Author: ajborley
Date: Wed Sep 13 04:31:42 2006
New Revision: 442945
URL: http://svn.apache.org/viewvc?view=rev&rev=442945
Log:
Geoff's patch for TUSCANY-717
Modified:
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/ChangeSummaryBuilder.cpp
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/ChangeSummaryImpl.cpp
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataObjectImpl.cpp
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/Logger.cpp
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSAX2Parser.cpp
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOUtils.cpp
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SequenceImpl.cpp
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/sdotest.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=442945&r1=442944&r2=442945
==============================================================================
---
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/ChangeSummaryBuilder.cpp
(original)
+++
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/ChangeSummaryBuilder.cpp
Wed Sep 13 04:31:42 2006
@@ -26,6 +26,8 @@
#include "commonj/sdo/DASProperty.h"
#include "commonj/sdo/Logging.h"
+#include <stdio.h>
+#include <stdlib.h>
namespace commonj
{
namespace sdo
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=442945&r1=442944&r2=442945
==============================================================================
---
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/ChangeSummaryImpl.cpp
(original)
+++
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/ChangeSummaryImpl.cpp
Wed Sep 13 04:31:42 2006
@@ -30,6 +30,7 @@
#include "commonj/sdo/SDORuntimeException.h"
#include "commonj/sdo/Logging.h"
+#include <stdlib.h>
namespace commonj{
namespace sdo{
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=442945&r1=442944&r2=442945
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataObjectImpl.cpp
(original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataObjectImpl.cpp
Wed Sep 13 04:31:42 2006
@@ -42,6 +42,7 @@
#include <string>
#include <stdio.h>
+#include <stdlib.h>
using std::string;
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/Logger.cpp
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/Logger.cpp?view=diff&rev=442945&r1=442944&r2=442945
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/Logger.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/Logger.cpp Wed Sep
13 04:31:42 2006
@@ -22,7 +22,7 @@
#include <stdarg.h>
#include "commonj/sdo/DefaultLogWriter.h"
#include <stdio.h>
-
+#include <stdlib.h>
using namespace std;
namespace commonj
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=442945&r1=442944&r2=442945
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSAX2Parser.cpp
(original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSAX2Parser.cpp
Wed Sep 13 04:31:42 2006
@@ -30,6 +30,7 @@
#include "commonj/sdo/TypeImpl.h"
#include "commonj/sdo/DataObjectImpl.h"
#include "commonj/sdo/DataFactoryImpl.h"
+#include <stdio.h>
using namespace std;
namespace commonj
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOUtils.cpp
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOUtils.cpp?view=diff&rev=442945&r1=442944&r2=442945
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOUtils.cpp
(original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOUtils.cpp Wed Sep
13 04:31:42 2006
@@ -18,7 +18,7 @@
/* $Rev$ $Date: 2006/03/16 12:21:39 $ */
#include "commonj/sdo/SDOUtils.h"
-
+#include <stdio.h>
using namespace std;
//
Modified:
incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SequenceImpl.cpp
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SequenceImpl.cpp?view=diff&rev=442945&r1=442944&r2=442945
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SequenceImpl.cpp
(original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SequenceImpl.cpp Wed
Sep 13 04:31:42 2006
@@ -848,19 +848,27 @@
{
int j = 0;
const Property* prop;
- SEQUENCE_ITEM_LIST::iterator i;
- for (i=the_list.begin();i != the_list.end(); ++i)
+ SEQUENCE_ITEM_LIST::iterator i = the_list.begin();
+
+ while (i != the_list.end())
{
- prop = (*i).getProp();
- if (prop != 0) {
- if (!strcmp(prop->getName(),
- p.getName()))
- {
- // not sure this works - does i still equate
- // to an iterator over the list after the remove?
- i = the_list.erase(i);
- }
- }
+ prop = (*i).getProp();
+ if (prop != 0)
+ {
+ if (!strcmp(prop->getName(), p.getName()))
+ {
+ i = the_list.erase(i);
+ }
+ else
+ {
+ ++i;
+ }
+ }
+ else
+ {
+ ++i;
+ }
+
}
return;
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=442945&r1=442944&r2=442945
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeImpl.cpp
(original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeImpl.cpp Wed Sep
13 04:31:42 2006
@@ -29,6 +29,7 @@
#include <iostream>
#include <wchar.h>
#include <stdio.h>
+#include <stdlib.h>
using namespace std;
#include <list>
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=442945&r1=442944&r2=442945
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/SdoGenerate.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/SdoGenerate.cpp Wed Sep 13
04:31:42 2006
@@ -20,6 +20,7 @@
/* work in progress on generation of structures from sdos*/
#include <stdio.h>
+#include <stdlib.h>
#pragma warning(disable:4786)
Modified: incubator/tuscany/cpp/sdo/runtime/core/test/sdotest.cpp
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/sdotest.cpp?view=diff&rev=442945&r1=442944&r2=442945
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/sdotest.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/sdotest.cpp Wed Sep 13 04:31:42
2006
@@ -18,6 +18,7 @@
/* $Id: sdotest.cpp,v 1.22 2006/03/16 12:53:57 slattery Exp $ */
#include <stdio.h>
+#include <stdlib.h>
#pragma warning(disable:4786)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
