diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2011-10-18 22:18:35 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2011-10-18 22:50:09 +0200 |
| commit | 54a5e8d05528c379b1c3465b908c18fe5aa5d2b3 (patch) | |
| tree | da218465a52a7eaf19c44d281fc3952e40f9f59b /cpp/src/Slice/CPlusPlusUtil.cpp | |
| parent | Fixed ICE-4722 - Bogus communicator initialization in Freeze map (diff) | |
| download | ice-54a5e8d05528c379b1c3465b908c18fe5aa5d2b3.tar.bz2 ice-54a5e8d05528c379b1c3465b908c18fe5aa5d2b3.tar.xz ice-54a5e8d05528c379b1c3465b908c18fe5aa5d2b3.zip | |
Fixed ICE-4721 - support for OS X clang
Diffstat (limited to 'cpp/src/Slice/CPlusPlusUtil.cpp')
| -rw-r--r-- | cpp/src/Slice/CPlusPlusUtil.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp index f0d6a514e75..0d5024d9d91 100644 --- a/cpp/src/Slice/CPlusPlusUtil.cpp +++ b/cpp/src/Slice/CPlusPlusUtil.cpp @@ -631,7 +631,7 @@ Slice::writeMarshalUnmarshalCode(Output& out, const TypePtr& type, const string& string scope = fixKwd(cl->scope()); if(marshal) { - out << nl << stream << deref << "write(::Ice::ObjectPtr(::IceInternal::upCast(" << fixedParam + out << nl << stream << deref << "write(::Ice::ObjectPtr(" << scope << "upCast(" << fixedParam << ".get())));"; } else @@ -649,7 +649,7 @@ Slice::writeMarshalUnmarshalCode(Output& out, const TypePtr& type, const string& string scope = fixKwd(px->_class()->scope()); if(marshal) { - out << nl << stream << deref << "write(::Ice::ObjectPrx(::IceInternal::upCast(" << fixedParam + out << nl << stream << deref << "write(::Ice::ObjectPrx(::IceProxy" << scope << "upCast(" << fixedParam << ".get())));"; } else |