cargilld 2005/02/25 10:30:46
Modified: c/tests/XSValueTest XSValueTest.cpp
Log:
Attempt to fix compiler errors.
Revision Changes Path
1.15 +41 -22 xml-xerces/c/tests/XSValueTest/XSValueTest.cpp
Index: XSValueTest.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/XSValueTest/XSValueTest.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XSValueTest.cpp 25 Feb 2005 09:38:23 -0000 1.14
+++ XSValueTest.cpp 25 Feb 2005 18:30:46 -0000 1.15
@@ -17,6 +17,9 @@
/*
* $Id$
* $Log$
+* Revision 1.15 2005/02/25 18:30:46 cargilld
+* Attempt to fix compiler errors.
+*
* Revision 1.14 2005/02/25 09:38:23 gareth
* Fix for compile under gcc 4. Patch by Scott Cantor.
*
@@ -785,10 +788,12 @@
const char lex_iv_2[]="1234.56.789";
XSValue::XSValue_Data act_v_ran_v_1; act_v_ran_v_1.fValue.f_double =
(double)1234.567;
+#if defined(XML_BITSTOBUILD_64)
XSValue::XSValue_Data act_v_ran64_v_1; act_v_ran64_v_1.fValue.f_double =
(double)18446744073709551615.999;
XSValue::XSValue_Data act_v_ran64_v_2; act_v_ran64_v_2.fValue.f_double =
(double)999.18446744073709551615;
//XSValue::XSValue_Data act_v_ran64_iv_1;="18446744073709551616.999";
//XSValue::XSValue_Data act_v_ran64_iv_2;="999.18446744073709551616";
+#endif
XSValue::XSValue_Data act_v_ran32_v_1; act_v_ran32_v_1.fValue.f_double =
(double)4294967295.999;
XSValue::XSValue_Data act_v_ran32_v_2; act_v_ran32_v_2.fValue.f_double =
(double)999.4294967295;
@@ -1350,8 +1355,10 @@
const char lex_v_ran32_iv_2[]="-2147483649";
XSValue::XSValue_Data act_v_ran_v_1; act_v_ran_v_1.fValue.f_long =
(long)1234;
+#if defined(XML_BITSTOBUILD_64)
XSValue::XSValue_Data act_v_ran64_v_1; act_v_ran64_v_1.fValue.f_long =
(long)+9223372036854775807;
XSValue::XSValue_Data act_v_ran64_v_2; act_v_ran64_v_2.fValue.f_long =
(long)-9223372036854775808;
+#endif
XSValue::XSValue_Data act_v_ran32_v_1; act_v_ran32_v_1.fValue.f_long =
(long)+2147483647;
XSValue::XSValue_Data act_v_ran32_v_2; act_v_ran32_v_2.fValue.f_long =
(long)-2147483648;
@@ -1439,12 +1446,12 @@
#else
ACTVALUE_TEST(lex_v_ran32_v_1, dt, toValidate, EXP_RET_VALUE_TRUE,
DONT_CARE, act_v_ran32_v_1);
ACTVALUE_TEST(lex_v_ran32_v_2, dt, toValidate, EXP_RET_VALUE_TRUE,
DONT_CARE, act_v_ran32_v_2);
- ACTVALUE_TEST(lex_v_ran32_iv_1, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0003, act_v_ran64_v_1);
- ACTVALUE_TEST(lex_v_ran32_iv_2, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0003, act_v_ran64_v_1);
+ ACTVALUE_TEST(lex_v_ran32_iv_1, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0003, act_v_ran32_v_1);
+ ACTVALUE_TEST(lex_v_ran32_iv_2, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0003, act_v_ran32_v_1);
#endif
- ACTVALUE_TEST(lex_iv_1, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0002, act_v_ran64_v_1);
- ACTVALUE_TEST(lex_iv_2, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0002, act_v_ran64_v_1);
+ ACTVALUE_TEST(lex_iv_1, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0002, act_v_ran32_v_1);
+ ACTVALUE_TEST(lex_iv_2, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0002, act_v_ran32_v_1);
}
/***
@@ -1503,7 +1510,9 @@
const char lex_v_ran32_iv_2[]="-2147483649";
XSValue::XSValue_Data act_v_ran_v_1; act_v_ran_v_1.fValue.f_long =
(long)-1234;
+#if defined(XML_BITSTOBUILD_64)
XSValue::XSValue_Data act_v_ran64_v_2; act_v_ran64_v_2.fValue.f_long =
(long)-9223372036854775808;
+#endif
XSValue::XSValue_Data act_v_ran32_v_2; act_v_ran32_v_2.fValue.f_long =
(long)-2147483648;
const char lex_v_ran64_v_2_canrep[]="-9223372036854775808";
@@ -1586,11 +1595,11 @@
ACTVALUE_TEST(lex_v_ran64_iv_2, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0003, act_v_ran64_v_2);
#else
ACTVALUE_TEST(lex_v_ran32_v_2, dt, toValidate, EXP_RET_VALUE_TRUE,
DONT_CARE, act_v_ran32_v_2);
- ACTVALUE_TEST(lex_v_ran32_iv_2, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0003, act_v_ran64_v_2);
+ ACTVALUE_TEST(lex_v_ran32_iv_2, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0003, act_v_ran32_v_2);
#endif
- ACTVALUE_TEST(lex_iv_1, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0002, act_v_ran64_v_2);
- ACTVALUE_TEST(lex_iv_2, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0002, act_v_ran64_v_2);
+ ACTVALUE_TEST(lex_iv_1, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0002, act_v_ran32_v_2);
+ ACTVALUE_TEST(lex_iv_2, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0002, act_v_ran32_v_2);
}
/***
@@ -1647,7 +1656,9 @@
const char lex_v_ran32_iv_2[]="-2147483649";
XSValue::XSValue_Data act_v_ran_v_1; act_v_ran_v_1.fValue.f_long =
(long)-1234;
+#if defined(XML_BITSTOBUILD_64)
XSValue::XSValue_Data act_v_ran64_v_2; act_v_ran64_v_2.fValue.f_long =
(long)-9223372036854775808;
+#endif
XSValue::XSValue_Data act_v_ran32_v_2; act_v_ran32_v_2.fValue.f_long =
(long)-2147483648;
const char lex_v_ran64_v_2_canrep[]="-9223372036854775808";
@@ -1789,8 +1800,10 @@
const char lex_v_ran32_iv_2[]="-2147483649";
XSValue::XSValue_Data act_v_ran_v_1; act_v_ran_v_1.fValue.f_long =
(long)1234;
+#if defined(XML_BITSTOBUILD_64)
XSValue::XSValue_Data act_v_ran64_v_1; act_v_ran64_v_1.fValue.f_long =
(long)+9223372036854775807;
XSValue::XSValue_Data act_v_ran64_v_2; act_v_ran64_v_2.fValue.f_long =
(long)-9223372036854775808;
+#endif
XSValue::XSValue_Data act_v_ran32_v_1; act_v_ran32_v_1.fValue.f_long =
(long)+2147483647;
XSValue::XSValue_Data act_v_ran32_v_2; act_v_ran32_v_2.fValue.f_long =
(long)-2147483648;
@@ -1880,12 +1893,12 @@
#else
ACTVALUE_TEST(lex_v_ran32_v_1, dt, toValidate, EXP_RET_VALUE_TRUE,
DONT_CARE, act_v_ran32_v_1);
ACTVALUE_TEST(lex_v_ran32_v_2, dt, toValidate, EXP_RET_VALUE_TRUE,
DONT_CARE, act_v_ran32_v_2);
- ACTVALUE_TEST(lex_v_ran32_iv_1, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0003, act_v_ran64_v_1);
- ACTVALUE_TEST(lex_v_ran32_iv_2, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0003, act_v_ran64_v_1);
+ ACTVALUE_TEST(lex_v_ran32_iv_1, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0003, act_v_ran32_v_1);
+ ACTVALUE_TEST(lex_v_ran32_iv_2, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0003, act_v_ran32_v_1);
#endif
- ACTVALUE_TEST(lex_iv_1, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0002, act_v_ran64_v_1);
- ACTVALUE_TEST(lex_iv_2, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0002, act_v_ran64_v_1);
+ ACTVALUE_TEST(lex_iv_1, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0002, act_v_ran32_v_1);
+ ACTVALUE_TEST(lex_iv_2, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0002, act_v_ran32_v_1);
}
/***
@@ -2408,7 +2421,9 @@
const char lex_v_ran32_iv_2[]="4294967296";
XSValue::XSValue_Data act_v_ran_v_1; act_v_ran_v_1.fValue.f_ulong =
(unsigned long)1234;
+#if defined(XML_BITSTOBUILD_64)
XSValue::XSValue_Data act_v_ran64_v_2; act_v_ran64_v_2.fValue.f_ulong =
(unsigned long)+18446744073709551615;
+#endif
XSValue::XSValue_Data act_v_ran32_v_2; act_v_ran32_v_2.fValue.f_ulong =
(unsigned long)4294967295;
const char lex_v_ran64_v_2_canrep[]="18446744073709551615";
@@ -2491,11 +2506,11 @@
ACTVALUE_TEST(lex_v_ran64_iv_2, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0003, act_v_ran64_v_2);
#else
ACTVALUE_TEST(lex_v_ran32_v_2, dt, toValidate, EXP_RET_VALUE_TRUE,
DONT_CARE, act_v_ran32_v_2);
- ACTVALUE_TEST(lex_v_ran32_iv_2, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0003, act_v_ran64_v_2);
+ ACTVALUE_TEST(lex_v_ran32_iv_2, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0003, act_v_ran32_v_2);
#endif
- ACTVALUE_TEST(lex_iv_1, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0002, act_v_ran64_v_2);
- ACTVALUE_TEST(lex_iv_2, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0002, act_v_ran64_v_2);
+ ACTVALUE_TEST(lex_iv_1, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0002, act_v_ran32_v_2);
+ ACTVALUE_TEST(lex_iv_2, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0002, act_v_ran32_v_2);
}
/***
@@ -2556,8 +2571,10 @@
const char lex_v_ran32_iv_2[]="-1";
XSValue::XSValue_Data act_v_ran_v_1; act_v_ran_v_1.fValue.f_ulong =
(unsigned long)1234;
+#if defined(XML_BITSTOBUILD_64)
XSValue::XSValue_Data act_v_ran64_v_1; act_v_ran64_v_1.fValue.f_ulong =
(unsigned long)+18446744073709551615;
XSValue::XSValue_Data act_v_ran64_v_2; act_v_ran64_v_2.fValue.f_ulong =
(unsigned long)0;
+#endif
XSValue::XSValue_Data act_v_ran32_v_1; act_v_ran32_v_1.fValue.f_ulong =
(unsigned long)+4294967295;
XSValue::XSValue_Data act_v_ran32_v_2; act_v_ran32_v_2.fValue.f_ulong =
(unsigned long)0;
@@ -2647,12 +2664,12 @@
#else
ACTVALUE_TEST(lex_v_ran32_v_1, dt, toValidate, EXP_RET_VALUE_TRUE,
DONT_CARE, act_v_ran32_v_1);
ACTVALUE_TEST(lex_v_ran32_v_2, dt, toValidate, EXP_RET_VALUE_TRUE,
DONT_CARE, act_v_ran32_v_2);
- ACTVALUE_TEST(lex_v_ran32_iv_1, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0003, act_v_ran64_v_1);
- ACTVALUE_TEST(lex_v_ran32_iv_2, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0002, act_v_ran64_v_1);
+ ACTVALUE_TEST(lex_v_ran32_iv_1, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0003, act_v_ran32_v_1);
+ ACTVALUE_TEST(lex_v_ran32_iv_2, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0002, act_v_ran32_v_1);
#endif
- ACTVALUE_TEST(lex_iv_1, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0002, act_v_ran64_v_1);
- ACTVALUE_TEST(lex_iv_2, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0002, act_v_ran64_v_1);
+ ACTVALUE_TEST(lex_iv_1, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0002, act_v_ran32_v_1);
+ ACTVALUE_TEST(lex_iv_2, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0002, act_v_ran32_v_1);
}
/***
@@ -3167,7 +3184,9 @@
const char lex_v_ran32_iv_2[]="4294967296";
XSValue::XSValue_Data act_v_ran_v_1; act_v_ran_v_1.fValue.f_ulong =
(unsigned long)1234;
+#if defined(XML_BITSTOBUILD_64)
XSValue::XSValue_Data act_v_ran64_v_2; act_v_ran64_v_2.fValue.f_ulong =
(unsigned long)+18446744073709551615;
+#endif
XSValue::XSValue_Data act_v_ran32_v_2; act_v_ran32_v_2.fValue.f_ulong =
(unsigned long)+4294967295;
const char lex_v_ran64_v_2_canrep[]="18446744073709551615";
@@ -3249,11 +3268,11 @@
ACTVALUE_TEST(lex_v_ran64_iv_2, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0003, act_v_ran64_v_2);
#else
ACTVALUE_TEST(lex_v_ran32_v_2, dt, toValidate, EXP_RET_VALUE_TRUE,
DONT_CARE, act_v_ran32_v_2);
- ACTVALUE_TEST(lex_v_ran32_iv_2, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0003, act_v_ran64_v_2);
+ ACTVALUE_TEST(lex_v_ran32_iv_2, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0003, act_v_ran32_v_2);
#endif
- ACTVALUE_TEST(lex_iv_1, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0002, act_v_ran64_v_2);
- ACTVALUE_TEST(lex_iv_2, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0002, act_v_ran64_v_2);
+ ACTVALUE_TEST(lex_iv_1, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0002, act_v_ran32_v_2);
+ ACTVALUE_TEST(lex_iv_2, dt, toValidate, EXP_RET_VALUE_FALSE,
XSValue::st_FOCA0002, act_v_ran32_v_2);
}
/***
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
