Author: edslattery
Date: Fri Mar 17 00:54:32 2006
New Revision: 386571
URL: http://svn.apache.org/viewcvs?rev=386571&view=rev
Log: (empty)
Modified:
incubator/tuscany/cpp/sdo/runtime/core/test/main.cpp
incubator/tuscany/cpp/sdo/runtime/core/test/sdotest.cpp
incubator/tuscany/cpp/sdo/runtime/core/test/sdotest2.cpp
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/main.cpp
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sdo/runtime/core/test/main.cpp?rev=386571&r1=386570&r2=386571&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/main.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/main.cpp Fri Mar 17 00:54:32
2006
@@ -26,6 +26,8 @@
#include "sdotest.h"
+extern "C"{
+
int cdecl main (int argc, char** argv)
{
//Logger::setLogging(20);
@@ -141,4 +143,5 @@
cout << "Total tests:" << totaltests << " Tests passed:" << testspassed;
return 0;
+}
}
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/sdotest.cpp
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sdo/runtime/core/test/sdotest.cpp?rev=386571&r1=386570&r2=386571&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/sdotest.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/sdotest.cpp Fri Mar 17 00:54:32
2006
@@ -3454,7 +3454,7 @@
int sdotest::dumpproperties(FILE *f, DataObjectPtr root)
{
- PropertyList& pl = root->getInstanceProperties();
+ PropertyList pl = root->getInstanceProperties();
for (int i=0;i<pl.size();i++)
{
if (pl[i].isMany())
@@ -4674,7 +4674,7 @@
//cout << "TYPES LOADED FROM COMPANY XSD" << endl;
- //TypeList& tl = mdg->getTypes();
+ //TypeList tl = mdg->getTypes();
//for (int i=0;i< tl.size(); i++)
//{
// cout << tl[i].getURI() << ":" << tl[i].getName() << endl;
@@ -4716,7 +4716,7 @@
//cout << "TYPES LOADED FROM COMPANYSUBS XSD" << endl;
- //TypeList& tl = mdg->getTypes();
+ //TypeList tl = mdg->getTypes();
//for (int i=0;i< tl.size(); i++)
//{
// cout << tl[i].getURI() << ":" << tl[i].getName() << endl;
@@ -4823,7 +4823,7 @@
//cout << "TYPES LOADED FROM COMPANYABS XSD" << endl;
- //TypeList& tl = mdg->getTypes();
+ //TypeList tl = mdg->getTypes();
//for (int i=0;i< tl.size(); i++)
//{
// cout << tl[i].getURI() << ":" << tl[i].getName() << endl;
@@ -5229,7 +5229,7 @@
//cout << "TYPES LOADED FROM COMPANY XSD" << endl;
//int i;
- //TypeList& tl = mdg->getTypes();
+ //TypeList tl = mdg->getTypes();
//for (i=0;i< tl.size(); i++)
//{
// cout << tl[i].getURI() << ":" << tl[i].getName() << endl;
@@ -5359,7 +5359,7 @@
//cout << "TYPES LOADED FROM COMPANY XSD" << endl;
//int i;
- //TypeList& tl = mdg->getTypes();
+ //TypeList tl = mdg->getTypes();
//for (i=0;i< tl.size(); i++)
//{
// cout << tl[i].getURI() << ":" << tl[i].getName() << endl;
@@ -5520,7 +5520,7 @@
//cout << "TYPES LOADED FROM COMPANY XSD" << endl;
//int i;
- //TypeList& tl = mdg->getTypes();
+ //TypeList tl = mdg->getTypes();
//for (i=0;i< tl.size(); i++)
//{
// cout << tl[i].getURI() << ":" << tl[i].getName() << endl;
@@ -5589,7 +5589,7 @@
//cout << "TYPES LOADED FROM COMPANY XSD" << endl;
- //TypeList& tl = mdg->getTypes();
+ //TypeList tl = mdg->getTypes();
//for (int i=0;i< tl.size(); i++)
//{
// cout << tl[i].getURI() << ":" << tl[i].getName() << endl;
@@ -5624,7 +5624,7 @@
XSDHelperPtr xsh = HelperProvider::getXSDHelper(mdg);
xsh->defineFile("bugs\\1\\company.xsd");
- //TypeList& tl = mdg->getTypes();
+ //TypeList tl = mdg->getTypes();
//for (int i=0;i< tl.size(); i++)
//{
// cout << tl[i].getURI() << ":" << tl[i].getName() << endl;
@@ -7315,7 +7315,7 @@
const Type& t = dob->getType();
- PropertyList& pl = t.getProperties();
+ PropertyList pl = t.getProperties();
for (int i=0;i<pl.size();i++)
{
@@ -7337,7 +7337,7 @@
const Type& t2 = dob2->getType();
- PropertyList& pl2 = t2.getProperties();
+ PropertyList pl2 = t2.getProperties();
for (int j=0;j<pl2.size();j++)
{
@@ -7399,7 +7399,7 @@
const Type& t = dob->getType();
- PropertyList& pl = t.getProperties();
+ PropertyList pl = t.getProperties();
for (int i=0;i<pl.size();i++)
{
@@ -7423,7 +7423,7 @@
const Type& t2 = dob2->getType();
- PropertyList& pl2 = t2.getProperties();
+ PropertyList pl2 = t2.getProperties();
for (int j=0;j<pl2.size();j++)
{
@@ -7950,7 +7950,7 @@
return 0;
}
- TypeList& tl = mdg->getTypes();
+ TypeList tl = mdg->getTypes();
for (i=0;i<tl.size();i++)
{
@@ -8031,7 +8031,7 @@
return 0;
}
- TypeList& tl = mdg->getTypes();
+ TypeList tl = mdg->getTypes();
fprintf(f,
"*******************************TYPES**********************\n");
@@ -8316,7 +8316,7 @@
return 0;
}
- TypeList& tl = mdg->getTypes();
+ TypeList tl = mdg->getTypes();
fprintf(f,"*****STYLE %s\n",style);
@@ -8325,7 +8325,7 @@
fprintf(f,"Type: %s#%s\n", tl[i].getURI(),tl[i].getName());
if (!strcmp(tl[i].getName(),"library"))
{
- PropertyList& pl = tl[i].getProperties();
+ PropertyList pl = tl[i].getProperties();
for (int j=0;j<pl.size();j++)
{
fprintf(f,"Property:%s\n",pl[j].getName());
@@ -8428,14 +8428,14 @@
return 0;
}
- TypeList& tl = mdg->getTypes();
+ TypeList tl = mdg->getTypes();
//cout << "***** CALCULATOR ***************************************" <<
endl;
for (i=0;i<tl.size();i++)
{
fprintf(f, "Type:%s#%s\n", tl[i].getURI(),tl[i].getName());
- PropertyList& pl = tl[i].getProperties();
+ PropertyList pl = tl[i].getProperties();
for (int j=0;j<pl.size();j++)
{
fprintf(f,"Property:%s\n",pl[j].getName());
@@ -8518,7 +8518,7 @@
return 0;
}
- TypeList& tl = mdg->getTypes();
+ TypeList tl = mdg->getTypes();
//cout << "***** TESTORDER ****************************************" <<
endl;
@@ -8526,7 +8526,7 @@
{
if (!strcmp(tl[i].getURI(),"commonj.sdo")) continue;
fprintf(f,"Type:%s#%s\n",tl[i].getURI(),tl[i].getName());
- PropertyList& pl = tl[i].getProperties();
+ PropertyList pl = tl[i].getProperties();
for (int j=0;j<pl.size();j++)
{
fprintf(f,"Property:%s\n", pl[j].getName());
@@ -8583,7 +8583,7 @@
}
- TypeList& tl = mdg->getTypes();
+ TypeList tl = mdg->getTypes();
//cout << "***** SIMPLE ****************************************" << endl;
@@ -8591,7 +8591,7 @@
{
if (!strcmp(tl[i].getURI(),"commonj.sdo")) continue;
fprintf(f, "Type:%s#%s\n",tl[i].getURI(),tl[i].getName());
- PropertyList& pl = tl[i].getProperties();
+ PropertyList pl = tl[i].getProperties();
for (int j=0;j<pl.size();j++)
{
fprintf(f,"Property:%s\n",pl[j].getName());
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/sdotest2.cpp
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/cpp/sdo/runtime/core/test/sdotest2.cpp?rev=386571&r1=386570&r2=386571&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/sdotest2.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/sdotest2.cpp Fri Mar 17
00:54:32 2006
@@ -534,14 +534,14 @@
}
- TypeList& tl = mdg->getTypes();
+ TypeList tl = mdg->getTypes();
fprintf(f1, "***** TYPES BEFORE RESOLVE
**********************************\n");
for (i=0;i<tl.size();i++)
{
fprintf(f1,"Type:%s#%s\n",tl[i].getURI(),tl[i].getName());
- PropertyList& pl = tl[i].getProperties();
+ PropertyList pl = tl[i].getProperties();
for (int j=0;j<pl.size();j++)
{
fprintf(f1,"Property:%s ",pl[j].getName());
@@ -621,14 +621,14 @@
}
else {
- TypeList& tl = mdg->getTypes();
+ TypeList tl = mdg->getTypes();
fprintf(f2, "***** TYPES AFTER
RESOLVE*********************************\n");
for (i=0;i<tl.size();i++)
{
fprintf(f2,"Type:%s#%s\n",tl[i].getURI(),tl[i].getName());
- PropertyList& pl = tl[i].getProperties();
+ PropertyList pl = tl[i].getProperties();
for (int j=0;j<pl.size();j++)
{
fprintf(f2, "Property:%s ",pl[j].getName());
@@ -746,14 +746,14 @@
return 0;
}
- TypeList& tl = mdg->getTypes();
+ TypeList tl = mdg->getTypes();
fprintf(f1,"***** TESTANY
******************************************\n");
for (i=0;i<tl.size();i++)
{
fprintf(f1,"Type:%s#%s\n",tl[i].getURI(),tl[i].getName());
- PropertyList& pl = tl[i].getProperties();
+ PropertyList pl = tl[i].getProperties();
for (int j=0;j<pl.size();j++)
{
fprintf(f1,"Property:%s ",pl[j].getName());
