geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [8/8] geode-native git commit: GEODE-2439: Remove C++ fixed width integers from clicache
Date Fri, 24 Feb 2017 03:39:29 GMT
GEODE-2439: Remove C++ fixed width integers from clicache

This closes #27.


Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/391d79b9
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/391d79b9
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/391d79b9

Branch: refs/heads/develop
Commit: 391d79b97c25e5b710a2880dac89312abee636b8
Parents: fd20447
Author: David Kimura <dkimura@pivotal.io>
Authored: Thu Feb 23 12:41:21 2017 -0800
Committer: Jacob Barrett <jbarrett@pivotal.io>
Committed: Thu Feb 23 19:37:46 2017 -0800

----------------------------------------------------------------------
 src/clicache/include/gfcli/Utils.hpp            |   4 +-
 src/clicache/src/AttributesFactory.cpp          |  14 +--
 src/clicache/src/AttributesFactory.hpp          |  14 +--
 src/clicache/src/AttributesMutator.cpp          |  10 +-
 src/clicache/src/AttributesMutator.hpp          |  10 +-
 src/clicache/src/Cache.cpp                      |   2 +-
 src/clicache/src/CacheStatistics.cpp            |   4 +-
 src/clicache/src/CacheStatistics.hpp            |   8 +-
 src/clicache/src/CacheTransactionManager.cpp    |   2 +-
 src/clicache/src/CacheTransactionManager.hpp    |   2 +-
 src/clicache/src/CacheableArrayList.hpp         |   4 +-
 src/clicache/src/CacheableBuiltins.hpp          |  46 ++++----
 src/clicache/src/CacheableDate.cpp              |  18 ++--
 src/clicache/src/CacheableDate.hpp              |  10 +-
 src/clicache/src/CacheableFileName.cpp          |  12 +--
 src/clicache/src/CacheableFileName.hpp          |  10 +-
 src/clicache/src/CacheableHashMap.cpp           |   2 +-
 src/clicache/src/CacheableHashMap.hpp           |   8 +-
 src/clicache/src/CacheableHashSet.hpp           |  38 +++----
 src/clicache/src/CacheableHashTable.hpp         |   6 +-
 src/clicache/src/CacheableIdentityHashMap.hpp   |   8 +-
 src/clicache/src/CacheableKey.cpp               |   8 +-
 src/clicache/src/CacheableKey.hpp               |   8 +-
 src/clicache/src/CacheableLinkedList.hpp        |  12 +--
 src/clicache/src/CacheableObject.cpp            |  10 +-
 src/clicache/src/CacheableObject.hpp            |  10 +-
 src/clicache/src/CacheableObjectArray.cpp       |  16 +--
 src/clicache/src/CacheableObjectArray.hpp       |  12 +--
 src/clicache/src/CacheableObjectXml.cpp         |  10 +-
 src/clicache/src/CacheableObjectXml.hpp         |  10 +-
 src/clicache/src/CacheableStack.cpp             |   8 +-
 src/clicache/src/CacheableStack.hpp             |   8 +-
 src/clicache/src/CacheableString.cpp            |  14 +--
 src/clicache/src/CacheableString.hpp            |  18 ++--
 src/clicache/src/CacheableStringArray.cpp       |   2 +-
 src/clicache/src/CacheableStringArray.hpp       |  18 ++--
 src/clicache/src/CacheableUndefined.cpp         |   4 +-
 src/clicache/src/CacheableUndefined.hpp         |   8 +-
 src/clicache/src/CacheableVector.cpp            |   4 +-
 src/clicache/src/CacheableVector.hpp            |   8 +-
 src/clicache/src/CqAttributes.cpp               |   2 +-
 src/clicache/src/CqQuery.cpp                    |   2 +-
 src/clicache/src/CqQuery.hpp                    |   2 +-
 src/clicache/src/CqServiceStatistics.cpp        |  10 +-
 src/clicache/src/CqServiceStatistics.hpp        |  10 +-
 src/clicache/src/CqStatistics.cpp               |   8 +-
 src/clicache/src/CqStatistics.hpp               |   8 +-
 src/clicache/src/DataInput.cpp                  | 108 +++++++++----------
 src/clicache/src/DataInput.hpp                  |  54 +++++-----
 src/clicache/src/DataOutput.cpp                 |  96 ++++++++---------
 src/clicache/src/DataOutput.hpp                 |  88 +++++++--------
 src/clicache/src/ExceptionTypes.cpp             |   4 +-
 src/clicache/src/GeodeClassIds.hpp              |  90 ++++++++--------
 src/clicache/src/ICacheableKey.hpp              |   2 +-
 src/clicache/src/IGeodeSerializable.hpp         |   8 +-
 src/clicache/src/IRegion.hpp                    |   6 +-
 src/clicache/src/ISelectResults.hpp             |   4 +-
 src/clicache/src/LocalRegion.cpp                |  20 ++--
 src/clicache/src/LocalRegion.hpp                |   6 +-
 src/clicache/src/Log.cpp                        |   2 +-
 src/clicache/src/Log.hpp                        |   2 +-
 src/clicache/src/Properties.cpp                 |  10 +-
 src/clicache/src/Properties.hpp                 |  12 +--
 src/clicache/src/Query.cpp                      |   4 +-
 src/clicache/src/Query.hpp                      |   4 +-
 src/clicache/src/QueryService.cpp               |   2 +-
 .../src/ReflectionBasedAutoSerializer.cpp       |   2 +-
 src/clicache/src/Region.cpp                     |  28 ++---
 src/clicache/src/Region.hpp                     |   6 +-
 src/clicache/src/RegionAttributes.cpp           |  14 +--
 src/clicache/src/RegionAttributes.hpp           |  36 +++----
 src/clicache/src/RegionFactory.cpp              |  14 +--
 src/clicache/src/RegionFactory.hpp              |  14 +--
 src/clicache/src/ResultCollector.cpp            |   2 +-
 src/clicache/src/ResultSet.cpp                  |   6 +-
 src/clicache/src/ResultSet.hpp                  |   4 +-
 src/clicache/src/Serializable.cpp               |  86 +++++++--------
 src/clicache/src/Serializable.hpp               |  46 ++++----
 src/clicache/src/StatisticDescriptor.cpp        |   2 +-
 src/clicache/src/StatisticDescriptor.hpp        |   4 +-
 src/clicache/src/Statistics.cpp                 |  50 ++++-----
 src/clicache/src/Statistics.hpp                 |  54 +++++-----
 src/clicache/src/StatisticsFactory.cpp          |  10 +-
 src/clicache/src/StatisticsFactory.hpp          |  10 +-
 src/clicache/src/StatisticsType.cpp             |   4 +-
 src/clicache/src/StatisticsType.hpp             |   6 +-
 src/clicache/src/Struct.cpp                     |   4 +-
 src/clicache/src/StructSet.cpp                  |   8 +-
 src/clicache/src/StructSet.hpp                  |   4 +-
 src/clicache/src/SystemProperties.cpp           |  30 +++---
 src/clicache/src/SystemProperties.hpp           |  60 +++++------
 src/clicache/src/TransactionEvent.cpp           |   2 +-
 .../src/UserFunctionExecutionException.cpp      |   2 +-
 .../src/UserFunctionExecutionException.hpp      |   8 +-
 src/clicache/src/Utils.cpp                      |   2 +-
 src/clicache/src/impl/AuthenticatedCache.cpp    |   2 +-
 src/clicache/src/impl/DotNetTypes.hpp           |   2 +-
 src/clicache/src/impl/EnumInfo.hpp              |   8 +-
 src/clicache/src/impl/GeodeDataInputStream.hpp  |  26 ++---
 src/clicache/src/impl/GeodeDataOutputStream.hpp |  22 ++--
 src/clicache/src/impl/GeodeNullStream.hpp       |  18 ++--
 src/clicache/src/impl/ManagedAuthInitialize.cpp |   2 +-
 src/clicache/src/impl/ManagedCacheListener.cpp  |   8 +-
 src/clicache/src/impl/ManagedCacheLoader.cpp    |   8 +-
 src/clicache/src/impl/ManagedCacheWriter.cpp    |   8 +-
 src/clicache/src/impl/ManagedCacheableDelta.cpp |  14 +--
 src/clicache/src/impl/ManagedCacheableDelta.hpp |   6 +-
 .../src/impl/ManagedCacheableDeltaBytes.cpp     |  18 ++--
 .../src/impl/ManagedCacheableDeltaBytes.hpp     |  12 +--
 src/clicache/src/impl/ManagedCacheableKey.cpp   |  10 +-
 src/clicache/src/impl/ManagedCacheableKey.hpp   |   6 +-
 .../src/impl/ManagedCacheableKeyBytes.cpp       |  24 ++---
 .../src/impl/ManagedCacheableKeyBytes.hpp       |  12 +--
 src/clicache/src/impl/ManagedCqListener.cpp     |   2 +-
 .../src/impl/ManagedCqStatusListener.cpp        |   2 +-
 .../src/impl/ManagedFixedPartitionResolver.cpp  |   8 +-
 .../src/impl/ManagedPartitionResolver.cpp       |   8 +-
 .../src/impl/ManagedPersistenceManager.cpp      |   8 +-
 .../src/impl/ManagedResultCollector.cpp         |   2 +-
 .../src/impl/ManagedResultCollector.hpp         |   2 +-
 .../src/impl/ManagedTransactionListener.cpp     |   8 +-
 .../src/impl/ManagedTransactionWriter.cpp       |   8 +-
 src/clicache/src/impl/MemoryPressureHandler.cpp |  10 +-
 src/clicache/src/impl/PdxFieldType.hpp          |   8 +-
 src/clicache/src/impl/PdxHelper.cpp             |  36 +++----
 src/clicache/src/impl/PdxHelper.hpp             |  16 +--
 .../src/impl/PdxInstanceFactoryImpl.cpp         |   2 +-
 src/clicache/src/impl/PdxInstanceImpl.cpp       |   8 +-
 src/clicache/src/impl/PdxInstanceImpl.hpp       |   6 +-
 src/clicache/src/impl/PdxLocalReader.cpp        |   8 +-
 src/clicache/src/impl/PdxLocalReader.hpp        |  10 +-
 src/clicache/src/impl/PdxLocalWriter.cpp        |  18 ++--
 src/clicache/src/impl/PdxLocalWriter.hpp        |  12 +--
 .../src/impl/PdxManagedCacheableKey.cpp         |  10 +-
 .../src/impl/PdxManagedCacheableKey.hpp         |   6 +-
 .../src/impl/PdxManagedCacheableKeyBytes.cpp    |  22 ++--
 .../src/impl/PdxManagedCacheableKeyBytes.hpp    |  12 +--
 .../src/impl/PdxReaderWithTypeCollector.cpp     |   6 +-
 .../src/impl/PdxReaderWithTypeCollector.hpp     |   8 +-
 .../src/impl/PdxRemotePreservedData.hpp         |   2 +-
 src/clicache/src/impl/PdxRemoteReader.cpp       |   8 +-
 src/clicache/src/impl/PdxRemoteReader.hpp       |   8 +-
 src/clicache/src/impl/PdxRemoteWriter.cpp       |  10 +-
 src/clicache/src/impl/PdxRemoteWriter.hpp       |  10 +-
 src/clicache/src/impl/PdxType.cpp               |   8 +-
 src/clicache/src/impl/PdxType.hpp               |  16 +--
 src/clicache/src/impl/PdxTypeRegistry.cpp       |   2 +-
 src/clicache/src/impl/PdxTypeRegistry.hpp       |   2 +-
 .../src/impl/PdxWriterWithTypeCollector.cpp     |  10 +-
 .../src/impl/PdxWriterWithTypeCollector.hpp     |   8 +-
 src/clicache/src/impl/WeakhashMap.hpp           |   2 +-
 src/cppcache/src/RegionStats.hpp                |   1 -
 .../src/statistics/HostStatHelperWin.cpp        |   4 +-
 src/cryptoimpl/SSLImpl.cpp                      |   1 +
 src/dhimpl/DHImpl.cpp                           |   1 +
 src/tests/cpp/fwklib/IpcHandler.hpp             |   1 +
 src/tests/cpp/fwklib/TcpIpc.hpp                 |   1 +
 157 files changed, 1026 insertions(+), 1023 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/include/gfcli/Utils.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/include/gfcli/Utils.hpp b/src/clicache/include/gfcli/Utils.hpp
