More cleanup

zeroc-ice · Oct 30, 2024 · e92b038 · e92b038
1 parent 826afbe
commit e92b038
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 21 deletions.
diff --git a/cpp/include/Ice/StringConverter.h b/cpp/include/Ice/StringConverter.h
@@ -148,7 +148,7 @@ namespace Ice
      * @param nc The narrow string converter. If null, the UTF-8 string is returned.
      * @return A native narrow string.
      */
-    ICE_API std::string UTF8ToNative(const std::string& str, const StringConverterPtr& nc);
+    ICE_API std::string UTF8ToNative(std::string_view str, const StringConverterPtr& nc);
 
 #ifdef _WIN32
 

diff --git a/cpp/include/IceBox/Service.h b/cpp/include/IceBox/Service.h
@@ -1,21 +1,11 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
+// Copyright (c) ZeroC, Inc.
 
 #ifndef ICEBOX_SERVICE_H
 #define ICEBOX_SERVICE_H
 
 #include "Config.h"
 #include "Ice/Ice.h"
 
-#if defined(__clang__)
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wshadow-field-in-constructor"
-#elif defined(__GNUC__)
-#    pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wshadow"
-#endif
-
 namespace IceBox
 {
     /**
@@ -61,10 +51,4 @@ namespace IceBox
     using ServicePtr = std::shared_ptr<Service>;
 }
 
-#if defined(__clang__)
-#    pragma clang diagnostic pop
-#elif defined(__GNUC__)
-#    pragma GCC diagnostic pop
-#endif
-
 #endif
diff --git a/cpp/src/Ice/Service.cpp b/cpp/src/Ice/Service.cpp
@@ -120,7 +120,9 @@ namespace
     class SMEventLoggerIWrapper final : public Ice::Logger
     {
     public:
-        SMEventLoggerIWrapper(const SMEventLoggerPtr& logger, string prefix) : _logger(logger), _prefix(std::move(prefix))
+        SMEventLoggerIWrapper(const SMEventLoggerPtr& logger, string prefix)
+            : _logger(logger),
+              _prefix(std::move(prefix))
         {
             assert(_logger);
         }

diff --git a/cpp/src/Ice/StringConverter.cpp b/cpp/src/Ice/StringConverter.cpp
@@ -341,11 +341,11 @@ Ice::nativeToUTF8(string_view str, const Ice::StringConverterPtr& converter)
 }
 
 string
-Ice::UTF8ToNative(const string& str, const Ice::StringConverterPtr& converter)
+Ice::UTF8ToNative(string_view str, const Ice::StringConverterPtr& converter)
 {
     if (!converter || str.empty())
     {
-        return str;
+        return string{str};
     }
     string tmp;
     converter->fromUTF8(