diff options
Diffstat (limited to 'cpp/test/Ice')
| -rw-r--r-- | cpp/test/Ice/background/EndpointI.h | 2 | ||||
| -rw-r--r-- | cpp/test/Ice/exceptions/AllTests.cpp | 20 | ||||
| -rw-r--r-- | cpp/test/Ice/objects/AllTests.cpp | 2 | ||||
| -rw-r--r-- | cpp/test/Ice/objects/TestI.cpp | 2 | ||||
| -rw-r--r-- | cpp/test/Ice/proxy/TestAMDI.cpp | 5 | ||||
| -rw-r--r-- | cpp/test/Ice/proxy/TestI.cpp | 5 |
6 files changed, 0 insertions, 36 deletions
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 } |