index 221fef7..86808f7 100644
--- a/src/clicache/include/gfcli/Utils.hpp
+++ b/src/clicache/include/gfcli/Utils.hpp
@@ -77,9 +77,9 @@ namespace Apache
 					/// <summary>
 					/// Utility method to get the calling thread's last system error code.
 					/// </summary>
-					static property int32_t LastError
+					static property System::Int32 LastError
 					{
-						int32_t get( );
+						System::Int32 get( );
 					}
 				};
     }  // namespace Client

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/AttributesFactory.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/AttributesFactory.cpp b/src/clicache/src/AttributesFactory.cpp
index a603be1..f3ab002 100644
--- a/src/clicache/src/AttributesFactory.cpp
+++ b/src/clicache/src/AttributesFactory.cpp
@@ -169,28 +169,28 @@ namespace Apache
       // EXPIRATION ATTRIBUTES
 
       generic<class TKey, class TValue>
-      void AttributesFactory<TKey, TValue>::SetEntryIdleTimeout( ExpirationAction action, uint32_t idleTimeout )
+      void AttributesFactory<TKey, TValue>::SetEntryIdleTimeout( ExpirationAction action, System::UInt32 idleTimeout )
       {
         NativePtr->setEntryIdleTimeout(
           static_cast<apache::geode::client::ExpirationAction::Action>( action ), idleTimeout );
       }
 
       generic<class TKey, class TValue>
-      void AttributesFactory<TKey, TValue>::SetEntryTimeToLive( ExpirationAction action, uint32_t timeToLive )
+      void AttributesFactory<TKey, TValue>::SetEntryTimeToLive( ExpirationAction action, System::UInt32 timeToLive )
       {
         NativePtr->setEntryTimeToLive(
           static_cast<apache::geode::client::ExpirationAction::Action>( action ), timeToLive );
       }
 
       generic<class TKey, class TValue>
-      void AttributesFactory<TKey, TValue>::SetRegionIdleTimeout( ExpirationAction action, uint32_t idleTimeout )
+      void AttributesFactory<TKey, TValue>::SetRegionIdleTimeout( ExpirationAction action, System::UInt32 idleTimeout )
       {
         NativePtr->setRegionIdleTimeout(
           static_cast<apache::geode::client::ExpirationAction::Action>( action ), idleTimeout );
       }
 
       generic<class TKey, class TValue>
-      void AttributesFactory<TKey, TValue>::SetRegionTimeToLive( ExpirationAction action, uint32_t timeToLive )
+      void AttributesFactory<TKey, TValue>::SetRegionTimeToLive( ExpirationAction action, System::UInt32 timeToLive )
       {
         NativePtr->setRegionTimeToLive(
           static_cast<apache::geode::client::ExpirationAction::Action>( action ), timeToLive );
@@ -253,7 +253,7 @@ namespace Apache
       // MAP ATTRIBUTES
 
       generic<class TKey, class TValue>
-      void AttributesFactory<TKey, TValue>::SetInitialCapacity( int32_t initialCapacity )
+      void AttributesFactory<TKey, TValue>::SetInitialCapacity( System::Int32 initialCapacity )
       {
         _GF_MG_EXCEPTION_TRY2/* due to auto replace */
 
@@ -273,7 +273,7 @@ namespace Apache
       }
 
       generic<class TKey, class TValue>
-      void AttributesFactory<TKey, TValue>::SetConcurrencyLevel( int32_t concurrencyLevel )
+      void AttributesFactory<TKey, TValue>::SetConcurrencyLevel( System::Int32 concurrencyLevel )
       {
         _GF_MG_EXCEPTION_TRY2/* due to auto replace */
 
@@ -283,7 +283,7 @@ namespace Apache
       }
 
       generic<class TKey, class TValue>
-      void AttributesFactory<TKey, TValue>::SetLruEntriesLimit( uint32_t entriesLimit )
+      void AttributesFactory<TKey, TValue>::SetLruEntriesLimit( System::UInt32 entriesLimit )
       {
         NativePtr->setLruEntriesLimit( entriesLimit );
       }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/AttributesFactory.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/AttributesFactory.hpp b/src/clicache/src/AttributesFactory.hpp
index f9901c8..870ceae 100644
--- a/src/clicache/src/AttributesFactory.hpp
+++ b/src/clicache/src/AttributesFactory.hpp
@@ -289,7 +289,7 @@ namespace Apache
         /// <param name="idleTimeout">
         /// the idleTimeout in seconds for entries in this region.
         /// </param>
-        void SetEntryIdleTimeout( ExpirationAction action, uint32_t idleTimeout );
+        void SetEntryIdleTimeout( ExpirationAction action, System::UInt32 idleTimeout );
 
         /// <summary>
         /// Sets the timeToLive expiration attributes for region entries for the next
@@ -301,7 +301,7 @@ namespace Apache
         /// <param name="timeToLive">
         /// the timeToLive in seconds for entries in this region.
         /// </param>
-        void SetEntryTimeToLive( ExpirationAction action, uint32_t timeToLive );
+        void SetEntryTimeToLive( ExpirationAction action, System::UInt32 timeToLive );
 
         /// <summary>
         /// Sets the idleTimeout expiration attributes for the region itself for the
@@ -313,7 +313,7 @@ namespace Apache
         /// <param name="idleTimeout">
         /// the idleTimeout in seconds for the region as a whole.
         /// </param>
-        void SetRegionIdleTimeout( ExpirationAction action, uint32_t idleTimeout );
+        void SetRegionIdleTimeout( ExpirationAction action, System::UInt32 idleTimeout );
 
         /// <summary>
         /// Sets the timeToLive expiration attributes for the region itself for the
@@ -325,7 +325,7 @@ namespace Apache
         /// <param name="timeToLive">
         /// the timeToLive in seconds for the region as a whole.
         /// </param>
-        void SetRegionTimeToLive( ExpirationAction action, uint32_t timeToLive );
+        void SetRegionTimeToLive( ExpirationAction action, System::UInt32 timeToLive );
 
 
         // PERSISTENCE
@@ -403,7 +403,7 @@ namespace Apache
         /// <exception cref="IllegalArgumentException">
         /// if initialCapacity is nonpositive
         /// </exception>
-        void SetInitialCapacity( int32_t initialCapacity );
+        void SetInitialCapacity( System::Int32 initialCapacity );
 
         /// <summary>
         /// Sets the entry load factor for the next <c>RegionAttributes</c>
@@ -426,7 +426,7 @@ namespace Apache
         /// <exception cref="IllegalArgumentException">
         /// if concurrencyLevel is nonpositive
         /// </exception>
-        void SetConcurrencyLevel( int32_t concurrencyLevel );
+        void SetConcurrencyLevel( System::Int32 concurrencyLevel );
 
         /// <summary>
         /// Sets a limit on the number of entries that will be held in the cache.
@@ -437,7 +437,7 @@ namespace Apache
         /// The limit of the number of entries before eviction starts.
         /// Defaults to 0, meaning no LRU actions will used.
         /// </param>
-        void SetLruEntriesLimit( uint32_t entriesLimit );
+        void SetLruEntriesLimit( System::UInt32 entriesLimit );
 
         /// <summary>
         /// Sets the disk policy type for the next <c>RegionAttributes</c> created.

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/AttributesMutator.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/AttributesMutator.cpp b/src/clicache/src/AttributesMutator.cpp
index 73f6ca6..515f114 100644
--- a/src/clicache/src/AttributesMutator.cpp
+++ b/src/clicache/src/AttributesMutator.cpp
@@ -35,7 +35,7 @@ namespace Apache
     {
 
       generic<class TKey, class TValue>
-      int32_t AttributesMutator<TKey, TValue>::SetEntryIdleTimeout( int32_t idleTimeout )
+      System::Int32 AttributesMutator<TKey, TValue>::SetEntryIdleTimeout( System::Int32 idleTimeout )
       {
         return NativePtr->setEntryIdleTimeout( idleTimeout );
       }
@@ -50,7 +50,7 @@ namespace Apache
       }
 
       generic<class TKey, class TValue>
-      int32_t AttributesMutator<TKey, TValue>::SetEntryTimeToLive( int32_t timeToLive )
+      System::Int32 AttributesMutator<TKey, TValue>::SetEntryTimeToLive( System::Int32 timeToLive )
       {
         return NativePtr->setEntryTimeToLive( timeToLive );
       }
@@ -65,7 +65,7 @@ namespace Apache
       }
 
       generic<class TKey, class TValue>
