clang-tidy workflow fixes (#3413)

zeroc-ice · Jan 24, 2025 · 0f14661 · 0f14661
1 parent 48bcc2e
commit 0f14661
Show file tree

Hide file tree

Showing 23 changed files with 37 additions and 12 deletions.
diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml
@@ -33,6 +33,12 @@ jobs:
   clang-tidy:
     runs-on: ubuntu-24.04
     steps:
+      - name: Checkout Ice
+        uses: actions/checkout@v4
+
+      - name: Setup Ice Build Dependencies
+        uses: ./.github/actions/setup-dependencies
+
       - name: Install clang-tidy
         run: |
           # This LLVM script will add the relevant LLVM PPA: https://apt.llvm.org/
@@ -49,12 +55,6 @@ jobs:
           sudo apt-get install -y bear
           bear --version
 
-      - name: Checkout Ice
-        uses: actions/checkout@v4
-
-      - name: Setup Ice Build Dependencies
-        uses: ./.github/actions/setup-dependencies
-
       - name: Build Ice
         timeout-minutes: 90
         working-directory: cpp
@@ -63,4 +63,4 @@ jobs:
       - name: Run Clang Tidy
         working-directory: cpp
         run: |
-          run-clang-tidy-19 -j$(nproc) -quiet src/Ice/ || true
+          run-clang-tidy-19 -j$(nproc) -quiet src/
diff --git a/cpp/src/DataStorm/DataElementI.cpp b/cpp/src/DataStorm/DataElementI.cpp
@@ -8,6 +8,8 @@
 #include "TopicI.h"
 #include "TraceUtil.h"
 
+#include <algorithm>
+
 using namespace std;
 using namespace DataStormI;
 using namespace DataStormContract;

diff --git a/cpp/src/DataStorm/SessionI.cpp b/cpp/src/DataStorm/SessionI.cpp
@@ -964,7 +964,7 @@ SessionI::disconnect()
     auto self = shared_from_this();
     for (const auto& [topicId, _] : _topics)
     {
-        runWithTopics(topicId, [topicId, self](TopicI* topic, TopicSubscriber&) { topic->detach(topicId, self); });
+        runWithTopics(topicId, [id = topicId, self](TopicI* topic, TopicSubscriber&) { topic->detach(id, self); });
     }
 
     _session = nullopt;

diff --git a/cpp/src/DataStorm/TopicFactoryI.cpp b/cpp/src/DataStorm/TopicFactoryI.cpp
@@ -7,6 +7,8 @@
 #include "TopicI.h"
 #include "TraceUtil.h"
 
+#include <algorithm>
+
 using namespace std;
 using namespace DataStormI;
 using namespace DataStormContract;

diff --git a/cpp/src/Glacier2/FilterT.h b/cpp/src/Glacier2/FilterT.h
@@ -5,6 +5,7 @@
 #include "Glacier2/Session.h"
 #include "Ice/Identity.h"
 
+#include <algorithm>
 #include <list>
 #include <mutex>
 #include <string>

diff --git a/cpp/src/Glacier2/RouterI.cpp b/cpp/src/Glacier2/RouterI.cpp
@@ -114,7 +114,7 @@ string
 Glacier2::RouterI::getCategoryForClient(const Current&) const
 {
     assert(false); // Must not be called in this router implementation.
-    return nullptr;
+    return {};
 }
 
 void

diff --git a/cpp/src/Glacier2/SessionRouterI.cpp b/cpp/src/Glacier2/SessionRouterI.cpp
@@ -305,7 +305,7 @@ CreateSession::CreateSession(shared_ptr<SessionRouterI> sessionRouter, string us
             }
         }
         {
-            auto info = dynamic_pointer_cast<SSL::ConnectionInfo>(current.con->getInfo());
+            auto info = dynamic_pointer_cast<Ice::SSL::ConnectionInfo>(current.con->getInfo());
             if (info && info->peerCertificate)
             {
                 _context["_con.peerCert"] = Ice::SSL::encodeCertificate(info->peerCertificate);
@@ -637,7 +637,7 @@ SessionRouterI::createSessionFromSecureConnectionAsync(
     //
     try
     {
-        auto info = dynamic_pointer_cast<SSL::ConnectionInfo>(current.con->getInfo());
+        auto info = dynamic_pointer_cast<Ice::SSL::ConnectionInfo>(current.con->getInfo());
         if (!info)
         {
             exception(make_exception_ptr(PermissionDeniedException("not ssl connection")));
@@ -656,7 +656,7 @@ SessionRouterI::createSessionFromSecureConnectionAsync(
             userDN = Ice::SSL::getSubjectName(info->peerCertificate);
         }
     }
-    catch (const SSL::CertificateEncodingException&)
+    catch (const Ice::SSL::CertificateEncodingException&)
     {
         exception(make_exception_ptr(PermissionDeniedException("certificate encoding exception")));
         return;

diff --git a/cpp/src/Ice/CollocatedRequestHandler.cpp b/cpp/src/Ice/CollocatedRequestHandler.cpp
@@ -10,6 +10,8 @@
 #include "TraceLevels.h"
 #include "TraceUtil.h"
 
+#include <algorithm>
+
 using namespace std;
 using namespace Ice;
 using namespace IceInternal;

diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp
@@ -18,6 +18,7 @@
 #include "TraceLevels.h"
 #include "Transceiver.h"
 
+#include <algorithm>
 #include <chrono>
 #include <iterator>
 

diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp
@@ -22,6 +22,7 @@
 
 #include "DisableWarnings.h"
 
+#include <algorithm>
 #include <iomanip>
 #include <stdexcept>
 

diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp
@@ -11,6 +11,7 @@
 #include "LoggerI.h"
 #include "PluginManagerI.h"
 
+#include <algorithm>
 #include <mutex>
 #include <stdexcept>
 

diff --git a/cpp/src/Ice/LocatorInfo.cpp b/cpp/src/Ice/LocatorInfo.cpp
@@ -14,6 +14,7 @@
 
 #include "DisableWarnings.h"
 
+#include <algorithm>
 #include <iterator>
 
 using namespace std;

diff --git a/cpp/src/Ice/ObjectAdapterFactory.cpp b/cpp/src/Ice/ObjectAdapterFactory.cpp
@@ -7,6 +7,8 @@
 #include "Ice/UUID.h"
 #include "ObjectAdapterI.h"
 
+#include <algorithm>
+
 using namespace std;
 using namespace Ice;
 using namespace IceInternal;

diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp
@@ -35,6 +35,7 @@
 #    include <sys/time.h>
 #endif
 
+#include <algorithm>
 #include <iterator>
 #include <stdexcept>
 

diff --git a/cpp/src/Ice/Properties.cpp b/cpp/src/Ice/Properties.cpp
@@ -10,6 +10,7 @@
 #include "PropertyNames.h"
 #include "PropertyUtil.h"
 
+#include <algorithm>
 #include <cassert>
 #include <fstream>
 

diff --git a/cpp/src/Ice/SSL/SSLEndpointI.cpp b/cpp/src/Ice/SSL/SSLEndpointI.cpp
@@ -6,6 +6,8 @@
 #include "SSLConnectorI.h"
 #include "SSLInstance.h"
 
+#include <algorithm>
+
 using namespace std;
 using namespace Ice;
 using namespace Ice::SSL;

diff --git a/cpp/src/Ice/Value.cpp b/cpp/src/Ice/Value.cpp
@@ -7,6 +7,7 @@
 #include "Ice/OutputStream.h"
 #include "Ice/SlicedData.h"
 
+#include <algorithm>
 #include <deque>
 
 using namespace std;

diff --git a/cpp/src/Ice/WSEndpoint.cpp b/cpp/src/Ice/WSEndpoint.cpp
@@ -11,6 +11,8 @@
 #include "WSAcceptor.h"
 #include "WSConnector.h"
 
+#include <algorithm>
+
 using namespace std;
 using namespace Ice;
 using namespace IceInternal;

diff --git a/cpp/src/IceBT/Engine.cpp b/cpp/src/IceBT/Engine.cpp
@@ -7,6 +7,7 @@
 #include "Ice/UUID.h"
 #include "Util.h"
 
+#include <algorithm>
 #include <thread>
 
 using namespace std;

diff --git a/cpp/src/IceLocatorDiscovery/PluginI.cpp b/cpp/src/IceLocatorDiscovery/PluginI.cpp
@@ -6,6 +6,7 @@
 #include "IceLocatorDiscovery.h"
 #include "Plugin.h"
 
+#include <algorithm>
 #include <thread>
 
 using namespace std;

diff --git a/cpp/src/slice2php/Main.cpp b/cpp/src/slice2php/Main.cpp
@@ -12,6 +12,7 @@
 #include "Ice/StringUtil.h"
 #include "PHPUtil.h"
 
+#include <algorithm>
 #include <cassert>
 #include <climits>
 #include <cstring>

diff --git a/cpp/src/slice2py/Python.cpp b/cpp/src/slice2py/Python.cpp
@@ -11,6 +11,7 @@
 #include "../Slice/Util.h"
 #include "PythonUtil.h"
 
+#include <algorithm>
 #include <cassert>
 #include <cstring>
 #include <fstream>

diff --git a/cpp/src/slice2swift/SwiftUtil.cpp b/cpp/src/slice2swift/SwiftUtil.cpp
@@ -5,6 +5,7 @@
 #include "../Ice/OutputUtil.h"
 #include "../Slice/Util.h"
 
+#include <algorithm>
 #include <cassert>
 
 using namespace std;