diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-07-22 17:09:25 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-07-22 17:09:25 -0400 |
| commit | 752e06b4eb63abb8a30bb958802eaedda72d3806 (patch) | |
| tree | 7c2348544d202c310a55a62629abc4025daa03a5 /cpp/include/Ice/ConnectionAsync.h | |
| parent | Disable VS 2015 update 3 optimizer (diff) | |
| download | ice-752e06b4eb63abb8a30bb958802eaedda72d3806.tar.bz2 ice-752e06b4eb63abb8a30bb958802eaedda72d3806.tar.xz ice-752e06b4eb63abb8a30bb958802eaedda72d3806.zip | |
Added ICE_BUILDING_SRC to make builds
Ice::Dispatcher and Ice::LocalObject are now hidden with C++11
Reworked C++11 exception ice_clone, added ExceptionHelper
+ other C++ cleanups
Diffstat (limited to 'cpp/include/Ice/ConnectionAsync.h')
| -rw-r--r-- | cpp/include/Ice/ConnectionAsync.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/include/Ice/ConnectionAsync.h b/cpp/include/Ice/ConnectionAsync.h index cd1588191f7..ce9fd85e7af 100644 --- a/cpp/include/Ice/ConnectionAsync.h +++ b/cpp/include/Ice/ConnectionAsync.h @@ -10,13 +10,14 @@ #ifndef ICE_CONNECTION_ASYNC_H #define ICE_CONNECTION_ASYNC_H +#ifndef ICE_CPP11_MAPPING + #include <Ice/Connection.h> #include <Ice/Proxy.h> namespace Ice { -#ifndef ICE_CPP11_MAPPING template<class T> class CallbackNC_Connection_flushBatchRequests : public Callback_Connection_flushBatchRequests_Base, public ::IceInternal::OnewayCallbackNC<T> @@ -110,8 +111,8 @@ newCallback_Connection_flushBatchRequests(T* instance, void (T::*excb)(const ::I { return new Callback_Connection_flushBatchRequests<T, CT>(instance, excb, sentcb); } -#endif } #endif +#endif |