Fix build failures and IceDB exceptions

zeroc-ice · Mar 14, 2024 · 5741a16 · 5741a16
1 parent 9605947
commit 5741a16
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 38 deletions.
diff --git a/cpp/include/Ice/IconvStringConverter.h b/cpp/include/Ice/IconvStringConverter.h
@@ -35,7 +35,7 @@ namespace Ice
      * Indicates that Iconv does not support the code.
      * \headerfile Ice/Ice.h
      */
-    class ICE_API IconvInitializationException : public IceUtil::Exception
+    class ICE_API IconvInitializationException final : public IceUtil::Exception
     {
     public:
         using IceUtil::Exception::Exception;
@@ -52,19 +52,13 @@ namespace Ice
          * Obtains the Slice type ID of this exception.
          * @return The fully-scoped type ID.
          */
-        std::string ice_id() const override;
+        std::string ice_id() const final;
 
         /**
          * Prints a description of this exception to the given stream.
          * @param str The output stream.
          */
-        void ice_print(std::ostream& str) const override;
-
-        /**
-         * Obtains the reason for the failure.
-         * @return The reason.
-         */
-        std::string reason() const noexcept;
+        void ice_print(std::ostream& str) const final;
 
     private:
         std::string _reason;

diff --git a/cpp/src/Ice/IconvStringConverter.cpp b/cpp/src/Ice/IconvStringConverter.cpp
@@ -29,9 +29,4 @@ IconvInitializationException::ice_id() const
     return "::Ice::IconvInitializationException";
 }
 
-string
-IconvInitializationException::reason() const noexcept
-{
-    return _reason;
-}
 #endif
diff --git a/cpp/src/IceDB/IceDB.cpp b/cpp/src/IceDB/IceDB.cpp
@@ -25,12 +25,6 @@ LMDBException::ice_print(ostream& out) const
     out << ": " << mdb_strerror(_error);
 }
 
-void
-LMDBException::ice_throw() const
-{
-    throw *this;
-}
-
 int
 LMDBException::error() const
 {
@@ -61,12 +55,6 @@ KeyTooLongException::ice_print(ostream& out) const
     out << "Max size = " << maxKeySize;
 }
 
-void
-KeyTooLongException::ice_throw() const
-{
-    throw *this;
-}
-
 BadEnvException::BadEnvException(const char* file, int line, size_t size) : IceUtil::Exception(file, line), _size(size)
 {
 }
@@ -85,12 +73,6 @@ BadEnvException::ice_print(ostream& out) const
     out << ", IceDB max key size = " << maxKeySize;
 }
 
-void
-BadEnvException::ice_throw() const
-{
-    throw *this;
-}
-
 Env::Env(const string& path, MDB_dbi maxDbs, size_t mapSize, unsigned int maxReaders)
 {
     int rc = mdb_env_create(&_menv);

diff --git a/cpp/src/IceDB/IceDB.h b/cpp/src/IceDB/IceDB.h
@@ -49,7 +49,6 @@ namespace IceDB
 
         virtual std::string ice_id() const;
         virtual void ice_print(std::ostream&) const;
-        virtual void ice_throw() const;
 
         int error() const;
 
@@ -69,7 +68,6 @@ namespace IceDB
 
         virtual std::string ice_id() const;
         virtual void ice_print(std::ostream&) const;
-        virtual void ice_throw() const;
 
     private:
         const size_t _size;
@@ -87,7 +85,6 @@ namespace IceDB
 
         virtual std::string ice_id() const;
         virtual void ice_print(std::ostream&) const;
-        virtual void ice_throw() const;
 
     private:
         const size_t _size;

diff --git a/cpp/test/Ice/operations/TwowaysAMI.cpp b/cpp/test/Ice/operations/TwowaysAMI.cpp
@@ -976,9 +976,9 @@ namespace
             {
                 called();
             }
-            catch (const std::exception& ex)
+            catch (const std::exception& e)
             {
-                cerr << ex.what() << endl;
+                cerr << e.what() << endl;
                 test(false);
             }
             catch (...)

diff --git a/matlab/src/ObjectPrx.cpp b/matlab/src/ObjectPrx.cpp
@@ -1068,7 +1068,7 @@ extern "C"
         {
             assert(f->getException());
             delete reinterpret_cast<shared_ptr<InvocationFuture>*>(self);
-            return createResultException(f->getException());
+            return createResultException(convertException(f->getException()));
         }
 
         bool ok;