diff options
Diffstat (limited to 'cpp/include')
-rw-r--r-- | cpp/include/Freeze/Initialize.h | 2 | ||||
-rw-r--r-- | cpp/include/Glacier2/Application.h | 2 | ||||
-rw-r--r-- | cpp/include/Ice/Exception.h | 6 | ||||
-rw-r--r-- | cpp/include/Ice/Stream.h | 4 | ||||
-rw-r--r-- | cpp/include/IceSSL/Plugin.h | 6 | ||||
-rw-r--r-- | cpp/include/IceUtil/CtrlCHandler.h | 2 | ||||
-rw-r--r-- | cpp/include/IceUtil/Exception.h | 10 | ||||
-rw-r--r-- | cpp/include/IceUtil/Options.h | 4 | ||||
-rw-r--r-- | cpp/include/IceUtil/ThreadException.h | 12 | ||||
-rw-r--r-- | cpp/include/IceUtil/Unicode.h | 2 | ||||
-rw-r--r-- | cpp/include/IceXML/Parser.h | 2 | ||||
-rw-r--r-- | cpp/include/Slice/FileTracker.h | 2 |
12 files changed, 27 insertions, 27 deletions
diff --git a/cpp/include/Freeze/Initialize.h b/cpp/include/Freeze/Initialize.h index 931bd58aeb6..a81407e23a2 100644 --- a/cpp/include/Freeze/Initialize.h +++ b/cpp/include/Freeze/Initialize.h @@ -75,7 +75,7 @@ public: virtual ~TransactionalEvictorDeadlockException() throw(); virtual std::string ice_name() const; - virtual Ice::Exception* ice_clone() const; + virtual TransactionalEvictorDeadlockException* ice_clone() const; virtual void ice_throw() const; TransactionPtr tx; diff --git a/cpp/include/Glacier2/Application.h b/cpp/include/Glacier2/Application.h index 6bf8334af94..edbe14f31c6 100644 --- a/cpp/include/Glacier2/Application.h +++ b/cpp/include/Glacier2/Application.h @@ -27,7 +27,7 @@ class GLACIER2_API RestartSessionException : public IceUtil::Exception public: virtual std::string ice_name() const; - virtual IceUtil::Exception* ice_clone() const; + virtual RestartSessionException* ice_clone() const; virtual void ice_throw() const; }; diff --git a/cpp/include/Ice/Exception.h b/cpp/include/Ice/Exception.h index f0a57f27e4b..9ed187dae90 100644 --- a/cpp/include/Ice/Exception.h +++ b/cpp/include/Ice/Exception.h @@ -43,7 +43,7 @@ public: LocalException(const char*, int); virtual ~LocalException() throw(); virtual std::string ice_name() const = 0; - virtual Exception* ice_clone() const = 0; + virtual LocalException* ice_clone() const = 0; virtual void ice_throw() const = 0; }; @@ -52,7 +52,7 @@ class ICE_API UserException : public IceUtil::Exception public: virtual std::string ice_name() const = 0; - virtual Exception* ice_clone() const = 0; + virtual UserException* ice_clone() const = 0; virtual void ice_throw() const = 0; virtual void __write(::IceInternal::BasicStream*) const = 0; @@ -71,7 +71,7 @@ public: SystemException(const char*, int); virtual ~SystemException() throw(); virtual std::string ice_name() const = 0; - virtual Exception* ice_clone() const = 0; + virtual SystemException* ice_clone() const = 0; virtual void ice_throw() const = 0; }; diff --git a/cpp/include/Ice/Stream.h b/cpp/include/Ice/Stream.h index 3257def6c6a..a1876f32bcf 100644 --- a/cpp/include/Ice/Stream.h +++ b/cpp/include/Ice/Stream.h @@ -66,7 +66,7 @@ public: virtual void usesClasses(bool) = 0; virtual ::std::string ice_name() const = 0; - virtual Exception* ice_clone() const = 0; + virtual UserExceptionReader* ice_clone() const = 0; virtual void ice_throw() const = 0; virtual void __write(IceInternal::BasicStream*) const; @@ -422,7 +422,7 @@ public: virtual bool usesClasses() const = 0; virtual ::std::string ice_name() const = 0; - virtual Exception* ice_clone() const = 0; + virtual UserExceptionWriter* ice_clone() const = 0; virtual void ice_throw() const = 0; virtual void __write(IceInternal::BasicStream*) const; diff --git a/cpp/include/IceSSL/Plugin.h b/cpp/include/IceSSL/Plugin.h index ff67ba55a43..80772366690 100644 --- a/cpp/include/IceSSL/Plugin.h +++ b/cpp/include/IceSSL/Plugin.h @@ -61,7 +61,7 @@ public: CertificateReadException(const char*, int, const std::string&); virtual ~CertificateReadException() throw(); virtual std::string ice_name() const; - virtual IceUtil::Exception* ice_clone() const; + virtual CertificateReadException* ice_clone() const; virtual void ice_throw() const; std::string reason; @@ -81,7 +81,7 @@ public: CertificateEncodingException(const char*, int, const std::string&); virtual ~CertificateEncodingException() throw(); virtual std::string ice_name() const; - virtual IceUtil::Exception* ice_clone() const; + virtual CertificateEncodingException* ice_clone() const; virtual void ice_throw() const; std::string reason; @@ -101,7 +101,7 @@ public: ParseException(const char*, int, const std::string&); virtual ~ParseException() throw(); virtual std::string ice_name() const; - virtual IceUtil::Exception* ice_clone() const; + virtual ParseException* ice_clone() const; virtual void ice_throw() const; std::string reason; diff --git a/cpp/include/IceUtil/CtrlCHandler.h b/cpp/include/IceUtil/CtrlCHandler.h index 6614b601c58..24d2012df33 100644 --- a/cpp/include/IceUtil/CtrlCHandler.h +++ b/cpp/include/IceUtil/CtrlCHandler.h @@ -60,7 +60,7 @@ public: CtrlCHandlerException(const char*, int); virtual std::string ice_name() const; - virtual Exception* ice_clone() const; + virtual CtrlCHandlerException* ice_clone() const; virtual void ice_throw() const; }; diff --git a/cpp/include/IceUtil/Exception.h b/cpp/include/IceUtil/Exception.h index 9f04171efd9..fdeb01372e6 100644 --- a/cpp/include/IceUtil/Exception.h +++ b/cpp/include/IceUtil/Exception.h @@ -51,7 +51,7 @@ public: NullHandleException(const char*, int); virtual ~NullHandleException() throw(); virtual std::string ice_name() const; - virtual Exception* ice_clone() const; + virtual NullHandleException* ice_clone() const; virtual void ice_throw() const; private: @@ -68,7 +68,7 @@ public: virtual ~IllegalArgumentException() throw(); virtual std::string ice_name() const; virtual void ice_print(std::ostream&) const; - virtual Exception* ice_clone() const; + virtual IllegalArgumentException* ice_clone() const; virtual void ice_throw() const; std::string reason() const; @@ -86,7 +86,7 @@ public: SyscallException(const char*, int, int); virtual std::string ice_name() const; virtual void ice_print(std::ostream&) const; - virtual Exception* ice_clone() const; + virtual SyscallException* ice_clone() const; virtual void ice_throw() const; int error() const; @@ -105,7 +105,7 @@ public: virtual ~FileLockException() throw(); virtual std::string ice_name() const; virtual void ice_print(std::ostream&) const; - virtual Exception* ice_clone() const; + virtual FileLockException* ice_clone() const; virtual void ice_throw() const; std::string path() const; @@ -125,7 +125,7 @@ public: OptionalNotSetException(const char*, int); virtual ~OptionalNotSetException() throw(); virtual std::string ice_name() const; - virtual Exception* ice_clone() const; + virtual OptionalNotSetException* ice_clone() const; virtual void ice_throw() const; private: diff --git a/cpp/include/IceUtil/Options.h b/cpp/include/IceUtil/Options.h index 364df237821..2bc37c5fdff 100644 --- a/cpp/include/IceUtil/Options.h +++ b/cpp/include/IceUtil/Options.h @@ -29,7 +29,7 @@ public: virtual ~APIException() throw(); virtual ::std::string ice_name() const; virtual void ice_print(std::ostream&) const; - virtual ::IceUtil::Exception* ice_clone() const; + virtual APIException* ice_clone() const; virtual void ice_throw() const; ::std::string reason; @@ -49,7 +49,7 @@ public: virtual ~BadOptException() throw(); virtual ::std::string ice_name() const; virtual void ice_print(std::ostream&) const; - virtual ::IceUtil::Exception* ice_clone() const; + virtual BadOptException* ice_clone() const; virtual void ice_throw() const; ::std::string reason; diff --git a/cpp/include/IceUtil/ThreadException.h b/cpp/include/IceUtil/ThreadException.h index d0444c20573..b723ff4d4fe 100644 --- a/cpp/include/IceUtil/ThreadException.h +++ b/cpp/include/IceUtil/ThreadException.h @@ -21,7 +21,7 @@ public: ThreadSyscallException(const char*, int, int); virtual std::string ice_name() const; - virtual Exception* ice_clone() const; + virtual ThreadSyscallException* ice_clone() const; virtual void ice_throw() const; private: @@ -35,7 +35,7 @@ public: ThreadLockedException(const char*, int); virtual std::string ice_name() const; - virtual Exception* ice_clone() const; + virtual ThreadLockedException* ice_clone() const; virtual void ice_throw() const; private: @@ -49,7 +49,7 @@ public: ThreadStartedException(const char*, int); virtual std::string ice_name() const; - virtual Exception* ice_clone() const; + virtual ThreadStartedException* ice_clone() const; virtual void ice_throw() const; private: @@ -63,7 +63,7 @@ public: ThreadNotStartedException(const char*, int); virtual std::string ice_name() const; - virtual Exception* ice_clone() const; + virtual ThreadNotStartedException* ice_clone() const; virtual void ice_throw() const; private: @@ -77,7 +77,7 @@ public: BadThreadControlException(const char*, int); virtual std::string ice_name() const; - virtual Exception* ice_clone() const; + virtual BadThreadControlException* ice_clone() const; virtual void ice_throw() const; private: @@ -92,7 +92,7 @@ public: InvalidTimeoutException(const char*, int, const Time&); virtual std::string ice_name() const; virtual void ice_print(std::ostream&) const; - virtual Exception* ice_clone() const; + virtual InvalidTimeoutException* ice_clone() const; virtual void ice_throw() const; private: diff --git a/cpp/include/IceUtil/Unicode.h b/cpp/include/IceUtil/Unicode.h index 6bd5232c065..4921a5b27ea 100644 --- a/cpp/include/IceUtil/Unicode.h +++ b/cpp/include/IceUtil/Unicode.h @@ -46,7 +46,7 @@ public: UTFConversionException(const char*, int, ConversionError); virtual std::string ice_name() const; virtual void ice_print(std::ostream&) const; - virtual Exception* ice_clone() const; + virtual UTFConversionException* ice_clone() const; virtual void ice_throw() const; ConversionError conversionError() const; diff --git a/cpp/include/IceXML/Parser.h b/cpp/include/IceXML/Parser.h index e32993aa207..28a48daf367 100644 --- a/cpp/include/IceXML/Parser.h +++ b/cpp/include/IceXML/Parser.h @@ -37,7 +37,7 @@ public: virtual std::string ice_name() const; virtual void ice_print(std::ostream&) const; - virtual IceUtil::Exception* ice_clone() const; + virtual ParserException* ice_clone() const; virtual void ice_throw() const; std::string reason() const; diff --git a/cpp/include/Slice/FileTracker.h b/cpp/include/Slice/FileTracker.h index 3fb45799e8c..ba12335da7d 100644 --- a/cpp/include/Slice/FileTracker.h +++ b/cpp/include/Slice/FileTracker.h @@ -23,7 +23,7 @@ public: ~FileException() throw(); virtual std::string ice_name() const; virtual void ice_print(std::ostream&) const; - virtual ::IceUtil::Exception* ice_clone() const; + virtual FileException* ice_clone() const; virtual void ice_throw() const; std::string reason() const; |