-      int32_t AttributesMutator<TKey, TValue>::SetRegionIdleTimeout( int32_t idleTimeout )
+      System::Int32 AttributesMutator<TKey, TValue>::SetRegionIdleTimeout( System::Int32 idleTimeout )
       {
         return NativePtr->setRegionIdleTimeout( idleTimeout );
       }
@@ -80,7 +80,7 @@ namespace Apache
       }
 
       generic<class TKey, class TValue>
-      int32_t AttributesMutator<TKey, TValue>::SetRegionTimeToLive( int32_t timeToLive )
+      System::Int32 AttributesMutator<TKey, TValue>::SetRegionTimeToLive( System::Int32 timeToLive )
       {
         return NativePtr->setRegionTimeToLive( timeToLive );
       }
@@ -95,7 +95,7 @@ namespace Apache
       }
 
       generic<class TKey, class TValue>
-      uint32_t AttributesMutator<TKey, TValue>::SetLruEntriesLimit( uint32_t entriesLimit )
+      System::UInt32 AttributesMutator<TKey, TValue>::SetLruEntriesLimit( System::UInt32 entriesLimit )
       {
         return NativePtr->setLruEntriesLimit( entriesLimit );
       }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/AttributesMutator.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/AttributesMutator.hpp b/src/clicache/src/AttributesMutator.hpp
index 73af10e..43ce638 100644
--- a/src/clicache/src/AttributesMutator.hpp
+++ b/src/clicache/src/AttributesMutator.hpp
@@ -69,7 +69,7 @@ namespace Apache
         /// if the new idleTimeout changes entry expiration from
         /// disabled to enabled or enabled to disabled.
         /// </exception>
-        int32_t SetEntryIdleTimeout( int32_t idleTimeout );
+        System::Int32 SetEntryIdleTimeout( System::Int32 idleTimeout );
 
         /// <summary>
         /// Sets the idleTimeout action for region entries.
@@ -91,7 +91,7 @@ namespace Apache
         /// if the new timeToLive changes entry expiration from
         /// disabled to enabled or enabled to disabled
         /// </exception>
-        int32_t SetEntryTimeToLive( int32_t timeToLive );
+        System::Int32 SetEntryTimeToLive( System::Int32 timeToLive );
 
         /// <summary>
         /// Set the timeToLive action for region entries.
@@ -113,7 +113,7 @@ namespace Apache
         /// if the new idleTimeout changes region expiration from
         /// disabled to enabled or enabled to disabled.
         /// </exception>
-        int32_t SetRegionIdleTimeout( int32_t idleTimeout );
+        System::Int32 SetRegionIdleTimeout( System::Int32 idleTimeout );
 
         /// <summary>
         /// Sets the idleTimeout action for the region itself.
@@ -135,7 +135,7 @@ namespace Apache
         /// if the new timeToLive changes region expiration from
         /// disabled to enabled or enabled to disabled.
         /// </exception>
-        int32_t SetRegionTimeToLive( int32_t timeToLive );
+        System::Int32 SetRegionTimeToLive( System::Int32 timeToLive );
 
         /// <summary>
         /// Sets the timeToLive action for the region itself.
@@ -155,7 +155,7 @@ namespace Apache
         /// if the new entriesLimit changes LRU from
         /// disabled to enabled or enabled to disabled.
         /// </exception>
-        uint32_t SetLruEntriesLimit( uint32_t entriesLimit );
+        System::UInt32 SetLruEntriesLimit( System::UInt32 entriesLimit );
 
         /// <summary>
         /// Sets the CacheListener for the region.

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/Cache.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/Cache.cpp b/src/clicache/src/Cache.cpp
index 106f1e5..278aceb 100644
--- a/src/clicache/src/Cache.cpp
+++ b/src/clicache/src/Cache.cpp
@@ -133,7 +133,7 @@ namespace Apache
         array<Client::IRegion<TKey, TValue>^>^ rootRegions =
           gcnew array<Client::IRegion<TKey, TValue>^>( vrr.size( ) );
 
