diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-11-05 10:51:56 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-11-05 10:51:56 -0400 |
| commit | a9207c4a7e8190cb64286afc1b373f16010d0feb (patch) | |
| tree | b6815a6debc9b9589145cc12f192b6dd83b3f49e /cpp/src/Ice/InputStream.cpp | |
| parent | Revert "Reverted previous double-underscore changes in IceUtil classes" (diff) | |
| download | ice-a9207c4a7e8190cb64286afc1b373f16010d0feb.tar.bz2 ice-a9207c4a7e8190cb64286afc1b373f16010d0feb.tar.xz ice-a9207c4a7e8190cb64286afc1b373f16010d0feb.zip | |
Revert "Replaced double and triple underscores in C++ by ice-prefixed names"
This reverts commit 91fa99c34d1211d426b24bf68001fc27a87b3f00.
Diffstat (limited to 'cpp/src/Ice/InputStream.cpp')
| -rw-r--r-- | cpp/src/Ice/InputStream.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/InputStream.cpp b/cpp/src/Ice/InputStream.cpp index 562bde737fd..132012b07b2 100644 --- a/cpp/src/Ice/InputStream.cpp +++ b/cpp/src/Ice/InputStream.cpp @@ -1899,7 +1899,7 @@ Ice::InputStream::EncapsDecoder::unmarshal(Int index, const Ice::ValuePtr& v) // // Read the object. // - v->iceRead(_stream); + v->__read(_stream); // // Patch all instances now that the object is unmarshaled. @@ -2034,7 +2034,7 @@ Ice::InputStream::EncapsDecoder10::throwException(ICE_IN(ICE_USER_EXCEPTION_FACT } catch(UserException& ex) { - ex.iceRead(_stream); + ex.__read(_stream); if(usesClasses) { readPendingValues(); @@ -2329,7 +2329,7 @@ Ice::InputStream::EncapsDecoder11::throwException(ICE_IN(ICE_USER_EXCEPTION_FACT } catch(UserException& ex) { - ex.iceRead(_stream); + ex.__read(_stream); throw; // Never reached. |