geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [4/8] geode-native git commit: GEODE-2439: Remove int type definitions
Date Fri, 24 Feb 2017 03:39:25 GMT
GEODE-2439: Remove int type definitions


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

Branch: refs/heads/develop
Commit: fd204478b6f73e6d4dc814fd3efeba9d804774ae
Parents: 8e3db6f
Author: David Kimura <dkimura@pivotal.io>
Authored: Wed Feb 22 11:03:37 2017 -0800
Committer: David Kimura <dkimura@pivotal.io>
Committed: Thu Feb 23 16:07:04 2017 -0800

----------------------------------------------------------------------
 src/clicache/src/CacheableDate.cpp              |   2 +-
 .../src/ReflectionBasedAutoSerializer.cpp       |   4 +-
 src/clicache/src/Serializable.cpp               |  14 +-
 src/clicache/src/Serializable.hpp               |  14 +-
 src/clicache/src/StatisticsFactory.cpp          |   2 +-
 src/clicache/src/StatisticsFactory.hpp          |   4 +-
 src/clicache/src/impl/ManagedCacheableDelta.cpp |   2 +-
 src/clicache/src/impl/ManagedCacheableKey.cpp   |   2 +-
 .../src/impl/PdxInstanceFactoryImpl.cpp         |   2 +-
 src/clicache/src/impl/PdxInstanceImpl.cpp       |   2 +-
 src/clicache/src/impl/PdxLocalWriter.cpp        |   4 +-
 .../src/impl/PdxManagedCacheableKey.cpp         |   2 +-
 src/cppcache/include/geode/Log.hpp              |   4 +-
 src/cppcache/include/geode/geode_base.hpp       |  35 ----
 src/cppcache/include/geode/geode_globals.hpp    |   2 +
 .../geode/statistics/StatisticDescriptor.hpp    |   6 +-
 .../include/geode/statistics/Statistics.hpp     |  50 +++---
 .../geode/statistics/StatisticsFactory.hpp      |  20 +--
 .../include/geode/statistics/StatisticsType.hpp |   4 +-
 .../ThinClientSecurityHelper.hpp                |   2 +-
 .../testThinClientFixedPartitionResolver.cpp    |  10 +-
 .../testThinClientPRSingleHopServerGroup.cpp    |  24 +--
 .../testThinClientStatistics.cpp                |   2 +-
 src/cppcache/src/BucketServerLocation.hpp       |   8 +-
 src/cppcache/src/CacheImpl.cpp                  |   6 +-
 src/cppcache/src/CacheImpl.hpp                  |   6 +-
 src/cppcache/src/ClientMetadataService.cpp      |   4 +-
 src/cppcache/src/ClientMetadataService.hpp      |   2 +-
 src/cppcache/src/Connector.hpp                  |   2 +-
 src/cppcache/src/CqQueryVsdStats.hpp            |   2 +-
 src/cppcache/src/CqServiceVsdStats.hpp          |   2 +-
 src/cppcache/src/ExecutionImpl.cpp              |   8 +-
 src/cppcache/src/ExecutionImpl.hpp              |   8 +-
 src/cppcache/src/HostAsm.hpp                    |   2 +-
 src/cppcache/src/LocalRegion.cpp                |  26 +--
 src/cppcache/src/Log.cpp                        | 107 ++---------
 src/cppcache/src/PdxFieldType.cpp               |   6 +-
 src/cppcache/src/PdxFieldType.hpp               |  26 +--
 src/cppcache/src/PdxHelper.cpp                  |  55 ++----
 src/cppcache/src/PdxHelper.hpp                  |  18 +-
 src/cppcache/src/PdxInstanceImpl.cpp            |   2 +-
 src/cppcache/src/PdxLocalReader.hpp             |   2 +-
 src/cppcache/src/PdxLocalWriter.cpp             |  12 +-
 src/cppcache/src/PdxLocalWriter.hpp             |  10 +-
 src/cppcache/src/PdxRemotePreservedData.hpp     |  18 +-
 src/cppcache/src/PdxRemoteWriter.hpp            |   8 +-
 src/cppcache/src/PdxType.cpp                    |  14 +-
 src/cppcache/src/PdxType.hpp                    |  46 ++---
 src/cppcache/src/PdxTypeRegistry.cpp            |  16 +-
 src/cppcache/src/PdxTypeRegistry.hpp            |  14 +-
 src/cppcache/src/PdxWriterWithTypeCollector.cpp |  10 +-
 src/cppcache/src/PdxWriterWithTypeCollector.hpp |   6 +-
 src/cppcache/src/PoolStatistics.hpp             |  22 +--
 src/cppcache/src/RegionStats.hpp                |   2 +-
 src/cppcache/src/RemoteQuery.cpp                |   2 +-
 src/cppcache/src/TcpConn.hpp                    |   2 +-
 src/cppcache/src/TcpSslConn.hpp                 |   2 +-
 src/cppcache/src/TcrConnection.cpp              |   6 +-
 src/cppcache/src/TcrConnection.hpp              |   8 +-
 src/cppcache/src/TcrEndpoint.cpp                |   2 +-
 src/cppcache/src/TcrEndpoint.hpp                |   2 +-
 src/cppcache/src/TcrMessage.cpp                 |   2 +-
 src/cppcache/src/TcrMessage.hpp                 |  12 +-
 src/cppcache/src/TcrPoolEndPoint.cpp            |   2 +-
 src/cppcache/src/TcrPoolEndPoint.hpp            |   2 +-
 src/cppcache/src/ThinClientHARegion.cpp         |   2 +-
 src/cppcache/src/ThinClientPoolDM.cpp           |   2 +-
 src/cppcache/src/ThinClientPoolDM.hpp           |   4 +-
 .../src/ThinClientRedundancyManager.cpp         |   2 +-
 src/cppcache/src/ThinClientRegion.cpp           |   4 +-
 src/cppcache/src/ThinClientRegion.hpp           |   2 +-
 src/cppcache/src/Utils.hpp                      |   4 +-
 .../src/VersionedCacheableObjectPartList.hpp    |   2 +-
 src/cppcache/src/hostsolaris.asm                |   2 +-
 .../src/statistics/AtomicStatisticsImpl.cpp     | 126 ++++++-------
 .../src/statistics/AtomicStatisticsImpl.hpp     |  94 +++++-----
 .../src/statistics/GeodeStatisticsFactory.cpp   |  26 +--
 .../src/statistics/GeodeStatisticsFactory.hpp   |  26 +--
 src/cppcache/src/statistics/HostStatHelper.cpp  |  12 +-
 src/cppcache/src/statistics/HostStatHelper.hpp  |  12 +-
 .../src/statistics/HostStatHelperLinux.cpp      |  36 ++--
 .../src/statistics/HostStatHelperSolaris.cpp    |  39 ++--
 .../src/statistics/HostStatHelperWin.cpp        |  53 +++---
 .../src/statistics/HostStatHelperWin.hpp        |  20 +--
 src/cppcache/src/statistics/HostStatSampler.cpp |  80 ++++-----
 src/cppcache/src/statistics/HostStatSampler.hpp |  38 ++--
 .../src/statistics/LinuxProcessStats.cpp        |  14 +-
 .../src/statistics/LinuxProcessStats.hpp        |  24 +--
 .../src/statistics/NullProcessStats.cpp         |  12 +-
 .../src/statistics/NullProcessStats.hpp         |  12 +-
 .../src/statistics/OsStatisticsImpl.cpp         | 110 ++++++------
 .../src/statistics/OsStatisticsImpl.hpp         |  96 +++++-----
 .../src/statistics/PoolStatsSampler.cpp         |  20 +--
 .../src/statistics/PoolStatsSampler.hpp         |   6 +-
 src/cppcache/src/statistics/ProcessStats.cpp    |   2 +-
 src/cppcache/src/statistics/ProcessStats.hpp    |  10 +-
 .../src/statistics/SolarisProcessStats.cpp      |  14 +-
 .../src/statistics/SolarisProcessStats.hpp      |  26 +--
 .../src/statistics/StatArchiveWriter.cpp        | 179 +++++++------------
 .../src/statistics/StatArchiveWriter.hpp        | 100 +++++------
 .../src/statistics/StatSamplerStats.cpp         |   4 +-
 .../src/statistics/StatSamplerStats.hpp         |   6 +-
 .../src/statistics/StatisticDescriptorImpl.cpp  |  36 ++--
 .../src/statistics/StatisticDescriptorImpl.hpp  |  38 ++--
 src/cppcache/src/statistics/Statistics.cpp      |  52 +++---
 .../src/statistics/StatisticsManager.cpp        |  22 +--
 .../src/statistics/StatisticsManager.hpp        |  18 +-
 .../src/statistics/StatisticsTypeImpl.cpp       |  22 +--
 .../src/statistics/StatisticsTypeImpl.hpp       |  20 +--
 .../src/statistics/WindowsProcessStats.cpp      |  12 +-
 .../src/statistics/WindowsProcessStats.hpp      |  42 ++---
 src/tests/cpp/testobject/ArrayOfByte.hpp        |   4 +-
 112 files changed, 1007 insertions(+), 1205 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/clicache/src/CacheableDate.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableDate.cpp b/src/clicache/src/CacheableDate.cpp
index 2a55557..b8fb2b8 100644
--- a/src/clicache/src/CacheableDate.cpp
+++ b/src/clicache/src/CacheableDate.cpp
@@ -90,7 +90,7 @@ namespace Apache
           TimeSpan epochSpan = m_dateTime - EpochTime;
           int64_t millitime =
             epochSpan.Ticks / TimeSpan::TicksPerMillisecond;
-          m_hashcode = (int)millitime ^ (int)((int64)millitime >> 32);
+          m_hashcode = (int)millitime ^ (int)((int64_t)millitime >> 32);
         }
         return m_hashcode;
       }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/clicache/src/ReflectionBasedAutoSerializer.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ReflectionBasedAutoSerializer.cpp b/src/clicache/src/ReflectionBasedAutoSerializer.cpp
index 1a711d8..af5dcdf 100755
--- a/src/clicache/src/ReflectionBasedAutoSerializer.cpp
+++ b/src/clicache/src/ReflectionBasedAutoSerializer.cpp
@@ -193,7 +193,7 @@ namespace Apache
                   w->WriteIntArray(m_fieldName, (array<Int32>^)value);
                 break;
 			          case FieldType::LONG_ARRAY:
-                  w->WriteLongArray(m_fieldName, (array<int64>^)value);
+                  w->WriteLongArray(m_fieldName, (array<int64_t>^)value);
                 break;
 			          case FieldType::FLOAT_ARRAY:
                   w->WriteFloatArray(m_fieldName, (array<float>^)value);
@@ -562,4 +562,4 @@ namespace Apache
 }  // namespace Apache
 
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/clicache/src/Serializable.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/Serializable.cpp b/src/clicache/src/Serializable.cpp
index d42439b..b95003c 100644
--- a/src/clicache/src/Serializable.cpp
+++ b/src/clicache/src/Serializable.cpp
@@ -218,13 +218,13 @@ namespace Apache
         return (Apache::Geode::Client::Serializable^)CacheableStringArray::Create(value);
       }
 
