Index: c/tests/auto_build/testcases/client/cpp/AxisBenchClient.cpp
===================================================================
RCS file: /home/cvspublic/ws-axis/c/tests/auto_build/testcases/client/cpp/AxisBenchClient.cpp,v
retrieving revision 1.23
diff -u -r1.23 AxisBenchClient.cpp
--- c/tests/auto_build/testcases/client/cpp/AxisBenchClient.cpp	15 Jul 2005 15:28:49 -0000	1.23
+++ c/tests/auto_build/testcases/client/cpp/AxisBenchClient.cpp	9 Aug 2005 13:02:56 -0000
@@ -23,7 +23,7 @@
 #else
   #include "sys/timeb.h"
 
-#ifdef Q168440_WORKAROUND
+#if defined(_MSC_VER) && (_MSC_VER < 1300)
   // Bug in MS Visual C++ 6.0. Fixed in Visual C++ .Net version.
   // Cannot print an __int64 number with cout without this overloading
   std::ostream& operator<<(std::ostream& os, __int64 i )
Index: c/tests/auto_build/testcases/client/cpp/AxisBench_TTestClient.cpp
===================================================================
RCS file: /home/cvspublic/ws-axis/c/tests/auto_build/testcases/client/cpp/AxisBench_TTestClient.cpp,v
retrieving revision 1.5
diff -u -r1.5 AxisBench_TTestClient.cpp
--- c/tests/auto_build/testcases/client/cpp/AxisBench_TTestClient.cpp	15 Jul 2005 15:28:49 -0000	1.5
+++ c/tests/auto_build/testcases/client/cpp/AxisBench_TTestClient.cpp	9 Aug 2005 13:02:56 -0000
@@ -34,7 +34,7 @@
         #define RETTYPE DWORD WINAPI
         #define ARGTYPE LPVOID
 
-#ifdef Q168440_WORKAROUND
+#if defined(_MSC_VER) && (_MSC_VER < 1300)
   // Bug in MS Visual C++ 6.0. Fixed in Visual C++ .Net version.
   // Cannot print an __int64 number with cout without this overloading
  std::ostream& operator<<(std::ostream& os, __int64 i )
Index: c/tests/auto_build/testcases/client/cpp/InOutClient.cpp
===================================================================
RCS file: /home/cvspublic/ws-axis/c/tests/auto_build/testcases/client/cpp/InOutClient.cpp,v
retrieving revision 1.7
diff -u -r1.7 InOutClient.cpp
--- c/tests/auto_build/testcases/client/cpp/InOutClient.cpp	15 Jul 2005 15:28:49 -0000	1.7
+++ c/tests/auto_build/testcases/client/cpp/InOutClient.cpp	9 Aug 2005 13:02:56 -0000
@@ -33,7 +33,7 @@
 #include <iostream>
 
 #ifdef WIN32
-#ifdef Q168440_WORKAROUND
+#if defined(_MSC_VER) && (_MSC_VER < 1300)
   // Bug in MS Visual C++ 6.0. Fixed in Visual C++ .Net version.
   // Cannot print an __int64 number with cout without this overloading
   std::ostream& operator<<(std::ostream& os, __int64 i )
Index: c/tests/auto_build/testcases/client/cpp/XSDAttributeClient.cpp
===================================================================
RCS file: /home/cvspublic/ws-axis/c/tests/auto_build/testcases/client/cpp/XSDAttributeClient.cpp,v
retrieving revision 1.6
diff -u -r1.6 XSDAttributeClient.cpp
--- c/tests/auto_build/testcases/client/cpp/XSDAttributeClient.cpp	15 Jul 2005 15:28:49 -0000	1.6
+++ c/tests/auto_build/testcases/client/cpp/XSDAttributeClient.cpp	9 Aug 2005 13:02:56 -0000
@@ -20,7 +20,7 @@
 #include <iostream>
 
 #ifdef WIN32
-#ifdef Q168440_WORKAROUND
+#if defined(_MSC_VER) && (_MSC_VER < 1300)
   // Bug in MS Visual C++ 6.0. Fixed in Visual C++ .Net version.
   // Cannot print an __int64 number with cout without this overloading
   std::ostream& operator<<(std::ostream& os, __int64 i )
Index: c/tests/auto_build/testcases/client/cpp/XSDElementClient.cpp
===================================================================
RCS file: /home/cvspublic/ws-axis/c/tests/auto_build/testcases/client/cpp/XSDElementClient.cpp,v
retrieving revision 1.12
diff -u -r1.12 XSDElementClient.cpp
--- c/tests/auto_build/testcases/client/cpp/XSDElementClient.cpp	15 Jul 2005 15:28:49 -0000	1.12
+++ c/tests/auto_build/testcases/client/cpp/XSDElementClient.cpp	9 Aug 2005 13:02:56 -0000
@@ -46,7 +46,7 @@
 #include <iostream>
 
 #ifdef WIN32
