diff options
Diffstat (limited to 'cpp/include/Ice/Config.h')
| -rw-r--r-- | cpp/include/Ice/Config.h | 49 |
1 files changed, 2 insertions, 47 deletions
diff --git a/cpp/include/Ice/Config.h b/cpp/include/Ice/Config.h index 5498b0ecd30..ce3212f2d1c 100644 --- a/cpp/include/Ice/Config.h +++ b/cpp/include/Ice/Config.h @@ -11,24 +11,12 @@ #ifndef ICE_CONFIG_H #define ICE_CONFIG_H +#include <IceUtil/Config.h> + #if defined(WIN32) -# include <windows.h> # include <process.h> -// '...' : forcing value to bool 'true' or 'false' (performance warning) -# pragma warning( disable : 4800 ) -// ... identifier was truncated to '255' characters in the debug information -# pragma warning( disable : 4786 ) -// 'this' : used in base member initializer list -# pragma warning( disable : 4355 ) -// class ... needs to have dll-interface to be used by clients of class ... -# pragma warning( disable : 4251 ) -// ... : inherits ... via dominance -# pragma warning( disable : 4250 ) -// non dll-interface class ... used as base for dll-interface class ... -# pragma warning( disable : 4275 ) - # ifdef ICE_API_EXPORTS # define ICE_API __declspec(dllexport) # else @@ -87,7 +75,6 @@ typedef double Double; // Some include files we need almost everywhere // #include <cerrno> -#include <cassert> #include <cstdio> #include <cstring> #include <iostream> @@ -95,32 +82,6 @@ typedef double Double; #include <vector> // -// Ice uses JThreads/C++ -// -#include <JTC/JTC.h> - -// -// By deriving from this class, other classes are made non-copyable -// -namespace Ice -{ - -class noncopyable -{ -protected: - - noncopyable() { } - ~noncopyable() { } // May not be virtual! Classes without virtual operations also derive from noncopyable. - -private: - - noncopyable(const noncopyable&); - const noncopyable& operator=(const noncopyable&); -}; - -} - -// // Define the Ice and IceInternal namespace, so that we can use the following // everywhere in our code: // @@ -130,10 +91,4 @@ private: namespace Ice { } namespace IceInternal { } -// -// The Ice version -// -#define ICE_STRING_VERSION "0.0.1" -#define ICE_INT_VERSION 0x00000001 - #endif |