Update .clang-tidy

zeroc-ice · Dec 16, 2024 · 3ec26c9 · 3ec26c9
1 parent c9cad83
commit 3ec26c9
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 13 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -4,11 +4,11 @@ Checks:
   -clang-diagnostic-shadow-uncaptured-local,
   -clang-analyzer-optin.core.EnumCastOutOfRange,
   cert-*,
-  -modernize-*,
+  modernize-*,
   -modernize-avoid-c-arrays,
   -modernize-use-trailing-return-type,
   -modernize-concat-nested-namespaces,
-  -performance-*,
+  performance-*,
   -performance-avoid-endl
 '
 WarningsAsErrors:  '*'

diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h
@@ -260,7 +260,7 @@ namespace Ice
         // The copy constructor and assignment operators are to keep GCC happy.
         Proxy(const Proxy&) noexcept = default;
         Proxy& operator=(const Proxy&) noexcept { return *this; } // NOLINT
-        Proxy& operator=(Proxy&&) noexcept { return *this; } // NOLINT
+        Proxy& operator=(Proxy&&) noexcept { return *this; }      // NOLINT
 
     private:
         Prx fromReference(IceInternal::ReferencePtr&& ref) const

diff --git a/cpp/src/Ice/FileUtil.h b/cpp/src/Ice/FileUtil.h
@@ -22,11 +22,11 @@
 
 namespace IceInternal
 {
-    #ifdef _WIN32
+#ifdef _WIN32
     const char* const separator = "\\";
-    #else
+#else
     const char* const separator = "/";
-    #endif
+#endif
 
     //
     // Determine if path is an absolute path.

diff --git a/cpp/src/Ice/MetricsAdminI.cpp b/cpp/src/Ice/MetricsAdminI.cpp
@@ -23,7 +23,8 @@ using namespace IceMX;
 
 namespace
 {
-    const string suffixes[] = { // NOLINT:cert-err58-cpp
+    const string suffixes[] = {
+        // NOLINT:cert-err58-cpp
         "Disabled",
         "GroupBy",
         "Accept.*",

diff --git a/cpp/src/Ice/SSL/RFC2253.cpp b/cpp/src/Ice/SSL/RFC2253.cpp
@@ -20,7 +20,7 @@ namespace
     // See RFC 2253 and RFC 1779.
     //
 
-    const string special = ",=+<>#;"; // NOLINT:cert-err58-cpp
+    const string special = ",=+<>#;";                 // NOLINT:cert-err58-cpp
     const string hexvalid = "0123456789abcdefABCDEF"; // NOLINT:cert-err58-cpp
 }
 

diff --git a/cpp/src/Ice/WSTransceiver.cpp b/cpp/src/Ice/WSTransceiver.cpp
@@ -52,7 +52,7 @@ using namespace IceInternal;
 
 namespace
 {
-    const string _iceProtocol = "ice.zeroc.com"; // NOLINT:cert-err58-cpp
+    const string _iceProtocol = "ice.zeroc.com";                   // NOLINT:cert-err58-cpp
     const string _wsUUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"; // NOLINT:cert-err58-cpp
 
     //

diff --git a/cpp/src/slice2py/Python.cpp b/cpp/src/slice2py/Python.cpp
@@ -185,7 +185,7 @@ namespace
         StringList& _modules;
     };
 
-    const string moduleTag = "# Modules:"; // NOLINT:cert-err58-cpp
+    const string moduleTag = "# Modules:";       // NOLINT:cert-err58-cpp
     const string submoduleTag = "# Submodules:"; // NOLINT:cert-err58-cpp
 
     PackageVisitor::PackageVisitor(StringList& modules) : _modules(modules) {}

diff --git a/cpp/test/Ice/logger/Client5.cpp b/cpp/test/Ice/logger/Client5.cpp
@@ -26,10 +26,10 @@ runTest(const Ice::CommunicatorPtr& communicator)
 //
 #ifdef _WIN32
 const char* const message = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. "
-                       "Vestibulum ornare, ex non bibendum hendrerit, felis tortor cras amet.";
+                            "Vestibulum ornare, ex non bibendum hendrerit, felis tortor cras amet.";
 #else
 const char* const message = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. "
-                       "Fusce dictum turpis ante, sit amet finibus eros commodo vel. Sed amet.";
+                            "Fusce dictum turpis ante, sit amet finibus eros commodo vel. Sed amet.";
 #endif
 
 class Client5 : public Test::TestHelper

diff --git a/cpp/test/IceUtil/uuid/Client.cpp b/cpp/test/IceUtil/uuid/Client.cpp
@@ -143,7 +143,8 @@ runTest(int threadCount, GenerateFunc func, long howMany, bool verbose, string n
     if (verbose)
     {
         cout << "Each " << name << " took an average of "
-             << static_cast<double>(chrono::duration_cast<chrono::microseconds>(finish - start).count()) / static_cast<double>(howMany)
+             << static_cast<double>(chrono::duration_cast<chrono::microseconds>(finish - start).count()) /
+                    static_cast<double>(howMany)
              << " microseconds to generate and insert into a set." << endl;
     }
 }