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/01/25 12:26:39 UTC
cvs commit: ws-axis/c/src/soap/xsd/constraints MaxExclusive.cpp MaxExclusive.hpp MaxInclusive.cpp MaxInclusive.hpp MinExclusive.cpp MinExclusive.hpp MinInclusive.cpp MinInclusive.hpp
dicka 2005/01/25 03:26:39
Modified: c/src/soap/xsd AnyURI.cpp Date.cpp DateTime.cpp Decimal.cpp
Double.cpp Duration.cpp Float.cpp Integer.cpp
Long.cpp Long.hpp NOTATION.cpp
NonNegativeInteger.cpp NonNegativeInteger.hpp
String.cpp Time.cpp UnsignedLong.cpp XSD_QName.cpp
c/src/soap/xsd/constraints MaxExclusive.cpp MaxExclusive.hpp
MaxInclusive.cpp MaxInclusive.hpp MinExclusive.cpp
MinExclusive.hpp MinInclusive.cpp MinInclusive.hpp
Log:
Correction of build break and compilation warnings on Linux and AIX of XSD objects and constraints.
Submitted by: Adrian Dick
Revision Changes Path
1.6 +2 -2 ws-axis/c/src/soap/xsd/AnyURI.cpp
Index: AnyURI.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/AnyURI.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AnyURI.cpp 21 Jan 2005 15:17:19 -0000 1.5
+++ AnyURI.cpp 25 Jan 2005 11:26:38 -0000 1.6
@@ -21,7 +21,7 @@
MinLength* minLength= getMinLength();
if (minLength->isSet())
{
- if (strlen(value) < minLength->getMinLength())
+ if (strlen(value) < (unsigned int) minLength->getMinLength())
{
AxisString exceptionMessage =
"Length of value to be serialized is shorter than MinLength specified for this type. Minlength = ";
@@ -43,7 +43,7 @@
MaxLength* maxLength = getMaxLength();
if (maxLength->isSet())
{
- if (strlen(value) > maxLength->getMaxLength())
+ if (strlen(value) > (unsigned int) maxLength->getMaxLength())
{
AxisString exceptionMessage =
"Length of value to be serialized is longer than MaxLength specified for this type. Maxlength = ";
1.7 +12 -8 ws-axis/c/src/soap/xsd/Date.cpp
Index: Date.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/Date.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Date.cpp 24 Jan 2005 17:21:26 -0000 1.6
+++ Date.cpp 25 Jan 2005 11:26:38 -0000 1.7
@@ -21,11 +21,12 @@
MinInclusive* minInclusive = getMinInclusive();
if (minInclusive->isSet())
{
- if ( 0 > difftime(mktime(&(minInclusive->getMinInclusiveAsStructTM())), mktime(const_cast<struct tm*>(value))) )
+ struct tm minInclusiveAsStructTM = minInclusive->getMinInclusiveAsStructTM();
+ if ( 0 > difftime(mktime(&minInclusiveAsStructTM), mktime(const_cast<struct tm*>(value))) )
{
AxisString exceptionMessage =
"Value to be serialized is less than MinInclusive specified for this type. MinInclusive = ";
- exceptionMessage += asctime(&(minInclusive->getMinInclusiveAsStructTM()));
+ exceptionMessage += asctime(&minInclusiveAsStructTM);
exceptionMessage += ", Value = ";
exceptionMessage += asctime(value);
exceptionMessage += ".";
@@ -39,11 +40,12 @@
MinExclusive* minExclusive = getMinExclusive();
if (minExclusive->isSet())
{
- if ( 0 > difftime(mktime(&(minExclusive->getMinExclusiveAsStructTM())), mktime(const_cast<struct tm*>(value))) )
+ struct tm minExclusiveAsStructTM = minExclusive->getMinExclusiveAsStructTM();
+ if ( 0 >= difftime(mktime(&minExclusiveAsStructTM), mktime(const_cast<struct tm*>(value))) )
{
AxisString exceptionMessage =
"Value to be serialized is less than or equal to MinExclusive specified for this type. MinExclusive = ";
- exceptionMessage += asctime(&(minExclusive->getMinExclusiveAsStructTM()));
+ exceptionMessage += asctime(&minExclusiveAsStructTM);
exceptionMessage += ", Value = ";
exceptionMessage += asctime(value);
exceptionMessage += ".";
@@ -57,11 +59,12 @@
MaxInclusive* maxInclusive = getMaxInclusive();
if (maxInclusive->isSet())
{
- if ( 0 > difftime(mktime(&(maxInclusive->getMaxInclusiveAsStructTM())), mktime(const_cast<struct tm*>(value))) )
+ struct tm maxInclusiveAsStructTM = maxInclusive->getMaxInclusiveAsStructTM();
+ if ( 0 < difftime(mktime(&maxInclusiveAsStructTM), mktime(const_cast<struct tm*>(value))) )
{
AxisString exceptionMessage =
"Value to be serialized is greater than MaxInclusive specified for this type. MaxInclusive = ";
- exceptionMessage += asctime(&(maxInclusive->getMaxInclusiveAsStructTM()));
+ exceptionMessage += asctime(&maxInclusiveAsStructTM);
exceptionMessage += ", Value = ";
exceptionMessage += asctime(value);
exceptionMessage += ".";
@@ -75,11 +78,12 @@
MaxExclusive* maxExclusive = getMaxExclusive();
if (maxExclusive->isSet())
{
- if ( 0 > difftime(mktime(&(maxExclusive->getMaxExclusiveAsStructTM())), mktime(const_cast<struct tm*>(value))) )
+ struct tm maxExclusiveAsStructTM = maxExclusive->getMaxExclusiveAsStructTM();
+ if ( 0 <= difftime(mktime(&maxExclusiveAsStructTM), mktime(const_cast<struct tm*>(value))) )
{
AxisString exceptionMessage =
"Value to be serialized is greater than or equal to MaxExclusive specified for this type. MaxExclusive = ";
- exceptionMessage += asctime(&(maxExclusive->getMaxExclusiveAsStructTM()));
+ exceptionMessage += asctime(&maxExclusiveAsStructTM);
exceptionMessage += ", Value = ";
exceptionMessage += asctime(value);
exceptionMessage += ".";
1.9 +12 -8 ws-axis/c/src/soap/xsd/DateTime.cpp
Index: DateTime.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/DateTime.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DateTime.cpp 24 Jan 2005 17:21:26 -0000 1.8
+++ DateTime.cpp 25 Jan 2005 11:26:38 -0000 1.9
@@ -30,11 +30,12 @@
MinInclusive* minInclusive = getMinInclusive();
if (minInclusive->isSet())
{
- if ( 0 > difftime(mktime(&(minInclusive->getMinInclusiveAsStructTM())), mktime(const_cast<struct tm*>(value))) )
+ struct tm minInclusiveAsStructTM = minInclusive->getMinInclusiveAsStructTM();
+ if ( 0 > difftime(mktime(&minInclusiveAsStructTM), mktime(const_cast<struct tm*>(value))) )
{
AxisString exceptionMessage =
"Value to be serialized is less than MinInclusive specified for this type. MinInclusive = ";
- exceptionMessage += asctime(&(minInclusive->getMinInclusiveAsStructTM()));
+ exceptionMessage += asctime(&minInclusiveAsStructTM);
exceptionMessage += ", Value = ";
exceptionMessage += asctime(value);
exceptionMessage += ".";
@@ -48,11 +49,12 @@
MinExclusive* minExclusive = getMinExclusive();
if (minExclusive->isSet())
{
- if ( 0 > difftime(mktime(&(minExclusive->getMinExclusiveAsStructTM())), mktime(const_cast<struct tm*>(value))) )
+ struct tm minExclusiveAsStructTM = minExclusive->getMinExclusiveAsStructTM();
+ if ( 0 >= difftime(mktime(&minExclusiveAsStructTM), mktime(const_cast<struct tm*>(value))) )
{
AxisString exceptionMessage =
"Value to be serialized is less than or equal to MinExclusive specified for this type. MinExclusive = ";
- exceptionMessage += asctime(&(minExclusive->getMinExclusiveAsStructTM()));
+ exceptionMessage += asctime(&minExclusiveAsStructTM);
exceptionMessage += ", Value = ";
exceptionMessage += asctime(value);
exceptionMessage += ".";
@@ -66,11 +68,12 @@
MaxInclusive* maxInclusive = getMaxInclusive();
if (maxInclusive->isSet())
{
- if ( 0 > difftime(mktime(&(maxInclusive->getMaxInclusiveAsStructTM())), mktime(const_cast<struct tm*>(value))) )
+ struct tm maxInclusiveAsStructTM = maxInclusive->getMaxInclusiveAsStructTM();
+ if ( 0 < difftime(mktime(&maxInclusiveAsStructTM), mktime(const_cast<struct tm*>(value))) )
{
AxisString exceptionMessage =
"Value to be serialized is greater than MaxInclusive specified for this type. MaxInclusive = ";
- exceptionMessage += asctime(&(maxInclusive->getMaxInclusiveAsStructTM()));
+ exceptionMessage += asctime(&maxInclusiveAsStructTM);
exceptionMessage += ", Value = ";
exceptionMessage += asctime(value);
exceptionMessage += ".";
@@ -84,11 +87,12 @@
MaxExclusive* maxExclusive = getMaxExclusive();
if (maxExclusive->isSet())
{
- if ( 0 > difftime(mktime(&(maxExclusive->getMaxExclusiveAsStructTM())), mktime(const_cast<struct tm*>(value))) )
+ struct tm maxExclusiveAsStructTM = maxExclusive->getMaxExclusiveAsStructTM();
+ if ( 0 <= difftime(mktime(&maxExclusiveAsStructTM), mktime(const_cast<struct tm*>(value))) )
{
AxisString exceptionMessage =
"Value to be serialized is greater than or equal to MaxExclusive specified for this type. MaxExclusive = ";
- exceptionMessage += asctime(&(maxExclusive->getMaxExclusiveAsStructTM()));
+ exceptionMessage += asctime(&maxExclusiveAsStructTM);
exceptionMessage += ", Value = ";
exceptionMessage += asctime(value);
exceptionMessage += ".";
1.9 +4 -4 ws-axis/c/src/soap/xsd/Decimal.cpp
Index: Decimal.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/Decimal.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Decimal.cpp 24 Jan 2005 17:21:26 -0000 1.8
+++ Decimal.cpp 25 Jan 2005 11:26:38 -0000 1.9
@@ -53,7 +53,7 @@
MinExclusive* minExclusive = getMinExclusive();
if (minExclusive->isSet())
{
- if ( *value < minExclusive->getMinExclusiveAsDouble() )
+ if ( *value <= minExclusive->getMinExclusiveAsDouble() )
{
AxisString exceptionMessage =
"Value to be serialized is less than or equal to MinExclusive specified for this type. MinExclusive = ";
@@ -73,10 +73,10 @@
delete minExclusive;
-MaxInclusive* maxInclusive = getMaxInclusive();
+ MaxInclusive* maxInclusive = getMaxInclusive();
if (maxInclusive->isSet())
{
- if ( *value < maxInclusive->getMaxInclusiveAsDouble() )
+ if ( *value > maxInclusive->getMaxInclusiveAsDouble() )
{
AxisString exceptionMessage =
"Value to be serialized is greater than MaxInclusive specified for this type. MaxInclusive = ";
@@ -98,7 +98,7 @@
MaxExclusive* maxExclusive = getMaxExclusive();
if (maxExclusive->isSet())
{
- if ( *value < maxExclusive->getMaxExclusiveAsDouble() )
+ if ( *value >= maxExclusive->getMaxExclusiveAsDouble() )
{
AxisString exceptionMessage =
"Value to be serialized is greater than or equal to MaxExclusive specified for this type. MaxExclusive = ";
1.7 +3 -3 ws-axis/c/src/soap/xsd/Double.cpp
Index: Double.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/Double.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Double.cpp 24 Jan 2005 17:21:26 -0000 1.6
+++ Double.cpp 25 Jan 2005 11:26:38 -0000 1.7
@@ -44,7 +44,7 @@
MinExclusive* minExclusive = getMinExclusive();
if (minExclusive->isSet())
{
- if ( *value < minExclusive->getMinExclusiveAsDouble() )
+ if ( *value <= minExclusive->getMinExclusiveAsDouble() )
{
AxisString exceptionMessage =
"Value to be serialized is less than or equal to MinExclusive specified for this type. MinExclusive = ";
@@ -67,7 +67,7 @@
MaxInclusive* maxInclusive = getMaxInclusive();
if (maxInclusive->isSet())
{
- if ( *value < maxInclusive->getMaxInclusiveAsDouble() )
+ if ( *value > maxInclusive->getMaxInclusiveAsDouble() )
{
AxisString exceptionMessage =
"Value to be serialized is greater than MaxInclusive specified for this type. MaxInclusive = ";
@@ -89,7 +89,7 @@
MaxExclusive* maxExclusive = getMaxExclusive();
if (maxExclusive->isSet())
{
- if ( *value < maxExclusive->getMaxExclusiveAsDouble() )
+ if ( *value >= maxExclusive->getMaxExclusiveAsDouble() )
{
AxisString exceptionMessage =
"Value to be serialized is greater than or equal to MaxExclusive specified for this type. MaxExclusive = ";
1.7 +11 -11 ws-axis/c/src/soap/xsd/Duration.cpp
Index: Duration.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/Duration.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Duration.cpp 24 Jan 2005 17:21:26 -0000 1.6
+++ Duration.cpp 25 Jan 2005 11:26:38 -0000 1.7
@@ -27,10 +27,10 @@
AxisString exceptionMessage =
"Value to be serialized is less than MinInclusive specified for this type. MinInclusive = ";
AxisChar* length = new AxisChar[25];
- sprintf(length, "%d", minInclusive->getMinInclusiveAsLONGLONG());
+ sprintf(length, PRINTF_LONGLONG_FORMAT_SPECIFIER, minInclusive->getMinInclusiveAsLONGLONG());
exceptionMessage += length;
exceptionMessage += ", Value = ";
- sprintf(length, PRINTF_LONGLONG_FORMAT_SPECIFIER, *value);
+ sprintf(length, "%ld", *value);
exceptionMessage += length;
exceptionMessage += ".";
delete [] length;
@@ -44,15 +44,15 @@
MinExclusive* minExclusive = getMinExclusive();
if (minExclusive->isSet())
{
- if ( *value < minExclusive->getMinExclusiveAsLONGLONG() )
+ if ( *value <= minExclusive->getMinExclusiveAsLONGLONG() )
{
AxisString exceptionMessage =
"Value to be serialized is less than or equal to MinExclusive specified for this type. MinExclusive = ";
AxisChar* length = new AxisChar[25];
- sprintf(length, "%d", minExclusive->getMinExclusiveAsLONGLONG());
+ sprintf(length, PRINTF_LONGLONG_FORMAT_SPECIFIER, minExclusive->getMinExclusiveAsLONGLONG());
exceptionMessage += length;
exceptionMessage += ", Value = ";
- sprintf(length, PRINTF_LONGLONG_FORMAT_SPECIFIER, *value);
+ sprintf(length, "%ld", *value);
exceptionMessage += length;
exceptionMessage += ".";
delete [] length;
@@ -67,15 +67,15 @@
MaxInclusive* maxInclusive = getMaxInclusive();
if (maxInclusive->isSet())
{
- if ( *value < maxInclusive->getMaxInclusiveAsLONGLONG() )
+ if ( *value > maxInclusive->getMaxInclusiveAsLONGLONG() )
{
AxisString exceptionMessage =
"Value to be serialized is greater than MaxInclusive specified for this type. MaxInclusive = ";
AxisChar* length = new AxisChar[25];
- sprintf(length, "%d", maxInclusive->getMaxInclusiveAsLONGLONG());
+ sprintf(length, PRINTF_LONGLONG_FORMAT_SPECIFIER, maxInclusive->getMaxInclusiveAsLONGLONG());
exceptionMessage += length;
exceptionMessage += ", Value = ";
- sprintf(length, PRINTF_LONGLONG_FORMAT_SPECIFIER, *value);
+ sprintf(length, "%ld", *value);
exceptionMessage += length;
exceptionMessage += ".";
delete [] length;
@@ -89,15 +89,15 @@
MaxExclusive* maxExclusive = getMaxExclusive();
if (maxExclusive->isSet())
{
- if ( *value < maxExclusive->getMaxExclusiveAsLONGLONG() )
+ if ( *value >= maxExclusive->getMaxExclusiveAsLONGLONG() )
{
AxisString exceptionMessage =
"Value to be serialized is greater than or equal to MaxExclusive specified for this type. MaxExclusive = ";
AxisChar* length = new AxisChar[25];
- sprintf(length, "%d", maxExclusive->getMaxExclusiveAsLONGLONG());
+ sprintf(length, PRINTF_LONGLONG_FORMAT_SPECIFIER, maxExclusive->getMaxExclusiveAsLONGLONG());
exceptionMessage += length;
exceptionMessage += ", Value = ";
- sprintf(length, PRINTF_LONGLONG_FORMAT_SPECIFIER, *value);
+ sprintf(length, "%ld", *value);
exceptionMessage += length;
exceptionMessage += ".";
delete [] length;
1.8 +3 -3 ws-axis/c/src/soap/xsd/Float.cpp
Index: Float.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/Float.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Float.cpp 24 Jan 2005 17:21:26 -0000 1.7
+++ Float.cpp 25 Jan 2005 11:26:38 -0000 1.8
@@ -50,7 +50,7 @@
MinExclusive* minExclusive = getMinExclusive();
if (minExclusive->isSet())
{
- if ( *value < static_cast<float>(minExclusive->getMinExclusiveAsDouble()) )
+ if ( *value <= static_cast<float>(minExclusive->getMinExclusiveAsDouble()) )
{
AxisString exceptionMessage =
"Value to be serialized is less than or equal to MinExclusive specified for this type. MinExclusive = ";
@@ -73,7 +73,7 @@
MaxInclusive* maxInclusive = getMaxInclusive();
if (maxInclusive->isSet())
{
- if ( *value < static_cast<float>(maxInclusive->getMaxInclusiveAsDouble()) )
+ if ( *value > static_cast<float>(maxInclusive->getMaxInclusiveAsDouble()) )
{
AxisString exceptionMessage =
"Value to be serialized is greater than MaxInclusive specified for this type. MaxInclusive = ";
@@ -95,7 +95,7 @@
MaxExclusive* maxExclusive = getMaxExclusive();
if (maxExclusive->isSet())
{
- if ( *value < static_cast<float>(maxExclusive->getMaxExclusiveAsDouble()) )
+ if ( *value >= static_cast<float>(maxExclusive->getMaxExclusiveAsDouble()) )
{
AxisString exceptionMessage =
"Value to be serialized is greater than or equal to MaxExclusive specified for this type. MaxExclusive = ";
1.6 +66 -0 ws-axis/c/src/soap/xsd/Integer.cpp
Index: Integer.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/Integer.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Integer.cpp 24 Jan 2005 15:41:24 -0000 1.5
+++ Integer.cpp 25 Jan 2005 11:26:38 -0000 1.6
@@ -46,6 +46,72 @@
}
}
delete minInclusive;
+
+ MinExclusive* minExclusive = getMinExclusive();
+ if (minExclusive->isSet())
+ {
+ if ( *value <= minExclusive->getMinExclusiveAsLONGLONG() )
+ {
+ AxisString exceptionMessage =
+ "Value to be serialized is less than or equal to MinExclusive specified for this type. MinExclusive = ";
+ AxisChar* length = new AxisChar[25];
+ sprintf(length, PRINTF_LONGLONG_FORMAT_SPECIFIER, minExclusive->getMinExclusiveAsLONGLONG());
+ exceptionMessage += length;
+ exceptionMessage += ", Value = ";
+ sprintf(length, PRINTF_LONGLONG_FORMAT_SPECIFIER, *value);
+ exceptionMessage += length;
+ exceptionMessage += ".";
+ delete [] length;
+
+ throw new AxisSoapException(CLIENT_SOAP_SOAP_CONTENT_ERROR,
+ const_cast<AxisChar*>(exceptionMessage.c_str()));
+ }
+ }
+ delete minExclusive;
+
+ MaxInclusive* maxInclusive = getMaxInclusive();
+ if (maxInclusive->isSet())
+ {
+ if ( *value > maxInclusive->getMaxInclusiveAsLONGLONG() )
+ {
+ AxisString exceptionMessage =
+ "Value to be serialized is less than MaxInclusive specified for this type. MaxInclusive = ";
+ AxisChar* length = new AxisChar[25];
+ sprintf(length, PRINTF_LONGLONG_FORMAT_SPECIFIER, maxInclusive->getMaxInclusiveAsLONGLONG());
+ exceptionMessage += length;
+ exceptionMessage += ", Value = ";
+ sprintf(length, PRINTF_LONGLONG_FORMAT_SPECIFIER, *value);
+ exceptionMessage += length;
+ exceptionMessage += ".";
+ delete [] length;
+
+ throw new AxisSoapException(CLIENT_SOAP_SOAP_CONTENT_ERROR,
+ const_cast<AxisChar*>(exceptionMessage.c_str()));
+ }
+ }
+ delete maxInclusive;
+
+ MaxExclusive* maxExclusive = getMaxExclusive();
+ if (maxExclusive->isSet())
+ {
+ if ( *value >= maxExclusive->getMaxExclusiveAsLONGLONG() )
+ {
+ AxisString exceptionMessage =
+ "Value to be serialized is less than or equal to MaxExclusive specified for this type. MaxExclusive = ";
+ AxisChar* length = new AxisChar[25];
+ sprintf(length, PRINTF_LONGLONG_FORMAT_SPECIFIER, maxExclusive->getMaxExclusiveAsLONGLONG());
+ exceptionMessage += length;
+ exceptionMessage += ", Value = ";
+ sprintf(length, PRINTF_LONGLONG_FORMAT_SPECIFIER, *value);
+ exceptionMessage += length;
+ exceptionMessage += ".";
+ delete [] length;
+
+ throw new AxisSoapException(CLIENT_SOAP_SOAP_CONTENT_ERROR,
+ const_cast<AxisChar*>(exceptionMessage.c_str()));
+ }
+ }
+ delete maxExclusive;
AxisChar* serializedValue = new char[80];
AxisSprintf (serializedValue, 80, PRINTF_LONGLONG_FORMAT_SPECIFIER, *value);
1.5 +15 -13 ws-axis/c/src/soap/xsd/Long.cpp
Index: Long.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/Long.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Long.cpp 24 Jan 2005 17:21:26 -0000 1.4
+++ Long.cpp 25 Jan 2005 11:26:38 -0000 1.5
@@ -8,23 +8,25 @@
}
MinInclusive* Long::getMinInclusive()
-{
- return new MinInclusive(static_cast<LONGLONG>(-9223372036854775808));
-}
-
-MinExclusive* Long::getMinExclusive()
-{
- return new MinExclusive(static_cast<LONGLONG>(-9223372036854775809));
+{
+ AxisChar* end;
+ LONGLONG* minInclusive = new LONGLONG;
+ *minInclusive = strtol ("-9223372036854775808", &end, 10);
+
+ MinInclusive* retVal = new MinInclusive(*minInclusive);
+ delete minInclusive;
+ return retVal;
}
MaxInclusive* Long::getMaxInclusive()
{
- return new MaxInclusive(static_cast<LONGLONG>(9223372036854775807));
-}
-
-MaxExclusive* Long::getMaxExclusive()
-{
- return new MaxExclusive(static_cast<LONGLONG>(9223372036854775808));
+ AxisChar* end;
+ LONGLONG* maxInclusive = new LONGLONG;
+ *maxInclusive = strtol ("9223372036854775807", &end, 10);
+
+ MaxInclusive* retVal = new MaxInclusive(*maxInclusive);
+ delete maxInclusive;
+ return retVal;
}
AXIS_CPP_NAMESPACE_END
1.5 +1 -15 ws-axis/c/src/soap/xsd/Long.hpp
Index: Long.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/Long.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Long.hpp 24 Jan 2005 17:21:26 -0000 1.4
+++ Long.hpp 25 Jan 2005 11:26:38 -0000 1.5
@@ -48,25 +48,11 @@
virtual MinInclusive* getMinInclusive();
/**
- * Creates a MinExclusive object. For the Long type this is defined as
- * -9223372036854775809.
- * @return MinExclusive object
- */
- virtual MinExclusive* getMinExclusive();
-
- /**
* Creates a MaxInclusive object. For the Long type this is defined as
* 9223372036854775807.
* @return MaxInclusive object
*/
- virtual MaxInclusive* getMaxInclusive();
-
- /**
- * Creates a MaxExclusive object. For the Long type this is defined as
- * 9223372036854775808.
- * @return MaxExclusive object
- */
- virtual MaxExclusive* getMaxExclusive();
+ virtual MaxInclusive* getMaxInclusive();
};
AXIS_CPP_NAMESPACE_END
1.6 +2 -2 ws-axis/c/src/soap/xsd/NOTATION.cpp
Index: NOTATION.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/NOTATION.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NOTATION.cpp 21 Jan 2005 15:17:19 -0000 1.5
+++ NOTATION.cpp 25 Jan 2005 11:26:38 -0000 1.6
@@ -21,7 +21,7 @@
MinLength* minLength= getMinLength();
if (minLength->isSet())
{
- if (strlen(value) < minLength->getMinLength())
+ if (strlen(value) < (unsigned int) minLength->getMinLength())
{
AxisString exceptionMessage =
"Length of value to be serialized is shorter than MinLength specified for this type. Minlength = ";
@@ -43,7 +43,7 @@
MaxLength* maxLength = getMaxLength();
if (maxLength->isSet())
{
- if (strlen(value) > maxLength->getMaxLength())
+ if (strlen(value) > (unsigned int) maxLength->getMaxLength())
{
AxisString exceptionMessage =
"Length of value to be serialized is longer than MaxLength specified for this type. Maxlength = ";
1.5 +133 -4 ws-axis/c/src/soap/xsd/NonNegativeInteger.cpp
Index: NonNegativeInteger.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/NonNegativeInteger.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NonNegativeInteger.cpp 24 Jan 2005 17:21:26 -0000 1.4
+++ NonNegativeInteger.cpp 25 Jan 2005 11:26:38 -0000 1.5
@@ -2,19 +2,148 @@
AXIS_CPP_NAMESPACE_START
-LONGLONG* NonNegativeInteger::deserializeNonNegativeInteger(const AxisChar* valueAsChar) throw (AxisSoapException)
+NonNegativeInteger::NonNegativeInteger():m_NonNegativeInteger(NULL)
{
- return (LONGLONG*) deserialize(valueAsChar);
+}
+
+NonNegativeInteger::~NonNegativeInteger()
+{
+ if (m_NonNegativeInteger)
+ delete m_NonNegativeInteger;
+}
+
+AxisChar* NonNegativeInteger::serialize(const void* value) throw (AxisSoapException)
+{
+ return serialize((unsigned LONGLONG*) value);
+}
+
+void* NonNegativeInteger::deserialize(const AxisChar* valueAsChar) throw (AxisSoapException)
+{
+ return (void*) deserializeNonNegativeInteger(valueAsChar);
+}
+
+
+AxisChar* NonNegativeInteger::serialize(const unsigned LONGLONG* value) throw (AxisSoapException)
+{
+ MinInclusive* minInclusive = getMinInclusive();
+ if (minInclusive->isSet())
+ {
+ if ( *value < minInclusive->getMinInclusiveAsUnsignedLONGLONG() )
+ {
+ AxisString exceptionMessage =
+ "Value to be serialized is less than MinInclusive specified for this type. MinInclusive = ";
+ AxisChar* length = new AxisChar[25];
+ sprintf(length, PRINTF_LONGLONG_FORMAT_SPECIFIER, minInclusive->getMinInclusiveAsUnsignedLONGLONG());
+ exceptionMessage += length;
+ exceptionMessage += ", Value = ";
+ sprintf(length, PRINTF_LONGLONG_FORMAT_SPECIFIER, *value);
+ exceptionMessage += length;
+ exceptionMessage += ".";
+ delete [] length;
+
+ throw new AxisSoapException(CLIENT_SOAP_SOAP_CONTENT_ERROR,
+ const_cast<AxisChar*>(exceptionMessage.c_str()));
+ }
+ }
+ delete minInclusive;
+
+ MinExclusive* minExclusive = getMinExclusive();
+ if (minExclusive->isSet())
+ {
+ if ( *value <= minExclusive->getMinExclusiveAsUnsignedLONGLONG() )
+ {
+ AxisString exceptionMessage =
+ "Value to be serialized is less than or equal to MinExclusive specified for this type. MinExclusive = ";
+ AxisChar* length = new AxisChar[25];
+ sprintf(length, PRINTF_LONGLONG_FORMAT_SPECIFIER, minExclusive->getMinExclusiveAsUnsignedLONGLONG());
+ exceptionMessage += length;
+ exceptionMessage += ", Value = ";
+ sprintf(length, PRINTF_LONGLONG_FORMAT_SPECIFIER, *value);
+ exceptionMessage += length;
+ exceptionMessage += ".";
+ delete [] length;
+
+ throw new AxisSoapException(CLIENT_SOAP_SOAP_CONTENT_ERROR,
+ const_cast<AxisChar*>(exceptionMessage.c_str()));
+ }
+ }
+ delete minExclusive;
+
+ MaxInclusive* maxInclusive = getMaxInclusive();
+ if (maxInclusive->isSet())
+ {
+ if ( *value > maxInclusive->getMaxInclusiveAsUnsignedLONGLONG() )
+ {
+ AxisString exceptionMessage =
+ "Value to be serialized is less than MaxInclusive specified for this type. MaxInclusive = ";
+ AxisChar* length = new AxisChar[25];
+ sprintf(length, PRINTF_LONGLONG_FORMAT_SPECIFIER, maxInclusive->getMaxInclusiveAsUnsignedLONGLONG());
+ exceptionMessage += length;
+ exceptionMessage += ", Value = ";
+ sprintf(length, PRINTF_LONGLONG_FORMAT_SPECIFIER, *value);
+ exceptionMessage += length;
+ exceptionMessage += ".";
+ delete [] length;
+
+ throw new AxisSoapException(CLIENT_SOAP_SOAP_CONTENT_ERROR,
+ const_cast<AxisChar*>(exceptionMessage.c_str()));
+ }
+ }
+ delete maxInclusive;
+
+ MaxExclusive* maxExclusive = getMaxExclusive();
+ if (maxExclusive->isSet())
+ {
+ if ( *value >= maxExclusive->getMaxExclusiveAsUnsignedLONGLONG() )
+ {
+ AxisString exceptionMessage =
+ "Value to be serialized is less than or equal to MaxExclusive specified for this type. MaxExclusive = ";
+ AxisChar* length = new AxisChar[25];
+ sprintf(length, PRINTF_LONGLONG_FORMAT_SPECIFIER, maxExclusive->getMaxExclusiveAsUnsignedLONGLONG());
+ exceptionMessage += length;
+ exceptionMessage += ", Value = ";
+ sprintf(length, PRINTF_LONGLONG_FORMAT_SPECIFIER, *value);
+ exceptionMessage += length;
+ exceptionMessage += ".";
+ delete [] length;
+
+ throw new AxisSoapException(CLIENT_SOAP_SOAP_CONTENT_ERROR,
+ const_cast<AxisChar*>(exceptionMessage.c_str()));
+ }
+ }
+ delete maxExclusive;
+
+ AxisChar* serializedValue = new char[80];
+ AxisSprintf (serializedValue, 80, PRINTF_LONGLONG_FORMAT_SPECIFIER, *value);
+
+ IAnySimpleType::serialize(serializedValue);
+ delete [] serializedValue;
+ return m_Buf;
+}
+
+unsigned LONGLONG* NonNegativeInteger::deserializeNonNegativeInteger(const AxisChar* valueAsChar) throw (AxisSoapException)
+{
+ AxisChar* end;
+
+ if(m_NonNegativeInteger)
+ {
+ delete m_NonNegativeInteger;
+ m_NonNegativeInteger = NULL;
+ }
+ m_NonNegativeInteger = new unsigned LONGLONG;
+ *m_NonNegativeInteger = strtol (valueAsChar, &end, 10);
+
+ return m_NonNegativeInteger;
}
MinInclusive* NonNegativeInteger::getMinInclusive()
{
- return new MinInclusive((LONGLONG) 0);
+ return new MinInclusive((unsigned LONGLONG) 0);
}
MinExclusive* NonNegativeInteger::getMinExclusive()
{
- return new MinExclusive((LONGLONG) -1);
+ return new MinExclusive((unsigned LONGLONG) -1);
}
MaxInclusive* NonNegativeInteger::getMaxInclusive()
1.5 +35 -1 ws-axis/c/src/soap/xsd/NonNegativeInteger.hpp
Index: NonNegativeInteger.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/NonNegativeInteger.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NonNegativeInteger.hpp 24 Jan 2005 17:21:26 -0000 1.4
+++ NonNegativeInteger.hpp 25 Jan 2005 11:26:38 -0000 1.5
@@ -30,13 +30,44 @@
class NonNegativeInteger : public Integer {
public:
+
+ /**
+ * Constructor
+ */
+ NonNegativeInteger();
+
+ /**
+ * Destructor
+ */
+ ~NonNegativeInteger();
+
+ /**
+ * Serialize value to it's on-the-wire string form.
+ * @param value The value to be serialized.
+ * @return Serialized form of value.
+ */
+ AxisChar* serialize(const void* value) throw (AxisSoapException);
+
+ /**
+ * Deserialize value from it's on-the-wire string form.
+ * @param valueAsChar Serialized form of value.
+ * @return Deserialized value.
+ */
+ void* deserialize(const AxisChar* valueAsChar) throw (AxisSoapException);
+
+ /**
+ * Serialize NonNegativeInteger value to it's on-the-wire string form.
+ * @param value The NonNegativeInteger value to be serialized.
+ * @return Serialized form of NonNegativeInteger value.
+ */
+ AxisChar* serialize(const unsigned LONGLONG* value) throw (AxisSoapException);
/**
* Deserialized NonNegativeInteger value from it's on-the-wire string form.
* @param valueAsChar Serialized form of NonNegativeInteger value.
* @return Deserialized NonNegativeInteger value.
*/
- LONGLONG* deserializeNonNegativeInteger(const AxisChar* valueAsChar) throw (AxisSoapException);
+ unsigned LONGLONG* deserializeNonNegativeInteger(const AxisChar* valueAsChar) throw (AxisSoapException);
protected:
@@ -67,6 +98,9 @@
* @return MaxExclusive object
*/
virtual MaxExclusive* getMaxExclusive();
+
+private:
+ unsigned LONGLONG* m_NonNegativeInteger;
};
1.6 +2 -2 ws-axis/c/src/soap/xsd/String.cpp
Index: String.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/String.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- String.cpp 21 Jan 2005 15:17:19 -0000 1.5
+++ String.cpp 25 Jan 2005 11:26:38 -0000 1.6
@@ -21,7 +21,7 @@
MinLength* minLength= getMinLength();
if (minLength->isSet())
{
- if (strlen(value) < minLength->getMinLength())
+ if (strlen(value) < (unsigned int) minLength->getMinLength())
{
AxisString exceptionMessage =
"Length of value to be serialized is shorter than MinLength specified for this type. Minlength = ";
@@ -43,7 +43,7 @@
MaxLength* maxLength = getMaxLength();
if (maxLength->isSet())
{
- if (strlen(value) > maxLength->getMaxLength())
+ if (strlen(value) > (unsigned int) maxLength->getMaxLength())
{
AxisString exceptionMessage =
"Length of value to be serialized is longer than MaxLength specified for this type. Maxlength = ";
1.7 +12 -8 ws-axis/c/src/soap/xsd/Time.cpp
Index: Time.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/Time.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Time.cpp 24 Jan 2005 17:21:26 -0000 1.6
+++ Time.cpp 25 Jan 2005 11:26:38 -0000 1.7
@@ -21,11 +21,12 @@
MinInclusive* minInclusive = getMinInclusive();
if (minInclusive->isSet())
{
- if ( 0 > difftime(mktime(&(minInclusive->getMinInclusiveAsStructTM())), mktime(const_cast<struct tm*>(value))) )
+ struct tm minInclusiveAsStructTM = minInclusive->getMinInclusiveAsStructTM();
+ if ( 0 > difftime(mktime(&minInclusiveAsStructTM), mktime(const_cast<struct tm*>(value))) )
{
AxisString exceptionMessage =
"Value to be serialized is less than MinInclusive specified for this type. MinInclusive = ";
- exceptionMessage += asctime(&(minInclusive->getMinInclusiveAsStructTM()));
+ exceptionMessage += asctime(&minInclusiveAsStructTM);
exceptionMessage += ", Value = ";
exceptionMessage += asctime(value);
exceptionMessage += ".";
@@ -39,11 +40,12 @@
MinExclusive* minExclusive = getMinExclusive();
if (minExclusive->isSet())
{
- if ( 0 > difftime(mktime(&(minExclusive->getMinExclusiveAsStructTM())), mktime(const_cast<struct tm*>(value))) )
+ struct tm minExclusiveAsStructTM = minExclusive->getMinExclusiveAsStructTM();
+ if ( 0 >= difftime(mktime(&minExclusiveAsStructTM), mktime(const_cast<struct tm*>(value))) )
{
AxisString exceptionMessage =
"Value to be serialized is less than or equal to MinExclusive specified for this type. MinExclusive = ";
- exceptionMessage += asctime(&(minExclusive->getMinExclusiveAsStructTM()));
+ exceptionMessage += asctime(&minExclusiveAsStructTM);
exceptionMessage += ", Value = ";
exceptionMessage += asctime(value);
exceptionMessage += ".";
@@ -57,11 +59,12 @@
MaxInclusive* maxInclusive = getMaxInclusive();
if (maxInclusive->isSet())
{
- if ( 0 > difftime(mktime(&(maxInclusive->getMaxInclusiveAsStructTM())), mktime(const_cast<struct tm*>(value))) )
+ struct tm maxInclusiveAsStructTM = maxInclusive->getMaxInclusiveAsStructTM();
+ if ( 0 < difftime(mktime(&maxInclusiveAsStructTM), mktime(const_cast<struct tm*>(value))) )
{
AxisString exceptionMessage =
"Value to be serialized is greater than MaxInclusive specified for this type. MaxInclusive = ";
- exceptionMessage += asctime(&(maxInclusive->getMaxInclusiveAsStructTM()));
+ exceptionMessage += asctime(&maxInclusiveAsStructTM);
exceptionMessage += ", Value = ";
exceptionMessage += asctime(value);
exceptionMessage += ".";
@@ -75,11 +78,12 @@
MaxExclusive* maxExclusive = getMaxExclusive();
if (maxExclusive->isSet())
{
- if ( 0 > difftime(mktime(&(maxExclusive->getMaxExclusiveAsStructTM())), mktime(const_cast<struct tm*>(value))) )
+ struct tm maxExclusiveAsStructTM = maxExclusive->getMaxExclusiveAsStructTM();
+ if ( 0 <= difftime(mktime(&maxExclusiveAsStructTM), mktime(const_cast<struct tm*>(value))) )
{
AxisString exceptionMessage =
"Value to be serialized is greater than or equal to MaxExclusive specified for this type. MaxExclusive = ";
- exceptionMessage += asctime(&(maxExclusive->getMaxExclusiveAsStructTM()));
+ exceptionMessage += asctime(&maxExclusiveAsStructTM);
exceptionMessage += ", Value = ";
exceptionMessage += asctime(value);
exceptionMessage += ".";
1.3 +9 -4 ws-axis/c/src/soap/xsd/UnsignedLong.cpp
Index: UnsignedLong.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/UnsignedLong.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UnsignedLong.cpp 24 Jan 2005 17:21:26 -0000 1.2
+++ UnsignedLong.cpp 25 Jan 2005 11:26:38 -0000 1.3
@@ -24,13 +24,13 @@
AxisChar* UnsignedLong::serialize(const unsigned long* value) throw (AxisSoapException)
{
- LONGLONG valueAsLong = static_cast<LONGLONG>(*value);
+ unsigned LONGLONG valueAsLong = static_cast<unsigned LONGLONG>(*value);
return NonNegativeInteger::serialize(&valueAsLong);
}
unsigned long* UnsignedLong::deserializeUnsignedLong(const AxisChar* valueAsChar) throw (AxisSoapException)
{
- LONGLONG* returnValue = NonNegativeInteger::deserializeNonNegativeInteger(valueAsChar);
+ unsigned LONGLONG* returnValue = NonNegativeInteger::deserializeNonNegativeInteger(valueAsChar);
if(m_UnsignedLong)
{
@@ -43,8 +43,13 @@
}
MaxInclusive* UnsignedLong::getMaxInclusive()
-{
- return new MaxInclusive((LONGLONG) 18446744073709551615);
+{
+ /*
+ * The actual value for this is 18446744073709551615, but as this is also the
+ * physical limit of an unsigned 64bit integer, we don't actually need to check
+ * this.
+ */
+ return new MaxInclusive();
}
AXIS_CPP_NAMESPACE_END
1.6 +2 -2 ws-axis/c/src/soap/xsd/XSD_QName.cpp
Index: XSD_QName.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/XSD_QName.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XSD_QName.cpp 21 Jan 2005 15:17:19 -0000 1.5
+++ XSD_QName.cpp 25 Jan 2005 11:26:38 -0000 1.6
@@ -21,7 +21,7 @@
MinLength* minLength= getMinLength();
if (minLength->isSet())
{
- if (strlen(value) < minLength->getMinLength())
+ if (strlen(value) < (unsigned int) minLength->getMinLength())
{
AxisString exceptionMessage =
"Length of value to be serialized is shorter than MinLength specified for this type. Minlength = ";
@@ -43,7 +43,7 @@
MaxLength* maxLength = getMaxLength();
if (maxLength->isSet())
{
- if (strlen(value) > maxLength->getMaxLength())
+ if (strlen(value) > (unsigned int) maxLength->getMaxLength())
{
AxisString exceptionMessage =
"Length of value to be serialized is longer than MaxLength specified for this type. Maxlength = ";
1.2 +11 -0 ws-axis/c/src/soap/xsd/constraints/MaxExclusive.cpp
Index: MaxExclusive.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/constraints/MaxExclusive.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MaxExclusive.cpp 24 Jan 2005 17:21:26 -0000 1.1
+++ MaxExclusive.cpp 25 Jan 2005 11:26:39 -0000 1.2
@@ -8,6 +8,12 @@
m_isSet = true;
}
+ MaxExclusive::MaxExclusive(unsigned LONGLONG maxExclusive)
+ {
+ m_MaxExclusive.unsignedLongLongMaxExclusive = maxExclusive;
+ m_isSet = true;
+ }
+
MaxExclusive::MaxExclusive(double maxExclusive)
{
m_MaxExclusive.doubleMaxExclusive = maxExclusive;
@@ -28,6 +34,11 @@
LONGLONG MaxExclusive::getMaxExclusiveAsLONGLONG()
{
return m_MaxExclusive.longlongMaxExclusive;
+ }
+
+ unsigned LONGLONG MaxExclusive::getMaxExclusiveAsUnsignedLONGLONG()
+ {
+ return m_MaxExclusive.unsignedLongLongMaxExclusive;
}
double MaxExclusive::getMaxExclusiveAsDouble()
1.2 +5 -0 ws-axis/c/src/soap/xsd/constraints/MaxExclusive.hpp
Index: MaxExclusive.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/constraints/MaxExclusive.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MaxExclusive.hpp 24 Jan 2005 17:21:26 -0000 1.1
+++ MaxExclusive.hpp 25 Jan 2005 11:26:39 -0000 1.2
@@ -40,6 +40,8 @@
MaxExclusive();
MaxExclusive(LONGLONG maxExclusive);
+
+ MaxExclusive(unsigned LONGLONG maxExclusive);
MaxExclusive(double maxExclusive);
@@ -47,6 +49,8 @@
LONGLONG getMaxExclusiveAsLONGLONG();
+ unsigned LONGLONG getMaxExclusiveAsUnsignedLONGLONG();
+
double getMaxExclusiveAsDouble();
struct tm getMaxExclusiveAsStructTM();
@@ -55,6 +59,7 @@
union
{
LONGLONG longlongMaxExclusive;
+ unsigned LONGLONG unsignedLongLongMaxExclusive;
double doubleMaxExclusive;
struct tm structTMMaxExclusive;
} m_MaxExclusive;
1.2 +11 -0 ws-axis/c/src/soap/xsd/constraints/MaxInclusive.cpp
Index: MaxInclusive.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/constraints/MaxInclusive.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MaxInclusive.cpp 24 Jan 2005 17:21:26 -0000 1.1
+++ MaxInclusive.cpp 25 Jan 2005 11:26:39 -0000 1.2
@@ -8,6 +8,12 @@
m_isSet = true;
}
+ MaxInclusive::MaxInclusive(unsigned LONGLONG maxInclusive)
+ {
+ m_MaxInclusive.unsignedLongLongMaxInclusive = maxInclusive;
+ m_isSet = true;
+ }
+
MaxInclusive::MaxInclusive(double maxInclusive)
{
m_MaxInclusive.doubleMaxInclusive = maxInclusive;
@@ -28,6 +34,11 @@
LONGLONG MaxInclusive::getMaxInclusiveAsLONGLONG()
{
return m_MaxInclusive.longlongMaxInclusive;
+ }
+
+ unsigned LONGLONG MaxInclusive::getMaxInclusiveAsUnsignedLONGLONG()
+ {
+ return m_MaxInclusive.unsignedLongLongMaxInclusive;
}
double MaxInclusive::getMaxInclusiveAsDouble()
1.2 +5 -0 ws-axis/c/src/soap/xsd/constraints/MaxInclusive.hpp
Index: MaxInclusive.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/constraints/MaxInclusive.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MaxInclusive.hpp 24 Jan 2005 17:21:26 -0000 1.1
+++ MaxInclusive.hpp 25 Jan 2005 11:26:39 -0000 1.2
@@ -40,12 +40,16 @@
MaxInclusive();
MaxInclusive(LONGLONG maxInclusive);
+
+ MaxInclusive(unsigned LONGLONG maxInclusive);
MaxInclusive(double maxInclusive);
MaxInclusive(struct tm maxInclusive);
LONGLONG getMaxInclusiveAsLONGLONG();
+
+ unsigned LONGLONG getMaxInclusiveAsUnsignedLONGLONG();
double getMaxInclusiveAsDouble();
@@ -55,6 +59,7 @@
union
{
LONGLONG longlongMaxInclusive;
+ unsigned LONGLONG unsignedLongLongMaxInclusive;
double doubleMaxInclusive;
struct tm structTMMaxInclusive;
} m_MaxInclusive;
1.2 +11 -0 ws-axis/c/src/soap/xsd/constraints/MinExclusive.cpp
Index: MinExclusive.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/constraints/MinExclusive.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MinExclusive.cpp 24 Jan 2005 17:21:26 -0000 1.1
+++ MinExclusive.cpp 25 Jan 2005 11:26:39 -0000 1.2
@@ -8,6 +8,12 @@
m_isSet = true;
}
+ MinExclusive::MinExclusive(unsigned LONGLONG minExclusive)
+ {
+ m_MinExclusive.unsignedLongLongMinExclusive = minExclusive;
+ m_isSet = true;
+ }
+
MinExclusive::MinExclusive(double minExclusive)
{
m_MinExclusive.doubleMinExclusive = minExclusive;
@@ -28,6 +34,11 @@
LONGLONG MinExclusive::getMinExclusiveAsLONGLONG()
{
return m_MinExclusive.longlongMinExclusive;
+ }
+
+ unsigned LONGLONG MinExclusive::getMinExclusiveAsUnsignedLONGLONG()
+ {
+ return m_MinExclusive.unsignedLongLongMinExclusive;
}
double MinExclusive::getMinExclusiveAsDouble()
1.2 +5 -0 ws-axis/c/src/soap/xsd/constraints/MinExclusive.hpp
Index: MinExclusive.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/constraints/MinExclusive.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MinExclusive.hpp 24 Jan 2005 17:21:26 -0000 1.1
+++ MinExclusive.hpp 25 Jan 2005 11:26:39 -0000 1.2
@@ -40,12 +40,16 @@
MinExclusive();
MinExclusive(LONGLONG minExclusive);
+
+ MinExclusive(unsigned LONGLONG minExclusive);
MinExclusive(double minExclusive);
MinExclusive(struct tm minExclusive);
LONGLONG getMinExclusiveAsLONGLONG();
+
+ unsigned LONGLONG getMinExclusiveAsUnsignedLONGLONG();
double getMinExclusiveAsDouble();
@@ -55,6 +59,7 @@
union
{
LONGLONG longlongMinExclusive;
+ unsigned LONGLONG unsignedLongLongMinExclusive;
double doubleMinExclusive;
struct tm structTMMinExclusive;
} m_MinExclusive;
1.2 +11 -0 ws-axis/c/src/soap/xsd/constraints/MinInclusive.cpp
Index: MinInclusive.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/constraints/MinInclusive.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MinInclusive.cpp 24 Jan 2005 15:41:25 -0000 1.1
+++ MinInclusive.cpp 25 Jan 2005 11:26:39 -0000 1.2
@@ -8,6 +8,12 @@
m_isSet = true;
}
+ MinInclusive::MinInclusive(unsigned LONGLONG minInclusive)
+ {
+ m_MinInclusive.unsignedLongLongMinInclusive = minInclusive;
+ m_isSet = true;
+ }
+
MinInclusive::MinInclusive(double minInclusive)
{
m_MinInclusive.doubleMinInclusive = minInclusive;
@@ -28,6 +34,11 @@
LONGLONG MinInclusive::getMinInclusiveAsLONGLONG()
{
return m_MinInclusive.longlongMinInclusive;
+ }
+
+ unsigned LONGLONG MinInclusive::getMinInclusiveAsUnsignedLONGLONG()
+ {
+ return m_MinInclusive.unsignedLongLongMinInclusive;
}
double MinInclusive::getMinInclusiveAsDouble()
1.2 +5 -0 ws-axis/c/src/soap/xsd/constraints/MinInclusive.hpp
Index: MinInclusive.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/xsd/constraints/MinInclusive.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MinInclusive.hpp 24 Jan 2005 15:41:25 -0000 1.1
+++ MinInclusive.hpp 25 Jan 2005 11:26:39 -0000 1.2
@@ -41,12 +41,16 @@
MinInclusive(LONGLONG minInclusive);
+ MinInclusive(unsigned LONGLONG minInclusive);
+
MinInclusive(double minInclusive);
MinInclusive(struct tm minInclusive);
LONGLONG getMinInclusiveAsLONGLONG();
+ unsigned LONGLONG getMinInclusiveAsUnsignedLONGLONG();
+
double getMinInclusiveAsDouble();
struct tm getMinInclusiveAsStructTM();
@@ -55,6 +59,7 @@
union
{
LONGLONG longlongMinInclusive;
+ unsigned LONGLONG unsignedLongLongMinInclusive;
double doubleMinInclusive;
struct tm structTMMinInclusive;
} m_MinInclusive;