geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [2/8] geode-native git commit: GEODE-2478: Replace gf with geode.
Date Wed, 22 Feb 2017 18:55:53 GMT
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/include/geode/PoolFactory.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/geode/PoolFactory.hpp b/src/cppcache/include/geode/PoolFactory.hpp
index f50ac70..482b4a1 100644
--- a/src/cppcache/include/geode/PoolFactory.hpp
+++ b/src/cppcache/include/geode/PoolFactory.hpp
@@ -22,7 +22,7 @@
 
 #include "geode_globals.hpp"
 #include "SharedBase.hpp"
-#include "gf_types.hpp"
+#include "geode_types.hpp"
 #include "Pool.hpp"
 
 /**

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/include/geode/PoolManager.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/geode/PoolManager.hpp b/src/cppcache/include/geode/PoolManager.hpp
index 6ccf6e5..127436d 100644
--- a/src/cppcache/include/geode/PoolManager.hpp
+++ b/src/cppcache/include/geode/PoolManager.hpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 #include "geode_globals.hpp"
-#include "gf_types.hpp"
+#include "geode_types.hpp"
 #include "Pool.hpp"
 #include "PoolFactory.hpp"
 #include "Region.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/include/geode/Properties.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/geode/Properties.hpp b/src/cppcache/include/geode/Properties.hpp
index 1206b82..7ddd703 100644
--- a/src/cppcache/include/geode/Properties.hpp
+++ b/src/cppcache/include/geode/Properties.hpp
@@ -24,7 +24,7 @@
  * @file
  */
 #include "geode_globals.hpp"
-#include "gf_types.hpp"
+#include "geode_types.hpp"
 #include "Serializable.hpp"
 #include "DataInput.hpp"
 #include "DataOutput.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/include/geode/Query.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/geode/Query.hpp b/src/cppcache/include/geode/Query.hpp
index 5ad5ab0..ed91cbe 100644
--- a/src/cppcache/include/geode/Query.hpp
+++ b/src/cppcache/include/geode/Query.hpp
@@ -21,7 +21,7 @@
  */
 
 #include "geode_globals.hpp"
-#include "gf_types.hpp"
+#include "geode_types.hpp"
 
 #include "SelectResults.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/include/geode/QueryService.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/geode/QueryService.hpp b/src/cppcache/include/geode/QueryService.hpp
index 48959ea..d47f065 100644
--- a/src/cppcache/include/geode/QueryService.hpp
+++ b/src/cppcache/include/geode/QueryService.hpp
@@ -21,7 +21,7 @@
  */
 
 #include "geode_globals.hpp"
-#include "gf_types.hpp"
+#include "geode_types.hpp"
 #include "ExceptionTypes.hpp"
 #include "CqQuery.hpp"
 #include "CqAttributes.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/include/geode/Region.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/geode/Region.hpp b/src/cppcache/include/geode/Region.hpp
index e41fb61..827a9c1 100644
--- a/src/cppcache/include/geode/Region.hpp
+++ b/src/cppcache/include/geode/Region.hpp
@@ -23,7 +23,7 @@
 //#### Warning: DO NOT directly include Region.hpp, include Cache.hpp instead.
 
 #include "geode_globals.hpp"
-#include "gf_types.hpp"
+#include "geode_types.hpp"
 #include "CacheableKey.hpp"
 #include "CacheableString.hpp"
 #include "CacheStatistics.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/include/geode/RegionAttributes.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/geode/RegionAttributes.hpp b/src/cppcache/include/geode/RegionAttributes.hpp
index f885704..f526f93 100644
--- a/src/cppcache/include/geode/RegionAttributes.hpp
+++ b/src/cppcache/include/geode/RegionAttributes.hpp
@@ -25,7 +25,7 @@
  */
 
 #include "geode_globals.hpp"
-#include "gf_types.hpp"
+#include "geode_types.hpp"
 #include "CacheLoader.hpp"
 #include "ExpirationAttributes.hpp"
 #include "CacheWriter.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/include/geode/RegionEntry.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/geode/RegionEntry.hpp b/src/cppcache/include/geode/RegionEntry.hpp
index dc910d8..c6b3e7d 100644
--- a/src/cppcache/include/geode/RegionEntry.hpp
+++ b/src/cppcache/include/geode/RegionEntry.hpp
@@ -21,7 +21,7 @@
  */
 
 #include "geode_globals.hpp"
-#include "gf_types.hpp"
+#include "geode_types.hpp"
 #include "CacheableKey.hpp"
 #include "CacheStatistics.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/include/geode/RegionEvent.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/geode/RegionEvent.hpp b/src/cppcache/include/geode/RegionEvent.hpp
index 2309ab9..05671ae 100644
--- a/src/cppcache/include/geode/RegionEvent.hpp
+++ b/src/cppcache/include/geode/RegionEvent.hpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 #include "geode_globals.hpp"
-#include "gf_types.hpp"
+#include "geode_types.hpp"
 #include "Region.hpp"
 #include "CacheableKey.hpp"
 #include "UserData.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/include/geode/RegionFactory.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/geode/RegionFactory.hpp b/src/cppcache/include/geode/RegionFactory.hpp
index 3245d41..d411ab0 100644
--- a/src/cppcache/include/geode/RegionFactory.hpp
+++ b/src/cppcache/include/geode/RegionFactory.hpp
@@ -21,7 +21,7 @@
  */
 
 #include "geode_globals.hpp"
-#include "gf_types.hpp"
+#include "geode_types.hpp"
 #include "AttributesFactory.hpp"
 /**
  * @file

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/include/geode/RegionService.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/geode/RegionService.hpp b/src/cppcache/include/geode/RegionService.hpp
index 557643e..8f8ae67 100644
--- a/src/cppcache/include/geode/RegionService.hpp
+++ b/src/cppcache/include/geode/RegionService.hpp
@@ -21,7 +21,7 @@
  */
 
 #include "geode_globals.hpp"
-#include "gf_types.hpp"
+#include "geode_types.hpp"
 #include "VectorT.hpp"
 
 /**

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/include/geode/ResultCollector.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/geode/ResultCollector.hpp b/src/cppcache/include/geode/ResultCollector.hpp
index c5555f8..28b221c 100644
--- a/src/cppcache/include/geode/ResultCollector.hpp
+++ b/src/cppcache/include/geode/ResultCollector.hpp
@@ -21,7 +21,7 @@
  */
 
 #include "geode_globals.hpp"
-#include "gf_types.hpp"
+#include "geode_types.hpp"
 #include "SharedPtr.hpp"
 #include "VectorT.hpp"
 #include "CacheableBuiltins.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/include/geode/ResultSet.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/geode/ResultSet.hpp b/src/cppcache/include/geode/ResultSet.hpp
index 1d0957b..30f0dea 100644
--- a/src/cppcache/include/geode/ResultSet.hpp
+++ b/src/cppcache/include/geode/ResultSet.hpp
@@ -21,7 +21,7 @@
  */
 
 #include "geode_globals.hpp"
-#include "gf_types.hpp"
+#include "geode_types.hpp"
 #include "ExceptionTypes.hpp"
 
 #include "SelectResults.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/include/geode/SelectResults.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/geode/SelectResults.hpp b/src/cppcache/include/geode/SelectResults.hpp
index 4682e02..e10dde1 100644
--- a/src/cppcache/include/geode/SelectResults.hpp
+++ b/src/cppcache/include/geode/SelectResults.hpp
@@ -25,7 +25,7 @@
  */
 
 #include "geode_globals.hpp"
-#include "gf_types.hpp"
+#include "geode_types.hpp"
 #include "ExceptionTypes.hpp"
 #include "Serializable.hpp"
 #include "CacheableBuiltins.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/include/geode/SelectResultsIterator.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/geode/SelectResultsIterator.hpp b/src/cppcache/include/geode/SelectResultsIterator.hpp
index d02300c..b51cdd0 100644
--- a/src/cppcache/include/geode/SelectResultsIterator.hpp
+++ b/src/cppcache/include/geode/SelectResultsIterator.hpp
@@ -25,7 +25,7 @@
  */
 
 #include "geode_globals.hpp"
-#include "gf_types.hpp"
+#include "geode_types.hpp"
 #include "ExceptionTypes.hpp"
 #include "Serializable.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/include/geode/Serializable.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/geode/Serializable.hpp b/src/cppcache/include/geode/Serializable.hpp
index 7fba574..5a16d7d 100644
--- a/src/cppcache/include/geode/Serializable.hpp
+++ b/src/cppcache/include/geode/Serializable.hpp
@@ -25,7 +25,7 @@
  */
 
 #include "geode_globals.hpp"