-        for( int32_t index = 0; index < vrr.size( ); index++ )
+        for( System::Int32 index = 0; index < vrr.size( ); index++ )
         {
           apache::geode::client::RegionPtr& nativeptr( vrr[ index ] );
           rootRegions[ index ] = Client::Region<TKey, TValue>::Create( nativeptr.ptr( ) );

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CacheStatistics.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheStatistics.cpp b/src/clicache/src/CacheStatistics.cpp
index 149467a..7edaeeb 100644
--- a/src/clicache/src/CacheStatistics.cpp
+++ b/src/clicache/src/CacheStatistics.cpp
@@ -26,12 +26,12 @@ namespace Apache
     namespace Client
     {
 
-      uint32_t CacheStatistics::LastModifiedTime::get( )
+      System::UInt32 CacheStatistics::LastModifiedTime::get( )
       {
         return NativePtr->getLastModifiedTime( );
       }
 
-      uint32_t CacheStatistics::LastAccessedTime::get( )
+      System::UInt32 CacheStatistics::LastAccessedTime::get( )
       {
         return NativePtr->getLastAccessedTime( );
     }  // namespace Client

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CacheStatistics.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheStatistics.hpp b/src/clicache/src/CacheStatistics.hpp
index 6405411..d91f1d5 100644
--- a/src/clicache/src/CacheStatistics.hpp
+++ b/src/clicache/src/CacheStatistics.hpp
@@ -73,7 +73,7 @@ namespace Apache
         /// <seealso cref="Region.Get" />
         /// <seealso cref="Region.Create" />
         /// <seealso cref="Region.CreateSubRegion" />
-        property uint32_t LastModifiedTime
+        property System::UInt32 LastModifiedTime
         {
           /// <summary>
           /// Get the last modified time of an entry or a region.
@@ -82,7 +82,7 @@ namespace Apache
           /// the last accessed time expressed as the number of milliseconds since
           /// January 1, 1970.
           /// </returns>
-          uint32_t get( );
+          System::UInt32 get( );
         }
 
         /// <summary>
@@ -108,7 +108,7 @@ namespace Apache
         /// </returns>
         /// <seealso cref="Region.Get" />
         /// <seealso cref="LastModifiedTime" />
-        property uint32_t LastAccessedTime
+        property System::UInt32 LastAccessedTime
         {
           /// <summary>
           /// Get the last accessed time of an entry or a region.
@@ -117,7 +117,7 @@ namespace Apache
           /// the last accessed time expressed as the number of milliseconds since
           /// January 1, 1970.
           /// </returns>
-          uint32_t get( );
+          System::UInt32 get( );
         }
 
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CacheTransactionManager.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheTransactionManager.cpp b/src/clicache/src/CacheTransactionManager.cpp
index 54a6e4a..71b1f8d 100644
--- a/src/clicache/src/CacheTransactionManager.cpp
+++ b/src/clicache/src/CacheTransactionManager.cpp
@@ -111,7 +111,7 @@ namespace Apache
 
         _GF_MG_EXCEPTION_CATCH_ALL2
       }
-      bool CacheTransactionManager::TryResume(Apache::Geode::Client::TransactionId^ transactionId, int32_t waitTimeInMilliSec)
+      bool CacheTransactionManager::TryResume(Apache::Geode::Client::TransactionId^ transactionId, System::Int32 waitTimeInMilliSec)
       {
         _GF_MG_EXCEPTION_TRY2
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CacheTransactionManager.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheTransactionManager.hpp b/src/clicache/src/CacheTransactionManager.hpp
index 92b4ef2..480d95a 100644
--- a/src/clicache/src/CacheTransactionManager.hpp
+++ b/src/clicache/src/CacheTransactionManager.hpp
@@ -171,7 +171,7 @@ namespace Apache
         /// <param name="transactionId">the transaction to resume</param>
         /// <param name="waitTimeInMilliSec">the maximum milliseconds to wait </param>
         /// <returns>true if the transaction was resumed, false otherwise</returns>
-        bool TryResume(Apache::Geode::Client::TransactionId^ transactionId, int32_t waitTimeInMilliSec);
+        bool TryResume(Apache::Geode::Client::TransactionId^ transactionId, System::Int32 waitTimeInMilliSec);
 
 
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CacheableArrayList.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableArrayList.hpp b/src/clicache/src/CacheableArrayList.hpp
index 06ba735..adc26a3 100644
--- a/src/clicache/src/CacheableArrayList.hpp
+++ b/src/clicache/src/CacheableArrayList.hpp
@@ -73,9 +73,9 @@ namespace Apache
         /// type to create and deserialize into.
         /// </summary>
         /// <returns>the classId</returns>
-        virtual property uint32_t ClassId
+        virtual property System::UInt32 ClassId
         {
-          virtual uint32_t get() override
+          virtual System::UInt32 get() override
           {
             return GeodeClassIds::CacheableArrayList;
           }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CacheableBuiltins.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableBuiltins.hpp b/src/clicache/src/CacheableBuiltins.hpp
index be30c3b..c0e11d6 100644
--- a/src/clicache/src/CacheableBuiltins.hpp
+++ b/src/clicache/src/CacheableBuiltins.hpp
@@ -44,7 +44,7 @@ namespace Apache
       /// An immutable template wrapper for C++ <c>CacheableKey</c>s that can
       /// serve as a distributable key object for caching.
       /// </summary>
-      template <typename TNative, typename TManaged, uint32_t TYPEID>
+      template <typename TNative, typename TManaged, System::UInt32 TYPEID>
       ref class CacheableBuiltinKey
         : public CacheableKey
       {
@@ -76,9 +76,9 @@ namespace Apache
         /// type to create and deserialize into.
         /// </summary>
         /// <returns>the classId</returns>
-        virtual property uint32_t ClassId
+        virtual property System::UInt32 ClassId
         {
-          virtual uint32_t get() override
+          virtual System::UInt32 get() override
           {
             return TYPEID;
           }
@@ -160,7 +160,7 @@ namespace Apache
       /// distributable object for caching.
       /// </summary>
       template <typename TNative, typename TNativePtr, typename TManaged,
-        uint32_t TYPEID>
+        System::UInt32 TYPEID>
       ref class CacheableBuiltinArray
         : public Serializable
       {
@@ -172,9 +172,9 @@ namespace Apache
         /// type to create and deserialize into.
         /// </summary>
         /// <returns>the classId</returns>
-        virtual property uint32_t ClassId
+        virtual property System::UInt32 ClassId
         {
-          virtual uint32_t get() override
+          virtual System::UInt32 get() override
           {
             return TYPEID;
           }
@@ -191,11 +191,11 @@ namespace Apache
           return this;
         }
 
-        virtual property uint32_t ObjectSize
+        virtual property System::UInt32 ObjectSize
         {
-          virtual uint32_t get() override
+          virtual System::UInt32 get() override
           {
-            return (uint32_t)(m_value->Length) * sizeof(TManaged);
+            return (System::UInt32)(m_value->Length) * sizeof(TManaged);
           }
         }
         /// <summary>
@@ -212,9 +212,9 @@ namespace Apache
         /// <summary>
         /// Returns the size of this array.
         /// </summary>
-        property int32_t Length
+        property System::Int32 Length
         {
-          inline int32_t get()
+          inline System::Int32 get()
           {
             return m_value->Length;
           }
@@ -228,9 +228,9 @@ namespace Apache
         /// <summary>
         /// Returns the value at the given index.
         /// </summary>
-        property TManaged GFINDEXER(int32_t)
+        property TManaged GFINDEXER(System::Int32)
         {
-          inline TManaged get(int32_t index)
+          inline TManaged get(System::Int32 index)
           {
             return m_value[index];
           }
@@ -261,7 +261,7 @@ namespace Apache
           // ManagedPtrWrap< apache::geode::client::Serializable,
           // Internal::SBWrap<apache::geode::client::Serializable> > nptr = nativeptr;
           TNative* nativeptr = static_cast<TNative*>(nptr);
-          int32_t len = nativeptr->length();
+          System::Int32 len = nativeptr->length();
           if (len > 0)
           {
             array<TManaged>^ buffer = gcnew array<TManaged>(len);
@@ -299,7 +299,7 @@ namespace Apache
         /// </remarks>
         /// <param name="buffer">the array to copy from</param>
         /// <param name="length">length of array from start to copy</param>
-        CacheableBuiltinArray(array<TManaged>^ buffer, int32_t length)
+        CacheableBuiltinArray(array<TManaged>^ buffer, System::Int32 length)
         {
           //TODO:
           if (length > buffer->Length) {
@@ -403,7 +403,7 @@ namespace Apache
        *  </remarks>
        *  <param name="value">the array to create the new instance</param>
        */                                                                   \
-       inline static m^ Create(array<mt>^ value, int32_t length)               \
+       inline static m^ Create(array<mt>^ value, System::Int32 length)               \
       {                                                                     \
       return (value != nullptr && value->Length > 0 ? \
       gcnew m(value, length) : nullptr);                                \
@@ -458,7 +458,7 @@ namespace Apache
                *  </remarks>
                *  <param name="value">the array to create the new instance</param>
                */                                                                   \
-               inline m(array<mt>^ value, int32_t length)                              \
+               inline m(array<mt>^ value, System::Int32 length)                              \
                : CacheableBuiltinArray(value, length) { }                          \
                inline m(apache::geode::client::Serializable* nativeptr)                            \
                : CacheableBuiltinArray(nativeptr) { }                              \
@@ -507,21 +507,21 @@ namespace Apache
       /// as a distributable key object for caching.
       /// </summary>
       _GFCLI_CACHEABLE_KEY_DEF_NEW(apache::geode::client::CacheableInt16,
-                                   CacheableInt16, int16_t);
+                                   CacheableInt16, System::Int16);
 
       /// <summary>
       /// An immutable wrapper for 32-bit integers that can serve
       /// as a distributable key object for caching.
       /// </summary>
       _GFCLI_CACHEABLE_KEY_DEF_NEW(apache::geode::client::CacheableInt32,
-                                   CacheableInt32, int32_t);
+                                   CacheableInt32, System::Int32);
 
       /// <summary>
       /// An immutable wrapper for 64-bit integers that can serve
       /// as a distributable key object for caching.
       /// </summary>
       _GFCLI_CACHEABLE_KEY_DEF_NEW(apache::geode::client::CacheableInt64,
-                                   CacheableInt64, int64_t);
+                                   CacheableInt64, System::Int64);
 
 
       // Built-in Cacheable array types
@@ -548,19 +548,19 @@ namespace Apache
       /// An immutable wrapper for array of 16-bit integers that can serve
       /// as a distributable object for caching.
       /// </summary>
-      _GFCLI_CACHEABLE_ARRAY_DEF_NEW(CacheableInt16Array, int16_t);
+      _GFCLI_CACHEABLE_ARRAY_DEF_NEW(CacheableInt16Array, System::Int16);
 
       /// <summary>
       /// An immutable wrapper for array of 32-bit integers that can serve
       /// as a distributable object for caching.
       /// </summary>
-      _GFCLI_CACHEABLE_ARRAY_DEF_NEW(CacheableInt32Array, int32_t);
+      _GFCLI_CACHEABLE_ARRAY_DEF_NEW(CacheableInt32Array, System::Int32);
 
       /// <summary>
       /// An immutable wrapper for array of 64-bit integers that can serve
       /// as a distributable object for caching.
       /// </summary>
-      _GFCLI_CACHEABLE_ARRAY_DEF_NEW(CacheableInt64Array, int64_t);
+      _GFCLI_CACHEABLE_ARRAY_DEF_NEW(CacheableInt64Array, System::Int64);
 
       /// <summary>
       /// An immutable wrapper for array of booleans that can serve

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CacheableDate.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableDate.cpp b/src/clicache/src/CacheableDate.cpp
index b8fb2b8..79bd75d 100644
--- a/src/clicache/src/CacheableDate.cpp
+++ b/src/clicache/src/CacheableDate.cpp
@@ -39,7 +39,7 @@ namespace Apache
       {
 
         // Round off dateTime to the nearest millisecond.
-        int64_t ticksToAdd = m_dateTime.Ticks % TimeSpan::TicksPerMillisecond;
+        System::Int64 ticksToAdd = m_dateTime.Ticks % TimeSpan::TicksPerMillisecond;
         ticksToAdd = (ticksToAdd >= (TimeSpan::TicksPerMillisecond / 2) ?
                       (TimeSpan::TicksPerMillisecond - ticksToAdd) : -ticksToAdd);
         m_dateTime = m_dateTime.AddTicks(ticksToAdd);
@@ -50,7 +50,7 @@ namespace Apache
       {
         //put as universal time
         TimeSpan epochSpan = m_dateTime.ToUniversalTime() - EpochTime;
-        int64_t millisSinceEpoch =
+        System::Int64 millisSinceEpoch =
           epochSpan.Ticks / TimeSpan::TicksPerMillisecond;
         output->WriteInt64(millisSinceEpoch);
 
@@ -60,7 +60,7 @@ namespace Apache
       IGeodeSerializable^ CacheableDate::FromData(DataInput^ input)
       {
         DateTime epochTime = EpochTime;
-        int64_t millisSinceEpoch = input->ReadInt64();
+        System::Int64 millisSinceEpoch = input->ReadInt64();
         m_dateTime = epochTime.AddTicks(
           millisSinceEpoch * TimeSpan::TicksPerMillisecond);
         m_dateTime = m_dateTime.ToLocalTime();
@@ -68,12 +68,12 @@ namespace Apache
         return this;
       }
 
-      uint32_t CacheableDate::ObjectSize::get()
+      System::UInt32 CacheableDate::ObjectSize::get()
       {
-        return (uint32_t)sizeof(DateTime);
+        return (System::UInt32)sizeof(DateTime);
       }
 
-      uint32_t CacheableDate::ClassId::get()
+      System::UInt32 CacheableDate::ClassId::get()
       {
         return GeodeClassIds::CacheableDate;
       }
@@ -84,13 +84,13 @@ namespace Apache
           System::Globalization::CultureInfo::CurrentCulture);
       }
 
-      int32_t CacheableDate::GetHashCode()
+      System::Int32 CacheableDate::GetHashCode()
       {
         if (m_hashcode == 0) {
           TimeSpan epochSpan = m_dateTime - EpochTime;
-          int64_t millitime =
+          System::Int64 millitime =
             epochSpan.Ticks / TimeSpan::TicksPerMillisecond;
-          m_hashcode = (int)millitime ^ (int)((int64_t)millitime >> 32);
+          m_hashcode = (int)millitime ^ (int)((System::Int64)millitime >> 32);
         }
         return m_hashcode;
       }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CacheableDate.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableDate.hpp b/src/clicache/src/CacheableDate.hpp
index ab0bee6..9cf2435 100644
--- a/src/clicache/src/CacheableDate.hpp
+++ b/src/clicache/src/CacheableDate.hpp
@@ -98,9 +98,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>
@@ -109,9 +109,9 @@ namespace Apache
         /// type to create and deserialize into.
         /// </summary>
         /// <returns>the classId</returns>
-        virtual property uint32_t ClassId
+        virtual property System::UInt32 ClassId
         {
-          virtual uint32_t get();
+          virtual System::UInt32 get();
         }
 
         /// <summary>
@@ -127,7 +127,7 @@ namespace Apache
         /// <summary>
         /// Return the hashcode for this key.
         /// </summary>
-        virtual int32_t GetHashCode() override;
+        virtual System::Int32 GetHashCode() override;
 
         /// <summary>
         /// Return true if this key matches other object.

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CacheableFileName.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableFileName.cpp b/src/clicache/src/CacheableFileName.cpp
index 3fad6d4..fb3cb10 100644
--- a/src/clicache/src/CacheableFileName.cpp
+++ b/src/clicache/src/CacheableFileName.cpp
@@ -56,27 +56,27 @@ namespace Apache
         return this;
       }
 
-      uint32_t CacheableFileName::ClassId::get()
+      System::UInt32 CacheableFileName::ClassId::get()
       {
         return GeodeClassIds::CacheableFileName;
       }
 
-      uint32_t CacheableFileName::ObjectSize::get()
+      System::UInt32 CacheableFileName::ObjectSize::get()
       {
-        return (uint32_t)(m_str->Length * sizeof(char));
+        return (System::UInt32)(m_str->Length * sizeof(char));
       }
 
-      int32_t CacheableFileName::GetHashCode()
+      System::Int32 CacheableFileName::GetHashCode()
       {
         if (m_str->IsNullOrEmpty(m_str)) {
           return 0;
         }
         if (m_hashcode == 0) {
           int localHashcode = 0;
-          uint32_t prime = 31;
+          System::UInt32 prime = 31;
 
           pin_ptr<const wchar_t> pin_value = PtrToStringChars(m_str);
-          for (int32_t i = 0; i < m_str->Length; i++) {
+          for (System::Int32 i = 0; i < m_str->Length; i++) {
             localHashcode = prime*localHashcode + Char::ToLower(pin_value[i]);
           }
           m_hashcode = localHashcode ^ 1234321;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CacheableFileName.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableFileName.hpp b/src/clicache/src/CacheableFileName.hpp
index 298dfc0..bb1279e 100644
--- a/src/clicache/src/CacheableFileName.hpp
+++ b/src/clicache/src/CacheableFileName.hpp
@@ -82,9 +82,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>
@@ -93,9 +93,9 @@ namespace Apache
         /// type to create and deserialize into.
         /// </summary>
         /// <returns>the classId</returns>
-        virtual property uint32_t ClassId
+        virtual property System::UInt32 ClassId
         {
-          virtual uint32_t get();
+          virtual System::UInt32 get();
         }
 
         /// <summary>
@@ -114,7 +114,7 @@ namespace Apache
         /// <summary>
         /// Return the hashcode for this key.
         /// </summary>
-        virtual int32_t GetHashCode() override;
+        virtual System::Int32 GetHashCode() override;
 
         /// <summary>
         /// Return true if this key matches other object.

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CacheableHashMap.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableHashMap.cpp b/src/clicache/src/CacheableHashMap.cpp
index 28f2ec5..a4c96e0 100644
--- a/src/clicache/src/CacheableHashMap.cpp
+++ b/src/clicache/src/CacheableHashMap.cpp
@@ -44,7 +44,7 @@ namespace Apache
         return this;
       }
 
-      uint32_t Client::CacheableHashMap::ObjectSize::get()
+      System::UInt32 Client::CacheableHashMap::ObjectSize::get()
       {
         return ((System::Collections::IDictionary^)m_dictionary)->Count;
     }  // namespace Client

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CacheableHashMap.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableHashMap.hpp b/src/clicache/src/CacheableHashMap.hpp
index 4b94cb8..6d64461 100644
--- a/src/clicache/src/CacheableHashMap.hpp
+++ b/src/clicache/src/CacheableHashMap.hpp
@@ -104,9 +104,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>
@@ -115,9 +115,9 @@ namespace Apache
         /// type to create and deserialize into.
         /// </summary>
         /// <returns>the classId</returns>
-        virtual property uint32_t ClassId
+        virtual property System::UInt32 ClassId
         {
-          inline virtual uint32_t get()
+          inline virtual System::UInt32 get()
           {
             return GeodeClassIds::CacheableHashMap;
           }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CacheableHashSet.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableHashSet.hpp b/src/clicache/src/CacheableHashSet.hpp
index c6e2d60..ab59f8c 100644
--- a/src/clicache/src/CacheableHashSet.hpp
+++ b/src/clicache/src/CacheableHashSet.hpp
@@ -42,7 +42,7 @@ namespace Apache
         /// A mutable <c>ICacheableKey</c> hash set wrapper that can serve as
         /// a distributable object for caching.
         /// </summary>
-        template <uint32_t TYPEID, typename HSTYPE>
+        template <System::UInt32 TYPEID, typename HSTYPE>
         public ref class CacheableHashSetType
           : public Serializable, public ICollection<Object^>
         {
@@ -78,11 +78,11 @@ namespace Apache
             return this;
           }
 
-          virtual property uint32_t ObjectSize
+          virtual property System::UInt32 ObjectSize
           {
-            virtual uint32_t get() override
+            virtual System::UInt32 get() override
             {
-              uint32_t size = 0;
+              System::UInt32 size = 0;
               for each (Object^ key in this) {
                 if (key != nullptr)
                   //size += key->ObjectSize; 
@@ -249,9 +249,9 @@ namespace Apache
           /// type to create and deserialize into.
           /// </summary>
           /// <returns>the classId</returns>
-          virtual property uint32_t ClassId
+          virtual property System::UInt32 ClassId
           {
-            virtual uint32_t get() override
+            virtual System::UInt32 get() override
             {
               //return static_cast<HSTYPE*>(NativePtr())->classId() + 0x80000000;
               return TYPEID;
@@ -261,9 +261,9 @@ namespace Apache
           /// <summary>
           /// Get the largest possible size of the <c>CacheableHashSet</c>.
           /// </summary>
-          property int32_t MaxSize
+          property System::Int32 MaxSize
           {
-            inline int32_t get()
+            inline System::Int32 get()
             {
               return static_cast<HSTYPE*>(NativePtr())->max_size();
             }
@@ -283,9 +283,9 @@ namespace Apache
           /// <summary>
           /// Get the number of buckets used by the HashSet.
           /// </summary>
-          property int32_t BucketCount
+          property System::Int32 BucketCount
           {
-            inline int32_t get()
+            inline System::Int32 get()
             {
               return static_cast<HSTYPE*>(NativePtr())->bucket_count();
             }
@@ -295,7 +295,7 @@ namespace Apache
           /// Increases the bucket count to at least <c>size</c> elements.
           /// </summary>
           /// <param name="size">The new size of the HashSet.</param>
-          virtual void Resize(int32_t size) sealed
+          virtual void Resize(System::Int32 size) sealed
           {
             static_cast<HSTYPE*>(NativePtr())->resize(size);
           }
@@ -380,7 +380,7 @@ namespace Apache
           /// is greater than the available space from arrayIndex to the end
           /// of the destination array.
           /// </exception>
-          virtual void CopyTo(array<Object^>^ array, int32_t arrayIndex)
+          virtual void CopyTo(array<Object^>^ array, System::Int32 arrayIndex)
           {
             if (array == nullptr || arrayIndex < 0) {
               throw gcnew IllegalArgumentException("CacheableHashSet.CopyTo():"
@@ -389,10 +389,10 @@ namespace Apache
             Internal::ManagedPtrWrap< apache::geode::client::Serializable,
               Internal::SBWrap<apache::geode::client::Serializable> > nptr = NativePtr;
             HSTYPE* set = static_cast<HSTYPE*>(nptr());
-            int32_t index = arrayIndex;
+            System::Int32 index = arrayIndex;
 
             if (arrayIndex >= array->Length ||
-                array->Length < (arrayIndex + (int32_t)set->size())) {
+                array->Length < (arrayIndex + (System::Int32)set->size())) {
               throw gcnew OutOfRangeException("CacheableHashSet.CopyTo():"
                                               " array index is beyond the HashSet or length of given "
                                               "array is less than that required to copy all the "
@@ -409,9 +409,9 @@ namespace Apache
           /// Gets the number of elements contained in the
           /// <c>CacheableHashSet</c>.
           /// </summary>
-          virtual property int32_t Count
+          virtual property System::Int32 Count
           {
-            virtual int32_t get()
+            virtual System::Int32 get()
             {
               return static_cast<HSTYPE*>(NativePtr())->size();
             }
@@ -519,7 +519,7 @@ namespace Apache
           /// Allocates a new empty instance with given initial size.
           /// </summary>
           /// <param name="size">The initial size of the HashSet.</param>
-          inline CacheableHashSetType<TYPEID, HSTYPE>(int32_t size)
+          inline CacheableHashSetType<TYPEID, HSTYPE>(System::Int32 size)
             : Serializable(HSTYPE::create(size).ptr())
           { }
         };
@@ -541,7 +541,7 @@ namespace Apache
        *  </summary>
        *  <param name="size">the intial size of the new instance</param>
        */                                                                   \
-       inline m(int32_t size)                                                 \
+       inline m(System::Int32 size)                                                 \
        : Internal::CacheableHashSetType<Apache::Geode::Client::GeodeClassIds::m, HSTYPE>(size) {}                  \
        \
        /** <summary>
@@ -557,7 +557,7 @@ namespace Apache
        *  Static function to create a new instance with the given size.
        *  </summary>
        */                                                                   \
-       inline static m^ Create(int32_t size)                                  \
+       inline static m^ Create(System::Int32 size)                                  \
       {                                                                     \
       return gcnew m(size);                                               \
       }                                                                     \

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CacheableHashTable.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableHashTable.hpp b/src/clicache/src/CacheableHashTable.hpp
index 30812bd..a2c6c7e 100644
--- a/src/clicache/src/CacheableHashTable.hpp
+++ b/src/clicache/src/CacheableHashTable.hpp
@@ -65,7 +65,7 @@ namespace Apache
         /// <param name="capacity">
         /// The initial capacity of the HashTable.
         /// </param>
-        inline CacheableHashTable(int32_t capacity)
+        inline CacheableHashTable(System::Int32 capacity)
           : CacheableHashMap(capacity)
         { }
 
@@ -78,9 +78,9 @@ namespace Apache
         /// type to create and deserialize into.
         /// </summary>
         /// <returns>the classId</returns>
-        virtual property uint32_t ClassId
+        virtual property System::UInt32 ClassId
         {
-          virtual uint32_t get() override
+          virtual System::UInt32 get() override
           {
             return GeodeClassIds::CacheableHashTable;
           }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CacheableIdentityHashMap.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableIdentityHashMap.hpp b/src/clicache/src/CacheableIdentityHashMap.hpp
index 6d42e1e..6407c53 100644
--- a/src/clicache/src/CacheableIdentityHashMap.hpp
+++ b/src/clicache/src/CacheableIdentityHashMap.hpp
@@ -66,7 +66,7 @@ namespace Apache
         /// <param name="capacity">
         /// The initial capacity of the HashMap.
         /// </param>
-        inline CacheableIdentityHashMap(int32_t capacity)
+        inline CacheableIdentityHashMap(System::Int32 capacity)
           : CacheableHashMap(capacity)
         { }
 
@@ -91,7 +91,7 @@ namespace Apache
         /// <summary>
         /// Static function to create a new instance with given initial size.
         /// </summary>
-        inline static CacheableIdentityHashMap^ Create(int32_t capacity)
+        inline static CacheableIdentityHashMap^ Create(System::Int32 capacity)
         {
           return gcnew CacheableIdentityHashMap(capacity);
         }
@@ -104,9 +104,9 @@ namespace Apache
         /// type to create and deserialize into.
         /// </summary>
         /// <returns>the classId</returns>
-        virtual property uint32_t ClassId
+        virtual property System::UInt32 ClassId
         {
-          virtual uint32_t get() override
+          virtual System::UInt32 get() override
           {
             return GeodeClassIds::CacheableIdentityHashMap;
           }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CacheableKey.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableKey.cpp b/src/clicache/src/CacheableKey.cpp
index aa4e1c8..4526b78 100644
--- a/src/clicache/src/CacheableKey.cpp
+++ b/src/clicache/src/CacheableKey.cpp
@@ -30,7 +30,7 @@ namespace Apache
     {
 
      // generic<class TKey>
-      int32_t CacheableKey::GetHashCode()
+      System::Int32 CacheableKey::GetHashCode()
       {
         return static_cast<apache::geode::client::CacheableKey*>(NativePtr())->hashcode();
       }
@@ -90,19 +90,19 @@ namespace Apache
       }
 
       //generic<class TKey>
-      CacheableKey::operator CacheableKey^ (int16_t value)
+      CacheableKey::operator CacheableKey^ (System::Int16 value)
       {
         return (CacheableKey^) CacheableInt16::Create(value);
       }
 
       //generic<class TKey>
-      CacheableKey::operator CacheableKey^ (int32_t value)
+      CacheableKey::operator CacheableKey^ (System::Int32 value)
       {
         return (CacheableKey^) CacheableInt32::Create(value);
       }
 
      // generic<class TKey>
-      CacheableKey::operator CacheableKey^ (int64_t value)
+      CacheableKey::operator CacheableKey^ (System::Int64 value)
       {
         return (CacheableKey^) CacheableInt64::Create(value);
       }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CacheableKey.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableKey.hpp b/src/clicache/src/CacheableKey.hpp
index 0c6d250..f36f3ae 100644
--- a/src/clicache/src/CacheableKey.hpp
+++ b/src/clicache/src/CacheableKey.hpp
@@ -46,7 +46,7 @@ namespace Apache
         /// It gets the hash code by calling the <c>hashcode()</c> function
         /// of the underlying <c>apache::geode::client::CacheableKey</c> object.
         /// </summary>
-        virtual int32_t GetHashCode() override;
+        virtual System::Int32 GetHashCode() override;
 
         /// <summary>
         /// Return true if this key matches other object. It invokes the '=='
@@ -92,7 +92,7 @@ namespace Apache
         /// Implicit conversion operator from a 16-bit integer
         /// to a <c>CacheableKey</c>.
         /// </summary>
-        static operator CacheableKey^ (int16_t value);
+        static operator CacheableKey^ (System::Int16 value);
 
         /// <summary>
         /// Implicit conversion operator from a character
@@ -104,13 +104,13 @@ namespace Apache
         /// Implicit conversion operator from a 32-bit integer
         /// to a <c>CacheableKey</c>.
         /// </summary>
-        static operator CacheableKey^ (int32_t value);
+        static operator CacheableKey^ (System::Int32 value);
 
         /// <summary>
         /// Implicit conversion operator from a 64-bit integer
         /// to a <c>CacheableKey</c>.
         /// </summary>
-        static operator CacheableKey^ (int64_t value);
+        static operator CacheableKey^ (System::Int64 value);
 
         /// <summary>
         /// Implicit conversion operator from a string

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CacheableLinkedList.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableLinkedList.hpp b/src/clicache/src/CacheableLinkedList.hpp
index bd7da8b..0da310c 100644
--- a/src/clicache/src/CacheableLinkedList.hpp
+++ b/src/clicache/src/CacheableLinkedList.hpp
@@ -75,9 +75,9 @@ namespace Apache
         /// type to create and deserialize into.
         /// </summary>
         /// <returns>the classId</returns>
-        virtual property uint32_t ClassId
+        virtual property System::UInt32 ClassId
         {
-          virtual uint32_t get()
+          virtual System::UInt32 get()
           {
             return GeodeClassIds::CacheableLinkedList;
           }
@@ -109,10 +109,10 @@ namespace Apache
           return this;
         }
 
-        /*uint32_t ObjectSize::get()
+        /*System::UInt32 ObjectSize::get()
         {
         //TODO::
-        uint32_t size = static_cast<uint32_t> (sizeof(CacheableVector^));
+        System::UInt32 size = static_cast<System::UInt32> (sizeof(CacheableVector^));
         for each (IGeodeSerializable^ val in this) {
         if (val != nullptr) {
         size += val->ObjectSize;
@@ -121,9 +121,9 @@ namespace Apache
         return m_linkedList->Count;
         }*/
 
-        virtual property uint32_t ObjectSize
+        virtual property System::UInt32 ObjectSize
         {
-          virtual uint32_t get()
+          virtual System::UInt32 get()
           {
             return m_linkedList->Count;
           }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CacheableObject.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableObject.cpp b/src/clicache/src/CacheableObject.cpp
index 9b61914..3bb18d2 100644
--- a/src/clicache/src/CacheableObject.cpp
+++ b/src/clicache/src/CacheableObject.cpp
@@ -43,9 +43,9 @@ namespace Apache
 
           GeodeDataOutputStream dos(output);
           BinaryFormatter bf;
-          int64_t checkpoint = dos.Length;
+          System::Int64 checkpoint = dos.Length;
           bf.Serialize(%dos, m_obj);
-          m_objectSize = (uint32_t) (dos.Length - checkpoint);
+          m_objectSize = (System::UInt32) (dos.Length - checkpoint);
 
           output->RewindCursor(m_objectSize + 4);
           output->WriteInt32(m_objectSize);
@@ -57,21 +57,21 @@ namespace Apache
       {
         int maxSize = input->ReadInt32();
         GeodeDataInputStream dis(input, maxSize);
-        uint32_t checkpoint = dis.BytesRead;
+        System::UInt32 checkpoint = dis.BytesRead;
         BinaryFormatter bf;
         m_obj = bf.Deserialize(%dis);
         m_objectSize = dis.BytesRead - checkpoint;
         return this;
       }
 
-      uint32_t CacheableObject::ObjectSize::get()
+      System::UInt32 CacheableObject::ObjectSize::get()
       { 
         if (m_objectSize == 0) {
           GeodeNullStream ns;
           BinaryFormatter bf;
           bf.Serialize(%ns, m_obj);
 
-          m_objectSize = (uint32_t)sizeof(CacheableObject^) + (uint32_t)ns.Length;
+          m_objectSize = (System::UInt32)sizeof(CacheableObject^) + (System::UInt32)ns.Length;
         }
         return m_objectSize;
     }  // namespace Client

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CacheableObject.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableObject.hpp b/src/clicache/src/CacheableObject.hpp
index 48424d5..3b9ff2f 100644
--- a/src/clicache/src/CacheableObject.hpp
+++ b/src/clicache/src/CacheableObject.hpp
@@ -88,9 +88,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>
@@ -99,9 +99,9 @@ namespace Apache
         /// type to create and deserialize into.
         /// </summary>
         /// <returns>the classId</returns>
-        virtual property uint32_t ClassId
+        virtual property System::UInt32 ClassId
         {
-          inline virtual uint32_t get()
+          inline virtual System::UInt32 get()
           {
             return GeodeClassIds::CacheableManagedObject;
           }
@@ -148,7 +148,7 @@ namespace Apache
 
       private:
         Object^ m_obj;
-        uint32_t m_objectSize;
+        System::UInt32 m_objectSize;
       };
     }  // namespace Client
   }  // namespace Geode

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CacheableObjectArray.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableObjectArray.cpp b/src/clicache/src/CacheableObjectArray.cpp
index d21a38d..9a41846 100644
--- a/src/clicache/src/CacheableObjectArray.cpp
+++ b/src/clicache/src/CacheableObjectArray.cpp
@@ -41,7 +41,7 @@ namespace Apache
 
       void CacheableObjectArray::ToData(DataOutput^ output)
       {
-        output->WriteArrayLen((int32_t)Count);
+        output->WriteArrayLen((System::Int32)Count);
         output->WriteByte((int8_t)apache::geode::client::GeodeTypeIdsImpl::Class);
         output->WriteByte((int8_t)apache::geode::client::GeodeTypeIds::CacheableASCIIString);
         output->WriteUTF("java.lang.Object");
@@ -54,7 +54,7 @@ namespace Apache
         /*_GF_MG_EXCEPTION_TRY
 
           apache::geode::client::DataOutput& nativeOutput = *(output->_NativePtr);
-          nativeOutput.writeArrayLen((int32_t)Count);
+          nativeOutput.writeArrayLen((System::Int32)Count);
           nativeOutput.write((int8_t)apache::geode::client::GeodeTypeIdsImpl::Class);
           nativeOutput.write((int8_t)apache::geode::client::GeodeTypeIds::CacheableASCIIString);
           nativeOutput.writeASCII("java.lang.Object");
@@ -79,25 +79,25 @@ namespace Apache
           //nativeInput.readInt(&classLen);
           //nativeInput.advanceCursor(classLen);
         }
-        for (int32_t index = 0; index < len; ++index) {
+        for (System::Int32 index = 0; index < len; ++index) {
           Add(input->ReadObject());
         }
         return this;
         /*_GF_MG_EXCEPTION_TRY
 
           apache::geode::client::DataInput& nativeInput = *(input->_NativePtr);
-          int32_t len;
+          System::Int32 len;
           nativeInput.readArrayLen(&len);
           if (len >= 0) {
             int8_t typeCode;
             nativeInput.read(&typeCode); // ignore CLASS typeid
             nativeInput.read(&typeCode); // ignore string typeid
-            uint16_t classLen;
+            System::UInt16 classLen;
             nativeInput.readInt(&classLen);
             nativeInput.advanceCursor(classLen);
           }
           apache::geode::client::CacheablePtr value;
-          for (int32_t index = 0; index < len; ++index) {
+          for (System::Int32 index = 0; index < len; ++index) {
             nativeInput.readObject(value);
             Add(SafeUMSerializableConvert(value.ptr()));
           }
@@ -106,9 +106,9 @@ namespace Apache
         return this;*/
       }
 
-      uint32_t CacheableObjectArray::ObjectSize::get()
+      System::UInt32 CacheableObjectArray::ObjectSize::get()
       { 
-       /* uint32_t size = static_cast<uint32_t> (sizeof(CacheableObjectArray^));
+       /* System::UInt32 size = static_cast<System::UInt32> (sizeof(CacheableObjectArray^));
         for each (IGeodeSerializable^ val in this) {
           if (val != nullptr) {
             size += val->ObjectSize;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CacheableObjectArray.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableObjectArray.hpp b/src/clicache/src/CacheableObjectArray.hpp
index 7c484e4..2a88330 100644
--- a/src/clicache/src/CacheableObjectArray.hpp
+++ b/src/clicache/src/CacheableObjectArray.hpp
@@ -65,7 +65,7 @@ namespace Apache
         /// <param name="capacity">
         /// The initial capacity of the vector.
         /// </param>
-        inline CacheableObjectArray(int32_t capacity)
+        inline CacheableObjectArray(System::Int32 capacity)
           : List<Object^>(capacity)
         { }
 
@@ -90,7 +90,7 @@ namespace Apache
         /// <summary>
         /// Static function to create a new instance with given initial size.
         /// </summary>
-        inline static CacheableObjectArray^ Create(int32_t capacity)
+        inline static CacheableObjectArray^ Create(System::Int32 capacity)
         {
           return gcnew CacheableObjectArray(capacity);
         }
@@ -118,9 +118,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>
@@ -129,9 +129,9 @@ namespace Apache
         /// type to create and deserialize into.
         /// </summary>
         /// <returns>the classId</returns>
-        virtual property uint32_t ClassId
+        virtual property System::UInt32 ClassId
         {
-          virtual uint32_t get()
+          virtual System::UInt32 get()
           {
             return GeodeClassIds::CacheableObjectArray;
           }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CacheableObjectXml.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableObjectXml.cpp b/src/clicache/src/CacheableObjectXml.cpp
index 289f024..5899a20 100644
--- a/src/clicache/src/CacheableObjectXml.cpp
+++ b/src/clicache/src/CacheableObjectXml.cpp
@@ -53,9 +53,9 @@ namespace Apache
 
           XmlSerializer xs(objType);
           GeodeDataOutputStream dos(output);
-          int64_t checkpoint = dos.Length;
+          System::Int64 checkpoint = dos.Length;
           xs.Serialize(%dos, m_obj);
-          m_objectSize = (uint32_t) (dos.Length - checkpoint);
+          m_objectSize = (System::UInt32) (dos.Length - checkpoint);
 
           output->RewindCursor(m_objectSize + 4);
           output->WriteInt32(m_objectSize);
@@ -82,7 +82,7 @@ namespace Apache
             int maxSize = input->ReadInt32();
             GeodeDataInputStream dis(input, maxSize);
             XmlSerializer xs(objType);
-            uint32_t checkpoint = dis.BytesRead;
+            System::UInt32 checkpoint = dis.BytesRead;
             m_obj = xs.Deserialize(%dis);
             m_objectSize = dis.BytesRead - checkpoint;
           }
@@ -90,7 +90,7 @@ namespace Apache
         return this;
       }
 
-      uint32_t CacheableObjectXml::ObjectSize::get()
+      System::UInt32 CacheableObjectXml::ObjectSize::get()
       { 
         if (m_objectSize == 0) {
           if (m_obj != nullptr) {
@@ -99,7 +99,7 @@ namespace Apache
             GeodeNullStream ns;
             xs.Serialize(%ns, m_obj);
 
-            m_objectSize = (uint32_t)sizeof(CacheableObjectXml^) + (uint32_t)ns.Length;
+            m_objectSize = (System::UInt32)sizeof(CacheableObjectXml^) + (System::UInt32)ns.Length;
           }
         }
         return m_objectSize;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CacheableObjectXml.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableObjectXml.hpp b/src/clicache/src/CacheableObjectXml.hpp
index 86820bc..fdd1753 100644
--- a/src/clicache/src/CacheableObjectXml.hpp
+++ b/src/clicache/src/CacheableObjectXml.hpp
@@ -91,9 +91,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>
@@ -102,9 +102,9 @@ namespace Apache
         /// type to create and deserialize into.
         /// </summary>
         /// <returns>the classId</returns>
-        virtual property uint32_t ClassId
+        virtual property System::UInt32 ClassId
         {
-          inline virtual uint32_t get()
+          inline virtual System::UInt32 get()
           {
             return GeodeClassIds::CacheableManagedObjectXml;
           }
@@ -149,7 +149,7 @@ namespace Apache
 
       private:
         Object^ m_obj;
-        uint32_t m_objectSize;
+        System::UInt32 m_objectSize;
       };
     }  // namespace Client
   }  // namespace Geode

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CacheableStack.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableStack.cpp b/src/clicache/src/CacheableStack.cpp
index 9285d2c..96839e6 100644
--- a/src/clicache/src/CacheableStack.cpp
+++ b/src/clicache/src/CacheableStack.cpp
@@ -41,7 +41,7 @@ namespace Apache
       {
         if (m_stack != nullptr)
         {
-          output->WriteArrayLen((int32_t)m_stack->Count);
+          output->WriteArrayLen((System::Int32)m_stack->Count);
           for each (Object^ obj in m_stack) {
             output->WriteObject(obj);
           }
@@ -67,15 +67,15 @@ namespace Apache
         return this;
       }
 
-      uint32_t CacheableStack::ClassId::get()
+      System::UInt32 CacheableStack::ClassId::get()
       {
         return GeodeClassIds::CacheableStack;
       }
 
-      uint32_t CacheableStack::ObjectSize::get()
+      System::UInt32 CacheableStack::ObjectSize::get()
       {
         //TODO:
-        /*uint32_t size = static_cast<uint32_t> (sizeof(CacheableStack^));
+        /*System::UInt32 size = static_cast<System::UInt32> (sizeof(CacheableStack^));
         for each (IGeodeSerializable^ val in this) {
         if (val != nullptr) {
         size += val->ObjectSize;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CacheableStack.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableStack.hpp b/src/clicache/src/CacheableStack.hpp
index f81c4d6..fbebf6a 100644
--- a/src/clicache/src/CacheableStack.hpp
+++ b/src/clicache/src/CacheableStack.hpp
@@ -88,9 +88,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>
@@ -99,9 +99,9 @@ namespace Apache
         /// type to create and deserialize into.
         /// </summary>
         /// <returns>the classId</returns>
-        virtual property uint32_t ClassId
+        virtual property System::UInt32 ClassId
         {
-          virtual uint32_t get();
+          virtual System::UInt32 get();
         }
 
         virtual property System::Collections::ICollection^ Value

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CacheableString.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableString.cpp b/src/clicache/src/CacheableString.cpp
index 9db8cff..36d7b09 100644
--- a/src/clicache/src/CacheableString.cpp
+++ b/src/clicache/src/CacheableString.cpp
@@ -76,7 +76,7 @@ namespace Apache
         size_t len;
         if (value != nullptr && (len = value->Length) > 0) {
           pin_ptr<const wchar_t> pin_value = PtrToStringChars(value);
-          cStr = apache::geode::client::CacheableString::create(pin_value, (int32_t)len);
+          cStr = apache::geode::client::CacheableString::create(pin_value, (System::Int32)len);
         }
         else {
           cStr = (apache::geode::client::CacheableString*)
@@ -91,7 +91,7 @@ namespace Apache
         if (value != nullptr && (len = value->Length) > 0) {
           pin_ptr<const Char> pin_value = &value[0];
           cStr = apache::geode::client::CacheableString::create(
-            (const wchar_t*)pin_value, (int32_t)len);
+            (const wchar_t*)pin_value, (System::Int32)len);
         }
         else {
           cStr = (apache::geode::client::CacheableString*)
@@ -137,7 +137,7 @@ namespace Apache
         this->SetStringType();
       }
 
-      uint32_t CacheableString::ObjectSize::get()
+      System::UInt32 CacheableString::ObjectSize::get()
       {
         return (m_value->Length * sizeof(char));
       }
@@ -168,7 +168,7 @@ namespace Apache
         return false;
       }
 
-      int32_t CacheableString::GetHashCode()
+      System::Int32 CacheableString::GetHashCode()
       {
         if (String::IsNullOrEmpty(m_value)) {
           return 0;
@@ -177,9 +177,9 @@ namespace Apache
         //return m_value->GetHashCode();
         if (m_hashcode == 0)
         {
-          int32_t prime = 31;
-          int32_t localHash = 0;
-          for (int32_t i = 0; i < m_value->Length; i++)
+          System::Int32 prime = 31;
+          System::Int32 localHash = 0;
+          for (System::Int32 i = 0; i < m_value->Length; i++)
             localHash = prime*localHash + m_value[i];
           m_hashcode = localHash;
         }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CacheableString.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableString.hpp b/src/clicache/src/CacheableString.hpp
index 7f383ef..633cae9 100644
--- a/src/clicache/src/CacheableString.hpp
+++ b/src/clicache/src/CacheableString.hpp
@@ -101,9 +101,9 @@ namespace Apache
         /// type to create and deserialize into.
         /// </summary>
         /// <returns>the classId</returns>
-        virtual property uint32_t ClassId
+        virtual property System::UInt32 ClassId
         {
-          virtual uint32_t get() override
+          virtual System::UInt32 get() override
           {
             return m_type;
           }
@@ -113,9 +113,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() override;
+          virtual System::UInt32 get() override;
         }
 
         /// <summary>
@@ -161,7 +161,7 @@ namespace Apache
         /// <summary>
         /// Return the hashcode for this key.
         /// </summary>
-        virtual int32_t GetHashCode() override;
+        virtual System::Int32 GetHashCode() override;
 
         /// <summary>
         /// Gets the string value.
@@ -197,9 +197,9 @@ namespace Apache
         /// <summary>
         /// Gets the length of the underlying C string.
         /// </summary>
-        property uint32_t Length
+        property System::UInt32 Length
         {
-          inline uint32_t get()
+          inline System::UInt32 get()
           {
             return m_value->Length;
           }
@@ -281,14 +281,14 @@ namespace Apache
           return cStr->Value;
         }
 
-        CacheableString(uint32_t type) : CacheableKey()
+        CacheableString(System::UInt32 type) : CacheableKey()
         {
           m_type = type;
         }
 
       private:
         String^ m_value;
-        uint32_t m_type;
+        System::UInt32 m_type;
         int m_hashcode;
 
         CacheableString() : CacheableKey()

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CacheableStringArray.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableStringArray.cpp b/src/clicache/src/CacheableStringArray.cpp
index ca5dd72..34c27ae 100644
--- a/src/clicache/src/CacheableStringArray.cpp
+++ b/src/clicache/src/CacheableStringArray.cpp
@@ -43,7 +43,7 @@ namespace Apache
         return m_value;
       }
 
-      String^ CacheableStringArray::default::get(int32_t index)
+      String^ CacheableStringArray::default::get(System::Int32 index)
       {
         return m_value[index];
       }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CacheableStringArray.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableStringArray.hpp b/src/clicache/src/CacheableStringArray.hpp
index 900853b..fca0be6 100644
--- a/src/clicache/src/CacheableStringArray.hpp
+++ b/src/clicache/src/CacheableStringArray.hpp
@@ -86,9 +86,9 @@ namespace Apache
         /// type to create and deserialize into.
         /// </summary>
         /// <returns>the classId</returns>
-        virtual property uint32_t ClassId
+        virtual property System::UInt32 ClassId
         {
-          virtual uint32_t get() override
+          virtual System::UInt32 get() override
           {
             return GeodeClassIds::CacheableStringArray;
           }
@@ -97,16 +97,16 @@ 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() override
+          virtual System::UInt32 get() override
           {
             int size = 0;
             for (int i = 0; i < m_value->Length; i++)
             {
               size += m_value[i]->Length;
             }
-            return (uint32_t)(size + sizeof(this));
+            return (System::UInt32)(size + sizeof(this));
           }
 
         }
@@ -119,17 +119,17 @@ namespace Apache
         /// <summary>
         /// Returns a copy of the underlying string at the given index.
         /// </summary>
-        property String^ GFINDEXER(int32_t)
+        property String^ GFINDEXER(System::Int32)
         {
-          String^ get(int32_t index);
+          String^ get(System::Int32 index);
         }
 
         /// <summary>
         /// Gets the length of the array.
         /// </summary>
-        property int32_t Length
+        property System::Int32 Length
         {
-          inline int32_t get()
+          inline System::Int32 get()
           {
             return m_value->Length;
           }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CacheableUndefined.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableUndefined.cpp b/src/clicache/src/CacheableUndefined.cpp
index 01888da..c6545c8 100644
--- a/src/clicache/src/CacheableUndefined.cpp
+++ b/src/clicache/src/CacheableUndefined.cpp
@@ -43,9 +43,9 @@ namespace Apache
         return this;
       }
 
-      uint32_t CacheableUndefined::ObjectSize::get()
+      System::UInt32 CacheableUndefined::ObjectSize::get()
       {
-        return static_cast<uint32_t> (sizeof(CacheableUndefined^));
+        return static_cast<System::UInt32> (sizeof(CacheableUndefined^));
     }  // namespace Client
   }  // namespace Geode
 }  // namespace Apache

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CacheableUndefined.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableUndefined.hpp b/src/clicache/src/CacheableUndefined.hpp
index d2576bc..83b40ff 100644
--- a/src/clicache/src/CacheableUndefined.hpp
+++ b/src/clicache/src/CacheableUndefined.hpp
@@ -74,9 +74,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>
@@ -85,9 +85,9 @@ namespace Apache
         /// type to create and deserialize into.
         /// </summary>
         /// <returns>the classId</returns>
-        virtual property uint32_t ClassId
+        virtual property System::UInt32 ClassId
         {
-          inline virtual uint32_t get()
+          inline virtual System::UInt32 get()
           {
             return GeodeClassIds::CacheableUndefined;
           }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CacheableVector.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableVector.cpp b/src/clicache/src/CacheableVector.cpp
index 1604ef3..36f0e3a 100644
--- a/src/clicache/src/CacheableVector.cpp
+++ b/src/clicache/src/CacheableVector.cpp
@@ -60,10 +60,10 @@ namespace Apache
         return this;
       }
 
-      uint32_t CacheableVector::ObjectSize::get()
+      System::UInt32 CacheableVector::ObjectSize::get()
       { 
         //TODO::
-        /*uint32_t size = static_cast<uint32_t> (sizeof(CacheableVector^));
+        /*System::UInt32 size = static_cast<System::UInt32> (sizeof(CacheableVector^));
         for each (IGeodeSerializable^ val in this) {
           if (val != nullptr) {
             size += val->ObjectSize;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CacheableVector.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableVector.hpp b/src/clicache/src/CacheableVector.hpp
index 97645e7..886f6a0 100644
--- a/src/clicache/src/CacheableVector.hpp
+++ b/src/clicache/src/CacheableVector.hpp
@@ -90,9 +90,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>
@@ -101,9 +101,9 @@ namespace Apache
         /// type to create and deserialize into.
         /// </summary>
         /// <returns>the classId</returns>
-        virtual property uint32_t ClassId
+        virtual property System::UInt32 ClassId
         {
-          virtual uint32_t get()
+          virtual System::UInt32 get()
           {
             return GeodeClassIds::CacheableVector;
           }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CqAttributes.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqAttributes.cpp b/src/clicache/src/CqAttributes.cpp
index cf6e07c..7025eb6 100644
--- a/src/clicache/src/CqAttributes.cpp
+++ b/src/clicache/src/CqAttributes.cpp
@@ -39,7 +39,7 @@ namespace Apache
         NativePtr->getCqListeners( vrr );
         array<ICqListener<TKey, TResult>^>^ listners = gcnew array<ICqListener<TKey, TResult>^>( vrr.size( ) );
 
-        for( int32_t index = 0; index < vrr.size( ); index++ )
+        for( System::Int32 index = 0; index < vrr.size( ); index++ )
         {
           apache::geode::client::CqListenerPtr& nativeptr( vrr[ index ] );
           apache::geode::client::ManagedCqListenerGeneric* mg_listener =

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CqQuery.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqQuery.cpp b/src/clicache/src/CqQuery.cpp
index 21358bb..1e8461b 100644
--- a/src/clicache/src/CqQuery.cpp
+++ b/src/clicache/src/CqQuery.cpp
@@ -42,7 +42,7 @@ namespace Apache
       }
 
       generic<class TKey, class TResult>
-      ICqResults<TResult>^ CqQuery<TKey, TResult>::ExecuteWithInitialResults(uint32_t timeout)
+      ICqResults<TResult>^ CqQuery<TKey, TResult>::ExecuteWithInitialResults(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/CqQuery.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqQuery.hpp b/src/clicache/src/CqQuery.hpp
index 3abbe2f..97f3d47 100644
--- a/src/clicache/src/CqQuery.hpp
+++ b/src/clicache/src/CqQuery.hpp
@@ -88,7 +88,7 @@ namespace Apache
         /// <exception cref="IllegalArgumentException">
         /// if timeout parameter is greater than 2^31/1000.
         /// </exception>
-        ICqResults<TResult>^ ExecuteWithInitialResults(uint32_t timeout);
+        ICqResults<TResult>^ ExecuteWithInitialResults(System::UInt32 timeout);
 
         /// <summary>
         /// Get the string for this cq query.

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CqServiceStatistics.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqServiceStatistics.cpp b/src/clicache/src/CqServiceStatistics.cpp
index 6cfbaaa..c52a85c 100644
--- a/src/clicache/src/CqServiceStatistics.cpp
+++ b/src/clicache/src/CqServiceStatistics.cpp
@@ -26,23 +26,23 @@ namespace Apache
     namespace Client
     {
 
-	uint32_t CqServiceStatistics::numCqsActive( )
+	System::UInt32 CqServiceStatistics::numCqsActive( )
 	{
 	  return NativePtr->numCqsActive( );
 	}
-    uint32_t CqServiceStatistics::numCqsCreated( )
+    System::UInt32 CqServiceStatistics::numCqsCreated( )
 	{
 	  return NativePtr->numCqsCreated( );
 	}
-    uint32_t CqServiceStatistics::numCqsClosed( )
+    System::UInt32 CqServiceStatistics::numCqsClosed( )
 	{
 	  return NativePtr->numCqsClosed( );
 	}
-    uint32_t CqServiceStatistics::numCqsStopped( )
+    System::UInt32 CqServiceStatistics::numCqsStopped( )
 	{
 	  return NativePtr->numCqsStopped( );
 	}
-    uint32_t CqServiceStatistics::numCqsOnClient( )
+    System::UInt32 CqServiceStatistics::numCqsOnClient( )
 	{
 	  return NativePtr->numCqsOnClient( );
     }  // namespace Client

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CqServiceStatistics.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqServiceStatistics.hpp b/src/clicache/src/CqServiceStatistics.hpp
index 424cdb1..fc8f235 100644
--- a/src/clicache/src/CqServiceStatistics.hpp
+++ b/src/clicache/src/CqServiceStatistics.hpp
@@ -41,29 +41,29 @@ namespace Apache
         ///Get the number of CQs currently active. 
         ///Active CQs are those which are executing (in running state).
         /// </summary>
-          uint32_t numCqsActive( );
+          System::UInt32 numCqsActive( );
 
         /// <summary>
         ///Get the total number of CQs created. This is a cumulative number.
         /// </summary>
-          uint32_t numCqsCreated( );
+          System::UInt32 numCqsCreated( );
 
         /// <summary>
         ///Get the total number of closed CQs. This is a cumulative number.
         /// </summary>
-          uint32_t numCqsClosed( );
+          System::UInt32 numCqsClosed( );
 
         /// <summary>
         ///Get the number of stopped CQs currently.
         /// </summary>
-          uint32_t numCqsStopped( );
+          System::UInt32 numCqsStopped( );
 
         /// <summary>
         ///Get number of CQs that are currently active or stopped. 
         ///The CQs included in this number are either running or stopped (suspended).
         ///Closed CQs are not included.
         /// </summary>
-          uint32_t numCqsOnClient( );
+          System::UInt32 numCqsOnClient( );
 
       internal:
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/391d79b9/src/clicache/src/CqStatistics.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqStatistics.cpp b/src/clicache/src/CqStatistics.cpp
index 82adb9d..8378f20 100644
--- a/src/clicache/src/CqStatistics.cpp
+++ b/src/clicache/src/CqStatistics.cpp
@@ -26,19 +26,19 @@ namespace Apache
     namespace Client
     {
 
-		uint32_t CqStatistics::numInserts( )
+		System::UInt32 CqStatistics::numInserts( )
 	{
 	  return NativePtr->numInserts( );
 	}
-    uint32_t CqStatistics::numDeletes( )
+    System::UInt32 CqStatistics::numDeletes( )
 	{
 	  return NativePtr->numDeletes( );
 	}
-    uint32_t CqStatistics::numUpdates( )
+    System::UInt32 CqStatistics::numUpdates( )
 	{
 	  return NativePtr->numUpdates( );
 	}
-    uint32_t CqStatistics::numEvents( )
+    System::UInt32 CqStatistics::numEvents( )
 	{
 	  return NativePtr->numEvents( );
     }  // namespace Client


Mime
View raw message