diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-05-06 14:05:41 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-05-06 14:05:41 +0200 |
| commit | d8617dcd8dc79e135be0cc9cc534a43d5b328c0e (patch) | |
| tree | 1ac14bcb49ec34734c90d0c9c719169331b3c68a /cpp/include | |
| parent | ICE-6483 upgrade to gradle 2.4 (diff) | |
| download | ice-d8617dcd8dc79e135be0cc9cc534a43d5b328c0e.tar.bz2 ice-d8617dcd8dc79e135be0cc9cc534a43d5b328c0e.tar.xz ice-d8617dcd8dc79e135be0cc9cc534a43d5b328c0e.zip | |
Fixed ICE-6482: Cleanup WinRT makefiles, other WinRT minor fixes
Diffstat (limited to 'cpp/include')
| -rw-r--r-- | cpp/include/Glacier2/Config.h | 10 | ||||
| -rw-r--r-- | cpp/include/Ice/Exception.h | 4 | ||||
| -rw-r--r-- | cpp/include/Ice/GCObject.h | 1 |
3 files changed, 13 insertions, 2 deletions
diff --git a/cpp/include/Glacier2/Config.h b/cpp/include/Glacier2/Config.h index 9f4efe2b040..b73c1530b5f 100644 --- a/cpp/include/Glacier2/Config.h +++ b/cpp/include/Glacier2/Config.h @@ -28,4 +28,14 @@ # endif #endif +#ifndef GLACIER2_API +# ifdef GLACIER2_API_EXPORTS +# define GLACIER2_API ICE_DECLSPEC_EXPORT +# elif defined(ICE_STATIC_LIBS) +# define GLACIER2_API /**/ +# else +# define GLACIER2_API ICE_DECLSPEC_IMPORT +# endif +#endif + #endif diff --git a/cpp/include/Ice/Exception.h b/cpp/include/Ice/Exception.h index b0446ccc0e4..09cf13ccfd5 100644 --- a/cpp/include/Ice/Exception.h +++ b/cpp/include/Ice/Exception.h @@ -59,10 +59,10 @@ public: virtual void __write(::IceInternal::BasicStream*) const; virtual void __read(::IceInternal::BasicStream*); - + virtual void __write(const OutputStreamPtr&) const; virtual void __read(const InputStreamPtr&); - + virtual bool __usesClasses() const; protected: diff --git a/cpp/include/Ice/GCObject.h b/cpp/include/Ice/GCObject.h index 205c19c1f8c..929b13bc25f 100644 --- a/cpp/include/Ice/GCObject.h +++ b/cpp/include/Ice/GCObject.h @@ -11,6 +11,7 @@ #define ICE_GC_OBJECT_H #include <Ice/Object.h> +#include <Ice/BasicStream.h> #include <IceUtil/MutexPtrLock.h> #include <IceUtil/Mutex.h> |