You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by wh...@apache.org on 2005/07/19 16:45:34 UTC
cvs commit: ws-axis/c/src/soap SoapSerializer.cpp SoapSerializer.h
whitlock 2005/07/19 07:45:34
Modified: c/src/common ArrayBean.h Param.h
c/src/soap SoapSerializer.cpp SoapSerializer.h
Removed: c/src/common IArrayBean.h
Log:
AXISCPP-149 Remove IArrayBean because it is redundant.
Revision Changes Path
1.18 +1 -2 ws-axis/c/src/common/ArrayBean.h
Index: ArrayBean.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/ArrayBean.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ArrayBean.h 22 Nov 2004 10:40:00 -0000 1.17
+++ ArrayBean.h 19 Jul 2005 14:45:33 -0000 1.18
@@ -19,7 +19,6 @@
#if !defined(AXIS_ARRAYBEAN_H__OF_AXIS_INCLUDED_)
#define AXIS_ARRAYBEAN_H__OF_AXIS_INCLUDED_
-#include "IArrayBean.h"
#include "BasicTypeSerializer.h"
#include "ComplexObjectHandler.h"
@@ -37,7 +36,7 @@
@author Susantha Kumara (skumara@virtusa.com)
*/
-class ArrayBean:public IArrayBean
+class ArrayBean
{
friend class Param;
public:
1.33 +1 -4 ws-axis/c/src/common/Param.h
Index: Param.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/common/Param.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- Param.h 14 Jul 2005 13:18:39 -0000 1.32
+++ Param.h 19 Jul 2005 14:45:33 -0000 1.33
@@ -34,10 +34,7 @@
class ParamValue
{
public:
- union {
- class ArrayBean* pArray; /* this is used to hold arrays */
- class IArrayBean* pIArray; /* used by wrapper classes */
- };
+ ArrayBean* pArray; /* this is used to hold arrays */
ComplexObjectHandler* pCplxObj;
AnyType* pAnyObject; /* used to hold AnyType struct for xsd:any */
SoapAttachmentReference* pAttachmentRef;
1.137 +8 -8 ws-axis/c/src/soap/SoapSerializer.cpp
Index: SoapSerializer.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapSerializer.cpp,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- SoapSerializer.cpp 14 Jul 2005 13:18:39 -0000 1.136
+++ SoapSerializer.cpp 19 Jul 2005 14:45:33 -0000 1.137
@@ -152,7 +152,7 @@
{
int iSuccess = AXIS_SUCCESS;
- IArrayBean * pAb = makeArrayBean( nType, (void*) (pArray->m_Array));
+ ArrayBean * pAb = makeArrayBean( nType, (void*) (pArray->m_Array));
pAb->SetDimension(pArray->m_Size);
@@ -169,7 +169,7 @@
pParam->setName("array");
}
- pParam->m_Value.pIArray = pAb;
+ pParam->m_Value.pArray = pAb;
pParam->m_Type = XSD_ARRAY;
if( m_pSoapEnvelope && (m_pSoapEnvelope->m_pSoapBody) &&
@@ -190,7 +190,7 @@
{
int iSuccess = AXIS_SUCCESS;
- IArrayBean* pAb = makeArrayBean( (void*)(pArray->m_Array), pSZFunct,
+ ArrayBean* pAb = makeArrayBean( (void*)(pArray->m_Array), pSZFunct,
pDelFunct,
pSizeFunct);
@@ -217,7 +217,7 @@
pParam->setName( "array");
}
- pParam->m_Value.pIArray = pAb;
+ pParam->m_Value.pArray = pAb;
pParam->m_Type = XSD_ARRAY;
if( m_pSoapEnvelope &&
@@ -570,7 +570,7 @@
* Used to create an ArrayBean when the return type of a method is an array
* of basic types
*/
-IArrayBean * SoapSerializer::makeArrayBean( XSDTYPE nType, void * pArray)
+ArrayBean * SoapSerializer::makeArrayBean( XSDTYPE nType, void * pArray)
{
ArrayBean* pAb = new ArrayBean();
@@ -584,7 +584,7 @@
* Used to create an ArrayBean when the return type of a method is an array
* of complex types
*/
-IArrayBean * SoapSerializer::makeArrayBean(void * pObject,
+ArrayBean * SoapSerializer::makeArrayBean(void * pObject,
void * pSZFunct,
void * pDelFunct,
void * pSizeFunct)
@@ -680,7 +680,7 @@
pParam->setName( "array");
}
- pParam->m_Value.pIArray = pAb;
+ pParam->m_Value.pArray = pAb;
pParam->m_Type = XSD_ARRAY;
if( pNamespace != NULL)
@@ -752,7 +752,7 @@
pParam->setName( "array");
}
- pParam->m_Value.pIArray = pAb;
+ pParam->m_Value.pArray = pAb;
pParam->m_Type = XSD_ARRAY;
if( pNamespace != NULL)
1.54 +3 -3 ws-axis/c/src/soap/SoapSerializer.h
Index: SoapSerializer.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/soap/SoapSerializer.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- SoapSerializer.h 14 Jul 2005 13:18:39 -0000 1.53
+++ SoapSerializer.h 19 Jul 2005 14:45:33 -0000 1.54
@@ -38,7 +38,7 @@
class SoapBody;
class SoapFault;
class HeaderBlock;
-class IArrayBean;
+class ArrayBean;
class Attribute;
class ISoapAttachment;
class SoapAttachmentReference;
@@ -160,8 +160,8 @@
void setCurrentProviderType(PROVIDERTYPE nType) { m_ProviderType = nType;};
private:
- IArrayBean* makeArrayBean(XSDTYPE nType, void* pArray);
- IArrayBean* makeArrayBean(void* pObject, void* pSZFunct, void* pDelFunct,
+ ArrayBean* makeArrayBean(XSDTYPE nType, void* pArray);
+ ArrayBean* makeArrayBean(void* pObject, void* pSZFunct, void* pDelFunct,
void* pSizeFunct);
int setSoapHeader(SoapHeader* pSoapHeader);