diff --git a/test/Factory/Factory.cpp b/test/Factory/Factory.cpp index ce46179..b4e6743 100755 --- a/test/Factory/Factory.cpp +++ b/test/Factory/Factory.cpp @@ -293,14 +293,19 @@ int main() cout << endl; cout << endl; - + +#if defined(__BORLANDC__) || defined(_MSC_VER) system("PAUSE"); +#endif return EXIT_SUCCESS; } // $Log$ +// Revision 1.11 2006/01/04 23:54:28 syntheticpp +// remove system(PAUSE) for gcc, Thanks to Lukas Fittl +// // Revision 1.10 2006/01/04 23:45:08 syntheticpp // remove gcc 4.0 warnings, Thanks to Lukas Fittl // diff --git a/test/Function/FunctionTest.cpp b/test/Function/FunctionTest.cpp index 2cdd840..d9720a2 100755 --- a/test/Function/FunctionTest.cpp +++ b/test/Function/FunctionTest.cpp @@ -784,7 +784,9 @@ int test_main(int, char* []) test_implicit(); test_call(); - system("pause"); +#if defined(__BORLANDC__) || defined(_MSC_VER) + system("PAUSE"); +#endif return 0; } diff --git a/test/OrderedStatic/main.cpp b/test/OrderedStatic/main.cpp index 3e6ca24..3f2caf9 100755 --- a/test/OrderedStatic/main.cpp +++ b/test/OrderedStatic/main.cpp @@ -138,7 +138,9 @@ int main() std::cout << "\n"; - system("pause"); +#if defined(__BORLANDC__) || defined(_MSC_VER) + system("PAUSE"); +#endif return 0; } diff --git a/test/RegressionTest/Test.cpp b/test/RegressionTest/Test.cpp index 5219c4d..7cccc64 100755 --- a/test/RegressionTest/Test.cpp +++ b/test/RegressionTest/Test.cpp @@ -62,10 +62,9 @@ int main() { int result = Test::run("Loki Unit Test"); - #if defined(__BORLANDC__) || defined(__GNUC__) || defined(_MSC_VER) - // Stop console window from closing if run from IDE. - system("pause"); - #endif +#if defined(__BORLANDC__) || defined(_MSC_VER) + system("PAUSE"); +#endif return result; } @@ -117,6 +116,9 @@ int main() // $Log$ +// Revision 1.13 2006/01/04 23:54:30 syntheticpp +// remove system(PAUSE) for gcc, Thanks to Lukas Fittl +// // Revision 1.12 2005/10/30 14:22:31 syntheticpp // disable threading because the sdk (windows.h) is not detected automatically by the batch scripts // diff --git a/test/Singleton/DeletableSingleton.cpp b/test/Singleton/DeletableSingleton.cpp index f6a22be..7bee424 100755 --- a/test/Singleton/DeletableSingleton.cpp +++ b/test/Singleton/DeletableSingleton.cpp @@ -71,8 +71,8 @@ int main(int argc, char *argv[]) LogBook::Instance().print("LogClass reinstantiated."); LogBook::Instance().print("Going to terminate program now."); -#if defined(__BORLANDC__) || defined(__GNUC__) || defined(_MSC_VER) - system("pause"); // Stop console window from closing if run from IDE. +#if defined(__BORLANDC__) || defined(_MSC_VER) + system("PAUSE"); #endif return 0; diff --git a/test/Singleton/Dependencies.cpp b/test/Singleton/Dependencies.cpp index 709b332..dcedbde 100755 --- a/test/Singleton/Dependencies.cpp +++ b/test/Singleton/Dependencies.cpp @@ -448,8 +448,8 @@ int main() #endif //#if !defined(_MSC_VER) || (_MSC_VER>=1400) -#if defined(__BORLANDC__) || defined(__GNUC__) || defined(_MSC_VER) - system("pause"); +#if defined(__BORLANDC__) || defined(_MSC_VER) + system("PAUSE"); #endif std::cout << "\nnow leaving main \n"; diff --git a/test/Singleton/Phoenix.cpp b/test/Singleton/Phoenix.cpp index 41b0952..59bdb95 100755 --- a/test/Singleton/Phoenix.cpp +++ b/test/Singleton/Phoenix.cpp @@ -82,8 +82,8 @@ int main(int argc, char* argv[]) SetLongevity(example, 1, &Loki::Private::Deleter::Delete); LogBook::Instance().echo("LogClass now instantiated."); -#if defined(__BORLANDC__) || defined(__GNUC__) || defined(_MSC_VER) - system("pause"); // Stop console window from closing if run from IDE. +#if defined(__BORLANDC__) || defined(_MSC_VER) + system("PAUSE"); #endif return 0; diff --git a/test/SmallObj/SmallObjBench.cpp b/test/SmallObj/SmallObjBench.cpp index 46af2ca..acaa5de 100755 --- a/test/SmallObj/SmallObjBench.cpp +++ b/test/SmallObj/SmallObjBench.cpp @@ -314,10 +314,8 @@ int main() testSize<16,loop>(); testSize<17,loop>(); - -#if defined(__BORLANDC__) || defined(__GNUC__) || defined(_MSC_VER) - // Stop console window from closing if run from IDE. - system("pause"); +#if defined(__BORLANDC__) || defined(_MSC_VER) + system("PAUSE"); #endif return 0; @@ -326,6 +324,9 @@ int main() // ---------------------------------------------------------------------------- // $Log$ +// Revision 1.17 2006/01/04 23:54:30 syntheticpp +// remove system(PAUSE) for gcc, Thanks to Lukas Fittl +// // Revision 1.16 2005/12/08 22:23:33 rich_sposato // Added checks for whether loki's allocator is corrupted. // diff --git a/test/SmallObj/SmallSingleton.cpp b/test/SmallObj/SmallSingleton.cpp index d9a1ca2..bab7ff9 100644 --- a/test/SmallObj/SmallSingleton.cpp +++ b/test/SmallObj/SmallSingleton.cpp @@ -353,8 +353,8 @@ int main() cout << endl << endl; #endif -#if defined(__BORLANDC__) || defined(__GNUC__) || defined(_MSC_VER) - system("pause"); +#if defined(__BORLANDC__) || defined(_MSC_VER) + system("PAUSE"); #endif cout << endl<< endl << "now leaving main" << endl; @@ -366,6 +366,9 @@ int main() // ---------------------------------------------------------------------------- // $Log$ +// Revision 1.12 2006/01/04 23:54:30 syntheticpp +// remove system(PAUSE) for gcc, Thanks to Lukas Fittl +// // Revision 1.11 2005/12/08 21:03:02 rich_sposato // Changed template parameter values for SmallObject allocator. //