Cleanup

zeroc-ice · Feb 22, 2024 · 5f9950d · 5f9950d
1 parent 6317768
commit 5f9950d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/cpp/include/Ice/LocalException.h b/cpp/include/Ice/LocalException.h
@@ -362,20 +362,8 @@ class ICE_CLASS(ICE_API) TwowayOnlyException : public LocalExceptionHelper<Twowa
      * @param line The line number at which the exception was raised, typically __LINE__.
      * @param operation The name of the operation that was invoked.
      */
-    TwowayOnlyException(const char* file, int line, const ::std::string& operation) : LocalExceptionHelper<TwowayOnlyException, LocalException>(file, line),
-        operation(operation)
-    {
-    }
-
-     /**
-     * One-shot constructor to initialize all data members.
-     * The file and line number are required for all local exceptions.
-     * @param file The file name in which the exception was raised, typically __FILE__.
-     * @param line The line number at which the exception was raised, typically __LINE__.
-     * @param operation The name of the operation that was invoked.
-     */
-    TwowayOnlyException(const char* file, int line, ::std::string_view operation) : LocalExceptionHelper<TwowayOnlyException, LocalException>(file, line),
-        operation(operation)
+    TwowayOnlyException(const char* file, int line, ::std::string operation) : LocalExceptionHelper<TwowayOnlyException, LocalException>(file, line),
+        operation(std::move(operation))
     {
     }
 

diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
@@ -62,7 +62,7 @@ Ice::ObjectPrx::_checkTwowayOnly(string_view name) const
 {
     if (!ice_isTwoway())
     {
-        throw Ice::TwowayOnlyException(__FILE__, __LINE__, name);
+        throw Ice::TwowayOnlyException(__FILE__, __LINE__, string(name));
     }
 }