geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [5/8] geode-native git commit: GEODE-2439: Remove C++ fixed width integers from clicache
Date Fri, 24 Feb 2017 03:39:26 GMT
http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/ManagedCacheableDelta.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedCacheableDelta.cpp b/src/clicache/src/impl/ManagedCacheableDelta.cpp
index 93fc016..80f54de 100644
--- a/src/clicache/src/impl/ManagedCacheableDelta.cpp
+++ b/src/clicache/src/impl/ManagedCacheableDelta.cpp
@@ -37,7 +37,7 @@ namespace apache
       void ManagedCacheableDeltaGeneric::toData(DataOutput& output) const
       {
         try {
-          uint32_t pos = (int)output.getBufferLength();
+          System::UInt32 pos = (int)output.getBufferLength();
           Apache::Geode::Client::DataOutput mg_output(&output, true);
           m_managedSerializableptr->ToData(%mg_output);
           //this will move the cursor in c++ layer
@@ -78,7 +78,7 @@ namespace apache
         return this;
       }
 
-      uint32_t ManagedCacheableDeltaGeneric::objectSize() const
+      System::UInt32 ManagedCacheableDeltaGeneric::objectSize() const
       {
         try {
           int ret = m_managedSerializableptr->ObjectSize;
@@ -96,9 +96,9 @@ namespace apache
         return 0;
       }
 
-      int32_t ManagedCacheableDeltaGeneric::classId() const
+      System::Int32 ManagedCacheableDeltaGeneric::classId() const
       {
-        uint32_t classId;
+        System::UInt32 classId;
         try {
           classId = m_managedSerializableptr->ClassId;
         }
@@ -114,7 +114,7 @@ namespace apache
       int8_t ManagedCacheableDeltaGeneric::typeId() const
       {
         try {
-          uint32_t classId = m_classId;
+          System::UInt32 classId = m_classId;
           if (classId >= 0x80000000) {
             return (int8_t)((classId - 0x80000000) % 0x20000000);
           }
@@ -145,7 +145,7 @@ namespace apache
         // and [0xe0000000, 0xffffffff] is for FixedIDInt
         // Note: depends on fact that FixedIDByte is 1, FixedIDShort is 2
         // and FixedIDInt is 3; if this changes then correct this accordingly
-        uint32_t classId = m_managedSerializableptr->ClassId;
+        System::UInt32 classId = m_managedSerializableptr->ClassId;
         if (classId >= 0x80000000) {
           return (int8_t)((classId - 0x80000000) / 0x20000000);
         }
@@ -252,7 +252,7 @@ namespace apache
 
       }
 
-      int32_t ManagedCacheableDeltaGeneric::hashcode() const
+      System::UInt32 ManagedCacheableDeltaGeneric::hashcode() const
       {
         throw gcnew System::NotSupportedException;
       }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/ManagedCacheableDelta.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedCacheableDelta.hpp b/src/clicache/src/impl/ManagedCacheableDelta.hpp
index 9bd06f1..6f247de 100644
--- a/src/clicache/src/impl/ManagedCacheableDelta.hpp
+++ b/src/clicache/src/impl/ManagedCacheableDelta.hpp
@@ -103,14 +103,14 @@ namespace apache
         /// <summary>
         /// return the size of this object in bytes
         /// </summary>
-        virtual uint32_t objectSize() const;
+        virtual System::UInt32 objectSize() const;
 
         /// <summary>
         /// return the classId of the instance being serialized.
         /// This is used by deserialization to determine what instance
         /// type to create and deserialize into.
         /// </summary>
-        virtual int32_t classId() const;
+        virtual System::Int32 classId() const;
 
         /// <summary>
         /// return the typeId of the instance being serialized.
@@ -136,7 +136,7 @@ namespace apache
         /// <summary>
         /// return the hashcode for this key.
         /// </summary>
-        virtual int32_t hashcode() const;
+        virtual System::UInt32 hashcode() const;
 
         /// <summary>
         /// return true if this key matches other CacheableKey

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/ManagedCacheableDeltaBytes.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedCacheableDeltaBytes.cpp b/src/clicache/src/impl/ManagedCacheableDeltaBytes.cpp
index a5f0df2..2e50472 100644
--- a/src/clicache/src/impl/ManagedCacheableDeltaBytes.cpp
+++ b/src/clicache/src/impl/ManagedCacheableDeltaBytes.cpp
@@ -53,7 +53,7 @@ namespace apache
         try {
           Apache::Geode::Client::Log::Debug("ManagedCacheableDeltaBytes::fromData: classid " + m_classId);
           Apache::Geode::Client::DataInput mg_input(&input, true);
-          const uint8_t* objStartPos = input.currentBufferPosition();
+          const System::Byte* objStartPos = input.currentBufferPosition();
 
           Apache::Geode::Client::IGeodeSerializable^ obj =
             Apache::Geode::Client::Serializable::GetTypeFactoryMethodGeneric(m_classId)();
@@ -62,10 +62,10 @@ namespace apache
 
           m_hashCode = obj->GetHashCode();
 
-          const uint8_t* objEndPos = input.currentBufferPosition();
+          const System::Byte* objEndPos = input.currentBufferPosition();
 
           //m_size = mg_input.BytesRead;
-          m_size = (uint32_t)(objEndPos - objStartPos);
+          m_size = (System::UInt32)(objEndPos - objStartPos);
           Apache::Geode::Client::Log::Debug("ManagedCacheableDeltaBytes::fromData: objectSize = " + m_size + " m_hashCode = " + m_hashCode);
           m_bytes = input.getBufferCopyFrom(objStartPos, m_size);
         }
@@ -78,7 +78,7 @@ namespace apache
         return this;
       }
 
-      uint32_t ManagedCacheableDeltaBytesGeneric::objectSize() const
+      System::UInt32 ManagedCacheableDeltaBytesGeneric::objectSize() const
       {
         try {
           return m_size;
@@ -92,9 +92,9 @@ namespace apache
         return 0;
       }
 
-      int32_t ManagedCacheableDeltaBytesGeneric::classId() const
+      System::Int32 ManagedCacheableDeltaBytesGeneric::classId() const
       {
-        uint32_t classId;
+        System::UInt32 classId;
         try {
           classId = m_classId;
         }
@@ -110,7 +110,7 @@ namespace apache
       int8_t ManagedCacheableDeltaBytesGeneric::typeId() const
       {
         try {
-          uint32_t classId = m_classId;
+          System::UInt32 classId = m_classId;
           if (classId >= 0x80000000) {
             return (int8_t)((classId - 0x80000000) % 0x20000000);
           }
@@ -141,7 +141,7 @@ namespace apache
         // and [0xe0000000, 0xffffffff] is for FixedIDInt
         // Note: depends on fact that FixedIDByte is 1, FixedIDShort is 2
         // and FixedIDInt is 3; if this changes then correct this accordingly
-        uint32_t classId = m_classId;
+        System::UInt32 classId = m_classId;
         if (classId >= 0x80000000) {
           return (int8_t)((classId - 0x80000000) / 0x20000000);
         }
@@ -303,7 +303,7 @@ namespace apache
         return false;
       }
 
-      int32_t ManagedCacheableDeltaBytesGeneric::hashcode() const
+      System::UInt32 ManagedCacheableDeltaBytesGeneric::hashcode() const
       {
         throw gcnew System::NotSupportedException;
       }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/ManagedCacheableDeltaBytes.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedCacheableDeltaBytes.hpp b/src/clicache/src/impl/ManagedCacheableDeltaBytes.hpp
index a23eef9..f934fbb 100644
--- a/src/clicache/src/impl/ManagedCacheableDeltaBytes.hpp
+++ b/src/clicache/src/impl/ManagedCacheableDeltaBytes.hpp
@@ -142,14 +142,14 @@ namespace apache
         /// <summary>
         /// return the size of this object in bytes
         /// </summary>
-        virtual uint32_t objectSize() const;
+        virtual System::UInt32 objectSize() const;
 
         /// <summary>
         /// return the classId of the instance being serialized.
         /// This is used by deserialization to determine what instance
         /// type to create and deserialize into.
         /// </summary>
-        virtual int32_t classId() const;
+        virtual System::Int32 classId() const;
 
         /// <summary>
         /// return the typeId of the instance being serialized.
@@ -175,7 +175,7 @@ namespace apache
         /// <summary>
         /// return the hashcode for this key.
         /// </summary>
-        virtual int32_t hashcode() const;
+        virtual System::UInt32 hashcode() const;
 
         /// <summary>
         /// return true if this key matches other CacheableKey
@@ -223,9 +223,9 @@ namespace apache
 
         int m_domainId;
         UInt32 m_classId;
-        uint8_t * m_bytes;
-        uint32_t m_size;
-        int32_t m_hashCode;
+        System::Byte * m_bytes;
+        System::UInt32 m_size;
+        System::UInt32 m_hashCode;
         bool m_hasDelta;
 
         // Disable the copy and assignment constructors

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/ManagedCacheableKey.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedCacheableKey.cpp b/src/clicache/src/impl/ManagedCacheableKey.cpp
index 510eee7..040a22b 100644
--- a/src/clicache/src/impl/ManagedCacheableKey.cpp
+++ b/src/clicache/src/impl/ManagedCacheableKey.cpp
@@ -37,7 +37,7 @@ namespace apache
       void ManagedCacheableKeyGeneric::toData(apache::geode::client::DataOutput& output) const
       {
         try {
-          uint32_t pos = (int)output.getBufferLength();
+          System::UInt32 pos = (int)output.getBufferLength();
           //Apache::Geode::Client::Log::Debug("ManagedCacheableKeyGeneric::toData");      
           Apache::Geode::Client::DataOutput mg_output(&output, true);
           m_managedptr->ToData(%mg_output);
@@ -80,7 +80,7 @@ namespace apache
         return this;
       }
 
-      uint32_t ManagedCacheableKeyGeneric::objectSize() const
+      System::UInt32 ManagedCacheableKeyGeneric::objectSize() const
       {
         try {
           int ret = m_managedptr->ObjectSize;
@@ -98,10 +98,10 @@ namespace apache
         return 0;
       }
 
-      int32_t ManagedCacheableKeyGeneric::classId() const
+      System::Int32 ManagedCacheableKeyGeneric::classId() const
       {
         //Apache::Geode::Client::Log::Debug("ManagedCacheableKeyGeneric::classid " + m_classId);
-        /*uint32_t classId;
+        /*System::UInt32 classId;
         try {
         classId = m_managedptr->ClassId;
         }
@@ -202,7 +202,7 @@ namespace apache
         return false;
       }
 
-      int32_t ManagedCacheableKeyGeneric::hashcode() const
+      System::UInt32 ManagedCacheableKeyGeneric::hashcode() const
       {
         if (m_hashcode != 0)
           return m_hashcode;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/ManagedCacheableKey.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedCacheableKey.hpp b/src/clicache/src/impl/ManagedCacheableKey.hpp
index cfd1198..8d63ccd 100644
--- a/src/clicache/src/impl/ManagedCacheableKey.hpp
+++ b/src/clicache/src/impl/ManagedCacheableKey.hpp
@@ -81,14 +81,14 @@ namespace apache
         /// <summary>
         /// return the size of this object in bytes
         /// </summary>
-        virtual uint32_t objectSize() const;
+        virtual System::UInt32 objectSize() const;
 
         /// <summary>
         /// return the classId of the instance being serialized.
         /// This is used by deserialization to determine what instance
         /// type to create and deserialize into.
         /// </summary>
-        virtual int32_t classId() const;
+        virtual System::Int32 classId() const;
 
         /// <summary>
         /// return the typeId of the instance being serialized.
@@ -125,7 +125,7 @@ namespace apache
         /// <summary>
         /// return the hashcode for this key.
         /// </summary>
-        virtual int32_t hashcode() const;
+        virtual System::UInt32 hashcode() const;
 
         /// <summary>
         /// Copy the string form of a key into a char* buffer for logging purposes.

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/ManagedCacheableKeyBytes.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedCacheableKeyBytes.cpp b/src/clicache/src/impl/ManagedCacheableKeyBytes.cpp
index f56f56b..7e82076 100644
--- a/src/clicache/src/impl/ManagedCacheableKeyBytes.cpp
+++ b/src/clicache/src/impl/ManagedCacheableKeyBytes.cpp
@@ -55,7 +55,7 @@ namespace apache
 
           Apache::Geode::Client::Log::Debug("ManagedCacheableKeyBytesGeneric::fromData: classid " + m_classId + "aid = " + +System::Threading::Thread::GetDomainID());
           Apache::Geode::Client::DataInput mg_input(&input, true);
-          const uint8_t* objStartPos = input.currentBufferPosition();
+          const System::Byte* objStartPos = input.currentBufferPosition();
 
           Apache::Geode::Client::IGeodeSerializable^ obj = Apache::Geode::Client::Serializable::GetTypeFactoryMethodGeneric(m_classId)();
           obj->FromData(%mg_input);
@@ -64,10 +64,10 @@ namespace apache
 
           m_hashCode = obj->GetHashCode();
 
-          const uint8_t* objEndPos = input.currentBufferPosition();
+          const System::Byte* objEndPos = input.currentBufferPosition();
 
           //m_size = mg_input.BytesRead;
-          m_size = (uint32_t)(objEndPos - objStartPos);
+          m_size = (System::UInt32)(objEndPos - objStartPos);
           Apache::Geode::Client::Log::Debug("ManagedCacheableKeyBytesGeneric::fromData: objectSize = " + m_size + " m_hashCode = " + m_hashCode);
           m_bytes = input.getBufferCopyFrom(objStartPos, m_size);
 
@@ -81,7 +81,7 @@ namespace apache
         return this;
       }
 
-      uint32_t ManagedCacheableKeyBytesGeneric::objectSize() const
+      System::UInt32 ManagedCacheableKeyBytesGeneric::objectSize() const
       {
         try {
           //return m_managedptr->ObjectSize;
@@ -96,9 +96,9 @@ namespace apache
         return 0;
       }
 
-      int32_t ManagedCacheableKeyBytesGeneric::classId() const
+      System::Int32 ManagedCacheableKeyBytesGeneric::classId() const
       {
-        uint32_t classId;
+        System::UInt32 classId;
         try {
           //classId = m_managedptr->ClassId;
           classId = m_classId;
@@ -115,8 +115,8 @@ namespace apache
       int8_t ManagedCacheableKeyBytesGeneric::typeId() const
       {
         try {
-          //uint32_t classId = m_managedptr->ClassId;
-          uint32_t classId = m_classId;
+          //System::UInt32 classId = m_managedptr->ClassId;
+          System::UInt32 classId = m_classId;
           if (classId >= 0x80000000) {
             return (int8_t)((classId - 0x80000000) % 0x20000000);
           }
@@ -147,8 +147,8 @@ namespace apache
         // and [0xe0000000, 0xffffffff] is for FixedIDInt
         // Note: depends on fact that FixedIDByte is 1, FixedIDShort is 2
         // and FixedIDInt is 3; if this changes then correct this accordingly
-        //uint32_t classId = m_managedptr->ClassId;
-        uint32_t classId = m_classId;
+        //System::UInt32 classId = m_managedptr->ClassId;
+        System::UInt32 classId = m_classId;
         if (classId >= 0x80000000) {
           return (int8_t)((classId - 0x80000000) / 0x20000000);
         }
@@ -229,7 +229,7 @@ namespace apache
         return false;
       }
 
-      int32_t ManagedCacheableKeyBytesGeneric::hashcode() const
+      System::UInt32 ManagedCacheableKeyBytesGeneric::hashcode() const
       {
         return m_hashCode;
       }
@@ -264,7 +264,7 @@ namespace apache
         Apache::Geode::Client::Log::Debug("ManagedCacheableKeyBytesGeneric::getManagedObject " + m_size);
 
         //System::Text::StringBuilder^ sb = gcnew System::Text::StringBuilder(2000);
-        //for(uint32_t i = 0; i<m_size; i++)
+        //for(System::UInt32 i = 0; i<m_size; i++)
         //{
         //	if(m_bytes[i] != 0)
         //		sb->Append(System::Convert::ToChar( m_bytes[i]));

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/ManagedCacheableKeyBytes.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedCacheableKeyBytes.hpp b/src/clicache/src/impl/ManagedCacheableKeyBytes.hpp
index 3aecee4..2e7d6c1 100644
--- a/src/clicache/src/impl/ManagedCacheableKeyBytes.hpp
+++ b/src/clicache/src/impl/ManagedCacheableKeyBytes.hpp
@@ -106,14 +106,14 @@ namespace apache
         /// <summary>
         /// return the size of this object in bytes
         /// </summary>
-        virtual uint32_t objectSize() const;
+        virtual System::UInt32 objectSize() const;
 
         /// <summary>
         /// return the classId of the instance being serialized.
         /// This is used by deserialization to determine what instance
         /// type to create and deserialize into.
         /// </summary>
-        virtual int32_t classId() const;
+        virtual System::Int32 classId() const;
 
         /// <summary>
         /// return the typeId of the instance being serialized.
@@ -150,7 +150,7 @@ namespace apache
         /// <summary>
         /// return the hashcode for this key.
         /// </summary>
-        virtual int32_t hashcode() const;
+        virtual System::UInt32 hashcode() const;
 
         /// <summary>
         /// Copy the string form of a key into a char* buffer for logging purposes.
@@ -191,9 +191,9 @@ namespace apache
         //    gcroot<IGeodeSerializable^> m_managedptr;
         int m_domainId;
         UInt32 m_classId;
-        uint8_t * m_bytes;
-        uint32_t m_size;
-        int32_t m_hashCode;
+        System::Byte * m_bytes;
+        System::UInt32 m_size;
+        System::UInt32 m_hashCode;
         // Disable the copy and assignment constructors
         ManagedCacheableKeyBytesGeneric(const ManagedCacheableKeyBytesGeneric&);
         ManagedCacheableKeyBytesGeneric& operator = (const ManagedCacheableKeyBytesGeneric&);

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/ManagedCqListener.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedCqListener.cpp b/src/clicache/src/impl/ManagedCqListener.cpp
index 485a39e..92678d8 100644
--- a/src/clicache/src/impl/ManagedCqListener.cpp
+++ b/src/clicache/src/impl/ManagedCqListener.cpp
@@ -49,7 +49,7 @@ namespace apache
           String^ mg_factoryFunctionName =
             Apache::Geode::Client::ManagedString::Get(factoryFunctionName);
           String^ mg_typeName = nullptr;
-          int32_t dotIndx = -1;
+          System::Int32 dotIndx = -1;
 
           if (mg_factoryFunctionName == nullptr ||
               (dotIndx = mg_factoryFunctionName->LastIndexOf('.')) < 0)

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/ManagedCqStatusListener.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedCqStatusListener.cpp b/src/clicache/src/impl/ManagedCqStatusListener.cpp
index 26fc920..21c8473 100644
--- a/src/clicache/src/impl/ManagedCqStatusListener.cpp
+++ b/src/clicache/src/impl/ManagedCqStatusListener.cpp
@@ -47,7 +47,7 @@ namespace apache
           String^ mg_factoryFunctionName =
             Apache::Geode::Client::ManagedString::Get(factoryFunctionName);
           String^ mg_typeName = nullptr;
-          int32_t dotIndx = -1;
+          System::Int32 dotIndx = -1;
 
           if (mg_factoryFunctionName == nullptr ||
               (dotIndx = mg_factoryFunctionName->LastIndexOf('.')) < 0)

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/ManagedFixedPartitionResolver.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedFixedPartitionResolver.cpp b/src/clicache/src/impl/ManagedFixedPartitionResolver.cpp
index d0bf46c..23310f5 100644
--- a/src/clicache/src/impl/ManagedFixedPartitionResolver.cpp
+++ b/src/clicache/src/impl/ManagedFixedPartitionResolver.cpp
@@ -49,10 +49,10 @@ namespace apache
           String^ mg_genericKey = nullptr;
           String^ mg_genericVal = nullptr;
 
-          int32_t dotIndx = -1;
-          int32_t genericsOpenIndx = -1;
-          int32_t genericsCloseIndx = -1;
-          int32_t commaIndx = -1;
+          System::Int32 dotIndx = -1;
+          System::Int32 genericsOpenIndx = -1;
+          System::Int32 genericsCloseIndx = -1;
+          System::Int32 commaIndx = -1;
 
           if (mg_factoryFunctionName == nullptr ||
               (dotIndx = mg_factoryFunctionName->LastIndexOf('.')) < 0)

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/ManagedPartitionResolver.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedPartitionResolver.cpp b/src/clicache/src/impl/ManagedPartitionResolver.cpp
index c5a7ded..5958ce5 100644
--- a/src/clicache/src/impl/ManagedPartitionResolver.cpp
+++ b/src/clicache/src/impl/ManagedPartitionResolver.cpp
@@ -53,10 +53,10 @@ namespace apache
           String^ mg_genericKey = nullptr;
           String^ mg_genericVal = nullptr;
 
-          int32_t dotIndx = -1;
-          int32_t genericsOpenIndx = -1;
-          int32_t genericsCloseIndx = -1;
-          int32_t commaIndx = -1;
+          System::Int32 dotIndx = -1;
+          System::Int32 genericsOpenIndx = -1;
+          System::Int32 genericsCloseIndx = -1;
+          System::Int32 commaIndx = -1;
 
           if (mg_factoryFunctionName == nullptr ||
               (dotIndx = mg_factoryFunctionName->LastIndexOf('.')) < 0)

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/ManagedPersistenceManager.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedPersistenceManager.cpp b/src/clicache/src/impl/ManagedPersistenceManager.cpp
index 28a4eab..5eeeeb4 100644
--- a/src/clicache/src/impl/ManagedPersistenceManager.cpp
+++ b/src/clicache/src/impl/ManagedPersistenceManager.cpp
@@ -44,10 +44,10 @@ namespace apache
           String^ mg_genericKey = nullptr;
           String^ mg_genericVal = nullptr;
 
-          int32_t dotIndx = -1;
-          int32_t genericsOpenIndx = -1;
-          int32_t genericsCloseIndx = -1;
-          int32_t commaIndx = -1;
+          System::Int32 dotIndx = -1;
+          System::Int32 genericsOpenIndx = -1;
+          System::Int32 genericsCloseIndx = -1;
+          System::Int32 commaIndx = -1;
 
           if (mg_factoryFunctionName == nullptr ||
             (dotIndx = mg_factoryFunctionName->LastIndexOf('.')) < 0)

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/ManagedResultCollector.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedResultCollector.cpp b/src/clicache/src/impl/ManagedResultCollector.cpp
index 1aa9deb..8874eec 100644
--- a/src/clicache/src/impl/ManagedResultCollector.cpp
+++ b/src/clicache/src/impl/ManagedResultCollector.cpp
@@ -166,7 +166,7 @@ namespace apache
         }
       }
 
-      CacheableVectorPtr ManagedResultCollectorGeneric::getResult(uint32_t timeout)
+      CacheableVectorPtr ManagedResultCollectorGeneric::getResult(System::UInt32 timeout)
       {
         try {
           //array<IGeodeSerializable^>^ rs = m_managedptr->GetResult(timeout);

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/ManagedResultCollector.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedResultCollector.hpp b/src/clicache/src/impl/ManagedResultCollector.hpp
index 65db30c..bc1223f 100644
--- a/src/clicache/src/impl/ManagedResultCollector.hpp
+++ b/src/clicache/src/impl/ManagedResultCollector.hpp
@@ -75,7 +75,7 @@ namespace apache {
         /// </summary>
         virtual ~ManagedResultCollectorGeneric() { }
 
-        CacheableVectorPtr getResult(uint32_t timeout = DEFAULT_QUERY_RESPONSE_TIMEOUT);
+        CacheableVectorPtr getResult(System::UInt32 timeout = DEFAULT_QUERY_RESPONSE_TIMEOUT);
         void addResult(CacheablePtr& result);
         void endResults();
         void clearResults();

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/ManagedTransactionListener.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedTransactionListener.cpp b/src/clicache/src/impl/ManagedTransactionListener.cpp
index 8fc256e..be829bd 100644
--- a/src/clicache/src/impl/ManagedTransactionListener.cpp
+++ b/src/clicache/src/impl/ManagedTransactionListener.cpp
@@ -51,10 +51,10 @@ namespace apache
           String^ mg_genericKey = nullptr;
           String^ mg_genericVal = nullptr;
 
-          int32_t dotIndx = -1;
-          int32_t genericsOpenIndx = -1;
-          int32_t genericsCloseIndx = -1;
-          int32_t commaIndx = -1;
+          System::Int32 dotIndx = -1;
+          System::Int32 genericsOpenIndx = -1;
+          System::Int32 genericsCloseIndx = -1;
+          System::Int32 commaIndx = -1;
 
           if (mg_factoryFunctionName == nullptr ||
               (dotIndx = mg_factoryFunctionName->LastIndexOf('.')) < 0)

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/ManagedTransactionWriter.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedTransactionWriter.cpp b/src/clicache/src/impl/ManagedTransactionWriter.cpp
index e6e1b26..f319667 100644
--- a/src/clicache/src/impl/ManagedTransactionWriter.cpp
+++ b/src/clicache/src/impl/ManagedTransactionWriter.cpp
@@ -52,10 +52,10 @@ namespace apache
           String^ mg_genericKey = nullptr;
           String^ mg_genericVal = nullptr;
 
-          int32_t dotIndx = -1;
-          int32_t genericsOpenIndx = -1;
-          int32_t genericsCloseIndx = -1;
-          int32_t commaIndx = -1;
+          System::Int32 dotIndx = -1;
+          System::Int32 genericsOpenIndx = -1;
+          System::Int32 genericsCloseIndx = -1;
+          System::Int32 commaIndx = -1;
 
           if (mg_factoryFunctionName == nullptr ||
               (dotIndx = mg_factoryFunctionName->LastIndexOf('.')) < 0)

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/MemoryPressureHandler.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/MemoryPressureHandler.cpp b/src/clicache/src/impl/MemoryPressureHandler.cpp
index 29ce7f8..bf3d80d 100644
--- a/src/clicache/src/impl/MemoryPressureHandler.cpp
+++ b/src/clicache/src/impl/MemoryPressureHandler.cpp
@@ -28,7 +28,7 @@ namespace Apache
     namespace Client
     {
 
-      int64_t g_prevUnmanagedSize = 0;
+      System::Int64 g_prevUnmanagedSize = 0;
 
       int MemoryPressureHandler::handle_timeout( const ACE_Time_Value&
           current_time, const void* arg )
@@ -38,14 +38,14 @@ namespace Apache
         PROCESS_MEMORY_COUNTERS pmc;
 
         if ( GetProcessMemoryInfo( hProcess, &pmc, sizeof(pmc)) ) {
-          int64_t totalmem  = (int64_t)pmc.WorkingSetSize;
-          int64_t curr_managed_size = GC::GetTotalMemory( false );
-          int64_t curr_unmanagedMemory = totalmem - curr_managed_size;
+          System::Int64 totalmem  = (System::Int64)pmc.WorkingSetSize;
+          System::Int64 curr_managed_size = GC::GetTotalMemory( false );
+          System::Int64 curr_unmanagedMemory = totalmem - curr_managed_size;
           Log::Finest( "Current total memory usage: {0}, managed memory: {1}, "
               "unmanaged memory: {2}", totalmem, curr_managed_size,
               curr_unmanagedMemory );
           if ( curr_unmanagedMemory > 0 ) {
-            int64_t increase = curr_unmanagedMemory - g_prevUnmanagedSize;
+            System::Int64 increase = curr_unmanagedMemory - g_prevUnmanagedSize;
             if ( Math::Abs( increase ) > 20*1024*1024 ) {
               if ( increase > 0 ) {
                 Log::Fine( "Adding memory pressure information to assist .NET GC: {0} bytes", increase );

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/PdxFieldType.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxFieldType.hpp b/src/clicache/src/impl/PdxFieldType.hpp
index 253e2e7..fdef59b 100644
--- a/src/clicache/src/impl/PdxFieldType.hpp
+++ b/src/clicache/src/impl/PdxFieldType.hpp
@@ -130,13 +130,13 @@ namespace Apache
 
           virtual void ToData(DataOutput^ output);
           virtual IGeodeSerializable^ FromData(DataInput^ input);
-          virtual property uint32_t ObjectSize
+          virtual property System::UInt32 ObjectSize
           {
-            uint32_t get(){ return 0; }
+            System::UInt32 get(){ return 0; }
           }
-          virtual property uint32_t ClassId
+          virtual property System::UInt32 ClassId
           {
-            uint32_t get(){ return m_typeId; }
+            System::UInt32 get(){ return m_typeId; }
           }
           virtual String^ ToString() override
           {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/PdxHelper.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxHelper.cpp b/src/clicache/src/impl/PdxHelper.cpp
index be8b0f7..769710d 100644
--- a/src/clicache/src/impl/PdxHelper.cpp
+++ b/src/clicache/src/impl/PdxHelper.cpp
@@ -89,7 +89,7 @@ namespace Apache
               plw->EndObjectWriting();//now write typeid
 
               int len = 0;
-              uint8_t* pdxStream = plw->GetPdxStream(len);
+              System::Byte* pdxStream = plw->GetPdxStream(len);
               pdxII->updatePdxStream( pdxStream, len);
 
 
@@ -123,7 +123,7 @@ namespace Apache
 			//This is for pdx Statistics
             CacheImpl* cacheImpl = getCacheImpl();
             if (cacheImpl != NULL) {
-              uint8_t* stPos = dataOutput->GetStartBufferPosition() + ptc->getStartPositionOffset();
+              System::Byte* stPos = dataOutput->GetStartBufferPosition() + ptc->getStartPositionOffset();
               int pdxLen = PdxHelper::ReadInt32(stPos);       
               cacheImpl->m_cacheStats->incPdxSerialization(pdxLen + 1 + 2*4); //pdxLen + 93 DSID + len + typeID
             }
@@ -153,7 +153,7 @@ namespace Apache
 			//This is for pdx Statistics
             CacheImpl* cacheImpl = getCacheImpl();
             if (cacheImpl != NULL) {
-              uint8_t* stPos = dataOutput->GetStartBufferPosition() + prw->getStartPositionOffset();
+              System::Byte* stPos = dataOutput->GetStartBufferPosition() + prw->getStartPositionOffset();
               int pdxLen = PdxHelper::ReadInt32(stPos);       
               cacheImpl->m_cacheStats->incPdxSerialization(pdxLen + 1 + 2*4); //pdxLen + 93 DSID + len + typeID
             }
@@ -398,7 +398,7 @@ namespace Apache
           }
         }
 
-        Int32 PdxHelper::ReadInt32(uint8_t* offsetPosition)
+        Int32 PdxHelper::ReadInt32(System::Byte* offsetPosition)
         {
           Int32 data = offsetPosition[0];
           data = (data << 8) | offsetPosition[1];
@@ -408,46 +408,46 @@ namespace Apache
           return data;
         }
 
-        Int32 PdxHelper::ReadInt16(uint8_t* offsetPosition)
+        Int32 PdxHelper::ReadInt16(System::Byte* offsetPosition)
         {
-          int16_t data = offsetPosition[0];
+          System::Int16 data = offsetPosition[0];
           data = (data << 8) | offsetPosition[1];
           return (Int32)data;
         }
 
-				Int32 PdxHelper::ReadUInt16(uint8_t* offsetPosition)
+				Int32 PdxHelper::ReadUInt16(System::Byte* offsetPosition)
         {
 					UInt16 data = offsetPosition[0];
           data = (data << 8) | offsetPosition[1];
           return (Int32)data;
         }
 
-        Int32 PdxHelper::ReadByte(uint8_t* offsetPosition)
+        Int32 PdxHelper::ReadByte(System::Byte* offsetPosition)
         {
           return (Int32)offsetPosition[0];
         }
 
-        void PdxHelper::WriteInt32(uint8_t* offsetPosition, Int32 value)
+        void PdxHelper::WriteInt32(System::Byte* offsetPosition, Int32 value)
         {
-          offsetPosition[0] = (uint8_t)(value >> 24);
-          offsetPosition[1] = (uint8_t)(value >> 16);
-          offsetPosition[2] = (uint8_t)(value >> 8);
-          offsetPosition[3] = (uint8_t)value;
+          offsetPosition[0] = (System::Byte)(value >> 24);
+          offsetPosition[1] = (System::Byte)(value >> 16);
+          offsetPosition[2] = (System::Byte)(value >> 8);
+          offsetPosition[3] = (System::Byte)value;
         }
 
-        void PdxHelper::WriteInt16(uint8_t* offsetPosition, Int32 value)
+        void PdxHelper::WriteInt16(System::Byte* offsetPosition, Int32 value)
         {
           Int16 val = (Int16)value;
-          offsetPosition[0] = (uint8_t)(val >> 8);
-          offsetPosition[1] = (uint8_t)val;
+          offsetPosition[0] = (System::Byte)(val >> 8);
+          offsetPosition[1] = (System::Byte)val;
         }
 
-        void PdxHelper::WriteByte(uint8_t* offsetPosition, Int32 value)
+        void PdxHelper::WriteByte(System::Byte* offsetPosition, Int32 value)
         {
           offsetPosition[0] = (Byte)value;
         }
 
-        Int32 PdxHelper::ReadInt(uint8_t* offsetPosition, int size)
+        Int32 PdxHelper::ReadInt(System::Byte* offsetPosition, int size)
         {
           switch(size)
           {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/PdxHelper.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxHelper.hpp b/src/clicache/src/impl/PdxHelper.hpp
index 09042c0..43d51bb 100644
--- a/src/clicache/src/impl/PdxHelper.hpp
+++ b/src/clicache/src/impl/PdxHelper.hpp
@@ -45,21 +45,21 @@ namespace Apache
 
           literal Byte PdxHeader = 8;
 
-          static Int32 ReadInt32(uint8_t* offsetPosition);
+          static Int32 ReadInt32(System::Byte* offsetPosition);
 
-          static Int32 ReadInt16(uint8_t* offsetPosition);
+          static Int32 ReadInt16(System::Byte* offsetPosition);
 
-					static Int32 PdxHelper::ReadUInt16(uint8_t* offsetPosition);
+					static Int32 PdxHelper::ReadUInt16(System::Byte* offsetPosition);
 
-          static Int32 ReadByte(uint8_t* offsetPosition);
+          static Int32 ReadByte(System::Byte* offsetPosition);
 
-          static void WriteInt32(uint8_t* offsetPosition, Int32 value);
+          static void WriteInt32(System::Byte* offsetPosition, Int32 value);
 
-          static void WriteInt16(uint8_t* offsetPosition, Int32 value);
+          static void WriteInt16(System::Byte* offsetPosition, Int32 value);
 
-          static void WriteByte(uint8_t* offsetPosition, Int32 value);
+          static void WriteByte(System::Byte* offsetPosition, Int32 value);
 
-          static Int32 ReadInt(uint8_t* offsetPosition, int size);
+          static Int32 ReadInt(System::Byte* offsetPosition, int size);
 
           static Int32 GetEnumValue(String^ enumClassName, String^ enumName, int hashcode);
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/PdxInstanceFactoryImpl.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxInstanceFactoryImpl.cpp b/src/clicache/src/impl/PdxInstanceFactoryImpl.cpp
index d2e54e0..885dab6 100644
--- a/src/clicache/src/impl/PdxInstanceFactoryImpl.cpp
+++ b/src/clicache/src/impl/PdxInstanceFactoryImpl.cpp
@@ -286,7 +286,7 @@ namespace Apache
           }
           else if (type->Equals(DotNetTypes::IntArrayType))
           {
-            return this->WriteIntArray(fieldName, (array<int32_t>^)fieldValue);
+            return this->WriteIntArray(fieldName, (array<System::Int32>^)fieldValue);
           }
           else if (type->Equals(DotNetTypes::LongArrayType))
           {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/PdxInstanceImpl.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxInstanceImpl.cpp b/src/clicache/src/impl/PdxInstanceImpl.cpp
index 735d842..e4c181e 100755
--- a/src/clicache/src/impl/PdxInstanceImpl.cpp
+++ b/src/clicache/src/impl/PdxInstanceImpl.cpp
@@ -81,7 +81,7 @@ namespace Apache
         {
           DataInput^ dataInput = gcnew DataInput(m_buffer, m_bufferLength);
           dataInput->setRootObjectPdx(true);
-          int64_t sampleStartNanos = Utils::startStatOpTime();
+          System::Int64 sampleStartNanos = Utils::startStatOpTime();
           Object^ ret = Internal::PdxHelper::DeserializePdx(dataInput, true, m_typeId, m_bufferLength);
           //dataInput->ResetPdx(0);
 
@@ -188,7 +188,7 @@ namespace Apache
           else
             serializedLength = pdxSerializedLength;
 
-          uint8_t* offsetsBuffer = dataInput->GetCursor() + serializedLength;
+          System::Byte* offsetsBuffer = dataInput->GetCursor() + serializedLength;
 
           return pt->GetFieldPosition(sequenceId, offsetsBuffer, offsetSize, serializedLength);
         }
@@ -991,7 +991,7 @@ namespace Apache
 
             if (m_buffer != NULL)
             {
-              uint8_t* copy = m_buffer;
+              System::Byte* copy = m_buffer;
 
               if (!m_own)
                 copy = apache::geode::client::DataInput::getBufferCopy(m_buffer, m_bufferLength);
@@ -1056,7 +1056,7 @@ namespace Apache
             }
           }
 
-          void PdxInstanceImpl::updatePdxStream(uint8_t* newPdxStream, int len)
+          void PdxInstanceImpl::updatePdxStream(System::Byte* newPdxStream, int len)
           {
             m_buffer = newPdxStream;
             m_own = true;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/PdxInstanceImpl.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxInstanceImpl.hpp b/src/clicache/src/impl/PdxInstanceImpl.hpp
index 3095ccc..ebab9a5 100755
--- a/src/clicache/src/impl/PdxInstanceImpl.hpp
+++ b/src/clicache/src/impl/PdxInstanceImpl.hpp
@@ -64,7 +64,7 @@ namespace Apache
 
 
           //DataInput^ m_dataInput;
-          uint8_t* m_buffer;
+          System::Byte* m_buffer;
           int m_bufferLength;
           int m_typeId;
           bool m_own;
@@ -116,10 +116,10 @@ namespace Apache
 
           static bool deepArrayEquals(Object^ obj, Object^ otherObj);
 
-          void updatePdxStream(uint8_t* newPdxStream, int len);
+          void updatePdxStream(System::Byte* newPdxStream, int len);
 
         public:
-          PdxInstanceImpl(uint8_t* buffer, int length, int typeId, bool own)
+          PdxInstanceImpl(System::Byte* buffer, int length, int typeId, bool own)
           {
             //m_dataInput = dataInput;
             m_buffer = buffer;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/PdxLocalReader.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxLocalReader.cpp b/src/clicache/src/impl/PdxLocalReader.cpp
index c563b95..e92ba9a 100644
--- a/src/clicache/src/impl/PdxLocalReader.cpp
+++ b/src/clicache/src/impl/PdxLocalReader.cpp
@@ -133,17 +133,17 @@ namespace Apache
           return m_dataInput->ReadChar();
         }
         
-        uint16_t PdxLocalReader::ReadUInt16( String^ fieldName )
+        System::UInt16 PdxLocalReader::ReadUInt16( String^ fieldName )
         {
           return m_dataInput->ReadUInt16();
         }
 
-        uint32_t PdxLocalReader::ReadUInt32( String^ fieldName )
+        System::UInt32 PdxLocalReader::ReadUInt32( String^ fieldName )
         {
           return m_dataInput->ReadUInt32();
         }
         
-        uint64_t PdxLocalReader::ReadUInt64( String^ fieldName )
+        System::UInt64 PdxLocalReader::ReadUInt64( String^ fieldName )
         {
           return m_dataInput->ReadUInt64();
         }
@@ -419,4 +419,4 @@ namespace Apache
 
     }
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/PdxLocalReader.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxLocalReader.hpp b/src/clicache/src/impl/PdxLocalReader.hpp
index 98ab183..bbe4971 100644
--- a/src/clicache/src/impl/PdxLocalReader.hpp
+++ b/src/clicache/src/impl/PdxLocalReader.hpp
@@ -43,12 +43,12 @@ namespace Apache
 
           DataInput^        m_dataInput;
           PdxType^          m_pdxType;
-          uint8_t*          m_startBuffer;
+          System::Byte*          m_startBuffer;
           Int32             m_startPosition;
           Int32             m_serializedLength;
           Int32             m_serializedLengthWithOffsets;
           Int32             m_offsetSize;
-          uint8_t*          m_offsetsBuffer;
+          System::Byte*          m_offsetsBuffer;
           bool              m_isDataNeedToPreserve;
           
           PdxRemotePreservedData^ m_pdxRemotePreserveData;
@@ -104,19 +104,19 @@ namespace Apache
         /// Read a 16-bit unsigned integer from the stream.
         /// </summary>
         /// <param name="fieldName">The name of a member field whose value to read.</param>
-        virtual uint16_t ReadUInt16( String^ fieldName );
+        virtual System::UInt16 ReadUInt16( String^ fieldName );
 
         /// <summary>
         /// Read a 32-bit unsigned integer from the stream.
         /// </summary>
         /// <param name="fieldName">The name of a member field whose value to read.</param>
-        virtual uint32_t ReadUInt32( String^ fieldName );
+        virtual System::UInt32 ReadUInt32( String^ fieldName );
         
         /// <summary>
         /// Read a 64-bit unsigned integer from the stream.
         /// </summary>
         /// <param name="fieldName">The name of a member field whose value to read.</param>
-        virtual uint64_t ReadUInt64( String^ fieldName );
+        virtual System::UInt64 ReadUInt64( String^ fieldName );
 
         /// <summary>
         /// Read a 16-bit integer from the stream.

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/PdxLocalWriter.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxLocalWriter.cpp b/src/clicache/src/impl/PdxLocalWriter.cpp
index cf80944..8280a14 100644
--- a/src/clicache/src/impl/PdxLocalWriter.cpp
+++ b/src/clicache/src/impl/PdxLocalWriter.cpp
@@ -65,9 +65,9 @@ namespace Apache
             WritePdxHeader();
           }
 
-          uint8_t* PdxLocalWriter::GetPdxStream(int& pdxLen)
+          System::Byte* PdxLocalWriter::GetPdxStream(int& pdxLen)
           {
-            uint8_t* stPos = m_dataOutput->GetStartBufferPosition() + m_startPositionOffset;
+            System::Byte* stPos = m_dataOutput->GetStartBufferPosition() + m_startPositionOffset;
             int len = PdxHelper::ReadInt32(stPos);
             pdxLen = len;
             //ignore len and typeid
@@ -81,7 +81,7 @@ namespace Apache
             Int32 typeId = m_pdxType->TypeId;
 
             //GetStartBufferPosition ; if unmanaged dataoutput get change
-            uint8_t* starpos = m_dataOutput->GetStartBufferPosition() + m_startPositionOffset;
+            System::Byte* starpos = m_dataOutput->GetStartBufferPosition() + m_startPositionOffset;
             PdxHelper::WriteInt32(starpos , len);
             PdxHelper::WriteInt32(starpos + 4, typeId);
 
@@ -183,31 +183,31 @@ namespace Apache
             return this;
           }
                        
-          IPdxWriter^ PdxLocalWriter::WriteUInt16( String^ fieldName, uint16_t value )
+          IPdxWriter^ PdxLocalWriter::WriteUInt16( String^ fieldName, System::UInt16 value )
           {
             m_dataOutput->WriteUInt16(value);
             return this;
           }
 
-          IPdxWriter^ PdxLocalWriter::WriteUInt32( String^ fieldName, uint32_t value )
+          IPdxWriter^ PdxLocalWriter::WriteUInt32( String^ fieldName, System::UInt32 value )
           {
             m_dataOutput->WriteUInt32(value);
             return this;
           }
 
-          IPdxWriter^ PdxLocalWriter::WriteUInt64( String^ fieldName, uint64_t value )
+          IPdxWriter^ PdxLocalWriter::WriteUInt64( String^ fieldName, System::UInt64 value )
           {
             m_dataOutput->WriteUInt64(value);
             return this;
           }
 
-          IPdxWriter^ PdxLocalWriter::WriteShort( String^ fieldName, int16_t value )
+          IPdxWriter^ PdxLocalWriter::WriteShort( String^ fieldName, System::Int16 value )
           {
             m_dataOutput->WriteInt16(value);
             return this;
           }
 
-          IPdxWriter^ PdxLocalWriter::WriteInt( String^ fieldName, int32_t value )
+          IPdxWriter^ PdxLocalWriter::WriteInt( String^ fieldName, System::Int32 value )
           {
             m_dataOutput->WriteInt32(value);
             return this;
@@ -446,7 +446,7 @@ namespace Apache
             }
             else if(type->Equals(DotNetTypes::IntArrayType))
             {
-              return this->WriteIntArray(fieldName, (array<int32_t>^)fieldValue);
+              return this->WriteIntArray(fieldName, (array<System::Int32>^)fieldValue);
             }
             else if(type->Equals(DotNetTypes::LongArrayType))
             {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/PdxLocalWriter.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxLocalWriter.hpp b/src/clicache/src/impl/PdxLocalWriter.hpp
index 1dbaa6c..001d418 100644
--- a/src/clicache/src/impl/PdxLocalWriter.hpp
+++ b/src/clicache/src/impl/PdxLocalWriter.hpp
@@ -39,7 +39,7 @@ namespace Apache
         protected:
           PdxType^      m_pdxType;
           DataOutput^   m_dataOutput;
-          uint8_t*      m_startPosition;
+          System::Byte*      m_startPosition;
           Int32         m_startPositionOffset;
           String^         m_domainClassName;
           array<int>^   m_offsets;
@@ -81,7 +81,7 @@ namespace Apache
 
           //this is used to get pdx stream when WriteablePdxStream udpadates the field
           //It should be called after pdx stream has been written to output
-          uint8_t* GetPdxStream(int& pdxLen);
+          System::Byte* GetPdxStream(int& pdxLen);
 
           void WritePdxHeader();
 
@@ -125,25 +125,25 @@ namespace Apache
           virtual IPdxWriter^ WriteChar(String^ fieldName, Char value);
 
           /// <summary>
-          /// Write an unsigned short integer (int16_t) to the <c>IPdxWriter</c>.
+          /// Write an unsigned short integer (System::Int16) to the <c>IPdxWriter</c>.
           /// </summary>
           /// <param name="fieldName">The name of the field associated with the value.</param>
           /// <param name="value">The unsigned 16-bit integer to write.</param>
-          virtual IPdxWriter^ WriteUInt16(String^ fieldName, uint16_t value);
+          virtual IPdxWriter^ WriteUInt16(String^ fieldName, System::UInt16 value);
 
           /// <summary>
           /// Write an unsigned 32-bit integer to the <c>IPdxWriter</c>.
           /// </summary>
           /// <param name="fieldName">The name of the field associated with the value.</param>
           /// <param name="value">The unsigned 32-bit integer to write.</param>
-          virtual IPdxWriter^ WriteUInt32(String^ fieldName, uint32_t value);
+          virtual IPdxWriter^ WriteUInt32(String^ fieldName, System::UInt32 value);
 
           /// <summary>
           /// Write an unsigned 64-bit integer to the <c>IPdxWriter</c>.
           /// </summary>
           /// <param name="fieldName">The name of the field associated with the value.</param>
           /// <param name="value">The unsigned 64-bit integer to write.</param>
-          virtual IPdxWriter^ WriteUInt64(String^ fieldName, uint64_t value);
+          virtual IPdxWriter^ WriteUInt64(String^ fieldName, System::UInt64 value);
 
           /// <summary>
           /// Write a 16-bit integer to the <c>IPdxWriter</c>.

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/PdxManagedCacheableKey.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxManagedCacheableKey.cpp b/src/clicache/src/impl/PdxManagedCacheableKey.cpp
index c1fa298..46f57c7 100644
--- a/src/clicache/src/impl/PdxManagedCacheableKey.cpp
+++ b/src/clicache/src/impl/PdxManagedCacheableKey.cpp
@@ -37,7 +37,7 @@ namespace apache
       void PdxManagedCacheableKey::toData(apache::geode::client::DataOutput& output) const
       {
         try {
-          uint32_t pos = (int)output.getBufferLength();
+          System::UInt32 pos = (int)output.getBufferLength();
           Apache::Geode::Client::DataOutput mg_output(&output, true);
           Apache::Geode::Client::Internal::PdxHelper::SerializePdx(%mg_output, m_managedptr);
           //m_managedptr->ToData( %mg_output );
@@ -78,7 +78,7 @@ namespace apache
         return this;
       }
 
-      uint32_t PdxManagedCacheableKey::objectSize() const
+      System::UInt32 PdxManagedCacheableKey::objectSize() const
       {
         try {
           return m_objectSize;
@@ -92,9 +92,9 @@ namespace apache
         return 0;
       }
 
-      int32_t PdxManagedCacheableKey::classId() const
+      System::Int32 PdxManagedCacheableKey::classId() const
       {
-        /*uint32_t classId;
+        /*System::UInt32 classId;
         try {
         classId = m_managedptr->ClassId;
         }
@@ -191,7 +191,7 @@ namespace apache
         return false;
       }
 
-      int32_t PdxManagedCacheableKey::hashcode() const
+      System::UInt32 PdxManagedCacheableKey::hashcode() const
       {
         if (m_hashcode != 0)
           return m_hashcode;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/PdxManagedCacheableKey.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxManagedCacheableKey.hpp b/src/clicache/src/impl/PdxManagedCacheableKey.hpp
index 35086d4..1034b8c 100644
--- a/src/clicache/src/impl/PdxManagedCacheableKey.hpp
+++ b/src/clicache/src/impl/PdxManagedCacheableKey.hpp
@@ -104,14 +104,14 @@ namespace apache
         /// <summary>
         /// return the size of this object in bytes
         /// </summary>
-        virtual uint32_t objectSize() const;
+        virtual System::UInt32 objectSize() const;
 
         /// <summary>
         /// return the classId of the instance being serialized.
         /// This is used by deserialization to determine what instance
         /// type to create and deserialize into.
         /// </summary>
-        virtual int32_t classId() const;
+        virtual System::Int32 classId() const;
 
         /// <summary>
         /// return the typeId of the instance being serialized.
@@ -148,7 +148,7 @@ namespace apache
         /// <summary>
         /// return the hashcode for this key.
         /// </summary>
-        virtual int32_t hashcode() const;
+        virtual System::UInt32 hashcode() const;
 
         /// <summary>
         /// Copy the string form of a key into a char* buffer for logging purposes.

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/PdxManagedCacheableKeyBytes.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxManagedCacheableKeyBytes.cpp b/src/clicache/src/impl/PdxManagedCacheableKeyBytes.cpp
index 3688389..8124c3e 100644
--- a/src/clicache/src/impl/PdxManagedCacheableKeyBytes.cpp
+++ b/src/clicache/src/impl/PdxManagedCacheableKeyBytes.cpp
@@ -55,7 +55,7 @@ namespace apache
 
           //Apache::Geode::Client::Log::Debug("PdxManagedCacheableKeyBytes::fromData: classid " + m_classId);
           Apache::Geode::Client::DataInput mg_input(&input, true);
-          const uint8_t* objStartPos = input.currentBufferPosition();
+          const System::Byte* objStartPos = input.currentBufferPosition();
 
           Apache::Geode::Client::IPdxSerializable^ obj = Apache::Geode::Client::Internal::PdxHelper::DeserializePdx(%mg_input, false);
 
@@ -66,10 +66,10 @@ namespace apache
 
           m_hashCode = obj->GetHashCode();
 
-          const uint8_t* objEndPos = input.currentBufferPosition();
+          const System::Byte* objEndPos = input.currentBufferPosition();
 
           //m_size = mg_input.BytesRead;
-          m_size = (uint32_t)(objEndPos - objStartPos);
+          m_size = (System::UInt32)(objEndPos - objStartPos);
           // Apache::Geode::Client::Log::Debug("PdxManagedCacheableKeyBytes::fromData: objectSize = " + m_size + " m_hashCode = " + m_hashCode);
           m_bytes = input.getBufferCopyFrom(objStartPos, m_size);
 
@@ -83,7 +83,7 @@ namespace apache
         return this;
       }
 
-      uint32_t PdxManagedCacheableKeyBytes::objectSize() const
+      System::UInt32 PdxManagedCacheableKeyBytes::objectSize() const
       {
         try {
           //return m_managedptr->ObjectSize;
@@ -98,9 +98,9 @@ namespace apache
         return 0;
       }
 
-      int32_t PdxManagedCacheableKeyBytes::classId() const
+      System::Int32 PdxManagedCacheableKeyBytes::classId() const
       {
-        //uint32_t classId;
+        //System::UInt32 classId;
         //try {
         //  //classId = m_managedptr->ClassId;
         //  classId = m_classId;
@@ -118,8 +118,8 @@ namespace apache
       int8_t PdxManagedCacheableKeyBytes::typeId() const
       {
         //try {
-        //  //uint32_t classId = m_managedptr->ClassId;
-        //  uint32_t classId = m_classId;
+        //  //System::UInt32 classId = m_managedptr->ClassId;
+        //  System::UInt32 classId = m_classId;
         //  if (classId >= 0x80000000) {
         //    return (int8_t)((classId - 0x80000000) % 0x20000000);
         //  }
@@ -150,8 +150,8 @@ namespace apache
         // and [0xe0000000, 0xffffffff] is for FixedIDInt
         // Note: depends on fact that FixedIDByte is 1, FixedIDShort is 2
         // and FixedIDInt is 3; if this changes then correct this accordingly
-        //uint32_t classId = m_managedptr->ClassId;
-        /*  uint32_t classId = m_classId;
+        //System::UInt32 classId = m_managedptr->ClassId;
+        /*  System::UInt32 classId = m_classId;
           if (classId >= 0x80000000) {
           return (int8_t)((classId - 0x80000000) / 0x20000000);
           }*/
@@ -234,7 +234,7 @@ namespace apache
         return false;
       }
 
-      int32_t PdxManagedCacheableKeyBytes::hashcode() const
+      System::UInt32 PdxManagedCacheableKeyBytes::hashcode() const
       {
         return m_hashCode;
       }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/PdxManagedCacheableKeyBytes.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxManagedCacheableKeyBytes.hpp b/src/clicache/src/impl/PdxManagedCacheableKeyBytes.hpp
index 0e6c520..b2fc8c8 100644
--- a/src/clicache/src/impl/PdxManagedCacheableKeyBytes.hpp
+++ b/src/clicache/src/impl/PdxManagedCacheableKeyBytes.hpp
@@ -131,14 +131,14 @@ namespace apache
     /// <summary>
     /// return the size of this object in bytes
     /// </summary>
-    virtual uint32_t objectSize() const;
+    virtual System::UInt32 objectSize() const;
 
     /// <summary>
     /// return the classId of the instance being serialized.
     /// This is used by deserialization to determine what instance
     /// type to create and deserialize into.
     /// </summary>
-    virtual int32_t classId( ) const;
+    virtual System::Int32 classId( ) const;
 
     /// <summary>
     /// return the typeId of the instance being serialized.
@@ -175,7 +175,7 @@ namespace apache
     /// <summary>
     /// return the hashcode for this key.
     /// </summary>
-    virtual int32_t hashcode( ) const;
+    virtual System::UInt32 hashcode( ) const;
 
     /// <summary>
     /// Copy the string form of a key into a char* buffer for logging purposes.
@@ -221,10 +221,10 @@ namespace apache
 //    gcroot<IGeodeSerializable^> m_managedptr;
     int m_domainId;
     UInt32 m_classId;
-    uint8_t * m_bytes;
-    uint32_t m_size;
+    System::Byte * m_bytes;
+    System::UInt32 m_size;
     bool m_hasDelta;
-    int32_t m_hashCode;
+    System::UInt32 m_hashCode;
     // Disable the copy and assignment constructors
     PdxManagedCacheableKeyBytes( const PdxManagedCacheableKeyBytes& );
     PdxManagedCacheableKeyBytes& operator = ( const PdxManagedCacheableKeyBytes& );

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/PdxReaderWithTypeCollector.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxReaderWithTypeCollector.cpp b/src/clicache/src/impl/PdxReaderWithTypeCollector.cpp
index 5f6ab2e..4aa9a21 100644
--- a/src/clicache/src/impl/PdxReaderWithTypeCollector.cpp
+++ b/src/clicache/src/impl/PdxReaderWithTypeCollector.cpp
@@ -95,7 +95,7 @@ namespace Apache
           return retVal;
         }
 
-        uint16_t PdxReaderWithTypeCollector::ReadUInt16(String^ fieldName)
+        System::UInt16 PdxReaderWithTypeCollector::ReadUInt16(String^ fieldName)
         {
           checkType(fieldName, PdxTypes::SHORT, "short");
           m_newPdxType->AddFixedLengthTypeField(fieldName, "short", PdxTypes::SHORT, GeodeClassIds::SHORT_SIZE);
@@ -110,7 +110,7 @@ namespace Apache
           return 0;
         }
 
-        uint32_t PdxReaderWithTypeCollector::ReadUInt32(String^ fieldName)
+        System::UInt32 PdxReaderWithTypeCollector::ReadUInt32(String^ fieldName)
         {
           checkType(fieldName, PdxTypes::INT, "int");
           m_newPdxType->AddFixedLengthTypeField(fieldName, "int", PdxTypes::INT, GeodeClassIds::INTEGER_SIZE);
@@ -125,7 +125,7 @@ namespace Apache
           return 0;
         }
 
-        uint64_t PdxReaderWithTypeCollector::ReadUInt64(String^ fieldName)
+        System::UInt64 PdxReaderWithTypeCollector::ReadUInt64(String^ fieldName)
         {
           checkType(fieldName, PdxTypes::LONG, "long");
           m_newPdxType->AddFixedLengthTypeField(fieldName, "long", PdxTypes::LONG, GeodeClassIds::LONG_SIZE);

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/PdxReaderWithTypeCollector.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxReaderWithTypeCollector.hpp b/src/clicache/src/impl/PdxReaderWithTypeCollector.hpp
index eeaec60..8df1219 100644
--- a/src/clicache/src/impl/PdxReaderWithTypeCollector.hpp
+++ b/src/clicache/src/impl/PdxReaderWithTypeCollector.hpp
@@ -79,19 +79,19 @@ namespace Apache
         /// Read a 16-bit unsigned integer from the stream.
         /// </summary>
         /// <param name="fieldName">The name of a member field whose value to read.</param>
-        virtual uint16_t ReadUInt16( String^ fieldName )override;
+        virtual System::UInt16 ReadUInt16( String^ fieldName )override;
 
         /// <summary>
         /// Read a 32-bit unsigned integer from the stream.
         /// </summary>
         /// <param name="fieldName">The name of a member field whose value to read.</param>
-        virtual uint32_t ReadUInt32( String^ fieldName )override;
+        virtual System::UInt32 ReadUInt32( String^ fieldName )override;
         
         /// <summary>
         /// Read a 64-bit unsigned integer from the stream.
         /// </summary>
         /// <param name="fieldName">The name of a member field whose value to read.</param>
-        virtual uint64_t ReadUInt64( String^ fieldName )override;
+        virtual System::UInt64 ReadUInt64( String^ fieldName )override;
 
         /// <summary>
         /// Read a 16-bit integer from the stream.
@@ -103,7 +103,7 @@ namespace Apache
         /// Read a 32-bit integer from the stream.
         /// </summary>
         /// <param name="fieldName">The name of a member field whose value to read.</param>
-        virtual int32_t ReadInt( String^ fieldName )override;
+        virtual System::Int32 ReadInt( String^ fieldName )override;
 
         /// <summary>
         /// Read a 64-bit integer from the stream.

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/PdxRemotePreservedData.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxRemotePreservedData.hpp b/src/clicache/src/impl/PdxRemotePreservedData.hpp
index dc979be..d2fa725 100644
--- a/src/clicache/src/impl/PdxRemotePreservedData.hpp
+++ b/src/clicache/src/impl/PdxRemotePreservedData.hpp
@@ -116,4 +116,4 @@ namespace Apache
   }  // namespace Geode
 }  // namespace Apache
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/PdxRemoteReader.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxRemoteReader.cpp b/src/clicache/src/impl/PdxRemoteReader.cpp
index 488137c..297fddb 100644
--- a/src/clicache/src/impl/PdxRemoteReader.cpp
+++ b/src/clicache/src/impl/PdxRemoteReader.cpp
@@ -131,7 +131,7 @@ namespace Apache
           }
         }
         
-        uint16_t PdxRemoteReader::ReadUInt16( String^ fieldName )
+        System::UInt16 PdxRemoteReader::ReadUInt16( String^ fieldName )
         {
           int choice = m_localToRemoteMap[m_currentIndex++];
 
@@ -155,7 +155,7 @@ namespace Apache
           }
         }
 
-        uint32_t PdxRemoteReader::ReadUInt32( String^ fieldName )
+        System::UInt32 PdxRemoteReader::ReadUInt32( String^ fieldName )
         {
           int choice = m_localToRemoteMap[m_currentIndex++];
 
@@ -179,7 +179,7 @@ namespace Apache
           }
         }
         
-        uint64_t PdxRemoteReader::ReadUInt64( String^ fieldName )
+        System::UInt64 PdxRemoteReader::ReadUInt64( String^ fieldName )
         {
           int choice = m_localToRemoteMap[m_currentIndex++];
 
@@ -844,4 +844,4 @@ namespace Apache
   }  // namespace Geode
 }  // namespace Apache
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/PdxRemoteReader.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxRemoteReader.hpp b/src/clicache/src/impl/PdxRemoteReader.hpp
index 95e05c2..86e4a9d 100644
--- a/src/clicache/src/impl/PdxRemoteReader.hpp
+++ b/src/clicache/src/impl/PdxRemoteReader.hpp
@@ -76,19 +76,19 @@ namespace Apache
         /// Read a 16-bit unsigned integer from the stream.
         /// </summary>
         /// <param name="fieldName">The name of a member field whose value to read.</param>
-        virtual uint16_t ReadUInt16( String^ fieldName )override;
+        virtual System::UInt16 ReadUInt16( String^ fieldName )override;
 
         /// <summary>
         /// Read a 32-bit unsigned integer from the stream.
         /// </summary>
         /// <param name="fieldName">The name of a member field whose value to read.</param>
-        virtual uint32_t ReadUInt32( String^ fieldName )override;
+        virtual System::UInt32 ReadUInt32( String^ fieldName )override;
         
         /// <summary>
         /// Read a 64-bit unsigned integer from the stream.
         /// </summary>
         /// <param name="fieldName">The name of a member field whose value to read.</param>
-        virtual uint64_t ReadUInt64( String^ fieldName )override;
+        virtual System::UInt64 ReadUInt64( String^ fieldName )override;
 
         /// <summary>
         /// Read a 16-bit integer from the stream.
@@ -100,7 +100,7 @@ namespace Apache
         /// Read a 32-bit integer from the stream.
         /// </summary>
         /// <param name="fieldName">The name of a member field whose value to read.</param>
-        virtual int32_t ReadInt( String^ fieldName )override;
+        virtual System::Int32 ReadInt( String^ fieldName )override;
 
         /// <summary>
         /// Read a 64-bit integer from the stream.

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/PdxRemoteWriter.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxRemoteWriter.cpp b/src/clicache/src/impl/PdxRemoteWriter.cpp
index e55abad..515429e 100644
--- a/src/clicache/src/impl/PdxRemoteWriter.cpp
+++ b/src/clicache/src/impl/PdxRemoteWriter.cpp
@@ -114,7 +114,7 @@ namespace Apache
           return this;
         }
 
