diff options
| author | Bernard Normier <bernard@zeroc.com> | 2017-01-17 17:06:54 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2017-01-17 17:06:54 -0500 |
| commit | 154566dbe9af9b58f24c81697c0f6d644cbdff1a (patch) | |
| tree | ac2ee022c38db1b8d9c144ca7a1f39b3af122f7b /cpp/src | |
| parent | Fixed ICE-7512 and ICE-7511 - make distclean issues with Xcode IceSDK build (diff) | |
| download | ice-154566dbe9af9b58f24c81697c0f6d644cbdff1a.tar.bz2 ice-154566dbe9af9b58f24c81697c0f6d644cbdff1a.tar.xz ice-154566dbe9af9b58f24c81697c0f6d644cbdff1a.zip | |
"to string" on a fixed proxy no longer raise FixedProxyException
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/Reference.cpp | 9 | ||||
| -rw-r--r-- | cpp/src/Ice/Reference.h | 1 |
2 files changed, 0 insertions, 10 deletions
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp index c55b3037a33..188ad33e5ee 100644 --- a/cpp/src/Ice/Reference.cpp +++ b/cpp/src/Ice/Reference.cpp @@ -734,15 +734,6 @@ IceInternal::FixedReference::streamWrite(OutputStream*) const throw FixedProxyException(__FILE__, __LINE__); } -string -IceInternal::FixedReference::toString() const -{ - throw FixedProxyException(__FILE__, __LINE__); - - assert(false); // Cannot be reached. - return string(); // To keep the compiler from complaining. -} - PropertyDict IceInternal::FixedReference::toProperty(const string&) const { diff --git a/cpp/src/Ice/Reference.h b/cpp/src/Ice/Reference.h index d3612f6cedd..a48a61c66e4 100644 --- a/cpp/src/Ice/Reference.h +++ b/cpp/src/Ice/Reference.h @@ -212,7 +212,6 @@ public: virtual bool isWellKnown() const; virtual void streamWrite(Ice::OutputStream*) const; - virtual std::string toString() const; virtual Ice::PropertyDict toProperty(const std::string&) const; virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrxPtr&) const; |