diff options
67 files changed, 129 insertions, 662 deletions
diff --git a/.gitignore b/.gitignore index b4f491a3dd6..69830991607 100644 --- a/.gitignore +++ b/.gitignore @@ -59,4 +59,6 @@ vcproj .DS_Store cpp/SDKs cpp/demo/ipch -cpp/demo/Debug
\ No newline at end of file +cpp/demo/Debug + +cpp/test/IceBox/configuration/build.txt
\ No newline at end of file diff --git a/cpp/allTests.py b/cpp/allTests.py index 046dfe586ce..095a203853b 100755 --- a/cpp/allTests.py +++ b/cpp/allTests.py @@ -35,7 +35,7 @@ tests = [ ("Slice/errorDetection", ["once"]), ("Slice/keyword", ["once"]), ("Slice/structure", ["once"]), - ("Ice/properties", ["once", "novc6", "nobcc"]), + ("Ice/properties", ["once", "novc6"]), ("Ice/proxy", ["core"]), ("Ice/operations", ["core"]), ("Ice/exceptions", ["core"]), @@ -67,7 +67,7 @@ tests = [ ("Ice/defaultValue", ["core"]), ("Ice/invoke", ["core", "novc6"]), ("IceSSL/configuration", ["once", "novalgrind"]), # valgrind doesn't work well with openssl - ("IceBox/configuration", ["core", "noipv6", "nobcc", "novc6"]), + ("IceBox/configuration", ["core", "noipv6", "novc6"]), ("Freeze/dbmap", ["once", "novc6"]), ("Freeze/complex", ["once", "novc6"]), ("Freeze/evictor", ["core", "novc6"]), @@ -82,15 +82,15 @@ tests = [ ("FreezeScript/dbmap", ["once", "novc6"]), ("FreezeScript/evictor", ["once", "novc6"]), ("IceGrid/simple", ["service", "novc6"]), - ("IceGrid/fileLock", ["service", "nobcc", "novc6"]), - ("IceGrid/deployer", ["service", "nobcc", "novc6"]), - ("IceGrid/session", ["service", "nobcc", "novc6"]), - ("IceGrid/update", ["service", "nobcc", "novc6"]), - ("IceGrid/activation", ["service", "nobcc", "novc6"]), - ("IceGrid/replicaGroup", ["service", "nobcc", "novc6"]), - ("IceGrid/replication", ["service", "nobcc", "novc6"]), - ("IceGrid/allocation", ["service", "nobcc", "novc6"]), - ("IceGrid/distribution", ["service", "nobcc", "novc6"]), + ("IceGrid/fileLock", ["service", "novc6"]), + ("IceGrid/deployer", ["service", "novc6"]), + ("IceGrid/session", ["service", "novc6"]), + ("IceGrid/update", ["service", "novc6"]), + ("IceGrid/activation", ["service", "novc6"]), + ("IceGrid/replicaGroup", ["service", "novc6"]), + ("IceGrid/replication", ["service", "novc6"]), + ("IceGrid/allocation", ["service", "novc6"]), + ("IceGrid/distribution", ["service", "novc6"]), ("IceGrid/admin", ["service", "novc6"]), ("Glacier2/router", ["service", "novc6"]), ("Glacier2/attack", ["service", "novc6"]), diff --git a/cpp/config/Make.rules.bcc b/cpp/config/Make.rules.bcc deleted file mode 100644 index 7e8afe8a0a9..00000000000 --- a/cpp/config/Make.rules.bcc +++ /dev/null @@ -1,56 +0,0 @@ -# **********************************************************************
-#
-# Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-#
-# This file is included by Make.rules.mak when using Borland C++Builder.
-#
-# The following warnings are suppressed when building Ice:
-#
-# -w-par: W8057 - Parameter is never used
-# -w-lvc: W8031 - Temporary used for parameter
-# -w-rch: W8066 - Unreachable code
-#
-# Ice and Ice applications must be built with multi-threaded support (-tWM)
-# and linked with the multi-threaded runtime library (cw32mti.lib).
-#
-
-CXX = bcc32.exe
-CC = bcc32.exe
-LINK = ilink32.exe
-RC = brc32.exe
-
-BASE = -b
-PREOUT = ,
-PRELIBS = ,,
-PRELIBPATH = -L
-
-SETARGV = wildargs.obj
-
-CPPFLAGS = $(CPPFLAGS) -q -w-par -w-lvc -w-rch -vi- -tWM -c -DNO_STRICT;_NO_VCL;_RTLDLL
-
-!if "$(OPTIMIZE)" == "yes"
-CPPFLAGS = $(CPPFLAGS) -O2 -k- -DNDEBUG
-!else
-CPPFLAGS = $(CPPFLAGS) -Od -v -k -D_DEBUG
-!endif
-
-LDFLAGS = $(LDFLAGS) -L"$(BDS)\lib" -q -Gn -v -x
-
-LD_DLLFLAGS = $(LDFLAGS) -Gi -Tpd c0d32.obj
-LD_EXEFLAGS = $(LDFLAGS) -Tpe c0x32.obj
-
-ICE_OS_LIBS = cw32mti.lib import32.lib
-
-BASELIBS = iceutil$(LIBSUFFIX).lib $(ICE_OS_LIBS)
-LIBS = ice$(LIBSUFFIX).lib $(BASELIBS)
-
-BZIP2_LIBS = libbz2.lib
-DB_LIBS = libdb48.lib
-MCPP_LIBS = mcpp.lib
-ICONV_LIB = libiconv-bcc.lib
diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak index 7173648c14f..3b5b419c8a6 100755 --- a/cpp/config/Make.rules.mak +++ b/cpp/config/Make.rules.mak @@ -28,7 +28,7 @@ prefix = C:\Ice-$(VERSION) #
# Specify your C++ compiler. Supported values are:
-# VC60, VC90, VC90_EXPRESS, VC100, VC100_EXPRESS, BCC2010, VC110, VC110_EXPRESS
+# VC60, VC90, VC90_EXPRESS, VC100, VC100_EXPRESS, VC110, VC110_EXPRESS
#
!if "$(CPP_COMPILER)" == ""
CPP_COMPILER = VC90
@@ -97,13 +97,10 @@ SETARGV = setargv.obj #
# Compiler specific definitions
#
-!if "$(CPP_COMPILER)" == "BCC2010"
-BCPLUSPLUS = yes
-!include $(top_srcdir)/config/Make.rules.bcc
-!elseif "$(CPP_COMPILER)" == "VC60" || \
+!if "$(CPP_COMPILER)" == "VC60" || \
"$(CPP_COMPILER)" == "VC90" || "$(CPP_COMPILER)" == "VC90_EXPRESS" || \
"$(CPP_COMPILER)" == "VC100" || "$(CPP_COMPILER)" == "VC100_EXPRESS" || \
- "$(CPP_COMPILER)" == "VC110" || "$(CPP_COMPILER)" == "VC110_EXPRESS"
+ "$(CPP_COMPILER)" == "VC110" || "$(CPP_COMPILER)" == "VC110_EXPRESS"
!include $(top_srcdir)/config/Make.rules.msvc
! else
!error Invalid setting for CPP_COMPILER: $(CPP_COMPILER)
@@ -113,9 +110,7 @@ BCPLUSPLUS = yes !error CPP_COMPILER: $(CPP_COMPILER) not supported to build Ice for WinRT
!endif
-!if "$(CPP_COMPILER)" == "BCC2010"
-libsuff = \bcc10
-!elseif "$(CPP_COMPILER)" == "VC60"
+!if "$(CPP_COMPILER)" == "VC60"
libsuff = \vc6
UNIQUE_DLL_NAMES = yes
!elseif "$(CPP_COMPILER)" == "VC100" || "$(CPP_COMPILER)" == "VC100_EXPRESS"
@@ -146,11 +141,9 @@ COMPSUFFIX = vc60_ !elseif "$(CPP_COMPILER)" == "VC90" || "$(CPP_COMPILER)" == "VC90_EXPRESS"
COMPSUFFIX = vc90_
!elseif "$(CPP_COMPILER)" == "VC100" || "$(CPP_COMPILER)" == "VC100_EXPRESS"
-COMPSUFFIX = vc100_
+COMPSUFFIX = vc100_
!elseif "$(CPP_COMPILER)" == "VC110" || "$(CPP_COMPILER)" == "VC110_EXPRESS"
COMPSUFFIX = vc110_
-!elseif "$(CPP_COMPILER)" == "BCC2010"
-COMPSUFFIX = bcc10_
!endif
!endif
@@ -301,4 +294,4 @@ clean:: install::
-depend::
\ No newline at end of file +depend::
diff --git a/cpp/demo/Freeze/bench/Client.cpp b/cpp/demo/Freeze/bench/Client.cpp index b86979edd16..2b20779bcf4 100644 --- a/cpp/demo/Freeze/bench/Client.cpp +++ b/cpp/demo/Freeze/bench/Client.cpp @@ -166,7 +166,7 @@ private: Freeze::TransactionHolder txHolder(_connection); for(i = 0; i < _repetitions; ++i) { -#if defined(__BCPLUSPLUS__) || (defined(_MSC_VER) && (_MSC_VER < 1310)) +#if (defined(_MSC_VER) && (_MSC_VER < 1310)) m.put(T::value_type(i, i)); #else m.put(typename T::value_type(i, i)); @@ -269,7 +269,7 @@ private: s2.s = os.str(); s2.s1 = s1; -#if defined(__BCPLUSPLUS__) || (defined(_MSC_VER) && (_MSC_VER < 1310)) +#if (defined(_MSC_VER) && (_MSC_VER < 1310)) m.put(T::value_type(s1, s2)); #else m.put(typename T::value_type(s1, s2)); @@ -350,7 +350,7 @@ private: ostringstream os; os << i; c1->s = os.str(); -#if defined(__BCPLUSPLUS__) || (defined(_MSC_VER) && (_MSC_VER < 1310)) +#if (defined(_MSC_VER) && (_MSC_VER < 1310)) m.put(T::value_type(s1, c1)); #else m.put(typename T::value_type(s1, c1)); @@ -425,7 +425,7 @@ private: Freeze::TransactionHolder txHolder(_connection); for(i = 0; i < _repetitions; ++i) { -#if defined(__BCPLUSPLUS__) || (defined(_MSC_VER) && (_MSC_VER < 1310)) +#if (defined(_MSC_VER) && (_MSC_VER < 1310)) m.put(T::value_type(i, i)); #else m.put(typename T::value_type(i, i)); diff --git a/cpp/demo/Freeze/casino/BankI.h b/cpp/demo/Freeze/casino/BankI.h index ad0e3ba899a..99cd3d6126f 100644 --- a/cpp/demo/Freeze/casino/BankI.h +++ b/cpp/demo/Freeze/casino/BankI.h @@ -54,7 +54,7 @@ private: std::vector<CasinoStore::PersistentBetPrx> getBets(const Ice::ObjectAdapterPtr&) const; -#if (defined(_MSC_VER) && (_MSC_VER < 1300)) || defined(__BCPLUSPLUS__) +#if (defined(_MSC_VER) && (_MSC_VER < 1300)) // // Some compilers don't let local classes access private data members // diff --git a/cpp/demo/Freeze/casino/BetResolver.h b/cpp/demo/Freeze/casino/BetResolver.h index cd441ed2718..5c05b2e44a8 100644 --- a/cpp/demo/Freeze/casino/BetResolver.h +++ b/cpp/demo/Freeze/casino/BetResolver.h @@ -30,7 +30,7 @@ public: int getBetCount() const; -#if (!defined(_MSC_VER) || (_MSC_VER >= 1300)) && (!defined(__BCPLUSPLUS__)) +#if (!defined(_MSC_VER) || (_MSC_VER >= 1300)) // // Some compilers don't let local classes access private members // diff --git a/cpp/demo/Freeze/casino/Server.cpp b/cpp/demo/Freeze/casino/Server.cpp index f84b4b6bca2..d8f1a937d08 100644 --- a/cpp/demo/Freeze/casino/Server.cpp +++ b/cpp/demo/Freeze/casino/Server.cpp @@ -30,7 +30,7 @@ private: map<string, string> createTypeMap(const string&); const string _envName; -#if (defined(_MSC_VER) && (_MSC_VER < 1300)) || defined(__BCPLUSPLUS__) +#if (defined(_MSC_VER) && (_MSC_VER < 1300)) // // Some compilers don't let local classes access private data members // diff --git a/cpp/demo/Freeze/customEvictor/CurrentDatabase.cpp b/cpp/demo/Freeze/customEvictor/CurrentDatabase.cpp index 7d4c613ab60..2800b3991cc 100644 --- a/cpp/demo/Freeze/customEvictor/CurrentDatabase.cpp +++ b/cpp/demo/Freeze/customEvictor/CurrentDatabase.cpp @@ -18,7 +18,7 @@ using namespace IceUtil; // can only create and destroy one CurrentDatabase per process run. // -#if defined(_MSC_VER) || defined(__BCPLUSPLUS__) +#ifdef _MSC_VER #define __thread __declspec(thread) #endif diff --git a/cpp/include/Ice/Handle.h b/cpp/include/Ice/Handle.h index 7ee19c57c6a..1d1703d36c7 100644 --- a/cpp/include/Ice/Handle.h +++ b/cpp/include/Ice/Handle.h @@ -35,17 +35,6 @@ template<typename T> class Handle : public ::IceUtil::HandleBase<T> { public: - -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - // - // C++Builder 2009 does not allow setting Ptr to 0. - // - Handle(int p) - { - assert(p == 0); - this->_ptr = 0; - } -#endif Handle(T* p = 0) { @@ -182,21 +171,13 @@ public: template<class Y> static Handle dynamicCast(const ::IceUtil::HandleBase<Y>& r) { -#ifdef __BCPLUSPLUS__ - return Handle<T>(dynamic_cast<T*>(r._ptr)); -#else return Handle(dynamic_cast<T*>(r._ptr)); -#endif } template<class Y> static Handle dynamicCast(Y* p) { -#ifdef __BCPLUSPLUS__ - return Handle<T>(dynamic_cast<T*>(p)); -#else return Handle(dynamic_cast<T*>(p)); -#endif } void __clearHandleUnsafe() diff --git a/cpp/include/Ice/ProxyHandle.h b/cpp/include/Ice/ProxyHandle.h index 8a271c7e834..b23958d26d5 100644 --- a/cpp/include/Ice/ProxyHandle.h +++ b/cpp/include/Ice/ProxyHandle.h @@ -113,17 +113,6 @@ template<typename T> class ProxyHandle : public ::IceUtil::HandleBase<T> { public: - -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - // - // C++Builder 2009 does not allow setting Prx to 0. - // - ProxyHandle(int p) - { - assert(p == 0); - this->_ptr = 0; - } -#endif ProxyHandle(T* p = 0) { diff --git a/cpp/include/Ice/Stream.h b/cpp/include/Ice/Stream.h index 839ce185b62..e44bb1f31af 100644 --- a/cpp/include/Ice/Stream.h +++ b/cpp/include/Ice/Stream.h @@ -36,9 +36,7 @@ enum StreamTraitType StreamTraitTypeShortEnum, // Enums with up to 32767 enumerators StreamTraitTypeIntEnum, // Enums with more than 32767 enumerators StreamTraitTypeSequence, -#ifndef __BCPLUSPLUS__ // COMPILERFIX: See StreamTrait<vector<bool>> comment below StreamTraitTypeSequenceBool, -#endif StreamTraitTypeDictionary, StreamTraitTypeUserException, StreamTraitTypeUnknown @@ -72,17 +70,12 @@ struct StreamTrait< ::std::vector<T> > // sequences (see StreamReader<StreamTraitTypeSequenceBool>::read // implementation below) // -// COMPILERFIX: BCC2010 doesn't allow use of full specialization over -// partial specialization. -// -#ifndef __BCPLUSPLUS__ template<> struct StreamTrait< ::std::vector<bool> > { static const StreamTraitType type = StreamTraitTypeSequenceBool; static const int minWireSize = 1; }; -#endif template<> struct StreamTrait<UserException> @@ -260,18 +253,6 @@ public: virtual void sliceObjects(bool) = 0; - // - // COMPILERFIX: BCC2010 doesn't allow use of full specialization over - // partial specialization. - // -#ifdef __BCPLUSPLUS__ - void - read(::std::_Vb_reference<unsigned int, int> v) - { - v = readBool(); - } -#endif - ICE_DEPRECATED_API virtual bool readBool() = 0; ICE_DEPRECATED_API virtual Byte readByte() = 0; ICE_DEPRECATED_API virtual Short readShort() = 0; @@ -650,7 +631,6 @@ struct StreamReader<StreamTraitTypeSequence> } }; -#ifndef __BCPLUSPLUS__ // COMPILERFIX: See StreamTrait<vector<bool>> comment above template<> // StreamWriter specialization for sequences of bool struct StreamWriter<StreamTraitTypeSequenceBool> { @@ -685,7 +665,6 @@ struct StreamReader<StreamTraitTypeSequenceBool> } } }; -#endif template<> // StreamWriter specialization for dictionaries. struct StreamWriter<StreamTraitTypeDictionary> diff --git a/cpp/include/IceUtil/AbstractMutex.h b/cpp/include/IceUtil/AbstractMutex.h index 8b757cfa771..c0805160a1e 100644 --- a/cpp/include/IceUtil/AbstractMutex.h +++ b/cpp/include/IceUtil/AbstractMutex.h @@ -35,10 +35,8 @@ class AbstractMutexI : public AbstractMutex, public T { public: -#ifndef __BCPLUSPLUS__ typedef LockT<AbstractMutexI> Lock; typedef TryLockT<AbstractMutexI> TryLock; -#endif virtual void lock() const { @@ -64,10 +62,8 @@ class AbstractMutexReadI : public AbstractMutex, public T { public: -#ifndef __BCPLUSPLUS__ typedef LockT<AbstractMutexReadI> Lock; typedef TryLockT<AbstractMutexReadI> TryLock; -#endif virtual void lock() const { @@ -93,10 +89,8 @@ class AbstractMutexWriteI : public AbstractMutex, public T { public: -#ifndef __BCPLUSPLUS__ typedef LockT<AbstractMutexWriteI> Lock; typedef TryLockT<AbstractMutexWriteI> TryLock; -#endif virtual void lock() const { diff --git a/cpp/include/IceUtil/Cache.h b/cpp/include/IceUtil/Cache.h index b0fd325522b..31d6e7cc460 100644 --- a/cpp/include/IceUtil/Cache.h +++ b/cpp/include/IceUtil/Cache.h @@ -174,7 +174,7 @@ Cache<Key, Value>::pin(const Key& key, const Handle<Value>& obj) std::pair<typename CacheMap::iterator, bool> ir = #endif -#if defined(_MSC_VER) +#ifdef _MSC_VER _map.insert(CacheMap::value_type(key, CacheValue(obj))); #else _map.insert(typename CacheMap::value_type(key, CacheValue(obj))); @@ -228,7 +228,7 @@ Cache<Key, Value>::pinImpl(const Key& key, const Handle<Value>& newObj) std::pair<typename CacheMap::iterator, bool> ir = #endif -#if defined(_MSC_VER) || defined(__BCPLUSPLUS__) +#if defined(_MSC_VER) _map.insert(CacheMap::value_type(key, CacheValue(0))); #else _map.insert(typename CacheMap::value_type(key, CacheValue(0))); diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index 64d101366c3..d6e89cdf7fe 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -65,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) @@ -102,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 @@ -198,7 +198,7 @@ private: // // Int64 typedef // -#if defined(__BCPLUSPLUS__) || defined(_MSC_VER) +#ifdef _MSC_VER // // On Windows, long is always 32-bit // @@ -214,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 @@ -228,23 +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 - diff --git a/cpp/include/IceUtil/FileUtil.h b/cpp/include/IceUtil/FileUtil.h index cad934ca36c..666ea5ec6a7 100644 --- a/cpp/include/IceUtil/FileUtil.h +++ b/cpp/include/IceUtil/FileUtil.h @@ -38,7 +38,7 @@ ICE_UTIL_API bool directoryExists(const std::string&); #ifdef _WIN32 -#if defined(__BCPLUSPLUS__) || (defined(_MSC_VER) && (_MSC_VER < 1300)) +#if (defined(_MSC_VER) && (_MSC_VER < 1300)) typedef struct _stat structstat; #else typedef struct _stat64i32 structstat; diff --git a/cpp/include/IceUtil/Handle.h b/cpp/include/IceUtil/Handle.h index a57dd25b04a..8e75db3bae4 100644 --- a/cpp/include/IceUtil/Handle.h +++ b/cpp/include/IceUtil/Handle.h @@ -146,17 +146,6 @@ template<typename T> class Handle : public HandleBase<T> { public: - -#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) - // - // C++Builder 2009 does not allow setting Ptr to 0. - // - Handle(int p) - { - assert(p == 0); - this->_ptr = 0; - } -#endif Handle(T* p = 0) { @@ -261,21 +250,13 @@ public: template<class Y> static Handle dynamicCast(const HandleBase<Y>& r) { -#ifdef __BCPLUSPLUS__ - return Handle<T>(dynamic_cast<T*>(r._ptr)); -#else return Handle(dynamic_cast<T*>(r._ptr)); -#endif } template<class Y> static Handle dynamicCast(Y* p) { -#ifdef __BCPLUSPLUS__ - return Handle<T>(dynamic_cast<T*>(p)); -#else return Handle(dynamic_cast<T*>(p)); -#endif } }; diff --git a/cpp/include/Slice/Preprocessor.h b/cpp/include/Slice/Preprocessor.h index 444ee12d967..ee58e8f312c 100644 --- a/cpp/include/Slice/Preprocessor.h +++ b/cpp/include/Slice/Preprocessor.h @@ -12,9 +12,6 @@ #include <IceUtil/Shared.h> #include <IceUtil/Handle.h> #include <vector> -#ifdef __BCPLUSPLUS__ -# include <stdio.h> -#endif #ifndef SLICE_API # ifdef SLICE_API_EXPORTS diff --git a/cpp/src/Freeze/EvictorI.h b/cpp/src/Freeze/EvictorI.h index 671603d106b..bbfae83a260 100755 --- a/cpp/src/Freeze/EvictorI.h +++ b/cpp/src/Freeze/EvictorI.h @@ -217,7 +217,7 @@ protected: } ObjectStore<T>* store = new ObjectStore<T>(facet, facetType,_createDb, this, storeIndices, populateEmptyIndices); -#if defined(__BCPLUSPLUS__) || (defined(_MSC_VER) && (_MSC_VER < 1300)) +#if (defined(_MSC_VER) && (_MSC_VER < 1300)) _storeMap.insert(StoreMap::value_type(facet, store)); #else _storeMap.insert(typename StoreMap::value_type(facet, store)); @@ -232,7 +232,7 @@ protected: { facet = ""; } -#if defined(__BCPLUSPLUS__) || (defined(_MSC_VER) && (_MSC_VER < 1300)) +#if (defined(_MSC_VER) && (_MSC_VER < 1300)) std::pair<StoreMap::iterator, bool> ir = _storeMap.insert(StoreMap::value_type(facet, 0)); #elif (defined(_MSC_VER) && (_MSC_VER >= 1600)) @@ -278,7 +278,7 @@ protected: } os = new ObjectStore<T>(facet, facetType, true, this); -#if defined(__BCPLUSPLUS__) || (defined(_MSC_VER) && (_MSC_VER < 1300)) +#if (defined(_MSC_VER) && (_MSC_VER < 1300)) _storeMap.insert(StoreMap::value_type(facet, os)); #else _storeMap.insert(typename StoreMap::value_type(facet, os)); diff --git a/cpp/src/Freeze/ObjectStore.h b/cpp/src/Freeze/ObjectStore.h index 2a3739379de..189edfe0017 100644 --- a/cpp/src/Freeze/ObjectStore.h +++ b/cpp/src/Freeze/ObjectStore.h @@ -93,14 +93,7 @@ class ObjectStore : public ObjectStoreBase, public IceUtil::Cache<Ice::Identity, { } -#ifdef __BCPLUSPLUS__ - bool load(const Ice::Identity& ident, const TransactionIPtr& trans, ObjectRecord& rec) - { - return ObjectStoreBase::load(ident, trans, rec); - } -#else using ObjectStoreBase::load; -#endif typedef IceUtil::Cache<Ice::Identity, T> Cache; diff --git a/cpp/src/Freeze/SharedDbEnv.cpp b/cpp/src/Freeze/SharedDbEnv.cpp index 9765aefd56d..8da91a02793 100644 --- a/cpp/src/Freeze/SharedDbEnv.cpp +++ b/cpp/src/Freeze/SharedDbEnv.cpp @@ -89,10 +89,8 @@ dbErrCallback(const char* prefix, char* msg) out << "DbEnv \"" << env->getEnvName() << "\": " << msg; } -#ifndef __BCPLUSPLUS__ // COMPILERFIX namespace { -#endif Mutex* mapMutex = 0; Mutex* refCountMutex = 0; @@ -119,9 +117,7 @@ public: Init init; -#ifndef __BCPLUSPLUS__ // COMPILERFIX } -#endif typedef map<MapKey, Freeze::SharedDbEnv*> SharedDbEnvMap; SharedDbEnvMap* sharedDbEnvMap; diff --git a/cpp/src/FreezeScript/DumpDB.cpp b/cpp/src/FreezeScript/DumpDB.cpp index 13d8e1554bf..5472b1d50a8 100755 --- a/cpp/src/FreezeScript/DumpDB.cpp +++ b/cpp/src/FreezeScript/DumpDB.cpp @@ -629,8 +629,7 @@ run(const Ice::StringSeq& originalArgs, const Ice::CommunicatorPtr& communicator return status; } -//COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. -#if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) +#ifdef _WIN32 int wmain(int argc, wchar_t* argv[]) diff --git a/cpp/src/FreezeScript/transformdb.cpp b/cpp/src/FreezeScript/transformdb.cpp index 7d8573fe09d..6a6bd5fe7f5 100755 --- a/cpp/src/FreezeScript/transformdb.cpp +++ b/cpp/src/FreezeScript/transformdb.cpp @@ -928,8 +928,7 @@ run(const Ice::StringSeq& originalArgs, const Ice::CommunicatorPtr& communicator return status; } -//COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. -#if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) +#ifdef _WIN32 int wmain(int argc, wchar_t* argv[]) diff --git a/cpp/src/Glacier2/Glacier2Router.cpp b/cpp/src/Glacier2/Glacier2Router.cpp index b5d38c7c642..93af7ddb963 100644 --- a/cpp/src/Glacier2/Glacier2Router.cpp +++ b/cpp/src/Glacier2/Glacier2Router.cpp @@ -612,8 +612,7 @@ Glacier2::RouterService::usage(const string& appName) print("Usage: " + appName + " [options]\n" + options); } -//COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. -#if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) +#ifdef _WIN32 int wmain(int argc, wchar_t* argv[]) diff --git a/cpp/src/Ice/ConnectionRequestHandler.cpp b/cpp/src/Ice/ConnectionRequestHandler.cpp index 9a4c75122c0..d7571419139 100644 --- a/cpp/src/Ice/ConnectionRequestHandler.cpp +++ b/cpp/src/Ice/ConnectionRequestHandler.cpp @@ -21,19 +21,7 @@ using namespace IceInternal; ConnectionRequestHandler::ConnectionRequestHandler(const ReferencePtr& reference, const Ice::ObjectPrx& proxy) : RequestHandler(reference) { -// COMPILERFIX: Without the catch/rethrow C++Builder 2007 can get access violations. -#ifdef __BCPLUSPLUS__ - try - { -#endif - _connection = _reference->getConnection(_compress); -#ifdef __BCPLUSPLUS__ - } - catch(const Ice::LocalException&) - { - throw; - } -#endif + _connection = _reference->getConnection(_compress); RouterInfoPtr ri = reference->getRouterInfo(); if(ri) { diff --git a/cpp/src/Ice/DLLMain.cpp b/cpp/src/Ice/DLLMain.cpp index f45db86139a..7a67e55e6d6 100644 --- a/cpp/src/Ice/DLLMain.cpp +++ b/cpp/src/Ice/DLLMain.cpp @@ -16,10 +16,6 @@ extern "C" { BOOL WINAPI -#ifdef __BCPLUSPLUS__ -DllMain(HINSTANCE hDLL, DWORD reason, LPVOID reserved) -{ -#else ice_DLL_Main(HINSTANCE hDLL, DWORD reason, LPVOID reserved) { // @@ -32,7 +28,6 @@ ice_DLL_Main(HINSTANCE hDLL, DWORD reason, LPVOID reserved) return FALSE; } } -#endif if(reason == DLL_PROCESS_ATTACH) { @@ -43,7 +38,6 @@ ice_DLL_Main(HINSTANCE hDLL, DWORD reason, LPVOID reserved) Ice::ImplicitContextI::cleanupThread(); } -#ifndef __BCPLUSPLUS__ // // During DETACH, we must call _CRT_INIT last. // @@ -54,7 +48,6 @@ ice_DLL_Main(HINSTANCE hDLL, DWORD reason, LPVOID reserved) return FALSE; } } -#endif return TRUE; } diff --git a/cpp/src/Ice/DynamicLibrary.cpp b/cpp/src/Ice/DynamicLibrary.cpp index 15c9007cb9b..5b690df5f2b 100644 --- a/cpp/src/Ice/DynamicLibrary.cpp +++ b/cpp/src/Ice/DynamicLibrary.cpp @@ -213,12 +213,7 @@ IceInternal::DynamicLibrary::getSymbol(const string& name) { assert(_hnd != 0); #ifdef _WIN32 -# ifdef __BCPLUSPLUS__ - string newName = "_" + name; - symbol_type result = GetProcAddress(_hnd, newName.c_str()); -# else symbol_type result = GetProcAddress(_hnd, name.c_str()); -# endif #else symbol_type result = dlsym(_hnd, name.c_str()); #endif diff --git a/cpp/src/Ice/Makefile.mak b/cpp/src/Ice/Makefile.mak index b6410234852..9ca40c2236e 100644 --- a/cpp/src/Ice/Makefile.mak +++ b/cpp/src/Ice/Makefile.mak @@ -157,14 +157,6 @@ Ice.res: EventLoggerMsg.rc #EventLoggerMsg.h EventLoggerMsg.rc: EventLoggerMsg.mc
# mc EventLoggerMsg.mc
-!if "$(CPP_COMPILER)" == "BCC2010" & "$(OPTIMIZE)" == "yes"
-#
-# Tests fail if GC.cpp is built with optimizations enabled
-#
-GC.obj: GC.cpp
- $(CXX) /c $(CPPFLAGS) $(CXXFLAGS) -Od GC.cpp
-!endif
-
clean::
-del /q BuiltinSequences.cpp $(HDIR)\BuiltinSequences.h
-del /q CommunicatorF.cpp $(HDIR)\CommunicatorF.h
diff --git a/cpp/src/Ice/Service.cpp b/cpp/src/Ice/Service.cpp index 3a47db215e1..3c5c8df8f85 100644 --- a/cpp/src/Ice/Service.cpp +++ b/cpp/src/Ice/Service.cpp @@ -852,16 +852,7 @@ Ice::Service::main(int argc, char* const argv[], const InitializationData& initi int Ice::Service::main(int& argc, wchar_t* argv[], const InitializationData& initializationData) { -#ifdef __BCPLUSPLUS__ // COMPILER FIX - // - // BCC doesn't see the main overload if we don't create the temp args object here. - // - Ice::StringSeq args = Ice::argsToStringSeq(argc, argv, initializationData.stringConverter); - return main(args, initializationData); -#else return main(Ice::argsToStringSeq(argc, argv, initializationData.stringConverter), initializationData); -#endif - } #endif diff --git a/cpp/src/Ice/ThreadPool.h b/cpp/src/Ice/ThreadPool.h index a3deceff4c2..5d45363a494 100644 --- a/cpp/src/Ice/ThreadPool.h +++ b/cpp/src/Ice/ThreadPool.h @@ -337,7 +337,7 @@ public: // of the event handler. We need to lock the event handler here to call // finishMessage. // -#if defined(__BCPLUSPLUS__) || (defined(_MSC_VER) && (_MSC_VER < 1300)) +#if (defined(_MSC_VER) && (_MSC_VER < 1300)) IceUtil::LockT<T> sync(_mutex); #else IceUtil::LockT<typename T> sync(_mutex); diff --git a/cpp/src/IceBox/Admin.cpp b/cpp/src/IceBox/Admin.cpp index 875ad497aef..89d8512c663 100644 --- a/cpp/src/IceBox/Admin.cpp +++ b/cpp/src/IceBox/Admin.cpp @@ -23,8 +23,7 @@ public: virtual int run(int, char*[]); }; -//COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. -#if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) +#ifdef _WIN32 int wmain(int argc, wchar_t* argv[]) diff --git a/cpp/src/IceBox/Service.cpp b/cpp/src/IceBox/Service.cpp index 0bf9dcf6b08..5f04478359d 100644 --- a/cpp/src/IceBox/Service.cpp +++ b/cpp/src/IceBox/Service.cpp @@ -136,8 +136,7 @@ IceBox::IceBoxService::usage(const string& appName) print("Usage: " + appName + " [options]\n" + options); } -//COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. -#if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) +#ifdef _WIN32 int wmain(int argc, wchar_t* argv[]) diff --git a/cpp/src/IceGrid/Client.cpp b/cpp/src/IceGrid/Client.cpp index 7b32674b6fe..1b38c97dfbe 100644 --- a/cpp/src/IceGrid/Client.cpp +++ b/cpp/src/IceGrid/Client.cpp @@ -183,8 +183,7 @@ interruptCallback(int signal) } } -//COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. -#if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) +#ifdef _WIN32 int wmain(int argc, wchar_t* argv[]) diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp index 91d1345ecfd..0c26b17ceda 100644 --- a/cpp/src/IceGrid/IceGridNode.cpp +++ b/cpp/src/IceGrid/IceGridNode.cpp @@ -833,8 +833,7 @@ NodeService::usage(const string& appName) print("Usage: " + appName + " [options]\n" + options); } -//COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. -#if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) +#ifdef _WIN32 int wmain(int argc, wchar_t* argv[]) diff --git a/cpp/src/IceGrid/IceGridRegistry.cpp b/cpp/src/IceGrid/IceGridRegistry.cpp index 979e6a9331a..5bb1e4374dd 100644 --- a/cpp/src/IceGrid/IceGridRegistry.cpp +++ b/cpp/src/IceGrid/IceGridRegistry.cpp @@ -201,8 +201,7 @@ RegistryService::usage(const string& appName) print("Usage: " + appName + " [options]\n" + options); } -//COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. -#if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) +#ifdef _WIN32 int wmain(int argc, wchar_t* argv[]) diff --git a/cpp/src/IcePatch2/Calc.cpp b/cpp/src/IcePatch2/Calc.cpp index e6c4c470e6e..549a07f2659 100755 --- a/cpp/src/IcePatch2/Calc.cpp +++ b/cpp/src/IcePatch2/Calc.cpp @@ -111,8 +111,7 @@ usage(const string& appName) ; } -//COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. -#if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) +#ifdef _WIN32 int wmain(int argc, wchar_t* argv[]) diff --git a/cpp/src/IcePatch2/Client.cpp b/cpp/src/IcePatch2/Client.cpp index 4fdad194b8a..e8ea78897b2 100644 --- a/cpp/src/IcePatch2/Client.cpp +++ b/cpp/src/IcePatch2/Client.cpp @@ -326,8 +326,7 @@ Client::usage(const string& appName) cerr << options << endl; } -//COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. -#if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) +#ifdef _WIN32 int wmain(int argc, wchar_t* argv[]) diff --git a/cpp/src/IcePatch2/Server.cpp b/cpp/src/IcePatch2/Server.cpp index b7a871719fd..7bdc7376629 100644 --- a/cpp/src/IcePatch2/Server.cpp +++ b/cpp/src/IcePatch2/Server.cpp @@ -213,18 +213,8 @@ IcePatch2::PatcherService::usage(const string& appName) #ifdef _WIN32 -//COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. -#ifdef __BCCPLUSPLUS__ - -int -main(int argc, char* argv[]) - -#else - int wmain(int argc, wchar_t* argv[]) - -#endif { IcePatch2::PatcherService svc; int status = EXIT_FAILURE; diff --git a/cpp/src/IcePatch2Lib/Util.cpp b/cpp/src/IcePatch2Lib/Util.cpp index ad3cfc797eb..3f5713be7c1 100755 --- a/cpp/src/IcePatch2Lib/Util.cpp +++ b/cpp/src/IcePatch2Lib/Util.cpp @@ -492,51 +492,13 @@ IcePatch2::readDirectory(const string& pa) StringSeq result; const wstring fs = IceUtil::stringToWstring(simplify(path + "/*")); -# ifdef __BCPLUSPLUS__ - struct _wffblk data; - int h = _wfindfirst(fs.c_str(), &data, FA_DIREC); - if(h == -1) - { - if(_doserrno == ENMFILE) - { - return result; - } - throw "cannot read directory `" + path + "':\n" + IceUtilInternal::lastErrorToString(); - } - - - while(true) - { - string name = IceUtil::wstringToString(data.ff_name); - assert(!name.empty()); - - if(name != ".." && name != ".") - { - result.push_back(name); - } - - if(_wfindnext(&data) == -1) - { - if(errno == ENOENT) - { - break; - } - - string ex = "cannot read directory `" + path + "':\n" + IceUtilInternal::lastErrorToString(); - _wfindclose(&data); - throw ex; - } - } - - _wfindclose(&data); -# else struct _wfinddata_t data; -# if defined(_MSC_VER) && (_MSC_VER < 1300) +# if defined(_MSC_VER) && (_MSC_VER < 1300) long h = _wfindfirst(fs.c_str(), &data); -# else +# else intptr_t h = _wfindfirst(fs.c_str(), &data); -# endif +# endif if(h == -1) { throw "cannot read directory `" + path + "':\n" + IceUtilInternal::lastErrorToString(); @@ -566,7 +528,6 @@ IcePatch2::readDirectory(const string& pa) } _findclose(h); -# endif sort(result.begin(), result.end()); return result; @@ -729,54 +690,6 @@ IcePatch2::decompressFile(const string& pa) throw "cannot open `" + pathBZ2 + "' for reading:\n" + IceUtilInternal::lastErrorToString(); } -#ifdef __BCPLUSPLUS__ - // - // The BZ2_bzReadOpen/BZ2_bzRead/BZ2_bzReadClose functions fail with BCC - // - IceUtilInternal::structstat buf; - if(IceUtilInternal::stat(pathBZ2, &buf) == -1) - { - throw "cannot stat `" + pathBZ2 + "':\n" + IceUtilInternal::lastErrorToString(); - } - - ByteSeq compressedBytes(buf.st_size); - if(fread(&compressedBytes[0], buf.st_size, 1, stdioFileBZ2) != 1) - { - throw "cannot read from `" + pathBZ2 + "':\n" + IceUtilInternal::lastErrorToString(); - } - - ByteSeq uncompressedBytes; - unsigned int uncompressedLen = buf.st_size * 2; - while(true) - { - uncompressedBytes.resize(uncompressedLen); - int bzError = BZ2_bzBuffToBuffDecompress(&uncompressedBytes[0], &uncompressedLen, &compressedBytes[0], - buf.st_size, 0, 0); - if(bzError == BZ_OK) - { - break; - } - else if(bzError == BZ_OUTBUFF_FULL) - { - uncompressedLen *= 2; - continue; - } - else - { - string ex = "BZ2_bzBuffToBuffDecompress failed"; - if(bzError == BZ_IO_ERROR) - { - ex += string(": ") + IceUtilInternal::lastErrorToString(); - } - throw ex; - } - } - - if(fwrite(&uncompressedBytes[0], uncompressedLen, 1, fp) != 1) - { - throw "cannot write to `" + path + "':\n" + IceUtilInternal::lastErrorToString(); - } -#else bzFile = BZ2_bzReadOpen(&bzError, stdioFileBZ2, 0, 0, 0, 0); if(bzError != BZ_OK) { @@ -830,7 +743,6 @@ IcePatch2::decompressFile(const string& pa) } throw ex; } -#endif } catch(...) { @@ -1021,66 +933,12 @@ getFileInfoSeqInt(const string& basePath, const string& relPath, int compress, G if(buf.st_size != 0) { -#ifdef __BCPLUSPLUS__ - // - // The BZ2_bzWriteOpen/BZ2_bzWrite/BZ2_bzWriteClose functions fail with BCC - // - if(doCompress) - { - int fd = IceUtilInternal::open(path.c_str(), O_BINARY|O_RDONLY); - if(fd == -1) - { - throw "cannot open `" + path + "' for reading:\n" + IceUtilInternal::lastErrorToString(); - } - - ByteSeq uncompressedBytes(buf.st_size); - - if(read(fd, &uncompressedBytes[0], buf.st_size) == -1) - { - close(fd); - throw "cannot read from `" + path + "':\n" + IceUtilInternal::lastErrorToString(); - } - - unsigned int compressedLen = buf.st_size * 1.01 + 600; - ByteSeq compressedBytes(compressedLen); - - int bzError = BZ2_bzBuffToBuffCompress(&compressedBytes[0], &compressedLen, - &uncompressedBytes[0], buf.st_size, 5, 0, 0); - if(bzError != BZ_OK) - { - string ex = "BZ2_bzBuffToBuffCompress failed"; - if(bzError == BZ_IO_ERROR) - { - ex += string(": ") + IceUtilInternal::lastErrorToString(); - } - close(fd); - throw ex; - } - close(fd); - - const string pathBZ2Temp = path + ".bz2temp"; - - FILE* stdioFile = IceUtilInternal::fopen(pathBZ2Temp, "wb"); - if(fwrite(&compressedBytes[0], compressedLen, 1, stdioFile) != 1) - { - fclose(stdioFile); - throw "cannot write to `" + pathBZ2Temp + "':\n" + IceUtilInternal::lastErrorToString(); - } - fclose(stdioFile); - - rename(pathBZ2Temp, pathBZ2); - - info.size = compressedLen; - } -#endif - int fd = IceUtilInternal::open(path.c_str(), O_BINARY|O_RDONLY); if(fd == -1) { throw "cannot open `" + path + "' for reading:\n" + IceUtilInternal::lastErrorToString(); } -#ifndef __BCPLUSPLUS__ const string pathBZ2Temp = path + ".bz2temp"; FILE* stdioFile = 0; int bzError = 0; @@ -1107,7 +965,6 @@ getFileInfoSeqInt(const string& basePath, const string& relPath, int compress, G throw ex; } } -#endif unsigned int bytesLeft = static_cast<unsigned int>(buf.st_size); while(bytesLeft > 0) @@ -1121,18 +978,16 @@ getFileInfoSeqInt(const string& basePath, const string& relPath, int compress, G #endif == -1) { -#ifndef __BCPLUSPLUS__ if(doCompress) { fclose(stdioFile); } -#endif + IceUtilInternal::close(fd); throw "cannot read from `" + path + "':\n" + IceUtilInternal::lastErrorToString(); } bytesLeft -= static_cast<unsigned int>(bytes.size()); -#ifndef __BCPLUSPLUS__ if(doCompress) { BZ2_bzWrite(&bzError, bzFile, const_cast<Byte*>(&bytes[0]), static_cast<int>(bytes.size())); @@ -1149,14 +1004,12 @@ getFileInfoSeqInt(const string& basePath, const string& relPath, int compress, G throw ex; } } -#endif SHA1_Update(&ctx, reinterpret_cast<const void*>(&bytes[0]), bytes.size()); } IceUtilInternal::close(fd); -#ifndef __BCPLUSPLUS__ if(doCompress) { BZ2_bzWriteClose(&bzError, bzFile, 0, 0, 0); @@ -1182,7 +1035,6 @@ getFileInfoSeqInt(const string& basePath, const string& relPath, int compress, G info.size = static_cast<Int>(bufBZ2.st_size); } -#endif } SHA1_Final(reinterpret_cast<unsigned char*>(&bytesSHA[0]), &ctx); diff --git a/cpp/src/IceStorm/Admin.cpp b/cpp/src/IceStorm/Admin.cpp index 0cd2197dfc6..b0b5a0eb7c4 100644 --- a/cpp/src/IceStorm/Admin.cpp +++ b/cpp/src/IceStorm/Admin.cpp @@ -25,8 +25,7 @@ public: virtual int run(int, char*[]); }; -//COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. -#if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) +#ifdef _WIN32 int wmain(int argc, wchar_t* argv[]) diff --git a/cpp/src/IceStorm/FreezeDB/Migrate.cpp b/cpp/src/IceStorm/FreezeDB/Migrate.cpp index 8647eff1353..0cc861b0339 100644 --- a/cpp/src/IceStorm/FreezeDB/Migrate.cpp +++ b/cpp/src/IceStorm/FreezeDB/Migrate.cpp @@ -34,8 +34,7 @@ private: void v31migrate(const Freeze::ConnectionPtr&, SubscriberMap&); }; -//COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. -#if defined(_WIN32 ) && !defined(__BCPLUSPLUS__) +#ifdef _WIN32 int wmain(int argc, wchar_t* argv[]) diff --git a/cpp/src/IceUtil/FileUtil.cpp b/cpp/src/IceUtil/FileUtil.cpp index 2ecc670051f..0888ff8281c 100644 --- a/cpp/src/IceUtil/FileUtil.cpp +++ b/cpp/src/IceUtil/FileUtil.cpp @@ -22,10 +22,6 @@ # include <io.h> #endif -#ifdef __BCPLUSPLUS__ -# include <dir.h> -#endif - using namespace std; // diff --git a/cpp/src/IceUtil/InputUtil.cpp b/cpp/src/IceUtil/InputUtil.cpp index 530d6dfe494..1b29658afbe 100644 --- a/cpp/src/IceUtil/InputUtil.cpp +++ b/cpp/src/IceUtil/InputUtil.cpp @@ -25,7 +25,7 @@ using namespace IceUtil; namespace IceUtilInternal { -#if defined(__BCPLUSPLUS__) || (defined(_MSC_VER) && (_MSC_VER < 1300)) +#if (defined(_MSC_VER) && (_MSC_VER < 1300)) // // The VC60 runtime does not include _strtoi64, so we provide our own implementation // @@ -177,7 +177,7 @@ Int64 strToInt64(const char* s, char** endptr, int base) { #if defined(_WIN32) -# if defined(__BCPLUSPLUS__) || (defined(_MSC_VER) && (_MSC_VER < 1300)) +# if (defined(_MSC_VER) && (_MSC_VER < 1300)) return strToInt64Impl(s, endptr, base); # else return _strtoi64(s, endptr, base); diff --git a/cpp/src/IceUtil/Time.cpp b/cpp/src/IceUtil/Time.cpp index b830d32412c..585335191e8 100644 --- a/cpp/src/IceUtil/Time.cpp +++ b/cpp/src/IceUtil/Time.cpp @@ -95,13 +95,8 @@ IceUtil::Time::now(Clock clock) if(clock == Realtime) { #ifdef _WIN32 -# if defined(_MSC_VER) struct _timeb tb; _ftime(&tb); -# elif defined(__BCPLUSPLUS__) - struct timeb tb; - ftime(&tb); -# endif return Time(static_cast<Int64>(tb.time) * ICE_INT64(1000000) + tb.millitm * 1000); #else struct timeval tv; @@ -128,13 +123,8 @@ IceUtil::Time::now(Clock clock) } else { -# if defined(_MSC_VER) struct _timeb tb; _ftime(&tb); -# elif defined(__BCPLUSPLUS__) - struct timeb tb; - ftime(&tb); -# endif return Time(static_cast<Int64>(tb.time) * ICE_INT64(1000000) + tb.millitm * 1000); } #elif defined(__hpux) diff --git a/cpp/src/IceXML/Parser.cpp b/cpp/src/IceXML/Parser.cpp index a95287489db..d72164c5c5c 100644 --- a/cpp/src/IceXML/Parser.cpp +++ b/cpp/src/IceXML/Parser.cpp @@ -44,11 +44,7 @@ IceXML::ParserException::ice_name() const void IceXML::ParserException::ice_print(std::ostream& out) const { -#ifdef __BCPLUSPLUS__ - IceUtil::Exception::ice_print(out); -#else Exception::ice_print(out); -#endif if(!_reason.empty()) { out << "\n" << _reason; diff --git a/cpp/src/Slice/Util.cpp b/cpp/src/Slice/Util.cpp index 3afb6a29eb5..c8d98fc400f 100644 --- a/cpp/src/Slice/Util.cpp +++ b/cpp/src/Slice/Util.cpp @@ -15,10 +15,6 @@ #include <unistd.h> // For readlink() -#ifdef __BCPLUSPLUS__ -# include <dir.h> -#endif - using namespace std; using namespace Slice; diff --git a/cpp/src/iceserviceinstall/Install.cpp b/cpp/src/iceserviceinstall/Install.cpp index 2656f7e607a..2c360418ea1 100644 --- a/cpp/src/iceserviceinstall/Install.cpp +++ b/cpp/src/iceserviceinstall/Install.cpp @@ -34,18 +34,8 @@ private: bool _pause; }; -//COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. -#ifdef __BCPLUSPLUS__ - -int -main(int argc, char* argv[]) - -#else - int wmain(int argc, wchar_t* argv[]) - -#endif { Install app; InitializationData id; diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 0d662a1c1f5..084a08944a8 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -6530,18 +6530,6 @@ Slice::Gen::AsyncImplVisitor::visitOperation(const OperationPtr& p) H << nl << "// COMPILERFIX: The using directive avoid compiler warnings with -Woverloaded-virtual"; H << nl << "using ::IceInternal::IncomingAsync::ice_exception;"; H << nl << "virtual void ice_exception(const ::std::exception&);"; - - H.zeroIndent(); - H << nl << "#if defined(__BCPLUSPLUS__)"; - H.restoreIndent(); - H << nl << "// COMPILERFIX: Avoid compiler warnings with C++Builder 2010"; - H << nl << "virtual void ice_exception()"; - H << sb; - H << nl << "::IceInternal::IncomingAsync::ice_exception();"; - H << eb; - H.zeroIndent(); - H << nl << "#endif"; - H.restoreIndent(); } H << eb << ';'; diff --git a/cpp/test/Ice/Makefile.mak b/cpp/test/Ice/Makefile.mak index 4b61e7d7d66..12a0b8186de 100644 --- a/cpp/test/Ice/Makefile.mak +++ b/cpp/test/Ice/Makefile.mak @@ -38,7 +38,7 @@ SUBDIRS = $(SUBDIRS) \ checksum \
stringConverter \
background \
- threadPoolPriority
+ threadPoolPriority \
custom \
properties \
servantLocator \
diff --git a/cpp/test/Ice/info/Makefile.mak b/cpp/test/Ice/info/Makefile.mak index e13d2019e6b..683d8b5d0b8 100644 --- a/cpp/test/Ice/info/Makefile.mak +++ b/cpp/test/Ice/info/Makefile.mak @@ -40,6 +40,7 @@ CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN !if "$(WINRT)" != "yes"
LD_TESTFLAGS = $(LD_EXEFLAGS) $(SETARGV)
+LIBS = $(LIBS) icessl$(LIBSUFFIX).lib
!else
LD_TESTFLAGS = $(LD_DLLFLAGS) /export:dllMain
!endif
diff --git a/cpp/test/IceGrid/distribution/run.py b/cpp/test/IceGrid/distribution/run.py index 5bd5a77abd1..53b01e90a9c 100755 --- a/cpp/test/IceGrid/distribution/run.py +++ b/cpp/test/IceGrid/distribution/run.py @@ -21,11 +21,7 @@ sys.path.append(os.path.join(path[0], "scripts")) import TestUtil, IceGridAdmin def icepatch2Calc(datadir, dirname): - icePatch2Calc = "" - if TestUtil.isBCC2010(): - icePatch2Calc = os.path.join(TestUtil.getServiceDir(), "icepatch2calc") - else: - icePatch2Calc = os.path.join(TestUtil.getCppBinDir(), "icepatch2calc") + icePatch2Calc = os.path.join(TestUtil.getCppBinDir(), "icepatch2calc") commandProc = TestUtil.spawn('"%s" "%s"' % (icePatch2Calc, os.path.join(datadir, dirname))) commandProc.waitTestSuccess() diff --git a/cpp/test/IceGrid/fileLock/run.py b/cpp/test/IceGrid/fileLock/run.py index b3eaad29b32..2b75cd0d533 100755 --- a/cpp/test/IceGrid/fileLock/run.py +++ b/cpp/test/IceGrid/fileLock/run.py @@ -27,7 +27,7 @@ IceGridAdmin.nreplicas = 0 def runIceGridRegistry(): iceGrid = "" - if TestUtil.isBCC2010() or TestUtil.isVC6(): + if TestUtil.isVC6(): iceGrid = os.path.join(TestUtil.getServiceDir(), "icegridregistry") else: iceGrid = os.path.join(TestUtil.getCppBinDir(), "icegridregistry") diff --git a/cpp/test/IceStorm/federation2/run.py b/cpp/test/IceStorm/federation2/run.py index 96a89fb70b0..02439681c4f 100755 --- a/cpp/test/IceStorm/federation2/run.py +++ b/cpp/test/IceStorm/federation2/run.py @@ -20,11 +20,7 @@ if len(path) == 0: sys.path.append(os.path.join(path[0], "scripts")) import TestUtil, IceStormUtil, Expect -iceStormAdmin = "" -if TestUtil.isBCC2010(): - iceStormAdmin = os.path.join(TestUtil.getServiceDir(), "icestormadmin") -else: - iceStormAdmin = os.path.join(TestUtil.getCppBinDir(), "icestormadmin") +iceStormAdmin = os.path.join(TestUtil.getCppBinDir(), "icestormadmin") publisher = os.path.join(os.getcwd(), "publisher") subscriber = os.path.join(os.getcwd(), "subscriber") diff --git a/cpp/test/IceStorm/stress/run.py b/cpp/test/IceStorm/stress/run.py index aa6634d1aaa..fd41399d26b 100755 --- a/cpp/test/IceStorm/stress/run.py +++ b/cpp/test/IceStorm/stress/run.py @@ -20,11 +20,7 @@ if len(path) == 0: sys.path.append(os.path.join(path[0], "scripts")) import TestUtil, IceStormUtil -iceStormAdmin = "" -if TestUtil.isBCC2010(): - iceStormAdmin = os.path.join(TestUtil.getServiceDir(), "icestormadmin") -else: - iceStormAdmin = os.path.join(TestUtil.getCppBinDir(), "icestormadmin") +iceStormAdmin = iceStormAdmin = os.path.join(TestUtil.getServiceDir(), "icestormadmin") publisher = os.path.join(os.getcwd(), "publisher") subscriber = os.path.join(os.getcwd(), "subscriber") diff --git a/cpp/test/IceUtil/inputUtil/Client.cpp b/cpp/test/IceUtil/inputUtil/Client.cpp index 4f649c7e5ae..73543bb4a19 100644 --- a/cpp/test/IceUtil/inputUtil/Client.cpp +++ b/cpp/test/IceUtil/inputUtil/Client.cpp @@ -21,10 +21,7 @@ using namespace std; #define WS " \f\n\r\t\v" -#if defined(__BCPLUSPLUS__) -Int64 Int64Min = -9223372036854775808i64; -Int64 Int64Max = 9223372036854775807i64; -#elif defined(_MSC_VER) +#if defined(_MSC_VER) const Int64 Int64Min = -9223372036854775808i64; const Int64 Int64Max = 9223372036854775807i64; #elif defined(ICE_64) diff --git a/cpp/test/IceUtil/unicode/Client.cpp b/cpp/test/IceUtil/unicode/Client.cpp index 32425cc7454..3f703e0f7f2 100644 --- a/cpp/test/IceUtil/unicode/Client.cpp +++ b/cpp/test/IceUtil/unicode/Client.cpp @@ -23,8 +23,7 @@ using namespace std; // converts these BOMs back and forth. // -//COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications. -#if defined(_WIN32) && !defined(__BCPLUSPLUS__) +#ifdef _WIN32 int wmain(int argc, wchar_t* argv[]) @@ -41,12 +40,7 @@ main(int argc, char* argv[]) if(argc > 1) { #ifdef _WIN32 - -#ifdef __BCPLUSPLUS__ - dir = argv[1]; -#else dir = IceUtil::wstringToString(argv[1]); -#endif dir += "\\"; #else dir = argv[1]; @@ -179,7 +173,7 @@ main(int argc, char* argv[]) cout << "ok" << endl; } -#ifndef __BCPLUSPLUS__ + { cout << "testing UTF-8 filename... "; IceUtilInternal::ifstream fn(dir + "filename.txt"); @@ -251,6 +245,5 @@ main(int argc, char* argv[]) cout << "ok" << endl; } -#endif return EXIT_SUCCESS; } diff --git a/cpp/test/Makefile.mak b/cpp/test/Makefile.mak index 8a7eac2d2f8..88280361582 100644 --- a/cpp/test/Makefile.mak +++ b/cpp/test/Makefile.mak @@ -20,12 +20,12 @@ SUBDIRS = Ice SUBDIRS = IceUtil \
Slice \
Ice \
- IceSSL
+ IceSSL \
Glacier2 \
Freeze \
IceStorm \
FreezeScript \
- IceGrid
+ IceGrid \
IceBox
!endif
diff --git a/cpp/test/include/TestCommon.h b/cpp/test/include/TestCommon.h index 02d2adba199..c834907c00f 100644 --- a/cpp/test/include/TestCommon.h +++ b/cpp/test/include/TestCommon.h @@ -19,10 +19,6 @@ #include <cstdlib> -#ifdef __BCPLUSPLUS__ -#include <stdlib.h> -#endif - void inline print(const std::string& msg) { @@ -168,41 +164,41 @@ int mainEntryPoint(int, char**); } -class TestFailedException : public ::Ice::LocalException
-{
-public:
-
- TestFailedException(const char* file, int line) :
- LocalException(file, line)
- {
- }
-
- TestFailedException(const char* file, int line, const ::std::string& r) :
- LocalException(file, line),
- reason(r)
- {
- }
-
- virtual ~TestFailedException() throw()
- {
- }
-
- virtual ::std::string ice_name() const
- {
- return "::TestFailedException";
- }
-
- virtual ::Ice::Exception* ice_clone() const
- {
- return new TestFailedException(*this);
- }
-
- virtual void ice_throw() const
- {
- throw *this;
- }
-
- ::std::string reason;
+class TestFailedException : public ::Ice::LocalException +{ +public: + + TestFailedException(const char* file, int line) : + LocalException(file, line) + { + } + + TestFailedException(const char* file, int line, const ::std::string& r) : + LocalException(file, line), + reason(r) + { + } + + virtual ~TestFailedException() throw() + { + } + + virtual ::std::string ice_name() const + { + return "::TestFailedException"; + } + + virtual ::Ice::Exception* ice_clone() const + { + return new TestFailedException(*this); + } + + virtual void ice_throw() const + { + throw *this; + } + + ::std::string reason; }; void diff --git a/demoscript/Util.py b/demoscript/Util.py index 1e0d8c07490..0bd75b2a057 100644 --- a/demoscript/Util.py +++ b/demoscript/Util.py @@ -94,8 +94,6 @@ def configurePaths(): compiler = "" if os.environ.get("CPP_COMPILER", "") != "": compiler = os.environ["CPP_COMPILER"] - if compiler == "BCC2010": - binDir = binDir + "\\bcc10;" + binDir if compiler == "VC100" or compiler == "VC100_EXPRESS": binDir = os.path.join(binDir, "vc100") @@ -248,7 +246,7 @@ def isNoServices(): config = open(os.path.join(toplevel, "config", "Make.rules.mak"), "r") if config != None: compiler = re.search("CPP_COMPILER[\t\s]*= ([A-Z0-9]*)", config.read()).group(1) - return compiler == "BCC2010" or compiler == "VC60" + return compiler == "VC60" def getMapping(): """Determine the current mapping based on the cwd.""" diff --git a/distribution/bin/makemsi.py b/distribution/bin/makemsi.py index 2234b2aef36..e856f30d8ae 100755 --- a/distribution/bin/makemsi.py +++ b/distribution/bin/makemsi.py @@ -374,7 +374,7 @@ def main(): try: optionList, args = getopt.getopt( sys.argv[1:], "dhil:", [ "help", "clean", "skip-build", "skip-installer", "info", "debug", - "logfile", "vc60", "vc80", "vc90", "bcc2007", "bcc2009", "thirdpartyhome=", "sources=", "buildDir=", "pfxfile=", "pfxpassword="]) + "logfile", "vc60", "vc80", "vc90", "thirdpartyhome=", "sources=", "buildDir=", "pfxfile=", "pfxpassword="]) except getopt.GetoptError: usage() sys.exit(2) @@ -411,10 +411,6 @@ def main(): target = 'vc80' elif o == '--vc90': target = 'vc90' - elif o == '--bcc2007': - target = 'bcc2007' - elif o == '--bcc2009': - target = 'bcc2009' elif o == '--pfxfile': os.environ['PFX_FILE'] = a elif o == '--pfxpassword': @@ -486,11 +482,7 @@ def main(): else: defaults['installdir'] = "C:\\Ice-%s-%s" % (iceVersion, target.upper()) - if target == 'bcc2007' or target == 'bcc2009': - defaults['pdb'] = 'tds' - else: - defaults['pdb'] = 'pdb' - + defaults['pdb'] = 'pdb' defaults['OutDir'] = '' defaults['timeStampingURL'] = timeStampingURL @@ -575,12 +567,6 @@ libraries.""" if build: buildIceDists(stageDir, buildDir, iceVersion, target) - if target == "bcc2007": - setDefaultCompiler(os.path.join(buildDir, "release", "Ice-%s" % iceVersion, "cpp", "config", "Make.rules.mak"), "BCC2007") - - if target == "bcc2009": - setDefaultCompiler(os.path.join(buildDir, "release", "Ice-%s" % iceVersion, "cpp", "config", "Make.rules.mak"), "BCC2009") - # # Stage Ice! # diff --git a/distribution/src/common/Make.rules.mak b/distribution/src/common/Make.rules.mak index a922abe9857..749705c93e7 100644 --- a/distribution/src/common/Make.rules.mak +++ b/distribution/src/common/Make.rules.mak @@ -21,7 +21,7 @@ #
# Specify your C++ compiler. Supported values are:
-# VC90, VC90_EXPRESS, VC100, VC100_EXPRESS, BCC2010
+# VC90, VC90_EXPRESS, VC100, VC100_EXPRESS
#
#CPP_COMPILER = VC90
@@ -45,22 +45,15 @@ SETARGV = setargv.obj #
# Compiler specific definitions
#
-!if "$(CPP_COMPILER)" == "BCC2010"
-BCPLUSPLUS = yes
-!include $(top_srcdir)/config/Make.rules.bcc
-!elseif "$(CPP_COMPILER)" == "VC90" || "$(CPP_COMPILER)" == "VC90_EXPRESS" || "$(CPP_COMPILER)" == "VC100" || "$(CPP_COMPILER)" == "VC100_EXPRESS"
+!if "$(CPP_COMPILER)" == "VC90" || "$(CPP_COMPILER)" == "VC90_EXPRESS" || "$(CPP_COMPILER)" == "VC100" || "$(CPP_COMPILER)" == "VC100_EXPRESS"
!include $(top_srcdir)/config/Make.rules.msvc
!elseif "$(CPP_COMPILER)" == ""
-!error Please set CPP_COMPILER to VC90, VC90_EXPRESS, VC100, VC100_EXPRESS, or BCC2010
+!error Please set CPP_COMPILER to VC90, VC90_EXPRESS, VC100, VC100_EXPRESS
!else
!error Invalid setting for CPP_COMPILER: $(CPP_COMPILER)
!endif
-!if "$(CPP_COMPILER)" == "BCC2010"
-libsuff = \bcc10
-!else
libsuff = $(x64suffix)
-!endif
!if "$(OPTIMIZE)" != "yes"
LIBSUFFIX = $(LIBSUFFIX)d
diff --git a/distribution/src/common/README.DEMOS.txt b/distribution/src/common/README.DEMOS.txt index 53e3ad92afd..dbf6572f4bf 100644 --- a/distribution/src/common/README.DEMOS.txt +++ b/distribution/src/common/README.DEMOS.txt @@ -13,18 +13,17 @@ Table of Contents 1. Building and running the C++ demos (Visual Studio 2008SP1 or 2010)
2. Building and running the C++ demos (Visual C++ 2008SP1 or 2010 Express)
- 3. Building and running the C++ demos (C++ Builder 2010)
- 4. Building and running the .NET demos
+ 3. Building and running the .NET demos
- Building the C# demos
- Building the Visual Basic demos
- Running .NET demos
- SSL Notes for the .NET demos
- 5. Building and running the .NET Compact Framework demo
- 6. Building and running the Java demos
- 7. Building and running the Android demos
- 8. Running the Python demos
- 9. Running the Ruby demos
- 10. Building and running the PHP demos
+ 4. Building and running the .NET Compact Framework demo
+ 5. Building and running the Java demos
+ 6. Building and running the Android demos
+ 7. Running the Python demos
+ 8. Running the Ruby demos
+ 9. Building and running the PHP demos
======================================================================
@@ -88,35 +87,7 @@ another command window, type 'client' to start the client. ======================================================================
-3. Building and running the C++ demos (C++ Builder 2010)
-======================================================================
-
-The C++ demos are in the demo directory.
-
-You will need Microsoft NMAKE to build the demos. If you do not
-already have NMAKE installed, you can download it as part of the
-Windows Platform SDK:
-
- http://www.microsoft.com/downloads/details.aspx?FamilyId=E6E1C3DF-A74F-4207-8586-711EBE331CDC&displaylang=en
-
-Open a "RAD Studio Command Prompt" window. If you installed Ice in a
-non-default location, set ICE_HOME as shown below:
-
- > set ICE_HOME=<Ice installation root directory>
-
-Change to the demo directory and run the following commands to build
-the demos:
-
- > set CPP_COMPILER=BCC2010
- > nmake /f Makefile.mak
-
-To run a demo, change to the desired demo subdirectory and review the
-README file if one is present. Type 'server' to start the server. In
-another command window, type 'client' to start the client.
-
-
-======================================================================
-4. Building and running the .NET demos
+3. Building and running the .NET demos
======================================================================
Note that the Visual Studio project files require the Ice Visual
@@ -177,7 +148,7 @@ remove the certificate: ======================================================================
-5. Building and running the .NET Compact Framework demo
+4. Building and running the .NET Compact Framework demo
======================================================================
Note that the Visual Studio project file requires the Ice Visual
@@ -196,7 +167,7 @@ instructions on starting a device emulator and deploying the program. ======================================================================
-6. Building and running the Java demos
+5. Building and running the Java demos
======================================================================
The Java demos are in the demoj directory.
@@ -241,7 +212,7 @@ are necessary. ======================================================================
-7. Building and running the Android demos
+6. Building and running the Android demos
======================================================================
Several sample Android projects are provided in the demoj/android
@@ -275,7 +246,7 @@ subdirectory for further instructions. ======================================================================
-8. Running the Python demos
+7. Running the Python demos
======================================================================
The Python demos are in the demopy directory.
@@ -291,7 +262,7 @@ separate command window, type 'python Client.py' to run the client. ======================================================================
-9. Running the Ruby demos
+8. Running the Ruby demos
======================================================================
The Ruby demos are in the demorb directory.
@@ -318,7 +289,7 @@ Then in a separate command window, start the Ruby client: ======================================================================
-10. Building and running the PHP demos
+9. Building and running the PHP demos
======================================================================
PHP demos are provided in the demophp directory.
diff --git a/perf/src/Ice/raw/cpp/Client.cpp b/perf/src/Ice/raw/cpp/Client.cpp index 4096deffae0..ba90ddab168 100644 --- a/perf/src/Ice/raw/cpp/Client.cpp +++ b/perf/src/Ice/raw/cpp/Client.cpp @@ -90,11 +90,7 @@ const char closeConnectionMsg = 4; const char magic[] = { 0x49, 0x63, 0x65, 0x50 }; // 'I', 'c', 'e', 'P' -#ifdef __BCPLUSPLUS__ -const char requestHdr[headerSize + sizeof(Ice::Int)] = -#else const char requestHdr[] = -#endif { magic[0], magic[1], @@ -110,11 +106,7 @@ const char requestHdr[] = 0, 0, 0, 0 // Request id (placeholder) }; -#ifdef __BCPLUSPLUS__ -const char requestBatchHdr[headerSize + sizeof(Ice::Int)] = -#else const char requestBatchHdr[] = -#endif { magic[0], magic[1], diff --git a/perf/src/Ice/raw/cpp/Server.cpp b/perf/src/Ice/raw/cpp/Server.cpp index 9ca4b1277c9..3fccab79d42 100644 --- a/perf/src/Ice/raw/cpp/Server.cpp +++ b/perf/src/Ice/raw/cpp/Server.cpp @@ -91,11 +91,7 @@ const char closeConnectionMsg = 4; const char magic[] = { 0x49, 0x63, 0x65, 0x50 }; // 'I', 'c', 'e', 'P' -#ifdef __BCPLUSPLUS__ -const char requestHdr[headerSize + sizeof(Ice::Int)] = -#else const char requestHdr[] = -#endif { magic[0], magic[1], @@ -111,11 +107,7 @@ const char requestHdr[] = 0, 0, 0, 0 // Request id (placeholder) }; -#ifdef __BCPLUSPLUS__ -const char requestBatchHdr[headerSize + sizeof(Ice::Int)] = -#else const char requestBatchHdr[] = -#endif { magic[0], magic[1], diff --git a/scripts/IceGridAdmin.py b/scripts/IceGridAdmin.py index e74c304ae6d..7d66516563c 100644 --- a/scripts/IceGridAdmin.py +++ b/scripts/IceGridAdmin.py @@ -71,7 +71,7 @@ def getDefaultLocatorProperty(): def startIceGridRegistry(testdir, dynamicRegistration = False): iceGrid = "" - if TestUtil.isBCC2010() or TestUtil.isVC6(): + if TestUtil.isVC6(): iceGrid = os.path.join(TestUtil.getServiceDir(), "icegridregistry") else: iceGrid = os.path.join(TestUtil.getCppBinDir(), "icegridregistry") @@ -155,7 +155,7 @@ def iceGridNodePropertiesOverride(): def startIceGridNode(testdir): iceGrid = "" - if TestUtil.isBCC2010() or TestUtil.isVC6(): + if TestUtil.isVC6(): iceGrid = os.path.join(TestUtil.getServiceDir(), "icegridnode") else: iceGrid = os.path.join(TestUtil.getCppBinDir(), "icegridnode") diff --git a/scripts/IceStormUtil.py b/scripts/IceStormUtil.py index a6c08ca4903..439611f4666 100644 --- a/scripts/IceStormUtil.py +++ b/scripts/IceStormUtil.py @@ -35,7 +35,7 @@ class IceStormUtil(object): self.toplevel = toplevel self.testdir = testdir self.iceBox = TestUtil.getIceBox() - if TestUtil.isBCC2010() or TestUtil.isVC6(): + if TestUtil.isVC6(): self.iceBoxAdmin = os.path.join(TestUtil.getServiceDir(), "iceboxadmin") self.iceStormAdmin = os.path.join(TestUtil.getServiceDir(), "icestormadmin") else: diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 12ca1e94b38..d25f7434540 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -87,11 +87,6 @@ def getCppCompiler(): return compiler -def isBCC2010(): - if not isWin32(): - return False - return getCppCompiler() == "BCC2010" - def isVC6(): if not isWin32(): return False @@ -197,9 +192,6 @@ def configurePaths(): if isWin32(): libDir = getCppBinDir() - if iceHome and isBCC2010(): - addLdPath(libDir) - libDir = os.path.join(libDir, "bcc10") else: libDir = os.path.join(getIceDir("cpp"), "lib") if iceHome and x64: @@ -646,9 +638,7 @@ def getIceBox(): lang = getDefaultMapping() if lang == "cpp": iceBox = "" - if isBCC2010(): - iceBox = os.path.join(getServiceDir(), "icebox.exe") - elif isWin32(): + if isWin32(): # # Read the build.txt file from the test directory to figure out # how the IceBox service was built ("debug" vs. "release") and @@ -696,7 +686,7 @@ def getGlacier2Router(): return getIceExe("glacier2router") def getIceExe(name): - if isBCC2010() or isVC6(): + if isVC6(): return os.path.join(getServiceDir(), name) else: return os.path.join(getCppBinDir(), name) @@ -1685,10 +1675,6 @@ def runTests(start, expanded, num = 0, script = False): print("%s*** test only supported under Win32%s" % (prefix, suffix)) continue - if isBCC2010() and "nobcc" in config: - print("%s*** test not supported with C++Builder%s" % (prefix, suffix)) - continue - if isVC6() and "novc6" in config: print("%s*** test not supported with VC++ 6.0%s" % (prefix, suffix)) continue |