-        IPdxWriter^ PdxRemoteWriter::WriteUInt16(String^ fieldName, uint16_t value)
+        IPdxWriter^ PdxRemoteWriter::WriteUInt16(String^ fieldName, System::UInt16 value)
         {
           writePreserveData();
           PdxLocalWriter::WriteUInt16(fieldName, value);
@@ -122,7 +122,7 @@ namespace Apache
 
         }
 
-        IPdxWriter^ PdxRemoteWriter::WriteUInt32(String^ fieldName, uint32_t value)
+        IPdxWriter^ PdxRemoteWriter::WriteUInt32(String^ fieldName, System::UInt32 value)
         {
           writePreserveData();
           PdxLocalWriter::WriteUInt32(fieldName, value);
@@ -130,7 +130,7 @@ namespace Apache
 
         }
 
-        IPdxWriter^ PdxRemoteWriter::WriteUInt64(String^ fieldName, uint64_t value)
+        IPdxWriter^ PdxRemoteWriter::WriteUInt64(String^ fieldName, System::UInt64 value)
         {
           writePreserveData();
           PdxLocalWriter::WriteUInt64(fieldName, value);
@@ -138,14 +138,14 @@ namespace Apache
 
         }
 
-        IPdxWriter^ PdxRemoteWriter::WriteShort(String^ fieldName, int16_t value)
+        IPdxWriter^ PdxRemoteWriter::WriteShort(String^ fieldName, System::Int16 value)
         {
           writePreserveData();
           PdxLocalWriter::WriteShort(fieldName, value);
           return this;
         }
 
