diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-05-06 17:21:30 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-05-06 17:21:30 +0200 |
| commit | 0015b0097b89806b407e38df9399c358a82646f7 (patch) | |
| tree | e07664cfc01e1fe8dbd4a83b88363ef170ab237c /cpp/include | |
| parent | ICE-6484 java exceptions test fails with --cross=js (diff) | |
| download | ice-0015b0097b89806b407e38df9399c358a82646f7.tar.bz2 ice-0015b0097b89806b407e38df9399c358a82646f7.tar.xz ice-0015b0097b89806b407e38df9399c358a82646f7.zip | |
Fixed generated code to not instantiate templates if ICE_STATIC_LIBS is defined, minor WinRT test fixes
Diffstat (limited to 'cpp/include')
| -rw-r--r-- | cpp/include/Ice/GCObject.h | 1 | ||||
| -rw-r--r-- | cpp/include/IceUtil/Config.h | 14 |
2 files changed, 7 insertions, 8 deletions
diff --git a/cpp/include/Ice/GCObject.h b/cpp/include/Ice/GCObject.h index 929b13bc25f..205c19c1f8c 100644 --- a/cpp/include/Ice/GCObject.h +++ b/cpp/include/Ice/GCObject.h @@ -11,7 +11,6 @@ #define ICE_GC_OBJECT_H #include <Ice/Object.h> -#include <Ice/BasicStream.h> #include <IceUtil/MutexPtrLock.h> #include <IceUtil/Mutex.h> diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index c834d1c0c3c..6aa9653f2ee 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -50,7 +50,7 @@ // // Check for C++ 11 support -// +// // For GCC, we recognize --std=c++0x only for GCC version 4.5 and greater, // as C++11 support in prior releases was too limited. // @@ -86,7 +86,7 @@ #endif // -// Support for thread-safe function local static initialization +// Support for thread-safe function local static initialization // (a.k.a. "magic statics") // #if defined(__GNUC__) || defined(__clang__) @@ -94,7 +94,7 @@ #endif // -// Compiler extensions to export and import symbols: see the documentation +// Compiler extensions to export and import symbols: see the documentation // for Visual Studio, Solaris Studio and GCC. // #if defined(_WIN32) @@ -131,14 +131,14 @@ # define ICE_DEPRECATED_API(msg) __declspec(deprecated(msg)) #elif defined(__clang__) # if __has_extension(attribute_deprecated_with_message) -# define ICE_DEPRECATED_API(msg) __attribute__((deprecated(msg))) +# define ICE_DEPRECATED_API(msg) __attribute__((deprecated(msg))) # else # define ICE_DEPRECATED_API(msg) __attribute__((deprecated)) # endif #elif defined(__GNUC__) # if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)) // The message option was introduced in GCC 4.5 -# define ICE_DEPRECATED_API(msg) __attribute__((deprecated(msg))) +# define ICE_DEPRECATED_API(msg) __attribute__((deprecated(msg))) # else # define ICE_DEPRECATED_API(msg) __attribute__((deprecated)) # endif @@ -156,7 +156,7 @@ # ifndef ICE_HAS_WIN32_CONDVAR # define ICE_HAS_WIN32_CONDVAR # endif -# endif +# endif #endif // @@ -206,7 +206,7 @@ class ICE_UTIL_API noncopyable protected: noncopyable() { } - ~noncopyable() { } // May not be virtual! Classes without virtual + ~noncopyable() { } // May not be virtual! Classes without virtual // operations also derive from noncopyable. private: |