remove VC6 support

13 files changed, 2 insertions, 88 deletions

diff --git a/cpp/test/Freeze/complex/Parser.cpp b/cpp/test/Freeze/complex/Parser.cpp
index 2c1a6341d76..3bbb5d64873 100644
--- a/cpp/test/Freeze/complex/Parser.cpp
+++ b/cpp/test/Freeze/complex/Parser.cpp
@@ -69,12 +69,7 @@ Parser::getInput(char* buf, int& result, int maxSize)
 {
     if(!_buf.empty())
     {
-#if defined(_MSC_VER) && _MSC_VER < 1500 && !defined(_STLP_MSVC)
-        // COMPILERBUG: Visual C++ defines min and max as macros
-        result = _MIN(maxSize, static_cast<int>(_buf.length()));
-#else
         result = min(maxSize, static_cast<int>(_buf.length()));
-#endif
         strncpy(buf, _buf.c_str(), result);
         _buf.erase(0, result);
     }
diff --git a/cpp/test/Ice/background/EndpointI.h b/cpp/test/Ice/background/EndpointI.h
index 69684fa865f..da8b5d7a726 100644
--- a/cpp/test/Ice/background/EndpointI.h
+++ b/cpp/test/Ice/background/EndpointI.h
@@ -47,9 +47,7 @@ public:
 protected:
 
     virtual Ice::Int hashInit() const;
-#if !defined(_MSC_VER) || _MSC_VER > 1300
     using IceInternal::EndpointI::connectors;
-#endif
     
 private:
 
diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp
index 8fa3b573700..0ebc176792b 100644
--- a/cpp/test/Ice/exceptions/AllTests.cpp
+++ b/cpp/test/Ice/exceptions/AllTests.cpp
@@ -1110,10 +1110,6 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
         test(false);
     }
 
-#if (!defined(_MSC_VER) || _MSC_VER >= 1300)
-//
-// With VC6 SP5, there is no way to call ::A::__write from ::Mod::A
-//
     try
     {
         thrower->throwModA(1, 2);
@@ -1134,7 +1130,6 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
     {
         test(false);
     }
-#endif
 
     cout << "ok" << endl;
 
@@ -1169,10 +1164,6 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
         test(false);
     }
 
-#if (!defined(_MSC_VER) || _MSC_VER >= 1300)
-//
-// With VC6 SP5, there is no way to call ::A::__write from ::Mod::A
-//
     try
     {
         thrower->throwModA(1, 2);
@@ -1192,7 +1183,6 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
     {
         test(false);
     }
-#endif
 
     cout << "ok" << endl;
 
@@ -1519,16 +1509,11 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
             cb->check();
         }
 
-#if (!defined(_MSC_VER) || _MSC_VER >= 1300)
-//
-// With VC6 SP5, there is no way to call ::A::__write from ::Mod::A
-//
         {
             AMI_Thrower_throwModAIPtr cb = new AMI_Thrower_throwModAI;
             thrower->throwModA_async(cb, 1, 2);
             cb->check();
         }
-#endif
 
         cout << "ok" << endl;
 
@@ -1673,10 +1658,6 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
             cb->check();
         }
 
-#if (!defined(_MSC_VER) || _MSC_VER >= 1300)
-//
-// With VC6 SP5, there is no way to call ::A::__write from ::Mod::A
-//
         {
             CallbackPtr cb = new Callback;
             Callback_Thrower_throwModAPtr callback = 
@@ -1684,7 +1665,6 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
             thrower->begin_throwModA(1, 2, callback);
             cb->check();
         }
-#endif
 
         cout << "ok" << endl;
 
diff --git a/cpp/test/Ice/objects/AllTests.cpp b/cpp/test/Ice/objects/AllTests.cpp
index ae99c434b49..9945eee5735 100644
--- a/cpp/test/Ice/objects/AllTests.cpp
+++ b/cpp/test/Ice/objects/AllTests.cpp
@@ -190,14 +190,12 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
     initial->setI(h);
     cout << "ok" << endl;
 
-#if !defined(_MSC_VER) || (_MSC_VER >= 1300)
     if(!collocated)
     {
         cout << "testing UnexpectedObjectException... " << flush;
         testUOE(communicator);
         cout << "ok" << endl;
     }
-#endif
 
     return initial;
 }