-        IPdxWriter^ PdxRemoteWriter::WriteInt(String^ fieldName, int32_t value)
+        IPdxWriter^ PdxRemoteWriter::WriteInt(String^ fieldName, System::Int32 value)
         {
           writePreserveData();
           PdxLocalWriter::WriteInt(fieldName, value);

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/PdxRemoteWriter.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxRemoteWriter.hpp b/src/clicache/src/impl/PdxRemoteWriter.hpp
index eda54ef..13af9fb 100644
--- a/src/clicache/src/impl/PdxRemoteWriter.hpp
+++ b/src/clicache/src/impl/PdxRemoteWriter.hpp
@@ -106,25 +106,25 @@ namespace Apache
           virtual IPdxWriter^ WriteChar( String^ fieldName, Char value ) override;
 
           /// <summary>
-          /// Write an unsigned short integer (int16_t) to the <c>IPdxWriter</c>.
+          /// Write an unsigned short integer (System::Int16) to the <c>IPdxWriter</c>.
           /// </summary>
           /// <param name="fieldName">The name of the field associated with the value.</param>
           /// <param name="value">The unsigned 16-bit integer to write.</param>
-          virtual IPdxWriter^ WriteUInt16( String^ fieldName, uint16_t value ) override;
+          virtual IPdxWriter^ WriteUInt16( String^ fieldName, System::UInt16 value ) override;
 
           /// <summary>
           /// Write an unsigned 32-bit integer to the <c>IPdxWriter</c>.
           /// </summary>
           /// <param name="fieldName">The name of the field associated with the value.</param>
           /// <param name="value">The unsigned 32-bit integer to write.</param>
-          virtual IPdxWriter^ WriteUInt32( String^ fieldName, uint32_t value ) override;
+          virtual IPdxWriter^ WriteUInt32( String^ fieldName, System::UInt32 value ) override;
 
           /// <summary>
           /// Write an unsigned 64-bit integer to the <c>IPdxWriter</c>.
           /// </summary>
           /// <param name="fieldName">The name of the field associated with the value.</param>
           /// <param name="value">The unsigned 64-bit integer to write.</param>
-          virtual IPdxWriter^ WriteUInt64( String^ fieldName, uint64_t value ) override;
+          virtual IPdxWriter^ WriteUInt64( String^ fieldName, System::UInt64 value ) override;
 
           /// <summary>
           /// Write a 16-bit integer to the <c>IPdxWriter</c>.
@@ -138,7 +138,7 @@ namespace Apache
           /// </summary>
           /// <param name="fieldName">The name of the field associated with the value.</param>
           /// <param name="value">The 32-bit integer to write.</param>
-          virtual IPdxWriter^ WriteInt( String^ fieldName, int32_t value ) override;
+          virtual IPdxWriter^ WriteInt( String^ fieldName, System::Int32 value ) override;
 
           /// <summary>
           /// Write a 64-bit integer to the <c>IPdxWriter</c>.

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/PdxType.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxType.cpp b/src/clicache/src/impl/PdxType.cpp
index 4b3fb1b..7b366a8 100644
--- a/src/clicache/src/impl/PdxType.cpp
+++ b/src/clicache/src/impl/PdxType.cpp
@@ -140,7 +140,7 @@ namespace Apache
 
         }
 
