Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/libRTI/ieee1516-2010/CMakeLists.txt,v
retrieving revision 1.4
diff -u -r1.4 CMakeLists.txt
--- CMakeLists.txt	7 Mar 2014 18:24:44 -0000	1.4
+++ CMakeLists.txt	24 Mar 2014 11:58:03 -0000
@@ -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")
Index: Handle.cpp
===================================================================
RCS file: /sources/certi/certi/libRTI/ieee1516-2010/Handle.cpp,v
retrieving revision 1.2
diff -u -r1.2 Handle.cpp
--- Handle.cpp	7 Mar 2014 18:00:49 -0000	1.2
+++ Handle.cpp	24 Mar 2014 12:30:10 -0000
@@ -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
diff -u -r1.3 RTIvariableLengthData.cpp
--- RTIvariableLengthData.cpp	6 Mar 2014 16:11:31 -0000	1.3
+++ RTIvariableLengthData.cpp	24 Mar 2014 12:13:53 -0000
@@ -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
diff -u -r1.1 RTIvariableLengthDataImplementation.h
--- RTIvariableLengthDataImplementation.h	3 Mar 2014 16:43:27 -0000	1.1
+++ RTIvariableLengthDataImplementation.h	24 Mar 2014 12:12:28 -0000
@@ -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);