diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2007-04-27 18:55:15 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2007-04-27 18:55:15 +0000 |
| commit | 75bb9d486a72a786801c953b0f1e9f0cb13ba019 (patch) | |
| tree | 6c41b3691e502d84b5cdac541427c2f8f0258c38 /cppe/src/IceE/Reference.cpp | |
| parent | Removed unused getFixedConnections method (diff) | |
| download | ice-75bb9d486a72a786801c953b0f1e9f0cb13ba019.tar.bz2 ice-75bb9d486a72a786801c953b0f1e9f0cb13ba019.tar.xz ice-75bb9d486a72a786801c953b0f1e9f0cb13ba019.zip | |
Fixed bug 2145.
Diffstat (limited to 'cppe/src/IceE/Reference.cpp')
| -rw-r--r-- | cppe/src/IceE/Reference.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/cppe/src/IceE/Reference.cpp b/cppe/src/IceE/Reference.cpp index 7756f29d9e3..89af7f30c86 100644 --- a/cppe/src/IceE/Reference.cpp +++ b/cppe/src/IceE/Reference.cpp @@ -462,7 +462,8 @@ IceInternal::FixedReference::getEndpoints() const ReferencePtr IceInternal::FixedReference::changeRouter(const RouterPrx&) const { - return FixedReferencePtr(const_cast<FixedReference*>(this)); + throw FixedProxyException(__FILE__, __LINE__); + return 0; // Keep the compiler happy. } #endif @@ -472,7 +473,8 @@ IceInternal::FixedReference::changeRouter(const RouterPrx&) const ReferencePtr IceInternal::FixedReference::changeLocator(const LocatorPrx&) const { - return FixedReferencePtr(const_cast<FixedReference*>(this)); + throw FixedProxyException(__FILE__, __LINE__); + return 0; // Keep the compiler happy. } #endif @@ -480,19 +482,21 @@ IceInternal::FixedReference::changeLocator(const LocatorPrx&) const ReferencePtr IceInternal::FixedReference::changeTimeout(int) const { - return FixedReferencePtr(const_cast<FixedReference*>(this)); + throw FixedProxyException(__FILE__, __LINE__); + return 0; // Keep the compiler happy. } void IceInternal::FixedReference::streamWrite(BasicStream* s) const { - throw MarshalException(__FILE__, __LINE__, "Cannot marshal a fixed proxy"); + throw FixedProxyException(__FILE__, __LINE__); } string IceInternal::FixedReference::toString() const { - throw MarshalException(__FILE__, __LINE__, "Cannot marshal a fixed proxy"); + throw FixedProxyException(__FILE__, __LINE__); + return string(); // To keep the compiler from complaining. } ConnectionPtr |