diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-08-10 09:52:43 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-08-10 09:52:43 +0200 |
| commit | ddda52695c8647afa8bf833c1e1424df0e799279 (patch) | |
| tree | 43a16df66a37ad1467519553757e7627b72af996 /cpp/src/Ice/OutgoingAsync.cpp | |
| parent | GCC fixes (diff) | |
| parent | Remove some more VC6 compiler fixes (diff) | |
| download | ice-ddda52695c8647afa8bf833c1e1424df0e799279.tar.bz2 ice-ddda52695c8647afa8bf833c1e1424df0e799279.tar.xz ice-ddda52695c8647afa8bf833c1e1424df0e799279.zip | |
Merge remote-tracking branch 'origin/encoding11' into mx
Conflicts:
cpp/src/Ice/OutgoingAsync.cpp
Diffstat (limited to 'cpp/src/Ice/OutgoingAsync.cpp')
| -rw-r--r-- | cpp/src/Ice/OutgoingAsync.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp index 8bb137ef68f..3a158848376 100644 --- a/cpp/src/Ice/OutgoingAsync.cpp +++ b/cpp/src/Ice/OutgoingAsync.cpp @@ -7,6 +7,7 @@ // // ********************************************************************** +#include <IceUtil/DisableWarnings.h> #include <Ice/OutgoingAsync.h> #include <Ice/Object.h> #include <Ice/ConnectionI.h> @@ -524,11 +525,7 @@ IceInternal::OutgoingAsync::__sent(Ice::ConnectionI* connection) void IceInternal::OutgoingAsync::__sent() { -#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug - AsyncResult::__sent(); -#else ::Ice::AsyncResult::__sent(); -#endif if(!_proxy->ice_isTwoway()) { _observer.detach(); @@ -901,11 +898,7 @@ IceInternal::BatchOutgoingAsync::__sent(Ice::ConnectionI* connection) void IceInternal::BatchOutgoingAsync::__sent() { -#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug - AsyncResult::__sent(); -#else ::Ice::AsyncResult::__sent(); -#endif } void |