-#include "gf_types.hpp"
+#include "geode_types.hpp"
 
 namespace apache {
 namespace geode {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/include/geode/Struct.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/geode/Struct.hpp b/src/cppcache/include/geode/Struct.hpp
index a92f416..b88bf31 100644
--- a/src/cppcache/include/geode/Struct.hpp
+++ b/src/cppcache/include/geode/Struct.hpp
@@ -21,7 +21,7 @@
  */
 
 #include "geode_globals.hpp"
-#include "gf_types.hpp"
+#include "geode_types.hpp"
 #include "CacheableBuiltins.hpp"
 #include "StructSet.hpp"
 #include "SelectResults.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/include/geode/StructSet.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/geode/StructSet.hpp b/src/cppcache/include/geode/StructSet.hpp
index 56cb1d9..025a178 100644
--- a/src/cppcache/include/geode/StructSet.hpp
+++ b/src/cppcache/include/geode/StructSet.hpp
@@ -21,7 +21,7 @@
  */
 
 #include "geode_globals.hpp"
-#include "gf_types.hpp"
+#include "geode_types.hpp"
 
 #include "CqResults.hpp"
 #include "Struct.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/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
new file mode 100644
index 0000000..88f3d95
--- /dev/null
+++ b/src/cppcache/include/geode/geode_base.hpp
@@ -0,0 +1,358 @@
+#pragma once
+
+#ifndef GEODE_BASE_H_
+#define GEODE_BASE_H_
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#if defined(_WIN32)
+/** Library Export */
+#define LIBEXP __declspec(dllexport)
+/** Library Implementation */
+#define LIBIMP __declspec(dllimport)
+/** Library Call */
+#define LIBCALL __stdcall
+/** Library Export a type */
+#define LIBEXPORT(type) LIBEXP type LIBCALL
+#else
+/** Library Export */
+#define LIBEXP
+/** Library Implementation */
+#define LIBIMP extern
+/** Library Call */
+#define LIBCALL /**/
+/** Library Export a type */
+#define LIBEXPORT(type) type
+#endif
+
+/** Defines a Geode C extern */
+#ifdef BUILD_GEMFIRE
+#define GFCEXTERN(type) LIBEXP type LIBCALL
+#else
+#define GFCEXTERN(type) LIBIMP type LIBCALL
+#endif /* BUILD_GEMFIRE    */
+
+/** Defines a Geode CPPCACHE export */
+#if defined(_WIN32)
+#ifdef BUILD_CPPCACHE
+#define CPPCACHE_EXPORT LIBEXP
+#else
+#define CPPCACHE_EXPORT LIBIMP
+#endif
+#else
+#define CPPCACHE_EXPORT
+#endif /* BUILD_CPPCACHE */
+
+/** Define GF_TEMPLATE_EXPORT */
+#if defined(_WIN32)
+#ifdef BUILD_CPPCACHE
+#define GF_TEMPLATE_EXPORT __declspec(dllexport)
+#else
+#define GF_TEMPLATE_EXPORT __declspec(dllimport)
+#endif
+#else
+#define GF_TEMPLATE_EXPORT
+#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
+#define PRId8 "d"
+#endif
+#if !defined PRIi8
+#define PRIi8 "i"
+#endif
+#if !defined PRIo8
+#define PRIo8 "o"
+#endif
+#if !defined PRIu8
+#define PRIu8 "u"
+#endif
+#if !defined PRIx8
+#define PRIx8 "x"
+#endif
+#if !defined PRIX8
+#define PRIX8 "X"
+#endif
+#if !defined PRId16
+#define PRId16 "d"
+#endif
+#if !defined PRIi16
+#define PRIi16 "i"
+#endif
+#if !defined PRIo16
+#define PRIo16 "o"
+#endif
+#if !defined PRIu16
+#define PRIu16 "u"
+#endif
+#if !defined PRIx16
+#define PRIx16 "x"
+#endif
+#if !defined PRIX16
+#define PRIX16 "X"
+#endif
+#if !defined PRId32
+#define PRId32 "d"
+#endif
+#if !defined PRIi32
+#define PRIi32 "i"
+#endif
+#if !defined PRIo32
+#define PRIo32 "o"
+#endif
+#if !defined PRIu32
+#define PRIu32 "u"
+#endif
+#if !defined PRIx32
+#define PRIx32 "x"
+#endif
+#if !defined PRIX32
+#define PRIX32 "X"
+#endif
+#if !defined PRId64
+#define PRId64 "lld"
+#endif
+#if !defined PRIi64
+#define PRIi64 "lli"
+#endif
+#if !defined PRIo64
+#define PRIo64 "llo"
+#endif
+#if !defined PRIu64
+#define PRIu64 "llu"
+#endif
+#if !defined PRIx64
+#define PRIx64 "llx"
+#endif
+#if !defined PRIX64
+#define PRIX64 "llX"
+#endif
+/* end inttypes.h */
+
+#ifndef _INC_WCHAR
+#include <wchar.h>
+#endif
+
+#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
+#endif /* _WIN32*/
+
+/**@namespace geode This namespace contains all the Geode
+ * C++ API classes, enumerations and globals.
+ */
+
+/**@namespace geode_statistics This namespace contains all the Geode
+ * C++ statistics API classes.
+ */
+
+/**@namespace apache::geode::client::TypeHelper This namespace contains type
+ * traits helper
+ * structs/classes to determine type information at compile time
+ * using typename. Useful for templates in particular.
+ */
+
+/**
+ * @file
+ *
+ *  Definitions of types and functions supported in the Geode C++ interface
+ */
+
+/** default timeout for query response */
+#define DEFAULT_QUERY_RESPONSE_TIMEOUT 15
+
+/**
+ * @enum GfErrType
+ *Error codes returned by Geode C++ interface functions
+ */
+typedef enum {
+  GF_NOERR = 0,           /**< success - no error               */
+  GF_DEADLK = 1,          /**< deadlock detected                */
+  GF_EACCES = 2,          /**< permission problem               */
+  GF_ECONFL = 3,          /**< class creation conflict          */
+  GF_EINVAL = 4,          /**< invalid argument                 */
+  GF_ENOENT = 5,          /**< entity does not exist            */
+  GF_ENOMEM = 6,          /**< insufficient memory              */
+  GF_ERANGE = 7,          /**< index out of range               */
+  GF_ETYPE = 8,           /**< type mismatch                    */
+  GF_NOTOBJ = 9,          /**< invalid object reference         */
+  GF_NOTCON = 10,         /**< not connected to Geode         */
+  GF_NOTOWN = 11,         /**< lock not owned by process/thread */
+  GF_NOTSUP = 12,         /**< operation not supported          */
+  GF_SCPGBL = 13,         /**< attempt to exit global scope     */
+  GF_SCPEXC = 14,         /**< maximum scopes exceeded          */
+  GF_TIMOUT = 15,         /**< operation timed out              */
+  GF_OVRFLW = 16,         /**< arithmetic overflow              */
+  GF_IOERR = 17,          /**< paging file I/O error            */
+  GF_EINTR = 18,          /**< interrupted Geode call         */
+  GF_MSG = 19,            /**< message could not be handled     */
+  GF_DISKFULL = 20,       /**< disk full                        */
+  GF_NOSERVER_FOUND = 21, /** NoServer found */
+  GF_SERVER_FAILED = 22,
+
+  GF_CLIENT_WAIT_TIMEOUT = 23,
+  GF_CLIENT_WAIT_TIMEOUT_REFRESH_PRMETADATA = 24,
+
+  GF_CACHE_REGION_NOT_FOUND = 101, /**< No region with the specified name. */
+  GF_CACHE_REGION_INVALID = 102,   /**< the region is not valid */
+  GF_CACHE_REGION_KEYS_NOT_STRINGS = 103, /**< Entry keys are not strings */
+  GF_CACHE_REGION_ENTRY_NOT_BYTES =
+      104,                          /**< Entry's value is not a byte array */
+  GF_CACHE_REGION_NOT_GLOBAL = 105, /**< Distributed locks not supported */
+  GF_CACHE_PROXY = 106, /**< Errors detected in CacheProxy processing */
+  GF_CACHE_ILLEGAL_ARGUMENT_EXCEPTION =
+      107, /**< IllegalArgumentException in Cache Proxy */
+  GF_CACHE_ILLEGAL_STATE_EXCEPTION =
+      108,                          /**< IllegalStateException in CacheProxy */
+  GF_CACHE_TIMEOUT_EXCEPTION = 109, /**< TimeoutException in CacheProxy */
+  GF_CACHE_WRITER_EXCEPTION = 110,  /**< CacheWriterException in CacheProxy */
+  GF_CACHE_REGION_EXISTS_EXCEPTION =
+      111,                         /**< RegionExistsException in CacheProxy */
+  GF_CACHE_CLOSED_EXCEPTION = 112, /**< CacheClosedException in CacheProxy */
+  GF_CACHE_LEASE_EXPIRED_EXCEPTION =
+      113,                         /**< LeaseExpiredException in CacheProxy */
+  GF_CACHE_LOADER_EXCEPTION = 114, /**< CacheLoaderException in CacheProxy */
+  GF_CACHE_REGION_DESTROYED_EXCEPTION =
+      115, /**< RegionDestroyedException in CacheProxy */
+  GF_CACHE_ENTRY_DESTROYED_EXCEPTION =
+      116, /**< EntryDestroyedException in CacheProxy */
+  GF_CACHE_STATISTICS_DISABLED_EXCEPTION =
+      117, /**< StatisticsDisabledException in CacheProxy */
+  GF_CACHE_CONCURRENT_MODIFICATION_EXCEPTION =
+      118, /**< ConcurrentModificationException in CacheProxy */
+  GF_CACHE_ENTRY_NOT_FOUND = 119, /**< EntryNotFoundException in CacheProxy */
+  GF_CACHE_ENTRY_EXISTS = 120,    /**< EntryExistsException in CacheProxy */
+  GF_CACHEWRITER_ERROR =
+      121, /**< An Exception occured while invoking a cachewritter callback*/
+  GF_CANNOT_PROCESS_GII_REQUEST =
+      123, /**< A failure other than timeout occured durring a batch request */
+  GF_CACHESERVER_EXCEPTION = 124, /**< Java cache server exception sent to the
+                                     thin client by java cache server */
+  // GF_CACHE_REDUNDANCY_FAILURE = 125, /**< redundancy level not satisfied */
+  GF_AUTHENTICATION_FAILED_EXCEPTION = 126, /**<Authentication Fails */
+  GF_NOT_AUTHORIZED_EXCEPTION = 127, /**<Non Authorized Operation Tried */
+  GF_AUTHENTICATION_REQUIRED_EXCEPTION = 128, /**No Authentication Provided */
+  GF_DUPLICATE_DURABLE_CLIENT =
+      129, /**< Java cache server refused duplicate durable client  */
+  GF_REMOTE_QUERY_EXCEPTION = 130,   /** Query exception on java cache server */
+  GF_CACHE_LISTENER_EXCEPTION = 131, /** Exception in CacheListener */
+  GF_ALL_CONNECTIONS_IN_USE_EXCEPTION = 132, /** ALl connections in use*/
+  /**
+   * local entry was updated while a remote modification operation was
+   * in progress
+   */
+  GF_CACHE_ENTRY_UPDATED = 133,
+  GF_CACHE_LOCATOR_EXCEPTION = 134, /** Exception in Locator */
+  GF_INVALID_DELTA = 135,
+  GF_FUNCTION_EXCEPTION = 136,
+  GF_ROLLBACK_EXCEPTION = 137,
+  GF_COMMIT_CONFLICT_EXCEPTION = 138,
+  GF_TRANSACTION_DATA_NODE_HAS_DEPARTED_EXCEPTION = 139,
+  GF_TRANSACTION_DATA_REBALANCED_EXCEPTION = 140,
+  GF_PUTALL_PARTIAL_RESULT_EXCEPTION = 141,
+  GF_EUNDEF = 999 /**< unknown exception */
+} GfErrType;
+
+#include <new>
+
+#ifdef _WIN32
+
+typedef void *(*pNew)(size_t);
+typedef void (*pDelete)(void *);
+
+namespace apache {
+namespace geode {
+namespace client {
+extern void setDefaultNewAndDelete();
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
+
+void *operator new(size_t size);
+void operator delete(void *p);
+void *operator new[](size_t size);
+void operator delete[](void *p);
+
+#endif  // _WIN32
+
+/** Allocates x and throws OutOfMemoryException if it fails */
+#define GF_NEW(v, stmt)                                                 \
+  {                                                                     \
+    try {                                                               \
+      v = new stmt;                                                     \
+    } catch (const std::bad_alloc &) {                                  \
+      throw apache::geode::client::OutOfMemoryException(                \
+          "Out of Memory while executing \"" #v " = new " #stmt ";\""); \
+    }                                                                   \
+  }
+
+/** Deletes x only if it exists */
+#define GF_SAFE_DELETE(x) \
+  {                       \
+    delete x;             \
+    x = NULL;             \
+  }
+
+/** Deletes array x only if it exists */
+#define GF_SAFE_DELETE_ARRAY(x) \
+  {                             \
+    delete[] x;                 \
+    x = NULL;                   \
+  }
+
+#endif  // GEODE_BASE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/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 67a570a..7663441 100644
--- a/src/cppcache/include/geode/geode_globals.hpp
+++ b/src/cppcache/include/geode/geode_globals.hpp
@@ -114,7 +114,7 @@
 #endif
 #endif
 
-#include "gf_base.hpp"
+#include "geode_base.hpp"
 
 namespace apache {
 namespace geode {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/include/geode/geode_types.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/geode/geode_types.hpp b/src/cppcache/include/geode/geode_types.hpp
new file mode 100644
index 0000000..6fb90c4
--- /dev/null
+++ b/src/cppcache/include/geode/geode_types.hpp
@@ -0,0 +1,111 @@
+#pragma once
+
+#ifndef GEODE_TYPES_H_
+#define GEODE_TYPES_H_
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "SharedPtr.hpp"
+
+/**
+ * @file
+ */
+
+namespace apache {
+namespace geode {
+namespace client {
+
+class CacheFactory;
+
+#define _GF_PTR_DEF_(a, b) \
+  class CPPCACHE_EXPORT a; \
+  typedef SharedPtr<a> b;
+
+_GF_PTR_DEF_(DistributedSystem, DistributedSystemPtr);
+_GF_PTR_DEF_(CacheFactory, CacheFactoryPtr);
+_GF_PTR_DEF_(RegionService, RegionServicePtr);
+_GF_PTR_DEF_(GeodeCache, GeodeCachePtr);
+_GF_PTR_DEF_(Cache, CachePtr);
+_GF_PTR_DEF_(RegionFactory, RegionFactoryPtr);
+_GF_PTR_DEF_(AttributesFactory, AttributesFactoryPtr);
+_GF_PTR_DEF_(Region, RegionPtr);
+_GF_PTR_DEF_(AttributesMutator, AttributesMutatorPtr);
+_GF_PTR_DEF_(MapEntry, MapEntryPtr);
+_GF_PTR_DEF_(RegionEntry, RegionEntryPtr);
+_GF_PTR_DEF_(EventId, EventIdPtr);
+_GF_PTR_DEF_(CacheStatistics, CacheStatisticsPtr);
+_GF_PTR_DEF_(PersistenceManager, PersistenceManagerPtr);
+_GF_PTR_DEF_(Properties, PropertiesPtr);
+_GF_PTR_DEF_(FunctionService, FunctionServicePtr);
+_GF_PTR_DEF_(CacheLoader, CacheLoaderPtr);
+_GF_PTR_DEF_(CacheListener, CacheListenerPtr);
+_GF_PTR_DEF_(CacheWriter, CacheWriterPtr);
+_GF_PTR_DEF_(MembershipListener, MembershipListenerPtr);
+_GF_PTR_DEF_(RegionAttributes, RegionAttributesPtr);
+_GF_PTR_DEF_(CacheableDate, CacheableDatePtr);
+_GF_PTR_DEF_(CacheableFileName, CacheableFileNamePtr);
+_GF_PTR_DEF_(CacheableKey, CacheableKeyPtr);
+_GF_PTR_DEF_(CacheableObjectArray, CacheableObjectArrayPtr);
+_GF_PTR_DEF_(CacheableString, CacheableStringPtr);
+_GF_PTR_DEF_(CacheableUndefined, CacheableUndefinedPtr);
+_GF_PTR_DEF_(Serializable, SerializablePtr);
+_GF_PTR_DEF_(PdxSerializable, PdxSerializablePtr);
+_GF_PTR_DEF_(StackTrace, StackTracePtr);
+_GF_PTR_DEF_(SelectResults, SelectResultsPtr);
+_GF_PTR_DEF_(CqResults, CqResultsPtr);
+_GF_PTR_DEF_(ResultSet, ResultSetPtr);
+_GF_PTR_DEF_(StructSet, StructSetPtr);
+_GF_PTR_DEF_(Struct, StructPtr);
+_GF_PTR_DEF_(Query, QueryPtr);
+_GF_PTR_DEF_(QueryService, QueryServicePtr);
+_GF_PTR_DEF_(AuthInitialize, AuthInitializePtr);
+_GF_PTR_DEF_(CqQuery, CqQueryPtr);
+_GF_PTR_DEF_(CqListener, CqListenerPtr);
+_GF_PTR_DEF_(CqAttributes, CqAttributesPtr);
+_GF_PTR_DEF_(CqServiceStatistics, CqServiceStatisticsPtr);
+_GF_PTR_DEF_(CqStatistics, CqStatisticsPtr);
+_GF_PTR_DEF_(CqAttributesMutator, CqAttributesMutatorPtr);
+_GF_PTR_DEF_(ClientHealthStats, ClientHealthStatsPtr);
+_GF_PTR_DEF_(Pool, PoolPtr);
+_GF_PTR_DEF_(PoolFactory, PoolFactoryPtr);
+_GF_PTR_DEF_(PoolAttributes, PoolAttributesPtr);
+_GF_PTR_DEF_(ResultCollector, ResultCollectorPtr);
+_GF_PTR_DEF_(Execution, ExecutionPtr);
+_GF_PTR_DEF_(Delta, DeltaPtr);
+_GF_PTR_DEF_(PartitionResolver, PartitionResolverPtr);
+_GF_PTR_DEF_(FixedPartitionResolver, FixedPartitionResolverPtr);
+_GF_PTR_DEF_(CacheTransactionManager, CacheTransactionManagerPtr);
+_GF_PTR_DEF_(TransactionId, TransactionIdPtr);
+_GF_PTR_DEF_(EntryEvent, EntryEventPtr);
+_GF_PTR_DEF_(PdxReader, PdxReaderPtr);
+_GF_PTR_DEF_(PdxWriter, PdxWriterPtr);
+_GF_PTR_DEF_(PdxWrapper, PdxWrapperPtr);
+_GF_PTR_DEF_(PdxSerializer, PdxSerializerPtr);
+_GF_PTR_DEF_(PdxInstanceFactory, PdxInstanceFactoryPtr);
+_GF_PTR_DEF_(PdxInstance, PdxInstancePtr);
+_GF_PTR_DEF_(WritablePdxInstance, WritablePdxInstancePtr);
+_GF_PTR_DEF_(PdxUnreadFields, PdxUnreadFieldsPtr);
+_GF_PTR_DEF_(CacheableEnum, CacheableEnumPtr);
+_GF_PTR_DEF_(CqStatusListener, CqStatusListenerPtr);
+_GF_PTR_DEF_(InternalCacheTransactionManager2PC,
+             InternalCacheTransactionManager2PCPtr);
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
+
+#endif  // GEODE_TYPES_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/include/geode/gf_base.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/geode/gf_base.hpp b/src/cppcache/include/geode/gf_base.hpp
deleted file mode 100644
index 2508a06..0000000
--- a/src/cppcache/include/geode/gf_base.hpp
+++ /dev/null
@@ -1,358 +0,0 @@
-#pragma once
-
-#ifndef GEODE_GF_BASE_H_
-#define GEODE_GF_BASE_H_
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#if defined(_WIN32)
-/** Library Export */
-#define LIBEXP __declspec(dllexport)
-/** Library Implementation */
-#define LIBIMP __declspec(dllimport)
-/** Library Call */
-#define LIBCALL __stdcall
-/** Library Export a type */
-#define LIBEXPORT(type) LIBEXP type LIBCALL
-#else
-/** Library Export */
-#define LIBEXP
-/** Library Implementation */
-#define LIBIMP extern
-/** Library Call */
-#define LIBCALL /**/
-/** Library Export a type */
-#define LIBEXPORT(type) type
-#endif
-
-/** Defines a Geode C extern */
-#ifdef BUILD_GEMFIRE
-#define GFCEXTERN(type) LIBEXP type LIBCALL
-#else
-#define GFCEXTERN(type) LIBIMP type LIBCALL
-#endif /* BUILD_GEMFIRE    */
-
-/** Defines a Geode CPPCACHE export */
-#if defined(_WIN32)
-#ifdef BUILD_CPPCACHE
-#define CPPCACHE_EXPORT LIBEXP
-#else
-#define CPPCACHE_EXPORT LIBIMP
-#endif
-#else
-#define CPPCACHE_EXPORT
-#endif /* BUILD_CPPCACHE */
-
-/** Define GF_TEMPLATE_EXPORT */
-#if defined(_WIN32)
-#ifdef BUILD_CPPCACHE
-#define GF_TEMPLATE_EXPORT __declspec(dllexport)
-#else
-#define GF_TEMPLATE_EXPORT __declspec(dllimport)
-#endif
-#else
-#define GF_TEMPLATE_EXPORT
-#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
-#define PRId8 "d"
-#endif
-#if !defined PRIi8
-#define PRIi8 "i"
-#endif
-#if !defined PRIo8
-#define PRIo8 "o"
-#endif
-#if !defined PRIu8
-#define PRIu8 "u"
-#endif
-#if !defined PRIx8
-#define PRIx8 "x"
-#endif
-#if !defined PRIX8
-#define PRIX8 "X"
-#endif
-#if !defined PRId16
-#define PRId16 "d"
-#endif
-#if !defined PRIi16
-#define PRIi16 "i"
-#endif
-#if !defined PRIo16
-#define PRIo16 "o"
-#endif
-#if !defined PRIu16
-#define PRIu16 "u"
-#endif
-#if !defined PRIx16
-#define PRIx16 "x"
-#endif
-#if !defined PRIX16
-#define PRIX16 "X"
-#endif
-#if !defined PRId32
-#define PRId32 "d"
-#endif
-#if !defined PRIi32
-#define PRIi32 "i"
-#endif
-#if !defined PRIo32
-#define PRIo32 "o"
-#endif
-#if !defined PRIu32
-#define PRIu32 "u"
-#endif
-#if !defined PRIx32
-#define PRIx32 "x"
-#endif
-#if !defined PRIX32
-#define PRIX32 "X"
-#endif
-#if !defined PRId64
-#define PRId64 "lld"
-#endif
-#if !defined PRIi64
-#define PRIi64 "lli"
-#endif
-#if !defined PRIo64
-#define PRIo64 "llo"
-#endif
-#if !defined PRIu64
-#define PRIu64 "llu"
-#endif
-#if !defined PRIx64
-#define PRIx64 "llx"
-#endif
-#if !defined PRIX64
-#define PRIX64 "llX"
-#endif
-/* end inttypes.h */
-
-#ifndef _INC_WCHAR
-#include <wchar.h>
-#endif
-
-#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
-#endif /* _WIN32*/
-
-/**@namespace geode This namespace contains all the Geode
- * C++ API classes, enumerations and globals.
- */
-
-/**@namespace geode_statistics This namespace contains all the Geode
- * C++ statistics API classes.
- */
-
-/**@namespace apache::geode::client::TypeHelper This namespace contains type
- * traits helper
- * structs/classes to determine type information at compile time
- * using typename. Useful for templates in particular.
- */
-
-/**
- * @file
- *
- *  Definitions of types and functions supported in the Geode C++ interface
- */
-
-/** default timeout for query response */
-#define DEFAULT_QUERY_RESPONSE_TIMEOUT 15
-
-/**
- * @enum GfErrType
- *Error codes returned by Geode C++ interface functions
- */
-typedef enum {
-  GF_NOERR = 0,           /**< success - no error               */
-  GF_DEADLK = 1,          /**< deadlock detected                */
-  GF_EACCES = 2,          /**< permission problem               */
-  GF_ECONFL = 3,          /**< class creation conflict          */
-  GF_EINVAL = 4,          /**< invalid argument                 */
-  GF_ENOENT = 5,          /**< entity does not exist            */
-  GF_ENOMEM = 6,          /**< insufficient memory              */
-  GF_ERANGE = 7,          /**< index out of range               */
-  GF_ETYPE = 8,           /**< type mismatch                    */
-  GF_NOTOBJ = 9,          /**< invalid object reference         */
-  GF_NOTCON = 10,         /**< not connected to Geode         */
-  GF_NOTOWN = 11,         /**< lock not owned by process/thread */
-  GF_NOTSUP = 12,         /**< operation not supported          */
-  GF_SCPGBL = 13,         /**< attempt to exit global scope     */
-  GF_SCPEXC = 14,         /**< maximum scopes exceeded          */
-  GF_TIMOUT = 15,         /**< operation timed out              */
-  GF_OVRFLW = 16,         /**< arithmetic overflow              */
-  GF_IOERR = 17,          /**< paging file I/O error            */
-  GF_EINTR = 18,          /**< interrupted Geode call         */
-  GF_MSG = 19,            /**< message could not be handled     */
-  GF_DISKFULL = 20,       /**< disk full                        */
-  GF_NOSERVER_FOUND = 21, /** NoServer found */
-  GF_SERVER_FAILED = 22,
-
-  GF_CLIENT_WAIT_TIMEOUT = 23,
-  GF_CLIENT_WAIT_TIMEOUT_REFRESH_PRMETADATA = 24,
-
-  GF_CACHE_REGION_NOT_FOUND = 101, /**< No region with the specified name. */
-  GF_CACHE_REGION_INVALID = 102,   /**< the region is not valid */
-  GF_CACHE_REGION_KEYS_NOT_STRINGS = 103, /**< Entry keys are not strings */
-  GF_CACHE_REGION_ENTRY_NOT_BYTES =
-      104,                          /**< Entry's value is not a byte array */
-  GF_CACHE_REGION_NOT_GLOBAL = 105, /**< Distributed locks not supported */
-  GF_CACHE_PROXY = 106, /**< Errors detected in CacheProxy processing */
-  GF_CACHE_ILLEGAL_ARGUMENT_EXCEPTION =
-      107, /**< IllegalArgumentException in Cache Proxy */
-  GF_CACHE_ILLEGAL_STATE_EXCEPTION =
-      108,                          /**< IllegalStateException in CacheProxy */
-  GF_CACHE_TIMEOUT_EXCEPTION = 109, /**< TimeoutException in CacheProxy */
-  GF_CACHE_WRITER_EXCEPTION = 110,  /**< CacheWriterException in CacheProxy */
-  GF_CACHE_REGION_EXISTS_EXCEPTION =
-      111,                         /**< RegionExistsException in CacheProxy */
-  GF_CACHE_CLOSED_EXCEPTION = 112, /**< CacheClosedException in CacheProxy */
-  GF_CACHE_LEASE_EXPIRED_EXCEPTION =
-      113,                         /**< LeaseExpiredException in CacheProxy */
-  GF_CACHE_LOADER_EXCEPTION = 114, /**< CacheLoaderException in CacheProxy */
-  GF_CACHE_REGION_DESTROYED_EXCEPTION =
-      115, /**< RegionDestroyedException in CacheProxy */
-  GF_CACHE_ENTRY_DESTROYED_EXCEPTION =
-      116, /**< EntryDestroyedException in CacheProxy */
-  GF_CACHE_STATISTICS_DISABLED_EXCEPTION =
-      117, /**< StatisticsDisabledException in CacheProxy */
-  GF_CACHE_CONCURRENT_MODIFICATION_EXCEPTION =
-      118, /**< ConcurrentModificationException in CacheProxy */
-  GF_CACHE_ENTRY_NOT_FOUND = 119, /**< EntryNotFoundException in CacheProxy */
-  GF_CACHE_ENTRY_EXISTS = 120,    /**< EntryExistsException in CacheProxy */
-  GF_CACHEWRITER_ERROR =
-      121, /**< An Exception occured while invoking a cachewritter callback*/
-  GF_CANNOT_PROCESS_GII_REQUEST =
-      123, /**< A failure other than timeout occured durring a batch request */
-  GF_CACHESERVER_EXCEPTION = 124, /**< Java cache server exception sent to the
-                                     thin client by java cache server */
-  // GF_CACHE_REDUNDANCY_FAILURE = 125, /**< redundancy level not satisfied */
-  GF_AUTHENTICATION_FAILED_EXCEPTION = 126, /**<Authentication Fails */
-  GF_NOT_AUTHORIZED_EXCEPTION = 127, /**<Non Authorized Operation Tried */
-  GF_AUTHENTICATION_REQUIRED_EXCEPTION = 128, /**No Authentication Provided */
-  GF_DUPLICATE_DURABLE_CLIENT =
-      129, /**< Java cache server refused duplicate durable client  */
-  GF_REMOTE_QUERY_EXCEPTION = 130,   /** Query exception on java cache server */
-  GF_CACHE_LISTENER_EXCEPTION = 131, /** Exception in CacheListener */
-  GF_ALL_CONNECTIONS_IN_USE_EXCEPTION = 132, /** ALl connections in use*/
-  /**
-   * local entry was updated while a remote modification operation was
-   * in progress
-   */
-  GF_CACHE_ENTRY_UPDATED = 133,
-  GF_CACHE_LOCATOR_EXCEPTION = 134, /** Exception in Locator */
-  GF_INVALID_DELTA = 135,
-  GF_FUNCTION_EXCEPTION = 136,
-  GF_ROLLBACK_EXCEPTION = 137,
-  GF_COMMIT_CONFLICT_EXCEPTION = 138,
-  GF_TRANSACTION_DATA_NODE_HAS_DEPARTED_EXCEPTION = 139,
-  GF_TRANSACTION_DATA_REBALANCED_EXCEPTION = 140,
-  GF_PUTALL_PARTIAL_RESULT_EXCEPTION = 141,
-  GF_EUNDEF = 999 /**< unknown exception */
-} GfErrType;
-
-#include <new>
-
-#ifdef _WIN32
-
-typedef void *(*pNew)(size_t);
-typedef void (*pDelete)(void *);
-
-namespace apache {
-namespace geode {
-namespace client {
-extern void setDefaultNewAndDelete();
-}  // namespace client
-}  // namespace geode
-}  // namespace apache
-
-void *operator new(size_t size);
-void operator delete(void *p);
-void *operator new[](size_t size);
-void operator delete[](void *p);
-
-#endif  // _WIN32
-
-/** Allocates x and throws OutOfMemoryException if it fails */
-#define GF_NEW(v, stmt)                                                 \
-  {                                                                     \
-    try {                                                               \
-      v = new stmt;                                                     \
-    } catch (const std::bad_alloc &) {                                  \
-      throw apache::geode::client::OutOfMemoryException(                \
-          "Out of Memory while executing \"" #v " = new " #stmt ";\""); \
-    }                                                                   \
-  }
-
-/** Deletes x only if it exists */
-#define GF_SAFE_DELETE(x) \
-  {                       \
-    delete x;             \
-    x = NULL;             \
-  }
-
-/** Deletes array x only if it exists */
-#define GF_SAFE_DELETE_ARRAY(x) \
-  {                             \
-    delete[] x;                 \
-    x = NULL;                   \
-  }
-
-#endif  // GEODE_GF_BASE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/include/geode/gf_types.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/geode/gf_types.hpp b/src/cppcache/include/geode/gf_types.hpp
deleted file mode 100644
index 90fd4bb..0000000
--- a/src/cppcache/include/geode/gf_types.hpp
+++ /dev/null
@@ -1,111 +0,0 @@
-#pragma once
-
-#ifndef GEODE_GF_TYPES_H_
-#define GEODE_GF_TYPES_H_
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "SharedPtr.hpp"
-
-/**
- * @file
- */
-
-namespace apache {
-namespace geode {
-namespace client {
-
-class CacheFactory;
-
-#define _GF_PTR_DEF_(a, b) \
-  class CPPCACHE_EXPORT a; \
-  typedef SharedPtr<a> b;
-
-_GF_PTR_DEF_(DistributedSystem, DistributedSystemPtr);
-_GF_PTR_DEF_(CacheFactory, CacheFactoryPtr);
-_GF_PTR_DEF_(RegionService, RegionServicePtr);
-_GF_PTR_DEF_(GeodeCache, GeodeCachePtr);
-_GF_PTR_DEF_(Cache, CachePtr);
-_GF_PTR_DEF_(RegionFactory, RegionFactoryPtr);
-_GF_PTR_DEF_(AttributesFactory, AttributesFactoryPtr);
-_GF_PTR_DEF_(Region, RegionPtr);
-_GF_PTR_DEF_(AttributesMutator, AttributesMutatorPtr);
-_GF_PTR_DEF_(MapEntry, MapEntryPtr);
-_GF_PTR_DEF_(RegionEntry, RegionEntryPtr);
-_GF_PTR_DEF_(EventId, EventIdPtr);
-_GF_PTR_DEF_(CacheStatistics, CacheStatisticsPtr);
-_GF_PTR_DEF_(PersistenceManager, PersistenceManagerPtr);
-_GF_PTR_DEF_(Properties, PropertiesPtr);
-_GF_PTR_DEF_(FunctionService, FunctionServicePtr);
-_GF_PTR_DEF_(CacheLoader, CacheLoaderPtr);
-_GF_PTR_DEF_(CacheListener, CacheListenerPtr);
-_GF_PTR_DEF_(CacheWriter, CacheWriterPtr);
-_GF_PTR_DEF_(MembershipListener, MembershipListenerPtr);
-_GF_PTR_DEF_(RegionAttributes, RegionAttributesPtr);
-_GF_PTR_DEF_(CacheableDate, CacheableDatePtr);
-_GF_PTR_DEF_(CacheableFileName, CacheableFileNamePtr);
-_GF_PTR_DEF_(CacheableKey, CacheableKeyPtr);
-_GF_PTR_DEF_(CacheableObjectArray, CacheableObjectArrayPtr);
-_GF_PTR_DEF_(CacheableString, CacheableStringPtr);
-_GF_PTR_DEF_(CacheableUndefined, CacheableUndefinedPtr);
-_GF_PTR_DEF_(Serializable, SerializablePtr);
-_GF_PTR_DEF_(PdxSerializable, PdxSerializablePtr);
-_GF_PTR_DEF_(StackTrace, StackTracePtr);
-_GF_PTR_DEF_(SelectResults, SelectResultsPtr);
-_GF_PTR_DEF_(CqResults, CqResultsPtr);
-_GF_PTR_DEF_(ResultSet, ResultSetPtr);
-_GF_PTR_DEF_(StructSet, StructSetPtr);
-_GF_PTR_DEF_(Struct, StructPtr);
-_GF_PTR_DEF_(Query, QueryPtr);
-_GF_PTR_DEF_(QueryService, QueryServicePtr);
-_GF_PTR_DEF_(AuthInitialize, AuthInitializePtr);
-_GF_PTR_DEF_(CqQuery, CqQueryPtr);
-_GF_PTR_DEF_(CqListener, CqListenerPtr);
-_GF_PTR_DEF_(CqAttributes, CqAttributesPtr);
-_GF_PTR_DEF_(CqServiceStatistics, CqServiceStatisticsPtr);
-_GF_PTR_DEF_(CqStatistics, CqStatisticsPtr);
-_GF_PTR_DEF_(CqAttributesMutator, CqAttributesMutatorPtr);
-_GF_PTR_DEF_(ClientHealthStats, ClientHealthStatsPtr);
-_GF_PTR_DEF_(Pool, PoolPtr);
-_GF_PTR_DEF_(PoolFactory, PoolFactoryPtr);
-_GF_PTR_DEF_(PoolAttributes, PoolAttributesPtr);
-_GF_PTR_DEF_(ResultCollector, ResultCollectorPtr);
-_GF_PTR_DEF_(Execution, ExecutionPtr);
-_GF_PTR_DEF_(Delta, DeltaPtr);
-_GF_PTR_DEF_(PartitionResolver, PartitionResolverPtr);
-_GF_PTR_DEF_(FixedPartitionResolver, FixedPartitionResolverPtr);
-_GF_PTR_DEF_(CacheTransactionManager, CacheTransactionManagerPtr);
-_GF_PTR_DEF_(TransactionId, TransactionIdPtr);
-_GF_PTR_DEF_(EntryEvent, EntryEventPtr);
-_GF_PTR_DEF_(PdxReader, PdxReaderPtr);
-_GF_PTR_DEF_(PdxWriter, PdxWriterPtr);
-_GF_PTR_DEF_(PdxWrapper, PdxWrapperPtr);
-_GF_PTR_DEF_(PdxSerializer, PdxSerializerPtr);
-_GF_PTR_DEF_(PdxInstanceFactory, PdxInstanceFactoryPtr);
-_GF_PTR_DEF_(PdxInstance, PdxInstancePtr);
-_GF_PTR_DEF_(WritablePdxInstance, WritablePdxInstancePtr);
-_GF_PTR_DEF_(PdxUnreadFields, PdxUnreadFieldsPtr);
-_GF_PTR_DEF_(CacheableEnum, CacheableEnumPtr);
-_GF_PTR_DEF_(CqStatusListener, CqStatusListenerPtr);
-_GF_PTR_DEF_(InternalCacheTransactionManager2PC,
-             InternalCacheTransactionManager2PCPtr);
-}  // namespace client
-}  // namespace geode
-}  // namespace apache
-
-#endif  // GEODE_GF_TYPES_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/integration-test/testEntriesMapForVersioning.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testEntriesMapForVersioning.cpp b/src/cppcache/integration-test/testEntriesMapForVersioning.cpp
index 02560bf..45887a8 100644
--- a/src/cppcache/integration-test/testEntriesMapForVersioning.cpp
+++ b/src/cppcache/integration-test/testEntriesMapForVersioning.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <geode/gf_base.hpp>
+#include <geode/geode_base.hpp>
 
 #include "fw_dunit.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/integration-test/testSerialization.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testSerialization.cpp b/src/cppcache/integration-test/testSerialization.cpp
index 22039af..07782e9 100644
--- a/src/cppcache/integration-test/testSerialization.cpp
+++ b/src/cppcache/integration-test/testSerialization.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <geode/gf_base.hpp>
+#include <geode/geode_base.hpp>
 
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/integration-test/testThinClientBigValue.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientBigValue.cpp b/src/cppcache/integration-test/testThinClientBigValue.cpp
index 0578579..987aed6 100644
--- a/src/cppcache/integration-test/testThinClientBigValue.cpp
+++ b/src/cppcache/integration-test/testThinClientBigValue.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <geode/gf_base.hpp>
+#include <geode/geode_base.hpp>
 
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/integration-test/testThinClientPdxTests.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPdxTests.cpp b/src/cppcache/integration-test/testThinClientPdxTests.cpp
index 5132e5f..756eac9 100644
--- a/src/cppcache/integration-test/testThinClientPdxTests.cpp
+++ b/src/cppcache/integration-test/testThinClientPdxTests.cpp
@@ -1508,7 +1508,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, PutAndVerifyPdxInGFSInGet)
   {
     try {
       Serializable::registerType(
-          PdxInsideIGFSerializable::createDeserializable);
+          PdxInsideIGeodeSerializable::createDeserializable);
     } catch (const IllegalStateException&) {
       // ignore exception
     }
@@ -1565,17 +1565,18 @@ DUNIT_TASK_DEFINITION(CLIENT1, PutAndVerifyPdxInGFSInGet)
     }
 
     RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck");
-    PdxInsideIGFSerializablePtr np(new PdxInsideIGFSerializable());
+    PdxInsideIGeodeSerializablePtr np(new PdxInsideIGeodeSerializable());
 
     CacheableKeyPtr keyport = CacheableKey::create(1);
     regPtr0->put(keyport, np);
 
     // GET
-    PdxInsideIGFSerializablePtr pRet =
-        dynCast<PdxInsideIGFSerializablePtr>(regPtr0->get(keyport));
-    ASSERT(pRet->equals(np) == true,
-           "TASK PutAndVerifyPdxInIGFSInGet: PdxInsideIGFSerializable objects "
-           "should be equal");
+    PdxInsideIGeodeSerializablePtr pRet =
+        dynCast<PdxInsideIGeodeSerializablePtr>(regPtr0->get(keyport));
+    ASSERT(
+        pRet->equals(np) == true,
+        "TASK PutAndVerifyPdxInIGFSInGet: PdxInsideIGeodeSerializable objects "
+        "should be equal");
   }
 END_TASK_DEFINITION
 
@@ -1583,7 +1584,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, VerifyPdxInGFSGetOnly)
   {
     try {
       Serializable::registerType(
-          PdxInsideIGFSerializable::createDeserializable);
+          PdxInsideIGeodeSerializable::createDeserializable);
     } catch (const IllegalStateException&) {
       // ignore exception
     }
@@ -1640,16 +1641,16 @@ DUNIT_TASK_DEFINITION(CLIENT2, VerifyPdxInGFSGetOnly)
     }
 
     RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck");
-    PdxInsideIGFSerializablePtr orig(new PdxInsideIGFSerializable());
+    PdxInsideIGeodeSerializablePtr orig(new PdxInsideIGeodeSerializable());
 
     // GET
     CacheableKeyPtr keyport = CacheableKey::create(1);
-    PdxInsideIGFSerializablePtr pRet =
-        dynCast<PdxInsideIGFSerializablePtr>(regPtr0->get(keyport));
-    ASSERT(
-        pRet->equals(orig) == true,
-        "TASK:VerifyPdxInIGFSGetOnly, PdxInsideIGFSerializable objects should "
-        "be equal");
+    PdxInsideIGeodeSerializablePtr pRet =
+        dynCast<PdxInsideIGeodeSerializablePtr>(regPtr0->get(keyport));
+    ASSERT(pRet->equals(orig) == true,
+           "TASK:VerifyPdxInIGFSGetOnly, PdxInsideIGeodeSerializable objects "
+           "should "
+           "be equal");
   }
 END_TASK_DEFINITION
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/integration-test/testThinClientPdxTestsWithAuto.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPdxTestsWithAuto.cpp b/src/cppcache/integration-test/testThinClientPdxTestsWithAuto.cpp
index c8c4617..f114761 100644
--- a/src/cppcache/integration-test/testThinClientPdxTestsWithAuto.cpp
+++ b/src/cppcache/integration-test/testThinClientPdxTestsWithAuto.cpp
@@ -1236,7 +1236,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, PutAndVerifyPdxInGFSInGet)
   {
     try {
       Serializable::registerType(
-          PdxTestsAuto::PdxInsideIGFSerializable::createDeserializable);
+          PdxTestsAuto::PdxInsideIGeodeSerializable::createDeserializable);
     } catch (const IllegalStateException&) {
       // ignore exception
     }
@@ -1302,19 +1302,20 @@ DUNIT_TASK_DEFINITION(CLIENT1, PutAndVerifyPdxInGFSInGet)
     }
 
     RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck");
-    PdxTestsAuto::PdxInsideIGFSerializablePtr np(
-        new PdxTestsAuto::PdxInsideIGFSerializable());
+    PdxTestsAuto::PdxInsideIGeodeSerializablePtr np(
+        new PdxTestsAuto::PdxInsideIGeodeSerializable());
 
     CacheableKeyPtr keyport = CacheableKey::create(1);
     regPtr0->put(keyport, np);
 
     // GET
-    PdxTestsAuto::PdxInsideIGFSerializablePtr pRet =
-        dynCast<PdxTestsAuto::PdxInsideIGFSerializablePtr>(
+    PdxTestsAuto::PdxInsideIGeodeSerializablePtr pRet =
+        dynCast<PdxTestsAuto::PdxInsideIGeodeSerializablePtr>(
             regPtr0->get(keyport));
-    ASSERT(pRet->equals(np) == true,
-           "TASK PutAndVerifyPdxInIGFSInGet: PdxInsideIGFSerializable objects "
-           "should be equal");
+    ASSERT(
+        pRet->equals(np) == true,
+        "TASK PutAndVerifyPdxInIGFSInGet: PdxInsideIGeodeSerializable objects "
+        "should be equal");
   }
 END_TASK_DEFINITION
 
@@ -1322,7 +1323,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, VerifyPdxInGFSGetOnly)
   {
     try {
       Serializable::registerType(
-          PdxTestsAuto::PdxInsideIGFSerializable::createDeserializable);
+          PdxTestsAuto::PdxInsideIGeodeSerializable::createDeserializable);
     } catch (const IllegalStateException&) {
       // ignore exception
     }
@@ -1388,18 +1389,18 @@ DUNIT_TASK_DEFINITION(CLIENT2, VerifyPdxInGFSGetOnly)
     }
 
     RegionPtr regPtr0 = getHelper()->getRegion("DistRegionAck");
-    PdxTestsAuto::PdxInsideIGFSerializablePtr orig(
-        new PdxTestsAuto::PdxInsideIGFSerializable());
+    PdxTestsAuto::PdxInsideIGeodeSerializablePtr orig(
+        new PdxTestsAuto::PdxInsideIGeodeSerializable());
 
     // GET
     CacheableKeyPtr keyport = CacheableKey::create(1);
-    PdxTestsAuto::PdxInsideIGFSerializablePtr pRet =
-        dynCast<PdxTestsAuto::PdxInsideIGFSerializablePtr>(
+    PdxTestsAuto::PdxInsideIGeodeSerializablePtr pRet =
+        dynCast<PdxTestsAuto::PdxInsideIGeodeSerializablePtr>(
             regPtr0->get(keyport));
-    ASSERT(
-        pRet->equals(orig) == true,
-        "TASK:VerifyPdxInIGFSGetOnly, PdxInsideIGFSerializable objects should "
-        "be equal");
+    ASSERT(pRet->equals(orig) == true,
+           "TASK:VerifyPdxInIGFSGetOnly, PdxInsideIGeodeSerializable objects "
+           "should "
+           "be equal");
   }
 END_TASK_DEFINITION
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/AdminRegion.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/AdminRegion.hpp b/src/cppcache/src/AdminRegion.hpp
index af05740..9c930f5 100644
--- a/src/cppcache/src/AdminRegion.hpp
+++ b/src/cppcache/src/AdminRegion.hpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include <geode/gf_types.hpp>
+#include <geode/geode_types.hpp>
 #include "ThinClientCacheDistributionManager.hpp"
 #include "ReadWriteLock.hpp"
 #include <geode/Serializable.hpp>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/CacheTransactionManagerImpl.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CacheTransactionManagerImpl.cpp b/src/cppcache/src/CacheTransactionManagerImpl.cpp
index b3f9142..14d5ca4 100644
--- a/src/cppcache/src/CacheTransactionManagerImpl.cpp
+++ b/src/cppcache/src/CacheTransactionManagerImpl.cpp
@@ -21,7 +21,7 @@
  *      Author: ankurs
  */
 
-#include <geode/gf_types.hpp>
+#include <geode/geode_types.hpp>
 #include "CacheTransactionManagerImpl.hpp"
 #include <geode/TransactionId.hpp>
 #include <geode/ExceptionTypes.hpp>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/CacheableObjectPartList.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CacheableObjectPartList.hpp b/src/cppcache/src/CacheableObjectPartList.hpp
index b11267f..f124b39 100644
--- a/src/cppcache/src/CacheableObjectPartList.hpp
+++ b/src/cppcache/src/CacheableObjectPartList.hpp
@@ -21,7 +21,7 @@
  */
 
 #include <geode/geode_globals.hpp>
-#include <geode/gf_types.hpp>
+#include <geode/geode_types.hpp>
 #include <geode/DataOutput.hpp>
 #include <geode/DataInput.hpp>
 #include <geode/Cacheable.hpp>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/ClientHealthStats.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ClientHealthStats.hpp b/src/cppcache/src/ClientHealthStats.hpp
index 720f2f1..00954d2 100644
--- a/src/cppcache/src/ClientHealthStats.hpp
+++ b/src/cppcache/src/ClientHealthStats.hpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include <geode/gf_types.hpp>
+#include <geode/geode_types.hpp>
 #include <geode/Serializable.hpp>
 #include <geode/Log.hpp>
 #include <geode/CacheableDate.hpp>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/CqAttributesMutatorImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CqAttributesMutatorImpl.hpp b/src/cppcache/src/CqAttributesMutatorImpl.hpp
index 1004d7a..7a97ecf 100644
--- a/src/cppcache/src/CqAttributesMutatorImpl.hpp
+++ b/src/cppcache/src/CqAttributesMutatorImpl.hpp
@@ -21,7 +21,7 @@
  */
 
 #include <geode/geode_globals.hpp>
-#include <geode/gf_types.hpp>
+#include <geode/geode_types.hpp>
 #include <geode/VectorT.hpp>
 #include <geode/CqAttributesMutator.hpp>
 #include <geode/CqAttributes.hpp>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/CqEventImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CqEventImpl.hpp b/src/cppcache/src/CqEventImpl.hpp
index 7af0fb8..e742f1e 100644
--- a/src/cppcache/src/CqEventImpl.hpp
+++ b/src/cppcache/src/CqEventImpl.hpp
@@ -21,7 +21,7 @@
  */
 
 #include <geode/geode_globals.hpp>
-#include <geode/gf_types.hpp>
+#include <geode/geode_types.hpp>
 #include <geode/CqEvent.hpp>
 #include <geode/CqOperation.hpp>
 #include <geode/CqQuery.hpp>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/CqQueryImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CqQueryImpl.hpp b/src/cppcache/src/CqQueryImpl.hpp
index cec123f..1895f32 100644
--- a/src/cppcache/src/CqQueryImpl.hpp
+++ b/src/cppcache/src/CqQueryImpl.hpp
@@ -21,7 +21,7 @@
  */
 
 #include <geode/geode_globals.hpp>
-#include <geode/gf_types.hpp>
+#include <geode/geode_types.hpp>
 
 #include <geode/CqResults.hpp>
 #include <geode/CqQuery.hpp>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/CqService.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CqService.hpp b/src/cppcache/src/CqService.hpp
index d9d9d2b..4458064 100644
--- a/src/cppcache/src/CqService.hpp
+++ b/src/cppcache/src/CqService.hpp
@@ -21,7 +21,7 @@
  */
 
 #include <geode/geode_globals.hpp>
-#include <geode/gf_types.hpp>
+#include <geode/geode_types.hpp>
 #include "TcrMessage.hpp"
 #include "Queue.hpp"
 #include <ace/ACE.h>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/DistributedSystemImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/DistributedSystemImpl.hpp b/src/cppcache/src/DistributedSystemImpl.hpp
index e4cb89f..42311e3 100644
--- a/src/cppcache/src/DistributedSystemImpl.hpp
+++ b/src/cppcache/src/DistributedSystemImpl.hpp
@@ -26,7 +26,7 @@
 
 #include <geode/geode_globals.hpp>
 #include <geode/SharedPtr.hpp>
-#include <geode/gf_types.hpp>
+#include <geode/geode_types.hpp>
 #include "ace/Recursive_Thread_Mutex.h"
 #include "ace/Guard_T.h"
 #include "ace/OS.h"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/EventId.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/EventId.hpp b/src/cppcache/src/EventId.hpp
index ef29a36..92d17a6 100644
--- a/src/cppcache/src/EventId.hpp
+++ b/src/cppcache/src/EventId.hpp
@@ -21,7 +21,7 @@
  */
 
 #include <geode/geode_globals.hpp>
-#include <geode/gf_types.hpp>
+#include <geode/geode_types.hpp>
 #include <geode/Cacheable.hpp>
 #include "GeodeTypeIdsImpl.hpp"
 #include "SpinLock.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/ExecutionImpl.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ExecutionImpl.cpp b/src/cppcache/src/ExecutionImpl.cpp
index e2bfc41..f435ed2 100644
--- a/src/cppcache/src/ExecutionImpl.cpp
+++ b/src/cppcache/src/ExecutionImpl.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include <geode/geode_globals.hpp>
-#include <geode/gf_types.hpp>
+#include <geode/geode_types.hpp>
 #include "ExecutionImpl.hpp"
 #include <geode/ExceptionTypes.hpp>
 #include "ThinClientRegion.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/ExecutionImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ExecutionImpl.hpp b/src/cppcache/src/ExecutionImpl.hpp
index eae3e32..246f206 100644
--- a/src/cppcache/src/ExecutionImpl.hpp
+++ b/src/cppcache/src/ExecutionImpl.hpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include <geode/gf_types.hpp>
+#include <geode/geode_types.hpp>
 #include <geode/Execution.hpp>
 #include <geode/CacheableBuiltins.hpp>
 #include <geode/ResultCollector.hpp>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/FarSideEntryOp.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/FarSideEntryOp.hpp b/src/cppcache/src/FarSideEntryOp.hpp
index 1777700..b2d163f 100644
--- a/src/cppcache/src/FarSideEntryOp.hpp
+++ b/src/cppcache/src/FarSideEntryOp.hpp
@@ -27,7 +27,7 @@
  */
 
 #include <geode/geode_globals.hpp>
-#include <geode/gf_types.hpp>
+#include <geode/geode_types.hpp>
 #include <geode/Cacheable.hpp>
 #include <geode/DataOutput.hpp>
 #include <geode/DataInput.hpp>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/FunctionServiceImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/FunctionServiceImpl.hpp b/src/cppcache/src/FunctionServiceImpl.hpp
index 89b00d7..2a90c4f 100644
--- a/src/cppcache/src/FunctionServiceImpl.hpp
+++ b/src/cppcache/src/FunctionServiceImpl.hpp
@@ -21,7 +21,7 @@
  */
 
 #include <geode/geode_globals.hpp>
-#include <geode/gf_types.hpp>
+#include <geode/geode_types.hpp>
 #include "ProxyCache.hpp"
 #include <geode/FunctionService.hpp>
 /**

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/GF_TASK_T.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/GF_TASK_T.hpp b/src/cppcache/src/GF_TASK_T.hpp
deleted file mode 100644
index 0ee8da6..0000000
--- a/src/cppcache/src/GF_TASK_T.hpp
+++ /dev/null
@@ -1,86 +0,0 @@
-#pragma once
-
-#ifndef GEODE_GF_TASK_T_H_
-#define GEODE_GF_TASK_T_H_
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
-*@file GF_TASK_T.hpp
-*@since   1.0
-*@version 1.0
-*/
-
-#include "DistributedSystemImpl.hpp"
-#include <ace/Task.h>
-namespace apache {
-namespace geode {
-namespace client {
-const char NC_thread[] = "NC thread";
-template <class T>
-class CPPCACHE_EXPORT GF_TASK_T : public ACE_Task_Base {
- public:
-  /// Handle timeout events.
-  typedef int (T::*OPERATION)(volatile bool& isRunning);
-
-  // op_handler is the receiver of the timeout event. timeout is the method to
-  // be executed by op_handler_
-  GF_TASK_T(T* op_handler, OPERATION op)
-      : op_handler_(op_handler),
-        m_op(op),
-        m_run(false),
-        m_threadName(NC_thread) {}
-
-  // op_handler is the receiver of the timeout event. timeout is the method to
-  // be executed by op_handler_
-  GF_TASK_T(T* op_handler, OPERATION op, const char* tn)
-      : op_handler_(op_handler), m_op(op), m_run(false), m_threadName(tn) {}
-
-  ~GF_TASK_T() {}
-
-  void start() {
-    m_run = true;
-    activate();
-  }
-
-  void stop() {
-    if (m_run) {
-      m_run = false;
-      wait();
-    }
-  }
-
-  void stopNoblock() { m_run = false; }
-
-  int svc(void) {
-    DistributedSystemImpl::setThreadName(m_threadName);
-    return ((this->op_handler_->*m_op)(m_run));
-  }
-
- private:
-  T* op_handler_;
-  /// Handle timeout events.
-  OPERATION m_op;
-  volatile bool m_run;
-  const char* m_threadName;
-};
-}  // namespace client
-}  // namespace geode
-}  // namespace apache
-
-#endif  // GEODE_GF_TASK_T_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/InternalCacheTransactionManager2PCImpl.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/InternalCacheTransactionManager2PCImpl.cpp b/src/cppcache/src/InternalCacheTransactionManager2PCImpl.cpp
index 05afe04..fe7893d 100644
--- a/src/cppcache/src/InternalCacheTransactionManager2PCImpl.cpp
+++ b/src/cppcache/src/InternalCacheTransactionManager2PCImpl.cpp
@@ -21,7 +21,7 @@
  *      Author: sshcherbakov
  */
 
-#include <geode/gf_types.hpp>
+#include <geode/geode_types.hpp>
 #include "InternalCacheTransactionManager2PCImpl.hpp"
 #include "CacheTransactionManagerImpl.hpp"
 #include <geode/TransactionId.hpp>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/NoResult.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/NoResult.hpp b/src/cppcache/src/NoResult.hpp
index 7658551..00bd1fc 100644
--- a/src/cppcache/src/NoResult.hpp
+++ b/src/cppcache/src/NoResult.hpp
@@ -21,7 +21,7 @@
  */
 
 #include <geode/geode_globals.hpp>
-#include <geode/gf_types.hpp>
+#include <geode/geode_types.hpp>
 #include <geode/ExceptionTypes.hpp>
 #include <geode/ResultCollector.hpp>
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/PoolAttributes.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PoolAttributes.hpp b/src/cppcache/src/PoolAttributes.hpp
index 062a55c..eff6976 100644
--- a/src/cppcache/src/PoolAttributes.hpp
+++ b/src/cppcache/src/PoolAttributes.hpp
@@ -24,7 +24,7 @@
 #include "ace/OS.h"
 #include <geode/geode_globals.hpp>
 #include <geode/SharedBase.hpp>
-#include <geode/gf_types.hpp>
+#include <geode/geode_types.hpp>
 #include <geode/ExceptionTypes.hpp>
 
 /**

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/ProxyCache.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ProxyCache.hpp b/src/cppcache/src/ProxyCache.hpp
index 0dd8c54..043318d 100644
--- a/src/cppcache/src/ProxyCache.hpp
+++ b/src/cppcache/src/ProxyCache.hpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 #include <geode/geode_globals.hpp>
-#include <geode/gf_types.hpp>
+#include <geode/geode_types.hpp>
 #include <geode/Region.hpp>
 #include <geode/DistributedSystem.hpp>
 #include <geode/QueryService.hpp>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/ProxyRegion.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ProxyRegion.hpp b/src/cppcache/src/ProxyRegion.hpp
index 443ed4f..bcb755d 100644
--- a/src/cppcache/src/ProxyRegion.hpp
+++ b/src/cppcache/src/ProxyRegion.hpp
@@ -21,7 +21,7 @@
  */
 
 #include <geode/geode_globals.hpp>
-#include <geode/gf_types.hpp>
+#include <geode/geode_types.hpp>
 #include <geode/CacheableKey.hpp>
 #include <geode/CacheableString.hpp>
 #include <geode/CacheStatistics.hpp>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/RegionCommit.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RegionCommit.hpp b/src/cppcache/src/RegionCommit.hpp
index 0bc51b5..541614d 100644
--- a/src/cppcache/src/RegionCommit.hpp
+++ b/src/cppcache/src/RegionCommit.hpp
@@ -26,7 +26,7 @@
  *      Author: ankurs
  */
 
-#include <geode/gf_types.hpp>
+#include <geode/geode_types.hpp>
 #include <geode/SharedBase.hpp>
 #include <geode/DataInput.hpp>
 #include <geode/VectorOfSharedBase.hpp>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/RemoteQuery.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RemoteQuery.hpp b/src/cppcache/src/RemoteQuery.hpp
index 7ca4b59..b9daad7 100644
--- a/src/cppcache/src/RemoteQuery.hpp
+++ b/src/cppcache/src/RemoteQuery.hpp
@@ -21,7 +21,7 @@
  */
 
 #include <geode/geode_globals.hpp>
-#include <geode/gf_types.hpp>
+#include <geode/geode_types.hpp>
 #include <geode/ExceptionTypes.hpp>
 #include <geode/SharedPtr.hpp>
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/ResultSetImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ResultSetImpl.hpp b/src/cppcache/src/ResultSetImpl.hpp
index 37ef423..ff3891d 100644
--- a/src/cppcache/src/ResultSetImpl.hpp
+++ b/src/cppcache/src/ResultSetImpl.hpp
@@ -21,7 +21,7 @@
  */
 
 #include <geode/geode_globals.hpp>
-#include <geode/gf_types.hpp>
+#include <geode/geode_types.hpp>
 #include <geode/ExceptionTypes.hpp>
 
 #include <geode/ResultSet.hpp>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/StackFrame.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/StackFrame.cpp b/src/cppcache/src/StackFrame.cpp
index b9f3077..3c67a85 100644
--- a/src/cppcache/src/StackFrame.cpp
+++ b/src/cppcache/src/StackFrame.cpp
@@ -17,7 +17,7 @@
 #include <ace/OS.h>
 #include <geode/geode_globals.hpp>
 #include "StackFrame.hpp"
-#include <geode/gf_base.hpp>
+#include <geode/geode_base.hpp>
 
 namespace apache {
 namespace geode {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/StructSetImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/StructSetImpl.hpp b/src/cppcache/src/StructSetImpl.hpp
index 0cd08a8..5c7eb0c 100644
--- a/src/cppcache/src/StructSetImpl.hpp
+++ b/src/cppcache/src/StructSetImpl.hpp
@@ -21,7 +21,7 @@
  */
 
 #include <geode/geode_globals.hpp>
-#include <geode/gf_types.hpp>
+#include <geode/geode_types.hpp>
 
 #include <geode/StructSet.hpp>
 #include <geode/Struct.hpp>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/TXCommitMessage.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TXCommitMessage.hpp b/src/cppcache/src/TXCommitMessage.hpp
index 25b73e9..0a183c6 100644
--- a/src/cppcache/src/TXCommitMessage.hpp
+++ b/src/cppcache/src/TXCommitMessage.hpp
@@ -27,7 +27,7 @@
  */
 
 #include <geode/geode_globals.hpp>
-#include <geode/gf_types.hpp>
+#include <geode/geode_types.hpp>
 #include <geode/DataInput.hpp>
 #include "RegionCommit.hpp"
 #include <geode/VectorOfSharedBase.hpp>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/TXEntryState.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TXEntryState.hpp b/src/cppcache/src/TXEntryState.hpp
index d8cbc35..8e7f36b 100644
--- a/src/cppcache/src/TXEntryState.hpp
+++ b/src/cppcache/src/TXEntryState.hpp
@@ -26,7 +26,7 @@
  *      Author: ankurs
  */
 
-#include <geode/gf_types.hpp>
+#include <geode/geode_types.hpp>
 
 using namespace apache::geode::client;
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/TXId.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TXId.hpp b/src/cppcache/src/TXId.hpp
index 1a7b2d8..de811b9 100644
--- a/src/cppcache/src/TXId.hpp
+++ b/src/cppcache/src/TXId.hpp
@@ -26,7 +26,7 @@
  *      Author: ankurs
  */
 
-#include <geode/gf_types.hpp>
+#include <geode/geode_types.hpp>
 #include <geode/TransactionId.hpp>
 #include <geode/DataOutput.hpp>
 #include "AtomicInc.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/TXRegionState.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TXRegionState.hpp b/src/cppcache/src/TXRegionState.hpp
index 442b29d..1e4635f 100644
--- a/src/cppcache/src/TXRegionState.hpp
+++ b/src/cppcache/src/TXRegionState.hpp
@@ -26,7 +26,7 @@
  *      Author: ankurs
  */
 
-#include <geode/gf_types.hpp>
+#include <geode/geode_types.hpp>
 #include <geode/HashMapT.hpp>
 #include "TXEntryState.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/Task.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/Task.hpp b/src/cppcache/src/Task.hpp
new file mode 100644
index 0000000..4609d5e
--- /dev/null
+++ b/src/cppcache/src/Task.hpp
@@ -0,0 +1,86 @@
+#pragma once
+
+#ifndef GEODE_Task_H_
+#define GEODE_Task_H_
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+*@file Task.hpp
+*@since   1.0
+*@version 1.0
+*/
+
+#include "DistributedSystemImpl.hpp"
+#include <ace/Task.h>
+namespace apache {
+namespace geode {
+namespace client {
+const char NC_thread[] = "NC thread";
+template <class T>
+class CPPCACHE_EXPORT Task : public ACE_Task_Base {
+ public:
+  /// Handle timeout events.
+  typedef int (T::*OPERATION)(volatile bool& isRunning);
+
+  // op_handler is the receiver of the timeout event. timeout is the method to
+  // be executed by op_handler_
+  Task(T* op_handler, OPERATION op)
+      : op_handler_(op_handler),
+        m_op(op),
+        m_run(false),
+        m_threadName(NC_thread) {}
+
+  // op_handler is the receiver of the timeout event. timeout is the method to
+  // be executed by op_handler_
+  Task(T* op_handler, OPERATION op, const char* tn)
+      : op_handler_(op_handler), m_op(op), m_run(false), m_threadName(tn) {}
+
+  ~Task() {}
+
+  void start() {
+    m_run = true;
+    activate();
+  }
+
+  void stop() {
+    if (m_run) {
+      m_run = false;
+      wait();
+    }
+  }
+
+  void stopNoblock() { m_run = false; }
+
+  int svc(void) {
+    DistributedSystemImpl::setThreadName(m_threadName);
+    return ((this->op_handler_->*m_op)(m_run));
+  }
+
+ private:
+  T* op_handler_;
+  /// Handle timeout events.
+  OPERATION m_op;
+  volatile bool m_run;
+  const char* m_threadName;
+};
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
+
+#endif  // GEODE_Task_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/TcpSslConn.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TcpSslConn.cpp b/src/cppcache/src/TcpSslConn.cpp
index 3952b09..fde5c86 100644
--- a/src/cppcache/src/TcpSslConn.cpp
+++ b/src/cppcache/src/TcpSslConn.cpp
@@ -18,12 +18,12 @@
 
 #include <geode/SystemProperties.hpp>
 #include <geode/DistributedSystem.hpp>
-#include "../../cryptoimpl/GFSsl.hpp"
+#include "../../cryptoimpl/Ssl.hpp"
 
 using namespace apache::geode::client;
 
-GFSsl* TcpSslConn::getSSLImpl(ACE_SOCKET sock, const char* pubkeyfile,
-                              const char* privkeyfile) {
+Ssl* TcpSslConn::getSSLImpl(ACE_SOCKET sock, const char* pubkeyfile,
+                            const char* privkeyfile) {
   const char* libName = "cryptoImpl";
   if (m_dll.open(libName, RTLD_NOW | RTLD_GLOBAL, 0) == -1) {
     char msg[1000] = {0};
@@ -46,7 +46,7 @@ GFSsl* TcpSslConn::getSSLImpl(ACE_SOCKET sock, const char* pubkeyfile,
   const char* pemPassword =
       DistributedSystem::getSystemProperties()->sslKeystorePassword();
 
-  return reinterpret_cast<GFSsl*>(
+  return reinterpret_cast<Ssl*>(
       func(sock, pubkeyfile, privkeyfile, pemPassword));
 }
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/TcpSslConn.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TcpSslConn.hpp b/src/cppcache/src/TcpSslConn.hpp
index c6960c3..02e4a6d 100644
--- a/src/cppcache/src/TcpSslConn.hpp
+++ b/src/cppcache/src/TcpSslConn.hpp
@@ -22,7 +22,7 @@
 
 #include "TcpConn.hpp"
 #include <ace/DLL.h>
-#include "../../cryptoimpl/GFSsl.hpp"
+#include "../../cryptoimpl/Ssl.hpp"
 
 namespace apache {
 namespace geode {
@@ -30,7 +30,7 @@ namespace client {
 
 class TcpSslConn : public TcpConn {
  private:
-  GFSsl* m_ssl;
+  Ssl* m_ssl;
   ACE_DLL m_dll;
   // adongre: Added for Ticket #758
   // Pass extra parameter for the password
@@ -38,8 +38,8 @@ class TcpSslConn : public TcpConn {
                                      const char*);
   typedef void (*gf_destroy_SslImpl)(void*);
 
-  GFSsl* getSSLImpl(ACE_SOCKET sock, const char* pubkeyfile,
-                    const char* privkeyfile);
+  Ssl* getSSLImpl(ACE_SOCKET sock, const char* pubkeyfile,
+                  const char* privkeyfile);
 
  protected:
   int32_t socketOp(SockOp op, char* buff, int32_t len, uint32_t waitSeconds);

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/TcrChunkedContext.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TcrChunkedContext.hpp b/src/cppcache/src/TcrChunkedContext.hpp
index 656e4ba..3f3d760 100644
--- a/src/cppcache/src/TcrChunkedContext.hpp
+++ b/src/cppcache/src/TcrChunkedContext.hpp
@@ -29,7 +29,7 @@
 
 #include <ace/Semaphore.h>
 #include <string>
-#include <geode/gf_types.hpp>
+#include <geode/geode_types.hpp>
 #include "Utils.hpp"
 #include "AppDomainContext.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/TcrConnectionManager.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TcrConnectionManager.cpp b/src/cppcache/src/TcrConnectionManager.cpp
index 84293ad..67d7d01 100644
--- a/src/cppcache/src/TcrConnectionManager.cpp
+++ b/src/cppcache/src/TcrConnectionManager.cpp
@@ -113,7 +113,7 @@ void TcrConnectionManager::init(bool isPool) {
       GfErrTypeToException("TcrConnectionManager::init", err);
     }
 
-    m_redundancyTask = new GF_TASK_T<TcrConnectionManager>(
+    m_redundancyTask = new Task<TcrConnectionManager>(
         this, &TcrConnectionManager::redundancy, NC_Redundancy);
     m_redundancyTask->start();
 
@@ -129,7 +129,7 @@ void TcrConnectionManager::startFailoverAndCleanupThreads(bool isPool) {
   if (m_failoverTask == NULL || m_cleanupTask == NULL) {
     ACE_Guard<ACE_Recursive_Thread_Mutex> _guard(m_distMngrsLock);
     if (m_failoverTask == NULL && !isPool) {
-      m_failoverTask = new GF_TASK_T<TcrConnectionManager>(
+      m_failoverTask = new Task<TcrConnectionManager>(
           this, &TcrConnectionManager::failover, NC_Failover);
       m_failoverTask->start();
     }
@@ -137,7 +137,7 @@ void TcrConnectionManager::startFailoverAndCleanupThreads(bool isPool) {
       if (m_redundancyManager->m_HAenabled && !isPool) {
         m_redundancyManager->startPeriodicAck();
       }
-      m_cleanupTask = new GF_TASK_T<TcrConnectionManager>(
+      m_cleanupTask = new Task<TcrConnectionManager>(
           this, &TcrConnectionManager::cleanup, NC_CleanUp);
       m_cleanupTask->start();
     }
@@ -517,7 +517,7 @@ int TcrConnectionManager::redundancy(volatile bool &isRunning) {
 }
 
 void TcrConnectionManager::addNotificationForDeletion(
-    GF_TASK_T<TcrEndpoint> *notifyReceiver, TcrConnection *notifyConnection,
+    Task<TcrEndpoint> *notifyReceiver, TcrConnection *notifyConnection,
     ACE_Semaphore &notifyCleanupSema) {
   ACE_Guard<ACE_Recursive_Thread_Mutex> guard(m_notificationLock);
   m_connectionReleaseList.put(notifyConnection);
@@ -551,7 +551,7 @@ int TcrConnectionManager::cleanup(volatile bool &isRunning) {
 }
 
 void TcrConnectionManager::cleanNotificationLists() {
-  GF_TASK_T<TcrEndpoint> *notifyReceiver;
+  Task<TcrEndpoint> *notifyReceiver;
   TcrConnection *notifyConnection;
   ACE_Semaphore *notifyCleanupSema;
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/TcrConnectionManager.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TcrConnectionManager.hpp b/src/cppcache/src/TcrConnectionManager.hpp
index e9aa9a2..28766ac 100644
--- a/src/cppcache/src/TcrConnectionManager.hpp
+++ b/src/cppcache/src/TcrConnectionManager.hpp
@@ -21,7 +21,7 @@
  */
 
 #include <geode/geode_globals.hpp>
-#include "GF_TASK_T.hpp"
+#include "Task.hpp"
 #include <string>
 #include <ace/Recursive_Thread_Mutex.h>
 #include <ace/Map_Manager.h>
@@ -92,7 +92,7 @@ class CPPCACHE_EXPORT TcrConnectionManager {
                                        TcrMessageReply* reply);
   GfErrType sendSyncRequestCq(TcrMessage& request, TcrMessageReply& reply);
 
-  void addNotificationForDeletion(GF_TASK_T<TcrEndpoint>* notifyReceiver,
+  void addNotificationForDeletion(Task<TcrEndpoint>* notifyReceiver,
                                   TcrConnection* notifyConnection,
                                   ACE_Semaphore& notifyCleanupSema);
 
@@ -151,7 +151,7 @@ class CPPCACHE_EXPORT TcrConnectionManager {
   ACE_Recursive_Thread_Mutex m_distMngrsLock;
 
   ACE_Semaphore m_failoverSema;
-  GF_TASK_T<TcrConnectionManager>* m_failoverTask;
+  Task<TcrConnectionManager>* m_failoverTask;
 
   bool removeRefToEndpoint(TcrEndpoint* ep, bool keepEndpoint = false);
   TcrEndpoint* addRefToTcrEndpoint(std::string endpointName,
@@ -161,16 +161,16 @@ class CPPCACHE_EXPORT TcrConnectionManager {
   void removeHAEndpoints();
 
   ACE_Semaphore m_cleanupSema;
-  GF_TASK_T<TcrConnectionManager>* m_cleanupTask;
+  Task<TcrConnectionManager>* m_cleanupTask;
 
   long m_pingTaskId;
   long m_servermonitorTaskId;
-  Queue<GF_TASK_T<TcrEndpoint> > m_receiverReleaseList;
+  Queue<Task<TcrEndpoint> > m_receiverReleaseList;
   Queue<TcrConnection> m_connectionReleaseList;
   Queue<ACE_Semaphore> m_notifyCleanupSemaList;
 
   ACE_Semaphore m_redundancySema;
-  GF_TASK_T<TcrConnectionManager>* m_redundancyTask;
+  Task<TcrConnectionManager>* m_redundancyTask;
   ACE_Recursive_Thread_Mutex m_notificationLock;
   bool m_isDurable;
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/TcrEndpoint.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TcrEndpoint.cpp b/src/cppcache/src/TcrEndpoint.cpp
index f87a09f..9d7923a 100644
--- a/src/cppcache/src/TcrEndpoint.cpp
+++ b/src/cppcache/src/TcrEndpoint.cpp
@@ -476,7 +476,7 @@ GfErrType TcrEndpoint::registerDM(bool clientNotification, bool isSecondary,
                   m_name.c_str());
           return err;
         }
-        m_notifyReceiver = new GF_TASK_T<TcrEndpoint>(
+        m_notifyReceiver = new Task<TcrEndpoint>(
             this, &TcrEndpoint::receiveNotification, NC_Notification);
         m_notifyReceiver->start();
       }
@@ -1265,7 +1265,7 @@ void TcrEndpoint::stopNotifyReceiverAndCleanup() {
     // m_notifyReceiver->stopNoblock();
     m_notifyReceiver->wait();
     bool found = false;
-    for (std::list<GF_TASK_T<TcrEndpoint>*>::iterator it =
+    for (std::list<Task<TcrEndpoint>*>::iterator it =
              m_notifyReceiverList.begin();
          it != m_notifyReceiverList.end(); it++) {
       if (*it == m_notifyReceiver) {
@@ -1285,7 +1285,7 @@ void TcrEndpoint::stopNotifyReceiverAndCleanup() {
   if (m_notifyReceiverList.size() > 0) {
     LOGFINER("TcrEndpoint::stopNotifyReceiverAndCleanup: notifylist size = %d",
              m_notifyReceiverList.size());
-    for (std::list<GF_TASK_T<TcrEndpoint>*>::iterator it =
+    for (std::list<Task<TcrEndpoint>*>::iterator it =
              m_notifyReceiverList.begin();
          it != m_notifyReceiverList.end(); it++) {
       LOGFINER(

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/TcrEndpoint.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TcrEndpoint.hpp b/src/cppcache/src/TcrEndpoint.hpp
index 5b509d0..6dd421f 100644
--- a/src/cppcache/src/TcrEndpoint.hpp
+++ b/src/cppcache/src/TcrEndpoint.hpp
@@ -25,11 +25,11 @@
 #include <list>
 #include <ace/Recursive_Thread_Mutex.h>
 #include <ace/Semaphore.h>
-#include <geode/gf_base.hpp>
+#include <geode/geode_base.hpp>
 #include "FairQueue.hpp"
 #include "Set.hpp"
 #include "TcrConnection.hpp"
-#include "GF_TASK_T.hpp"
+#include "Task.hpp"
 #include "SpinLock.hpp"
 
 namespace apache {
@@ -199,10 +199,10 @@ class CPPCACHE_EXPORT TcrEndpoint {
   void closeConnection(TcrConnection*& conn);
   virtual void handleNotificationStats(int64 byteLength){};
   virtual void closeNotification();
-  std::list<GF_TASK_T<TcrEndpoint>*> m_notifyReceiverList;
+  std::list<Task<TcrEndpoint>*> m_notifyReceiverList;
   std::list<TcrConnection*> m_notifyConnectionList;
   TcrConnection* m_notifyConnection;
-  GF_TASK_T<TcrEndpoint>* m_notifyReceiver;
+  Task<TcrEndpoint>* m_notifyReceiver;
   int m_numRegionListener;
   bool m_isQueueHosted;
   ACE_Recursive_Thread_Mutex m_notifyReceiverLock;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/TcrHADistributionManager.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TcrHADistributionManager.hpp b/src/cppcache/src/TcrHADistributionManager.hpp
index 4f11b1b..39384bd 100644
--- a/src/cppcache/src/TcrHADistributionManager.hpp
+++ b/src/cppcache/src/TcrHADistributionManager.hpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include <geode/gf_base.hpp>
+#include <geode/geode_base.hpp>
 #include "ThinClientDistributionManager.hpp"
 #include <geode/CacheAttributes.hpp>
 #include "TcrEndpoint.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/TcrPoolEndPoint.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TcrPoolEndPoint.cpp b/src/cppcache/src/TcrPoolEndPoint.cpp
index 56fbd59..f50b181 100644
--- a/src/cppcache/src/TcrPoolEndPoint.cpp
+++ b/src/cppcache/src/TcrPoolEndPoint.cpp
@@ -94,7 +94,7 @@ GfErrType TcrPoolEndPoint::registerDM(bool clientNotification, bool isSecondary,
               name().c_str());
       return err;
     }
-    m_notifyReceiver = new GF_TASK_T<TcrEndpoint>(
+    m_notifyReceiver = new Task<TcrEndpoint>(
         this, &TcrEndpoint::receiveNotification, NC_Notification);
     m_notifyReceiver->start();
   }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/cppcache/src/ThinClientBaseDM.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ThinClientBaseDM.cpp b/src/cppcache/src/ThinClientBaseDM.cpp
index 9da5e25..cda9ccd 100644
--- a/src/cppcache/src/ThinClientBaseDM.cpp
+++ b/src/cppcache/src/ThinClientBaseDM.cpp
@@ -246,7 +246,7 @@ int ThinClientBaseDM::processChunks(volatile bool& isRunning) {
 void ThinClientBaseDM::startChunkProcessor() {
   if (m_chunkProcessor == NULL) {
     m_chunks.open();
-    m_chunkProcessor = new GF_TASK_T<ThinClientBaseDM>(
+    m_chunkProcessor = new Task<ThinClientBaseDM>(
         this, &ThinClientBaseDM::processChunks, NC_ProcessChunk);
     m_chunkProcessor->start();
   }


Mime
View raw message