Fix more C++ lints in cpp

.clang-tidy

@@ -2,6 +2,7 @@ Checks:
 '-*,
   clang-analyzer-*,
   -clang-diagnostic-shadow-uncaptured-local,
+  -clang-analyzer-optin.core.EnumCastOutOfRange,
   cert-*,
   modernize-*,
   -modernize-avoid-c-arrays,

cpp/include/DataStorm/InternalT.h

@@ -28,13 +28,13 @@ namespace DataStormI
     template<typename T> class has_communicator_parameter
     {
         template<typename TT, typename SS>
-        static auto testE(int)
+        static auto testE(int) noexcept
             -> decltype(TT::encode(std::declval<Ice::CommunicatorPtr&>(), std::declval<SS&>()), std::true_type());
 
         template<typename, typename> static auto testE(...) -> std::false_type;
 
         template<typename TT, typename SS>
-        static auto testD(int)
+        static auto testD(int) noexcept
             -> decltype(TT::decode(std::declval<Ice::CommunicatorPtr&>(), Ice::ByteSeq()), std::true_type());
 
         template<typename, typename> static auto testD(...) -> std::false_type;
@@ -79,9 +79,9 @@ namespace DataStormI
     template<typename T> class is_streamable
     {
         template<typename TT, typename SS>
-        static auto test(int) -> decltype(std::declval<SS&>() << std::declval<TT>(), std::true_type());
+        static auto test(int) noexcept -> decltype(std::declval<SS&>() << std::declval<TT>(), std::true_type());
 
-        template<typename, typename> static auto test(...) -> std::false_type;
+        template<typename, typename> static auto test(...) noexcept -> std::false_type;
 
     public:
         static const bool value = decltype(test<T, std::ostream>(0))::value;

cpp/include/Ice/LoggerUtil.h

@@ -44,8 +44,8 @@ namespace Ice
 
     template<typename T> struct IsException
     {
-        static char testex(Ice::Exception*);
-        static long testex(...);
+        static char testex(Ice::Exception*) noexcept;
+        static long testex(...) noexcept;
 
         static const bool value = sizeof(testex(static_cast<T*>(nullptr))) == sizeof(char);
     };

cpp/include/Ice/Proxy.h

@@ -259,8 +259,8 @@ 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; }
-        Proxy& operator=(Proxy&&) noexcept { return *this; }
+        Proxy& operator=(const Proxy&) noexcept { return *this; } // NOLINT
+        Proxy& operator=(Proxy&&) noexcept { return *this; }      // NOLINT
 
     private:
         Prx fromReference(IceInternal::ReferencePtr&& ref) const

cpp/include/Ice/StreamableTraits.h

@@ -81,9 +81,9 @@ namespace Ice
      */
     template<typename T> struct IsContainer
     {
-        template<typename C> static char test(typename C::iterator*);
+        template<typename C> static char test(typename C::iterator*) noexcept;
 
-        template<typename C> static long test(...);
+        template<typename C> static long test(...) noexcept;
 
         static const bool value = sizeof(test<T>(0)) == sizeof(char);
     };
@@ -95,9 +95,9 @@ namespace Ice
      */
     template<typename T> struct IsMap
     {
-        template<typename C> static char test(typename C::mapped_type*);
+        template<typename C> static char test(typename C::mapped_type*) noexcept;
 
-        template<typename C> static long test(...);
+        template<typename C> static long test(...) noexcept;
 
         static const bool value = IsContainer<T>::value && sizeof(test<T>(0)) == sizeof(char);
     };

cpp/src/DataStorm/TopicI.cpp

@@ -13,7 +13,7 @@ using namespace DataStormContract;
 
 namespace
 {
-    static Topic::Updater noOpUpdater =
+    static Topic::Updater noOpUpdater = // NOLINT:cert-err58-cpp
         [](const shared_ptr<Sample>& previous, const shared_ptr<Sample>& next, const Ice::CommunicatorPtr&)
     { next->setValue(previous); };
 
@@ -38,7 +38,7 @@ namespace
 
         bool match(const shared_ptr<Filterable>&) const final { return true; }
     };
-    const auto alwaysMatchFilter = make_shared<AlwaysMatchFilter>();
+    const auto alwaysMatchFilter = make_shared<AlwaysMatchFilter>(); // NOLINT:cert-err58-cpp
 
     DataStorm::ClearHistoryPolicy parseClearHistory(const std::string& value)
     {

cpp/src/DataStorm/TraceUtil.h

@@ -11,7 +11,8 @@
 #include "SessionI.h"
 #include "TopicI.h"
 
-namespace std
+// TODO: explain why we need to use namespace std here.
+namespace std // NOLINT:cert-dcl58-cpp
 {
     template<typename T> inline std::ostream& operator<<(std::ostream& os, const std::vector<T>& p)
     {
@@ -205,7 +206,7 @@ namespace DataStormI
         return os;
     }
 
-    class TraceLevels
+    class TraceLevels // NOLINT:clang-analyzer-optin.performance.Padding
     {
     public:
         TraceLevels(const Ice::PropertiesPtr&, Ice::LoggerPtr);

cpp/src/Glacier2/InstrumentationI.cpp

@@ -22,7 +22,7 @@ namespace
         class Attributes : public AttributeResolverT<SessionHelper>
         {
         public:
-            Attributes()
+            Attributes() noexcept
             {
                 add("parent", &SessionHelper::getInstanceName);
                 add("id", &SessionHelper::getId);

cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp

@@ -107,9 +107,9 @@ namespace
     {
 #if defined(__APPLE__) || defined(_WIN32)
 
-        const string padBytes0 = "";
-        const string padBytes1 = "=";
-        const string padBytes2 = "==";
+        const char* const padBytes0 = "";
+        const char* const padBytes1 = "=";
+        const char* const padBytes2 = "==";
 
         inline string paddingBytes(size_t length)
         {

cpp/src/Ice/ArgVector.cpp

@@ -32,10 +32,13 @@ IceInternal::ArgVector::ArgVector(const ArgVector& rhs)
 IceInternal::ArgVector&
 IceInternal::ArgVector::operator=(const ArgVector& rhs)
 {
-    delete[] argv;
-    argv = nullptr;
-    _args = rhs._args;
-    setupArgcArgv();
+    if (this != &rhs)
+    {
+        delete[] argv;
+        argv = nullptr;
+        _args = rhs._args;
+        setupArgcArgv();
+    }
     return *this;
 }
 

cpp/src/Ice/CtrlCHandler.cpp

@@ -205,12 +205,12 @@ CtrlCHandler::~CtrlCHandler()
     //
     void* status = nullptr;
 #    ifndef NDEBUG
-    int rc = pthread_kill(_tid, SIGTERM);
+    int rc = pthread_kill(_tid, SIGTERM); // NOLINT:cert-pos44-c
     assert(rc == 0);
     rc = pthread_join(_tid, &status);
     assert(rc == 0);
 #    else
-    pthread_kill(_tid, SIGTERM);
+    pthread_kill(_tid, SIGTERM); // NOLINT:cert-pos44-c
     pthread_join(_tid, &status);
 #    endif
 }

cpp/src/Ice/Exception.cpp

@@ -15,7 +15,7 @@
 // For UINTPTR_MAX on Ubuntu Precise
 //
 #ifndef __STDC_LIMIT_MACROS
-#    define __STDC_LIMIT_MACROS
+#    define __STDC_LIMIT_MACROS // NOLINT
 #endif
 
 #include "Ice/Exception.h"

cpp/src/Ice/FileUtil.cpp

@@ -22,17 +22,6 @@
 
 using namespace std;
 
-namespace IceInternal
-{
-#ifdef _WIN32
-    const string pathsep = ";";
-    const string separator = "\\";
-#else
-    const string pathsep = ":";
-    const string separator = "/";
-#endif
-}
-
 //
 // Determine if path is an absolute path
 //

cpp/src/Ice/FileUtil.h

@@ -22,8 +22,11 @@
 
 namespace IceInternal
 {
-    extern const ICE_API std::string pathsep;
-    extern const ICE_API std::string separator;
+#ifdef _WIN32
+    const char* const separator = "\\";
+#else
+    const char* const separator = "/";
+#endif
 
     //
     // Determine if path is an absolute path.

cpp/src/Ice/HttpParser.cpp

@@ -18,7 +18,9 @@ namespace
     // Convert a byte array to a string
     string bytesToString(const byte* begin, const byte* end)
     {
-        return string(reinterpret_cast<const char*>(begin), reinterpret_cast<const char*>(end));
+        assert(begin);
+        assert(end);
+        return string{reinterpret_cast<const char*>(begin), reinterpret_cast<const char*>(end)};
     }
 }
 

cpp/src/Ice/Instance.cpp

@@ -129,7 +129,7 @@ namespace
     class Init
     {
     public:
-        Init()
+        Init() noexcept
         {
             // Although probably not necessary here, we consistently lock
             // staticMutex before accessing instanceList.

cpp/src/Ice/InstrumentationI.cpp

@@ -77,7 +77,7 @@ namespace
         class Attributes : public AttributeResolverT<ConnectionHelper>
         {
         public:
-            Attributes()
+            Attributes() noexcept
             {
                 add("parent", &ConnectionHelper::getParent);
                 add("id", &ConnectionHelper::getId);
@@ -182,7 +182,7 @@ namespace
         class Attributes : public AttributeResolverT<DispatchHelper>
         {
         public:
-            Attributes()
+            Attributes() noexcept
             {
                 add("parent", &DispatchHelper::getParent);
                 add("id", &DispatchHelper::getId);
@@ -287,7 +287,7 @@ namespace
         class Attributes : public AttributeResolverT<InvocationHelper>
         {
         public:
-            Attributes()
+            Attributes() noexcept
             {
                 add("parent", &InvocationHelper::getParent);
                 add("id", &InvocationHelper::getId);
@@ -417,7 +417,7 @@ namespace
         class Attributes : public AttributeResolverT<RemoteInvocationHelper>
         {
         public:
-            Attributes()
+            Attributes() noexcept
             {
                 add("parent", &RemoteInvocationHelper::getParent);
                 add("id", &RemoteInvocationHelper::getId);
@@ -502,7 +502,7 @@ namespace
         class Attributes : public AttributeResolverT<CollocatedInvocationHelper>
         {
         public:
-            Attributes()
+            Attributes() noexcept
             {
                 add("parent", &CollocatedInvocationHelper::getParent);
                 add("id", &CollocatedInvocationHelper::getId);
@@ -546,7 +546,7 @@ namespace
         class Attributes : public AttributeResolverT<ThreadHelper>
         {
         public:
-            Attributes()
+            Attributes() noexcept
             {
                 add("parent", &ThreadHelper::_parent);
                 add("id", &ThreadHelper::_id);
@@ -585,7 +585,7 @@ namespace
         class Attributes : public AttributeResolverT<EndpointHelper>
         {
         public:
-            Attributes()
+            Attributes() noexcept
             {
                 add("parent", &EndpointHelper::getParent);
                 add("id", &EndpointHelper::getId);

cpp/src/Ice/LoggerI.cpp

@@ -22,7 +22,7 @@ namespace
     mutex outputMutex;
 
     // Timeout after which rename will be attempted in case of failures renaming files. That is set to 5 minutes.
-    const chrono::minutes retryTimeout = chrono::minutes(5);
+    const chrono::minutes retryTimeout = chrono::minutes(5); // NOLINT:cert-err58-cpp
 }
 
 Ice::LoggerI::LoggerI(string prefix, string file, bool convert, size_t sizeMax)

cpp/src/Ice/MetricsAdminI.cpp

@@ -24,6 +24,7 @@ using namespace IceMX;
 namespace
 {
     const string suffixes[] = {
+        // NOLINT:cert-err58-cpp
         "Disabled",
         "GroupBy",
         "Accept.*",

cpp/src/Ice/OpaqueEndpointI.cpp

@@ -16,7 +16,7 @@ using namespace IceInternal;
 
 namespace
 {
-    static string opaqueEndpointProtocol = "opaque";
+    static string opaqueEndpointProtocol = "opaque"; // NOLINT:cert-err58-cpp
     static string opaqueEndpointConnectionId;
 }
 

cpp/src/Ice/Reference.h

@@ -37,11 +37,11 @@ namespace IceInternal
 
         enum Mode
         {
-            ModeTwoway,
-            ModeOneway,
-            ModeBatchOneway,
-            ModeDatagram,
-            ModeBatchDatagram,
+            ModeTwoway = 0,
+            ModeOneway = 1,
+            ModeBatchOneway = 2,
+            ModeDatagram = 3,
+            ModeBatchDatagram = 4,
             ModeLast = ModeBatchDatagram
         };
 

cpp/src/Ice/RegisterPluginsInit.h

@@ -10,7 +10,7 @@ namespace IceInternal
     class RegisterPluginsInit
     {
     public:
-        RegisterPluginsInit();
+        RegisterPluginsInit() noexcept;
     };
 }
 

cpp/src/Ice/RegisterPluginsInit_all.cpp

@@ -14,7 +14,7 @@ extern "C"
     Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const std::string&, const Ice::StringSeq&);
 }
 
-IceInternal::RegisterPluginsInit::RegisterPluginsInit()
+IceInternal::RegisterPluginsInit::RegisterPluginsInit() noexcept
 {
     Ice::registerPluginFactory("IceTCP", createIceTCP, true);
     Ice::registerPluginFactory("IceSSL", createIceSSL, true);

cpp/src/Ice/RegisterPluginsInit_min.cpp

@@ -12,7 +12,7 @@ extern "C"
     Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const std::string&, const Ice::StringSeq&);
 }
 
-IceInternal::RegisterPluginsInit::RegisterPluginsInit()
+IceInternal::RegisterPluginsInit::RegisterPluginsInit() noexcept
 {
     Ice::registerPluginFactory("IceTCP", createIceTCP, true);
     Ice::registerPluginFactory("IceSSL", createIceSSL, true);

cpp/src/Ice/SSL/RFC2253.cpp

@@ -20,8 +20,8 @@ namespace
     // See RFC 2253 and RFC 1779.
     //
 
-    string special = ",=+<>#;";
-    string hexvalid = "0123456789abcdefABCDEF";
+    const string special = ",=+<>#;";                 // NOLINT:cert-err58-cpp
+    const string hexvalid = "0123456789abcdefABCDEF"; // NOLINT:cert-err58-cpp
 }
 
 static char unescapeHex(const string&, size_t);