-      int32 Serializable::GetPDXIdForType(const char* poolName, IGeodeSerializable^ pdxType)
+      int32_t Serializable::GetPDXIdForType(const char* poolName, IGeodeSerializable^ pdxType)
       {
         apache::geode::client::CacheablePtr kPtr(SafeMSerializableConvertGeneric(pdxType));
         return apache::geode::client::SerializationRegistry::GetPDXIdForType(poolName, kPtr);
       }
 
-      IGeodeSerializable^ Serializable::GetPDXTypeById(const char* poolName, int32 typeId)
+      IGeodeSerializable^ Serializable::GetPDXTypeById(const char* poolName, int32_t typeId)
       {
         SerializablePtr sPtr = apache::geode::client::SerializationRegistry::GetPDXTypeById(poolName, typeId);
         return SafeUMSerializableConvertGeneric(sPtr.ptr());
@@ -1345,7 +1345,7 @@ namespace Apache
                 }
 
                 //int16
-                int16 Serializable::getInt16(apache::geode::client::SerializablePtr nativeptr)
+                int16_t Serializable::getInt16(apache::geode::client::SerializablePtr nativeptr)
                 {
                   apache::geode::client::CacheableInt16* ci = static_cast<apache::geode::client::CacheableInt16*>(nativeptr.ptr());
                   return ci->value();
@@ -1357,25 +1357,25 @@ namespace Apache
                 }
 
                 //int32
-                int32 Serializable::getInt32(apache::geode::client::SerializablePtr nativeptr)
+                int32_t Serializable::getInt32(apache::geode::client::SerializablePtr nativeptr)
                 {
                   apache::geode::client::CacheableInt32* ci = static_cast<apache::geode::client::CacheableInt32*>(nativeptr.ptr());
                   return ci->value();
                 }
 
-                apache::geode::client::CacheableKeyPtr Serializable::getCacheableInt32(int32 val)
+                apache::geode::client::CacheableKeyPtr Serializable::getCacheableInt32(int32_t val)
                 {
                   return apache::geode::client::CacheableInt32::create(val);
                 }
 
                 //int64
-                int64 Serializable::getInt64(apache::geode::client::SerializablePtr nativeptr)
+                int64_t Serializable::getInt64(apache::geode::client::SerializablePtr nativeptr)
                 {
                   apache::geode::client::CacheableInt64* ci = static_cast<apache::geode::client::CacheableInt64*>(nativeptr.ptr());
                   return ci->value();
                 }
 
-                apache::geode::client::CacheableKeyPtr Serializable::getCacheableInt64(int64 val)
+                apache::geode::client::CacheableKeyPtr Serializable::getCacheableInt64(int64_t val)
                 {
                   return apache::geode::client::CacheableInt64::create(val);
                 }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/clicache/src/Serializable.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/Serializable.hpp b/src/clicache/src/Serializable.hpp
index 0dc6ba3..5b67491 100644
--- a/src/clicache/src/Serializable.hpp
+++ b/src/clicache/src/Serializable.hpp
@@ -295,8 +295,8 @@ namespace Apache
 
       internal:
 
-				static int32 GetPDXIdForType(const char* poolName, IGeodeSerializable^ pdxType);
-				static IGeodeSerializable^ GetPDXTypeById(const char* poolName, int32 typeId);
+				static int32_t GetPDXIdForType(const char* poolName, IGeodeSerializable^ pdxType);
+				static IGeodeSerializable^ GetPDXTypeById(const char* poolName, int32_t typeId);
 				static IPdxSerializable^ Serializable::GetPdxType(String^ className);
 				static void RegisterPDXManagedCacheableKey(bool appDomainEnable);
         static bool IsObjectAndPdxSerializerRegistered(String^ className);
@@ -344,19 +344,19 @@ namespace Apache
         static apache::geode::client::CacheableKeyPtr getCacheableFloat(float val);
         
         //int16
-        static int16 getInt16(apache::geode::client::SerializablePtr nativeptr);
+        static int16_t getInt16(apache::geode::client::SerializablePtr nativeptr);
         
         static apache::geode::client::CacheableKeyPtr getCacheableInt16(int val);
         
         //int32
-        static int32 getInt32(apache::geode::client::SerializablePtr nativeptr);
+        static int32_t getInt32(apache::geode::client::SerializablePtr nativeptr);
         
-        static apache::geode::client::CacheableKeyPtr getCacheableInt32(int32 val);
+        static apache::geode::client::CacheableKeyPtr getCacheableInt32(int32_t val);
         
         //int64
-        static int64 getInt64(apache::geode::client::SerializablePtr nativeptr);
+        static int64_t getInt64(apache::geode::client::SerializablePtr nativeptr);
         
-        static apache::geode::client::CacheableKeyPtr getCacheableInt64(int64 val);
+        static apache::geode::client::CacheableKeyPtr getCacheableInt64(int64_t val);
         
         //cacheable ascii string
         static String^ getASCIIString(apache::geode::client::SerializablePtr nativeptr);        

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/clicache/src/StatisticsFactory.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/StatisticsFactory.cpp b/src/clicache/src/StatisticsFactory.cpp
index a782c0d..73b7ba5 100644
--- a/src/clicache/src/StatisticsFactory.cpp
+++ b/src/clicache/src/StatisticsFactory.cpp
@@ -148,7 +148,7 @@ namespace Apache
       }
 
       StatisticsType^ StatisticsFactory::CreateType( String^ name, String^ description,
-                                   array<StatisticDescriptor^>^ stats, int32 statsLength)
+                                   array<StatisticDescriptor^>^ stats, int32_t statsLength)
       {
         ManagedString mg_name( name );
         ManagedString mg_description( description );

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/clicache/src/StatisticsFactory.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/StatisticsFactory.hpp b/src/clicache/src/StatisticsFactory.hpp
index a218dbe..38b2a38 100644
--- a/src/clicache/src/StatisticsFactory.hpp
+++ b/src/clicache/src/StatisticsFactory.hpp
@@ -159,7 +159,7 @@ namespace Apache
         /// if a type with the given <c>name</c> already exists.
         /// </exception>
         virtual StatisticsType^ CreateType(String^ name, String^ description,
-                                           array<StatisticDescriptor^>^ stats, int32 statsLength);
+                                           array<StatisticDescriptor^>^ stats, int32_t statsLength);
 
         /// <summary>
         /// Finds and returns an already created <see cref="StatisticsType" /> 
@@ -213,7 +213,7 @@ namespace Apache
         /// <para>
         /// The created instance will be <see cref="Statistics#isAtomic" /> atomic.
         /// </para>
