diff options
| author | Bernard Normier <bernard@zeroc.com> | 2017-05-03 20:14:31 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2017-05-03 20:14:31 -0400 |
| commit | 34156adcd7d7a1cc458260aabbd6b1857dab84b7 (patch) | |
| tree | 7379294e035ba71def6df3131ee7edc882258505 /cpp/src/Ice/InputStream.cpp | |
| parent | More makefile fixes (diff) | |
| download | ice-34156adcd7d7a1cc458260aabbd6b1857dab84b7.tar.bz2 ice-34156adcd7d7a1cc458260aabbd6b1857dab84b7.tar.xz ice-34156adcd7d7a1cc458260aabbd6b1857dab84b7.zip | |
Generate alias for "delegate" in C++11 (ICE-7859)
Diffstat (limited to 'cpp/src/Ice/InputStream.cpp')
| -rw-r--r-- | cpp/src/Ice/InputStream.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/Ice/InputStream.cpp b/cpp/src/Ice/InputStream.cpp index 61f71c7b5ba..0dc57a742ac 100644 --- a/cpp/src/Ice/InputStream.cpp +++ b/cpp/src/Ice/InputStream.cpp @@ -1437,7 +1437,7 @@ Ice::InputStream::readEnum(Int maxValue) } void -Ice::InputStream::throwException(ICE_IN(ICE_USER_EXCEPTION_FACTORY) factory) +Ice::InputStream::throwException(ICE_IN(ICE_DELEGATE(UserExceptionFactory)) factory) { initEncaps(); _currentEncaps->decoder->throwException(factory); @@ -1998,7 +1998,7 @@ Ice::InputStream::EncapsDecoder10::read(PatchFunc patchFunc, void* patchAddr) } void -Ice::InputStream::EncapsDecoder10::throwException(ICE_IN(ICE_USER_EXCEPTION_FACTORY) factory) +Ice::InputStream::EncapsDecoder10::throwException(ICE_IN(ICE_DELEGATE(UserExceptionFactory)) factory) { assert(_sliceType == NoSlice); @@ -2020,7 +2020,7 @@ Ice::InputStream::EncapsDecoder10::throwException(ICE_IN(ICE_USER_EXCEPTION_FACT // startSlice(); const string mostDerivedId = _typeId; - ICE_USER_EXCEPTION_FACTORY exceptionFactory = factory; + ICE_DELEGATE(UserExceptionFactory) exceptionFactory = factory; while(true) { // @@ -2328,7 +2328,7 @@ Ice::InputStream::EncapsDecoder11::read(PatchFunc patchFunc, void* patchAddr) } void -Ice::InputStream::EncapsDecoder11::throwException(ICE_IN(ICE_USER_EXCEPTION_FACTORY) factory) +Ice::InputStream::EncapsDecoder11::throwException(ICE_IN(ICE_DELEGATE(UserExceptionFactory)) factory) { assert(!_current); @@ -2339,7 +2339,7 @@ Ice::InputStream::EncapsDecoder11::throwException(ICE_IN(ICE_USER_EXCEPTION_FACT // startSlice(); const string mostDerivedId = _current->typeId; - ICE_USER_EXCEPTION_FACTORY exceptionFactory = factory; + ICE_DELEGATE(UserExceptionFactory) exceptionFactory = factory; while(true) { // |