cvs commit: ws-axis/c/src/soap/xsd UnsignedShort.cpp UnsignedShort.hpp

[di...@apache.org]

dicka       2005/02/18 08:38:29

  Modified:    c/src/soap/xsd UnsignedShort.cpp UnsignedShort.hpp
  Log:
  Correct infinite recursion, by using correct types throughout.
  
  PR: AXISCPP-456
  Submitted by: Adrian Dick
  Reviewed by: Andrew Perry
  
  Revision  Changes    Path
  1.4       +5 -5      ws-axis/c/src/soap/xsd/UnsignedShort.cpp
  
  Index: UnsignedShort.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/xsd/UnsignedShort.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- UnsignedShort.cpp	18 Feb 2005 11:11:20 -0000	1.3
  +++ UnsignedShort.cpp	18 Feb 2005 16:38:29 -0000	1.4
  @@ -12,7 +12,7 @@
   
   AxisChar* UnsignedShort::serialize(const void* value) throw (AxisSoapException)
   {
  -    return serialize((unsigned int*) value);
  +    return serialize((xsd__unsignedShort *) value);
   }
   
   void* UnsignedShort::deserialize(const AxisChar* valueAsChar) throw (AxisSoapException)
  @@ -20,13 +20,13 @@
       return (void*) deserializeUnsignedShort(valueAsChar);
   }
   
  -AxisChar* UnsignedShort::serialize(const unsigned short* value) throw (AxisSoapException)
  +AxisChar* UnsignedShort::serialize(xsd__unsignedShort * value) throw (AxisSoapException)
   {
       unsigned int valueAsInt = static_cast<unsigned int>(*value);
       return UnsignedInt::serialize(&valueAsInt);
   }
   
  -unsigned short* UnsignedShort::deserializeUnsignedShort(const AxisChar* valueAsChar) throw (AxisSoapException)
  +xsd__unsignedShort* UnsignedShort::deserializeUnsignedShort(const AxisChar* valueAsChar) throw (AxisSoapException)
   {
       unsigned int* returnValue = UnsignedInt::deserializeUnsignedInt(valueAsChar);
    
  @@ -35,8 +35,8 @@
           delete m_UnsignedShort;
           m_UnsignedShort = NULL;
       }
  -    m_UnsignedShort = new unsigned short;
  -    *m_UnsignedShort = static_cast<unsigned short> (*returnValue);
  +    m_UnsignedShort = new xsd__unsignedShort;
  +    *m_UnsignedShort = static_cast<xsd__unsignedShort> (*returnValue);
       return m_UnsignedShort;
   }
   
  
  
  
  1.3       +4 -3      ws-axis/c/src/soap/xsd/UnsignedShort.hpp
  
  Index: UnsignedShort.hpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/xsd/UnsignedShort.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- UnsignedShort.hpp	25 Jan 2005 14:25:24 -0000	1.2
  +++ UnsignedShort.hpp	18 Feb 2005 16:38:29 -0000	1.3
  @@ -23,6 +23,7 @@
   #define _UNSIGNEDSHORT_HPP____OF_AXIS_INCLUDED_
   
   #include "UnsignedInt.hpp"
  +#include <axis/AxisUserAPI.hpp>
   
   AXIS_CPP_NAMESPACE_START
   
  @@ -60,14 +61,14 @@
        * @param value The UnsignedShort value to be serialized.
        * @return Serialized form of UnsignedShort value.
        */  
  -    AxisChar* serialize(const unsigned short* value) throw (AxisSoapException);
  +    AxisChar* serialize(xsd__unsignedShort* value) throw (AxisSoapException);
     
     /**
      * Deserialized UnsignedShort value from it's on-the-wire string form.
      * @param valueAsChar Serialized form of UnsignedShort value.
      * @return Deserialized UnsignedShort value.
      */
  -    unsigned short* deserializeUnsignedShort(const AxisChar* valueAsChar) throw (AxisSoapException);
  +    xsd__unsignedShort* deserializeUnsignedShort(const AxisChar* valueAsChar) throw (AxisSoapException);
   
   protected:
   
  @@ -79,7 +80,7 @@
       virtual MaxInclusive* getMaxInclusive();
       
   private:
  -    unsigned short *m_UnsignedShort;
  +    xsd__unsignedShort *m_UnsignedShort;
   };
   
   AXIS_CPP_NAMESPACE_END