-        Int32 PdxType::GetFieldPosition(String^ fieldName, uint8_t* offsetPosition, Int32 offsetSize, Int32 pdxStreamlen)
+        Int32 PdxType::GetFieldPosition(String^ fieldName, System::Byte* offsetPosition, Int32 offsetSize, Int32 pdxStreamlen)
         {
           PdxFieldType^ pft = nullptr;
           m_fieldNameVsPdxType->TryGetValue(fieldName, pft);
@@ -156,7 +156,7 @@ namespace Apache
           return -1;
         }
 
-        Int32 PdxType::GetFieldPosition(Int32 fieldIdx, uint8_t* offsetPosition, Int32 offsetSize, Int32 pdxStreamlen)
+        Int32 PdxType::GetFieldPosition(Int32 fieldIdx, System::Byte* offsetPosition, Int32 offsetSize, Int32 pdxStreamlen)
         {
           PdxFieldType^ pft = m_pdxFieldTypes[fieldIdx];
 
@@ -171,7 +171,7 @@ namespace Apache
           return -1;
         }
 
-        Int32 PdxType::variableLengthFieldPosition(PdxFieldType^ varLenField, uint8_t* offsetPosition, Int32 offsetSize, Int32 pdxStreamlen)
+        Int32 PdxType::variableLengthFieldPosition(PdxFieldType^ varLenField, System::Byte* offsetPosition, Int32 offsetSize, Int32 pdxStreamlen)
         {
           int seqId = varLenField->SequenceId;
 
@@ -187,7 +187,7 @@ namespace Apache
 
         }
 
