Fix review comments

zeroc-ice · Feb 19, 2024 · 390f63b · 390f63b
1 parent 6e331ac
commit 390f63b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/cpp/include/Ice/Comparable.h b/cpp/include/Ice/Comparable.h
@@ -100,7 +100,7 @@ inline bool targetNotEqualTo(const T& lhs, const U& rhs)
 
 /**
  * Functor class that compares the contents of two smart pointers (or similar) of the given type using the given
- * comparator. It provides partial specializations for std::shared and std::optional.
+ * comparator. It provides partial specializations for std::shared_ptr and std::optional.
  * \headerfile Ice/Ice.h
  */
 template<typename T, template<typename> class Compare>

diff --git a/cpp/include/Ice/MetricsObserverI.h b/cpp/include/Ice/MetricsObserverI.h
@@ -280,14 +280,14 @@ template<typename T> class MetricsHelperT
         static const std::string
         toString(const Ice::ObjectPrx& p)
         {
-           return p->ice_toString();
+            return p->ice_toString();
         }
 
         template<typename Prx, std::enable_if_t<std::is_base_of<Ice::ObjectPrx, Prx>::value, bool> = true>
         static const std::string
         toString(const std::optional<Prx>& p)
         {
-           return p ? toString(p.value()) : "";
+            return p ? toString(p.value()) : "";
         }
 
         static const std::string&

diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
@@ -38,7 +38,7 @@ inline ReferencePtr createReference(const shared_ptr<Communicator>& communicator
     ReferencePtr ref = getInstance(communicator)->referenceFactory()->create(proxyString, "");
     if (!ref)
     {
-        throw std::invalid_argument("invalid proxyString");
+        throw std::invalid_argument("invalid proxy string");
     }
     return ref;
 }

diff --git a/cpp/src/Ice/RequestHandlerCache.cpp b/cpp/src/Ice/RequestHandlerCache.cpp
@@ -326,6 +326,7 @@ RequestHandlerCache::handleException(
         }
 
         // gcc complains without this return statement.
+        assert(false);
         return 0;
     }
 }