geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [7/8] geode-native git commit: GEODE-2439: Remove C++ fixed width integers from clicache
Date Fri, 24 Feb 2017 03:39:28 GMT
http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CqStatistics.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqStatistics.hpp b/src/clicache/src/CqStatistics.hpp
index 311d69b..69b6416 100644
--- a/src/clicache/src/CqStatistics.hpp
+++ b/src/clicache/src/CqStatistics.hpp
@@ -40,22 +40,22 @@ namespace Apache
         /// <summary>
         /// get number of inserts qualified by this Cq
         /// </summary>
-          uint32_t numInserts( );
+          System::UInt32 numInserts( );
 
         /// <summary>
         /// get number of deletes qualified by this Cq
         /// </summary>
-          uint32_t numDeletes( );
+          System::UInt32 numDeletes( );
 
         /// <summary>
         /// get number of updates qualified by this Cq
         /// </summary>
-          uint32_t numUpdates( );
+          System::UInt32 numUpdates( );
 
         /// <summary>
         /// get number of events qualified by this Cq
         /// </summary>
-          uint32_t numEvents( );
+          System::UInt32 numEvents( );
 
       internal:
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/DataInput.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/DataInput.cpp b/src/clicache/src/DataInput.cpp
index b07b23b..ea32707 100644
--- a/src/clicache/src/DataInput.cpp
+++ b/src/clicache/src/DataInput.cpp
@@ -46,7 +46,7 @@ namespace Apache
     namespace Client
     {
 
-      DataInput::DataInput(uint8_t* buffer, int size)
+      DataInput::DataInput(System::Byte* buffer, int size)
       {
         m_ispdxDesrialization = false;
         m_isRootObjectPdx = false;
@@ -58,7 +58,7 @@ namespace Apache
           m_isManagedObject = false;
           m_forStringDecode = gcnew array<Char>(100);
 
-          m_buffer = const_cast<uint8_t*>(NativePtr->currentBufferPosition());
+          m_buffer = const_cast<System::Byte*>(NativePtr->currentBufferPosition());
           m_bufferLength = NativePtr->getBytesRemaining();
 
           _GF_MG_EXCEPTION_CATCH_ALL2
@@ -76,8 +76,8 @@ namespace Apache
         if (buffer != nullptr && buffer->Length > 0) {
           _GF_MG_EXCEPTION_TRY2
 
-            int32_t len = buffer->Length;
-          GF_NEW(m_buffer, uint8_t[len]);
+            System::Int32 len = buffer->Length;
+          GF_NEW(m_buffer, System::Byte[len]);
           pin_ptr<const Byte> pin_buffer = &buffer[0];
           memcpy(m_buffer, (void*)pin_buffer, len);
           SetPtr(new apache::geode::client::DataInput(m_buffer, len), true);
@@ -86,7 +86,7 @@ namespace Apache
           m_isManagedObject = false;
           m_forStringDecode = gcnew array<Char>(100);
 
-          m_buffer = const_cast<uint8_t*>(NativePtr->currentBufferPosition());
+          m_buffer = const_cast<System::Byte*>(NativePtr->currentBufferPosition());
           m_bufferLength = NativePtr->getBytesRemaining();
 
           _GF_MG_EXCEPTION_CATCH_ALL2
@@ -97,12 +97,12 @@ namespace Apache
         }
       }
 
-      DataInput::DataInput(array<Byte>^ buffer, int32_t len)
+      DataInput::DataInput(array<Byte>^ buffer, System::Int32 len)
       {
         m_ispdxDesrialization = false;
         m_isRootObjectPdx = false;
         if (buffer != nullptr) {
-          if (len == 0 || (int32_t)len > buffer->Length) {
+          if (len == 0 || (System::Int32)len > buffer->Length) {
             throw gcnew IllegalArgumentException(String::Format(
               "DataInput.ctor(): given length {0} is zero or greater than "
               "size of buffer {1}", len, buffer->Length));
@@ -111,12 +111,12 @@ namespace Apache
           //System::Array::Copy(buffer, 0, m_bytes, 0, len);
           _GF_MG_EXCEPTION_TRY2
 
-            GF_NEW(m_buffer, uint8_t[len]);
+            GF_NEW(m_buffer, System::Byte[len]);
           pin_ptr<const Byte> pin_buffer = &buffer[0];
           memcpy(m_buffer, (void*)pin_buffer, len);
           SetPtr(new apache::geode::client::DataInput(m_buffer, len), true);
 
-          m_buffer = const_cast<uint8_t*>(NativePtr->currentBufferPosition());
+          m_buffer = const_cast<System::Byte*>(NativePtr->currentBufferPosition());
           m_bufferLength = NativePtr->getBytesRemaining();
 
           _GF_MG_EXCEPTION_CATCH_ALL2
@@ -173,7 +173,7 @@ namespace Apache
 
       array<Byte>^ DataInput::ReadBytes()
       {
-        int32_t length;
+        System::Int32 length;
         length = ReadArrayLen();
 
         if (length >= 0) {
@@ -218,7 +218,7 @@ namespace Apache
 
       array<SByte>^ DataInput::ReadSBytes()
       {
-        int32_t length;
+        System::Int32 length;
         length = ReadArrayLen();
 
         if (length > -1) {
@@ -232,7 +232,7 @@ namespace Apache
         return nullptr;
       }
 
-      array<Byte>^ DataInput::ReadBytesOnly(uint32_t len)
+      array<Byte>^ DataInput::ReadBytesOnly(System::UInt32 len)
       {
         if (len > 0) {
           CheckBufferSize(len);
@@ -249,14 +249,14 @@ namespace Apache
       void DataInput::ReadBytesOnly(array<Byte> ^ buffer, int offset, int count)
       {
         if (count > 0) {
-          CheckBufferSize((uint32_t)count);
+          CheckBufferSize((System::UInt32)count);
 
           for (int i = 0; i < count; i++)
             buffer[offset + i] = m_buffer[m_cursor++];
         }
       }
 
-      array<SByte>^ DataInput::ReadSBytesOnly(uint32_t len)
+      array<SByte>^ DataInput::ReadSBytesOnly(System::UInt32 len)
       {
         if (len > 0) {
           CheckBufferSize(len);
@@ -270,18 +270,18 @@ namespace Apache
         return nullptr;
       }
 
-      uint16_t DataInput::ReadUInt16()
+      System::UInt16 DataInput::ReadUInt16()
       {
         CheckBufferSize(2);
-        uint16_t data = m_buffer[m_cursor++];
+        System::UInt16 data = m_buffer[m_cursor++];
         data = (data << 8) | m_buffer[m_cursor++];
         return data;
       }
 
-      uint32_t DataInput::ReadUInt32()
+      System::UInt32 DataInput::ReadUInt32()
       {
         CheckBufferSize(4);
-        uint32_t data = m_buffer[m_cursor++];
+        System::UInt32 data = m_buffer[m_cursor++];
         data = (data << 8) | m_buffer[m_cursor++];
         data = (data << 8) | m_buffer[m_cursor++];
         data = (data << 8) | m_buffer[m_cursor++];
@@ -289,9 +289,9 @@ namespace Apache
         return data;
       }
 
-      uint64_t DataInput::ReadUInt64()
+      System::UInt64 DataInput::ReadUInt64()
       {
-        uint64_t data;
+        System::UInt64 data;
 
         CheckBufferSize(8);
 
@@ -307,17 +307,17 @@ namespace Apache
         return data;
       }
 
-      int16_t DataInput::ReadInt16()
+      System::Int16 DataInput::ReadInt16()
       {
         return ReadUInt16();
       }
 
-      int32_t DataInput::ReadInt32()
+      System::Int32 DataInput::ReadInt32()
       {
         return ReadUInt32();
       }
 
-      int64_t DataInput::ReadInt64()
+      System::Int64 DataInput::ReadInt64()
       {
         return ReadUInt64();
       }
@@ -622,7 +622,7 @@ namespace Apache
         //Log::Debug("DataInput::ReadInternalObject m_cursor " + m_cursor);
         bool findinternal = false;
         int8_t typeId = ReadByte();
-        int64_t compId = typeId;
+        System::Int64 compId = typeId;
         TypeFactoryMethodGeneric^ createType = nullptr;
 
         if (compId == GeodeTypeIds::NullObj) {
@@ -632,7 +632,7 @@ namespace Apache
         {
           //cache current state and reset after reading pdx object
           int cacheCursor = m_cursor;
-          uint8_t* cacheBuffer = m_buffer;
+          System::Byte* cacheBuffer = m_buffer;
           unsigned int cacheBufferLength = m_bufferLength;
           Object^ ret = Internal::PdxHelper::DeserializePdx(this, false);
           int tmp = NativePtr->getBytesRemaining();
@@ -668,18 +668,18 @@ namespace Apache
         }
         else if (compId == GeodeTypeIdsImpl::CacheableUserData) {
           int8_t classId = ReadByte();
-          //compId |= ( ( (int64_t)classId ) << 32 );
-          compId = (int64_t)classId;
+          //compId |= ( ( (System::Int64)classId ) << 32 );
+          compId = (System::Int64)classId;
         }
         else if (compId == GeodeTypeIdsImpl::CacheableUserData2) {
-          int16_t classId = ReadInt16();
-          //compId |= ( ( (int64_t)classId ) << 32 );
-          compId = (int64_t)classId;
+          System::Int16 classId = ReadInt16();
+          //compId |= ( ( (System::Int64)classId ) << 32 );
+          compId = (System::Int64)classId;
         }
         else if (compId == GeodeTypeIdsImpl::CacheableUserData4) {
-          int32_t classId = ReadInt32();
-          //compId |= ( ( (int64_t)classId ) << 32 );
-          compId = (int64_t)classId;
+          System::Int32 classId = ReadInt32();
+          //compId |= ( ( (System::Int64)classId ) << 32 );
+          compId = (System::Int64)classId;
         }
         else if (compId == GeodeTypeIdsImpl::FixedIDByte) {//TODO: need to verify again
           int8_t fixedId = ReadByte();
@@ -687,18 +687,18 @@ namespace Apache
           findinternal = true;
         }
         else if (compId == GeodeTypeIdsImpl::FixedIDShort) {
-          int16_t fixedId = ReadInt16();
+          System::Int16 fixedId = ReadInt16();
           compId = fixedId;
           findinternal = true;
         }
         else if (compId == GeodeTypeIdsImpl::FixedIDInt) {
-          int32_t fixedId = ReadInt32();
+          System::Int32 fixedId = ReadInt32();
           compId = fixedId;
           findinternal = true;
         }
         if (findinternal) {
           compId += 0x80000000;
-          createType = Serializable::GetManagedDelegateGeneric((int64_t)compId);
+          createType = Serializable::GetManagedDelegateGeneric((System::Int64)compId);
         }
         else {
           createType = Serializable::GetManagedDelegateGeneric(compId);
@@ -759,7 +759,7 @@ namespace Apache
           list = (System::Collections::IList^)Serializable::GetArrayObject(ret->GetType()->FullName, len);
 
           list[0] = ret;
-          for (int32_t index = 1; index < list->Count; ++index)
+          for (System::Int32 index = 1; index < list->Count; ++index)
           {
             list[index] = ReadObject();
           }
@@ -772,7 +772,7 @@ namespace Apache
       {
         bool findinternal = false;
         int8_t typeId = ReadByte();
-        int64_t compId = typeId;
+        System::Int64 compId = typeId;
         TypeFactoryMethodGeneric^ createType = nullptr;
 
         if (compId == GeodeTypeIds::NullObj) {
@@ -789,18 +789,18 @@ namespace Apache
         }
         else if (compId == GeodeTypeIdsImpl::CacheableUserData) {
           int8_t classId = ReadByte();
-          //compId |= ( ( (int64_t)classId ) << 32 );
-          compId = (int64_t)classId;
+          //compId |= ( ( (System::Int64)classId ) << 32 );
+          compId = (System::Int64)classId;
         }
         else if (compId == GeodeTypeIdsImpl::CacheableUserData2) {
-          int16_t classId = ReadInt16();
-          //compId |= ( ( (int64_t)classId ) << 32 );
-          compId = (int64_t)classId;
+          System::Int16 classId = ReadInt16();
+          //compId |= ( ( (System::Int64)classId ) << 32 );
+          compId = (System::Int64)classId;
         }
         else if (compId == GeodeTypeIdsImpl::CacheableUserData4) {
-          int32_t classId = ReadInt32();
-          //compId |= ( ( (int64_t)classId ) << 32 );
-          compId = (int64_t)classId;
+          System::Int32 classId = ReadInt32();
+          //compId |= ( ( (System::Int64)classId ) << 32 );
+          compId = (System::Int64)classId;
         }
         else if (compId == GeodeTypeIdsImpl::FixedIDByte) {//TODO: need to verify again
           int8_t fixedId = ReadByte();
@@ -808,18 +808,18 @@ namespace Apache
           findinternal = true;
         }
         else if (compId == GeodeTypeIdsImpl::FixedIDShort) {
-          int16_t fixedId = ReadInt16();
+          System::Int16 fixedId = ReadInt16();
           compId = fixedId;
           findinternal = true;
         }
         else if (compId == GeodeTypeIdsImpl::FixedIDInt) {
-          int32_t fixedId = ReadInt32();
+          System::Int32 fixedId = ReadInt32();
           compId = fixedId;
           findinternal = true;
         }
         if (findinternal) {
           compId += 0x80000000;
-          createType = Serializable::GetManagedDelegateGeneric((int64_t)compId);
+          createType = Serializable::GetManagedDelegateGeneric((System::Int64)compId);
         }
         else {
           createType = Serializable::GetManagedDelegateGeneric(compId);
@@ -845,7 +845,7 @@ namespace Apache
         throw gcnew IllegalStateException("Unregistered typeId in deserialization, aborting.");
       }
 
-      uint32_t DataInput::BytesRead::get()
+      System::UInt32 DataInput::BytesRead::get()
       {
         AdvanceUMCursor();
         SetBuffer();
@@ -853,12 +853,12 @@ namespace Apache
         return NativePtr->getBytesRead();
       }
 
-      uint32_t DataInput::BytesReadInternally::get()
+      System::UInt32 DataInput::BytesReadInternally::get()
       {
         return m_cursor;
       }
 
-      uint32_t DataInput::BytesRemaining::get()
+      System::UInt32 DataInput::BytesRemaining::get()
       {
         AdvanceUMCursor();
         SetBuffer();
@@ -866,12 +866,12 @@ namespace Apache
         //return m_bufferLength - m_cursor;
       }
 
-      void DataInput::AdvanceCursor(int32_t offset)
+      void DataInput::AdvanceCursor(System::Int32 offset)
       {
         m_cursor += offset;
       }
 
-      void DataInput::RewindCursor(int32_t offset)
+      void DataInput::RewindCursor(System::Int32 offset)
       {
         AdvanceUMCursor();
         NativePtr->rewindCursor(offset);

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/DataInput.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/DataInput.hpp b/src/clicache/src/DataInput.hpp
index 1ea78f2..35bc6b5 100644
--- a/src/clicache/src/DataInput.hpp
+++ b/src/clicache/src/DataInput.hpp
@@ -70,7 +70,7 @@ namespace Apache
         /// <exception cref="IllegalArgumentException">
         /// if the buffer is null
         /// </exception>
-        DataInput( array<Byte>^ buffer, int32_t len );
+        DataInput( array<Byte>^ buffer, System::Int32 len );
 
         /// <summary>
         /// Dispose: frees the internal buffer.
@@ -113,7 +113,7 @@ namespace Apache
         /// Read the given number of bytes from the stream.
         /// </summary>
         /// <param name="len">Number of bytes to read.</param>
-        array<Byte>^ ReadBytesOnly( uint32_t len );
+        array<Byte>^ ReadBytesOnly( System::UInt32 len );
 
         void ReadBytesOnly( array<Byte> ^ buffer, int offset, int count );
 
@@ -121,7 +121,7 @@ namespace Apache
         /// Read the given number of signed bytes from the stream.
         /// </summary>
         /// <param name="len">Number of signed bytes to read.</param>
-        array<SByte>^ ReadSBytesOnly( uint32_t len );
+        array<SByte>^ ReadSBytesOnly( System::UInt32 len );
 
         /// <summary>
         /// Read a array len based on array size.
@@ -131,17 +131,17 @@ namespace Apache
         /// <summary>
         /// Read a 16-bit integer from the stream.
         /// </summary>
-        int16_t ReadInt16( );
+        System::Int16 ReadInt16( );
 
         /// <summary>
         /// Read a 32-bit integer from the stream.
         /// </summary>
-        int32_t ReadInt32( );
+        System::Int32 ReadInt32( );
 
         /// <summary>
         /// Read a 64-bit integer from the stream.
         /// </summary>
-        int64_t ReadInt64( );
+        System::Int64 ReadInt64( );
 
         /// <summary>
         /// Read a floating point number from the stream.
@@ -178,17 +178,17 @@ namespace Apache
         /// <summary>
         /// Get the count of bytes that have been read from the stream.
         /// </summary>
-        property uint32_t BytesRead
+        property System::UInt32 BytesRead
         {
-          uint32_t get( );
+          System::UInt32 get( );
         }
 
         /// <summary>
         /// Get the count of bytes that are remaining in the buffer.
         /// </summary>
-        property uint32_t BytesRemaining
+        property System::UInt32 BytesRemaining
         {
-          uint32_t get();
+          System::UInt32 get();
         }
 
         /// <summary>
@@ -197,7 +197,7 @@ namespace Apache
         /// <param name="offset">
         /// The offset(number of bytes) by which to advance the cursor.
         /// </param>
-        void AdvanceCursor( int32_t offset );
+        void AdvanceCursor( System::Int32 offset );
 
         /// <summary>
         /// Rewind the cursor of the buffer by the given offset.
@@ -205,7 +205,7 @@ namespace Apache
         /// <param name="offset">
         /// The offset(number of bytes) by which to rewind the cursor.
         /// </param>
-        void RewindCursor( int32_t offset );
+        void RewindCursor( System::Int32 offset );
 
         /// <summary>
         /// Reset the cursor to the start of buffer.
@@ -315,9 +315,9 @@ namespace Apache
         /// <summary>
         /// Get the count of bytes that have been read from the stream, for internal use only.
         /// </summary>
-        property uint32_t BytesReadInternally
+        property System::UInt32 BytesReadInternally
         {
-          uint32_t get( );
+          System::UInt32 get( );
         }
 
         void ReadObject(bool% obj)
@@ -410,17 +410,17 @@ namespace Apache
         /// <summary>
         /// Read a 16-bit unsigned integer from the stream.
         /// </summary>
-        uint16_t ReadUInt16( );
+        System::UInt16 ReadUInt16( );
 
         /// <summary>
         /// Read a 32-bit unsigned integer from the stream.
         /// </summary>
-        uint32_t ReadUInt32( );
+        System::UInt32 ReadUInt32( );
        
         /// <summary>
         /// Read a 64-bit unsigned integer from the stream.
         /// </summary>
-        uint64_t ReadUInt64( );
+        System::UInt64 ReadUInt64( );
 
         void ReadObject(Double% obj)
         {
@@ -432,17 +432,17 @@ namespace Apache
           obj = ReadFloat();
         }
 
-        void ReadObject(int16_t% obj)
+        void ReadObject(System::Int16% obj)
         {
           obj = ReadInt16();
         }
 
-        void ReadObject(int32_t% obj)
+        void ReadObject(System::Int32% obj)
         {
           obj = ReadInt32();
         }
 
-        void ReadObject(int64_t% obj)
+        void ReadObject(System::Int64% obj)
         {
           obj = ReadInt64();
         }
@@ -497,12 +497,12 @@ namespace Apache
           }
         }
 
-				uint8_t* GetCursor()
+				System::Byte* GetCursor()
         {
           return m_buffer + m_cursor;
         }
 
-        uint8_t* GetBytes(uint8_t* src, uint32_t size)
+        System::Byte* GetBytes(System::Byte* src, System::UInt32 size)
         {
           return NativePtr->getBufferCopyFrom(src, size);
         }
@@ -540,7 +540,7 @@ namespace Apache
 
         void SetBuffer()
         {
-          m_buffer = const_cast<uint8_t*> (NativePtr->currentBufferPosition());
+          m_buffer = const_cast<System::Byte*> (NativePtr->currentBufferPosition());
           m_cursor = 0;
           m_bufferLength = NativePtr->getBytesRemaining();   
         }
@@ -635,7 +635,7 @@ namespace Apache
           m_cursor = 0;
           m_isManagedObject = managedObject;
           m_forStringDecode = gcnew array<Char>(100);
-          m_buffer = const_cast<uint8_t*>(nativeptr->currentBufferPosition());
+          m_buffer = const_cast<System::Byte*>(nativeptr->currentBufferPosition());
           if ( m_buffer != NULL) {
             m_bufferLength = nativeptr->getBytesRemaining();     
 					}
@@ -644,14 +644,14 @@ namespace Apache
           }
         }
 
-        DataInput( uint8_t* buffer, int size );
+        DataInput( System::Byte* buffer, int size );
 
        /* inline DataInput( apache::geode::client::DataInput* nativeptr )
           : UMWrap(nativeptr, false)
         { 
           m_cursor = 0;
           m_isManagedObject = false;
-          m_buffer = const_cast<uint8_t*>(nativeptr->currentBufferPosition());
+          m_buffer = const_cast<System::Byte*>(nativeptr->currentBufferPosition());
           if ( m_buffer != NULL) {
             m_bufferLength = nativeptr->getBytesRemaining();            
           }
@@ -678,7 +678,7 @@ namespace Apache
         /// </summary>
         bool m_ispdxDesrialization;
         bool m_isRootObjectPdx;
-        uint8_t* m_buffer;
+        System::Byte* m_buffer;
         unsigned int m_bufferLength;
         int m_cursor;
         bool m_isManagedObject;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/DataOutput.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/DataOutput.cpp b/src/clicache/src/DataOutput.cpp
index 35a0d06..3ea133d 100644
--- a/src/clicache/src/DataOutput.cpp
+++ b/src/clicache/src/DataOutput.cpp
@@ -59,11 +59,11 @@ namespace Apache
       void DataOutput::WriteChar(Char value)
       {
         EnsureCapacity(2);
-        m_bytes[m_cursor++] = (uint8_t)(value >> 8);
-        m_bytes[m_cursor++] = (uint8_t)value;
+        m_bytes[m_cursor++] = (System::Byte)(value >> 8);
+        m_bytes[m_cursor++] = (System::Byte)value;
       }
 
-      void DataOutput::WriteBytes(array<Byte>^ bytes, int32_t len)
+      void DataOutput::WriteBytes(array<Byte>^ bytes, System::Int32 len)
       {
         if (bytes != nullptr && bytes->Length >= 0)
         {
@@ -85,7 +85,7 @@ namespace Apache
         }
       }
 
-      void DataOutput::WriteArrayLen(int32_t len)
+      void DataOutput::WriteArrayLen(System::Int32 len)
       {
         if (len == -1) {//0xff
           WriteByte(0xFF);
@@ -103,7 +103,7 @@ namespace Apache
         }
       }
 
-      void DataOutput::WriteSBytes(array<SByte>^ bytes, int32_t len)
+      void DataOutput::WriteSBytes(array<SByte>^ bytes, System::Int32 len)
       {
         if (bytes != nullptr && bytes->Length >= 0)
         {
@@ -125,19 +125,19 @@ namespace Apache
         }
       }
 
-      void DataOutput::WriteBytesOnly(array<Byte>^ bytes, uint32_t len)
+      void DataOutput::WriteBytesOnly(array<Byte>^ bytes, System::UInt32 len)
       {
         WriteBytesOnly(bytes, len, 0);
       }
 
-      void DataOutput::WriteBytesOnly(array<Byte>^ bytes, uint32_t len, uint32_t offset)
+      void DataOutput::WriteBytesOnly(array<Byte>^ bytes, System::UInt32 len, System::UInt32 offset)
       {
         if (bytes != nullptr)
         {
-          if (len >= 0 && len <= ((uint32_t)bytes->Length - offset))
+          if (len >= 0 && len <= ((System::UInt32)bytes->Length - offset))
           {
             EnsureCapacity(len);
-            for (uint32_t i = 0; i < len; i++)
+            for (System::UInt32 i = 0; i < len; i++)
               m_bytes[m_cursor++] = bytes[offset + i];
           }
           else
@@ -147,14 +147,14 @@ namespace Apache
         }
       }
 
-      void DataOutput::WriteSBytesOnly(array<SByte>^ bytes, uint32_t len)
+      void DataOutput::WriteSBytesOnly(array<SByte>^ bytes, System::UInt32 len)
       {
         if (bytes != nullptr)
         {
-          if (len >= 0 && len <= (uint32_t)bytes->Length)
+          if (len >= 0 && len <= (System::UInt32)bytes->Length)
           {
             EnsureCapacity(len);
-            for (uint32_t i = 0; i < len; i++)
+            for (System::UInt32 i = 0; i < len; i++)
               m_bytes[m_cursor++] = bytes[i];
           }
           else
@@ -164,46 +164,46 @@ namespace Apache
         }
       }
 
-      void DataOutput::WriteUInt16(uint16_t value)
+      void DataOutput::WriteUInt16(System::UInt16 value)
       {
         EnsureCapacity(2);
-        m_bytes[m_cursor++] = (uint8_t)(value >> 8);
-        m_bytes[m_cursor++] = (uint8_t)value;
+        m_bytes[m_cursor++] = (System::Byte)(value >> 8);
+        m_bytes[m_cursor++] = (System::Byte)value;
       }
 
-      void DataOutput::WriteUInt32(uint32_t value)
+      void DataOutput::WriteUInt32(System::UInt32 value)
       {
         EnsureCapacity(4);
-        m_bytes[m_cursor++] = (uint8_t)(value >> 24);
-        m_bytes[m_cursor++] = (uint8_t)(value >> 16);
-        m_bytes[m_cursor++] = (uint8_t)(value >> 8);
-        m_bytes[m_cursor++] = (uint8_t)value;
+        m_bytes[m_cursor++] = (System::Byte)(value >> 24);
+        m_bytes[m_cursor++] = (System::Byte)(value >> 16);
+        m_bytes[m_cursor++] = (System::Byte)(value >> 8);
+        m_bytes[m_cursor++] = (System::Byte)value;
       }
 
-      void DataOutput::WriteUInt64(uint64_t value)
+      void DataOutput::WriteUInt64(System::UInt64 value)
       {
         EnsureCapacity(8);
-        m_bytes[m_cursor++] = (uint8_t)(value >> 56);
-        m_bytes[m_cursor++] = (uint8_t)(value >> 48);
-        m_bytes[m_cursor++] = (uint8_t)(value >> 40);
-        m_bytes[m_cursor++] = (uint8_t)(value >> 32);
-        m_bytes[m_cursor++] = (uint8_t)(value >> 24);
-        m_bytes[m_cursor++] = (uint8_t)(value >> 16);
-        m_bytes[m_cursor++] = (uint8_t)(value >> 8);
-        m_bytes[m_cursor++] = (uint8_t)value;
+        m_bytes[m_cursor++] = (System::Byte)(value >> 56);
+        m_bytes[m_cursor++] = (System::Byte)(value >> 48);
+        m_bytes[m_cursor++] = (System::Byte)(value >> 40);
+        m_bytes[m_cursor++] = (System::Byte)(value >> 32);
+        m_bytes[m_cursor++] = (System::Byte)(value >> 24);
+        m_bytes[m_cursor++] = (System::Byte)(value >> 16);
+        m_bytes[m_cursor++] = (System::Byte)(value >> 8);
+        m_bytes[m_cursor++] = (System::Byte)value;
       }
 
-      void DataOutput::WriteInt16(int16_t value)
+      void DataOutput::WriteInt16(System::Int16 value)
       {
         WriteUInt16(value);
       }
 
-      void DataOutput::WriteInt32(int32_t value)
+      void DataOutput::WriteInt32(System::Int32 value)
       {
         WriteUInt32(value);
       }
 
-      void DataOutput::WriteInt64(int64_t value)
+      void DataOutput::WriteInt64(System::Int64 value)
       {
         WriteUInt64(value);
       }
@@ -373,7 +373,7 @@ namespace Apache
           WriteUInt32(strLength);
           EnsureCapacity(strLength);
           for (int i = 0; i < strLength; i++) {
-            m_bytes[m_cursor++] = (uint8_t)value[i];
+            m_bytes[m_cursor++] = (System::Byte)value[i];
           }
         }
         else {
@@ -409,7 +409,7 @@ namespace Apache
       WriteObject( (IGeodeSerializable^)obj );
       }*/
 
-      int8_t DataOutput::GetTypeId(uint32_t classId)
+      int8_t DataOutput::GetTypeId(System::UInt32 classId)
       {
         if (classId >= 0x80000000) {
           return (int8_t)((classId - 0x80000000) % 0x20000000);
@@ -425,7 +425,7 @@ namespace Apache
         }
       }
 
-      int8_t DataOutput::DSFID(uint32_t classId)
+      int8_t DataOutput::DSFID(System::UInt32 classId)
       {
         // convention that [0x8000000, 0xa0000000) is for FixedIDDefault,
         // [0xa000000, 0xc0000000) is for FixedIDByte,
@@ -697,37 +697,37 @@ namespace Apache
             break;
           case GeodeTypeIdsImpl::FixedIDShort:
             WriteByte((int8_t)GeodeTypeIdsImpl::FixedIDShort);
-            WriteInt16((int16_t)typeId); // write the type ID.
+            WriteInt16((System::Int16)typeId); // write the type ID.
             break;
           case GeodeTypeIdsImpl::FixedIDInt:
             WriteByte((int8_t)GeodeTypeIdsImpl::FixedIDInt);
-            WriteInt32((int32_t)typeId); // write the type ID.
+            WriteInt32((System::Int32)typeId); // write the type ID.
             break;
           default:
             WriteByte(typeId); // write the type ID.
             break;
           }
 
-          if ((int32_t)typeId == GeodeTypeIdsImpl::CacheableUserData) {
+          if ((System::Int32)typeId == GeodeTypeIdsImpl::CacheableUserData) {
             WriteByte((int8_t)obj->ClassId);
           }
-          else if ((int32_t)typeId == GeodeTypeIdsImpl::CacheableUserData2) {
-            WriteInt16((int16_t)obj->ClassId);
+          else if ((System::Int32)typeId == GeodeTypeIdsImpl::CacheableUserData2) {
+            WriteInt16((System::Int16)obj->ClassId);
           }
-          else if ((int32_t)typeId == GeodeTypeIdsImpl::CacheableUserData4) {
-            WriteInt32((int32_t)obj->ClassId);
+          else if ((System::Int32)typeId == GeodeTypeIdsImpl::CacheableUserData4) {
+            WriteInt32((System::Int32)obj->ClassId);
           }
           obj->ToData(this); // let the obj serialize itself.
         }
       }
 
-      void DataOutput::AdvanceCursor(uint32_t offset)
+      void DataOutput::AdvanceCursor(System::UInt32 offset)
       {
         EnsureCapacity(offset);
         m_cursor += offset;
       }
 
-      void DataOutput::RewindCursor(uint32_t offset)
+      void DataOutput::RewindCursor(System::UInt32 offset)
       {
         //first set native one
         WriteBytesToUMDataOutput();
@@ -750,7 +750,7 @@ namespace Apache
         return buffer;
       }
 
-      uint32_t DataOutput::BufferLength::get()
+      System::UInt32 DataOutput::BufferLength::get()
       {
         //first set native one
         WriteBytesToUMDataOutput();
@@ -818,17 +818,17 @@ namespace Apache
         WriteFloat(obj);
       }
 
-      void DataOutput::WriteObject(int16_t% obj)
+      void DataOutput::WriteObject(System::Int16% obj)
       {
         WriteInt16(obj);
       }
 
-      void DataOutput::WriteObject(int32_t% obj)
+      void DataOutput::WriteObject(System::Int32% obj)
       {
         WriteInt32(obj);
       }
 
-      void DataOutput::WriteObject(int64_t% obj)
+      void DataOutput::WriteObject(System::Int64% obj)
       {
         WriteInt64(obj);
       }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/DataOutput.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/DataOutput.hpp b/src/clicache/src/DataOutput.hpp
index c98ec39..f57179f 100644
--- a/src/clicache/src/DataOutput.hpp
+++ b/src/clicache/src/DataOutput.hpp
@@ -51,10 +51,10 @@ namespace Apache
 				: public Client::Internal::UMWrap<apache::geode::client::DataOutput>
       {
       private:
-        int32_t m_cursor;
+        System::Int32 m_cursor;
         bool m_isManagedObject;
-        uint8_t * m_bytes;
-        int32_t m_remainingBufferLength;
+        System::Byte * m_bytes;
+        System::Int32 m_remainingBufferLength;
         bool m_ispdxSerialization;
       public:
 
@@ -66,8 +66,8 @@ namespace Apache
         { 
           m_isManagedObject = true;
           m_cursor = 0;
-          m_bytes = const_cast<uint8_t *>(NativePtr->getCursor());
-          m_remainingBufferLength = (int32_t)NativePtr->getRemainingBufferLength();
+          m_bytes = const_cast<System::Byte *>(NativePtr->getCursor());
+          m_remainingBufferLength = (System::Int32)NativePtr->getRemainingBufferLength();
           m_ispdxSerialization = false;
         }
 
@@ -75,7 +75,7 @@ namespace Apache
         /// Write length of the array to the <c>DataOutput</c>.
         /// </summary>
         /// <param name="len">Array len to write.</param>
-        void WriteArrayLen( int32_t len );
+        void WriteArrayLen( System::Int32 len );
         
         /// <summary>
         /// Write a signed byte to the <c>DataOutput</c>.
@@ -102,7 +102,7 @@ namespace Apache
         /// <param name="len">
         /// The number of bytes from the start of array to write.
         /// </param>
-        void WriteBytes( array<Byte>^ bytes, int32_t len );
+        void WriteBytes( array<Byte>^ bytes, System::Int32 len );
 
         /// <summary>
         /// Write an array of bytes to the <c>DataOutput</c>.
@@ -120,7 +120,7 @@ namespace Apache
         /// <param name="len">
         /// The number of bytes from the start of array to write.
         /// </param>
-        void WriteSBytes( array<SByte>^ bytes, int32_t len );
+        void WriteSBytes( array<SByte>^ bytes, System::Int32 len );
 
         /// <summary>
         /// Write an array of signed bytes to the <c>DataOutput</c>.
@@ -139,9 +139,9 @@ namespace Apache
         /// <param name="len">
         /// The number of bytes from the start of array to write.
         /// </param>
-        void WriteBytesOnly( array<Byte>^ bytes, uint32_t len );
+        void WriteBytesOnly( array<Byte>^ bytes, System::UInt32 len );
 
-        void WriteBytesOnly( array<Byte>^ bytes, uint32_t len, uint32_t offset );
+        void WriteBytesOnly( array<Byte>^ bytes, System::UInt32 len, System::UInt32 offset );
 
         /// <summary>
         /// Write an array of bytes without its length to the
@@ -161,7 +161,7 @@ namespace Apache
         /// <param name="len">
         /// The number of bytes from the start of array to write.
         /// </param>
-        void WriteSBytesOnly( array<SByte>^ bytes, uint32_t len );
+        void WriteSBytesOnly( array<SByte>^ bytes, System::UInt32 len );
 
         /// <summary>
         /// Write an array of signed bytes without its length
@@ -177,19 +177,19 @@ namespace Apache
         /// Write a 16-bit integer to the <c>DataOutput</c>.
         /// </summary>
         /// <param name="value">The 16-bit integer to write.</param>
-        void WriteInt16( int16_t value );
+        void WriteInt16( System::Int16 value );
 
         /// <summary>
         /// Write a 32-bit integer to the <c>DataOutput</c>.
         /// </summary>
         /// <param name="value">The 32-bit integer to write.</param>
-        void WriteInt32( int32_t value );
+        void WriteInt32( System::Int32 value );
 
         /// <summary>
         /// Write a 64-bit integer to the <c>DataOutput</c>.
         /// </summary>
         /// <param name="value">The 64-bit integer to write.</param>
-        void WriteInt64( int64_t value );
+        void WriteInt64( System::Int64 value );
 
         /// <summary>
         /// Write a float to the DataOutput.
@@ -251,7 +251,7 @@ namespace Apache
         /// <param name="offset">
         /// The offset by which to advance the cursor.
         /// </param>
-        void AdvanceCursor( uint32_t offset );
+        void AdvanceCursor( System::UInt32 offset );
 
         /// <summary>
         /// Rewind the buffer cursor by the given offset.
@@ -259,7 +259,7 @@ namespace Apache
         /// <param name="offset">
         /// The offset by which to rewind the cursor.
         /// </param>
-        void RewindCursor( uint32_t offset );
+        void RewindCursor( System::UInt32 offset );
 
         /// <summary>
         /// Get a copy of the current buffer.
@@ -269,9 +269,9 @@ namespace Apache
         /// <summary>
         /// Get the length of current data in the buffer.
         /// </summary>
-        property uint32_t BufferLength
+        property System::UInt32 BufferLength
         {
-          uint32_t get( );
+          System::UInt32 get( );
         }
 
         /// <summary>
@@ -373,32 +373,32 @@ namespace Apache
         void WriteByte( Byte value );
 
         /// <summary>
-        /// Write an unsigned short integer (int16_t) to the <c>DataOutput</c>.
+        /// Write an unsigned short integer (System::Int16) to the <c>DataOutput</c>.
         /// </summary>
         /// <param name="value">The unsigned 16-bit integer to write.</param>
-        void WriteUInt16( uint16_t value );
+        void WriteUInt16( System::UInt16 value );
 
         /// <summary>
         /// Write an unsigned 32-bit integer to the <c>DataOutput</c>.
         /// </summary>
         /// <param name="value">The unsigned 32-bit integer to write.</param>
-        void WriteUInt32( uint32_t value );
+        void WriteUInt32( System::UInt32 value );
 
         /// <summary>
         /// Write an unsigned 64-bit integer to the <c>DataOutput</c>.
         /// </summary>
         /// <param name="value">The unsigned 64-bit integer to write.</param>
-        void WriteUInt64( uint64_t value );
+        void WriteUInt64( System::UInt64 value );
 
 
-			  int32_t GetBufferLengthPdx()
+			  System::Int32 GetBufferLengthPdx()
         {
-          return (int32_t)NativePtr->getBufferLength();
+          return (System::Int32)NativePtr->getBufferLength();
         }
 
         void WriteString(String^ value);
 
-        int32_t GetCursorPdx()
+        System::Int32 GetCursorPdx()
         {
           return m_cursor;
         }
@@ -426,7 +426,7 @@ namespace Apache
             else if ( c < 0x80 )//ASCII character
             {
               // 7-bits done in one byte.
-              m_bytes[m_cursor++] = (uint8_t)c;
+              m_bytes[m_cursor++] = (System::Byte)c;
             }
             else if ( c < 0x800 )
             {
@@ -481,9 +481,9 @@ namespace Apache
 
         void WriteStringWithType( String^ value );
 
-        static int8_t GetTypeId(uint32_t classId );
+        static int8_t GetTypeId(System::UInt32 classId );
         
-        static int8_t DSFID(uint32_t classId);        
+        static int8_t DSFID(System::UInt32 classId);        
   
         void WriteObjectInternal( IGeodeSerializable^ obj );     
 
@@ -499,11 +499,11 @@ namespace Apache
         
         void WriteObject(Single% obj);
         
-        void WriteObject(int16_t% obj);
+        void WriteObject(System::Int16% obj);
         
-        void WriteObject(int32_t% obj);
+        void WriteObject(System::Int32% obj);
         
-        void WriteObject(int64_t% obj);
+        void WriteObject(System::Int64% obj);
         
 				void WriteObject(UInt16% obj);
         
@@ -543,24 +543,24 @@ namespace Apache
         void SetBuffer()
         {
           m_cursor = 0;
-          m_bytes = const_cast<uint8_t *>(NativePtr->getCursor());
-          m_remainingBufferLength = (int32_t)NativePtr->getRemainingBufferLength();
+          m_bytes = const_cast<System::Byte *>(NativePtr->getCursor());
+          m_remainingBufferLength = (System::Int32)NativePtr->getRemainingBufferLength();
         }
 
-				uint8_t* GetStartBufferPosition()
+				System::Byte* GetStartBufferPosition()
         {
-          return const_cast<uint8_t *>( NativePtr->getBuffer());;
+          return const_cast<System::Byte *>( NativePtr->getBuffer());;
         }
 
-        inline void EnsureCapacity( int32_t size )
+        inline void EnsureCapacity( System::Int32 size )
         {
-          int32_t bytesLeft = m_remainingBufferLength - m_cursor;
+          System::Int32 bytesLeft = m_remainingBufferLength - m_cursor;
           if ( bytesLeft < size ) {
             try
             {
               NativePtr->ensureCapacity(m_cursor + size);
-              m_bytes = const_cast<uint8_t *>( NativePtr->getCursor());
-              m_remainingBufferLength = (int32_t)NativePtr->getRemainingBufferLength();
+              m_bytes = const_cast<System::Byte *>( NativePtr->getCursor());
+              m_remainingBufferLength = (System::Int32)NativePtr->getRemainingBufferLength();
             }
             catch(apache::geode::client::OutOfMemoryException ex )
             {
@@ -577,14 +577,14 @@ namespace Apache
 						this->WriteObject(obj);
         }
 
-        uint8_t* GetBytes(uint8_t* src, uint32_t size)
+        System::Byte* GetBytes(System::Byte* src, System::UInt32 size)
         {
           return NativePtr->getBufferCopyFrom(src, size);
         }
  
-        int32_t GetRemainingBufferLength()
+        System::Int32 GetRemainingBufferLength()
         {
-          return (int32_t) NativePtr->getRemainingBufferLength();
+          return (System::Int32) NativePtr->getRemainingBufferLength();
         }
 
         /// <summary>
@@ -596,8 +596,8 @@ namespace Apache
         {
           m_isManagedObject = managedObject;
           m_cursor = 0;
-          m_bytes = const_cast<uint8_t *>(nativeptr->getCursor());
-          m_remainingBufferLength = (int32_t)nativeptr->getRemainingBufferLength();
+          m_bytes = const_cast<System::Byte *>(nativeptr->getCursor());
+          m_remainingBufferLength = (System::Int32)nativeptr->getRemainingBufferLength();
           m_ispdxSerialization = false;
         }
       };

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/ExceptionTypes.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ExceptionTypes.cpp b/src/clicache/src/ExceptionTypes.cpp
index ebe7ad9..70a8c65 100644
--- a/src/clicache/src/ExceptionTypes.cpp
+++ b/src/clicache/src/ExceptionTypes.cpp
@@ -102,7 +102,7 @@ namespace Apache
         };
 
         Native2ManagedExMap = gcnew Dictionary<String^, CreateException2^>( );
-        for (int32_t index = 0; index < exNamesDelegates->Length; index++)
+        for (System::Int32 index = 0; index < exNamesDelegates->Length; index++)
         {
           Native2ManagedExMap[ exNamesDelegates[ index ].m_name ] =
             exNamesDelegates[ index ].m_delegate;
@@ -127,7 +127,7 @@ namespace Apache
           // Get the exception type
           String^ mgExStr = exMsg->Substring(
             GeodeException::MgSysExPrefix->Length );
-          int32_t colonIndex = mgExStr->IndexOf( ':' );
+          System::Int32 colonIndex = mgExStr->IndexOf( ':' );
           if ( colonIndex > 0 ) {
             String^ mgExName = mgExStr->Substring( 0, colonIndex )->Trim( );
             // Try to load this class by reflection

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/GeodeClassIds.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/GeodeClassIds.hpp b/src/clicache/src/GeodeClassIds.hpp
index 1158afb..0ab567a 100644
--- a/src/clicache/src/GeodeClassIds.hpp
+++ b/src/clicache/src/GeodeClassIds.hpp
@@ -69,25 +69,25 @@ namespace Apache
         /// <summary>
         /// ClassId of <c>Properties</c> class
         /// </summary>
-        literal uint32_t Properties =
+        literal System::UInt32 Properties =
           apache::geode::client::GeodeTypeIds::Properties + 0x80000000;
 
         /// <summary>        
         /// ClassId of <c>CharArray</c> class
         /// </summary>
-        literal uint32_t CharArray =
+        literal System::UInt32 CharArray =
           apache::geode::client::GeodeTypeIds::CharArray + 0x80000000;
 
         /// <summary>
         /// ClassId of <c>BooleanArray</c> class
         /// </summary>
-        literal uint32_t BooleanArray =
+        literal System::UInt32 BooleanArray =
           apache::geode::client::GeodeTypeIds::BooleanArray + 0x80000000;
 
         /// <summary>
         /// ClassId of <c>RegionAttributes</c> class
         /// </summary>
-        literal uint32_t RegionAttributes =
+        literal System::UInt32 RegionAttributes =
           apache::geode::client::GeodeTypeIds::RegionAttributes + 0x80000000;
 
         /// <summary>
@@ -95,214 +95,214 @@ namespace Apache
         /// Implementation note: this has DSFID of FixedIDByte hence a
         /// different increment.
         /// </summary>
-        literal uint32_t CacheableUndefined =
+        literal System::UInt32 CacheableUndefined =
           apache::geode::client::GeodeTypeIds::CacheableUndefined + 0xa0000000;
 
-        literal uint32_t EnumInfo =
+        literal System::UInt32 EnumInfo =
           apache::geode::client::GeodeTypeIds::EnumInfo + 0xa0000000;
 
         /// <summary>
         /// ClassId of <c>Struct</c> class
         /// </summary>
-        literal uint32_t Struct =
+        literal System::UInt32 Struct =
           apache::geode::client::GeodeTypeIds::Struct + 0x80000000;
 
         /// <summary>
         /// ClassId of <c>CacheableString</c> class
         /// </summary>
-        literal uint32_t CacheableString =
+        literal System::UInt32 CacheableString =
           apache::geode::client::GeodeTypeIds::CacheableString + 0x80000000;
 
         /// <summary>
         /// ClassId of <c>CacheableString</c> class for huge strings
         /// </summary>
-        literal uint32_t CacheableStringHuge =
+        literal System::UInt32 CacheableStringHuge =
           apache::geode::client::GeodeTypeIds::CacheableStringHuge + 0x80000000;
 
         /// <summary>
         /// ClassId of <c>CacheableBytes</c> class
         /// </summary>
-        literal uint32_t CacheableBytes =
+        literal System::UInt32 CacheableBytes =
           apache::geode::client::GeodeTypeIds::CacheableBytes + 0x80000000;
 
         /// <summary>
         /// ClassId of <c>CacheableInt16Array</c> class
         /// </summary>
-        literal uint32_t CacheableInt16Array =
+        literal System::UInt32 CacheableInt16Array =
           apache::geode::client::GeodeTypeIds::CacheableInt16Array + 0x80000000;
 
         /// <summary>
         /// ClassId of <c>CacheableInt32Array</c> class
         /// </summary>
-        literal uint32_t CacheableInt32Array =
+        literal System::UInt32 CacheableInt32Array =
           apache::geode::client::GeodeTypeIds::CacheableInt32Array + 0x80000000;
 
         /// <summary>
         /// ClassId of <c>CacheableInt64Array</c> class
         /// </summary>
-        literal uint32_t CacheableInt64Array =
+        literal System::UInt32 CacheableInt64Array =
           apache::geode::client::GeodeTypeIds::CacheableInt64Array + 0x80000000;
 
         /// <summary>
         /// ClassId of <c>CacheableFloatArray</c> class
         /// </summary>
-        literal uint32_t CacheableFloatArray =
+        literal System::UInt32 CacheableFloatArray =
           apache::geode::client::GeodeTypeIds::CacheableFloatArray + 0x80000000;
 
         /// <summary>
         /// ClassId of <c>CacheableDoubleArray</c> class
         /// </summary>
-        literal uint32_t CacheableDoubleArray =
+        literal System::UInt32 CacheableDoubleArray =
           apache::geode::client::GeodeTypeIds::CacheableDoubleArray + 0x80000000;
 
         /// <summary>
         /// ClassId of <c>CacheableVector</c> class for object arrays
         /// </summary>
-        literal uint32_t CacheableObjectArray =
+        literal System::UInt32 CacheableObjectArray =
           apache::geode::client::GeodeTypeIds::CacheableObjectArray + 0x80000000;
 
         /// <summary>
         /// ClassId of <c>CacheableBoolean</c> class
         /// </summary>
-        literal uint32_t CacheableBoolean =
+        literal System::UInt32 CacheableBoolean =
           apache::geode::client::GeodeTypeIds::CacheableBoolean + 0x80000000;
 
         /// <summary>
         /// ClassId of <c>CacheableInt16</c> class for wide-characters
         /// </summary>
-        literal uint32_t CacheableCharacter =
+        literal System::UInt32 CacheableCharacter =
           apache::geode::client::GeodeTypeIds::CacheableWideChar + 0x80000000;
 
         /// <summary>
         /// ClassId of <c>CacheableByte</c> class
         /// </summary>
-        literal uint32_t CacheableByte =
+        literal System::UInt32 CacheableByte =
           apache::geode::client::GeodeTypeIds::CacheableByte + 0x80000000;
 
         /// <summary>
         /// ClassId of <c>CacheableInt16</c> class
         /// </summary>
-        literal uint32_t CacheableInt16 =
+        literal System::UInt32 CacheableInt16 =
           apache::geode::client::GeodeTypeIds::CacheableInt16 + 0x80000000;
 
         /// <summary>
         /// ClassId of <c>CacheableInt32</c> class
         /// </summary>
-        literal uint32_t CacheableInt32 =
+        literal System::UInt32 CacheableInt32 =
           apache::geode::client::GeodeTypeIds::CacheableInt32 + 0x80000000;
 
         /// <summary>
         /// ClassId of <c>CacheableInt64</c> class
         /// </summary>
-        literal uint32_t CacheableInt64 =
+        literal System::UInt32 CacheableInt64 =
           apache::geode::client::GeodeTypeIds::CacheableInt64 + 0x80000000;
 
         /// <summary>
         /// ClassId of <c>CacheableFloat</c> class
         /// </summary>
-        literal uint32_t CacheableFloat =
+        literal System::UInt32 CacheableFloat =
           apache::geode::client::GeodeTypeIds::CacheableFloat + 0x80000000;
 
         /// <summary>
         /// ClassId of <c>CacheableDouble</c> class
         /// </summary>
-        literal uint32_t CacheableDouble =
+        literal System::UInt32 CacheableDouble =
           apache::geode::client::GeodeTypeIds::CacheableDouble + 0x80000000;
 
         /// <summary>
         /// ClassId of <c>CacheableDate</c> class
         /// </summary>
-        literal uint32_t CacheableDate =
+        literal System::UInt32 CacheableDate =
           apache::geode::client::GeodeTypeIds::CacheableDate + 0x80000000;
 
         /// <summary>
         /// ClassId of <c>CacheableFileName</c> class
         /// </summary>
-        literal uint32_t CacheableFileName =
+        literal System::UInt32 CacheableFileName =
           apache::geode::client::GeodeTypeIds::CacheableFileName + 0x80000000;
 
         /// <summary>
         /// ClassId of <c>CacheableStringArray</c> class
         /// </summary>
-        literal uint32_t CacheableStringArray =
+        literal System::UInt32 CacheableStringArray =
           apache::geode::client::GeodeTypeIds::CacheableStringArray + 0x80000000;
 
         /// <summary>
         /// ClassId of <c>CacheableVector</c> class
         /// </summary>
-        literal uint32_t CacheableVector =
+        literal System::UInt32 CacheableVector =
           apache::geode::client::GeodeTypeIds::CacheableVector + 0x80000000;
 
         /// <summary>
         /// ClassId of <c>CacheableStack</c> class
         /// </summary>
-        literal uint32_t CacheableStack =
+        literal System::UInt32 CacheableStack =
           apache::geode::client::GeodeTypeIds::CacheableStack + 0x80000000;
 
         /// <summary>
         /// ClassId of <c>CacheableArrayList</c> class
         /// </summary>
-        literal uint32_t CacheableArrayList =
+        literal System::UInt32 CacheableArrayList =
           apache::geode::client::GeodeTypeIds::CacheableArrayList + 0x80000000;
 
         /// <summary>
         /// ClassId of <c>CacheableArrayList</c> class
         /// </summary>
-        literal uint32_t CacheableLinkedList =
+        literal System::UInt32 CacheableLinkedList =
           apache::geode::client::GeodeTypeIds::CacheableLinkedList + 0x80000000;
 
         /// <summary>
         /// ClassId of <c>CacheableHashSet</c> class
         /// </summary>
-        literal uint32_t CacheableHashSet =
+        literal System::UInt32 CacheableHashSet =
           apache::geode::client::GeodeTypeIds::CacheableHashSet + 0x80000000;
 
         /// <summary>
         /// ClassId of <c>CacheableLinkedHashSet</c> class
         /// </summary>
-        literal uint32_t CacheableLinkedHashSet =
+        literal System::UInt32 CacheableLinkedHashSet =
           apache::geode::client::GeodeTypeIds::CacheableLinkedHashSet + 0x80000000;
 
         /// <summary>
         /// ClassId of <c>CacheableHashMap</c> class
         /// </summary>
-        literal uint32_t CacheableHashMap =
+        literal System::UInt32 CacheableHashMap =
           apache::geode::client::GeodeTypeIds::CacheableHashMap + 0x80000000;
 
         /// <summary>
         /// ClassId of <c>CacheableHashTable</c> class
         /// </summary>
-        literal uint32_t CacheableHashTable =
+        literal System::UInt32 CacheableHashTable =
           apache::geode::client::GeodeTypeIds::CacheableHashTable + 0x80000000;
 
         /// <summary>
         /// ClassId of <c>CacheableIdentityHashMap</c> class
         /// </summary>
-        literal uint32_t CacheableIdentityHashMap =
+        literal System::UInt32 CacheableIdentityHashMap =
           apache::geode::client::GeodeTypeIds::CacheableIdentityHashMap + 0x80000000;
 
         /// <summary>
         /// Not used.
         /// </summary>
-        literal uint32_t CacheableTimeUnit =
+        literal System::UInt32 CacheableTimeUnit =
           apache::geode::client::GeodeTypeIds::CacheableTimeUnit + 0x80000000;
 
         /// <summary>
         /// ClassId of <c>CacheableString</c> class for null strings
         /// </summary>
-        literal uint32_t CacheableNullString =
+        literal System::UInt32 CacheableNullString =
           apache::geode::client::GeodeTypeIds::CacheableNullString + 0x80000000;
 
         /// <summary>
         /// ClassId of <c>CacheableString</c> class for ASCII strings
         /// </summary>
-        literal uint32_t CacheableASCIIString =
+        literal System::UInt32 CacheableASCIIString =
           apache::geode::client::GeodeTypeIds::CacheableASCIIString + 0x80000000;
 
         /// <summary>
         /// ClassId of <c>CacheableString</c> class for huge ASCII strings
         /// </summary>
-        literal uint32_t CacheableASCIIStringHuge =
+        literal System::UInt32 CacheableASCIIStringHuge =
           apache::geode::client::GeodeTypeIds::CacheableASCIIStringHuge + 0x80000000;
 
 
@@ -311,18 +311,18 @@ namespace Apache
         /// <summary>
         /// ClassId of <c>CacheableObject</c> class
         /// </summary>
-        literal uint32_t CacheableManagedObject = 7 + 0x80000000;
+        literal System::UInt32 CacheableManagedObject = 7 + 0x80000000;
 
         /// <summary>
         /// ClassId of <c>CacheableObjectXml</c> class
         /// </summary>
-        literal uint32_t CacheableManagedObjectXml = 8 + 0x80000000;
+        literal System::UInt32 CacheableManagedObjectXml = 8 + 0x80000000;
       internal:
 
-        literal uint32_t PdxType = apache::geode::client::GeodeTypeIds::PdxType + 0x80000000;
+        literal System::UInt32 PdxType = apache::geode::client::GeodeTypeIds::PdxType + 0x80000000;
 
-        literal uint32_t DATA_SERIALIZABLE = 45;
-        literal uint32_t JAVA_CLASS = 43;
+        literal System::UInt32 DATA_SERIALIZABLE = 45;
+        literal System::UInt32 JAVA_CLASS = 43;
 
         //internal geode typeids..
         /*  literal Byte USERCLASS = 40;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/ICacheableKey.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ICacheableKey.hpp b/src/clicache/src/ICacheableKey.hpp
index ce02104..1578207 100644
--- a/src/clicache/src/ICacheableKey.hpp
+++ b/src/clicache/src/ICacheableKey.hpp
@@ -55,7 +55,7 @@ namespace Apache
         /// <returns>
         /// The hashcode for this object.
         /// </returns>
-        int32_t GetHashCode( );
+        System::Int32 GetHashCode( );
 
         /// <summary>
         /// Returns true if this <c>ICacheableKey</c> matches the other.

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/IGeodeSerializable.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IGeodeSerializable.hpp b/src/clicache/src/IGeodeSerializable.hpp
index b94c55d..311601b 100644
--- a/src/clicache/src/IGeodeSerializable.hpp
+++ b/src/clicache/src/IGeodeSerializable.hpp
@@ -69,9 +69,9 @@ namespace Apache
         /// Note that you can simply return zero if you are not using the HeapLRU feature.
         /// </remarks>
         /// <returns>the size of this object in bytes.</returns>
-        property uint32_t ObjectSize
+        property System::UInt32 ObjectSize
         {
-          uint32_t get( );
+          System::UInt32 get( );
         }
 
         /// <summary>
@@ -87,9 +87,9 @@ namespace Apache
         /// behaviour.
         /// </remarks>
         /// <returns>the classId</returns>
-        property uint32_t ClassId
+        property System::UInt32 ClassId
         {
-          uint32_t get( );
+          System::UInt32 get( );
         }
 
         /// <summary>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/IRegion.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IRegion.hpp b/src/clicache/src/IRegion.hpp
index 3d40eb6..8c17d2f 100644
--- a/src/clicache/src/IRegion.hpp
+++ b/src/clicache/src/IRegion.hpp
@@ -1867,7 +1867,7 @@ namespace Apache
           /// The SelectResults which can either be a ResultSet or a StructSet.
           /// </returns>
           generic<class TResult>
-          ISelectResults<TResult>^ Query( String^ predicate, uint32_t timeout );
+          ISelectResults<TResult>^ Query( String^ predicate, System::UInt32 timeout );
 
           /// <summary>
           /// Executes the query on the server based on the predicate
@@ -1964,7 +1964,7 @@ namespace Apache
           /// <returns>
           /// true if the result size is non-zero, false otherwise.
           /// </returns>
-          bool ExistsValue( String^ predicate, uint32_t timeout );
+          bool ExistsValue( String^ predicate, System::UInt32 timeout );
 
           /// <summary>
           /// Executes the query on the server based on the predicate
@@ -2065,7 +2065,7 @@ namespace Apache
           /// The single ResultSet or StructSet item,
           /// or NULL of no results are available.
           /// </returns>
-          Object^ SelectValue( String^ predicate, uint32_t timeout );
+          Object^ SelectValue( String^ predicate, System::UInt32 timeout );
 
       };
     }  // namespace Client

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/ISelectResults.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ISelectResults.hpp b/src/clicache/src/ISelectResults.hpp
index 026e660..e53e17c 100644
--- a/src/clicache/src/ISelectResults.hpp
+++ b/src/clicache/src/ISelectResults.hpp
@@ -54,9 +54,9 @@ namespace Apache
         /// <summary>
         /// The size of the <c>ISelectResults</c>.
         /// </summary>
-        property int32_t Size
+        property System::Int32 Size
         {
-          int32_t get( );
+          System::Int32 get( );
         }
 
         /// <summary>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/LocalRegion.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/LocalRegion.cpp b/src/clicache/src/LocalRegion.cpp
index 7005c45..93d07c8 100644
--- a/src/clicache/src/LocalRegion.cpp
+++ b/src/clicache/src/LocalRegion.cpp
@@ -116,7 +116,7 @@ namespace Apache
 
           toArray = gcnew array<KeyValuePair<TKey,TValue>>(vc.size());
 
-        for( int32_t index = 0; index < vc.size( ); index++ )
+        for( System::Int32 index = 0; index < vc.size( ); index++ )
         {
           apache::geode::client::RegionEntryPtr nativeptr =  vc[ index ];  
           TKey key = Serializable::GetManagedValueGeneric<TKey> (nativeptr->getKey());
@@ -141,7 +141,7 @@ namespace Apache
 
           toArray = gcnew array<Object^>(vc.size());
 
-        for( int32_t index = 0; index < vc.size( ); index++ )
+        for( System::Int32 index = 0; index < vc.size( ); index++ )
         {
           apache::geode::client::RegionEntryPtr nativeptr =  vc[ index ];                       
           TKey key = Serializable::GetManagedValueGeneric<TKey> (nativeptr->getKey());
@@ -236,7 +236,7 @@ namespace Apache
         //List<TKey>^ collectionlist = gcnew List<TKey>(vc.size());
         array<TKey>^ keyarr =
           gcnew array<TKey>( vc.size( ) );
-        for( int32_t index = 0; index < vc.size( ); index++ )
+        for( System::Int32 index = 0; index < vc.size( ); index++ )
         {            
           apache::geode::client::CacheableKeyPtr& nativeptr( vc[ index ] );
           keyarr[ index ] = Serializable::GetManagedValueGeneric<TKey>(nativeptr);
@@ -258,7 +258,7 @@ namespace Apache
           //List<TValue>^ collectionlist = gcnew List<TValue>(vc.size());
           array<TValue>^ valarr =
             gcnew array<TValue>( vc.size( ) );
-          for( int32_t index = 0; index < vc.size( ); index++ )
+          for( System::Int32 index = 0; index < vc.size( ); index++ )
           {
             apache::geode::client::CacheablePtr& nativeptr( vc[ index ] );            
             valarr[ index ] = Serializable::GetManagedValueGeneric<TValue>(nativeptr);
@@ -627,7 +627,7 @@ namespace Apache
           array<IRegion<TKey, TValue>^>^ subRegions =
             gcnew array<IRegion<TKey, TValue>^>( vsr.size( ) );
 
-          for( int32_t index = 0; index < vsr.size( ); index++ )
+          for( System::Int32 index = 0; index < vsr.size( ); index++ )
           {
             apache::geode::client::RegionPtr& nativeptr( vsr[ index ] );
             subRegions[ index ] = Region<TKey, TValue>::Create( nativeptr.ptr( ) )->GetLocalView();
@@ -660,7 +660,7 @@ namespace Apache
           NativePtr->entries( vc, recursive );          
           array<RegionEntry<TKey, TValue>^>^ entryarr = gcnew array<RegionEntry<TKey, TValue>^>( vc.size( ) );
 
-          for( int32_t index = 0; index < vc.size( ); index++ )
+          for( System::Int32 index = 0; index < vc.size( ); index++ )
           {
             apache::geode::client::RegionEntryPtr& nativeptr( vc[ index ] );
             entryarr[ index ] = RegionEntry<TKey, TValue>::Create( nativeptr.ptr( ) );
@@ -752,7 +752,7 @@ namespace Apache
           throw gcnew System::ArgumentException;
         }          
 
-        for( int32_t index = 0; index < vc.size( ); index++ )
+        for( System::Int32 index = 0; index < vc.size( ); index++ )
         {
           apache::geode::client::RegionEntryPtr nativeptr =  vc[ index ];                       
           TKey key = Serializable::GetManagedValueGeneric<TKey> (nativeptr->getKey());
@@ -779,7 +779,7 @@ namespace Apache
 
       generic<class TKey, class TValue>
       generic<class TResult>
-      ISelectResults<TResult>^ LocalRegion<TKey, TValue>::Query( String^ predicate, uint32_t timeout )
+      ISelectResults<TResult>^ LocalRegion<TKey, TValue>::Query( String^ predicate, System::UInt32 timeout )
       {
         throw gcnew System::NotSupportedException;
       }
@@ -791,7 +791,7 @@ namespace Apache
       }
 
       generic<class TKey, class TValue>
-      bool LocalRegion<TKey, TValue>::ExistsValue( String^ predicate, uint32_t timeout )
+      bool LocalRegion<TKey, TValue>::ExistsValue( String^ predicate, System::UInt32 timeout )
       {
         throw gcnew System::NotSupportedException;
       }
@@ -803,7 +803,7 @@ namespace Apache
       }
 
       generic<class TKey, class TValue>
-      Object^ LocalRegion<TKey, TValue>::SelectValue( String^ predicate, uint32_t timeout )
+      Object^ LocalRegion<TKey, TValue>::SelectValue( String^ predicate, System::UInt32 timeout )
       {
         throw gcnew System::NotSupportedException;
       }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/LocalRegion.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/LocalRegion.hpp b/src/clicache/src/LocalRegion.hpp
index b10a859..2954a99 100644
--- a/src/clicache/src/LocalRegion.hpp
+++ b/src/clicache/src/LocalRegion.hpp
@@ -201,15 +201,15 @@ namespace Apache
           virtual ISelectResults<TResult>^ Query( String^ predicate );
 
           generic<class TResult>
-          virtual ISelectResults<TResult>^ Query( String^ predicate, uint32_t timeout );
+          virtual ISelectResults<TResult>^ Query( String^ predicate, System::UInt32 timeout );
 
           virtual bool ExistsValue( String^ predicate );
 
-          virtual bool ExistsValue( String^ predicate, uint32_t timeout );
+          virtual bool ExistsValue( String^ predicate, System::UInt32 timeout );
 
           virtual Object^ SelectValue( String^ predicate );
 
-          virtual Object^ SelectValue( String^ predicate, uint32_t timeout );
+          virtual Object^ SelectValue( String^ predicate, System::UInt32 timeout );
 
           virtual ISubscriptionService<TKey>^ GetSubscriptionService();
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/Log.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/Log.cpp b/src/clicache/src/Log.cpp
index 461f362..2a1f6ab 100644
--- a/src/clicache/src/Log.cpp
+++ b/src/clicache/src/Log.cpp
@@ -42,7 +42,7 @@ namespace Apache
         _GF_MG_EXCEPTION_CATCH_ALL2
       }
 
-      void Log::Init(LogLevel level, String^ logFileName, int32_t logFileLimit)
+      void Log::Init(LogLevel level, String^ logFileName, System::Int32 logFileLimit)
       {
         _GF_MG_EXCEPTION_TRY2
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/Log.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/Log.hpp b/src/clicache/src/Log.hpp
index 174a198..9c13d0c 100644
--- a/src/clicache/src/Log.hpp
+++ b/src/clicache/src/Log.hpp
@@ -177,7 +177,7 @@ namespace Apache
         /// <param name="logFileName">the log file name</param>
         /// <param name="logFileLimit">maximum allowable size of the log file, in bytes, 
         ///        or 0 for the default (1 Gbyte)</param>
-        static void Init(LogLevel level, String^ logFileName, int32_t logFileLimit);
+        static void Init(LogLevel level, String^ logFileName, System::Int32 logFileLimit);
 
         /// <summary>
         /// Closes logging facility (until next init).

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/Properties.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/Properties.cpp b/src/clicache/src/Properties.cpp
index 342476f..843ac40 100644
--- a/src/clicache/src/Properties.cpp
+++ b/src/clicache/src/Properties.cpp
@@ -181,7 +181,7 @@ namespace Apache
         _GF_MG_EXCEPTION_CATCH_ALL2
       }
 
-      /*void Properties::Insert( String^ key, const int32_t value)
+      /*void Properties::Insert( String^ key, const System::Int32 value)
       {
         //TODO::
         ManagedString mg_key( key );
@@ -413,7 +413,7 @@ namespace Apache
       }
 
       generic<class TPropKey, class TPropValue>
-      uint32_t Properties<TPropKey, TPropValue>::Size::get( )
+      System::UInt32 Properties<TPropKey, TPropValue>::Size::get( )
       {
         _GF_MG_EXCEPTION_TRY2
 
@@ -515,7 +515,7 @@ namespace Apache
       }
 
       generic<class TPropKey, class TPropValue>
-      uint32_t Properties<TPropKey, TPropValue>::ObjectSize::get( )
+      System::UInt32 Properties<TPropKey, TPropValue>::ObjectSize::get( )
       {
         //TODO::
         _GF_MG_EXCEPTION_TRY2
@@ -543,7 +543,7 @@ namespace Apache
           array<Byte>^ bytes = gcnew array<Byte>( output.getBufferLength( ) );
           {
             pin_ptr<const Byte> pin_bytes = &bytes[0];
-            memcpy( (uint8_t*)pin_bytes, output.getBuffer( ),
+            memcpy( (System::Byte*)pin_bytes, output.getBuffer( ),
               output.getBufferLength( ) );
           }
           info->AddValue( "bytes", bytes, array<Byte>::typeid );
@@ -568,7 +568,7 @@ namespace Apache
 
           _GF_MG_EXCEPTION_TRY2
 
-            apache::geode::client::DataInput input( (uint8_t*)pin_bytes, bytes->Length );
+            apache::geode::client::DataInput input( (System::Byte*)pin_bytes, bytes->Length );
             AssignPtr( static_cast<apache::geode::client::Properties*>(
               NativePtr->fromData( input ) ) );
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/Properties.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/Properties.hpp b/src/clicache/src/Properties.hpp
index 5b6f85b..4d32558 100644
--- a/src/clicache/src/Properties.hpp
+++ b/src/clicache/src/Properties.hpp
@@ -127,9 +127,9 @@ namespace Apache
         /// Return the number of entries in the collection.
         /// </summary>
         /// <returns>the number of entries</returns>
-        property uint32_t Size
+        property System::UInt32 Size
         {
-          uint32_t get( );
+          System::UInt32 get( );
         }
 
         /*/// <summary>
@@ -177,9 +177,9 @@ namespace Apache
         /// <summary>
         /// return the size of this object in bytes
         /// </summary>
-        virtual property uint32_t ObjectSize
+        virtual property System::UInt32 ObjectSize
         {
-          virtual uint32_t get( ); 
+          virtual System::UInt32 get( ); 
         }
 
         /// <summary>
@@ -187,9 +187,9 @@ namespace Apache
         /// </summary>
         /// <returns>classId of the Properties class</returns>
         /// <seealso cref="IGeodeSerializable.ClassId" />
-        virtual property uint32_t ClassId
+        virtual property System::UInt32 ClassId
         {
-          inline virtual uint32_t get( )
+          inline virtual System::UInt32 get( )
           {
             return GeodeClassIds::Properties;
           }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/Query.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/Query.cpp b/src/clicache/src/Query.cpp
index 889b783..4723b3f 100644
--- a/src/clicache/src/Query.cpp
+++ b/src/clicache/src/Query.cpp
@@ -40,7 +40,7 @@ namespace Apache
       }
 
       generic<class TResult>
-      ISelectResults<TResult>^ Query<TResult>::Execute( uint32_t timeout )
+      ISelectResults<TResult>^ Query<TResult>::Execute( System::UInt32 timeout )
       {
         _GF_MG_EXCEPTION_TRY2/* due to auto replace */
 
@@ -74,7 +74,7 @@ namespace Apache
       }
 
       generic<class TResult>
-      ISelectResults<TResult>^ Query<TResult>::Execute( array<Object^>^ paramList, uint32_t timeout )
+      ISelectResults<TResult>^ Query<TResult>::Execute( array<Object^>^ paramList, System::UInt32 timeout )
       {
         _GF_MG_EXCEPTION_TRY2/* due to auto replace */
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/Query.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/Query.hpp b/src/clicache/src/Query.hpp
index fb267a5..2166911 100644
--- a/src/clicache/src/Query.hpp
+++ b/src/clicache/src/Query.hpp
@@ -100,7 +100,7 @@ namespace Apache
         /// An <see cref="ISelectResults"/> object which can either be a
         /// <see cref="ResultSet"/> or a <see cref="StructSet"/>.
         /// </returns>
-        ISelectResults<TResult>^ Execute( uint32_t timeout );
+        ISelectResults<TResult>^ Execute( System::UInt32 timeout );
 
 		/// <summary>
         /// Executes the OQL Parameterized Query on the cache server with the specified
@@ -129,7 +129,7 @@ namespace Apache
         /// An <see cref="ISelectResults"/> object which can either be a
         /// <see cref="ResultSet"/> or a <see cref="StructSet"/>.
         /// </returns>
-        ISelectResults<TResult>^ Execute( array<Object^>^ paramList, uint32_t timeout );
+        ISelectResults<TResult>^ Execute( array<Object^>^ paramList, System::UInt32 timeout );
 
         /// <summary>
         /// Executes the OQL Parameterized Query on the cache server with the specified

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/QueryService.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/QueryService.cpp b/src/clicache/src/QueryService.cpp
index 3215e1f..f60ce3c 100644
--- a/src/clicache/src/QueryService.cpp
+++ b/src/clicache/src/QueryService.cpp
@@ -104,7 +104,7 @@ namespace Apache
           NativePtr->getCqs(vrr);
           array<CqQuery<TKey, TResult>^>^ cqs = gcnew array<CqQuery<TKey, TResult>^>(vrr.size());
 
-          for (int32_t index = 0; index < vrr.size(); index++)
+          for (System::Int32 index = 0; index < vrr.size(); index++)
           {
             cqs[index] = CqQuery<TKey, TResult>::Create(vrr[index].ptr());
           }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/ReflectionBasedAutoSerializer.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ReflectionBasedAutoSerializer.cpp b/src/clicache/src/ReflectionBasedAutoSerializer.cpp
index af5dcdf..436ce4b 100755
--- a/src/clicache/src/ReflectionBasedAutoSerializer.cpp
+++ b/src/clicache/src/ReflectionBasedAutoSerializer.cpp
@@ -193,7 +193,7 @@ namespace Apache
                   w->WriteIntArray(m_fieldName, (array<Int32>^)value);
                 break;
 			          case FieldType::LONG_ARRAY:
-                  w->WriteLongArray(m_fieldName, (array<int64_t>^)value);
+                  w->WriteLongArray(m_fieldName, (array<System::Int64>^)value);
                 break;
 			          case FieldType::FLOAT_ARRAY:
                   w->WriteFloatArray(m_fieldName, (array<float>^)value);

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/Region.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/Region.cpp b/src/clicache/src/Region.cpp
index f1aa688..917f182 100644
--- a/src/clicache/src/Region.cpp
+++ b/src/clicache/src/Region.cpp
@@ -146,7 +146,7 @@ namespace Apache
 
           toArray = gcnew array<KeyValuePair<TKey, TValue>>(vc.size());
 
-        for (int32_t index = 0; index < vc.size(); index++)
+        for (System::Int32 index = 0; index < vc.size(); index++)
         {
           apache::geode::client::RegionEntryPtr nativeptr = vc[index];
           TKey key = Serializable::GetManagedValueGeneric<TKey>(nativeptr->getKey());
@@ -171,7 +171,7 @@ namespace Apache
 
           toArray = gcnew array<Object^>(vc.size());
 
-        for (int32_t index = 0; index < vc.size(); index++)
+        for (System::Int32 index = 0; index < vc.size(); index++)
         {
           apache::geode::client::RegionEntryPtr nativeptr = vc[index];
           TKey key = Serializable::GetManagedValueGeneric<TKey>(nativeptr->getKey());
@@ -268,7 +268,7 @@ namespace Apache
         //List<TKey>^ collectionlist = gcnew List<TKey>(vc.size());
         array<TKey>^ keyarr =
           gcnew array<TKey>(vc.size());
-        for (int32_t index = 0; index < vc.size(); index++)
+        for (System::Int32 index = 0; index < vc.size(); index++)
         {
           apache::geode::client::CacheableKeyPtr& nativeptr(vc[index]);
           keyarr[index] = Serializable::GetManagedValueGeneric<TKey>(nativeptr);
@@ -291,7 +291,7 @@ namespace Apache
         //List<TValue>^ collectionlist = gcnew List<TValue>(vc.size());
         array<TValue>^ valarr =
           gcnew array<TValue>(vc.size());
-        for (int32_t index = 0; index < vc.size(); index++)
+        for (System::Int32 index = 0; index < vc.size(); index++)
         {
           apache::geode::client::CacheablePtr& nativeptr(vc[index]);
           valarr[index] = Serializable::GetManagedValueGeneric<TValue>(nativeptr);
@@ -760,7 +760,7 @@ namespace Apache
         array<IRegion<TKey, TValue>^>^ subRegions =
           gcnew array<IRegion<TKey, TValue>^>(vsr.size());
 
-        for (int32_t index = 0; index < vsr.size(); index++)
+        for (System::Int32 index = 0; index < vsr.size(); index++)
         {
           apache::geode::client::RegionPtr& nativeptr(vsr[index]);
           subRegions[index] = Region<TKey, TValue>::Create(nativeptr.ptr());
@@ -793,7 +793,7 @@ namespace Apache
         NativePtr->entries(vc, recursive);
         array<RegionEntry<TKey, TValue>^>^ entryarr = gcnew array<RegionEntry<TKey, TValue>^>(vc.size());
 
-        for (int32_t index = 0; index < vc.size(); index++)
+        for (System::Int32 index = 0; index < vc.size(); index++)
         {
           apache::geode::client::RegionEntryPtr& nativeptr(vc[index]);
           entryarr[index] = RegionEntry<TKey, TValue>::Create(nativeptr.ptr());
@@ -886,7 +886,7 @@ namespace Apache
           throw gcnew System::ArgumentException;
         }
 
-        for (int32_t index = 0; index < vc.size(); index++)
+        for (System::Int32 index = 0; index < vc.size(); index++)
         {
           apache::geode::client::RegionEntryPtr nativeptr = vc[index];
           TKey key = Serializable::GetManagedValueGeneric<TKey>(nativeptr->getKey());
@@ -994,7 +994,7 @@ namespace Apache
 
             NativePtr->registerAllKeys(isDurable, mg_keys, getInitialValues, receiveValues);
 
-            for (int32_t index = 0; index < mg_keys->size(); ++index) {
+            for (System::Int32 index = 0; index < mg_keys->size(); ++index) {
               resultKeys->Add(Serializable::GetManagedValueGeneric<TKey>(
                 mg_keys->operator[](index)));
             }
@@ -1016,7 +1016,7 @@ namespace Apache
         //List<TValue>^ collectionlist = gcnew List<TValue>(vc.size());
         array<TKey>^ keyarr =
           gcnew array<TKey>(vc.size());
-        for (int32_t index = 0; index < vc.size(); index++)
+        for (System::Int32 index = 0; index < vc.size(); index++)
         {
           apache::geode::client::CacheableKeyPtr& nativeptr(vc[index]);
           keyarr[index] = Serializable::GetManagedValueGeneric<TKey>(nativeptr);
@@ -1040,7 +1040,7 @@ namespace Apache
         array<String^>^ strarr =
           gcnew array<String^>(vc.size());
         //List<String>^ collectionlist = gcnew List<String>(vc.size());
-        for (int32_t index = 0; index < vc.size(); index++)
+        for (System::Int32 index = 0; index < vc.size(); index++)
         {
           strarr[index] = ManagedString::Get(vc[index]->asChar());
           //collectionlist[ index ] = Serializable::GetManagedValue<TValue>(nativeptr);
@@ -1102,7 +1102,7 @@ namespace Apache
           NativePtr->registerRegex(mg_regex.CharPtr, isDurable,
                                     mg_keys, getInitialValues, receiveValues);
 
-          for (int32_t index = 0; index < mg_keys->size(); ++index) {
+          for (System::Int32 index = 0; index < mg_keys->size(); ++index) {
             resultKeys->Add(Serializable::GetManagedValueGeneric<TKey>(
               mg_keys->operator[](index)));
           }
@@ -1162,7 +1162,7 @@ namespace Apache
 
       generic<class TKey, class TValue>
       generic<class TResult>
-      ISelectResults<TResult>^ Region<TKey, TValue>::Query(String^ predicate, uint32_t timeout)
+      ISelectResults<TResult>^ Region<TKey, TValue>::Query(String^ predicate, System::UInt32 timeout)
       {
         ManagedString mg_predicate(predicate);
 
@@ -1198,7 +1198,7 @@ namespace Apache
       }
 
       generic<class TKey, class TValue>
-      bool Region<TKey, TValue>::ExistsValue(String^ predicate, uint32_t timeout)
+      bool Region<TKey, TValue>::ExistsValue(String^ predicate, System::UInt32 timeout)
       {
         ManagedString mg_predicate(predicate);
 
@@ -1217,7 +1217,7 @@ namespace Apache
       }
 
       generic<class TKey, class TValue>
-      Object^ Region<TKey, TValue>::SelectValue(String^ predicate, uint32_t timeout)
+      Object^ Region<TKey, TValue>::SelectValue(String^ predicate, System::UInt32 timeout)
       {
         ManagedString mg_predicate(predicate);
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/Region.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/Region.hpp b/src/clicache/src/Region.hpp
index c7c2510..b7b18fe 100644
--- a/src/clicache/src/Region.hpp
+++ b/src/clicache/src/Region.hpp
@@ -249,15 +249,15 @@ namespace Apache
           virtual ISelectResults<TResult>^ Query( String^ predicate );
 
           generic<class TResult>
-          virtual ISelectResults<TResult>^ Query( String^ predicate, uint32_t timeout );
+          virtual ISelectResults<TResult>^ Query( String^ predicate, System::UInt32 timeout );
 
           virtual bool ExistsValue( String^ predicate );
 
-          virtual bool ExistsValue( String^ predicate, uint32_t timeout );
+          virtual bool ExistsValue( String^ predicate, System::UInt32 timeout );
 
           virtual Object^ SelectValue( String^ predicate );
 
-          virtual Object^ SelectValue( String^ predicate, uint32_t timeout );
+          virtual Object^ SelectValue( String^ predicate, System::UInt32 timeout );
 
 
       internal:

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/RegionAttributes.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/RegionAttributes.cpp b/src/clicache/src/RegionAttributes.cpp
index 3c8fec9..558dc7c 100644
--- a/src/clicache/src/RegionAttributes.cpp
+++ b/src/clicache/src/RegionAttributes.cpp
@@ -142,7 +142,7 @@ namespace Apache
       }
 
       generic <class TKey, class TValue>
-      int32_t Client::RegionAttributes<TKey, TValue>::RegionTimeToLive::get()
+      System::Int32 Client::RegionAttributes<TKey, TValue>::RegionTimeToLive::get()
       {
         return NativePtr->getRegionTimeToLive( );
       }
@@ -154,7 +154,7 @@ namespace Apache
       }
 
       generic <class TKey, class TValue>
-      int32_t Client::RegionAttributes<TKey, TValue>::RegionIdleTimeout::get()
+      System::Int32 Client::RegionAttributes<TKey, TValue>::RegionIdleTimeout::get()
       {
         return NativePtr->getRegionIdleTimeout( );
       }
@@ -166,7 +166,7 @@ namespace Apache
       }
 
       generic <class TKey, class TValue>
-      int32_t Client::RegionAttributes<TKey, TValue>::EntryTimeToLive::get()
+      System::Int32 Client::RegionAttributes<TKey, TValue>::EntryTimeToLive::get()
       {
         return NativePtr->getEntryTimeToLive( );
       }
@@ -178,7 +178,7 @@ namespace Apache
       }
 
       generic <class TKey, class TValue>
-      int32_t Client::RegionAttributes<TKey, TValue>::EntryIdleTimeout::get()
+      System::Int32 Client::RegionAttributes<TKey, TValue>::EntryIdleTimeout::get()
       {
         return NativePtr->getEntryIdleTimeout( );
       }
@@ -202,7 +202,7 @@ namespace Apache
       }
 
       generic <class TKey, class TValue>
-      int32_t Client::RegionAttributes<TKey, TValue>::InitialCapacity::get()
+      System::Int32 Client::RegionAttributes<TKey, TValue>::InitialCapacity::get()
       {
         return NativePtr->getInitialCapacity( );
       }
@@ -214,13 +214,13 @@ namespace Apache
       }
 
       generic <class TKey, class TValue>
-        int32_t Client::RegionAttributes<TKey, TValue>::ConcurrencyLevel::get()
+        System::Int32 Client::RegionAttributes<TKey, TValue>::ConcurrencyLevel::get()
       {
         return NativePtr->getConcurrencyLevel( );
       }
 
       generic <class TKey, class TValue>
-      uint32_t Client::RegionAttributes<TKey, TValue>::LruEntriesLimit::get()
+      System::UInt32 Client::RegionAttributes<TKey, TValue>::LruEntriesLimit::get()
       {
         return NativePtr->getLruEntriesLimit( );
       }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/RegionAttributes.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/RegionAttributes.hpp b/src/clicache/src/RegionAttributes.hpp
index 497e5bd..05e413f 100644
--- a/src/clicache/src/RegionAttributes.hpp
+++ b/src/clicache/src/RegionAttributes.hpp
@@ -120,9 +120,9 @@ namespace Apache
         /// Gets the <c>timeToLive</c> value for the region as a whole.
         /// </summary>
         /// <returns>the timeToLive duration for this region, in seconds</returns>
-        property int32_t RegionTimeToLive
+        property System::Int32 RegionTimeToLive
         {
-          int32_t get();
+          System::Int32 get();
         }
 
         /// <summary>
@@ -138,9 +138,9 @@ namespace Apache
         /// Gets the <c>idleTimeout</c> value for the region as a whole.
         /// </summary>
         /// <returns>the IdleTimeout duration for this region, in seconds</returns>
-        property int32_t RegionIdleTimeout
+        property System::Int32 RegionIdleTimeout
         {
-          int32_t get();
+          System::Int32 get();
         }
 
         /// <summary>
@@ -156,9 +156,9 @@ namespace Apache
         /// Gets the <c>timeToLive</c> value for entries in this region.
         /// </summary>
         /// <returns>the timeToLive duration for entries in this region, in seconds</returns>
-        property int32_t EntryTimeToLive
+        property System::Int32 EntryTimeToLive
         {
-          int32_t get();
+          System::Int32 get();
         }
 
         /// <summary>
@@ -174,9 +174,9 @@ namespace Apache
         /// Gets the <c>idleTimeout</c> value for entries in this region.
         /// </summary>
         /// <returns>the idleTimeout duration for entries in this region, in seconds</returns>
-        property int32_t EntryIdleTimeout
+        property System::Int32 EntryIdleTimeout
         {
-          int32_t get();
+          System::Int32 get();
         }
 
         /// <summary>
@@ -204,9 +204,9 @@ namespace Apache
         /// Returns the initial capacity of the entry's local cache.
         /// </summary>
         /// <returns>the initial capacity</returns>
-        property int32_t InitialCapacity
+        property System::Int32 InitialCapacity
         {
-          int32_t get();
+          System::Int32 get();
         }
 
         /// <summary>
@@ -223,9 +223,9 @@ namespace Apache
         /// </summary>
         /// <returns>the concurrency level</returns>
         /// <seealso cref="AttributesFactory" />
-        property int32_t ConcurrencyLevel
+        property System::Int32 ConcurrencyLevel
         {
-          int32_t get();
+          System::Int32 get();
         }
 
         /// <summary>
@@ -233,9 +233,9 @@ namespace Apache
         /// using LRU eviction. 
         /// </summary>
         /// <returns>the maximum LRU size, or 0 for no limit</returns>
-        property uint32_t LruEntriesLimit
+        property System::UInt32 LruEntriesLimit
         {
-          uint32_t get();
+          System::UInt32 get();
         }
 
         /// <summary>
@@ -449,9 +449,9 @@ namespace Apache
         /// <summary>
         /// return the size of this object in bytes
         /// </summary>
-        virtual property uint32_t ObjectSize
+        virtual property System::UInt32 ObjectSize
         {
-          virtual uint32_t get()
+          virtual System::UInt32 get()
           {
             return 0;  //don't care
           }
@@ -462,9 +462,9 @@ namespace Apache
         /// </summary>
         /// <returns>classId of the Properties class</returns>
         /// <seealso cref="../../IGeodeSerializable.ClassId" />
-        virtual property uint32_t ClassId
+        virtual property System::UInt32 ClassId
         {
-          inline virtual uint32_t get()
+          inline virtual System::UInt32 get()
           {
             return GeodeClassIds::RegionAttributes;
           }


Mime
View raw message