-        Int32 PdxType::fixedLengthFieldPosition(PdxFieldType^ fixLenField, uint8_t* offsetPosition, Int32 offsetSize, Int32 pdxStreamlen)
+        Int32 PdxType::fixedLengthFieldPosition(PdxFieldType^ fixLenField, System::Byte* offsetPosition, Int32 offsetSize, Int32 pdxStreamlen)
         {
           int seqId = fixLenField->SequenceId;
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/PdxType.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxType.hpp b/src/clicache/src/impl/PdxType.hpp
index df7bd6c..63b1cf2 100644
--- a/src/clicache/src/impl/PdxType.hpp
+++ b/src/clicache/src/impl/PdxType.hpp
@@ -69,8 +69,8 @@ namespace Apache
           PdxType^ clone();
 
           void generatePositionMap();
-          Int32 variableLengthFieldPosition(PdxFieldType^ varLenField, uint8_t* offsetPosition, Int32 offsetSize, Int32 pdxStreamlen);
-          Int32 fixedLengthFieldPosition(PdxFieldType^ fixLenField, uint8_t* offsetPosition, Int32 offsetSize, Int32 pdxStreamlen);
+          Int32 variableLengthFieldPosition(PdxFieldType^ varLenField, System::Byte* offsetPosition, Int32 offsetSize, Int32 pdxStreamlen);
+          Int32 fixedLengthFieldPosition(PdxFieldType^ fixLenField, System::Byte* offsetPosition, Int32 offsetSize, Int32 pdxStreamlen);
 
           PdxType^ isLocalTypeContains(PdxType^ otherType);
           PdxType^ isRemoteTypeContains(PdxType^ localType);
@@ -172,13 +172,13 @@ namespace Apache
           }
           virtual void ToData(DataOutput^ output);
           virtual IGeodeSerializable^ FromData(DataInput^ input);
