diff options
author | Dwayne Boone <dwayne@zeroc.com> | 2005-11-21 14:22:42 +0000 |
---|---|---|
committer | Dwayne Boone <dwayne@zeroc.com> | 2005-11-21 14:22:42 +0000 |
commit | 628b55a6cbe4a6285594c0aee7f642d9cda9b49f (patch) | |
tree | 975aaf33f420229c549c96e95c07a9ec9346c70c /cpp/demo/Freeze/bench/Client.cpp | |
parent | #ifdef code that is only used for debugging and doesn't compile on Mac OS X (diff) | |
download | ice-628b55a6cbe4a6285594c0aee7f642d9cda9b49f.tar.bz2 ice-628b55a6cbe4a6285594c0aee7f642d9cda9b49f.tar.xz ice-628b55a6cbe4a6285594c0aee7f642d9cda9b49f.zip |
Enabled indexed tests
Diffstat (limited to 'cpp/demo/Freeze/bench/Client.cpp')
-rw-r--r-- | cpp/demo/Freeze/bench/Client.cpp | 42 |
1 files changed, 40 insertions, 2 deletions
diff --git a/cpp/demo/Freeze/bench/Client.cpp b/cpp/demo/Freeze/bench/Client.cpp index 43a2d4d4610..1bd8cf7b299 100644 --- a/cpp/demo/Freeze/bench/Client.cpp +++ b/cpp/demo/Freeze/bench/Client.cpp @@ -720,7 +720,6 @@ TestApp::run(int argc, char* argv[]) _connection = Freeze::createConnection(communicator(), _envName); cout << "IntIntMap" << endl; - #if defined(_MSC_VER) && (_MSC_VER < 1310) { IntIntMap* dummy = 0; @@ -730,6 +729,16 @@ TestApp::run(int argc, char* argv[]) IntIntMapTest<IntIntMap>("IntIntMap"); #endif + cout << "IntIntMap with index" << endl; +#if defined(_MSC_VER) && (_MSC_VER < 1310) + { + IndexedIntIntMap* dummy = 0; + IntIntMapTest("IndexedIntIntMap", dummy); + } +#else + IntIntMapTest<IndexedIntIntMap>("IndexedIntIntMap"); +#endif + cout <<"Struct1Struct2Map" << endl; #if defined(_MSC_VER) && (_MSC_VER < 1310) { @@ -740,6 +749,16 @@ TestApp::run(int argc, char* argv[]) Struct1Struct2MapTest<Struct1Struct2Map>("Struct1Struct2Map"); #endif + cout <<"Struct1Struct2Map with index" << endl; +#if defined(_MSC_VER) && (_MSC_VER < 1310) + { + IndexedStruct1Struct2Map* dummy = 0; + Struct1Struct2MapTest("IndexedStruct1Struct2Map", dummy); + } +#else + Struct1Struct2MapTest<IndexedStruct1Struct2Map>("IndexedStruct1Struct2Map"); +#endif + cout <<"Struct1Class1Map" << endl; #if defined(_MSC_VER) && (_MSC_VER < 1310) { @@ -750,6 +769,16 @@ TestApp::run(int argc, char* argv[]) Struct1Class1MapTest<Struct1Class1Map>("Struct1Class1Map"); #endif + cout <<"Struct1Class1Map with index" << endl; +#if defined(_MSC_VER) && (_MSC_VER < 1310) + { + IndexedStruct1Class1Map* dummy = 0; + Struct1Class1MapTest("IndexedStruct1Class1Map", dummy); + } +#else + Struct1Class1MapTest<IndexedStruct1Class1Map>("IndexedStruct1Class1Map"); +#endif + MyFactoryPtr factory = new MyFactory(); factory->install(communicator()); @@ -757,7 +786,6 @@ TestApp::run(int argc, char* argv[]) Struct1ObjectMapTest(); cout <<"IntIntMap (read test)" << endl; - #if defined(_MSC_VER) && (_MSC_VER < 1310) { IntIntMap* dummy = 0; @@ -767,6 +795,16 @@ TestApp::run(int argc, char* argv[]) IntIntMapReadTest<IntIntMap>("IntIntMap"); #endif + cout <<"IntIntMap with index(read test)" << endl; +#if defined(_MSC_VER) && (_MSC_VER < 1310) + { + IndexedIntIntMap* dummy = 0; + IntIntMapReadTest("IndexedIntIntMap", dummy); + } +#else + IntIntMapReadTest<IndexedIntIntMap>("IndexedIntIntMap"); +#endif + _connection->close(); return EXIT_SUCCESS; |