-#ifdef Q168440_WORKAROUND
+#if defined(_MSC_VER) && (_MSC_VER < 1300)
   // Bug in MS Visual C++ 6.0. Fixed in Visual C++ .Net version.
   // Cannot print an __int64 number with cout without this overloading
   std::ostream& operator<<(std::ostream& os, __int64 i )
Index: c/tests/auto_build/testcases/client/cpp/XSDElementNilClient.cpp
===================================================================
RCS file: /home/cvspublic/ws-axis/c/tests/auto_build/testcases/client/cpp/XSDElementNilClient.cpp,v
retrieving revision 1.10
diff -u -r1.10 XSDElementNilClient.cpp
--- c/tests/auto_build/testcases/client/cpp/XSDElementNilClient.cpp	15 Jul 2005 15:28:49 -0000	1.10
+++ c/tests/auto_build/testcases/client/cpp/XSDElementNilClient.cpp	9 Aug 2005 13:02:57 -0000
@@ -46,7 +46,7 @@
 #include <iostream>
 
 #ifdef WIN32
-#ifdef Q168440_WORKAROUND
+#if defined(_MSC_VER) && (_MSC_VER < 1300)
   // Bug in MS Visual C++ 6.0. Fixed in Visual C++ .Net version.
   // Cannot print an __int64 number with cout without this overloading
   std::ostream& operator<<(std::ostream& os, __int64 i )
Index: c/tests/auto_build/testcases/client/cpp/XSD_integerClient.cpp
===================================================================
RCS file: /home/cvspublic/ws-axis/c/tests/auto_build/testcases/client/cpp/XSD_integerClient.cpp,v
retrieving revision 1.2
diff -u -r1.2 XSD_integerClient.cpp
--- c/tests/auto_build/testcases/client/cpp/XSD_integerClient.cpp	15 Jul 2005 15:28:49 -0000	1.2
+++ c/tests/auto_build/testcases/client/cpp/XSD_integerClient.cpp	9 Aug 2005 13:02:57 -0000
@@ -20,7 +20,7 @@
 #include <iostream>
 
 #ifdef WIN32
-#ifdef Q168440_WORKAROUND
+#if defined(_MSC_VER) && (_MSC_VER < 1300)
   // Bug in MS Visual C++ 6.0. Fixed in Visual C++ .Net version.
   // Cannot print an __int64 number with cout without this overloading
   std::ostream& operator<<(std::ostream& os, __int64 i )
Index: c/tests/auto_build/testcases/client/cpp/XSD_longClient.cpp
===================================================================
RCS file: /home/cvspublic/ws-axis/c/tests/auto_build/testcases/client/cpp/XSD_longClient.cpp,v
retrieving revision 1.2
diff -u -r1.2 XSD_longClient.cpp
--- c/tests/auto_build/testcases/client/cpp/XSD_longClient.cpp	15 Jul 2005 15:28:49 -0000	1.2
+++ c/tests/auto_build/testcases/client/cpp/XSD_longClient.cpp	9 Aug 2005 13:02:57 -0000
@@ -20,7 +20,7 @@
 #include <iostream>
 
 #ifdef WIN32
-#ifdef Q168440_WORKAROUND
+#if defined(_MSC_VER) && (_MSC_VER < 1300)
   // Bug in MS Visual C++ 6.0. Fixed in Visual C++ .Net version.
   // Cannot print an __int64 number with cout without this overloading
   std::ostream& operator<<(std::ostream& os, __int64 i )
Index: c/tests/auto_build/testcases/client/cpp/XSD_negativeIntegerClient.cpp
===================================================================
RCS file: /home/cvspublic/ws-axis/c/tests/auto_build/testcases/client/cpp/XSD_negativeIntegerClient.cpp,v
retrieving revision 1.2
diff -u -r1.2 XSD_negativeIntegerClient.cpp
--- c/tests/auto_build/testcases/client/cpp/XSD_negativeIntegerClient.cpp	15 Jul 2005 15:28:49 -0000	1.2
+++ c/tests/auto_build/testcases/client/cpp/XSD_negativeIntegerClient.cpp	9 Aug 2005 13:02:57 -0000
@@ -20,7 +20,7 @@
 #include <iostream>
 
 #ifdef WIN32
-#ifdef Q168440_WORKAROUND
+#if defined(_MSC_VER) && (_MSC_VER < 1300)
   // Bug in MS Visual C++ 6.0. Fixed in Visual C++ .Net version.
   // Cannot print an __int64 number with cout without this overloading
   std::ostream& operator<<(std::ostream& os, unsigned __int64 i )
