[certi-cvs] certi/libRTI/ieee1516-2010 CMakeLists.txt Handl...

[CERTI CVS commits]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      14/03/24 13:01:53

Modified files:
        libRTI/ieee1516-2010: CMakeLists.txt Handle.cpp 
                              RTIvariableLengthData.cpp 
                              RTIvariableLengthDataImplementation.h 

Log message:
        Fix compilation on Windows, patch from Jan-Patrick.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/ieee1516-2010/CMakeLists.txt?cvsroot=certi&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/ieee1516-2010/Handle.cpp?cvsroot=certi&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/ieee1516-2010/RTIvariableLengthData.cpp?cvsroot=certi&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/ieee1516-2010/RTIvariableLengthDataImplementation.h?cvsroot=certi&r1=1.1&r2=1.2

Patches:
Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/libRTI/ieee1516-2010/CMakeLists.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- CMakeLists.txt      7 Mar 2014 18:24:44 -0000       1.4
+++ CMakeLists.txt      24 Mar 2014 13:01:52 -0000      1.5
@@ -19,7 +19,7 @@
      )
 
 
-  add_library(VarData1516e STATIC ${VARDATA1516_SRCS})
+  add_library(VarData1516e STATIC ${VARDATA1516E_SRCS})
   target_link_libraries(VarData1516e)
   set_target_properties(VarData1516e PROPERTIES PROJECT_LABEL LibVarData1516e)
   set_target_properties(VarData1516e PROPERTIES COMPILE_FLAGS 
"-DRTI_DISABLE_WARNINGS -DSTATIC_RTI")
@@ -84,7 +84,7 @@
 # Correct line
 target_link_libraries(RTI1516e CERTI FedTime1516e)
 install(FILES RTI1516fedTime.h DESTINATION include/ieee1516-2010/RTI)
-message(STATUS "libRTI variant: HLA 1516")
+message(STATUS "libRTI variant: HLA 1516e")
 set_target_properties(RTI1516e PROPERTIES OUTPUT_NAME "RTI1516e")
 set_target_properties(RTI1516e PROPERTIES COMPILE_FLAGS "-DHLA13NG_LIBRTI 
-DRTI_DISABLE_WARNINGS -DBUILDING_RTI")
 set_target_properties(RTI1516e PROPERTIES VERSION 1.0.0 SOVERSION 1)

Index: Handle.cpp
===================================================================
RCS file: /sources/certi/certi/libRTI/ieee1516-2010/Handle.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Handle.cpp  7 Mar 2014 18:00:49 -0000       1.2
+++ Handle.cpp  24 Mar 2014 13:01:52 -0000      1.3
@@ -115,12 +115,12 @@
        }                                                            \
                                                                     \
        /* Alternate encode for directly filling a buffer         */ \
-       unsigned long HandleKind::encodedLength() const              \
+       size_t HandleKind::encodedLength() const              \
        {                                                            \
                return _impl->encodedLength();                           \
        }                                                            \
-       unsigned long HandleKind::encode(                            \
-       void* buffer, unsigned long bufferSize) const                \
+       size_t HandleKind::encode(                            \
+       void* buffer, size_t bufferSize) const                \
        throw (CouldNotEncode)                                       \
        {                                                            \
                return _impl->encode( buffer, bufferSize );              \

Index: RTIvariableLengthData.cpp
===================================================================
RCS file: /sources/certi/certi/libRTI/ieee1516-2010/RTIvariableLengthData.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- RTIvariableLengthData.cpp   6 Mar 2014 16:11:31 -0000       1.3
+++ RTIvariableLengthData.cpp   24 Mar 2014 13:01:52 -0000      1.4
@@ -15,7 +15,7 @@
        }
 
        // Caller is free to delete inData after the call
-       VariableLengthData::VariableLengthData(void const * inData, unsigned 
long inSize)
+       VariableLengthData::VariableLengthData(void const * inData, size_t 
inSize)
                : _impl(0)
        {
                _impl = new VariableLengthDataImplementation(inData, inSize);
@@ -57,7 +57,7 @@
                        return 0;
                }
        }
-       unsigned long 
+       size_t 
                VariableLengthData::size() const
        {
                if (_impl != 0)
@@ -70,7 +70,7 @@
        }
 
        // Caller is free to delete inData after the call
-       void VariableLengthData::setData(void const * inData, unsigned long 
inSize)
+       void VariableLengthData::setData(void const * inData, size_t inSize)
        {
                if (_impl != 0)
                {
@@ -84,7 +84,7 @@
        // Caller is responsible for ensuring that the data that is 
        // pointed to is valid for the lifetime of this object, or past
        // the next time this object is given new data.
-       void VariableLengthData::setDataPointer(void* inData, unsigned long 
inSize)
+       void VariableLengthData::setDataPointer(void* inData, size_t inSize)
        {
                if (_impl == 0)
                {
@@ -99,7 +99,7 @@
        // The allocation of inData is assumed to have been through an array
        // alloctor (e.g., char* data = new char[20]. If the data was allocated
        // in some other fashion, a deletion function must be supplied.
-       void VariableLengthData::takeDataPointer(void* inData, unsigned long 
inSize, VariableLengthDataDeleteFunction func)
+       void VariableLengthData::takeDataPointer(void* inData, size_t inSize, 
VariableLengthDataDeleteFunction func)
        {
                if (_impl == 0)
                {
@@ -120,7 +120,7 @@
        }
 
        // Caller is free to delete inData after the call
-       VariableLengthDataImplementation::VariableLengthDataImplementation(void 
const * inData, unsigned long inSize)
+       VariableLengthDataImplementation::VariableLengthDataImplementation(void 
const * inData, size_t inSize)
                : _data(0)
                , _size(inSize)
                , _dataOwner(true)

Index: RTIvariableLengthDataImplementation.h
===================================================================
RCS file: 
/sources/certi/certi/libRTI/ieee1516-2010/RTIvariableLengthDataImplementation.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- RTIvariableLengthDataImplementation.h       3 Mar 2014 16:43:27 -0000       
1.1
+++ RTIvariableLengthDataImplementation.h       24 Mar 2014 13:01:53 -0000      
1.2
@@ -8,7 +8,7 @@
 public:
     VariableLengthDataImplementation();
     // Caller is free to delete inData after the call
-    VariableLengthDataImplementation(void const * inData, unsigned long 
inSize);
+    VariableLengthDataImplementation(void const * inData, size_t inSize);
     // Caller is free to delete rhs after the call
     VariableLengthDataImplementation(VariableLengthDataImplementation const & 
rhs);