Author: jsdelfino
Date: Sun Nov 26 03:28:38 2006
New Revision: 479346
URL: http://svn.apache.org/viewvc?view=rev&rev=479346
Log:
Windows port. Fixed compile errors and warnings.
Modified:
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLDefinition.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logger.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Utils.cpp
incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.cpp
incubator/tuscany/cpp/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.cpp
incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Service.cpp
incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.cpp
Modified:
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLDefinition.cpp
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLDefinition.cpp?view=diff&rev=479346&r1=479345&r2=479346
==============================================================================
---
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLDefinition.cpp
(original)
+++
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/model/WSDLDefinition.cpp
Sun Nov 26 03:28:38 2006
@@ -347,7 +347,7 @@
DataObjectPtr service = 0;
// Find the binding
- for (int m = 0; m < wsdlModels.size(); m++)
+ for (unsigned int m = 0; m < wsdlModels.size(); m++)
{
DataObjectList& serviceList =
wsdlModels[m]->getList("service");
for (int i=0; i<serviceList.size(); i++)
@@ -379,7 +379,7 @@
Utils::rTokeniseString(":", bindingName, uri, name);
// Find the binding
- for (int m = 0; m < wsdlModels.size(); m++)
+ for (unsigned int m = 0; m < wsdlModels.size(); m++)
{
DataObjectList& bindingList =
wsdlModels[m]->getList("binding");
for (int i=0; i<bindingList.size(); i++)
@@ -410,7 +410,7 @@
Utils::rTokeniseString(":", portTypeName, uri, name);
// Find the binding
- for (int m = 0; m < wsdlModels.size(); m++)
+ for (unsigned int m = 0; m < wsdlModels.size(); m++)
{
DataObjectList& portTypeList =
wsdlModels[m]->getList("portType");
for (int i=0; i<portTypeList.size(); i++)
@@ -441,7 +441,7 @@
Utils::rTokeniseString(":", messageName, uri, name);
// Find the binding
- for (int m = 0; m < wsdlModels.size(); m++)
+ for (unsigned int m = 0; m < wsdlModels.size(); m++)
{
DataObjectList& messageList =
wsdlModels[m]->getList("message");
for (int i=0; i<messageList.size(); i++)
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logger.cpp
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logger.cpp?view=diff&rev=479346&r1=479345&r2=479346
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logger.cpp
(original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Logger.cpp Sun
Nov 26 03:28:38 2006
@@ -47,7 +47,11 @@
setLogWriter(0);
pid = new char[10];
+#if defined(WIN32) || defined (_WINDOWS)
+ sprintf(pid, "%d", _getpid());
+#else
sprintf(pid, "%d", getpid());
+#endif
}
return logWriter;
}
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Utils.cpp
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Utils.cpp?view=diff&rev=479346&r1=479345&r2=479346
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Utils.cpp
(original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Utils.cpp Sun
Nov 26 03:28:38 2006
@@ -310,7 +310,7 @@
return false;
}
- for (int i = 0; i < sequence1->size(); i++)
+ for (unsigned int i = 0; i < sequence1->size(); i++)
{
if (sequence1->isText(i) != sequence2->isText(i))
{
@@ -439,7 +439,7 @@
SequencePtr sequence = dataObject->getSequence();
if (sequence != NULL)
{
- for (int i = 0; i < sequence->size(); i++)
+ for (unsigned int i = 0; i < sequence->size(); i++)
{
if (sequence->isText(i))
{
Modified:
incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.cpp
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.cpp?view=diff&rev=479346&r1=479345&r2=479346
==============================================================================
---
incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.cpp
(original)
+++
incubator/tuscany/cpp/sca/runtime/extensions/cpp/src/tuscany/sca/cpp/model/CPPImplementation.cpp
Sun Nov 26 03:28:38 2006
@@ -57,7 +57,7 @@
// Create CPP bindings for all the services
const Component::SERVICE_MAP& services =
component->getServices();
Component::SERVICE_MAP::const_iterator iter = services.begin();
- for (int i=0; i< services.size(); i++)
+ for (unsigned int i=0; i< services.size(); i++)
{
Service *service = iter->second;
CPPServiceBinding* binding = new
CPPServiceBinding(service);
Modified:
incubator/tuscany/cpp/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.cpp
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.cpp?view=diff&rev=479346&r1=479345&r2=479346
==============================================================================
---
incubator/tuscany/cpp/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.cpp
(original)
+++
incubator/tuscany/cpp/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.cpp
Sun Nov 26 03:28:38 2006
@@ -115,7 +115,7 @@
binding->getEndpointName(),
operationName);
}
- catch(SystemConfigurationException& ex)
+ catch(SystemConfigurationException&)
{
throw;
}
@@ -143,7 +143,7 @@
{
wsdlOperation =
wsdl->findOperation(wsdlInterface->getName(), operationName);
}
- catch(SystemConfigurationException& ex)
+ catch(SystemConfigurationException&)
{
throw;
}
@@ -321,7 +321,7 @@
/*
* This code deals with sending xsd:any elements
*/
- for (int i=0; i<operation.getNParms(); i++)
+ for (unsigned int i=0; i<operation.getNParms(); i++)
{
ostringstream pname;
pname << "param" << (i+1);
@@ -408,7 +408,7 @@
else {
// Each parameter in the operation should be a property on
the request dataobject
- for (int i=0; i<operation.getNParms(); i++)
+ for (unsigned int i=0; i<operation.getNParms(); i++)
{
const Operation::Parameter& parm =
operation.getParameter(i);
switch(parm.getType())
Modified:
incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Service.cpp
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Service.cpp?view=diff&rev=479346&r1=479345&r2=479346
==============================================================================
---
incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Service.cpp
(original)
+++
incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Service.cpp
Sun Nov 26 03:28:38 2006
@@ -82,9 +82,6 @@
Axis2Service_init(axis2_svc_skeleton_t *svc_skeleton,
const axis2_env_t *env);
- axis2_svc_skeleton_t* AXIS2_CALL
- axis2_Axis2Service_create(axis2_env_t *env);
-
axis2_svc_skeleton_t*
axis2_Axis2Service_create(axis2_env_t *env)
{
Modified:
incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.cpp
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.cpp?view=diff&rev=479346&r1=479345&r2=479346
==============================================================================
---
incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.cpp
(original)
+++
incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.cpp
Sun Nov 26 03:28:38 2006
@@ -337,7 +337,7 @@
{
throwException(ServiceInvocationException, ex);
}
- catch(TuscanyRuntimeException& ex)
+ catch(TuscanyRuntimeException&)
{
throw;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
