You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2005/07/15 17:28:50 UTC
cvs commit: ws-axis/c/tests/auto_build/testcases/client/cpp AxisBenchClient.cpp AxisBench_TTestClient.cpp InOutClient.cpp XSDAttributeClient.cpp XSDElementClient.cpp XSDElementNilClient.cpp XSD_integerClient.cpp XSD_longClient.cpp XSD_negativeIntegerClient.cpp XSD_nonNegativeIntegerClient.cpp XSD_nonPositiveIntegerClient.cpp XSD_positiveIntegerClient.cpp XSD_unsignedLongClient.cpp
dicka 2005/07/15 08:28:49
Modified: c/build buildTest.xml
c/tests/auto_build/testcases/client/cpp AxisBenchClient.cpp
AxisBench_TTestClient.cpp InOutClient.cpp
XSDAttributeClient.cpp XSDElementClient.cpp
XSDElementNilClient.cpp XSD_integerClient.cpp
XSD_longClient.cpp XSD_negativeIntegerClient.cpp
XSD_nonNegativeIntegerClient.cpp
XSD_nonPositiveIntegerClient.cpp
XSD_positiveIntegerClient.cpp
XSD_unsignedLongClient.cpp
Log:
Resolve problems when compiling tests on MS VC++ 7. Also tested with MS VC++ 6.
Submitted by: John Kelly
Reviewed by: Adrian Dick
Revision Changes Path
1.13 +10 -2 ws-axis/c/build/buildTest.xml
Index: buildTest.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/build/buildTest.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- buildTest.xml 8 Jul 2005 21:31:23 -0000 1.12
+++ buildTest.xml 15 Jul 2005 15:28:49 -0000 1.13
@@ -91,7 +91,11 @@
objdir="${test.directory}" exceptions="true"
outtype="executable" subsystem="console">
<!-- Compilers -->
- <compiler refid="VisualC++"/>
+ <compiler extends="VisualC++">
+ <defineset>
+ <define name="Q168440_WORKAROUND" unless="msvc7" />
+ </defineset>
+ </compiler>
<compiler refid="Linuxgcc"/>
<compiler refid="AIXxlc"/>
<compiler extends="OS400icc">
@@ -121,7 +125,11 @@
objdir="${test.directory}" exceptions="true"
outtype="executable" subsystem="console">
<!-- Compilers -->
- <compiler refid="VisualC++"/>
+ <compiler extends="VisualC++">
+ <defineset>
+ <define name="Q168440_WORKAROUND" unless="msvc7" />
+ </defineset>
+ </compiler>
<compiler refid="Linuxgcc"/>
<compiler refid="AIXxlc"/>
<compiler refid="OS400icc"/>
1.23 +2 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/AxisBenchClient.cpp
Index: AxisBenchClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/AxisBenchClient.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- AxisBenchClient.cpp 11 Jul 2005 16:11:19 -0000 1.22
+++ AxisBenchClient.cpp 15 Jul 2005 15:28:49 -0000 1.23
@@ -23,6 +23,7 @@
#else
#include "sys/timeb.h"
+#ifdef Q168440_WORKAROUND
// 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 )
@@ -32,7 +33,7 @@
os << buf;
return os;
}
-
+#endif
#endif
static bool verbose = false;
1.5 +3 -1 ws-axis/c/tests/auto_build/testcases/client/cpp/AxisBench_TTestClient.cpp
Index: AxisBench_TTestClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/AxisBench_TTestClient.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AxisBench_TTestClient.cpp 25 May 2005 21:46:39 -0000 1.4
+++ AxisBench_TTestClient.cpp 15 Jul 2005 15:28:49 -0000 1.5
@@ -33,6 +33,8 @@
#include "sys/timeb.h"
#define RETTYPE DWORD WINAPI
#define ARGTYPE LPVOID
+
+#ifdef Q168440_WORKAROUND
// 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 )
@@ -42,7 +44,7 @@
os << buf;
return os;
}
-
+#endif
#else
#include <pthread.h>
#include <unistd.h>
1.7 +2 -0 ws-axis/c/tests/auto_build/testcases/client/cpp/InOutClient.cpp
Index: InOutClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/InOutClient.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- InOutClient.cpp 17 Jun 2005 08:11:16 -0000 1.6
+++ InOutClient.cpp 15 Jul 2005 15:28:49 -0000 1.7
@@ -33,6 +33,7 @@
#include <iostream>
#ifdef WIN32
+#ifdef Q168440_WORKAROUND
// 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 )
@@ -43,6 +44,7 @@
return os;
}
#endif
+#endif
#define ARRAYSIZE 2
1.6 +2 -0 ws-axis/c/tests/auto_build/testcases/client/cpp/XSDAttributeClient.cpp
Index: XSDAttributeClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/XSDAttributeClient.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XSDAttributeClient.cpp 6 Jul 2005 15:04:34 -0000 1.5
+++ XSDAttributeClient.cpp 15 Jul 2005 15:28:49 -0000 1.6
@@ -20,6 +20,7 @@
#include <iostream>
#ifdef WIN32
+#ifdef Q168440_WORKAROUND
// 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 )
@@ -38,6 +39,7 @@
return os;
}
#endif
+#endif
int main(int argc, char* argv[])
{
1.12 +2 -0 ws-axis/c/tests/auto_build/testcases/client/cpp/XSDElementClient.cpp
Index: XSDElementClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/XSDElementClient.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XSDElementClient.cpp 12 Jul 2005 17:45:37 -0000 1.11
+++ XSDElementClient.cpp 15 Jul 2005 15:28:49 -0000 1.12
@@ -46,6 +46,7 @@
#include <iostream>
#ifdef WIN32
+#ifdef Q168440_WORKAROUND
// 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 )
@@ -64,6 +65,7 @@
return os;
}
#endif
+#endif
int main(int argc, char* argv[])
{
1.10 +2 -0 ws-axis/c/tests/auto_build/testcases/client/cpp/XSDElementNilClient.cpp
Index: XSDElementNilClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/XSDElementNilClient.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XSDElementNilClient.cpp 5 Jul 2005 14:50:30 -0000 1.9
+++ XSDElementNilClient.cpp 15 Jul 2005 15:28:49 -0000 1.10
@@ -46,6 +46,7 @@
#include <iostream>
#ifdef WIN32
+#ifdef Q168440_WORKAROUND
// 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 )
@@ -64,6 +65,7 @@
return os;
}
#endif
+#endif
int main(int argc, char* argv[])
{
1.2 +2 -0 ws-axis/c/tests/auto_build/testcases/client/cpp/XSD_integerClient.cpp
Index: XSD_integerClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/XSD_integerClient.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XSD_integerClient.cpp 1 Jul 2005 14:24:58 -0000 1.1
+++ XSD_integerClient.cpp 15 Jul 2005 15:28:49 -0000 1.2
@@ -20,6 +20,7 @@
#include <iostream>
#ifdef WIN32
+#ifdef Q168440_WORKAROUND
// 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 )
@@ -30,6 +31,7 @@
return os;
}
#endif
+#endif
int main(int argc, char* argv[])
{
1.2 +2 -0 ws-axis/c/tests/auto_build/testcases/client/cpp/XSD_longClient.cpp
Index: XSD_longClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/XSD_longClient.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XSD_longClient.cpp 1 Jul 2005 15:20:12 -0000 1.1
+++ XSD_longClient.cpp 15 Jul 2005 15:28:49 -0000 1.2
@@ -20,6 +20,7 @@
#include <iostream>
#ifdef WIN32
+#ifdef Q168440_WORKAROUND
// 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 )
@@ -30,6 +31,7 @@
return os;
}
#endif
+#endif
int main(int argc, char* argv[])
{
1.2 +2 -0 ws-axis/c/tests/auto_build/testcases/client/cpp/XSD_negativeIntegerClient.cpp
Index: XSD_negativeIntegerClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/XSD_negativeIntegerClient.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XSD_negativeIntegerClient.cpp 4 Jul 2005 16:43:59 -0000 1.1
+++ XSD_negativeIntegerClient.cpp 15 Jul 2005 15:28:49 -0000 1.2
@@ -20,6 +20,7 @@
#include <iostream>
#ifdef WIN32
+#ifdef Q168440_WORKAROUND
// 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 )
@@ -30,6 +31,7 @@
return os;
}
#endif
+#endif
int main(int argc, char* argv[])
{
1.2 +2 -0 ws-axis/c/tests/auto_build/testcases/client/cpp/XSD_nonNegativeIntegerClient.cpp
Index: XSD_nonNegativeIntegerClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/XSD_nonNegativeIntegerClient.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XSD_nonNegativeIntegerClient.cpp 4 Jul 2005 16:43:59 -0000 1.1
+++ XSD_nonNegativeIntegerClient.cpp 15 Jul 2005 15:28:49 -0000 1.2
@@ -20,6 +20,7 @@
#include <iostream>
#ifdef WIN32
+#ifdef Q168440_WORKAROUND
// 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 )
@@ -30,6 +31,7 @@
return os;
}
#endif
+#endif
int main(int argc, char* argv[])
{
1.2 +2 -0 ws-axis/c/tests/auto_build/testcases/client/cpp/XSD_nonPositiveIntegerClient.cpp
Index: XSD_nonPositiveIntegerClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/XSD_nonPositiveIntegerClient.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XSD_nonPositiveIntegerClient.cpp 4 Jul 2005 16:43:59 -0000 1.1
+++ XSD_nonPositiveIntegerClient.cpp 15 Jul 2005 15:28:49 -0000 1.2
@@ -20,6 +20,7 @@
#include <iostream>
#ifdef WIN32
+#ifdef Q168440_WORKAROUND
// 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 )
@@ -30,6 +31,7 @@
return os;
}
#endif
+#endif
int main(int argc, char* argv[])
{
1.2 +2 -0 ws-axis/c/tests/auto_build/testcases/client/cpp/XSD_positiveIntegerClient.cpp
Index: XSD_positiveIntegerClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/XSD_positiveIntegerClient.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XSD_positiveIntegerClient.cpp 4 Jul 2005 16:43:59 -0000 1.1
+++ XSD_positiveIntegerClient.cpp 15 Jul 2005 15:28:49 -0000 1.2
@@ -20,6 +20,7 @@
#include <iostream>
#ifdef WIN32
+#ifdef Q168440_WORKAROUND
// 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 )
@@ -30,6 +31,7 @@
return os;
}
#endif
+#endif
int main(int argc, char* argv[])
{
1.2 +2 -0 ws-axis/c/tests/auto_build/testcases/client/cpp/XSD_unsignedLongClient.cpp
Index: XSD_unsignedLongClient.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/XSD_unsignedLongClient.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XSD_unsignedLongClient.cpp 4 Jul 2005 16:43:59 -0000 1.1
+++ XSD_unsignedLongClient.cpp 15 Jul 2005 15:28:49 -0000 1.2
@@ -20,6 +20,7 @@
#include <iostream>
#ifdef WIN32
+#ifdef Q168440_WORKAROUND
// 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 )
@@ -30,6 +31,7 @@
return os;
}
#endif
+#endif
int main(int argc, char* argv[])
{