Index: c/tests/auto_build/testcases/client/cpp/XSD_nonNegativeIntegerClient.cpp
===================================================================
RCS file: /home/cvspublic/ws-axis/c/tests/auto_build/testcases/client/cpp/XSD_nonNegativeIntegerClient.cpp,v
retrieving revision 1.2
diff -u -r1.2 XSD_nonNegativeIntegerClient.cpp
--- c/tests/auto_build/testcases/client/cpp/XSD_nonNegativeIntegerClient.cpp	15 Jul 2005 15:28:49 -0000	1.2
+++ c/tests/auto_build/testcases/client/cpp/XSD_nonNegativeIntegerClient.cpp	9 Aug 2005 13:02:57 -0000
@@ -20,7 +20,7 @@
 #include <iostream>
 
 #ifdef WIN32
-#ifdef Q168440_WORKAROUND
+#if defined(_MSC_VER) && (_MSC_VER < 1300)
   // Bug in MS Visual C++ 6.0. Fixed in Visual C++ .Net version.
   // Cannot print an __int64 number with cout without this overloading
   std::ostream& operator<<(std::ostream& os, unsigned __int64 i )
Index: c/tests/auto_build/testcases/client/cpp/XSD_nonPositiveIntegerClient.cpp
===================================================================
RCS file: /home/cvspublic/ws-axis/c/tests/auto_build/testcases/client/cpp/XSD_nonPositiveIntegerClient.cpp,v
retrieving revision 1.2
diff -u -r1.2 XSD_nonPositiveIntegerClient.cpp
--- c/tests/auto_build/testcases/client/cpp/XSD_nonPositiveIntegerClient.cpp	15 Jul 2005 15:28:49 -0000	1.2
+++ c/tests/auto_build/testcases/client/cpp/XSD_nonPositiveIntegerClient.cpp	9 Aug 2005 13:02:57 -0000
@@ -20,7 +20,7 @@
 #include <iostream>
 
 #ifdef WIN32
-#ifdef Q168440_WORKAROUND
+#if defined(_MSC_VER) && (_MSC_VER < 1300)
   // Bug in MS Visual C++ 6.0. Fixed in Visual C++ .Net version.
   // Cannot print an __int64 number with cout without this overloading
   std::ostream& operator<<(std::ostream& os, unsigned __int64 i )
Index: c/tests/auto_build/testcases/client/cpp/XSD_positiveIntegerClient.cpp
===================================================================
RCS file: /home/cvspublic/ws-axis/c/tests/auto_build/testcases/client/cpp/XSD_positiveIntegerClient.cpp,v
retrieving revision 1.2
diff -u -r1.2 XSD_positiveIntegerClient.cpp
--- c/tests/auto_build/testcases/client/cpp/XSD_positiveIntegerClient.cpp	15 Jul 2005 15:28:49 -0000	1.2
+++ c/tests/auto_build/testcases/client/cpp/XSD_positiveIntegerClient.cpp	9 Aug 2005 13:02:58 -0000
@@ -20,7 +20,7 @@
 #include <iostream>
 
 #ifdef WIN32
-#ifdef Q168440_WORKAROUND
+#if defined(_MSC_VER) && (_MSC_VER < 1300)
   // Bug in MS Visual C++ 6.0. Fixed in Visual C++ .Net version.
   // Cannot print an __int64 number with cout without this overloading
   std::ostream& operator<<(std::ostream& os, unsigned __int64 i )
Index: c/tests/auto_build/testcases/client/cpp/XSD_unsignedLongClient.cpp
===================================================================
RCS file: /home/cvspublic/ws-axis/c/tests/auto_build/testcases/client/cpp/XSD_unsignedLongClient.cpp,v
retrieving revision 1.2
diff -u -r1.2 XSD_unsignedLongClient.cpp
--- c/tests/auto_build/testcases/client/cpp/XSD_unsignedLongClient.cpp	15 Jul 2005 15:28:49 -0000	1.2
+++ c/tests/auto_build/testcases/client/cpp/XSD_unsignedLongClient.cpp	9 Aug 2005 13:02:58 -0000
@@ -20,7 +20,7 @@
 #include <iostream>
 
 #ifdef WIN32
-#ifdef Q168440_WORKAROUND
+#if defined(_MSC_VER) && (_MSC_VER < 1300)
   // Bug in MS Visual C++ 6.0. Fixed in Visual C++ .Net version.
   // Cannot print an __int64 number with cout without this overloading
   std::ostream& operator<<(std::ostream& os, unsigned __int64 i )