diff --git a/cpp/test/Ice/objects/TestI.cpp b/cpp/test/Ice/objects/TestI.cpp
index fdb272dea7c..648dd4df0cf 100644
--- a/cpp/test/Ice/objects/TestI.cpp
+++ b/cpp/test/Ice/objects/TestI.cpp
@@ -228,7 +228,6 @@ UnexpectedObjectExceptionTestI::ice_invoke(const std::vector<Ice::Byte>&,
                                            std::vector<Ice::Byte>& outParams,
                                            const Ice::Current& current)
 {
-#if !defined(_MSC_VER) || (_MSC_VER >= 1300)
     Ice::CommunicatorPtr communicator = current.adapter->getCommunicator();
     Ice::OutputStreamPtr out = Ice::createOutputStream(communicator);
     out->startEncapsulation();
@@ -237,6 +236,5 @@ UnexpectedObjectExceptionTestI::ice_invoke(const std::vector<Ice::Byte>&,
     out->writePendingObjects();
     out->endEncapsulation();
     out->finished(outParams);
-#endif
     return true;
 }
diff --git a/cpp/test/Ice/proxy/TestAMDI.cpp b/cpp/test/Ice/proxy/TestAMDI.cpp
index 5eda8e63fd2..355f4bd1e46 100644
--- a/cpp/test/Ice/proxy/TestAMDI.cpp
+++ b/cpp/test/Ice/proxy/TestAMDI.cpp
@@ -38,10 +38,5 @@ bool
 MyDerivedClassI::ice_isA(const std::string& s, const Ice::Current& current) const
 {
     _ctx = current.ctx;
-
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
-    return MyDerivedClass::ice_isA(s, current);
-#else
     return Test::MyDerivedClass::ice_isA(s, current);
-#endif
 }
diff --git a/cpp/test/Ice/proxy/TestI.cpp b/cpp/test/Ice/proxy/TestI.cpp
index fbc9219bee1..aad4b0f5e62 100644
--- a/cpp/test/Ice/proxy/TestI.cpp
+++ b/cpp/test/Ice/proxy/TestI.cpp
@@ -39,10 +39,5 @@ bool
 MyDerivedClassI::ice_isA(const std::string& s, const Ice::Current& current) const
 {
     _ctx = current.ctx;
-    
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
-    return MyDerivedClass::ice_isA(s, current);
-#else
     return Test::MyDerivedClass::ice_isA(s, current);
-#endif
 }
diff --git a/cpp/test/IceGrid/Makefile.mak b/cpp/test/IceGrid/Makefile.mak
index d9d6231de98..074f01af249 100644
--- a/cpp/test/IceGrid/Makefile.mak
+++ b/cpp/test/IceGrid/Makefile.mak
@@ -13,10 +13,7 @@ top_srcdir	= ..\..
 

 

 SUBDIRS		= simple \

-		  admin

-

-!if "$(BCPLUSPLUS)" != "yes" && "$(CPP_COMPILER)" != "VC60"

-SUBDIRS		= $(SUBDIRS) \

+		  admin \

 		  activation \

 		  allocation \

 		  deployer \

@@ -25,7 +22,6 @@ SUBDIRS		= $(SUBDIRS) \
 		  replication \

 		  session \

 		  update

-!endif

 

 $(EVERYTHING)::

 	@for %i in ( $(SUBDIRS) ) do \

diff --git a/cpp/test/IceGrid/deployer/Server.cpp b/cpp/test/IceGrid/deployer/Server.cpp
index 6bdfe03bb4a..0031b16770d 100644
--- a/cpp/test/IceGrid/deployer/Server.cpp
+++ b/cpp/test/IceGrid/deployer/Server.cpp
@@ -79,12 +79,6 @@ main(int argc, char* argv[])
     }
 
 #if defined(_WIN32)
-
-    //
-    // COMPILERFIX: Unicode environments don't work well with VC6 applications,
-    // for some reasons, the wstring returned by _wgetenv are incorrect.
-    //
-#if (!defined(_MSC_VER) || _MSC_VER >= 1300)
     wchar_t* value2 = _wgetenv(L"MY_ENV_UNICODE_VARIABLE");
     test(value2 != 0 && wstring(value2) == IceUtil::stringToWstring(unicodeVar));
 
@@ -94,7 +88,6 @@ main(int argc, char* argv[])
     // Environment variables are case insensitive on Windows.
     wchar_t* value4 = _wgetenv(IceUtil::stringToWstring(varname1).c_str());
     test(value4 != 0 && wstring(value4) == L"2");
-#endif
 
     char* value5 = getenv("MY_WINDOWS_COMPOSED_VARIABLE");
     test(value5 != 0 && string(value5) == "BAR;12");
diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp
index 68153f7444a..92fc54e957f 100644
--- a/cpp/test/IceSSL/configuration/AllTests.cpp
+++ b/cpp/test/IceSSL/configuration/AllTests.cpp
@@ -171,11 +171,6 @@ createServerProps(const Ice::PropertiesPtr& defaultProperties, const string& def
     return result;
 }
 
-#if defined(_MSC_VER) && (_MSC_VER < 1300) 
-void allTests2(const CommunicatorPtr&, const Ice::PropertiesPtr&, const string&, const string&, const string&,
-               const Test::ServerFactoryPrx&);
-#endif
-
 void
 allTests(const CommunicatorPtr& communicator, const string& testDir)
 {
@@ -1039,23 +1034,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir)
         fact->destroyServer(server);
         comm->destroy();
     }
