diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-10-28 15:02:03 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-10-28 15:02:03 +0100 |
| commit | c8bd13216c537a811dc6b770b2d6631ed230ee2c (patch) | |
| tree | 74d96ecfff05197bbe8df59335e6f276745e7641 /cpp/src/slice2cpp | |
| parent | ICE-5792 fixed IceGridGUI install (diff) | |
| download | ice-c8bd13216c537a811dc6b770b2d6631ed230ee2c.tar.bz2 ice-c8bd13216c537a811dc6b770b2d6631ed230ee2c.tar.xz ice-c8bd13216c537a811dc6b770b2d6631ed230ee2c.zip | |
Fixed ICE-5548: fixed C++11 support to maintain binary compatibility between C++11 and C++03 compiled code
Diffstat (limited to 'cpp/src/slice2cpp')
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 57f3337c06f..7b195708399 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -3664,17 +3664,11 @@ Slice::Gen::ObjectVisitor::visitOperation(const OperationPtr& p) } } - H.zeroIndent(); - H << nl << "#ifdef ICE_CPP11"; - H.restoreIndent(); - + H << nl << "// Only supported with C++ 11 support enabled"; H << nl << "virtual ::Ice::AsyncResultPtr begin_" << name << spar << paramsDeclAMI << "const ::IceInternal::Function<void (const ::Ice::Exception&)>& exception" - << "const ::IceInternal::Function<void (bool)>& sent = ::IceInternal::Function<void (bool)>()" << epar << " = 0;"; - - H.zeroIndent(); - H << nl << "#endif"; - H.restoreIndent(); + << "const ::IceInternal::Function<void (bool)>& sent = ::IceInternal::Function<void (bool)>()" + << epar << " = 0;"; H << sp << nl << "virtual ::Ice::AsyncResultPtr begin_" << name << spar << paramsDeclAMI << epar << " = 0;"; |