-          virtual property uint32_t ObjectSize
+          virtual property System::UInt32 ObjectSize
           {
-            uint32_t get(){ return 0; }
+            System::UInt32 get(){ return 0; }
           }
-          virtual property uint32_t ClassId
+          virtual property System::UInt32 ClassId
           {
-            uint32_t get(){ return GeodeClassIds::PdxType; }
+            System::UInt32 get(){ return GeodeClassIds::PdxType; }
           }
           virtual String^ ToString() override
           {
@@ -188,8 +188,8 @@ namespace Apache
           void AddVariableLengthTypeField(String^ fieldName, String^ className, Byte typeId);
           void InitializeType();
           PdxType^ MergeVersion(PdxType^ otherVersion);
-          Int32 GetFieldPosition(String^ fieldName, uint8_t* offsetPosition, Int32 offsetSize, Int32 pdxStreamlen);
-          Int32 GetFieldPosition(Int32 fieldIdx, uint8_t* offsetPosition, Int32 offsetSize, Int32 pdxStreamlen);
+          Int32 GetFieldPosition(String^ fieldName, System::Byte* offsetPosition, Int32 offsetSize, Int32 pdxStreamlen);
+          Int32 GetFieldPosition(Int32 fieldIdx, System::Byte* offsetPosition, Int32 offsetSize, Int32 pdxStreamlen);
 
           virtual bool Equals(Object^ otherType) override;
           virtual Int32 GetHashCode() override;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/PdxTypeRegistry.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxTypeRegistry.cpp b/src/clicache/src/impl/PdxTypeRegistry.cpp
index c1c7834..dae9c5f 100644
--- a/src/clicache/src/impl/PdxTypeRegistry.cpp
+++ b/src/clicache/src/impl/PdxTypeRegistry.cpp
@@ -314,4 +314,4 @@ namespace Apache
 }  // namespace Apache
 
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/PdxTypeRegistry.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxTypeRegistry.hpp b/src/clicache/src/impl/PdxTypeRegistry.hpp
index 7aa6738..e45d7a5 100644
--- a/src/clicache/src/impl/PdxTypeRegistry.hpp
+++ b/src/clicache/src/impl/PdxTypeRegistry.hpp
@@ -108,4 +108,4 @@ namespace Apache
   }  // namespace Geode
 }  // namespace Apache
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/PdxWriterWithTypeCollector.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxWriterWithTypeCollector.cpp b/src/clicache/src/impl/PdxWriterWithTypeCollector.cpp
index ba208dd..0c180aa 100644
--- a/src/clicache/src/impl/PdxWriterWithTypeCollector.cpp
+++ b/src/clicache/src/impl/PdxWriterWithTypeCollector.cpp
@@ -127,35 +127,35 @@ namespace Apache
           return this;
         }
 
