diff options
Diffstat (limited to 'cpp/include/IceUtil/Config.h')
| -rw-r--r-- | cpp/include/IceUtil/Config.h | 33 |
1 files changed, 5 insertions, 28 deletions
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index 643408d5c6c..d6e89cdf7fe 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_UTIL_CONFIG_H -#define ICE_UTIL_CONFIG_H +#pragma once // // Endianness @@ -66,7 +65,7 @@ // // TODO: more macros to support IBM Visual Age _Export syntax as well. // -#if defined(__BCPLUSPLUS__) || (defined(_MSC_VER) && !defined(ICE_STATIC_LIBS)) || \ +#if (defined(_MSC_VER) && !defined(ICE_STATIC_LIBS)) || \ (defined(__HP_aCC) && defined(__HP_WINDLL)) # define ICE_DECLSPEC_EXPORT __declspec(dllexport) # define ICE_DECLSPEC_IMPORT __declspec(dllimport) @@ -103,7 +102,7 @@ // TODO: figure out why IceUtil does not compile with _SLTP_DEBUG using // the Intel compiler. // -#if !defined(NDEBUG) && !defined(_STLP_DEBUG) && !defined(__INTEL_COMPILER) && !defined(__BCPLUSPLUS__) +#if !defined(NDEBUG) && !defined(_STLP_DEBUG) && !defined(__INTEL_COMPILER) # define _STLP_DEBUG #endif @@ -199,7 +198,7 @@ private: // // Int64 typedef // -#if defined(__BCPLUSPLUS__) || defined(_MSC_VER) +#ifdef _MSC_VER // // On Windows, long is always 32-bit // @@ -215,7 +214,7 @@ typedef long long Int64; // // ICE_INT64: macro for Int64 literal values // -#if defined(__BCPLUSPLUS__) || defined(_MSC_VER) +#if defined(_MSC_VER) # define ICE_INT64(n) n##i64 #elif defined(ICE_64) # define ICE_INT64(n) n##L @@ -229,25 +228,3 @@ typedef long long Int64; #define ICE_STRING_VERSION "3.4.2" // "A.B.C", with A=major, B=minor, C=patch #define ICE_INT_VERSION 30402 // AABBCC, with AA=major, BB=minor, CC=patch -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) -// -// Dummy class used in work around for bug in C++Builder 2009 -// http://qc.embarcadero/wc/qcmain.aspx?d=71611 -// -namespace IceUtil -{ - -class DummyBCC -{ -public: - - ~DummyBCC() - { - } -}; - -} -#endif - -#endif - |