You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ro...@apache.org on 2007/06/23 10:01:54 UTC
svn commit: r550023 - in /incubator/tuscany/cpp/sdo/runtime/core:
src/commonj/sdo/ test/
Author: robbinspg
Date: Sat Jun 23 01:01:53 2007
New Revision: 550023
URL: http://svn.apache.org/viewvc?view=rev&rev=550023
Log:
TUSCANY-1367 rename IntegerType to IntType
Modified:
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/ChangeSummaryImpl.cpp
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/CopyHelper.cpp
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataFactoryImpl.cpp
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataObjectImpl.cpp
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/EqualityHelper.cpp
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSAX2Parser.cpp
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/Setting.cpp
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/Type.h
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeImpl.cpp
incubator/tuscany/cpp/sdo/runtime/core/test/SdoGenerate.cpp
incubator/tuscany/cpp/sdo/runtime/core/test/utils.cpp
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/ChangeSummaryImpl.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/ChangeSummaryImpl.cpp?view=diff&rev=550023&r1=550022&r2=550023
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/ChangeSummaryImpl.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/ChangeSummaryImpl.cpp Sat Jun 23 01:01:53 2007
@@ -468,7 +468,7 @@
*(long*)*value = (long)ob->getCharacter(prop);
}
break;
- case Type::IntegerType:
+ case Type::IntType:
*value = new long;
if (!ob->isSet(prop) && !prop.isDefaulted())
{
@@ -535,7 +535,7 @@
}
break;
case Type::BigDecimalType:
- case Type::BigIntegerType:
+ case Type::BigIntType:
case Type::StringType:
case Type::UriType:
if (!ob->isSet(prop) && !prop.isDefaulted())
@@ -634,7 +634,7 @@
*(long*)*value = (long)listob->getCharacter();
}
break;
- case Type::IntegerType:
+ case Type::IntType:
*value = new long;
if (!ob->isSet(prop) && !prop.isDefaulted())
{
@@ -701,7 +701,7 @@
}
break;
case Type::BigDecimalType:
- case Type::BigIntegerType:
+ case Type::BigIntType:
case Type::StringType:
case Type::UriType:
if (!ob->isSet(prop) && !prop.isDefaulted())
@@ -977,7 +977,7 @@
// case Type::CharacterType:
// cout << "Character:" << sl[j].getCharacterValue();
// break;
-// case Type::IntegerType:
+// case Type::IntType:
// cout << "Integer:" << sl[j].getIntegerValue();
// break;
// case Type::ShortType:
@@ -996,7 +996,7 @@
// cout << "Date:" << sl[j].getDateValue().getTime();
// break;
// case Type::BigDecimalType:
-// case Type::BigIntegerType:
+// case Type::BigIntType:
// case Type::StringType:
// case Type::UriType:
// {
@@ -1237,7 +1237,7 @@
case Type::ByteType:
case Type::CharacterType:
- case Type::IntegerType:
+ case Type::IntType:
case Type::ShortType:
*value = new char[sizeof(long)];
*(long*)*value = atoi(c);
@@ -1269,7 +1269,7 @@
return sizeof(time_t);
case Type::BigDecimalType:
- case Type::BigIntegerType:
+ case Type::BigIntType:
case Type::StringType:
case Type::UriType:
{
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/CopyHelper.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/CopyHelper.cpp?view=diff&rev=550023&r1=550022&r2=550023
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/CopyHelper.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/CopyHelper.cpp Sat Jun 23 01:01:53 2007
@@ -60,7 +60,7 @@
case Type::CharacterType:
to->setCharacter( p, from->getCharacter(p));
break;
- case Type::IntegerType:
+ case Type::IntType:
to->setInteger( p, from->getInteger(p));
break;
case Type::ShortType:
@@ -79,7 +79,7 @@
to->setDate( p, from->getDate(p));
break;
case Type::BigDecimalType:
- case Type::BigIntegerType:
+ case Type::BigIntType:
case Type::UriType:
case Type::StringType:
{
@@ -136,11 +136,11 @@
to.append(from.getCharacter(i));
break;
#if __WORDSIZE ==64
- case Type::IntegerType:
+ case Type::IntType:
to.append((int64_t)(from.getInteger(i)));
break;
#else
- case Type::IntegerType:
+ case Type::IntType:
to.append(from.getInteger(i));
break;
#endif
@@ -160,7 +160,7 @@
to.append(from.getDate(i));
break;
case Type::BigDecimalType:
- case Type::BigIntegerType:
+ case Type::BigIntType:
case Type::UriType:
case Type::StringType:
{
@@ -219,7 +219,7 @@
case Type::CharacterType:
to->addCharacter( p, from->getCharacterValue(index));
break;
- case Type::IntegerType:
+ case Type::IntType:
to->addInteger( p, from->getIntegerValue(index));
break;
case Type::ShortType:
@@ -238,7 +238,7 @@
to->addDate( p, from->getDateValue(index));
break;
case Type::BigDecimalType:
- case Type::BigIntegerType:
+ case Type::BigIntType:
case Type::UriType:
case Type::StringType:
{
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataFactoryImpl.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataFactoryImpl.cpp?view=diff&rev=550023&r1=550022&r2=550023
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataFactoryImpl.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataFactoryImpl.cpp Sat Jun 23 01:01:53 2007
@@ -2009,7 +2009,7 @@
break;
- case Type::IntegerType:
+ case Type::IntType:
fprintf(header," long get%s();\n",pname);
fprintf(body, "long %s::get%s\n{\n",name, pname);
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataObjectImpl.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataObjectImpl.cpp?view=diff&rev=550023&r1=550022&r2=550023
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataObjectImpl.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataObjectImpl.cpp Sat Jun 23 01:01:53 2007
@@ -130,7 +130,7 @@
case Type::ByteType:
return BYTE_SIZE;
case Type::ShortType:
- case Type::IntegerType:
+ case Type::IntType:
case Type::LongType:
return MAX_LONG_SIZE;
case Type::FloatType:
@@ -138,7 +138,7 @@
case Type::DoubleType:
return MAX_DOUBLE_SIZE;
case Type::BigDecimalType:
- case Type::BigIntegerType:
+ case Type::BigIntType:
case Type::UriType:
case Type::StringType:
return getString(p,0,0);
@@ -158,7 +158,7 @@
case Type::ByteType:
return BYTE_SIZE;
case Type::ShortType:
- case Type::IntegerType:
+ case Type::IntType:
case Type::LongType:
return MAX_LONG_SIZE;
case Type::FloatType:
@@ -166,7 +166,7 @@
case Type::DoubleType:
return MAX_DOUBLE_SIZE;
case Type::BigDecimalType:
- case Type::BigIntegerType:
+ case Type::BigIntType:
case Type::UriType:
case Type::StringType:
return getString(0,0);
@@ -1099,7 +1099,7 @@
}
break;
- case Type::IntegerType:
+ case Type::IntType:
{
long ic = atol(PropertyValue.c_str());
if (ic == list[li]->getInteger(p)) ok = 1;
@@ -1149,7 +1149,7 @@
case Type::BytesType:
case Type::BigDecimalType:
- case Type::BigIntegerType:
+ case Type::BigIntType:
case Type::StringType:
case Type::UriType:
{
@@ -2655,14 +2655,14 @@
case Type::BooleanType:
case Type::ByteType:
case Type::CharacterType:
- case Type::IntegerType:
+ case Type::IntType:
case Type::ShortType:
case Type::DoubleType:
case Type::FloatType:
case Type::LongType:
case Type::DateType:
case Type::BigDecimalType:
- case Type::BigIntegerType:
+ case Type::BigIntType:
case Type::StringType:
case Type::BytesType:
case Type::UriType:
@@ -2687,11 +2687,11 @@
case Type::BooleanType:
case Type::ByteType:
case Type::CharacterType:
- case Type::IntegerType:
+ case Type::IntType:
case Type::ShortType:
case Type::LongType:
case Type::BigDecimalType:
- case Type::BigIntegerType:
+ case Type::BigIntType:
case Type::StringType:
case Type::UriType:
case Type::BytesType:
@@ -2725,14 +2725,14 @@
case Type::BooleanType:
case Type::ByteType:
case Type::CharacterType:
- case Type::IntegerType:
+ case Type::IntType:
case Type::ShortType:
case Type::DoubleType:
case Type::FloatType:
case Type::LongType:
case Type::DateType:
case Type::BigDecimalType:
- case Type::BigIntegerType:
+ case Type::BigIntType:
case Type::StringType:
case Type::UriType:
case Type::BytesType:
@@ -2763,14 +2763,14 @@
case Type::BooleanType:
case Type::ByteType:
case Type::CharacterType:
- case Type::IntegerType:
+ case Type::IntType:
case Type::ShortType:
case Type::DoubleType:
case Type::FloatType:
case Type::LongType:
case Type::DateType:
case Type::BigDecimalType:
- case Type::BigIntegerType:
+ case Type::BigIntType:
case Type::StringType:
case Type::UriType:
case Type::BytesType:
@@ -2798,7 +2798,7 @@
switch (getTypeEnum())
{
case Type::BigDecimalType:
- case Type::BigIntegerType:
+ case Type::BigIntType:
case Type::UriType:
case Type::StringType:
case Type::BytesType:
@@ -2806,7 +2806,7 @@
case Type::CharacterType:
case Type::ByteType:
case Type::ShortType:
- case Type::IntegerType:
+ case Type::IntType:
case Type::LongType:
sdoValue = SDOValue(invalue, len);
break;
@@ -2836,13 +2836,13 @@
{
case Type::BytesType:
case Type::BigDecimalType:
- case Type::BigIntegerType:
+ case Type::BigIntType:
case Type::UriType:
case Type::StringType:
case Type::BooleanType:
case Type::ByteType:
case Type::CharacterType:
- case Type::IntegerType:
+ case Type::IntType:
case Type::ShortType:
case Type::LongType:
sdoValue = SDOValue(invalue, len);
@@ -2874,14 +2874,14 @@
case Type::BooleanType:
case Type::ByteType:
case Type::CharacterType:
- case Type::IntegerType:
+ case Type::IntType:
case Type::ShortType:
case Type::DoubleType:
case Type::FloatType:
case Type::LongType:
case Type::DateType:
case Type::BigDecimalType:
- case Type::BigIntegerType:
+ case Type::BigIntType:
case Type::StringType:
case Type::UriType:
case Type::BytesType:
@@ -2912,7 +2912,7 @@
case Type::BooleanType:
case Type::ByteType:
case Type::CharacterType:
- case Type::IntegerType:
+ case Type::IntType:
case Type::ShortType:
case Type::DoubleType:
case Type::FloatType:
@@ -2922,7 +2922,7 @@
break;
case Type::BigDecimalType:
- case Type::BigIntegerType:
+ case Type::BigIntType:
case Type::StringType:
case Type::UriType:
case Type::BytesType:
@@ -2949,7 +2949,7 @@
case Type::BooleanType:
case Type::ByteType:
case Type::CharacterType:
- case Type::IntegerType:
+ case Type::IntType:
case Type::ShortType:
case Type::DoubleType:
case Type::FloatType:
@@ -2959,7 +2959,7 @@
break;
case Type::BigDecimalType:
- case Type::BigIntegerType:
+ case Type::BigIntType:
case Type::StringType:
case Type::UriType:
case Type::BytesType:
@@ -2988,14 +2988,14 @@
case Type::BooleanType:
case Type::ByteType:
case Type::CharacterType:
- case Type::IntegerType:
+ case Type::IntType:
case Type::ShortType:
case Type::DoubleType:
case Type::FloatType:
case Type::LongType:
case Type::DateType:
case Type::BigDecimalType:
- case Type::BigIntegerType:
+ case Type::BigIntType:
case Type::StringType:
case Type::UriType:
case Type::BytesType:
@@ -3026,14 +3026,14 @@
case Type::BooleanType:
case Type::ByteType:
case Type::CharacterType:
- case Type::IntegerType:
+ case Type::IntType:
case Type::ShortType:
case Type::DoubleType:
case Type::FloatType:
case Type::LongType:
case Type::DateType:
case Type::BigDecimalType:
- case Type::BigIntegerType:
+ case Type::BigIntType:
case Type::StringType:
case Type::UriType:
case Type::BytesType:
@@ -3068,14 +3068,14 @@
case Type::BooleanType:
case Type::ByteType:
case Type::CharacterType:
- case Type::IntegerType:
+ case Type::IntType:
case Type::ShortType:
case Type::DoubleType:
case Type::FloatType:
case Type::LongType:
case Type::DateType:
case Type::BigDecimalType:
- case Type::BigIntegerType:
+ case Type::BigIntType:
case Type::StringType:
case Type::UriType:
case Type::BytesType:
@@ -3104,14 +3104,14 @@
{
case Type::ByteType:
case Type::CharacterType:
- case Type::IntegerType:
+ case Type::IntType:
case Type::ShortType:
case Type::DoubleType:
case Type::FloatType:
case Type::LongType:
case Type::DateType:
case Type::BigDecimalType:
- case Type::BigIntegerType:
+ case Type::BigIntType:
case Type::StringType:
case Type::UriType:
case Type::BytesType:
@@ -3149,14 +3149,14 @@
case Type::BooleanType:
case Type::ByteType:
case Type::CharacterType:
- case Type::IntegerType:
+ case Type::IntType:
case Type::ShortType:
case Type::DoubleType:
case Type::FloatType:
case Type::LongType:
case Type::DateType:
case Type::BigDecimalType:
- case Type::BigIntegerType:
+ case Type::BigIntType:
case Type::StringType:
case Type::BytesType:
case Type::UriType:
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/EqualityHelper.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/EqualityHelper.cpp?view=diff&rev=550023&r1=550022&r2=550023
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/EqualityHelper.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/EqualityHelper.cpp Sat Jun 23 01:01:53 2007
@@ -43,7 +43,7 @@
return (to->getByte(p) == from->getByte(p));
case Type::CharacterType:
return (to->getCharacter(p) == from->getCharacter(p));
- case Type::IntegerType:
+ case Type::IntType:
return (to->getInteger(p) == from->getInteger(p));
case Type::ShortType:
return (to->getShort(p) == from->getShort(p));
@@ -56,7 +56,7 @@
case Type::DateType:
return (to->getDate(p).getTime() == from->getDate(p).getTime());
case Type::BigDecimalType:
- case Type::BigIntegerType:
+ case Type::BigIntType:
case Type::UriType:
case Type::StringType:
{
@@ -153,7 +153,7 @@
return true;
}
- case Type::IntegerType:
+ case Type::IntType:
{
for (unsigned int i=0;i< from.size(); i++)
{
@@ -225,7 +225,7 @@
}
case Type::BigDecimalType:
- case Type::BigIntegerType:
+ case Type::BigIntType:
case Type::UriType:
case Type::StringType:
{
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSAX2Parser.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSAX2Parser.cpp?view=diff&rev=550023&r1=550022&r2=550023
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSAX2Parser.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSAX2Parser.cpp Sat Jun 23 01:01:53 2007
@@ -290,7 +290,7 @@
case Type::ShortType:
((DataObjectImpl*)dob)->defineShort(propname);
break;
- case Type::IntegerType:
+ case Type::IntType:
((DataObjectImpl*)dob)->defineInteger(propname);
break;
case Type::LongType:
@@ -533,7 +533,7 @@
currentPropertySetting = PropertySetting(currentDataObject, propertyName,
bToBeNull);
break;
- case Type::IntegerType:
+ case Type::IntType:
pprop = ((DataObjectImpl*)dob)->defineInteger(propertyName);
currentPropertySetting = PropertySetting(currentDataObject, propertyName,
bToBeNull);
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/Setting.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/Setting.cpp?view=diff&rev=550023&r1=550022&r2=550023
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/Setting.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/Setting.cpp Sat Jun 23 01:01:53 2007
@@ -55,7 +55,7 @@
value = new long;
*(long*)value = (long)s.getCharacterValue();
break;
- case Type::IntegerType:
+ case Type::IntType:
value = new long;
*(long*)value = (long)s.getIntegerValue();
break;
@@ -80,7 +80,7 @@
*(long*)value = long(s.getDateValue().getTime());
break;
case Type::BigDecimalType:
- case Type::BigIntegerType:
+ case Type::BigIntType:
case Type::StringType:
case Type::UriType:
value = new wchar_t[length];
@@ -120,7 +120,7 @@
case Type::BooleanType:
case Type::ByteType:
case Type::CharacterType:
- case Type::IntegerType:
+ case Type::IntType:
case Type::ShortType:
delete (long*)value;
break;
@@ -137,7 +137,7 @@
delete (long*)value;
break;
case Type::BigDecimalType:
- case Type::BigIntegerType:
+ case Type::BigIntType:
case Type::StringType:
case Type::UriType:
delete[] (wchar_t*) value;
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/Type.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/Type.h?view=diff&rev=550023&r1=550022&r2=550023
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/Type.h (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/Type.h Sat Jun 23 01:01:53 2007
@@ -61,7 +61,7 @@
// Zero is a value for 'unknown type; - all data objects'
OtherTypes = 0,
BigDecimalType,
- BigIntegerType,
+ BigIntType,
BooleanType,
ByteType,
BytesType,
@@ -69,7 +69,7 @@
DateType,
DoubleType,
FloatType,
- IntegerType,
+ IntType,
LongType,
ShortType,
StringType,
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeImpl.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeImpl.cpp?view=diff&rev=550023&r1=550022&r2=550023
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeImpl.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeImpl.cpp Sat Jun 23 01:01:53 2007
@@ -854,7 +854,7 @@
case BooleanType:
case ByteType:
case CharacterType:
- case IntegerType:
+ case IntType:
case ShortType:
if (*value != 0)delete (char*)(*value);
*value = new char[sizeof(long)];
@@ -868,7 +868,7 @@
return sizeof(int64_t);
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case StringType:
case UriType:
if (*value != 0)delete (char*)(*value);
@@ -972,7 +972,7 @@
case ByteType:
case CharacterType:
- case IntegerType:
+ case IntType:
case ShortType:
if (*value != 0) delete ((char*)*value);
*value = new char[sizeof(long)];
@@ -1009,7 +1009,7 @@
return sizeof(time_t);
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case StringType:
case UriType:
{
@@ -1077,7 +1077,7 @@
case ByteType:
case CharacterType:
- case IntegerType:
+ case IntType:
case ShortType:
if (*value != 0) delete ((char*)*value);
@@ -1118,7 +1118,7 @@
return sizeof(time_t);
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case StringType:
case UriType:
{
@@ -1172,7 +1172,7 @@
switch (typeEnum)
{
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case UriType:
case StringType:
{
@@ -1235,7 +1235,7 @@
return sizeof(long);
case ShortType:
- case IntegerType:
+ case IntType:
{
if (*value != 0)delete ((char*)*value);
*value = new char[sizeof(long)];
@@ -1298,7 +1298,7 @@
}
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case UriType:
case StringType:
{
@@ -1345,7 +1345,7 @@
}
return sizeof(long);
- case IntegerType:
+ case IntType:
case ShortType:
{
if (*value != 0)delete ((char*)*value);
@@ -1410,7 +1410,7 @@
}
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case UriType:
case StringType:
{
@@ -1456,7 +1456,7 @@
}
return sizeof(long);
- case IntegerType:
+ case IntType:
case ShortType:
{
if (*value != 0)delete ((char*)*value);
@@ -1551,7 +1551,7 @@
case BooleanType:
case ByteType:
case CharacterType:
- case IntegerType:
+ case IntType:
case ShortType:
if (*value != 0) delete ((char*)*value);
*value = new char[sizeof(long)];
@@ -1583,7 +1583,7 @@
return sizeof(time_t);
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case StringType:
case UriType:
{
@@ -1645,7 +1645,7 @@
case BooleanType:
case ByteType:
case CharacterType:
- case IntegerType:
+ case IntType:
case ShortType:
if (*value != 0) delete ((char*)*value);
*value = new char[sizeof(long)];
@@ -1677,7 +1677,7 @@
return sizeof(time_t);
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case StringType:
case UriType:
{
@@ -1735,7 +1735,7 @@
case BooleanType:
case ByteType:
case CharacterType:
- case IntegerType:
+ case IntType:
case ShortType:
if (*value != 0) delete ((char*)*value);
*value = new char[sizeof(long)];
@@ -1767,7 +1767,7 @@
return sizeof(time_t);
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case StringType:
case UriType:
case BytesType:
@@ -1795,7 +1795,7 @@
case BooleanType:
case ByteType:
case CharacterType:
- case IntegerType:
+ case IntType:
case ShortType:
if (*value != 0) delete ((char*)*value);
*value = new char[sizeof(long)];
@@ -1827,7 +1827,7 @@
return sizeof(time_t);
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case StringType:
case UriType:
case BytesType:
@@ -1852,7 +1852,7 @@
case BooleanType:
case ByteType:
case CharacterType:
- case IntegerType:
+ case IntType:
case ShortType:
if (*value != 0) delete ((char*)*value);
*value = new char[sizeof(long)];
@@ -1884,7 +1884,7 @@
return sizeof(time_t);
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case StringType:
case UriType:
case BytesType:
@@ -1915,14 +1915,14 @@
case BooleanType:
case ByteType:
case CharacterType:
- case IntegerType:
+ case IntType:
case ShortType:
case DoubleType:
case FloatType:
case LongType:
case DateType:
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case StringType:
case BytesType:
case UriType:
@@ -1950,7 +1950,7 @@
{
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case UriType:
case StringType:
{
@@ -2012,7 +2012,7 @@
}
case ShortType:
- case IntegerType:
+ case IntType:
{
if (value == 0) return 0;
long tmp = *(long*)value;
@@ -2163,7 +2163,7 @@
switch (typeEnum)
{
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case UriType:
case StringType:
case BytesType:
@@ -2171,7 +2171,7 @@
case ByteType:
case CharacterType:
case ShortType:
- case IntegerType:
+ case IntType:
case LongType:
case DateType:
case DoubleType:
@@ -2211,7 +2211,7 @@
}
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case UriType:
case StringType:
{
@@ -2256,7 +2256,7 @@
}
case ShortType:
- case IntegerType:
+ case IntType:
{
if (value == 0) return 0;
long tmp = *(long*)value;
@@ -2333,14 +2333,14 @@
{
case BytesType:
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case UriType:
case StringType:
case BooleanType:
case CharacterType:
case ByteType:
case ShortType:
- case IntegerType:
+ case IntType:
case LongType:
case DateType:
case DoubleType:
@@ -2391,7 +2391,7 @@
}
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case UriType:
case StringType:
{
@@ -2435,7 +2435,7 @@
}
case ShortType:
- case IntegerType:
+ case IntType:
{
if (value == 0) return 0;
@@ -2563,7 +2563,7 @@
}
return *asstringbuf;
- case IntegerType:
+ case IntType:
*asstringbuf = new char[MAX_LONG_SIZE];
if (value == 0){
sprintf(*asstringbuf,"%ld",0);
@@ -2638,7 +2638,7 @@
return *asstringbuf;
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case StringType:
case UriType:
{
@@ -2701,14 +2701,14 @@
case BooleanType:
case ByteType:
case CharacterType:
- case IntegerType:
+ case IntType:
case ShortType:
case DoubleType:
case FloatType:
case LongType:
case DateType:
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case StringType:
case UriType:
case BytesType:
@@ -2736,7 +2736,7 @@
case BooleanType:
case ByteType:
case CharacterType:
- case IntegerType:
+ case IntType:
case ShortType:
if (value == 0) return false;
if (*(long*)value != 0) return true;
@@ -2783,7 +2783,7 @@
return false;
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case StringType:
case UriType:
if (value == 0 || len < 4)
@@ -2831,14 +2831,14 @@
case BooleanType:
case ByteType:
case CharacterType:
- case IntegerType:
+ case IntType:
case ShortType:
case DoubleType:
case FloatType:
case LongType:
case DateType:
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case StringType:
case UriType:
case BytesType:
@@ -2866,7 +2866,7 @@
case BooleanType:
case ByteType:
case CharacterType:
- case IntegerType:
+ case IntType:
case ShortType:
if (value == 0) return 0;
return (char)(*(long*)value);
@@ -2909,7 +2909,7 @@
return (char)(*(time_t*)value);
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case StringType:
case UriType:
{
@@ -2961,14 +2961,14 @@
case BooleanType:
case ByteType:
case CharacterType:
- case IntegerType:
+ case IntType:
case ShortType:
case DoubleType:
case FloatType:
case LongType:
case DateType:
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case StringType:
case UriType:
case BytesType:
@@ -2996,7 +2996,7 @@
case BooleanType:
case ByteType:
case CharacterType:
- case IntegerType:
+ case IntType:
case ShortType:
if (value == 0) return 0;
return (wchar_t)(*(long*)value);
@@ -3038,7 +3038,7 @@
return (wchar_t)(*(time_t*)value);
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case StringType:
case UriType:
{
@@ -3073,14 +3073,14 @@
case BooleanType:
case ByteType:
case CharacterType:
- case IntegerType:
+ case IntType:
case ShortType:
case DoubleType:
case FloatType:
case LongType:
case DateType:
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case StringType:
case UriType:
case BytesType:
@@ -3112,7 +3112,7 @@
case BooleanType:
case ByteType:
case CharacterType:
- case IntegerType:
+ case IntType:
case ShortType:
if (value == 0) return 0;
return (short)(*(long*)value);
@@ -3154,7 +3154,7 @@
return (short)(*(time_t*)value);
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case StringType:
case UriType:
if (value == 0 || len == 0)
@@ -3198,14 +3198,14 @@
case BooleanType:
case ByteType:
case CharacterType:
- case IntegerType:
+ case IntType:
case ShortType:
case DoubleType:
case FloatType:
case LongType:
case DateType:
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case StringType:
case UriType:
case BytesType:
@@ -3233,7 +3233,7 @@
case BooleanType:
case ByteType:
case CharacterType:
- case IntegerType:
+ case IntType:
case ShortType:
if (value == 0) return 0;
return (int)(*(long*)value);
@@ -3275,7 +3275,7 @@
return (int)(*(time_t*)value);
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case StringType:
case UriType:
if (value == 0)
@@ -3334,7 +3334,7 @@
case BooleanType:
case ByteType:
case CharacterType:
- case IntegerType:
+ case IntType:
case ShortType:
if (value == 0) return 0;
return (long)(*(long*)value);
@@ -3376,7 +3376,7 @@
return (long)(*(time_t*)value);
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case StringType:
case UriType:
if (value == 0)
@@ -3427,14 +3427,14 @@
case BooleanType:
case ByteType:
case CharacterType:
- case IntegerType:
+ case IntType:
case ShortType:
case DoubleType:
case FloatType:
case LongType:
case DateType:
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case StringType:
case UriType:
case BytesType:
@@ -3467,7 +3467,7 @@
case BooleanType:
case CharacterType:
case ByteType:
- case IntegerType:
+ case IntType:
case ShortType:
if (value == 0) return 0;
return (int64_t)(*(long*)value);
@@ -3509,7 +3509,7 @@
return (int64_t)(*(time_t*)value);
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case StringType:
case UriType:
if (value == 0)
@@ -3565,14 +3565,14 @@
case BooleanType:
case CharacterType:
case ByteType:
- case IntegerType:
+ case IntType:
case ShortType:
case DoubleType:
case FloatType:
case LongType:
case DateType:
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case StringType:
case UriType:
case BytesType:
@@ -3599,7 +3599,7 @@
case BooleanType:
case ByteType:
case CharacterType:
- case IntegerType:
+ case IntType:
case ShortType:
if (value == 0) return 0;
return (float)(*(long*)value);
@@ -3641,7 +3641,7 @@
return (float)(*(time_t*)value);
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case StringType:
case UriType:
{
@@ -3691,7 +3691,7 @@
case BooleanType:
case ByteType:
case CharacterType:
- case IntegerType:
+ case IntType:
case ShortType:
if (value == 0) return 0;
return (double)(*(long*)value);
@@ -3733,7 +3733,7 @@
return (double)(*(time_t*)value);
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case StringType:
case UriType:
{
@@ -3783,7 +3783,7 @@
case BooleanType:
case ByteType:
case CharacterType:
- case IntegerType:
+ case IntType:
case ShortType:
if (value == 0) return 0;
return (long double)(*(long*)value);
@@ -3825,7 +3825,7 @@
return (long double)(*(time_t*)value);
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case StringType:
case UriType:
{
@@ -3879,14 +3879,14 @@
case BooleanType:
case ByteType:
case CharacterType:
- case IntegerType:
+ case IntType:
case ShortType:
case DoubleType:
case FloatType:
case LongType:
case DateType:
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case StringType:
case UriType:
case BytesType:
@@ -3912,14 +3912,14 @@
case BooleanType:
case ByteType:
case CharacterType:
- case IntegerType:
+ case IntType:
case ShortType:
case DoubleType:
case FloatType:
case LongType:
case DateType:
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case StringType:
case UriType:
case BytesType:
@@ -3945,7 +3945,7 @@
{
case ByteType:
case CharacterType:
- case IntegerType:
+ case IntType:
case ShortType:
if (value == 0) return 0;
return (time_t)(*(long*)value);
@@ -3987,7 +3987,7 @@
return (time_t)(*(time_t*)value);
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case StringType:
case UriType:
case BooleanType:
@@ -4011,7 +4011,7 @@
{
case ByteType:
case CharacterType:
- case IntegerType:
+ case IntType:
case ShortType:
case DoubleType:
case FloatType:
@@ -4023,7 +4023,7 @@
return sdoValue.getDate();
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case UriType:
case OtherTypes:
case DataObjectType:
@@ -4052,14 +4052,14 @@
case BooleanType:
case ByteType:
case CharacterType:
- case IntegerType:
+ case IntType:
case ShortType:
case DoubleType:
case FloatType:
case LongType:
case DateType:
case BigDecimalType:
- case BigIntegerType:
+ case BigIntType:
case StringType:
case BytesType:
case UriType:
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/SdoGenerate.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/SdoGenerate.cpp?view=diff&rev=550023&r1=550022&r2=550023
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/SdoGenerate.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/SdoGenerate.cpp Sat Jun 23 01:01:53 2007
@@ -121,7 +121,7 @@
case Type::FloatType:
cout << "float " << pl[j].getName() << ";" << endl;
break;
- case Type::IntegerType:
+ case Type::IntType:
cout << "long " << pl[j].getName() << ";" << endl;
break;
case Type::LongType:
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/utils.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/utils.cpp?view=diff&rev=550023&r1=550022&r2=550023
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/utils.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/utils.cpp Sat Jun 23 01:01:53 2007
@@ -71,7 +71,7 @@
case Type::CharacterType:
fprintf(f,"Character:%d\n",sl[j].getCharacterValue());
break;
- case Type::IntegerType:
+ case Type::IntType:
fprintf(f,"Integer:%d\n",sl[j].getIntegerValue());
break;
case Type::ShortType:
@@ -90,7 +90,7 @@
fprintf(f,"Date:%d\n",sl[j].getDateValue().getTime());
break;
case Type::BigDecimalType:
- case Type::BigIntegerType:
+ case Type::BigIntType:
case Type::StringType:
case Type::UriType:
fprintf(f,"String:%s\n",sl[j].getCStringValue());
@@ -167,7 +167,7 @@
case Type::CharacterType:
fprintf(f,"character:%d\n",dp->getCharacter(p));
break;
- case Type::IntegerType:
+ case Type::IntType:
fprintf(f,"integer:%d\n",dp->getInteger(p));
break;
case Type::ShortType:
@@ -186,7 +186,7 @@
fprintf(f,"date:%d\n",dp->getDate(p).getTime());
break;
case Type::BigDecimalType:
- case Type::BigIntegerType:
+ case Type::BigIntType:
case Type::StringType:
case Type::UriType:
fprintf(f,"string:%s\n", dp->getCString(p));
@@ -243,7 +243,7 @@
case Type::CharacterType:
fprintf(f,"character[%d]=%d\n",i,dobl.getCharacter(i));
break;
- case Type::IntegerType:
+ case Type::IntType:
fprintf(f,"integer[%d]=%d\n",i,dobl.getInteger(i));
break;
case Type::ShortType:
@@ -262,7 +262,7 @@
fprintf(f,"date[%d]=%d\n",i,dobl.getDate(i).getTime());
break;
case Type::BigDecimalType:
- case Type::BigIntegerType:
+ case Type::BigIntType:
case Type::StringType:
case Type::UriType:
fprintf(f,"string[%d]=%s\n",i,dobl.getCString(i));
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org