From 1c3490a8db1f68997169e60e195e1f959605d3a0 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Fri, 7 Aug 2020 09:13:40 -0400
Subject: [PATCH] General: Tidy up clang-format warnings

---
 .ci/scripts/format/script.sh | 4 +++-
 CMakeLists.txt               | 2 +-
 src/common/bit_field.h       | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.ci/scripts/format/script.sh b/.ci/scripts/format/script.sh
index 991fe15527..1177d5c0c2 100644
--- a/.ci/scripts/format/script.sh
+++ b/.ci/scripts/format/script.sh
@@ -7,7 +7,9 @@ if grep -nrI '\s$' src *.yml *.txt *.md Doxyfile .gitignore .gitmodules .ci* dis
 fi
 
 # Default clang-format points to default 3.5 version one
-CLANG_FORMAT=clang-format-10.0
+CLANG_FORMAT=clang-format-10
+ls /usr/bin
+
 $CLANG_FORMAT --version
 
 if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3282ae9d40..8ecc2e4760 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -456,7 +456,7 @@ endif()
 # against all the src files. This should be used before making a pull request.
 # =======================================================================
 
-set(CLANG_FORMAT_POSTFIX "-6.0")
+set(CLANG_FORMAT_POSTFIX "-10")
 find_program(CLANG_FORMAT
     NAMES clang-format${CLANG_FORMAT_POSTFIX}
           clang-format
diff --git a/src/common/bit_field.h b/src/common/bit_field.h
index 26ae6c7fc7..dfa38a357e 100644
--- a/src/common/bit_field.h
+++ b/src/common/bit_field.h
@@ -161,7 +161,7 @@ public:
         }
     }
 
-    // This constructor and assignment operator might be considered ambiguous:
+    /// This constructor and assignment operator might be considered ambiguous:
     // Would they initialize the storage or just the bitfield?
     // Hence, delete them. Use the Assign method to set bitfield values!
     BitField(T val) = delete;