You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by gw...@apache.org on 2007/02/26 18:54:37 UTC
svn commit: r511929 -
/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/
Author: gwinn
Date: Mon Feb 26 09:54:36 2007
New Revision: 511929
URL: http://svn.apache.org/viewvc?view=rev&rev=511929
Log:
TUSCANY-1139
Modified:
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/ChangeSummaryBuilder.cpp
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/ChangedDataObjectListImpl.cpp
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataObjectImpl.cpp
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataObjectListImpl.cpp
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/PropertyList.cpp
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SAX2Attributes.cpp
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSAX2Parser.cpp
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.cpp
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SettingList.cpp
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeImpl.cpp
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeList.cpp
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/ChangeSummaryBuilder.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/ChangeSummaryBuilder.cpp?view=diff&rev=511929&r1=511928&r2=511929
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/ChangeSummaryBuilder.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/ChangeSummaryBuilder.cpp Mon Feb 26 09:54:36 2007
@@ -548,8 +548,7 @@
// will be expecting a chars message to give the
// contents
- createDeletes.insert(
- createDeletes.end(),createDelete(localname));
+ createDeletes.push_back(createDelete(localname));
LOGINFO_1(INFO,"CSBuilder: Processing a %s",(const char*)localname);
LOGEXIT(INFO,"CSBuilder:processStart Exit1");
@@ -887,7 +886,7 @@
{
// we should have finished, there are no nested changes
currentState = baseState;
- changes.insert(changes.end(),currentChange);
+ changes.push_back(currentChange);
currentLocation.clear();
LOGEXIT(INFO,"CSBuilder:processEnd Exit4");
return;
@@ -895,7 +894,7 @@
else if (currentState == dealingWithDeletion)
{
currentLocation.pop_back();
- deletions.insert(deletions.end(),currentDeletion);
+ deletions.push_back(currentDeletion);
if (deletionLevel > 0)
{
deletionLevel--;
@@ -1060,12 +1059,12 @@
void change::addAttribute(changeAttribute ca)
{
- attributes.insert(attributes.end(),ca);
+ attributes.push_back(ca);
}
void change::addElement(changeElement ce)
{
- elements.insert(elements.end(),ce);
+ elements.push_back(ce);
}
/////////////////////////////////////////////////
@@ -1118,12 +1117,12 @@
void deletion::addAttribute(deletionAttribute ca)
{
- attributes.insert(attributes.end(),ca);
+ attributes.push_back(ca);
}
void deletion::addElement(deletionElement ce)
{
- elements.insert(elements.end(),ce);
+ elements.push_back(ce);
}
void deletion::insertElement(deletionElement ce)
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/ChangedDataObjectListImpl.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/ChangedDataObjectListImpl.cpp?view=diff&rev=511929&r1=511928&r2=511929
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/ChangedDataObjectListImpl.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/ChangedDataObjectListImpl.cpp Mon Feb 26 09:54:36 2007
@@ -201,7 +201,7 @@
void ChangedDataObjectListImpl::append (DataObject *d, ChangedDataObjectList::ChangeType type)
{
- plist.insert(plist.end(),CDOListElement((DataObject*)d, type));
+ plist.push_back(CDOListElement((DataObject*)d, type));
}
/** clear()
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=511929&r1=511928&r2=511929
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataObjectImpl.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataObjectImpl.cpp Mon Feb 26 09:54:36 2007
@@ -612,7 +612,7 @@
new DataObjectImpl(df, getProperty(propertyIndex).getType());
b->setContainer(this);
b->setApplicableChangeSummary();
- PropertyValues.insert(PropertyValues.end(),rdo(propertyIndex,b));
+ PropertyValues.push_back(rdo(propertyIndex,b));
b->setNull();
}
@@ -759,7 +759,7 @@
// empty data object to hold the list
DataFactory* df = getDataFactory();
d = new DataObjectImpl(df, df->getType(Type::SDOTypeNamespaceURI,"DataObject"));
- PropertyValues.insert(PropertyValues.end(),rdo(propIndex,d));
+ PropertyValues.push_back(rdo(propIndex, d));
d->setContainer(this);
d->setApplicableChangeSummary();
@@ -1329,13 +1329,13 @@
i != propList.end();
i++)
{
- theVec.insert(theVec.end(), (*i));
+ theVec.push_back((*i));
}
std::list<PropertyImpl>::iterator j;
for (j = openProperties.begin() ;
j != openProperties.end() ; ++j)
{
- theVec.insert(theVec.end(),&(*j));
+ theVec.push_back(&(*j));
}
return PropertyList(theVec);
}
@@ -1774,7 +1774,7 @@
}
// The property does not currently have a value.
logChange(prop);
- PropertyValues.insert(PropertyValues.end(), rdo(propertyIndex, (DataObjectImpl*) 0));
+ PropertyValues.push_back(rdo(propertyIndex, (DataObjectImpl*) 0));
// If this is a sequenced data object then update the
// sequence. We already know that a) the property was not previously
// set so it can't be in the sequence currently and b) it is not a
@@ -1832,7 +1832,7 @@
logChange(prop);
- PropertyValues.insert(PropertyValues.end(), rdo(propertyIndex, (DataObjectImpl*) dob));
+ PropertyValues.push_back(rdo(propertyIndex, (DataObjectImpl*) dob));
// If this is a sequenced data object then update the
// sequence. We already know that a) the property is not
// in the sequence currently and b) it is not a
@@ -2307,7 +2307,9 @@
df->create(Type::SDOTypeNamespaceURI,"DataObject");
DataObject* doptr = listptr;
- PropertyValues.insert(PropertyValues.end(),rdo(ind,(DataObjectImpl*)doptr));
+
+ PropertyValues.push_back(rdo(ind, (DataObjectImpl*) doptr));
+
((DataObjectImpl*)doptr)->setContainer(this);
((DataObjectImpl*)doptr)->setApplicableChangeSummary();
@@ -2354,8 +2356,8 @@
logCreation(ditem, this, property);
logChange(property);
- PropertyValues.insert(PropertyValues.end(),
- rdo(getPropertyIndex(property),ditem));
+ PropertyValues.push_back(rdo(getPropertyIndex(property), ditem));
+
if (getType().isSequencedType())
{
SequenceImpl* sq = getSequenceImpl();
@@ -3810,7 +3812,7 @@
b->setContainer(this);
b->setApplicableChangeSummary();
logChange(propertyIndex);
- PropertyValues.insert(PropertyValues.end(), rdo(propertyIndex, b));
+ PropertyValues.push_back(rdo(propertyIndex, b));
b->setSDOValue(sval);
// If this is a sequenced data object then update the sequence. We
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataObjectListImpl.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataObjectListImpl.cpp?view=diff&rev=511929&r1=511928&r2=511929
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataObjectListImpl.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataObjectListImpl.cpp Mon Feb 26 09:54:36 2007
@@ -464,7 +464,7 @@
}
}
}
- plist.insert(plist.end(), RefCountingPointer<DataObjectImpl>((DataObjectImpl*) dob));
+ plist.push_back(RefCountingPointer<DataObjectImpl>((DataObjectImpl*) dob));
if (container != 0) {
if (container->getType().isSequencedType())
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/PropertyList.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/PropertyList.cpp?view=diff&rev=511929&r1=511928&r2=511929
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/PropertyList.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/PropertyList.cpp Mon Feb 26 09:54:36 2007
@@ -42,7 +42,7 @@
PROPERTY_LIST::iterator i;
for (i = p.begin(); i != p.end(); ++i)
{
- plist.insert(plist.end(),(PropertyImpl*)(*i));
+ plist.push_back((PropertyImpl*) (*i));
}
}
@@ -81,8 +81,8 @@
SDO_API void PropertyList::insert(const Property& p)
{
- PropertyImpl* pi = (PropertyImpl*)&p;
- plist.insert(plist.end(),new PropertyImpl(*pi));
+ PropertyImpl* pi = (PropertyImpl*) &p;
+ plist.push_back(new PropertyImpl(*pi));
}
PROPERTY_VECTOR PropertyList::getVec() const
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SAX2Attributes.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SAX2Attributes.cpp?view=diff&rev=511929&r1=511928&r2=511929
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SAX2Attributes.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SAX2Attributes.cpp Mon Feb 26 09:54:36 2007
@@ -85,8 +85,8 @@
return;
}
}
- }
- attributes.insert(attributes.end(), attr);
+ }
+ attributes.push_back(attr);
}
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=511929&r1=511928&r2=511929
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSAX2Parser.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSAX2Parser.cpp Mon Feb 26 09:54:36 2007
@@ -384,7 +384,7 @@
{
// remember this value to resolve later
IDRef ref(currentDataObject, attributes[i].getName(), propValue);
- IDRefs.insert(IDRefs.end(), ref);
+ IDRefs.push_back(ref);
}
else
{
@@ -1226,7 +1226,7 @@
IDRef ref(currentPropertySetting.dataObject,
currentPropertySetting.name,
currentPropertySetting.value );
- IDRefs.insert(IDRefs.end(), ref);
+ IDRefs.push_back(ref);
}
else
{
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.cpp?view=diff&rev=511929&r1=511928&r2=511929
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.cpp Mon Feb 26 09:54:36 2007
@@ -67,9 +67,11 @@
// copy the event to as list for replay.
if (currentGroup)
{
- currentGroup->events.insert( currentGroup->events.end(),
- GroupEvent(
- localname,prefix,URI,namespaces,attributes));
+ currentGroup->events.push_back(GroupEvent(localname,
+ prefix,
+ URI,
+ namespaces,
+ attributes));
}
}
@@ -82,8 +84,7 @@
// copy the event to as list for replay.
if (currentGroup)
{
- currentGroup->events.insert(currentGroup->events.end(),
- GroupEvent(localname,prefix,URI));
+ currentGroup->events.push_back(GroupEvent(localname, prefix, URI));
}
}
@@ -643,8 +644,7 @@
}
if (!found)
{
- currentType.properties.insert(
- currentType.properties.end(),*propit);
+ currentType.properties.push_back(*propit);
}
}
}
@@ -1100,9 +1100,8 @@
// work when serializing a sequence containing a single-valued property and
// then deserializing.
// currentProperty.isMany = currentProperty.isMany || currentType.isMany;
-
-
- currentType.properties.insert(currentType.properties.end(), currentProperty);
+
+ currentType.properties.push_back(currentProperty);
if (propertyStack.size() != 0)
{
currentProperty = propertyStack.top();
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SettingList.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SettingList.cpp?view=diff&rev=511929&r1=511928&r2=511929
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SettingList.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SettingList.cpp Mon Feb 26 09:54:36 2007
@@ -85,7 +85,7 @@
void SettingList::append ( Setting* d)
{
- slist.insert(slist.end(),d);
+ slist.push_back(d);
}
void SettingList::remove(unsigned int index)
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=511929&r1=511928&r2=511929
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeImpl.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeImpl.cpp Mon Feb 26 09:54:36 2007
@@ -760,10 +760,14 @@
{
// do not add duplicate properties
if (!getPropertyImplPure(propname))
- {
- props.insert(props.end(),new PropertyImpl(*this,
- propname, t, many,rdonly, cont));
- localPropsSize++;
+ {
+ props.push_back(new PropertyImpl(*this,
+ propname,
+ t,
+ many,
+ rdonly,
+ cont));
+ localPropsSize++;
}
}
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeList.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeList.cpp?view=diff&rev=511929&r1=511928&r2=511929
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeList.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeList.cpp Mon Feb 26 09:54:36 2007
@@ -78,7 +78,7 @@
SDO_API void TypeList::insert (const Type* t)
{
- plist.insert(plist.end(),t);
+ plist.push_back(t);
}
};
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org