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 na...@apache.org on 2005/10/11 06:04:37 UTC
svn commit: r312802 -
/webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/
Author: nadiramra
Date: Mon Oct 10 21:04:31 2005
New Revision: 312802
URL: http://svn.apache.org/viewcvs?rev=312802&view=rev
Log:
Fix AXISCPP-802 and AXISCPP-776.
Modified:
webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/CommonClientTestCode.hpp
webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/XSD_integerClient.cpp
webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/XSD_longClient.cpp
webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/XSD_negativeIntegerClient.cpp
webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/XSD_nonNegativeIntegerClient.cpp
webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/XSD_nonPositiveIntegerClient.cpp
webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/XSD_positiveIntegerClient.cpp
webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/XSD_unsignedLongClient.cpp
Modified: webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/CommonClientTestCode.hpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/CommonClientTestCode.hpp?rev=312802&r1=312801&r2=312802&view=diff
==============================================================================
--- webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/CommonClientTestCode.hpp (original)
+++ webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/CommonClientTestCode.hpp Mon Oct 10 21:04:31 2005
@@ -1,3 +1,6 @@
+#ifndef __COMMONHEADERFILE
+#define __COMMONHEADERFILE
+
#ifdef WIN32
#if defined(_MSC_VER) && (_MSC_VER < 1300)
// Bug in MS Visual C++ 6.0. Fixed in Visual C++ .Net version.
@@ -24,6 +27,12 @@
return os;
}
#endif
+
+ #define LONGLONGVALUE(value) value##I64
+ #define UNSIGNED_LONGLONGVALUE(value) value##UI64
+#else
+ #define LONGLONGVALUE(value) value##LL
+ #define UNSIGNED_LONGLONGVALUE(value) value##ULL
#endif
// ==========================================================
@@ -113,3 +122,5 @@
#define stringToAscii( x ) ( x )
#endif
+
+#endif
\ No newline at end of file
Modified: webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/XSD_integerClient.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/XSD_integerClient.cpp?rev=312802&r1=312801&r2=312802&view=diff
==============================================================================
--- webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/XSD_integerClient.cpp (original)
+++ webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/XSD_integerClient.cpp Mon Oct 10 21:04:31 2005
@@ -34,19 +34,11 @@
{
sprintf(endpoint, "%s", url);
XSD_integer* ws = new XSD_integer(endpoint);
-#ifdef __OS400__
- xsd__integer result = ws->asNonNillableElement((xsd__integer)9223372036854775807LL);
-#else
- xsd__integer result = ws->asNonNillableElement((xsd__integer)9223372036854775807);
-#endif
+ xsd__integer result = ws->asNonNillableElement((xsd__integer) LONGLONGVALUE(9223372036854775807));
cout << "non-nillable element=" << result << endl;
result = ws->asNonNillableElement((xsd__integer)1);
cout << "non-nillable element=" << result << endl;
-#ifdef __OS400__
- result = ws->asNonNillableElement((xsd__integer)-9223372036854775808LL);
-#else
- result = ws->asNonNillableElement((xsd__integer)-9223372036854775808);
-#endif
+ result = ws->asNonNillableElement((xsd__integer) LONGLONGVALUE(-9223372036854775808));
cout << "non-nillable element=" << result << endl;
result = ws->asNonNillableElement((xsd__integer)-1);
cout << "non-nillable element=" << result << endl;
Modified: webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/XSD_longClient.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/XSD_longClient.cpp?rev=312802&r1=312801&r2=312802&view=diff
==============================================================================
--- webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/XSD_longClient.cpp (original)
+++ webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/XSD_longClient.cpp Mon Oct 10 21:04:31 2005
@@ -35,19 +35,11 @@
sprintf(endpoint, "%s", url);
XSD_long* ws = new XSD_long(endpoint);
-#ifdef __OS400__
- xsd__long result = ws->asNonNillableElement((xsd__long)9223372036854775807LL);
-#else
- xsd__long result = ws->asNonNillableElement((xsd__long)9223372036854775807);
-#endif
+ xsd__long result = ws->asNonNillableElement((xsd__long) LONGLONGVALUE(9223372036854775807));
cout << "non-nillable element=" << result << endl;
result = ws->asNonNillableElement((xsd__long)1);
cout << "non-nillable element=" << result << endl;
-#ifdef __OS400__
- result = ws->asNonNillableElement((xsd__long)-9223372036854775808LL);
-#else
- result = ws->asNonNillableElement((xsd__long)-9223372036854775808);
-#endif
+ result = ws->asNonNillableElement((xsd__long) LONGLONGVALUE(-9223372036854775808));
cout << "non-nillable element=" << result << endl;
result = ws->asNonNillableElement((xsd__long)-1);
cout << "non-nillable element=" << result << endl;
Modified: webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/XSD_negativeIntegerClient.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/XSD_negativeIntegerClient.cpp?rev=312802&r1=312801&r2=312802&view=diff
==============================================================================
--- webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/XSD_negativeIntegerClient.cpp (original)
+++ webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/XSD_negativeIntegerClient.cpp Mon Oct 10 21:04:31 2005
@@ -34,12 +34,7 @@
{
sprintf(endpoint, "%s", url);
XSD_negativeInteger* ws = new XSD_negativeInteger(endpoint);
-
-#ifdef __OS400__
- xsd__negativeInteger result = ws->asNonNillableElement((xsd__negativeInteger)-9223372036854775808LL);
-#else
- xsd__negativeInteger result = ws->asNonNillableElement((xsd__negativeInteger)-9223372036854775808);
-#endif
+ xsd__negativeInteger result = ws->asNonNillableElement((xsd__negativeInteger) LONGLONGVALUE(-9223372036854775808));
cout << "non-nillable element=" << result << endl;
result = ws->asNonNillableElement((xsd__negativeInteger)-1);
cout << "non-nillable element=" << result << endl;
Modified: webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/XSD_nonNegativeIntegerClient.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/XSD_nonNegativeIntegerClient.cpp?rev=312802&r1=312801&r2=312802&view=diff
==============================================================================
--- webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/XSD_nonNegativeIntegerClient.cpp (original)
+++ webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/XSD_nonNegativeIntegerClient.cpp Mon Oct 10 21:04:31 2005
@@ -34,11 +34,7 @@
{
sprintf(endpoint, "%s", url);
XSD_nonNegativeInteger* ws = new XSD_nonNegativeInteger(endpoint);
-#ifdef __OS400__
- xsd__nonNegativeInteger result = ws->asNonNillableElement((xsd__nonNegativeInteger)18446744073709551615ULL);
-#else
- xsd__nonNegativeInteger result = ws->asNonNillableElement((xsd__nonNegativeInteger)18446744073709551615);
-#endif
+ xsd__nonNegativeInteger result = ws->asNonNillableElement((xsd__nonNegativeInteger) UNSIGNED_LONGLONGVALUE(18446744073709551615));
cout << "non-nillable element=" << result << endl;
result = ws->asNonNillableElement((xsd__nonNegativeInteger)1);
cout << "non-nillable element=" << result << endl;
Modified: webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/XSD_nonPositiveIntegerClient.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/XSD_nonPositiveIntegerClient.cpp?rev=312802&r1=312801&r2=312802&view=diff
==============================================================================
--- webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/XSD_nonPositiveIntegerClient.cpp (original)
+++ webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/XSD_nonPositiveIntegerClient.cpp Mon Oct 10 21:04:31 2005
@@ -35,11 +35,7 @@
// Note: All values are unsigned, but considered to be negative.
sprintf(endpoint, "%s", url);
XSD_nonPositiveInteger* ws = new XSD_nonPositiveInteger(endpoint);
-#ifdef __OS400__
- xsd__nonPositiveInteger result = ws->asNonNillableElement((xsd__nonPositiveInteger)-9223372036854775808LL);
-#else
- xsd__nonPositiveInteger result = ws->asNonNillableElement((xsd__nonPositiveInteger)-9223372036854775808);
-#endif
+ xsd__nonPositiveInteger result = ws->asNonNillableElement((xsd__nonPositiveInteger) LONGLONGVALUE(-9223372036854775808));
cout << "non-nillable element=" << result << endl;
result = ws->asNonNillableElement((xsd__nonPositiveInteger)-1);
cout << "non-nillable element=" << result << endl;
Modified: webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/XSD_positiveIntegerClient.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/XSD_positiveIntegerClient.cpp?rev=312802&r1=312801&r2=312802&view=diff
==============================================================================
--- webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/XSD_positiveIntegerClient.cpp (original)
+++ webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/XSD_positiveIntegerClient.cpp Mon Oct 10 21:04:31 2005
@@ -34,11 +34,7 @@
{
sprintf(endpoint, "%s", url);
XSD_positiveInteger* ws = new XSD_positiveInteger(endpoint);
-#ifdef __OS400__
- xsd__positiveInteger result = ws->asNonNillableElement((xsd__positiveInteger)18446744073709551615ULL);
-#else
- xsd__positiveInteger result = ws->asNonNillableElement((xsd__positiveInteger)18446744073709551615);
-#endif
+ xsd__positiveInteger result = ws->asNonNillableElement((xsd__positiveInteger) UNSIGNED_LONGLONGVALUE(18446744073709551615));
cout << "non-nillable element=" << result << endl;
result = ws->asNonNillableElement((xsd__positiveInteger)1);
cout << "non-nillable element=" << result << endl;
Modified: webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/XSD_unsignedLongClient.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/XSD_unsignedLongClient.cpp?rev=312802&r1=312801&r2=312802&view=diff
==============================================================================
--- webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/XSD_unsignedLongClient.cpp (original)
+++ webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/XSD_unsignedLongClient.cpp Mon Oct 10 21:04:31 2005
@@ -35,11 +35,7 @@
sprintf(endpoint, "%s", url);
XSD_unsignedLong* ws = new XSD_unsignedLong(endpoint);
-#ifdef __OS400__
- xsd__unsignedLong result = ws->asNonNillableElement((xsd__unsignedLong)18446744073709551615ULL);
-#else
- xsd__unsignedLong result = ws->asNonNillableElement((xsd__unsignedLong)18446744073709551615);
-#endif
+ xsd__unsignedLong result = ws->asNonNillableElement((xsd__unsignedLong) UNSIGNED_LONGLONGVALUE(18446744073709551615));
cout << "non-nillable element=" << result << endl;
result = ws->asNonNillableElement((xsd__unsignedLong)1);
cout << "non-nillable element=" << result << endl;