-        virtual Statistics^ CreateAtomicStatistics(StatisticsType^ type, String^ textId, int64 numericId);
+        virtual Statistics^ CreateAtomicStatistics(StatisticsType^ type, String^ textId, int64_t numericId);
 
         /// <summary>
         /// Return the first instance that matches the type, or NULL

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/clicache/src/impl/ManagedCacheableDelta.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedCacheableDelta.cpp b/src/clicache/src/impl/ManagedCacheableDelta.cpp
index 4e3e31f..93fc016 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 pos = (int)output.getBufferLength();
+          uint32_t 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

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/clicache/src/impl/ManagedCacheableKey.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedCacheableKey.cpp b/src/clicache/src/impl/ManagedCacheableKey.cpp
index 8ed3497..510eee7 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 pos = (int)output.getBufferLength();
+          uint32_t pos = (int)output.getBufferLength();
           //Apache::Geode::Client::Log::Debug("ManagedCacheableKeyGeneric::toData");      
           Apache::Geode::Client::DataOutput mg_output(&output, true);
           m_managedptr->ToData(%mg_output);

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/clicache/src/impl/PdxInstanceFactoryImpl.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxInstanceFactoryImpl.cpp b/src/clicache/src/impl/PdxInstanceFactoryImpl.cpp
index 8790c78..d2e54e0 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>^)fieldValue);
+            return this->WriteIntArray(fieldName, (array<int32_t>^)fieldValue);
           }
           else if (type->Equals(DotNetTypes::LongArrayType))
           {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/clicache/src/impl/PdxInstanceImpl.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxInstanceImpl.cpp b/src/clicache/src/impl/PdxInstanceImpl.cpp
index 8e45af0..735d842 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 sampleStartNanos = Utils::startStatOpTime();
+          int64_t sampleStartNanos = Utils::startStatOpTime();
           Object^ ret = Internal::PdxHelper::DeserializePdx(dataInput, true, m_typeId, m_bufferLength);
           //dataInput->ResetPdx(0);
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/clicache/src/impl/PdxLocalWriter.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxLocalWriter.cpp b/src/clicache/src/impl/PdxLocalWriter.cpp
index eba6bc7..cf80944 100644
--- a/src/clicache/src/impl/PdxLocalWriter.cpp
+++ b/src/clicache/src/impl/PdxLocalWriter.cpp
@@ -446,7 +446,7 @@ namespace Apache
             }
             else if(type->Equals(DotNetTypes::IntArrayType))
             {
-              return this->WriteIntArray(fieldName, (array<int32>^)fieldValue);
+              return this->WriteIntArray(fieldName, (array<int32_t>^)fieldValue);
             }
             else if(type->Equals(DotNetTypes::LongArrayType))
             {
@@ -487,4 +487,4 @@ namespace Apache
 
     }
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/clicache/src/impl/PdxManagedCacheableKey.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxManagedCacheableKey.cpp b/src/clicache/src/impl/PdxManagedCacheableKey.cpp
index 35f8b98..c1fa298 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 pos = (int)output.getBufferLength();
+          uint32_t 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 );

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/cppcache/include/geode/Log.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/geode/Log.hpp b/src/cppcache/include/geode/Log.hpp
index 9a9a4d1..0ba8873 100644
--- a/src/cppcache/include/geode/Log.hpp
+++ b/src/cppcache/include/geode/Log.hpp
@@ -199,8 +199,8 @@ class CPPCACHE_EXPORT Log {
    */
   static void init
       // 0 => use maximum value (currently 1G)
-      (LogLevel level, const char* logFileName, int32 logFileLimit = 0,
-       int64 logDiskSpaceLimit = 0);
+      (LogLevel level, const char* logFileName, int32_t logFileLimit = 0,
+       int64_t logDiskSpaceLimit = 0);
 
   /**
    * closes logging facility (until next init).

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/cppcache/include/geode/geode_base.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/geode/geode_base.hpp b/src/cppcache/include/geode/geode_base.hpp
index 88f3d95..fb318fc 100644
--- a/src/cppcache/include/geode/geode_base.hpp
+++ b/src/cppcache/include/geode/geode_base.hpp
@@ -70,31 +70,6 @@
 #endif
 
 #if defined(_MSC_VER)
-/* 32 bit Windows only, for now */
-typedef signed char int8;        /**< single byte, character or boolean field */
-typedef unsigned char uint8;     /**< unsigned integer value */
-typedef signed short int16;      /**< signed 16 bit integer (short) */
-typedef unsigned short uint16;   /**< unsigned 16 bit integer (ushort) */
-typedef signed int int32;        /**< signed 32 bit integer */
-typedef unsigned int uint32;     /**< unsigned 32 bit integer */
-typedef signed __int64 int64;    /**< signed 64 bit integer */
-typedef unsigned __int64 uint64; /**< unsigned 64 bit integer */
-
-// typedef int32            intptr_t; /**< a pointer to a 32 bit integer */
-// typedef uint32           uintptr_t; /**< a pointer to an unsigned 32 bit
-// integer */
-
-/* Windows does not have stdint.h */
-typedef int8 int8_t;
-typedef uint8 uint8_t;
-typedef int16 int16_t;
-typedef uint16 uint16_t;
-typedef int32 int32_t;
-typedef uint32 uint32_t;
-typedef int64 int64_t;
-typedef uint64 uint64_t;
-/* end stdint.h */
-
 /* Windows does not have inttypes.h */
 /* 32 bit Windows only, for now */
 #if !defined PRId8
@@ -178,16 +153,6 @@ typedef uint64 uint64_t;
 #else
 /* Unix, including both Sparc Solaris and Linux */
 #define __STDC_FORMAT_MACROS
-#include <inttypes.h>
-typedef int8_t int8;     /**< single byte, character or boolean field */
-typedef uint8_t uint8;   /**< unsigned integer value */
-typedef int16_t int16;   /**< signed 16 bit integer (short) */
-typedef uint16_t uint16; /**< unsigned 16 bit integer (ushort) */
-typedef int32_t int32;   /**< signed 32 bit integer */
-typedef uint32_t uint32; /**< unsigned 32 bit integer */
-typedef int64_t int64;   /**< signed 64 bit integer */
-typedef uint64_t uint64; /**< unsigned 64 bit integer */
-
 #ifndef _WCHAR_H
 #include <wchar.h>
 #endif

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/cppcache/include/geode/geode_globals.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/geode/geode_globals.hpp b/src/cppcache/include/geode/geode_globals.hpp
index 7663441..76fd28e 100644
--- a/src/cppcache/include/geode/geode_globals.hpp
+++ b/src/cppcache/include/geode/geode_globals.hpp
@@ -116,6 +116,8 @@
 
 #include "geode_base.hpp"
 
+#include <cstdint>
+
 namespace apache {
 namespace geode {
 namespace client {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/cppcache/include/geode/statistics/StatisticDescriptor.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/geode/statistics/StatisticDescriptor.hpp b/src/cppcache/include/geode/statistics/StatisticDescriptor.hpp
index 084dbea..af05086 100644
--- a/src/cppcache/include/geode/statistics/StatisticDescriptor.hpp
+++ b/src/cppcache/include/geode/statistics/StatisticDescriptor.hpp
@@ -51,7 +51,7 @@ class CPPCACHE_EXPORT StatisticDescriptor {
     * }. The id is initialized when its statistics
     * type is created.
     */
-  virtual int32 getId() = 0;
+  virtual int32_t getId() = 0;
 
   /**
    * Returns the name of this statistic
@@ -68,12 +68,12 @@ class CPPCACHE_EXPORT StatisticDescriptor {
    * Counter statistics have values that always increase.
    * Gauge statistics have unconstrained values.
    */
-  virtual int8 isCounter() = 0;
+  virtual bool isCounter() = 0;
 
   /**
    *  Returns true if a larger statistic value indicates better performance.
    */
-  virtual int8 isLargerBetter() = 0;
+  virtual bool isLargerBetter() = 0;
 
   /**
    *  Returns the unit in which this statistic is measured

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/cppcache/include/geode/statistics/Statistics.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/geode/statistics/Statistics.hpp b/src/cppcache/include/geode/statistics/Statistics.hpp
index dcaf9bc..54c972a 100644
--- a/src/cppcache/include/geode/statistics/Statistics.hpp
+++ b/src/cppcache/include/geode/statistics/Statistics.hpp
@@ -59,7 +59,7 @@ class CPPCACHE_EXPORT Statistics {
    *
    * @see StatisticsType#nameToDescriptor
    */
-  virtual int32 nameToId(const char* name) = 0;
+  virtual int32_t nameToId(const char* name) = 0;
 
   /**
    * Returns the descriptor of the statistic with the given name in this
@@ -77,7 +77,7 @@ class CPPCACHE_EXPORT Statistics {
   /**
    * Gets a value that uniquely identifies this statistics.
    */
-  virtual int64 getUniqueId() = 0;
+  virtual int64_t getUniqueId() = 0;
 
   /**
    * Gets the {@link StatisticsType} of this instance.
@@ -91,7 +91,7 @@ class CPPCACHE_EXPORT Statistics {
    * Gets the number associated with this instance that helps identify it.
    */
 
-  virtual int64 getNumericId() = 0;
+  virtual int64_t getNumericId() = 0;
   /**
    * Returns true if modifications are atomic. This means that multiple threads
    * can safely modify this instance without additional synchronization.
@@ -127,7 +127,7 @@ class CPPCACHE_EXPORT Statistics {
    * @throws IllegalArgumentException
    *         If the id is invalid.
    */
-  virtual void setInt(int32 id, int32 value) = 0;
+  virtual void setInt(int32_t id, int32_t value) = 0;
 
   /**
    * Sets the value of a named statistic of type <code>int</code>
@@ -139,7 +139,7 @@ class CPPCACHE_EXPORT Statistics {
    *         if the statistic with name <code>name</code> is not of
    *         type <code>int</code>.
    */
-  virtual void setInt(char* name, int32 value) = 0;
+  virtual void setInt(char* name, int32_t value) = 0;
 
   /**
    * Sets the value of a described statistic of type <code>int</code>
@@ -153,7 +153,7 @@ class CPPCACHE_EXPORT Statistics {
    *         if the described statistic is not of
    *         type <code>int</code>.
    */
-  virtual void setInt(StatisticDescriptor* descriptor, int32 value) = 0;
+  virtual void setInt(StatisticDescriptor* descriptor, int32_t value) = 0;
 
   /**
    * Sets the value of a statistic with the given <code>id</code>
@@ -166,7 +166,7 @@ class CPPCACHE_EXPORT Statistics {
    *         If the id is invalid.
    */
 
-  virtual void setLong(int32 id, int64 value) = 0;
+  virtual void setLong(int32_t id, int64_t value) = 0;
   /**
    * Sets the value of a described statistic of type <code>long</code>
    *
@@ -179,7 +179,7 @@ class CPPCACHE_EXPORT Statistics {
    *         if the described statistic is not of
    *         type <code>long</code>.
    */
-  virtual void setLong(StatisticDescriptor* descriptor, int64 value) = 0;
+  virtual void setLong(StatisticDescriptor* descriptor, int64_t value) = 0;
 
   /**
    * Sets the value of a named statistic of type <code>long</code>.
@@ -191,7 +191,7 @@ class CPPCACHE_EXPORT Statistics {
    *         if the statistic with name <code>name</code> is not of
    *         type <code>long</code>.
    */
-  virtual void setLong(char* name, int64 value) = 0;
+  virtual void setLong(char* name, int64_t value) = 0;
 
   /**
    * Sets the value of a statistic with the given <code>id</code>
@@ -203,7 +203,7 @@ class CPPCACHE_EXPORT Statistics {
    * @throws IllegalArgumentException
    *         If the id is invalid.
    */
-  virtual void setDouble(int32 id, double value) = 0;
+  virtual void setDouble(int32_t id, double value) = 0;
 
   /**
    * Sets the value of a described statistic of type <code>double</code>
@@ -242,7 +242,7 @@ class CPPCACHE_EXPORT Statistics {
    * @throws IllegalArgumentException
    *         If the id is invalid.
    */
-  virtual int32 getInt(int32 id) = 0;
+  virtual int32_t getInt(int32_t id) = 0;
 
   /**
    * Returns the value of the described statistic of type <code>int</code>.
@@ -256,7 +256,7 @@ class CPPCACHE_EXPORT Statistics {
    *         if the described statistic is not of
    *         type <code>int</code>.
    */
-  virtual int32 getInt(
+  virtual int32_t getInt(
       apache::geode::statistics::StatisticDescriptor* descriptor) = 0;
   /**
    * Returns the value of the statistic of type <code>int</code> at
@@ -268,7 +268,7 @@ class CPPCACHE_EXPORT Statistics {
    *         if the statistic named <code>name</code> is not of
    *         type <code>int</code>.
    */
-  virtual int32 getInt(char* name) = 0;
+  virtual int32_t getInt(char* name) = 0;
 
   /**
    * Returns the value of the identified statistic of type <code>long</code>.
@@ -278,7 +278,7 @@ class CPPCACHE_EXPORT Statistics {
    * @throws IllegalArgumentException
    *         If the id is invalid.
    */
-  virtual int64 getLong(int32 id) = 0;
+  virtual int64_t getLong(int32_t id) = 0;
 
   /**
    * Returns the value of the described statistic of type <code>long</code>.
@@ -292,7 +292,7 @@ class CPPCACHE_EXPORT Statistics {
    *         if the described statistic is not of
    *         type <code>long</code>.
    */
-  virtual int64 getLong(StatisticDescriptor* descriptor) = 0;
+  virtual int64_t getLong(StatisticDescriptor* descriptor) = 0;
   /**
    * Returns the value of the statistic of type <code>long</code> at
    * the given name.
@@ -303,7 +303,7 @@ class CPPCACHE_EXPORT Statistics {
    *         if the statistic named <code>name</code> is not of
    *         type <code>long</code>.
    */
-  virtual int64 getLong(char* name) = 0;
+  virtual int64_t getLong(char* name) = 0;
 
   /**
    * Returns the value of the identified statistic of type <code>double</code>.
@@ -313,7 +313,7 @@ class CPPCACHE_EXPORT Statistics {
    * @throws IllegalArgumentException
    *         If the id is invalid.
    */
-  virtual double getDouble(int32 id) = 0;
+  virtual double getDouble(int32_t id) = 0;
 
   /**
    * Returns the value of the described statistic of type <code>double</code>.
@@ -368,7 +368,7 @@ class CPPCACHE_EXPORT Statistics {
    * @throws IllegalArgumentException
    *         If the described statistic does not exist
    */
-  virtual int64 getRawBits(StatisticDescriptor* descriptor) = 0;
+  virtual int64_t getRawBits(StatisticDescriptor* descriptor) = 0;
 
   /**
    * Returns the bits that represent the raw value of the named statistic.
@@ -393,7 +393,7 @@ class CPPCACHE_EXPORT Statistics {
    * @throws IllegalArgumentException
    *         If the id is invalid.
    */
-  virtual int32 incInt(int32 id, int32 delta) = 0;
+  virtual int32_t incInt(int32_t id, int32_t delta) = 0;
 
   /**
    * Increments the value of the described statistic of type <code>int</code>
@@ -409,7 +409,7 @@ class CPPCACHE_EXPORT Statistics {
    *         if the described statistic is not of
    *         type <code>int</code>.
    */
-  virtual int32 incInt(StatisticDescriptor* descriptor, int32 delta) = 0;
+  virtual int32_t incInt(StatisticDescriptor* descriptor, int32_t delta) = 0;
 
   /**
    * Increments the value of the statistic of type <code>int</code> with
@@ -423,7 +423,7 @@ class CPPCACHE_EXPORT Statistics {
    *         if the statistic named <code>name</code> is not of
    *         type <code>int</code>.
    */
-  virtual int32 incInt(char* name, int32 delta) = 0;
+  virtual int32_t incInt(char* name, int32_t delta) = 0;
 
   /**
    * Increments the value of the identified statistic of type <code>long</code>
@@ -438,7 +438,7 @@ class CPPCACHE_EXPORT Statistics {
    * @throws IllegalArgumentException
    *         If the id is invalid.
    */
-  virtual int64 incLong(int32 id, int64 delta) = 0;
+  virtual int64_t incLong(int32_t id, int64_t delta) = 0;
 
   /**
    * Increments the value of the described statistic of type <code>long</code>
@@ -455,7 +455,7 @@ class CPPCACHE_EXPORT Statistics {
    *         if the described statistic is not of
    *         type <code>long</code>.
    */
-  virtual int64 incLong(StatisticDescriptor* descriptor, int64 delta) = 0;
+  virtual int64_t incLong(StatisticDescriptor* descriptor, int64_t delta) = 0;
   /**
    * Increments the value of the statistic of type <code>long</code> with
    * the given name by a given amount.
@@ -469,7 +469,7 @@ class CPPCACHE_EXPORT Statistics {
    *         if the statistic named <code>name</code> is not of
    *         type <code>long</code>.
    */
-  virtual int64 incLong(char* name, int64 delta) = 0;
+  virtual int64_t incLong(char* name, int64_t delta) = 0;
 
   /**
    * Increments the value of the identified statistic of type
@@ -485,7 +485,7 @@ class CPPCACHE_EXPORT Statistics {
    * @throws IllegalArgumentException
    *         If the id is invalid.
    */
-  virtual double incDouble(int32 id, double delta) = 0;
+  virtual double incDouble(int32_t id, double delta) = 0;
 
   /**
    * Increments the value of the described statistic of type <code>double</code>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/cppcache/include/geode/statistics/StatisticsFactory.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/geode/statistics/StatisticsFactory.hpp b/src/cppcache/include/geode/statistics/StatisticsFactory.hpp
index 8445a62..44e84bb 100644
--- a/src/cppcache/include/geode/statistics/StatisticsFactory.hpp
+++ b/src/cppcache/include/geode/statistics/StatisticsFactory.hpp
@@ -74,7 +74,7 @@ class CPPCACHE_EXPORT StatisticsFactory {
   virtual StatisticDescriptor* createIntCounter(const char* name,
                                                 const char* description,
                                                 const char* units,
-                                                int8 largerBetter = true) = 0;
+                                                bool largerBetter = true) = 0;
 
   /**
    * Creates and returns a double counter {@link StatisticDescriptor}
@@ -85,7 +85,7 @@ class CPPCACHE_EXPORT StatisticsFactory {
   virtual StatisticDescriptor* createLongCounter(const char* name,
                                                  const char* description,
                                                  const char* units,
-                                                 int8 largerBetter = true) = 0;
+                                                 bool largerBetter = true) = 0;
 
   /**
     * Creates and returns an int gauge {@link StatisticDescriptor}
@@ -96,7 +96,7 @@ class CPPCACHE_EXPORT StatisticsFactory {
 
   virtual StatisticDescriptor* createDoubleCounter(
       const char* name, const char* description, const char* units,
-      int8 largerBetter = true) = 0;
+      bool largerBetter = true) = 0;
 
   /**
    * Creates and returns an int gauge {@link StatisticDescriptor}
@@ -106,7 +106,7 @@ class CPPCACHE_EXPORT StatisticsFactory {
   virtual StatisticDescriptor* createIntGauge(const char* name,
                                               const char* description,
                                               const char* units,
-                                              int8 largerBetter = false) = 0;
+                                              bool largerBetter = false) = 0;
 
   /**
    * Creates and returns an long gauge {@link StatisticDescriptor}
@@ -116,7 +116,7 @@ class CPPCACHE_EXPORT StatisticsFactory {
   virtual StatisticDescriptor* createLongGauge(const char* name,
                                                const char* description,
                                                const char* units,
-                                               int8 largerBetter = false) = 0;
+                                               bool largerBetter = false) = 0;
 
   /**
    * Creates and returns an double gauge {@link StatisticDescriptor}
@@ -126,7 +126,7 @@ class CPPCACHE_EXPORT StatisticsFactory {
   virtual StatisticDescriptor* createDoubleGauge(const char* name,
                                                  const char* description,
                                                  const char* units,
-                                                 int8 largerBetter = false) = 0;
+                                                 bool largerBetter = false) = 0;
 
   /**
    * Creates  and returns a {@link StatisticsType}
@@ -137,7 +137,7 @@ class CPPCACHE_EXPORT StatisticsFactory {
    */
   virtual StatisticsType* createType(const char* name, const char* description,
                                      StatisticDescriptor** stats,
-                                     int32 statsLength) = 0;
+                                     int32_t statsLength) = 0;
 
   /**
    * Finds and returns an already created {@link StatisticsType}
@@ -170,7 +170,7 @@ class CPPCACHE_EXPORT StatisticsFactory {
    * The created instance may not be {@link Statistics#isAtomic atomic}.
    */
   virtual Statistics* createStatistics(StatisticsType* type, const char* textId,
-                                       int64 numericId) = 0;
+                                       int64_t numericId) = 0;
 
   /**
    * Creates and returns a {@link Statistics} instance of the given {@link
@@ -197,7 +197,7 @@ class CPPCACHE_EXPORT StatisticsFactory {
    */
   virtual Statistics* createAtomicStatistics(StatisticsType* type,
                                              const char* textId,
-                                             int64 numericId) = 0;
+                                             int64_t numericId) = 0;
 
   /** Return the first instance that matches the type, or NULL */
   virtual Statistics* findFirstStatisticsByType(StatisticsType* type) = 0;
@@ -210,7 +210,7 @@ class CPPCACHE_EXPORT StatisticsFactory {
   /**
    * Returns a numeric id that can be used to identify the manager
    */
-  virtual int64 getId() = 0;
+  virtual int64_t getId() = 0;
 
  private:
   const StatisticsFactory& operator=(const StatisticsFactory&);

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/cppcache/include/geode/statistics/StatisticsType.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/geode/statistics/StatisticsType.hpp b/src/cppcache/include/geode/statistics/StatisticsType.hpp
index 1d2be00..c4d34ab 100644
--- a/src/cppcache/include/geode/statistics/StatisticsType.hpp
+++ b/src/cppcache/include/geode/statistics/StatisticsType.hpp
@@ -68,7 +68,7 @@ class CPPCACHE_EXPORT StatisticsType {
    *         No statistic named <code>name</code> exists in this
    *         statistics instance.
    */
-  virtual int32 nameToId(const char* name) = 0;
+  virtual int32_t nameToId(const char* name) = 0;
   /**
    * Returns the descriptor of the statistic with the given name in this
    * statistics instance.
@@ -82,7 +82,7 @@ class CPPCACHE_EXPORT StatisticsType {
   /**
    * Returns the total number of statistics descriptors in the type.
    */
-  virtual int32 getDescriptorsCount() = 0;
+  virtual int32_t getDescriptorsCount() = 0;
 
   // protected:
   /**

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/cppcache/integration-test/ThinClientSecurityHelper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientSecurityHelper.hpp b/src/cppcache/integration-test/ThinClientSecurityHelper.hpp
index 28b3e4b..20d732a 100644
--- a/src/cppcache/integration-test/ThinClientSecurityHelper.hpp
+++ b/src/cppcache/integration-test/ThinClientSecurityHelper.hpp
@@ -191,7 +191,7 @@ class putThread : public ACE_Task_Base {
 
   int svc(void) {
     int ops = 0;
-    int32 pid = ACE_OS::getpid();
+    int32_t pid = ACE_OS::getpid();
     ACE_thread_t thr_id = ACE_OS::thr_self();
     CacheableKeyPtr key;
     CacheableStringPtr value;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/cppcache/integration-test/testThinClientFixedPartitionResolver.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientFixedPartitionResolver.cpp b/src/cppcache/integration-test/testThinClientFixedPartitionResolver.cpp
index 0e72ba2..b274898 100644
--- a/src/cppcache/integration-test/testThinClientFixedPartitionResolver.cpp
+++ b/src/cppcache/integration-test/testThinClientFixedPartitionResolver.cpp
@@ -245,7 +245,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, CheckPrSingleHopForIntKeysTask_REGION)
         if (networkhop) {
           failureCount++;
         }
-        int8 serverGroupFlag = TestUtils::getCacheImpl(getHelper()->cachePtr)
+        int8_t serverGroupFlag = TestUtils::getCacheImpl(getHelper()->cachePtr)
                                    ->getAndResetServerGroupFlag();
         LOGDEBUG(
             "CheckPrSingleHopForIntKeysTask_REGION: serverGroupFlag is %d "
@@ -290,7 +290,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, CheckPrSingleHopForIntKeysTask_REGION)
         LOGDEBUG("CheckPrSingleHopForIntKeysTask_REGION: networkhop %d ",
                  networkhop);
         ASSERT(!networkhop, "It is networkhop operation.");
-        int8 serverGroupFlag = TestUtils::getCacheImpl(getHelper()->cachePtr)
+        int8_t serverGroupFlag = TestUtils::getCacheImpl(getHelper()->cachePtr)
                                    ->getAndResetServerGroupFlag();
         LOGDEBUG(
             "CheckPrSingleHopForIntKeysTask_REGION: serverGroupFlag is %d ",
@@ -337,7 +337,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, CheckPrSingleHopForIntKeysTask_REGION)
         LOGDEBUG("CheckPrSingleHopForIntKeysTask_REGION: networkhop %d ",
                  networkhop);
         ASSERT(!networkhop, "It is networkhop operation.");
-        int8 serverGroupFlag = TestUtils::getCacheImpl(getHelper()->cachePtr)
+        int8_t serverGroupFlag = TestUtils::getCacheImpl(getHelper()->cachePtr)
                                    ->getAndResetServerGroupFlag();
         LOGDEBUG(
             "CheckPrSingleHopForIntKeysTask_REGION: serverGroupFlag is %d ",
@@ -374,7 +374,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, CheckPrSingleHopForIntKeysTask_REGION)
         LOGDEBUG("CheckPrSingleHopForIntKeysTask_REGION: networkhop %d ",
                  networkhop);
         ASSERT(!networkhop, "It is networkhop operation.");
-        int8 serverGroupFlag = TestUtils::getCacheImpl(getHelper()->cachePtr)
+        int8_t serverGroupFlag = TestUtils::getCacheImpl(getHelper()->cachePtr)
                                    ->getAndResetServerGroupFlag();
         LOGDEBUG(
             "CheckPrSingleHopForIntKeysTask_REGION: serverGroupFlag is %d ",
@@ -417,7 +417,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, CheckPrSingleHopForIntKeysTask_REGION)
         LOGDEBUG("CheckPrSingleHopForIntKeysTask_REGION: networkhop %d ",
                  networkhop);
         ASSERT(!networkhop, "It is networkhop operation.");
-        int8 serverGroupFlag = TestUtils::getCacheImpl(getHelper()->cachePtr)
+        int8_t serverGroupFlag = TestUtils::getCacheImpl(getHelper()->cachePtr)
                                    ->getAndResetServerGroupFlag();
         LOGDEBUG(
             "CheckPrSingleHopForIntKeysTask_REGION: serverGroupFlag is %d ",

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/cppcache/integration-test/testThinClientPRSingleHopServerGroup.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPRSingleHopServerGroup.cpp b/src/cppcache/integration-test/testThinClientPRSingleHopServerGroup.cpp
index e422cf4..ac5cc4e 100644
--- a/src/cppcache/integration-test/testThinClientPRSingleHopServerGroup.cpp
+++ b/src/cppcache/integration-test/testThinClientPRSingleHopServerGroup.cpp
@@ -111,7 +111,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, CheckPrSingleHopForIntKeysTask_CLIENT1)
         if (networkhop) {
           failureCount++;
         }
-        int8 serverGroupFlag = TestUtils::getCacheImpl(getHelper()->cachePtr)
+        int8_t serverGroupFlag = TestUtils::getCacheImpl(getHelper()->cachePtr)
                                    ->getAndResetServerGroupFlag();
         LOGINFO(
             "CheckPrSingleHopForIntKeysTask_CLIENT1: serverGroupFlag is %d ",
@@ -174,7 +174,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, CheckPrSingleHopForIntKeysTask_CLIENT1)
         LOGINFO("CheckPrSingleHopForIntKeysTask_CLIENT1: networkhop %d ",
                 networkhop);
         ASSERT(!networkhop, "It is networkhop operation.");
-        int8 serverGroupFlag = TestUtils::getCacheImpl(getHelper()->cachePtr)
+        int8_t serverGroupFlag = TestUtils::getCacheImpl(getHelper()->cachePtr)
                                    ->getAndResetServerGroupFlag();
         LOGINFO(
             "CheckPrSingleHopForIntKeysTask_CLIENT1: serverGroupFlag is %d ",
@@ -220,7 +220,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, CheckPrSingleHopForIntKeysTask_CLIENT1)
         LOGINFO("CheckPrSingleHopForIntKeysTask_CLIENT1: networkhop %d ",
                 networkhop);
         ASSERT(!networkhop, "It is networkhop operation.");
-        int8 serverGroupFlag = TestUtils::getCacheImpl(getHelper()->cachePtr)
+        int8_t serverGroupFlag = TestUtils::getCacheImpl(getHelper()->cachePtr)
                                    ->getAndResetServerGroupFlag();
         LOGINFO(
             "CheckPrSingleHopForIntKeysTask_CLIENT1: serverGroupFlag is %d ",
@@ -263,7 +263,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, CheckPrSingleHopForIntKeysTask_CLIENT1)
         LOGINFO("CheckPrSingleHopForIntKeysTask_CLIENT1: networkhop %d ",
                 networkhop);
         ASSERT(!networkhop, "It is networkhop operation.");
-        int8 serverGroupFlag = TestUtils::getCacheImpl(getHelper()->cachePtr)
+        int8_t serverGroupFlag = TestUtils::getCacheImpl(getHelper()->cachePtr)
                                    ->getAndResetServerGroupFlag();
         LOGINFO(
             "CheckPrSingleHopForIntKeysTask_CLIENT1: serverGroupFlag is %d ",
@@ -318,7 +318,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, CheckPrSingleHopForIntKeysTask_CLIENT2)
         if (networkhop) {
           failureCount++;
         }
-        int8 serverGroupFlag = TestUtils::getCacheImpl(getHelper()->cachePtr)
+        int8_t serverGroupFlag = TestUtils::getCacheImpl(getHelper()->cachePtr)
                                    ->getAndResetServerGroupFlag();
         LOGINFO(
             "CheckPrSingleHopForIntKeysTask_CLIENT2: serverGroupFlag is %d ",
@@ -375,7 +375,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, CheckPrSingleHopForIntKeysTask_CLIENT2)
         LOGINFO("CPPTEST: getting key %d with hashcode %d", i,
                 keyPtr->hashcode());
         dataReg->get(keyPtr);
-        int8 serverGroupFlag = TestUtils::getCacheImpl(getHelper()->cachePtr)
+        int8_t serverGroupFlag = TestUtils::getCacheImpl(getHelper()->cachePtr)
                                    ->getAndResetServerGroupFlag();
         LOGINFO(
             "CheckPrSingleHopForIntKeysTask_CLIENT2: serverGroupFlag is %d ",
@@ -416,7 +416,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, CheckPrSingleHopForIntKeysTask_CLIENT2)
 
       try {
         dataReg->getAll(keys, values, exceptions, false);
-        int8 serverGroupFlag = TestUtils::getCacheImpl(getHelper()->cachePtr)
+        int8_t serverGroupFlag = TestUtils::getCacheImpl(getHelper()->cachePtr)
                                    ->getAndResetServerGroupFlag();
         LOG("after gatall ");
         LOGINFO(
@@ -457,7 +457,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, CheckPrSingleHopForIntKeysTask_CLIENT2)
         LOGINFO("CPPTEST: destroying key %d with hashcode %d", i,
                 keyPtr->hashcode());
         dataReg->destroy(keyPtr);
-        int8 serverGroupFlag = TestUtils::getCacheImpl(getHelper()->cachePtr)
+        int8_t serverGroupFlag = TestUtils::getCacheImpl(getHelper()->cachePtr)
                                    ->getAndResetServerGroupFlag();
         LOGINFO(
             "CheckPrSingleHopForIntKeysTask_CLIENT2: serverGroupFlag is %d ",
@@ -512,7 +512,7 @@ DUNIT_TASK_DEFINITION(CLIENT3, CheckPrSingleHopForIntKeysTask_CLIENT3)
         if (networkhop) {
           failureCount++;
         }
-        int8 serverGroupFlag = TestUtils::getCacheImpl(getHelper()->cachePtr)
+        int8_t serverGroupFlag = TestUtils::getCacheImpl(getHelper()->cachePtr)
                                    ->getAndResetServerGroupFlag();
         LOGINFO(
             "CheckPrSingleHopForIntKeysTask_CLIENT3: serverGroupFlag is %d ",
@@ -569,7 +569,7 @@ DUNIT_TASK_DEFINITION(CLIENT3, CheckPrSingleHopForIntKeysTask_CLIENT3)
         LOGINFO("CPPTEST: getting key %d with hashcode %d", i,
                 keyPtr->hashcode());
         dataReg->get(keyPtr);
-        int8 serverGroupFlag = TestUtils::getCacheImpl(getHelper()->cachePtr)
+        int8_t serverGroupFlag = TestUtils::getCacheImpl(getHelper()->cachePtr)
                                    ->getAndResetServerGroupFlag();
         LOGINFO(
             "CheckPrSingleHopForIntKeysTask_CLIENT3: serverGroupFlag is %d ",
@@ -610,7 +610,7 @@ DUNIT_TASK_DEFINITION(CLIENT3, CheckPrSingleHopForIntKeysTask_CLIENT3)
 
       try {
         dataReg->getAll(keys, values, exceptions, false);
-        int8 serverGroupFlag = TestUtils::getCacheImpl(getHelper()->cachePtr)
+        int8_t serverGroupFlag = TestUtils::getCacheImpl(getHelper()->cachePtr)
                                    ->getAndResetServerGroupFlag();
         LOGINFO(
             "CheckPrSingleHopForIntKeysTask_CLIENT3: serverGroupFlag is %d ",
@@ -648,7 +648,7 @@ DUNIT_TASK_DEFINITION(CLIENT3, CheckPrSingleHopForIntKeysTask_CLIENT3)
         LOGINFO("CPPTEST: destroying key %d with hashcode %d", i,
                 keyPtr->hashcode());
         dataReg->destroy(keyPtr);
-        int8 serverGroupFlag = TestUtils::getCacheImpl(getHelper()->cachePtr)
+        int8_t serverGroupFlag = TestUtils::getCacheImpl(getHelper()->cachePtr)
                                    ->getAndResetServerGroupFlag();
         LOGINFO(
             "CheckPrSingleHopForIntKeysTask_CLIENT3: serverGroupFlag is %d ",

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/cppcache/integration-test/testThinClientStatistics.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientStatistics.cpp b/src/cppcache/integration-test/testThinClientStatistics.cpp
index 1fc155d..af985d4 100644
--- a/src/cppcache/integration-test/testThinClientStatistics.cpp
+++ b/src/cppcache/integration-test/testThinClientStatistics.cpp
@@ -398,7 +398,7 @@ void StatFileTest() {
   LOG(" Starting Stat.gfs file test");
   /* Get Pid , Get File name : HARD Coding for File name pattern */
   char buff[1024];
-  int32 pid = ACE_OS::getpid();
+  int32_t pid = ACE_OS::getpid();
   ACE_OS::sprintf(buff, "./statArchive-%d.gfs", pid);
   std::string statFilename(buff);
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/cppcache/src/BucketServerLocation.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/BucketServerLocation.hpp b/src/cppcache/src/BucketServerLocation.hpp
index 89c8473..00dda10 100644
--- a/src/cppcache/src/BucketServerLocation.hpp
+++ b/src/cppcache/src/BucketServerLocation.hpp
@@ -54,7 +54,7 @@ class BucketServerLocation : public ServerLocation {
         m_numServerGroups(static_cast<int8_t>(0)) {}
 
   BucketServerLocation(int bucketId, int port, std::string host, bool isPrimary,
-                       int8 version)
+                       int8_t version)
       : ServerLocation(host, port),
         m_bucketId(bucketId),
         m_isPrimary(isPrimary),
@@ -63,7 +63,7 @@ class BucketServerLocation : public ServerLocation {
         m_numServerGroups(static_cast<int8_t>(0)) {}
 
   BucketServerLocation(int bucketId, int port, std::string host, bool isPrimary,
-                       int8 version, std::vector<std::string> serverGroups)
+                       int8_t version, std::vector<std::string> serverGroups)
       : ServerLocation(host, port),
         m_bucketId(bucketId),
         m_isPrimary(isPrimary),
@@ -94,7 +94,7 @@ class BucketServerLocation : public ServerLocation {
 
   inline bool isPrimary() const { return m_isPrimary; }
 
-  inline int8 getVersion() const { return m_version; }
+  inline int8_t getVersion() const { return m_version; }
 
   void toData(apache::geode::client::DataOutput& output) const {
     ServerLocation::toData(output);
@@ -130,7 +130,7 @@ class BucketServerLocation : public ServerLocation {
   }
 
   uint32_t objectSize() const {
-    return sizeof(int) + sizeof(bool) + sizeof(int8);
+    return sizeof(int32_t) + sizeof(bool) + sizeof(int8_t);
   }
 
   int8_t typeId() const {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/cppcache/src/CacheImpl.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CacheImpl.cpp b/src/cppcache/src/CacheImpl.cpp
index 8d82841..dc9e090 100644
--- a/src/cppcache/src/CacheImpl.cpp
+++ b/src/cppcache/src/CacheImpl.cpp
@@ -48,7 +48,7 @@ CacheImpl* CacheImpl::s_instance = NULL;
 volatile bool CacheImpl::s_networkhop = false;
 volatile int CacheImpl::s_blacklistBucketTimeout = 0;
 ACE_Recursive_Thread_Mutex CacheImpl::s_nwHopLock;
-volatile int8 CacheImpl::s_serverGroupFlag = 0;
+volatile int8_t CacheImpl::s_serverGroupFlag = 0;
 MemberListForVersionStampPtr CacheImpl::s_versionStampMemIdList = NULLPTR;
 
 #define DEFAULT_LRU_MAXIMUM_ENTRIES 100000
@@ -185,8 +185,8 @@ bool CacheImpl::getAndResetNetworkHopFlag() {
   return networkhop;
 }
 
-int8 CacheImpl::getAndResetServerGroupFlag() {
-  int8 serverGroupFlag = CacheImpl::s_serverGroupFlag;
+int8_t CacheImpl::getAndResetServerGroupFlag() {
+  int8_t serverGroupFlag = CacheImpl::s_serverGroupFlag;
   CacheImpl::s_serverGroupFlag = 0;
   return serverGroupFlag;
 }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/cppcache/src/CacheImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CacheImpl.hpp b/src/cppcache/src/CacheImpl.hpp
index 37822a6..bfb4fdc 100644
--- a/src/cppcache/src/CacheImpl.hpp
+++ b/src/cppcache/src/CacheImpl.hpp
@@ -111,10 +111,10 @@ class CPPCACHE_EXPORT CacheImpl : private NonCopyable, private NonAssignable {
   static int blackListBucketTimeouts();
   static void setBlackListBucketTimeouts();
 
-  static void setServerGroupFlag(int8 serverGroupFlag) {
+  static void setServerGroupFlag(int8_t serverGroupFlag) {
     CacheImpl::s_serverGroupFlag = serverGroupFlag;
   }
-  static int8 getAndResetServerGroupFlag();
+  static int8_t getAndResetServerGroupFlag();
   static MemberListForVersionStampPtr getMemberListForVersionStamp();
 
   /** Returns the name of this cache.
@@ -285,7 +285,7 @@ class CPPCACHE_EXPORT CacheImpl : private NonCopyable, private NonAssignable {
  private:
   static volatile bool s_networkhop;
   static volatile int s_blacklistBucketTimeout;
-  static volatile int8 s_serverGroupFlag;
+  static volatile int8_t s_serverGroupFlag;
   static MemberListForVersionStampPtr s_versionStampMemIdList;
   PoolPtr m_defaultPool;
   bool m_ignorePdxUnreadFields;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/cppcache/src/ClientMetadataService.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ClientMetadataService.cpp b/src/cppcache/src/ClientMetadataService.cpp
index 7316199..dd756e1 100644
--- a/src/cppcache/src/ClientMetadataService.cpp
+++ b/src/cppcache/src/ClientMetadataService.cpp
@@ -341,7 +341,7 @@ void ClientMetadataService::populateDummyServers(const char* regionName,
 }
 
 void ClientMetadataService::enqueueForMetadataRefresh(
-    const char* regionFullPath, int8 serverGroupFlag) {
+    const char* regionFullPath, int8_t serverGroupFlag) {
   ThinClientPoolDM* tcrdm = dynamic_cast<ThinClientPoolDM*>(m_pool.ptr());
   if (tcrdm == NULL) {
     throw IllegalArgumentException(
@@ -436,7 +436,7 @@ ClientMetadataService::getServerToFilterMap(const VectorOfCacheableKey* keys,
         buckets.find(bucketId);
 
     if (bucketsIter == buckets.end()) {
-      int8 version = -1;
+      int8_t version = -1;
       // BucketServerLocationPtr serverLocation(new BucketServerLocation());
       BucketServerLocationPtr serverLocation = NULLPTR;
       cptr->getServerLocation(bucketId, isPrimary, serverLocation, version);

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/cppcache/src/ClientMetadataService.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ClientMetadataService.hpp b/src/cppcache/src/ClientMetadataService.hpp
index 79108c4..99ddd23 100644
--- a/src/cppcache/src/ClientMetadataService.hpp
+++ b/src/cppcache/src/ClientMetadataService.hpp
@@ -136,7 +136,7 @@ class ClientMetadataService : public ACE_Task_Base,
                             ClientMetadataPtr clientmetadata);
 
   void enqueueForMetadataRefresh(const char* regionFullPath,
-                                 int8 serverGroupFlag);
+                                 int8_t serverGroupFlag);
 
   HashMapT<BucketServerLocationPtr, VectorOfCacheableKeyPtr>*
   getServerToFilterMap(const VectorOfCacheableKey* keys,

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/cppcache/src/Connector.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/Connector.hpp b/src/cppcache/src/Connector.hpp
index 3558469..b7094c0 100644
--- a/src/cppcache/src/Connector.hpp
+++ b/src/cppcache/src/Connector.hpp
@@ -97,7 +97,7 @@ class Connector {
   /**
    * Returns local port for this TCP connection
    */
-  virtual uint16 getPort() = 0;
+  virtual uint16_t getPort() = 0;
 
  private:
   // Disallow copy constructor and assignment operator.

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/cppcache/src/CqQueryVsdStats.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CqQueryVsdStats.hpp b/src/cppcache/src/CqQueryVsdStats.hpp
index 326a27d..5b162da 100644
--- a/src/cppcache/src/CqQueryVsdStats.hpp
+++ b/src/cppcache/src/CqQueryVsdStats.hpp
@@ -75,7 +75,7 @@ class CPPCACHE_EXPORT CqQueryVsdStats : public CqStatistics {
 
 class CqQueryStatType {
  private:
-  static int8 instanceFlag;
+  static int8_t instanceFlag;
   static CqQueryStatType* single;
   static SpinLock m_singletonLock;
   static SpinLock m_statTypeLock;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/cppcache/src/CqServiceVsdStats.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CqServiceVsdStats.hpp b/src/cppcache/src/CqServiceVsdStats.hpp
index d2dfe5a..44a8c3d 100644
--- a/src/cppcache/src/CqServiceVsdStats.hpp
+++ b/src/cppcache/src/CqServiceVsdStats.hpp
@@ -108,7 +108,7 @@ class CPPCACHE_EXPORT CqServiceVsdStats : public CqServiceStatistics {
 
 class CqServiceStatType {
  private:
-  static int8 instanceFlag;
+  static int8_t instanceFlag;
   static CqServiceStatType* single;
   static SpinLock m_singletonLock;
   static SpinLock m_statTypeLock;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/cppcache/src/ExecutionImpl.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ExecutionImpl.cpp b/src/cppcache/src/ExecutionImpl.cpp
index f435ed2..02c264b 100644
--- a/src/cppcache/src/ExecutionImpl.cpp
+++ b/src/cppcache/src/ExecutionImpl.cpp
@@ -63,8 +63,8 @@ ExecutionPtr ExecutionImpl::withCollector(ResultCollectorPtr rs) {
   return ptr;
 }
 
-std::vector<int8>* ExecutionImpl::getFunctionAttributes(const char* func) {
-  std::map<std::string, std::vector<int8>*>::iterator itr =
+std::vector<int8_t>* ExecutionImpl::getFunctionAttributes(const char* func) {
+  std::map<std::string, std::vector<int8_t>*>::iterator itr =
       m_func_attrs.find(func);
   if (itr != m_func_attrs.end()) {
     return itr->second;
@@ -101,7 +101,7 @@ ResultCollectorPtr ExecutionImpl::execute(const char* fn, uint32_t timeout,
   bool serverOptimizeForWrite = false;
 
   if (verifyFuncArgs) {
-    std::vector<int8>* attr = getFunctionAttributes(fn);
+    std::vector<int8_t>* attr = getFunctionAttributes(fn);
     {
       if (attr == NULL) {
         ACE_Guard<ACE_Recursive_Thread_Mutex> _guard(m_func_attrs_lock);
@@ -360,7 +360,7 @@ ResultCollectorPtr ExecutionImpl::execute(const char* fn, uint32_t timeout,
 }
 
 GfErrType ExecutionImpl::getFuncAttributes(const char* func,
-                                           std::vector<int8>** attr) {
+                                           std::vector<int8_t>** attr) {
   ThinClientPoolDM* tcrdm = dynamic_cast<ThinClientPoolDM*>(m_pool.ptr());
   if (tcrdm == NULL) {
     throw IllegalArgumentException(

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/cppcache/src/ExecutionImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ExecutionImpl.hpp b/src/cppcache/src/ExecutionImpl.hpp
index 246f206..882f7dc 100644
--- a/src/cppcache/src/ExecutionImpl.hpp
+++ b/src/cppcache/src/ExecutionImpl.hpp
@@ -33,7 +33,7 @@
 namespace apache {
 namespace geode {
 namespace client {
-typedef std::map<std::string, std::vector<int8>*> FunctionToFunctionAttributes;
+typedef std::map<std::string, std::vector<int8_t>*> FunctionToFunctionAttributes;
 
 class ExecutionImpl : public Execution {
  public:
@@ -100,14 +100,14 @@ class ExecutionImpl : public Execution {
   ProxyCachePtr m_proxyCache;
   static ACE_Recursive_Thread_Mutex m_func_attrs_lock;
   static FunctionToFunctionAttributes m_func_attrs;
-  //  std::vector<int8> m_attributes;
+  //  std::vector<int8_t> m_attributes;
   CacheableVectorPtr executeOnPool(
       std::string& func, uint8_t getResult, int32_t retryAttempts,
       uint32_t timeout = DEFAULT_QUERY_RESPONSE_TIMEOUT);
   void executeOnAllServers(std::string& func, uint8_t getResult,
                            uint32_t timeout = DEFAULT_QUERY_RESPONSE_TIMEOUT);
-  std::vector<int8>* getFunctionAttributes(const char* func);
-  GfErrType getFuncAttributes(const char* func, std::vector<int8>** attr);
+  std::vector<int8_t>* getFunctionAttributes(const char* func);
+  GfErrType getFuncAttributes(const char* func, std::vector<int8_t>** attr);
 };
 }  // namespace client
 }  // namespace geode

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/cppcache/src/HostAsm.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/HostAsm.hpp b/src/cppcache/src/HostAsm.hpp
index 9099bee..770cb5d 100644
--- a/src/cppcache/src/HostAsm.hpp
+++ b/src/cppcache/src/HostAsm.hpp
@@ -85,7 +85,7 @@ enum { SPINLOCK_CLEAR_BYTE = 0 };
 // implemented in hostsolaris.asm
 extern "C" {
 void HostAsmUnlock(int32_t, SpinLockField*);
-bool HostAsmTryLock(SpinLockField*, int32, uint32);
+bool HostAsmTryLock(SpinLockField*, int32_t, uint32_t);
 int32_t InterlockedExchangeAdd(volatile int32_t*, int32_t);
 // int64_t InterlockedExchangeAddLong(volatile int64_t *, int64_t);
 }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/cppcache/src/LocalRegion.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LocalRegion.cpp b/src/cppcache/src/LocalRegion.cpp
index f49e0a7..5e61580 100644
--- a/src/cppcache/src/LocalRegion.cpp
+++ b/src/cppcache/src/LocalRegion.cpp
@@ -306,7 +306,7 @@ void LocalRegion::getEntry(const CacheableKeyPtr& key, CacheablePtr& valuePtr) {
 CacheablePtr LocalRegion::get(const CacheableKeyPtr& key,
                               const UserDataPtr& aCallbackArgument) {
   CacheablePtr rptr;
-  int64 sampleStartNanos = Utils::startStatOpTime();
+  int64_t sampleStartNanos = Utils::startStatOpTime();
   GfErrType err = getNoThrow(key, rptr, aCallbackArgument);
   Utils::updateStatOpTime(m_regionStats->getStat(),
                           RegionStatType::getInstance()->getGetTimeId(),
@@ -322,7 +322,7 @@ CacheablePtr LocalRegion::get(const CacheableKeyPtr& key,
 void LocalRegion::put(const CacheableKeyPtr& key, const CacheablePtr& value,
                       const UserDataPtr& aCallbackArgument) {
   CacheablePtr oldValue;
-  int64 sampleStartNanos = Utils::startStatOpTime();
+  int64_t sampleStartNanos = Utils::startStatOpTime();
   VersionTagPtr versionTag;
   GfErrType err = putNoThrow(key, value, aCallbackArgument, oldValue, -1,
                              CacheEventFlags::NORMAL, versionTag);
@@ -350,7 +350,7 @@ void LocalRegion::putAll(const HashMapOfCacheable& map, uint32_t timeout,
         "Region::putAll: timeout parameter "
         "greater than maximum allowed (2^31/1000 i.e 2147483).");
   }
-  int64 sampleStartNanos = Utils::startStatOpTime();
+  int64_t sampleStartNanos = Utils::startStatOpTime();
   GfErrType err = putAllNoThrow(map, timeout, aCallbackArgument);
   Utils::updateStatOpTime(m_regionStats->getStat(),
                           RegionStatType::getInstance()->getPutAllTimeId(),
@@ -364,7 +364,7 @@ void LocalRegion::removeAll(const VectorOfCacheableKey& keys,
   if (keys.size() == 0) {
     throw IllegalArgumentException("Region::removeAll: zero keys provided");
   }
-  int64 sampleStartNanos = Utils::startStatOpTime();
+  int64_t sampleStartNanos = Utils::startStatOpTime();
   GfErrType err = removeAllNoThrow(keys, aCallbackArgument);
   Utils::updateStatOpTime(m_regionStats->getStat(),
                           RegionStatType::getInstance()->getRemoveAllTimeId(),
@@ -541,7 +541,7 @@ void LocalRegion::getAll(const VectorOfCacheableKey& keys,
         getFullPath());
   }
 
-  int64 sampleStartNanos = Utils::startStatOpTime();
+  int64_t sampleStartNanos = Utils::startStatOpTime();
   GfErrType err = getAllNoThrow(keys, values, exceptions, addToLocalCache,
                                 aCallbackArgument);
   Utils::updateStatOpTime(m_regionStats->getStat(),
@@ -550,7 +550,7 @@ void LocalRegion::getAll(const VectorOfCacheableKey& keys,
   // handleReplay(err, NULLPTR);
   GfErrTypeToException("Region::getAll", err);
 }
-uint32 LocalRegion::size_remote() {
+uint32_t LocalRegion::size_remote() {
   CHECK_DESTROY_PENDING(TryReadGuard, LocalRegion::size);
   if (m_regionAttributes->getCachingEnabled()) {
     return m_entries->size();
@@ -877,7 +877,7 @@ GfErrType LocalRegion::getNoThrow(const CacheableKeyPtr& keyPtr,
     try {
       isLoaderInvoked = true;
       /*Update the statistics*/
-      int64 sampleStartNanos = Utils::startStatOpTime();
+      int64_t sampleStartNanos = Utils::startStatOpTime();
       value = m_loader->load(RegionPtr(this), keyPtr, aCallbackArgument);
       Utils::updateStatOpTime(
           m_regionStats->getStat(),
@@ -2172,7 +2172,7 @@ GfErrType LocalRegion::removeAllNoThrow(const VectorOfCacheableKey& keys,
 
 void LocalRegion::clear(const UserDataPtr& aCallbackArgument) {
   /*update the stats */
-  int64 sampleStartNanos = Utils::startStatOpTime();
+  int64_t sampleStartNanos = Utils::startStatOpTime();
   localClear(aCallbackArgument);
   Utils::updateStatOpTime(m_regionStats->getStat(),
                           RegionStatType::getInstance()->getClearsId(),
@@ -2556,7 +2556,7 @@ bool LocalRegion::invokeCacheWriterForEntryEvent(
     try {
       bool updateStats = true;
       /*Update the CacheWriter Stats*/
-      int64 sampleStartNanos = Utils::startStatOpTime();
+      int64_t sampleStartNanos = Utils::startStatOpTime();
       switch (type) {
         case BEFORE_UPDATE: {
           if (oldValue != NULLPTR) {
@@ -2614,7 +2614,7 @@ bool LocalRegion::invokeCacheWriterForRegionEvent(
     try {
       bool updateStats = true;
       /*Update the CacheWriter Stats*/
-      int64 sampleStartNanos = Utils::startStatOpTime();
+      int64_t sampleStartNanos = Utils::startStatOpTime();
       switch (type) {
         case BEFORE_REGION_DESTROY: {
           eventStr = "beforeRegionDestroy";
@@ -2667,7 +2667,7 @@ GfErrType LocalRegion::invokeCacheListenerForEntryEvent(
     try {
       bool updateStats = true;
       /*Update the CacheWriter Stats*/
-      int64 sampleStartNanos = Utils::startStatOpTime();
+      int64_t sampleStartNanos = Utils::startStatOpTime();
       switch (type) {
         case AFTER_UPDATE: {
           //  when CREATE is received from server for notification
@@ -2735,7 +2735,7 @@ GfErrType LocalRegion::invokeCacheListenerForRegionEvent(
     try {
       bool updateStats = true;
       /*Update the CacheWriter Stats*/
-      int64 sampleStartNanos = Utils::startStatOpTime();
+      int64_t sampleStartNanos = Utils::startStatOpTime();
       switch (type) {
         case AFTER_REGION_DESTROY: {
           eventStr = "afterRegionDestroy";
@@ -3117,7 +3117,7 @@ void LocalRegion::evict(int32_t percentage) {
 }
 void LocalRegion::invokeAfterAllEndPointDisconnected() {
   if (m_listener != NULLPTR) {
-    int64 sampleStartNanos = Utils::startStatOpTime();
+    int64_t sampleStartNanos = Utils::startStatOpTime();
     try {
       m_listener->afterRegionDisconnected(RegionPtr(this));
     } catch (const Exception& ex) {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/cppcache/src/Log.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/Log.cpp b/src/cppcache/src/Log.cpp
index 3176ec6..894f041 100644
--- a/src/cppcache/src/Log.cpp
+++ b/src/cppcache/src/Log.cpp
@@ -193,8 +193,8 @@ const char* Log::logFileName() {
   return g_logFileNameBuffer;
 }
 
-void Log::init(LogLevel level, const char* logFileName, int32 logFileLimit,
-               int64 logDiskSpaceLimit) {
+void Log::init(LogLevel level, const char* logFileName, int32_t logFileLimit,
+               int64_t logDiskSpaceLimit) {
   if (g_log != NULL) {
     throw IllegalStateException(
         "The Log has already been initialized. "
@@ -244,7 +244,7 @@ void Log::init(LogLevel level, const char* logFileName, int32 logFileLimit,
     // Appending a ".log" at the end if it does not exist or file has some other
     // extension.
     std::string filebasename = ACE::basename(g_logFile->c_str());
-    int32 len = static_cast<int32>(filebasename.length());
+    int32_t len = static_cast<int32_t>(filebasename.length());
     size_t fileExtPos = filebasename.find_last_of('.', len);
     // if no extension then add .log extension
     if (fileExtPos == std::string::npos) {
@@ -282,30 +282,6 @@ void Log::init(LogLevel level, const char* logFileName, int32 logFileLimit,
     g_rollIndex = 0;
 
     std::string dirname = ACE::dirname(g_logFile->c_str());
-    /*struct dirent **resultArray;
-    //int entries_count = ACE_OS::scandir(dirname.c_str(), &resultArray,
-    selector, comparator);
-
-    for(int i = 0; i < entries_count; i++) {
-      std::string strname = ACE::basename(resultArray[i]->d_name);
-      size_t fileExtPos = strname.find_last_of('.', strname.length());
-      if ( fileExtPos != std::string::npos ) {
-        std::string tempname = strname.substr(0,fileExtPos);
-        size_t fileHyphenPos = tempname.find_last_of('-', tempname.length());
-        if ( fileHyphenPos != std::string::npos ) {
-          std::string buff = tempname.substr(fileHyphenPos+1,tempname.length());
-          g_rollIndex = ACE_OS::atoi(buff.c_str())+ 1;
-        }
-      }
-    }
-    for(int i = 0; i < entries_count; i++) {
-      ACE_OS::free ( resultArray[i] );
-    }
-
-    if (entries_count >= 0) {
-      ACE_OS::free( resultArray );
-      resultArray = NULL;
-    }*/
 
     ACE_Dirent_Selector sds;
     int status = sds.open(dirname.c_str(), selector, comparator);
@@ -326,23 +302,6 @@ void Log::init(LogLevel level, const char* logFileName, int32 logFileLimit,
     }
     sds.close();
 
-    /*ACE_Dirent logDirectory;
-    logDirectory.open (ACE_TEXT (g_logFile->c_str()));
-    for (ACE_DIRENT *directory; (directory = logDirectory.read ()) != 0;) {
-            // Skip the ".." and "." files.
-            if (ACE::isdotdir(directory->d_name) != true) {
-                    ACE_stat stat_buf;
-                    ACE_OS::lstat (directory->d_name, &stat_buf);
-                    switch (stat_buf.st_mode & S_IFMT) {
-                            case S_IFREG:
-                                    stat_buf.
-                                    break;
-                            default:
-                                    break;
-                    }
-            }
-    }*/
-
     FILE* existingFile = fopen(g_logFileWithExt->c_str(), "r");
     if (existingFile != NULL && logFileLimit > 0) {
       /* adongre
@@ -363,8 +322,8 @@ void Log::init(LogLevel level, const char* logFileName, int32 logFileLimit,
       std::string extName;
       std::string newfilestr;
 
-      int32 len = static_cast<int32>(g_logFileWithExt->length());
-      int32 lastPosOfSep = static_cast<int32>(
+      int32_t len = static_cast<int32_t>(g_logFileWithExt->length());
+      int32_t lastPosOfSep = static_cast<int32_t>(
           g_logFileWithExt->find_last_of(ACE_DIRECTORY_SEPARATOR_CHAR, len));
       if (lastPosOfSep == -1) {
         logsdirname = ".";
@@ -373,8 +332,8 @@ void Log::init(LogLevel level, const char* logFileName, int32 logFileLimit,
       }
       logsbasename = g_logFileWithExt->substr(lastPosOfSep + 1, len);
       char logFileExtAfter = '.';
-      int32 baselen = static_cast<int32>(logsbasename.length());
-      int32 posOfExt = static_cast<int32>(
+      int32_t baselen = static_cast<int32_t>(logsbasename.length());
+      int32_t posOfExt = static_cast<int32_t>(
           logsbasename.find_last_of(logFileExtAfter, baselen));
       if (posOfExt == -1) {
         // throw IllegalArgument;
@@ -479,16 +438,8 @@ void Log::writeBanner() {
     apache::geode::client::millisleep(200);
   }
   if (!g_log) {
-    // g_log = stdout;
-    // fprintf(stdout,"File %s unable to open, logging into console.",
-    // g_logFile->c_str());
-    // fflush(stdout);
-    // g_logFile = NULL;
-    // g_logFileWithExt = NULL;
     g_isLogFileOpened = false;
     return;
-    // std::string msg = "Error in opening log file: " + *g_logFile;
-    // throw GeodeIOException(msg.c_str());
   } else {
     g_isLogFileOpened = true;
   }
@@ -507,9 +458,6 @@ void Log::writeBanner() {
 
   if (fprintf(g_log, "%s", bannertext.c_str()) == 0 || ferror(g_log)) {
     // we should be continue,
-    // fclose( g_log );
-    // std::string msg = "Error in writing banner to log file: " + *g_logFile;
-    // throw GeodeIOException(msg.c_str());
     return;
   }
 
@@ -645,8 +593,6 @@ void Log::put(LogLevel level, const char* msg) {
     if (!g_isLogFileOpened) {
       g_log = fopen(g_logFileWithExt->c_str(), "a");
       if (!g_log) {
-        // fprintf(stdout,"%s%s\n", formatLogLine(buf, level), msg);
-        // fflush(stdout);
         g_isLogFileOpened = false;
         return;
       }
@@ -672,8 +618,8 @@ void Log::put(LogLevel level, const char* msg) {
       std::string extName;
       std::string newfilestr;
 
-      int32 len = static_cast<int32>(g_logFileWithExt->length());
-      int32 lastPosOfSep = static_cast<int32>(
+      int32_t len = static_cast<int32_t>(g_logFileWithExt->length());
+      int32_t lastPosOfSep = static_cast<int32_t>(
           g_logFileWithExt->find_last_of(ACE_DIRECTORY_SEPARATOR_CHAR, len));
       if (lastPosOfSep == -1) {
         logsdirname = ".";
@@ -682,8 +628,8 @@ void Log::put(LogLevel level, const char* msg) {
       }
       logsbasename = g_logFileWithExt->substr(lastPosOfSep + 1, len);
       char logFileExtAfter = '.';
-      int32 baselen = static_cast<int32>(logsbasename.length());
-      int32 posOfExt = static_cast<int32>(
+      int32_t baselen = static_cast<int32_t>(logsbasename.length());
+      int32_t posOfExt = static_cast<int32_t>(
           logsbasename.find_last_of(logFileExtAfter, baselen));
       if (posOfExt == -1) {
         // throw IllegalArgument;
@@ -711,12 +657,6 @@ void Log::put(LogLevel level, const char* msg) {
       g_log = NULL;
 
       if (ACE_OS::rename(g_logFileWithExt->c_str(), rollFile) < 0) {
-        /* printf
-               ("thid = %lu, g_bytesWritten = %d\n",
-                ACE_OS::thr_self(), g_bytesWritten);*/
-        // std::string msg =
-        // "Could not rename: " + *g_logFileWithExt + " to: " + rollFile;
-        // throw GeodeIOException(msg.c_str());
         return;  // no need to throw exception try next time
       }
 
@@ -729,28 +669,8 @@ void Log::put(LogLevel level, const char* msg) {
 
     if ((g_diskSpaceLimit > 0) && (g_spaceUsed >= g_diskSpaceLimit)) {
       std::string dirname = ACE::dirname(g_logFile->c_str());
-      // struct dirent **resultArray;
-      // int entries_count = ACE_OS::scandir(dirname.c_str(), &resultArray,
-      // selector, comparator);
-      // int64 spaceUsed = 0;
       g_spaceUsed = 0;
       ACE_stat statBuf = {0};
-      /*for(int i = 1; i < entries_count; i++) {
-        ACE_OS::snprintf(fullpath , 512 ,
-    "%s%c%s",dirname.c_str(),ACE_DIRECTORY_SEPARATOR_CHAR,resultArray[i]->d_name);
-        ACE_OS::stat(fullpath,&statBuf);
-        g_fileInfoPair = std::make_pair(fullpath,statBuf.st_size);
-        fileInfo.push_back(g_fileInfoPair);
-        g_spaceUsed += fileInfo[i-1].second;
-      }
-    g_spaceUsed += g_bytesWritten;
-        for(int i = 0; i < entries_count; i++) {
-        ACE_OS::free ( resultArray[i] );
-        }
-    if (entries_count >= 0) {
-        ACE_OS::free( resultArray );
-      resultArray = NULL;
-    }*/
 
       ACE_Dirent_Selector sds;
       int status = sds.open(dirname.c_str(), selector, comparator);
@@ -769,7 +689,7 @@ void Log::put(LogLevel level, const char* msg) {
       int fileIndex = 0;
 
       while ((g_spaceUsed > (g_diskSpaceLimit /*- g_fileSizeLimit*/))) {
-        int64 fileSize = fileInfo[fileIndex].second;
+        int64_t fileSize = fileInfo[fileIndex].second;
         if (ACE_OS::unlink(fileInfo[fileIndex].first.c_str()) == 0) {
           g_spaceUsed -= fileSize;
         } else {
@@ -797,9 +717,6 @@ void Log::put(LogLevel level, const char* msg) {
       // process to terminate
       fclose(g_log);
       g_log = NULL;
-      // g_isLogFileOpened = false;
-      // std::string msg = "Error in writing to log file: " + *g_logFile;
-      // throw GeodeIOException(msg.c_str());
     } else {
       fflush(g_log);
     }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/cppcache/src/PdxFieldType.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxFieldType.cpp b/src/cppcache/src/PdxFieldType.cpp
index 5041129..72f20cf 100644
--- a/src/cppcache/src/PdxFieldType.cpp
+++ b/src/cppcache/src/PdxFieldType.cpp
@@ -47,9 +47,9 @@ PdxFieldType::PdxFieldType() : Serializable() {
 }
 
 PdxFieldType::PdxFieldType(const char* fieldName, const char* className,
-                           uint8_t typeId, int32 sequenceId,
-                           bool isVariableLengthType, int32 fixedSize,
-                           int32 varLenFieldIdx)
+                           uint8_t typeId, int32_t sequenceId,
+                           bool isVariableLengthType, int32_t fixedSize,
+                           int32_t varLenFieldIdx)
     : Serializable() {
   m_fieldName = fieldName;
   m_className = className;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd204478/src/cppcache/src/PdxFieldType.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxFieldType.hpp b/src/cppcache/src/PdxFieldType.hpp
index 8398ac5..40c50d2 100644
--- a/src/cppcache/src/PdxFieldType.hpp
+++ b/src/cppcache/src/PdxFieldType.hpp
@@ -41,18 +41,18 @@ class CPPCACHE_EXPORT PdxFieldType : public Serializable {
 
   bool m_isVariableLengthType;
   bool m_isIdentityField;
-  int32 m_fixedSize;
-  int32 m_varLenFieldIdx;
+  int32_t m_fixedSize;
+  int32_t m_varLenFieldIdx;
 
-  int32 m_vlOffsetIndex;
-  int32 m_relativeOffset;
+  int32_t m_vlOffsetIndex;
+  int32_t m_relativeOffset;
 
-  int32 getFixedTypeSize() const;
+  int32_t getFixedTypeSize() const;
 
  public:
   PdxFieldType(const char* fieldName, const char* className, uint8_t typeId,
-               int32 sequenceId, bool isVariableLengthType, int32 fixedSize,
-               int32 varLenFieldIdx);
+               int32_t sequenceId, bool isVariableLengthType, int32_t fixedSize,
+               int32_t varLenFieldIdx);
 
   PdxFieldType();
 
@@ -68,13 +68,13 @@ class CPPCACHE_EXPORT PdxFieldType : public Serializable {
 
   bool getIdentityField() const { return m_isIdentityField; }
 
-  int32 getVarLenFieldIdx() const { return m_varLenFieldIdx; }
+  int32_t getVarLenFieldIdx() const { return m_varLenFieldIdx; }
 
-  void setVarLenOffsetIndex(int32 value) { m_vlOffsetIndex = value; }
+  void setVarLenOffsetIndex(int32_t value) { m_vlOffsetIndex = value; }
 
-  void setRelativeOffset(int32 value) { m_relativeOffset = value; }
+  void setRelativeOffset(int32_t value) { m_relativeOffset = value; }
 
-  int32 getFixedSize() const { return m_fixedSize; }
+  int32_t getFixedSize() const { return m_fixedSize; }
   void setIdentityField(bool identityField) {
     m_isIdentityField = identityField;
   }
@@ -100,9 +100,9 @@ class CPPCACHE_EXPORT PdxFieldType : public Serializable {
 
   bool equals(PdxFieldTypePtr otherObj);
 
-  int32 getVarLenOffsetIndex() const { return m_vlOffsetIndex; }
+  int32_t getVarLenOffsetIndex() const { return m_vlOffsetIndex; }
 
-  int32 getRelativeOffset() const { return m_relativeOffset; }
+  int32_t getRelativeOffset() const { return m_relativeOffset; }
 };
 }  // namespace client
 }  // namespace geode


Mime
View raw message