-#if defined(_MSC_VER) && (_MSC_VER < 1300) 
-    //
-    // COMPILER FIX: VC60 generates "too many exception handler states" if single function
-    //
-    allTests2(communicator, defaultProperties, defaultDir, defaultHost, factoryRef, factory);
-}
-
-void
-allTests2(const CommunicatorPtr& communicator,
-          const Ice::PropertiesPtr& defaultProperties,
-          const string& defaultDir,
-          const string& defaultHost,
-          const string& factoryRef,
-          const Test::ServerFactoryPrx& factory)
-{
-    string sep = ";";
-#endif
+    
     {
         //
         // Configure a server with RSA and DSA certificates.
diff --git a/cpp/test/IceUtil/inputUtil/Client.cpp b/cpp/test/IceUtil/inputUtil/Client.cpp
index 73543bb4a19..ae0b00a43c2 100644
--- a/cpp/test/IceUtil/inputUtil/Client.cpp
+++ b/cpp/test/IceUtil/inputUtil/Client.cpp
@@ -210,7 +210,6 @@ main(int, char**)
         test(IceUtilInternal::splitString(":a:b:", ":", ss) && ss.size() == 2 && ss[0] == "a" && ss[1] == "b");
         ss.clear();
 
-#if defined(_MSC_VER) && _MSC_VER >= 1300 // COMPILERBUG: VC++ 6 doesn't like escaped quotes
         test(IceUtilInternal::splitString("\"a\"", ":", ss) && ss.size() == 1 && ss[0] == "a");
         ss.clear();
         test(IceUtilInternal::splitString("\"a\":b", ":", ss) && ss.size() == 2 && ss[0] == "a" && ss[1] == "b");
@@ -221,7 +220,6 @@ main(int, char**)
         ss.clear();
         test(IceUtilInternal::splitString("a=\"a:b\"", ":", ss) && ss.size() == 1 && ss[0] == "a=a:b");
         ss.clear();
-#endif
 
         test(IceUtilInternal::splitString("'a'", ":", ss) && ss.size() == 1 && ss[0] == "a");
         ss.clear();
@@ -230,7 +228,6 @@ main(int, char**)
         test(IceUtilInternal::splitString("\"'a\"", ":", ss) && ss.size() == 1 && ss[0] == "'a");
         ss.clear();
 
-#if defined(_MSC_VER) && _MSC_VER >= 1300 // COMPILERBUG: VC++ 6 doesn't like escaped quotes
         test(IceUtilInternal::splitString("a\\'b", ":", ss) && ss.size() == 1 && ss[0] == "a'b");
         ss.clear();
         test(IceUtilInternal::splitString("'a:b\\'c'", ":", ss) && ss.size() == 1 && ss[0] == "a:b'c");
@@ -243,8 +240,6 @@ main(int, char**)
         ss.clear();
         test(IceUtilInternal::splitString("\"a:b'c\"", ":", ss) && ss.size() == 1 && ss[0] == "a:b'c");
         ss.clear();
-#endif
-
         test(!IceUtilInternal::splitString("a\"b", ":", ss));
     }
     cout << "ok" << endl;
diff --git a/cpp/test/IceUtil/unicode/Client.cpp b/cpp/test/IceUtil/unicode/Client.cpp
index f05cb7646b7..e2525c1440e 100644
--- a/cpp/test/IceUtil/unicode/Client.cpp
+++ b/cpp/test/IceUtil/unicode/Client.cpp
@@ -207,11 +207,7 @@ main(int argc, char* argv[])
 
         int fd = IceUtilInternal::open(filepath, O_RDONLY);
         test(fd > 0);
-#   if defined(_MSC_VER) && (_MSC_VER >= 1400)
         test(_close(fd) == 0);
-#   else
-        test(close(fd) == 0);
-#   endif
 
         FILE* f = IceUtilInternal::fopen(filepath, "r");
         test(f != 0);
diff --git a/cpp/test/IceUtil/uuid/Client.cpp b/cpp/test/IceUtil/uuid/Client.cpp
index ee717e246af..04e4d7f392a 100644
--- a/cpp/test/IceUtil/uuid/Client.cpp
+++ b/cpp/test/IceUtil/uuid/Client.cpp
@@ -68,11 +68,7 @@ public:
             T item = _func();
 
             IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(staticMutex);
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
-            pair<ItemSet::iterator, bool> ok = _itemSet.insert(item);
-#else
             pair<typename ItemSet::iterator, bool> ok = _itemSet.insert(item);
-#endif
             if(!ok.second)
             {
                 cerr << "******* iteration " << i << endl;