-        IPdxWriter^ PdxWriterWithTypeCollector::WriteUInt16(String^ fieldName, uint16_t value)
+        IPdxWriter^ PdxWriterWithTypeCollector::WriteUInt16(String^ fieldName, System::UInt16 value)
         {
           m_pdxType->AddFixedLengthTypeField(fieldName, "short", PdxTypes::SHORT, GeodeClassIds::SHORT_SIZE);
           PdxLocalWriter::WriteUInt16(fieldName, value);
           return this;
         }
 
-        IPdxWriter^ PdxWriterWithTypeCollector::WriteUInt32(String^ fieldName, uint32_t value)
+        IPdxWriter^ PdxWriterWithTypeCollector::WriteUInt32(String^ fieldName, System::UInt32 value)
         {
           m_pdxType->AddFixedLengthTypeField(fieldName, "int", PdxTypes::INT, GeodeClassIds::INTEGER_SIZE);
           PdxLocalWriter::WriteUInt32(fieldName, value);
           return this;
         }
 
-        IPdxWriter^ PdxWriterWithTypeCollector::WriteUInt64(String^ fieldName, uint64_t value)
+        IPdxWriter^ PdxWriterWithTypeCollector::WriteUInt64(String^ fieldName, System::UInt64 value)
         {
           m_pdxType->AddFixedLengthTypeField(fieldName, "long", PdxTypes::LONG, GeodeClassIds::LONG_SIZE);
           PdxLocalWriter::WriteUInt64(fieldName, value);
           return this;
         }
 
