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/LocalObject.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/LocalObject.h')
| -rw-r--r-- | cpp/include/Ice/LocalObject.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cpp/include/Ice/LocalObject.h b/cpp/include/Ice/LocalObject.h index fd765e04f0a..01f17caf60f 100644 --- a/cpp/include/Ice/LocalObject.h +++ b/cpp/include/Ice/LocalObject.h @@ -10,6 +10,12 @@ #ifndef ICE_LOCAL_OBJECT_H #define ICE_LOCAL_OBJECT_H +#if !defined(ICE_CPP11_MAPPING) || defined(ICE_BUILDING_SRC) +// +// Part of the C++98 mapping, and "internal" definitions when building Ice +// with the C++11 mapping +// + #include <IceUtil/Shared.h> #include <Ice/LocalObjectF.h> @@ -27,3 +33,4 @@ public: } #endif +#endif |