You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by aj...@apache.org on 2006/09/20 10:24:38 UTC
svn commit: r448122 - in /incubator/tuscany/cpp/sca/runtime:
core/src/tuscany/sca/core/ extensions/python/src/tuscany/sca/python/
extensions/ws/reference/axis2c/src/tuscany/sca/ws/
extensions/ws/service/axis2c/src/tuscany/sca/ws/
Author: ajborley
Date: Wed Sep 20 01:24:38 2006
New Revision: 448122
URL: http://svn.apache.org/viewvc?view=rev&rev=448122
Log:
Added support for int and unsigned int native types to Operation & classes that use Operation.
Modified:
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/Operation.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/Operation.h
incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.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/WSServiceProxy.cpp
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/Operation.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/Operation.cpp?view=diff&rev=448122&r1=448121&r2=448122
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/Operation.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/Operation.cpp Wed Sep 20 01:24:38 2006
@@ -114,6 +114,12 @@
parameters.insert(parameters.end(), Parameter((void*)parm, SHORT));
}
+ void Operation::addParameter(const int *parm)
+ {
+ LOGINFO(4, "Operation::addParameter(int)");
+ parameters.insert(parameters.end(), Parameter((void*)parm, INT));
+ }
+
void Operation::addParameter(const long *parm)
{
LOGINFO(4, "Operation::addParameter(long)");
@@ -126,6 +132,12 @@
parameters.insert(parameters.end(), Parameter((void*)parm, USHORT));
}
+ void Operation::addParameter(const unsigned int *parm)
+ {
+ LOGINFO(4, "Operation::addParameter(unsigned int)");
+ parameters.insert(parameters.end(), Parameter((void*)parm, UINT));
+ }
+
void Operation::addParameter(const unsigned long *parm)
{
LOGINFO(4, "Operation::addParameter(unsigned long)");
@@ -200,6 +212,12 @@
returnValue = Parameter((void*)parm, SHORT);
}
+ void Operation::setReturnValue(const int *parm)
+ {
+ LOGINFO(4, "Operation::setReturnValue(int)");
+ returnValue = Parameter((void*)parm, INT);
+ }
+
void Operation::setReturnValue(const long *parm)
{
LOGINFO(4, "Operation::setReturnValue(long*)");
@@ -210,6 +228,12 @@
{
LOGINFO(4, "Operation::setReturnValue(unsigned short*)");
returnValue = Parameter((void*)parm, USHORT);
+ }
+
+ void Operation::setReturnValue(const unsigned int *parm)
+ {
+ LOGINFO(4, "Operation::setReturnValue(unsigned int)");
+ returnValue = Parameter((void*)parm, UINT);
}
void Operation::setReturnValue(const unsigned long *parm)
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/Operation.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/Operation.h?view=diff&rev=448122&r1=448121&r2=448122
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/Operation.h (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/Operation.h Wed Sep 20 01:24:38 2006
@@ -65,8 +65,10 @@
VOID_TYPE,
BOOL,
SHORT,
+ INT,
LONG,
USHORT,
+ UINT,
ULONG,
FLOAT,
DOUBLE,
@@ -96,8 +98,10 @@
SCA_API void setReturnValue(const void *retVal);
SCA_API void setReturnValue(const bool *retVal);
SCA_API void setReturnValue(const short *retVal);
+ SCA_API void setReturnValue(const int *retVal);
SCA_API void setReturnValue(const long *retVal);
SCA_API void setReturnValue(const unsigned short *retVal);
+ SCA_API void setReturnValue(const unsigned int *retVal);
SCA_API void setReturnValue(const unsigned long *retVal);
SCA_API void setReturnValue(const float *retVal);
SCA_API void setReturnValue(const double *retVal);
@@ -115,8 +119,10 @@
SCA_API void addParameter(const void *parm);
SCA_API void addParameter(const bool *parm);
SCA_API void addParameter(const short *parm);
+ SCA_API void addParameter(const int *parm);
SCA_API void addParameter(const long *parm);
SCA_API void addParameter(const unsigned short *parm);
+ SCA_API void addParameter(const unsigned int *parm);
SCA_API void addParameter(const unsigned long *parm);
SCA_API void addParameter(const float *parm);
SCA_API void addParameter(const double *parm);
Modified: incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.cpp?view=diff&rev=448122&r1=448121&r2=448122
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/python/src/tuscany/sca/python/PythonServiceWrapper.cpp Wed Sep 20 01:24:38 2006
@@ -328,6 +328,16 @@
pValue = PyInt_FromLong(*(unsigned short*)parm.getValue());
break;
}
+ case Operation::INT:
+ {
+ pValue = PyInt_FromLong(*(int*)parm.getValue());
+ break;
+ }
+ case Operation::UINT:
+ {
+ pValue = PyInt_FromLong(*(unsigned int*)parm.getValue());
+ break;
+ }
case Operation::LONG:
{
pValue = PyLong_FromLong(*(long*)parm.getValue());
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=448122&r1=448121&r2=448122
==============================================================================
--- 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 Wed Sep 20 01:24:38 2006
@@ -290,6 +290,11 @@
l.append(*(short*)parm.getValue());
break;
}
+ case Operation::INT:
+ {
+ l.append(*(int*)parm.getValue());
+ break;
+ }
case Operation::LONG:
{
l.append(*(long*)parm.getValue());
@@ -297,12 +302,17 @@
}
case Operation::USHORT:
{
- l.append(*(short*)parm.getValue());
+ l.append(*(unsigned short*)parm.getValue());
+ break;
+ }
+ case Operation::UINT:
+ {
+ l.append(*(unsigned int*)parm.getValue());
break;
}
case Operation::ULONG:
{
- l.append(*(long*)parm.getValue());
+ l.append(*(unsigned long*)parm.getValue());
break;
}
case Operation::FLOAT:
@@ -358,6 +368,11 @@
requestDO->setShort(i, *(short*)parm.getValue());
break;
}
+ case Operation::INT:
+ {
+ requestDO->setInteger(i, *(int*)parm.getValue());
+ break;
+ }
case Operation::LONG:
{
requestDO->setLong(i, *(long*)parm.getValue());
@@ -366,6 +381,11 @@
case Operation::USHORT:
{
requestDO->setInteger(i, *(unsigned short*)parm.getValue());
+ break;
+ }
+ case Operation::UINT:
+ {
+ requestDO->setInteger(i, *(unsigned int*)parm.getValue());
break;
}
case Operation::ULONG:
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=448122&r1=448121&r2=448122
==============================================================================
--- 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 Wed Sep 20 01:24:38 2006
@@ -209,7 +209,7 @@
case Type::DataObjectType:
{
DataObjectPtr dataObjectData = inputDataObject->getDataObject(pl[i]);
- //printf("inputDataObject has DataObjectType named %s (#%d)\n", name, dataObjectData);
+ printf("inputDataObject has DataObjectType named %s (#%d)\n", name, dataObjectData);
if(!dataObjectData)
{
@@ -225,7 +225,7 @@
* Get each element as a DataObject and add in to the parameter list
*/
- //printf("inputDataObject has OpenDataObjectType named %s\n", name);
+ printf("inputDataObject has OpenDataObjectType named %s\n", name);
DataObjectList& dataObjectList = inputDataObject->getList(pl[i]);
for(int j=0; j<dataObjectList.size(); j++)
@@ -379,6 +379,11 @@
l.append(*(short*)operation.getReturnValue());
break;
}
+ case Operation::INT:
+ {
+ l.append(*(int*)operation.getReturnValue());
+ break;
+ }
case Operation::LONG:
{
l.append(*(long*)operation.getReturnValue());
@@ -389,6 +394,11 @@
l.append(*(short*)operation.getReturnValue());
break;
}
+ case Operation::UINT:
+ {
+ l.append(*(int*)operation.getReturnValue());
+ break;
+ }
case Operation::ULONG:
{
l.append(*(long*)operation.getReturnValue());
@@ -457,14 +467,24 @@
outputDataObject->setShort(pl[i], *(short*)operation.getReturnValue());
break;
}
+ case Operation::INT:
+ {
+ outputDataObject->setInteger(pl[i], *(int*)operation.getReturnValue());
+ break;
+ }
case Operation::LONG:
{
- outputDataObject->setLong(pl[i], *(long*)operation.getReturnValue());
+ outputDataObject->setInteger(pl[i], *(long*)operation.getReturnValue());
break;
}
case Operation::USHORT:
{
outputDataObject->setInteger(pl[i], *(unsigned short*)operation.getReturnValue());
+ break;
+ }
+ case Operation::UINT:
+ {
+ outputDataObject->setInteger(pl[i], *(unsigned int*)operation.getReturnValue());
break;
}
case Operation::ULONG:
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org