-        IPdxWriter^ PdxWriterWithTypeCollector::WriteShort(String^ fieldName, int16_t value)
+        IPdxWriter^ PdxWriterWithTypeCollector::WriteShort(String^ fieldName, System::Int16 value)
         {
           m_pdxType->AddFixedLengthTypeField(fieldName, "short", PdxTypes::SHORT, GeodeClassIds::SHORT_SIZE);
           PdxLocalWriter::WriteShort(fieldName, value);
           return this;
         }
 
-        IPdxWriter^ PdxWriterWithTypeCollector::WriteInt(String^ fieldName, int32_t value)
+        IPdxWriter^ PdxWriterWithTypeCollector::WriteInt(String^ fieldName, System::Int32 value)
         {
           m_pdxType->AddFixedLengthTypeField(fieldName, "int", PdxTypes::INT, GeodeClassIds::INTEGER_SIZE);
           PdxLocalWriter::WriteInt(fieldName, value);

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/PdxWriterWithTypeCollector.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxWriterWithTypeCollector.hpp b/src/clicache/src/impl/PdxWriterWithTypeCollector.hpp
index 429a9e1..e8d4ccb 100644
--- a/src/clicache/src/impl/PdxWriterWithTypeCollector.hpp
+++ b/src/clicache/src/impl/PdxWriterWithTypeCollector.hpp
@@ -95,25 +95,25 @@ namespace Apache
           virtual IPdxWriter^ WriteChar( String^ fieldName, Char value ) override;
 
           /// <summary>
-          /// Write an unsigned short integer (int16_t) to the <c>IPdxWriter</c>.
+          /// Write an unsigned short integer (System::Int16) to the <c>IPdxWriter</c>.
           /// </summary>
           /// <param name="fieldName">The name of the field associated with the value.</param>
           /// <param name="value">The unsigned 16-bit integer to write.</param>
-          virtual IPdxWriter^ WriteUInt16( String^ fieldName, uint16_t value ) override;
+          virtual IPdxWriter^ WriteUInt16( String^ fieldName, System::UInt16 value ) override;
 
           /// <summary>
           /// Write an unsigned 32-bit integer to the <c>IPdxWriter</c>.
           /// </summary>
           /// <param name="fieldName">The name of the field associated with the value.</param>
           /// <param name="value">The unsigned 32-bit integer to write.</param>
-          virtual IPdxWriter^ WriteUInt32( String^ fieldName, uint32_t value ) override;
+          virtual IPdxWriter^ WriteUInt32( String^ fieldName, System::UInt32 value ) override;
 
           /// <summary>
           /// Write an unsigned 64-bit integer to the <c>IPdxWriter</c>.
           /// </summary>
           /// <param name="fieldName">The name of the field associated with the value.</param>
           /// <param name="value">The unsigned 64-bit integer to write.</param>
-          virtual IPdxWriter^ WriteUInt64( String^ fieldName, uint64_t value ) override;
+          virtual IPdxWriter^ WriteUInt64( String^ fieldName, System::UInt64 value ) override;
 
           /// <summary>
           /// Write a 16-bit integer to the <c>IPdxWriter</c>.

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/impl/WeakhashMap.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/WeakhashMap.hpp b/src/clicache/src/impl/WeakhashMap.hpp
index 30a4a60..dcdfbdb 100644
--- a/src/clicache/src/impl/WeakhashMap.hpp
+++ b/src/clicache/src/impl/WeakhashMap.hpp
@@ -255,4 +255,4 @@ namespace Apache
   }  // namespace Geode
 }  // namespace Apache
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/cppcache/src/RegionStats.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RegionStats.hpp b/src/cppcache/src/RegionStats.hpp
index 87ebe18..c077b5f 100644
--- a/src/cppcache/src/RegionStats.hpp
+++ b/src/cppcache/src/RegionStats.hpp
@@ -129,7 +129,6 @@ class CPPCACHE_EXPORT RegionStats {
 
 class RegionStatType {
  private:
-  static int8_t instanceFlag;
   static RegionStatType* single;
   static SpinLock m_singletonLock;
   static SpinLock m_statTypeLock;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/cppcache/src/statistics/HostStatHelperWin.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/HostStatHelperWin.cpp b/src/cppcache/src/statistics/HostStatHelperWin.cpp
index c299b9b..4c97ebb 100644
--- a/src/cppcache/src/statistics/HostStatHelperWin.cpp
+++ b/src/cppcache/src/statistics/HostStatHelperWin.cpp
@@ -536,8 +536,8 @@ uint32_t HostStatHelperWin::getInt32Value(PPERF_COUNTER_DEFINITION PerfCntr,
 
   if (PerfCntr->CounterSize == 4) {
     uint32_t* lptr;
-    lptr = static_cast<uint32_t*>(static_cast<char*>(PerfCntrBlk) +
-                                  PerfCntr->CounterOffset);
+    lptr = reinterpret_cast<uint32_t*>(reinterpret_cast<char*>(PerfCntrBlk) +
+                                       PerfCntr->CounterOffset);
     if (PerfCntr->CounterType == PERF_RAW_FRACTION) {
       double fraction = (double)*lptr++;
       double base = (double)*lptr;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/cryptoimpl/SSLImpl.cpp
----------------------------------------------------------------------
diff --git a/src/cryptoimpl/SSLImpl.cpp b/src/cryptoimpl/SSLImpl.cpp
index d478c9c..775c2c7 100644
--- a/src/cryptoimpl/SSLImpl.cpp
+++ b/src/cryptoimpl/SSLImpl.cpp
@@ -22,6 +22,7 @@
 #include <ace/SSL/SSL_SOCK_Connector.h>
 #include <ace/SSL/SSL_SOCK_Acceptor.h>
 #include <ace/OS.h>
+#include <cstdint>
 
 ACE_Recursive_Thread_Mutex SSLImpl::s_mutex;
 volatile bool SSLImpl::s_initialized = false;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/dhimpl/DHImpl.cpp
----------------------------------------------------------------------
diff --git a/src/dhimpl/DHImpl.cpp b/src/dhimpl/DHImpl.cpp
index c86d49f..c86e618 100644
--- a/src/dhimpl/DHImpl.cpp
+++ b/src/dhimpl/DHImpl.cpp
@@ -29,6 +29,7 @@
 #include <openssl/rsa.h>
 #include <cstring>
 #include <cctype>
+#include <cstdint>
 
 static DH *m_dh = NULL;
 static std::string m_skAlgo;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/tests/cpp/fwklib/IpcHandler.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/IpcHandler.hpp b/src/tests/cpp/fwklib/IpcHandler.hpp
index 74554d0..17ec608 100644
--- a/src/tests/cpp/fwklib/IpcHandler.hpp
+++ b/src/tests/cpp/fwklib/IpcHandler.hpp
@@ -25,6 +25,7 @@
 
 #include <geode/geode_base.hpp>
 
+#include <cstdint>
 #include <string>
 
 namespace apache {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/tests/cpp/fwklib/TcpIpc.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/TcpIpc.hpp b/src/tests/cpp/fwklib/TcpIpc.hpp
index 2c2fc41..cd7f969 100644
--- a/src/tests/cpp/fwklib/TcpIpc.hpp
+++ b/src/tests/cpp/fwklib/TcpIpc.hpp
@@ -23,6 +23,7 @@
 #include <geode/geode_base.hpp>
 #include <ace/SOCK_Stream.h>
 #include <ace/SOCK_Acceptor.h>
+#include <cstdint>
 #include <string>
 
 namespace apache {


Mime
View raw message