geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [05/31] geode-native git commit: GEODE-2476: Replace gfcpp with geode.
Date Tue, 21 Feb 2017 17:40:18 GMT
http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/ExecutionImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ExecutionImpl.hpp b/src/cppcache/src/ExecutionImpl.hpp
index 7c4d95a..eae3e32 100644
--- a/src/cppcache/src/ExecutionImpl.hpp
+++ b/src/cppcache/src/ExecutionImpl.hpp
@@ -20,11 +20,11 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gf_types.hpp>
-#include <gfcpp/Execution.hpp>
-#include <gfcpp/CacheableBuiltins.hpp>
-#include <gfcpp/ResultCollector.hpp>
-#include <gfcpp/Region.hpp>
+#include <geode/gf_types.hpp>
+#include <geode/Execution.hpp>
+#include <geode/CacheableBuiltins.hpp>
+#include <geode/ResultCollector.hpp>
+#include <geode/Region.hpp>
 #include "ProxyCache.hpp"
 #include <ace/Condition_Recursive_Thread_Mutex.h>
 #include <ace/Guard_T.h>
@@ -113,4 +113,4 @@ class ExecutionImpl : public Execution {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_EXECUTIONIMPL_H_
+#endif  // GEODE_EXECUTIONIMPL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/ExpMapEntry.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ExpMapEntry.hpp b/src/cppcache/src/ExpMapEntry.hpp
index 6f6d8c1..e0f081b 100644
--- a/src/cppcache/src/ExpMapEntry.hpp
+++ b/src/cppcache/src/ExpMapEntry.hpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>
 #include "MapEntry.hpp"
 #include "VersionStamp.hpp"
 
@@ -95,4 +95,4 @@ class CPPCACHE_EXPORT ExpEntryFactory : public EntryFactory {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_EXPMAPENTRY_H_
+#endif  // GEODE_EXPMAPENTRY_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/ExpirationAction.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ExpirationAction.cpp b/src/cppcache/src/ExpirationAction.cpp
index 23ba6a2..a6ab557 100644
--- a/src/cppcache/src/ExpirationAction.cpp
+++ b/src/cppcache/src/ExpirationAction.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/ExpirationAction.hpp>
+#include <geode/ExpirationAction.hpp>
 
 #include <string.h>
 #include <ace/OS.h>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/ExpirationAttributes.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ExpirationAttributes.cpp b/src/cppcache/src/ExpirationAttributes.cpp
index ec268ff..833d6b7 100644
--- a/src/cppcache/src/ExpirationAttributes.cpp
+++ b/src/cppcache/src/ExpirationAttributes.cpp
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <gfcpp/ExpirationAttributes.hpp>
+#include <geode/ExpirationAttributes.hpp>
 
 using namespace apache::geode::client;
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/ExpiryHandler_T.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ExpiryHandler_T.hpp b/src/cppcache/src/ExpiryHandler_T.hpp
index 484156f..779a606 100644
--- a/src/cppcache/src/ExpiryHandler_T.hpp
+++ b/src/cppcache/src/ExpiryHandler_T.hpp
@@ -25,9 +25,8 @@
  *@version 1.0
  */
 
-
 #include "ace/Event_Handler.h"
-#include <gfcpp/Log.hpp>
+#include <geode/Log.hpp>
 #include "StackTrace.hpp"
 namespace apache {
 namespace geode {
@@ -73,4 +72,4 @@ class CPPCACHE_EXPORT ExpiryHandler_T : public ACE_Event_Handler {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_EXPIRYHANDLER_T_H_
+#endif  // GEODE_EXPIRYHANDLER_T_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/ExpiryTaskManager.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ExpiryTaskManager.cpp b/src/cppcache/src/ExpiryTaskManager.cpp
index 066883e..1220380 100644
--- a/src/cppcache/src/ExpiryTaskManager.cpp
+++ b/src/cppcache/src/ExpiryTaskManager.cpp
@@ -16,9 +16,9 @@
  */
 #include "config.h"
 #include "ExpiryTaskManager.hpp"
-#include <gfcpp/Log.hpp>
-#include <gfcpp/Assert.hpp>
-#include <gfcpp/DistributedSystem.hpp>
+#include <geode/Log.hpp>
+#include <geode/Assert.hpp>
+#include <geode/DistributedSystem.hpp>
 #include "DistributedSystemImpl.hpp"
 
 #if defined(_WIN32)

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/ExpiryTaskManager.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ExpiryTaskManager.hpp b/src/cppcache/src/ExpiryTaskManager.hpp
index 3f489e8..1fbe1e1 100644
--- a/src/cppcache/src/ExpiryTaskManager.hpp
+++ b/src/cppcache/src/ExpiryTaskManager.hpp
@@ -24,8 +24,8 @@
 #include <ace/Timer_Heap.h>
 #include "ReadWriteLock.hpp"
 
-#include <gfcpp/gfcpp_globals.hpp>
-#include <gfcpp/Log.hpp>
+#include <geode/geode_globals.hpp>
+#include <geode/Log.hpp>
 
 /**
  * @file ExpiryTaskManager.hpp
@@ -274,4 +274,4 @@ class CPPCACHE_EXPORT ExpiryTaskManager : public ACE_Task_Base {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_EXPIRYTASKMANAGER_H_
+#endif  // GEODE_EXPIRYTASKMANAGER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/FairQueue.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/FairQueue.hpp b/src/cppcache/src/FairQueue.hpp
index 6d5233a..0c1e23f 100644
--- a/src/cppcache/src/FairQueue.hpp
+++ b/src/cppcache/src/FairQueue.hpp
@@ -176,4 +176,4 @@ class FairQueue {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_FAIRQUEUE_H_
+#endif  // GEODE_FAIRQUEUE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/FarSideEntryOp.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/FarSideEntryOp.hpp b/src/cppcache/src/FarSideEntryOp.hpp
index 034180c..1777700 100644
--- a/src/cppcache/src/FarSideEntryOp.hpp
+++ b/src/cppcache/src/FarSideEntryOp.hpp
@@ -26,13 +26,12 @@
  *      Author: ankurs
  */
 
-
-#include <gfcpp/gfcpp_globals.hpp>
-#include <gfcpp/gf_types.hpp>
-#include <gfcpp/Cacheable.hpp>
-#include <gfcpp/DataOutput.hpp>
-#include <gfcpp/DataInput.hpp>
-#include <gfcpp/UserData.hpp>
+#include <geode/geode_globals.hpp>
+#include <geode/gf_types.hpp>
+#include <geode/Cacheable.hpp>
+#include <geode/DataOutput.hpp>
+#include <geode/DataInput.hpp>
+#include <geode/UserData.hpp>
 #include "LocalRegion.hpp"
 
 namespace apache {
@@ -125,5 +124,4 @@ class FarSideEntryOp : public apache::geode::client::SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-
-#endif // GEODE_FARSIDEENTRYOP_H_
+#endif  // GEODE_FARSIDEENTRYOP_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/FixedPartitionAttributesImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/FixedPartitionAttributesImpl.hpp b/src/cppcache/src/FixedPartitionAttributesImpl.hpp
index 7824429..12dfac9 100644
--- a/src/cppcache/src/FixedPartitionAttributesImpl.hpp
+++ b/src/cppcache/src/FixedPartitionAttributesImpl.hpp
@@ -20,11 +20,11 @@
  * limitations under the License.
  */
 
-#include <gfcpp/Serializable.hpp>
-#include <gfcpp/DataInput.hpp>
-#include <gfcpp/DataOutput.hpp>
-#include <gfcpp/CacheableString.hpp>
-#include <gfcpp/CacheableBuiltins.hpp>
+#include <geode/Serializable.hpp>
+#include <geode/DataInput.hpp>
+#include <geode/DataOutput.hpp>
+#include <geode/CacheableString.hpp>
+#include <geode/CacheableBuiltins.hpp>
 
 namespace apache {
 namespace geode {
@@ -125,5 +125,4 @@ class FixedPartitionAttributesImpl : public Serializable {
 }  // namespace geode
 }  // namespace apache
 
-
-#endif // GEODE_FIXEDPARTITIONATTRIBUTESIMPL_H_
+#endif  // GEODE_FIXEDPARTITIONATTRIBUTESIMPL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/FunctionService.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/FunctionService.cpp b/src/cppcache/src/FunctionService.cpp
index ef83d15..c9d7a71 100644
--- a/src/cppcache/src/FunctionService.cpp
+++ b/src/cppcache/src/FunctionService.cpp
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <gfcpp/FunctionService.hpp>
-#include <gfcpp/ExceptionTypes.hpp>
+#include <geode/FunctionService.hpp>
+#include <geode/ExceptionTypes.hpp>
 #include <ExecutionImpl.hpp>
 #include <ProxyRegion.hpp>
 #include <UserAttributes.hpp>
 #include <ProxyCache.hpp>
-#include <gfcpp/PoolManager.hpp>
+#include <geode/PoolManager.hpp>
 #include <CacheRegionHelper.hpp>
-#include <gfcpp/TypeHelper.hpp>
+#include <geode/TypeHelper.hpp>
 
 using namespace apache::geode::client;
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/FunctionServiceImpl.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/FunctionServiceImpl.cpp b/src/cppcache/src/FunctionServiceImpl.cpp
index 024cfd1..f3f59e4 100644
--- a/src/cppcache/src/FunctionServiceImpl.cpp
+++ b/src/cppcache/src/FunctionServiceImpl.cpp
@@ -17,7 +17,7 @@
 
 #include "FunctionServiceImpl.hpp"
 #include "ExecutionImpl.hpp"
-#include <gfcpp/PoolManager.hpp>
+#include <geode/PoolManager.hpp>
 
 using namespace apache::geode::client;
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/FunctionServiceImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/FunctionServiceImpl.hpp b/src/cppcache/src/FunctionServiceImpl.hpp
index 7eb4626..89b00d7 100644
--- a/src/cppcache/src/FunctionServiceImpl.hpp
+++ b/src/cppcache/src/FunctionServiceImpl.hpp
@@ -20,10 +20,10 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
-#include <gfcpp/gf_types.hpp>
+#include <geode/geode_globals.hpp>
+#include <geode/gf_types.hpp>
 #include "ProxyCache.hpp"
-#include <gfcpp/FunctionService.hpp>
+#include <geode/FunctionService.hpp>
 /**
  * @file
  */
@@ -66,4 +66,4 @@ class CPPCACHE_EXPORT FunctionServiceImpl : public FunctionService {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_FUNCTIONSERVICEIMPL_H_
+#endif  // GEODE_FUNCTIONSERVICEIMPL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/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
index 568b814..0ee8da6 100644
--- a/src/cppcache/src/GF_TASK_T.hpp
+++ b/src/cppcache/src/GF_TASK_T.hpp
@@ -26,7 +26,6 @@
 *@version 1.0
 */
 
-
 #include "DistributedSystemImpl.hpp"
 #include <ace/Task.h>
 namespace apache {
@@ -84,4 +83,4 @@ class CPPCACHE_EXPORT GF_TASK_T : public ACE_Task_Base {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_GF_TASK_T_H_
+#endif  // GEODE_GF_TASK_T_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/GatewayEventCallbackArgument.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/GatewayEventCallbackArgument.hpp b/src/cppcache/src/GatewayEventCallbackArgument.hpp
index 9619951..ae1de8e 100644
--- a/src/cppcache/src/GatewayEventCallbackArgument.hpp
+++ b/src/cppcache/src/GatewayEventCallbackArgument.hpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/Serializable.hpp>
+#include <geode/Serializable.hpp>
 #include "GeodeTypeIdsImpl.hpp"
 
 namespace apache {
@@ -69,5 +69,4 @@ class GatewayEventCallbackArgument : public Serializable {
 }  // namespace geode
 }  // namespace apache
 
-
-#endif // GEODE_GATEWAYEVENTCALLBACKARGUMENT_H_
+#endif  // GEODE_GATEWAYEVENTCALLBACKARGUMENT_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/GatewaySenderEventCallbackArgument.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/GatewaySenderEventCallbackArgument.hpp b/src/cppcache/src/GatewaySenderEventCallbackArgument.hpp
index 38c9509..88ff69b 100644
--- a/src/cppcache/src/GatewaySenderEventCallbackArgument.hpp
+++ b/src/cppcache/src/GatewaySenderEventCallbackArgument.hpp
@@ -20,8 +20,7 @@
  * limitations under the License.
  */
 
-
-#include <gfcpp/Serializable.hpp>
+#include <geode/Serializable.hpp>
 #include "GeodeTypeIdsImpl.hpp"
 
 namespace apache {
@@ -74,5 +73,4 @@ class GatewaySenderEventCallbackArgument : public Serializable {
 }  // namespace geode
 }  // namespace apache
 
-
-#endif // GEODE_GATEWAYSENDEREVENTCALLBACKARGUMENT_H_
+#endif  // GEODE_GATEWAYSENDEREVENTCALLBACKARGUMENT_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/GeodeTypeIdsImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/GeodeTypeIdsImpl.hpp b/src/cppcache/src/GeodeTypeIdsImpl.hpp
index 5a260f4..7e57efc 100644
--- a/src/cppcache/src/GeodeTypeIdsImpl.hpp
+++ b/src/cppcache/src/GeodeTypeIdsImpl.hpp
@@ -82,5 +82,4 @@ class GeodeTypeIdsImpl {
 }  // namespace geode
 }  // namespace apache
 
-
-#endif // GEODE_GEODETYPEIDSIMPL_H_
+#endif  // GEODE_GEODETYPEIDSIMPL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/GetAllServersRequest.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/GetAllServersRequest.hpp b/src/cppcache/src/GetAllServersRequest.hpp
index 2e64ba1..f1d06cf 100644
--- a/src/cppcache/src/GetAllServersRequest.hpp
+++ b/src/cppcache/src/GetAllServersRequest.hpp
@@ -20,10 +20,10 @@
  * limitations under the License.
  */
 
-#include <gfcpp/Serializable.hpp>
-#include <gfcpp/DataInput.hpp>
-#include <gfcpp/DataOutput.hpp>
-#include <gfcpp/CacheableString.hpp>
+#include <geode/Serializable.hpp>
+#include <geode/DataInput.hpp>
+#include <geode/DataOutput.hpp>
+#include <geode/CacheableString.hpp>
 #include "GeodeTypeIdsImpl.hpp"
 #include <string>
 
@@ -53,5 +53,4 @@ class GetAllServersRequest : public Serializable {
 }  // namespace geode
 }  // namespace apache
 
-
-#endif // GEODE_GETALLSERVERSREQUEST_H_
+#endif  // GEODE_GETALLSERVERSREQUEST_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/GetAllServersResponse.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/GetAllServersResponse.hpp b/src/cppcache/src/GetAllServersResponse.hpp
index c19d602..739f9e2 100644
--- a/src/cppcache/src/GetAllServersResponse.hpp
+++ b/src/cppcache/src/GetAllServersResponse.hpp
@@ -20,10 +20,10 @@
  * limitations under the License.
  */
 
-#include <gfcpp/Serializable.hpp>
+#include <geode/Serializable.hpp>
 #include "ServerLocation.hpp"
-#include <gfcpp/DataInput.hpp>
-#include <gfcpp/DataOutput.hpp>
+#include <geode/DataInput.hpp>
+#include <geode/DataOutput.hpp>
 #include <vector>
 
 namespace apache {
@@ -55,5 +55,4 @@ typedef SharedPtr<GetAllServersResponse> GetAllServersResponsePtr;
 }  // namespace geode
 }  // namespace apache
 
-
-#endif // GEODE_GETALLSERVERSRESPONSE_H_
+#endif  // GEODE_GETALLSERVERSRESPONSE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/HashMapOfSharedBase.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/HashMapOfSharedBase.cpp b/src/cppcache/src/HashMapOfSharedBase.cpp
index fe7a8da..2e42368 100644
--- a/src/cppcache/src/HashMapOfSharedBase.cpp
+++ b/src/cppcache/src/HashMapOfSharedBase.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/HashMapOfSharedBase.hpp>
+#include <geode/HashMapOfSharedBase.hpp>
 
 namespace apache {
 namespace geode {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/HashSetOfSharedBase.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/HashSetOfSharedBase.cpp b/src/cppcache/src/HashSetOfSharedBase.cpp
index d46fc61..a7470e5 100644
--- a/src/cppcache/src/HashSetOfSharedBase.cpp
+++ b/src/cppcache/src/HashSetOfSharedBase.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/HashSetOfSharedBase.hpp>
+#include <geode/HashSetOfSharedBase.hpp>
 
 namespace apache {
 namespace geode {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/HostAsm.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/HostAsm.hpp b/src/cppcache/src/HostAsm.hpp
index fc227b2..9099bee 100644
--- a/src/cppcache/src/HostAsm.hpp
+++ b/src/cppcache/src/HostAsm.hpp
@@ -34,7 +34,7 @@ included.
 */
 
 #include "config.h"
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>
 #include <ace/ACE.h>
 #include <ace/Time_Value.h>
 #include <ace/OS_NS_time.h>
@@ -446,4 +446,4 @@ return true;
 #pragma clang diagnostic pop
 #endif
 
-#endif // GEODE_HOSTASM_H_
+#endif  // GEODE_HOSTASM_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/IntQueue.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/IntQueue.hpp b/src/cppcache/src/IntQueue.hpp
index fe3cc9a..f153cf6 100644
--- a/src/cppcache/src/IntQueue.hpp
+++ b/src/cppcache/src/IntQueue.hpp
@@ -120,4 +120,4 @@ class CPPCACHE_EXPORT IntQueue {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_INTQUEUE_H_
+#endif  // GEODE_INTQUEUE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/InterestResultPolicy.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/InterestResultPolicy.hpp b/src/cppcache/src/InterestResultPolicy.hpp
index 3532311..50d9aa8 100644
--- a/src/cppcache/src/InterestResultPolicy.hpp
+++ b/src/cppcache/src/InterestResultPolicy.hpp
@@ -23,7 +23,7 @@
 /**
  * @file
  */
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>
 
 namespace apache {
 namespace geode {
@@ -52,4 +52,4 @@ class CPPCACHE_EXPORT InterestResultPolicy {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_INTERESTRESULTPOLICY_H_
+#endif  // GEODE_INTERESTRESULTPOLICY_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/InternalCacheTransactionManager2PC.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/InternalCacheTransactionManager2PC.cpp b/src/cppcache/src/InternalCacheTransactionManager2PC.cpp
index 624495d..9d0509e 100644
--- a/src/cppcache/src/InternalCacheTransactionManager2PC.cpp
+++ b/src/cppcache/src/InternalCacheTransactionManager2PC.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/InternalCacheTransactionManager2PC.hpp>
+#include <geode/InternalCacheTransactionManager2PC.hpp>
 
 namespace apache {
 namespace geode {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/InternalCacheTransactionManager2PCImpl.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/InternalCacheTransactionManager2PCImpl.cpp b/src/cppcache/src/InternalCacheTransactionManager2PCImpl.cpp
index 1267ae2..05afe04 100644
--- a/src/cppcache/src/InternalCacheTransactionManager2PCImpl.cpp
+++ b/src/cppcache/src/InternalCacheTransactionManager2PCImpl.cpp
@@ -21,15 +21,15 @@
  *      Author: sshcherbakov
  */
 
-#include <gfcpp/gf_types.hpp>
+#include <geode/gf_types.hpp>
 #include "InternalCacheTransactionManager2PCImpl.hpp"
 #include "CacheTransactionManagerImpl.hpp"
-#include <gfcpp/TransactionId.hpp>
-#include <gfcpp/ExceptionTypes.hpp>
+#include <geode/TransactionId.hpp>
+#include <geode/ExceptionTypes.hpp>
 #include "TcrMessage.hpp"
 #include "ThinClientPoolDM.hpp"
 #include "CacheRegionHelper.hpp"
-#include <gfcpp/PoolManager.hpp>
+#include <geode/PoolManager.hpp>
 #include "TXCleaner.hpp"
 
 namespace apache {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/InternalCacheTransactionManager2PCImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/InternalCacheTransactionManager2PCImpl.hpp b/src/cppcache/src/InternalCacheTransactionManager2PCImpl.hpp
index 12c6831..7261643 100644
--- a/src/cppcache/src/InternalCacheTransactionManager2PCImpl.hpp
+++ b/src/cppcache/src/InternalCacheTransactionManager2PCImpl.hpp
@@ -26,8 +26,7 @@
  *      Author: sshcherbakov
  */
 
-
-#include <gfcpp/InternalCacheTransactionManager2PC.hpp>
+#include <geode/InternalCacheTransactionManager2PC.hpp>
 #include "CacheTransactionManagerImpl.hpp"
 
 namespace apache {
@@ -57,5 +56,4 @@ class InternalCacheTransactionManager2PCImpl
 }  // namespace geode
 }  // namespace apache
 
-
-#endif // GEODE_INTERNALCACHETRANSACTIONMANAGER2PCIMPL_H_
+#endif  // GEODE_INTERNALCACHETRANSACTIONMANAGER2PCIMPL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/InternalDataView.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/InternalDataView.hpp b/src/cppcache/src/InternalDataView.hpp
index aa9caa3..706bb68 100644
--- a/src/cppcache/src/InternalDataView.hpp
+++ b/src/cppcache/src/InternalDataView.hpp
@@ -26,7 +26,6 @@
  *      Author: ankurs
  */
 
-
 namespace apache {
 namespace geode {
 namespace client {
@@ -40,5 +39,4 @@ class InternalDataView {
 }  // namespace geode
 }  // namespace apache
 
-
-#endif // GEODE_INTERNALDATAVIEW_H_
+#endif  // GEODE_INTERNALDATAVIEW_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/LRUAction.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LRUAction.cpp b/src/cppcache/src/LRUAction.cpp
index 9261deb..1ba0ca0 100644
--- a/src/cppcache/src/LRUAction.cpp
+++ b/src/cppcache/src/LRUAction.cpp
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <gfcpp/Cache.hpp>
+#include <geode/Cache.hpp>
 #include "LRUAction.hpp"
 #include "LRULocalDestroyAction.hpp"
 #include "LRUEntriesMap.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/LRUAction.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LRUAction.hpp b/src/cppcache/src/LRUAction.hpp
index 6085d09..4867cc8 100644
--- a/src/cppcache/src/LRUAction.hpp
+++ b/src/cppcache/src/LRUAction.hpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
-#include <gfcpp/Cache.hpp>
-#include <gfcpp/PersistenceManager.hpp>
+#include <geode/geode_globals.hpp>
+#include <geode/Cache.hpp>
+#include <geode/PersistenceManager.hpp>
 #include "MapEntry.hpp"
 #include "CacheableToken.hpp"
 #include "RegionInternal.hpp"
@@ -182,4 +182,4 @@ class CPPCACHE_EXPORT LRUOverFlowToDiskAction : public virtual LRUAction {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_LRUACTION_H_
+#endif  // GEODE_LRUACTION_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/LRUEntriesMap.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LRUEntriesMap.hpp b/src/cppcache/src/LRUEntriesMap.hpp
index 4a85308..3efcbeb 100644
--- a/src/cppcache/src/LRUEntriesMap.hpp
+++ b/src/cppcache/src/LRUEntriesMap.hpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
-#include <gfcpp/Cache.hpp>
+#include <geode/geode_globals.hpp>
+#include <geode/Cache.hpp>
 #include "ConcurrentEntriesMap.hpp"
 #include "LRUAction.hpp"
 #include "LRUList.hpp"
@@ -137,4 +137,4 @@ class CPPCACHE_EXPORT LRUEntriesMap : public ConcurrentEntriesMap,
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_LRUENTRIESMAP_H_
+#endif  // GEODE_LRUENTRIESMAP_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/LRUExpMapEntry.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LRUExpMapEntry.hpp b/src/cppcache/src/LRUExpMapEntry.hpp
index 50acbb4..9b51455 100644
--- a/src/cppcache/src/LRUExpMapEntry.hpp
+++ b/src/cppcache/src/LRUExpMapEntry.hpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>
 #include "MapEntry.hpp"
 #include "LRUList.hpp"
 #include "VersionStamp.hpp"
@@ -100,4 +100,4 @@ class CPPCACHE_EXPORT LRUExpEntryFactory : public EntryFactory {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_LRUEXPMAPENTRY_H_
+#endif  // GEODE_LRUEXPMAPENTRY_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/LRUList.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LRUList.hpp b/src/cppcache/src/LRUList.hpp
index 08f9e54..3e1d30a 100644
--- a/src/cppcache/src/LRUList.hpp
+++ b/src/cppcache/src/LRUList.hpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
-#include <gfcpp/SharedPtr.hpp>
+#include <geode/geode_globals.hpp>
+#include <geode/SharedPtr.hpp>
 #include "SpinLock.hpp"
 
 namespace apache {
@@ -153,4 +153,4 @@ class LRUList {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_LRULIST_H_
+#endif  // GEODE_LRULIST_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/LRULocalDestroyAction.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LRULocalDestroyAction.hpp b/src/cppcache/src/LRULocalDestroyAction.hpp
index 71238fa..c0337d0 100644
--- a/src/cppcache/src/LRULocalDestroyAction.hpp
+++ b/src/cppcache/src/LRULocalDestroyAction.hpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>
 #include "LRUAction.hpp"
 #include "RegionInternal.hpp"
 #include "MapEntry.hpp"
@@ -54,4 +54,4 @@ class CPPCACHE_EXPORT LRULocalDestroyAction : public virtual LRUAction {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_LRULOCALDESTROYACTION_H_
+#endif  // GEODE_LRULOCALDESTROYACTION_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/LRUMapEntry.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LRUMapEntry.hpp b/src/cppcache/src/LRUMapEntry.hpp
index 363f60d..961a4a5 100644
--- a/src/cppcache/src/LRUMapEntry.hpp
+++ b/src/cppcache/src/LRUMapEntry.hpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
-#include <gfcpp/CacheableKey.hpp>
+#include <geode/geode_globals.hpp>
+#include <geode/CacheableKey.hpp>
 #include "MapEntry.hpp"
 #include "LRUList.hpp"
 #include "VersionStamp.hpp"
@@ -124,4 +124,4 @@ class CPPCACHE_EXPORT LRUEntryFactory : public EntryFactory {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_LRUMAPENTRY_H_
+#endif  // GEODE_LRUMAPENTRY_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/LocalRegion.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LocalRegion.cpp b/src/cppcache/src/LocalRegion.cpp
index 57b582c..f49e0a7 100644
--- a/src/cppcache/src/LocalRegion.cpp
+++ b/src/cppcache/src/LocalRegion.cpp
@@ -16,8 +16,8 @@
  */
 
 #include "LocalRegion.hpp"
-#include <gfcpp/Log.hpp>
-#include <gfcpp/SystemProperties.hpp>
+#include <geode/Log.hpp>
+#include <geode/SystemProperties.hpp>
 #include "CacheImpl.hpp"
 #include "CacheRegionHelper.hpp"
 #include "CacheableToken.hpp"
@@ -32,7 +32,7 @@
 #include "TXState.hpp"
 #include "VersionTag.hpp"
 #include <vector>
-#include <gfcpp/PoolManager.hpp>
+#include <geode/PoolManager.hpp>
 
 using namespace apache::geode::client;
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/LocalRegion.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LocalRegion.hpp b/src/cppcache/src/LocalRegion.hpp
index 128b119..0d0fa58 100644
--- a/src/cppcache/src/LocalRegion.hpp
+++ b/src/cppcache/src/LocalRegion.hpp
@@ -24,23 +24,23 @@
 * @file
 */
 
-#include <gfcpp/gfcpp_globals.hpp>
-#include <gfcpp/CacheStatistics.hpp>
-#include <gfcpp/ExceptionTypes.hpp>
-#include <gfcpp/CacheableKey.hpp>
-#include <gfcpp/Cacheable.hpp>
-#include <gfcpp/UserData.hpp>
-#include <gfcpp/Cache.hpp>
-#include <gfcpp/EntryEvent.hpp>
-#include <gfcpp/RegionEvent.hpp>
+#include <geode/geode_globals.hpp>
+#include <geode/CacheStatistics.hpp>
+#include <geode/ExceptionTypes.hpp>
+#include <geode/CacheableKey.hpp>
+#include <geode/Cacheable.hpp>
+#include <geode/UserData.hpp>
+#include <geode/Cache.hpp>
+#include <geode/EntryEvent.hpp>
+#include <geode/RegionEvent.hpp>
 #include "EventType.hpp"
-#include <gfcpp/PersistenceManager.hpp>
-#include <gfcpp/RegionEntry.hpp>
-#include <gfcpp/CacheListener.hpp>
-#include <gfcpp/CacheWriter.hpp>
-#include <gfcpp/CacheLoader.hpp>
-#include <gfcpp/AttributesMutator.hpp>
-#include <gfcpp/AttributesFactory.hpp>
+#include <geode/PersistenceManager.hpp>
+#include <geode/RegionEntry.hpp>
+#include <geode/CacheListener.hpp>
+#include <geode/CacheWriter.hpp>
+#include <geode/CacheLoader.hpp>
+#include <geode/AttributesMutator.hpp>
+#include <geode/AttributesFactory.hpp>
 
 #include "RegionInternal.hpp"
 #include "RegionStats.hpp"
@@ -497,4 +497,4 @@ class CPPCACHE_EXPORT LocalRegion : public RegionInternal {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_LOCALREGION_H_
+#endif  // GEODE_LOCALREGION_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/LocatorListRequest.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LocatorListRequest.cpp b/src/cppcache/src/LocatorListRequest.cpp
index 32914ad..75e470f 100644
--- a/src/cppcache/src/LocatorListRequest.cpp
+++ b/src/cppcache/src/LocatorListRequest.cpp
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 #include "LocatorListRequest.hpp"
-#include <gfcpp/DataInput.hpp>
-#include <gfcpp/DataOutput.hpp>
+#include <geode/DataInput.hpp>
+#include <geode/DataOutput.hpp>
 #include "GeodeTypeIdsImpl.hpp"
-#include <gfcpp/CacheableString.hpp>
+#include <geode/CacheableString.hpp>
 using namespace apache::geode::client;
 LocatorListRequest::LocatorListRequest(const std::string& servergroup)
     : m_servergroup(servergroup) {}

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/LocatorListRequest.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LocatorListRequest.hpp b/src/cppcache/src/LocatorListRequest.hpp
index e446981..ea444d5 100644
--- a/src/cppcache/src/LocatorListRequest.hpp
+++ b/src/cppcache/src/LocatorListRequest.hpp
@@ -43,4 +43,4 @@ class LocatorListRequest : public ServerLocationRequest {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_LOCATORLISTREQUEST_H_
+#endif  // GEODE_LOCATORLISTREQUEST_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/LocatorListResponse.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LocatorListResponse.cpp b/src/cppcache/src/LocatorListResponse.cpp
index 91bd01f..e5260dd 100644
--- a/src/cppcache/src/LocatorListResponse.cpp
+++ b/src/cppcache/src/LocatorListResponse.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "LocatorListResponse.hpp"
-#include <gfcpp/DataInput.hpp>
+#include <geode/DataInput.hpp>
 #include <vector>
 using namespace apache::geode::client;
 LocatorListResponse* LocatorListResponse::fromData(DataInput& input) {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/LocatorListResponse.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LocatorListResponse.hpp b/src/cppcache/src/LocatorListResponse.hpp
index 010bc81..093f8c7 100644
--- a/src/cppcache/src/LocatorListResponse.hpp
+++ b/src/cppcache/src/LocatorListResponse.hpp
@@ -52,4 +52,4 @@ typedef SharedPtr<LocatorListResponse> LocatorListResponsePtr;
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_LOCATORLISTRESPONSE_H_
+#endif  // GEODE_LOCATORLISTRESPONSE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/Log.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/Log.cpp b/src/cppcache/src/Log.cpp
index 972452a..3176ec6 100644
--- a/src/cppcache/src/Log.cpp
+++ b/src/cppcache/src/Log.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>
 
 #include <cctype>
 #include <string>
@@ -34,9 +34,9 @@
 #include <ace/Dirent_Selector.h>
 #include <ace/OS_NS_sys_stat.h>
 
-#include <gfcpp/Log.hpp>
-#include <gfcpp/ExceptionTypes.hpp>
-#include <gfcppBanner.hpp>
+#include <geode/Log.hpp>
+#include <geode/ExceptionTypes.hpp>
+#include <geodeBanner.hpp>
 
 #if defined(_WIN32)
 #include <io.h>
@@ -496,7 +496,7 @@ void Log::writeBanner() {
   if (s_logLevel == Log::None) {
     return;
   }
-  std::string bannertext = gfcppBanner::getBanner();
+  std::string bannertext = geodeBanner::getBanner();
 
   if (g_logFile == NULL) {
     fprintf(stdout, "%s", bannertext.c_str());

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/MapEntry.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/MapEntry.hpp b/src/cppcache/src/MapEntry.hpp
index d01b8cf..4e05652 100644
--- a/src/cppcache/src/MapEntry.hpp
+++ b/src/cppcache/src/MapEntry.hpp
@@ -20,11 +20,11 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
-#include <gfcpp/Cacheable.hpp>
-#include <gfcpp/CacheableKey.hpp>
-#include <gfcpp/SharedPtr.hpp>
-#include <gfcpp/ExceptionTypes.hpp>
+#include <geode/geode_globals.hpp>
+#include <geode/Cacheable.hpp>
+#include <geode/CacheableKey.hpp>
+#include <geode/SharedPtr.hpp>
+#include <geode/ExceptionTypes.hpp>
 #include "HostAsm.hpp"
 #include "CacheImpl.hpp"
 #include "ExpiryTaskManager.hpp"
@@ -288,4 +288,4 @@ class CPPCACHE_EXPORT EntryFactory {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_MAPENTRY_H_
+#endif  // GEODE_MAPENTRY_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/MapEntryT.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/MapEntryT.hpp b/src/cppcache/src/MapEntryT.hpp
index 18d7235..474abdc 100644
--- a/src/cppcache/src/MapEntryT.hpp
+++ b/src/cppcache/src/MapEntryT.hpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>
 #include "MapEntry.hpp"
 #include "TrackedMapEntry.hpp"
 
@@ -292,4 +292,4 @@ inline int MapEntryST<TBase, 0, UPDATE_COUNT>::incUpdateCount(TBase* loc) {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_MAPENTRYT_H_
+#endif  // GEODE_MAPENTRYT_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/MapSegment.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/MapSegment.hpp b/src/cppcache/src/MapSegment.hpp
index feb0cf6..6b91c93 100644
--- a/src/cppcache/src/MapSegment.hpp
+++ b/src/cppcache/src/MapSegment.hpp
@@ -20,16 +20,16 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>
 
-#include <gfcpp/CacheableKey.hpp>
+#include <geode/CacheableKey.hpp>
 #include "MapEntry.hpp"
-#include <gfcpp/RegionEntry.hpp>
-#include <gfcpp/VectorT.hpp>
+#include <geode/RegionEntry.hpp>
+#include <geode/VectorT.hpp>
 #include "SpinLock.hpp"
 #include "MapWithLock.hpp"
 #include "CacheableToken.hpp"
-#include <gfcpp/Delta.hpp>
+#include <geode/Delta.hpp>
 
 #include <ace/Hash_Map_Manager.h>
 #include <ace/Functor_T.h>
@@ -310,4 +310,4 @@ class CPPCACHE_EXPORT MapSegment {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_MAPSEGMENT_H_
+#endif  // GEODE_MAPSEGMENT_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/MapWithLock.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/MapWithLock.hpp b/src/cppcache/src/MapWithLock.hpp
index e4ed42f..32d259c 100644
--- a/src/cppcache/src/MapWithLock.hpp
+++ b/src/cppcache/src/MapWithLock.hpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
-#include <gfcpp/CacheableKey.hpp>
+#include <geode/geode_globals.hpp>
+#include <geode/CacheableKey.hpp>
 
 #include <ace/Hash_Map_Manager.h>
 #include <ace/Recursive_Thread_Mutex.h>
@@ -82,4 +82,4 @@ typedef ACE_Guard<ACE_Recursive_Thread_Mutex> MapOfRegionGuard;
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_MAPWITHLOCK_H_
+#endif  // GEODE_MAPWITHLOCK_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/MemberListForVersionStamp.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/MemberListForVersionStamp.cpp b/src/cppcache/src/MemberListForVersionStamp.cpp
index e58ae70..025d021 100644
--- a/src/cppcache/src/MemberListForVersionStamp.cpp
+++ b/src/cppcache/src/MemberListForVersionStamp.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "MemberListForVersionStamp.hpp"
-#include <gfcpp/Log.hpp>
+#include <geode/Log.hpp>
 
 using namespace apache::geode::client;
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/MemberListForVersionStamp.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/MemberListForVersionStamp.hpp b/src/cppcache/src/MemberListForVersionStamp.hpp
index c2ce1f5..3f21988 100644
--- a/src/cppcache/src/MemberListForVersionStamp.hpp
+++ b/src/cppcache/src/MemberListForVersionStamp.hpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
-#include <gfcpp/SharedPtr.hpp>
+#include <geode/geode_globals.hpp>
+#include <geode/SharedPtr.hpp>
 #include "DSMemberForVersionStamp.hpp"
 #include "ace/RW_Thread_Mutex.h"
 #include "ReadWriteLock.hpp"
@@ -62,5 +62,4 @@ typedef SharedPtr<MemberListForVersionStamp> MemberListForVersionStampPtr;
 }  // namespace geode
 }  // namespace apache
 
-
-#endif // GEODE_MEMBERLISTFORVERSIONSTAMP_H_
+#endif  // GEODE_MEMBERLISTFORVERSIONSTAMP_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/NanoTimer.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/NanoTimer.hpp b/src/cppcache/src/NanoTimer.hpp
index 3a321fa..8dbf4d8 100644
--- a/src/cppcache/src/NanoTimer.hpp
+++ b/src/cppcache/src/NanoTimer.hpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>
 
 namespace apache {
 namespace geode {
@@ -36,4 +36,4 @@ class CPPCACHE_EXPORT NanoTimer {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_NANOTIMER_H_
+#endif  // GEODE_NANOTIMER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/NoResult.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/NoResult.hpp b/src/cppcache/src/NoResult.hpp
index a89c3a4..7658551 100644
--- a/src/cppcache/src/NoResult.hpp
+++ b/src/cppcache/src/NoResult.hpp
@@ -20,10 +20,10 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
-#include <gfcpp/gf_types.hpp>
-#include <gfcpp/ExceptionTypes.hpp>
-#include <gfcpp/ResultCollector.hpp>
+#include <geode/geode_globals.hpp>
+#include <geode/gf_types.hpp>
+#include <geode/ExceptionTypes.hpp>
+#include <geode/ResultCollector.hpp>
 
 /**
  * @file
@@ -66,4 +66,4 @@ class CPPCACHE_EXPORT NoResult : public ResultCollector {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_NORESULT_H_
+#endif  // GEODE_NORESULT_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/NonCopyable.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/NonCopyable.hpp b/src/cppcache/src/NonCopyable.hpp
index 27b1689..7b17059 100644
--- a/src/cppcache/src/NonCopyable.hpp
+++ b/src/cppcache/src/NonCopyable.hpp
@@ -43,5 +43,4 @@ class CPPCACHE_EXPORT NonAssignable {
 }  // namespace geode
 }  // namespace apache
 
-
-#endif // GEODE_NONCOPYABLE_H_
+#endif  // GEODE_NONCOPYABLE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PartitionResolver.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PartitionResolver.cpp b/src/cppcache/src/PartitionResolver.cpp
index 369d3b0..584c430 100644
--- a/src/cppcache/src/PartitionResolver.cpp
+++ b/src/cppcache/src/PartitionResolver.cpp
@@ -14,8 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <gfcpp/PartitionResolver.hpp>
-#include <gfcpp/EntryEvent.hpp>
+#include <geode/PartitionResolver.hpp>
+#include <geode/EntryEvent.hpp>
 
 namespace apache {
 namespace geode {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PdxEnumInstantiator.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxEnumInstantiator.cpp b/src/cppcache/src/PdxEnumInstantiator.cpp
index f47501e..16e3964 100644
--- a/src/cppcache/src/PdxEnumInstantiator.cpp
+++ b/src/cppcache/src/PdxEnumInstantiator.cpp
@@ -20,8 +20,8 @@
 
 #include "PdxEnumInstantiator.hpp"
 #include "GeodeTypeIdsImpl.hpp"
-#include <gfcpp/CacheableString.hpp>
-#include <gfcpp/DataInput.hpp>
+#include <geode/CacheableString.hpp>
+#include <geode/DataInput.hpp>
 
 namespace apache {
 namespace geode {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PdxEnumInstantiator.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxEnumInstantiator.hpp b/src/cppcache/src/PdxEnumInstantiator.hpp
index 5457003..1d60c9b 100644
--- a/src/cppcache/src/PdxEnumInstantiator.hpp
+++ b/src/cppcache/src/PdxEnumInstantiator.hpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include <gfcpp/Serializable.hpp>
-#include <gfcpp/CacheableEnum.hpp>
+#include <geode/Serializable.hpp>
+#include <geode/CacheableEnum.hpp>
 
 namespace apache {
 namespace geode {
@@ -54,4 +54,4 @@ class PdxEnumInstantiator : public Serializable {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_PDXENUMINSTANTIATOR_H_
+#endif  // GEODE_PDXENUMINSTANTIATOR_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PdxFieldType.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxFieldType.cpp b/src/cppcache/src/PdxFieldType.cpp
index 04b5ae1..5041129 100644
--- a/src/cppcache/src/PdxFieldType.cpp
+++ b/src/cppcache/src/PdxFieldType.cpp
@@ -24,7 +24,7 @@
 #include "PdxFieldType.hpp"
 #include "GeodeTypeIdsImpl.hpp"
 #include "PdxTypes.hpp"
-#include <gfcpp/PdxFieldTypes.hpp>
+#include <geode/PdxFieldTypes.hpp>
 //#include <malloc.h>
 
 #include "ace/OS.h"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PdxFieldType.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxFieldType.hpp b/src/cppcache/src/PdxFieldType.hpp
index 9d43226..8398ac5 100644
--- a/src/cppcache/src/PdxFieldType.hpp
+++ b/src/cppcache/src/PdxFieldType.hpp
@@ -20,11 +20,11 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
-#include <gfcpp/Serializable.hpp>
-#include <gfcpp/CacheableString.hpp>
-#include <gfcpp/DataInput.hpp>
-#include <gfcpp/DataOutput.hpp>
+#include <geode/geode_globals.hpp>
+#include <geode/Serializable.hpp>
+#include <geode/CacheableString.hpp>
+#include <geode/DataInput.hpp>
+#include <geode/DataOutput.hpp>
 #include <string>
 
 namespace apache {
@@ -108,4 +108,4 @@ class CPPCACHE_EXPORT PdxFieldType : public Serializable {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_PDXFIELDTYPE_H_
+#endif  // GEODE_PDXFIELDTYPE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PdxHelper.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxHelper.cpp b/src/cppcache/src/PdxHelper.cpp
index 9848039..bcb3671 100644
--- a/src/cppcache/src/PdxHelper.cpp
+++ b/src/cppcache/src/PdxHelper.cpp
@@ -33,7 +33,7 @@
 #include "Utils.hpp"
 #include "PdxRemoteWriter.hpp"
 #include "CacheRegionHelper.hpp"
-#include <gfcpp/Cache.hpp>
+#include <geode/Cache.hpp>
 
 namespace apache {
 namespace geode {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PdxHelper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxHelper.hpp b/src/cppcache/src/PdxHelper.hpp
index d8d5f0c..c87d876 100644
--- a/src/cppcache/src/PdxHelper.hpp
+++ b/src/cppcache/src/PdxHelper.hpp
@@ -26,8 +26,7 @@
  *      Author: npatel
  */
 
-
-#include <gfcpp/DataOutput.hpp>
+#include <geode/DataOutput.hpp>
 #include "EnumInfo.hpp"
 #include "PdxType.hpp"
 #include "CacheImpl.hpp"
@@ -85,4 +84,4 @@ class PdxHelper {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_PDXHELPER_H_
+#endif  // GEODE_PDXHELPER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PdxInstanceFactoryImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxInstanceFactoryImpl.hpp b/src/cppcache/src/PdxInstanceFactoryImpl.hpp
index 813b2df..228a34e 100644
--- a/src/cppcache/src/PdxInstanceFactoryImpl.hpp
+++ b/src/cppcache/src/PdxInstanceFactoryImpl.hpp
@@ -3,7 +3,6 @@
 #ifndef GEODE_PDXINSTANCEFACTORYIMPL_H_
 #define GEODE_PDXINSTANCEFACTORYIMPL_H_
 
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +20,8 @@
  * limitations under the License.
  */
 
-#include <gfcpp/PdxInstanceFactory.hpp>
-#include <gfcpp/CacheableBuiltins.hpp>
+#include <geode/PdxInstanceFactory.hpp>
+#include <geode/CacheableBuiltins.hpp>
 #include <map>
 #include "PdxType.hpp"
 
@@ -458,5 +457,4 @@ class CPPCACHE_EXPORT PdxInstanceFactoryImpl : public PdxInstanceFactory {
 }  // namespace geode
 }  // namespace apache
 
-
-#endif // GEODE_PDXINSTANCEFACTORYIMPL_H_
+#endif  // GEODE_PDXINSTANCEFACTORYIMPL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PdxInstanceImpl.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxInstanceImpl.cpp b/src/cppcache/src/PdxInstanceImpl.cpp
index bf8d1ef..775571a 100644
--- a/src/cppcache/src/PdxInstanceImpl.cpp
+++ b/src/cppcache/src/PdxInstanceImpl.cpp
@@ -18,11 +18,11 @@
 #include "PdxTypeRegistry.hpp"
 #include "PdxHelper.hpp"
 #include "PdxTypes.hpp"
-#include <gfcpp/PdxFieldTypes.hpp>
+#include <geode/PdxFieldTypes.hpp>
 #include "PdxLocalWriter.hpp"
-#include <gfcpp/PdxReader.hpp>
+#include <geode/PdxReader.hpp>
 #include "CacheRegionHelper.hpp"
-#include <gfcpp/Cache.hpp>
+#include <geode/Cache.hpp>
 #include "CacheImpl.hpp"
 #include "Utils.hpp"
 #include <algorithm>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PdxInstanceImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxInstanceImpl.hpp b/src/cppcache/src/PdxInstanceImpl.hpp
index 05a8f95..f8882f6 100644
--- a/src/cppcache/src/PdxInstanceImpl.hpp
+++ b/src/cppcache/src/PdxInstanceImpl.hpp
@@ -3,7 +3,6 @@
 #ifndef GEODE_PDXINSTANCEIMPL_H_
 #define GEODE_PDXINSTANCEIMPL_H_
 
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,12 +20,12 @@
  * limitations under the License.
  */
 
-#include <gfcpp/PdxInstance.hpp>
-#include <gfcpp/WritablePdxInstance.hpp>
-#include <gfcpp/PdxSerializable.hpp>
+#include <geode/PdxInstance.hpp>
+#include <geode/WritablePdxInstance.hpp>
+#include <geode/PdxSerializable.hpp>
 #include "PdxType.hpp"
 #include "PdxLocalWriter.hpp"
-#include <gfcpp/PdxFieldTypes.hpp>
+#include <geode/PdxFieldTypes.hpp>
 #include <vector>
 #include <map>
 
@@ -1170,5 +1169,4 @@ typedef SharedPtr<PdxInstanceImpl> PdxInstanceImplPtr;
 }  // namespace geode
 }  // namespace apache
 
-
-#endif // GEODE_PDXINSTANCEIMPL_H_
+#endif  // GEODE_PDXINSTANCEIMPL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PdxInstantiator.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxInstantiator.cpp b/src/cppcache/src/PdxInstantiator.cpp
index 26a494d..73d9ae7 100644
--- a/src/cppcache/src/PdxInstantiator.cpp
+++ b/src/cppcache/src/PdxInstantiator.cpp
@@ -23,10 +23,10 @@
 
 #include "PdxInstantiator.hpp"
 #include "GeodeTypeIdsImpl.hpp"
-#include <gfcpp/CacheableString.hpp>
-#include <gfcpp/DataInput.hpp>
+#include <geode/CacheableString.hpp>
+#include <geode/DataInput.hpp>
 #include "PdxHelper.hpp"
-#include <gfcpp/PdxSerializable.hpp>
+#include <geode/PdxSerializable.hpp>
 
 namespace apache {
 namespace geode {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PdxInstantiator.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxInstantiator.hpp b/src/cppcache/src/PdxInstantiator.hpp
index 773ef78..3c01088 100644
--- a/src/cppcache/src/PdxInstantiator.hpp
+++ b/src/cppcache/src/PdxInstantiator.hpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/Serializable.hpp>
+#include <geode/Serializable.hpp>
 
 namespace apache {
 namespace geode {
@@ -51,4 +51,4 @@ class PdxInstantiator : public Serializable {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_PDXINSTANTIATOR_H_
+#endif  // GEODE_PDXINSTANTIATOR_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PdxLocalReader.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxLocalReader.hpp b/src/cppcache/src/PdxLocalReader.hpp
index b579ef2..9ce4d9a 100644
--- a/src/cppcache/src/PdxLocalReader.hpp
+++ b/src/cppcache/src/PdxLocalReader.hpp
@@ -20,11 +20,11 @@
  * limitations under the License.
  */
 
-#include <gfcpp/PdxReader.hpp>
+#include <geode/PdxReader.hpp>
 #include "PdxType.hpp"
-#include <gfcpp/DataInput.hpp>
-#include <gfcpp/CacheableObjectArray.hpp>
-#include <gfcpp/CacheableDate.hpp>
+#include <geode/DataInput.hpp>
+#include <geode/CacheableObjectArray.hpp>
+#include <geode/CacheableDate.hpp>
 #include "PdxRemotePreservedData.hpp"
 namespace apache {
 namespace geode {
@@ -219,4 +219,4 @@ typedef SharedPtr<PdxLocalReader> PdxLocalReaderPtr;
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_PDXLOCALREADER_H_
+#endif  // GEODE_PDXLOCALREADER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PdxLocalWriter.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxLocalWriter.cpp b/src/cppcache/src/PdxLocalWriter.cpp
index 9776b45..b6f75c0 100644
--- a/src/cppcache/src/PdxLocalWriter.cpp
+++ b/src/cppcache/src/PdxLocalWriter.cpp
@@ -24,7 +24,7 @@
 #include "PdxLocalWriter.hpp"
 #include "PdxHelper.hpp"
 #include "PdxTypeRegistry.hpp"
-#include <gfcpp/CacheableEnum.hpp>
+#include <geode/CacheableEnum.hpp>
 #include "GeodeTypeIdsImpl.hpp"
 
 namespace apache {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PdxLocalWriter.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxLocalWriter.hpp b/src/cppcache/src/PdxLocalWriter.hpp
index 4bbbe3d..22c4b14 100644
--- a/src/cppcache/src/PdxLocalWriter.hpp
+++ b/src/cppcache/src/PdxLocalWriter.hpp
@@ -20,12 +20,12 @@
  * limitations under the License.
  */
 
-#include <gfcpp/PdxWriter.hpp>
+#include <geode/PdxWriter.hpp>
 #include "PdxType.hpp"
-#include <gfcpp/DataOutput.hpp>
+#include <geode/DataOutput.hpp>
 #include <vector>
 #include "PdxRemotePreservedData.hpp"
-#include <gfcpp/CacheableObjectArray.hpp>
+#include <geode/CacheableObjectArray.hpp>
 
 namespace apache {
 namespace geode {
@@ -339,4 +339,4 @@ typedef SharedPtr<PdxLocalWriter> PdxLocalWriterPtr;
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_PDXLOCALWRITER_H_
+#endif  // GEODE_PDXLOCALWRITER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PdxReaderWithTypeCollector.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxReaderWithTypeCollector.cpp b/src/cppcache/src/PdxReaderWithTypeCollector.cpp
index 52b0198..630e542 100644
--- a/src/cppcache/src/PdxReaderWithTypeCollector.cpp
+++ b/src/cppcache/src/PdxReaderWithTypeCollector.cpp
@@ -23,8 +23,8 @@
 
 #include "PdxReaderWithTypeCollector.hpp"
 #include "PdxTypes.hpp"
-#include <gfcpp/PdxFieldTypes.hpp>
 #include <ace/OS_NS_stdio.h>
+#include <geode/PdxFieldTypes.hpp>
 
 namespace apache {
 namespace geode {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PdxReaderWithTypeCollector.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxReaderWithTypeCollector.hpp b/src/cppcache/src/PdxReaderWithTypeCollector.hpp
index ee2a812..834e56d 100644
--- a/src/cppcache/src/PdxReaderWithTypeCollector.hpp
+++ b/src/cppcache/src/PdxReaderWithTypeCollector.hpp
@@ -179,4 +179,4 @@ typedef SharedPtr<PdxReaderWithTypeCollector> PdxReaderWithTypeCollectorPtr;
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_PDXREADERWITHTYPECOLLECTOR_H_
+#endif  // GEODE_PDXREADERWITHTYPECOLLECTOR_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PdxRemotePreservedData.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxRemotePreservedData.hpp b/src/cppcache/src/PdxRemotePreservedData.hpp
index 3384378..17591c3 100644
--- a/src/cppcache/src/PdxRemotePreservedData.hpp
+++ b/src/cppcache/src/PdxRemotePreservedData.hpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/PdxUnreadFields.hpp>
+#include <geode/PdxUnreadFields.hpp>
 #include <vector>
 
 namespace apache {
@@ -114,4 +114,4 @@ class PdxRemotePreservedData : public PdxUnreadFields {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_PDXREMOTEPRESERVEDDATA_H_
+#endif  // GEODE_PDXREMOTEPRESERVEDDATA_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PdxRemoteReader.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxRemoteReader.hpp b/src/cppcache/src/PdxRemoteReader.hpp
index 3c96ba9..45df8de 100644
--- a/src/cppcache/src/PdxRemoteReader.hpp
+++ b/src/cppcache/src/PdxRemoteReader.hpp
@@ -214,4 +214,4 @@ typedef SharedPtr<PdxRemoteReader> PdxRemoteReaderPtr;
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_PDXREMOTEREADER_H_
+#endif  // GEODE_PDXREMOTEREADER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PdxRemoteWriter.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxRemoteWriter.hpp b/src/cppcache/src/PdxRemoteWriter.hpp
index 5819bbd..b3dd5bb 100644
--- a/src/cppcache/src/PdxRemoteWriter.hpp
+++ b/src/cppcache/src/PdxRemoteWriter.hpp
@@ -26,7 +26,6 @@
  *      Author: npatel
  */
 
-
 #include "PdxLocalWriter.hpp"
 
 namespace apache {
@@ -242,4 +241,4 @@ typedef SharedPtr<PdxRemoteWriter> PdxRemoteWriterPtr;
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_PDXREMOTEWRITER_H_
+#endif  // GEODE_PDXREMOTEWRITER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PdxSerializable.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxSerializable.cpp b/src/cppcache/src/PdxSerializable.cpp
index 29081c4..e579c46 100644
--- a/src/cppcache/src/PdxSerializable.cpp
+++ b/src/cppcache/src/PdxSerializable.cpp
@@ -21,11 +21,11 @@
  *      Author: npatel
  */
 
-#include <gfcpp/PdxSerializable.hpp>
+#include <geode/PdxSerializable.hpp>
 #include <GeodeTypeIdsImpl.hpp>
-#include <gfcpp/CacheableString.hpp>
+#include <geode/CacheableString.hpp>
 #include <PdxHelper.hpp>
-#include <gfcpp/CacheableKeys.hpp>
+#include <geode/CacheableKeys.hpp>
 
 namespace apache {
 namespace geode {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PdxType.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxType.hpp b/src/cppcache/src/PdxType.hpp
index 921f9b6..c037fbe 100644
--- a/src/cppcache/src/PdxType.hpp
+++ b/src/cppcache/src/PdxType.hpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include <gfcpp/Serializable.hpp>
+#include <geode/Serializable.hpp>
 #include "PdxFieldType.hpp"
-#include <gfcpp/CacheableBuiltins.hpp>
+#include <geode/CacheableBuiltins.hpp>
 #include <map>
 #include <vector>
 #include <list>
@@ -221,4 +221,4 @@ class PdxType : public Serializable,
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_PDXTYPE_H_
+#endif  // GEODE_PDXTYPE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PdxTypeRegistry.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxTypeRegistry.hpp b/src/cppcache/src/PdxTypeRegistry.hpp
index b4745f2..fa483b7 100644
--- a/src/cppcache/src/PdxTypeRegistry.hpp
+++ b/src/cppcache/src/PdxTypeRegistry.hpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/PdxSerializable.hpp>
+#include <geode/PdxSerializable.hpp>
 #include "PdxRemotePreservedData.hpp"
 #include "ReadWriteLock.hpp"
 #include <map>
@@ -140,4 +140,4 @@ class CPPCACHE_EXPORT PdxTypeRegistry {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_PDXTYPEREGISTRY_H_
+#endif  // GEODE_PDXTYPEREGISTRY_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PdxTypes.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxTypes.hpp b/src/cppcache/src/PdxTypes.hpp
index 15f5ba2..86bf9cf 100644
--- a/src/cppcache/src/PdxTypes.hpp
+++ b/src/cppcache/src/PdxTypes.hpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>
 
 class PdxTypes {
  public:
@@ -43,4 +43,4 @@ class PdxTypes {
   static const int8_t DATE_SIZE = 8;
 };
 
-#endif // GEODE_PDXTYPES_H_
+#endif  // GEODE_PDXTYPES_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PdxWrapper.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxWrapper.cpp b/src/cppcache/src/PdxWrapper.cpp
index 0ededfd..f208c8f 100644
--- a/src/cppcache/src/PdxWrapper.cpp
+++ b/src/cppcache/src/PdxWrapper.cpp
@@ -21,7 +21,7 @@
  *      Author: vrao
  */
 
-#include <gfcpp/PdxWrapper.hpp>
+#include <geode/PdxWrapper.hpp>
 #include <Utils.hpp>
 #include <PdxHelper.hpp>
 #include <SerializationRegistry.hpp>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PdxWriterWithTypeCollector.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxWriterWithTypeCollector.cpp b/src/cppcache/src/PdxWriterWithTypeCollector.cpp
index 2b9b6e7..29dceed 100644
--- a/src/cppcache/src/PdxWriterWithTypeCollector.cpp
+++ b/src/cppcache/src/PdxWriterWithTypeCollector.cpp
@@ -25,7 +25,7 @@
 #include "PdxType.hpp"
 #include "PdxHelper.hpp"
 #include "PdxTypes.hpp"
-#include <gfcpp/PdxFieldTypes.hpp>
+#include <geode/PdxFieldTypes.hpp>
 
 namespace apache {
 namespace geode {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PdxWriterWithTypeCollector.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxWriterWithTypeCollector.hpp b/src/cppcache/src/PdxWriterWithTypeCollector.hpp
index eaff977..e976119 100644
--- a/src/cppcache/src/PdxWriterWithTypeCollector.hpp
+++ b/src/cppcache/src/PdxWriterWithTypeCollector.hpp
@@ -228,4 +228,4 @@ typedef SharedPtr<PdxWriterWithTypeCollector> PdxWriterWithTypeCollectorPtr;
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_PDXWRITERWITHTYPECOLLECTOR_H_
+#endif  // GEODE_PDXWRITERWITHTYPECOLLECTOR_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PersistenceManager.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PersistenceManager.cpp b/src/cppcache/src/PersistenceManager.cpp
index b78d775..123f7b4 100644
--- a/src/cppcache/src/PersistenceManager.cpp
+++ b/src/cppcache/src/PersistenceManager.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#include <gfcpp/PersistenceManager.hpp>
-#include <gfcpp/Region.hpp>
+#include <geode/PersistenceManager.hpp>
+#include <geode/Region.hpp>
 
 using namespace apache::geode::client;
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/Pool.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/Pool.cpp b/src/cppcache/src/Pool.cpp
index ea63938..54ad10a 100644
--- a/src/cppcache/src/Pool.cpp
+++ b/src/cppcache/src/Pool.cpp
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-#include <gfcpp/Pool.hpp>
+#include <geode/Pool.hpp>
 #include <PoolAttributes.hpp>
-#include <gfcpp/Cache.hpp>
-#include <gfcpp/CacheFactory.hpp>
+#include <geode/Cache.hpp>
+#include <geode/CacheFactory.hpp>
 #include <ProxyCache.hpp>
 #include <ThinClientPoolHADM.hpp>
 /**

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PoolAttributes.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PoolAttributes.cpp b/src/cppcache/src/PoolAttributes.cpp
index 31be9dd..97834b3 100644
--- a/src/cppcache/src/PoolAttributes.cpp
+++ b/src/cppcache/src/PoolAttributes.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 #include "PoolAttributes.hpp"
-#include <gfcpp/ExceptionTypes.hpp>
-#include <gfcpp/PoolFactory.hpp>
+#include <geode/ExceptionTypes.hpp>
+#include <geode/PoolFactory.hpp>
 
 using namespace apache::geode::client;
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PoolAttributes.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PoolAttributes.hpp b/src/cppcache/src/PoolAttributes.hpp
index 2431628..062a55c 100644
--- a/src/cppcache/src/PoolAttributes.hpp
+++ b/src/cppcache/src/PoolAttributes.hpp
@@ -22,10 +22,10 @@
 #include <string>
 #include <vector>
 #include "ace/OS.h"
-#include <gfcpp/gfcpp_globals.hpp>
-#include <gfcpp/SharedBase.hpp>
-#include <gfcpp/gf_types.hpp>
-#include <gfcpp/ExceptionTypes.hpp>
+#include <geode/geode_globals.hpp>
+#include <geode/SharedBase.hpp>
+#include <geode/gf_types.hpp>
+#include <geode/ExceptionTypes.hpp>
 
 /**
  * @file
@@ -163,4 +163,4 @@ class PoolAttributes : public SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_POOLATTRIBUTES_H_
+#endif  // GEODE_POOLATTRIBUTES_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PoolFactory.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PoolFactory.cpp b/src/cppcache/src/PoolFactory.cpp
index 74568f1..5bc5861 100644
--- a/src/cppcache/src/PoolFactory.cpp
+++ b/src/cppcache/src/PoolFactory.cpp
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 #include <CacheImpl.hpp>
-#include <gfcpp/PoolFactory.hpp>
-#include <gfcpp/Pool.hpp>
+#include <geode/PoolFactory.hpp>
+#include <geode/Pool.hpp>
 #include <PoolAttributes.hpp>
 #include <ThinClientPoolDM.hpp>
 #include <ThinClientPoolHADM.hpp>
-#include <gfcpp/SystemProperties.hpp>
-#include <gfcpp/PoolManager.hpp>
+#include <geode/SystemProperties.hpp>
+#include <geode/PoolManager.hpp>
 #include <ace/Recursive_Thread_Mutex.h>
 #include <ace/INET_Addr.h>
 #include <ThinClientPoolStickyDM.hpp>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PoolManager.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PoolManager.cpp b/src/cppcache/src/PoolManager.cpp
index c964628..9470d60 100644
--- a/src/cppcache/src/PoolManager.cpp
+++ b/src/cppcache/src/PoolManager.cpp
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <gfcpp/PoolManager.hpp>
+#include <geode/PoolManager.hpp>
 #include <ace/Recursive_Thread_Mutex.h>
 #include <ace/Guard_T.h>
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PoolStatistics.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PoolStatistics.cpp b/src/cppcache/src/PoolStatistics.cpp
index 158717e..6c296aa 100644
--- a/src/cppcache/src/PoolStatistics.cpp
+++ b/src/cppcache/src/PoolStatistics.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>
 
 #include "PoolStatistics.hpp"
 //#include "StatisticsFactory.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PoolStatistics.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PoolStatistics.hpp b/src/cppcache/src/PoolStatistics.hpp
index 31a70c9..ba7202a 100644
--- a/src/cppcache/src/PoolStatistics.hpp
+++ b/src/cppcache/src/PoolStatistics.hpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
-#include <gfcpp/statistics/Statistics.hpp>
-#include <gfcpp/statistics/StatisticsFactory.hpp>
+#include <geode/geode_globals.hpp>
+#include <geode/statistics/Statistics.hpp>
+#include <geode/statistics/StatisticsFactory.hpp>
 #include <statistics/StatisticsManager.hpp>
 #include "SpinLock.hpp"
 
@@ -251,4 +251,4 @@ class PoolStatType {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_POOLSTATISTICS_H_
+#endif  // GEODE_POOLSTATISTICS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PoolXmlCreation.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PoolXmlCreation.hpp b/src/cppcache/src/PoolXmlCreation.hpp
index e75f6bc..d308b7e 100644
--- a/src/cppcache/src/PoolXmlCreation.hpp
+++ b/src/cppcache/src/PoolXmlCreation.hpp
@@ -22,11 +22,11 @@
 
 #include <string>
 #include <vector>
-#include <gfcpp/gfcpp_globals.hpp>
-#include <gfcpp/ExceptionTypes.hpp>
-#include <gfcpp/Pool.hpp>
+#include <geode/geode_globals.hpp>
+#include <geode/ExceptionTypes.hpp>
+#include <geode/Pool.hpp>
 #include "PoolXmlCreation.hpp"
-#include <gfcpp/PoolFactory.hpp>
+#include <geode/PoolFactory.hpp>
 
 namespace apache {
 namespace geode {
@@ -88,4 +88,4 @@ class CPPCACHE_EXPORT PoolXmlCreation {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_POOLXMLCREATION_H_
+#endif  // GEODE_POOLXMLCREATION_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PooledBase.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PooledBase.hpp b/src/cppcache/src/PooledBase.hpp
index 5bc9786..efdb7f4 100644
--- a/src/cppcache/src/PooledBase.hpp
+++ b/src/cppcache/src/PooledBase.hpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>
 
 namespace apache {
 namespace geode {
@@ -61,4 +61,4 @@ class CPPCACHE_EXPORT PooledBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_POOLEDBASE_H_
+#endif  // GEODE_POOLEDBASE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PooledBasePool.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PooledBasePool.hpp b/src/cppcache/src/PooledBasePool.hpp
index d33bb56..f065cb1 100644
--- a/src/cppcache/src/PooledBasePool.hpp
+++ b/src/cppcache/src/PooledBasePool.hpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
-#include <gfcpp/SharedPtr.hpp>
+#include <geode/geode_globals.hpp>
+#include <geode/SharedPtr.hpp>
 #include "SpinLock.hpp"
 #include "PooledBase.hpp"
 #include <deque>
@@ -82,4 +82,4 @@ class CPPCACHE_EXPORT PooledBasePool {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_POOLEDBASEPOOL_H_
+#endif  // GEODE_POOLEDBASEPOOL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PreservedDataExpiryHandler.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PreservedDataExpiryHandler.hpp b/src/cppcache/src/PreservedDataExpiryHandler.hpp
index 906564b..ce85a87 100644
--- a/src/cppcache/src/PreservedDataExpiryHandler.hpp
+++ b/src/cppcache/src/PreservedDataExpiryHandler.hpp
@@ -26,9 +26,9 @@
  *      Author: npatel
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
-#include <gfcpp/Cache.hpp>
-#include <gfcpp/PdxSerializable.hpp>
+#include <geode/geode_globals.hpp>
+#include <geode/Cache.hpp>
+#include <geode/PdxSerializable.hpp>
 #include "CacheImpl.hpp"
 #include "ExpiryTaskManager.hpp"
 //#include "CacheTransactionManagerImpl.hpp"
@@ -75,5 +75,4 @@ class CPPCACHE_EXPORT PreservedDataExpiryHandler : public ACE_Event_Handler {
 }  // namespace geode
 }  // namespace apache
 
-
-#endif // GEODE_PRESERVEDDATAEXPIRYHANDLER_H_
+#endif  // GEODE_PRESERVEDDATAEXPIRYHANDLER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/Properties.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/Properties.cpp b/src/cppcache/src/Properties.cpp
index 2513bec..9a28725 100644
--- a/src/cppcache/src/Properties.cpp
+++ b/src/cppcache/src/Properties.cpp
@@ -14,8 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <gfcpp/Properties.hpp>
-#include <gfcpp/GeodeTypeIds.hpp>
+#include <geode/Properties.hpp>
+#include <geode/GeodeTypeIds.hpp>
 
 #include <string>
 #include <ace/Hash_Map_Manager.h>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/ProxyCache.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ProxyCache.cpp b/src/cppcache/src/ProxyCache.cpp
index 699d339..b2e1e09 100644
--- a/src/cppcache/src/ProxyCache.cpp
+++ b/src/cppcache/src/ProxyCache.cpp
@@ -14,23 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <gfcpp/gfcpp_globals.hpp>
-#include <gfcpp/SharedPtr.hpp>
+#include <geode/geode_globals.hpp>
+#include <geode/SharedPtr.hpp>
 
-#include <gfcpp/DistributedSystem.hpp>
+#include <geode/DistributedSystem.hpp>
 #include "DistributedSystemImpl.hpp"
 #include "CacheXmlParser.hpp"
 #include "CacheRegionHelper.hpp"
-#include <gfcpp/Cache.hpp>
+#include <geode/Cache.hpp>
 #include "CacheImpl.hpp"
 #include "UserAttributes.hpp"
 #include "ProxyRegion.hpp"
-#include <gfcpp/FunctionService.hpp>
+#include <geode/FunctionService.hpp>
 #include "ProxyRemoteQueryService.hpp"
 #include "FunctionServiceImpl.hpp"
 #include "ProxyCache.hpp"
 #include <string.h>
-#include <gfcpp/PoolManager.hpp>
+#include <geode/PoolManager.hpp>
 #include "ThinClientPoolDM.hpp"
 #include "PdxInstanceFactoryImpl.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/ProxyCache.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ProxyCache.hpp b/src/cppcache/src/ProxyCache.hpp
index 8f42996..0dd8c54 100644
--- a/src/cppcache/src/ProxyCache.hpp
+++ b/src/cppcache/src/ProxyCache.hpp
@@ -19,14 +19,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <gfcpp/gfcpp_globals.hpp>
-#include <gfcpp/gf_types.hpp>
-#include <gfcpp/Region.hpp>
-#include <gfcpp/DistributedSystem.hpp>
-#include <gfcpp/QueryService.hpp>
-#include <gfcpp/PoolFactory.hpp>
+#include <geode/geode_globals.hpp>
+#include <geode/gf_types.hpp>
+#include <geode/Region.hpp>
+#include <geode/DistributedSystem.hpp>
+#include <geode/QueryService.hpp>
+#include <geode/PoolFactory.hpp>
 #include "UserAttributes.hpp"
-#include <gfcpp/RegionService.hpp>
+#include <geode/RegionService.hpp>
 
 /**
  * @file
@@ -137,4 +137,4 @@ class CPPCACHE_EXPORT ProxyCache : public RegionService {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_PROXYCACHE_H_
+#endif  // GEODE_PROXYCACHE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/ProxyRegion.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ProxyRegion.hpp b/src/cppcache/src/ProxyRegion.hpp
index 7756bf2..443ed4f 100644
--- a/src/cppcache/src/ProxyRegion.hpp
+++ b/src/cppcache/src/ProxyRegion.hpp
@@ -20,29 +20,29 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
-#include <gfcpp/gf_types.hpp>
-#include <gfcpp/CacheableKey.hpp>
-#include <gfcpp/CacheableString.hpp>
-#include <gfcpp/CacheStatistics.hpp>
-#include <gfcpp/ExceptionTypes.hpp>
-#include <gfcpp/CacheableString.hpp>
-#include <gfcpp/UserData.hpp>
-#include <gfcpp/CacheableBuiltins.hpp>
+#include <geode/geode_globals.hpp>
+#include <geode/gf_types.hpp>
+#include <geode/CacheableKey.hpp>
+#include <geode/CacheableString.hpp>
+#include <geode/CacheStatistics.hpp>
+#include <geode/ExceptionTypes.hpp>
+#include <geode/CacheableString.hpp>
+#include <geode/UserData.hpp>
+#include <geode/CacheableBuiltins.hpp>
 
 /**
 * @file
 */
 
-#include <gfcpp/RegionEntry.hpp>
-#include <gfcpp/CacheListener.hpp>
-#include <gfcpp/CacheWriter.hpp>
-#include <gfcpp/CacheLoader.hpp>
-#include <gfcpp/RegionAttributes.hpp>
-#include <gfcpp/AttributesMutator.hpp>
-#include <gfcpp/AttributesFactory.hpp>
-#include <gfcpp/CacheableKey.hpp>
-#include <gfcpp/Query.hpp>
+#include <geode/RegionEntry.hpp>
+#include <geode/CacheListener.hpp>
+#include <geode/CacheWriter.hpp>
+#include <geode/CacheLoader.hpp>
+#include <geode/RegionAttributes.hpp>
+#include <geode/AttributesMutator.hpp>
+#include <geode/AttributesFactory.hpp>
+#include <geode/CacheableKey.hpp>
+#include <geode/Query.hpp>
 #include "ProxyCache.hpp"
 
 namespace apache {
@@ -1521,4 +1521,4 @@ typedef SharedPtr<ProxyRegion> ProxyRegionPtr;
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_PROXYREGION_H_
+#endif  // GEODE_PROXYREGION_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/ProxyRemoteQueryService.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ProxyRemoteQueryService.cpp b/src/cppcache/src/ProxyRemoteQueryService.cpp
index 397f30c..d1adc86 100644
--- a/src/cppcache/src/ProxyRemoteQueryService.cpp
+++ b/src/cppcache/src/ProxyRemoteQueryService.cpp
@@ -16,7 +16,7 @@
  */
 #include "ProxyRemoteQueryService.hpp"
 #include "ThinClientPoolDM.hpp"
-#include <gfcpp/PoolManager.hpp>
+#include <geode/PoolManager.hpp>
 #include "CqQueryImpl.hpp"
 
 ProxyRemoteQueryService::ProxyRemoteQueryService(ProxyCache* cptr) {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/ProxyRemoteQueryService.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ProxyRemoteQueryService.hpp b/src/cppcache/src/ProxyRemoteQueryService.hpp
index 2579c78..7eb3cbf 100644
--- a/src/cppcache/src/ProxyRemoteQueryService.hpp
+++ b/src/cppcache/src/ProxyRemoteQueryService.hpp
@@ -19,11 +19,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <gfcpp/gfcpp_globals.hpp>
-#include <gfcpp/SharedPtr.hpp>
+#include <geode/geode_globals.hpp>
+#include <geode/SharedPtr.hpp>
 #include "CqService.hpp"
 #include "UserAttributes.hpp"
-#include <gfcpp/QueryService.hpp>
+#include <geode/QueryService.hpp>
 #include "ProxyCache.hpp"
 #include "ThinClientCacheDistributionManager.hpp"
 
@@ -73,4 +73,4 @@ typedef SharedPtr<ProxyRemoteQueryService> ProxyRemoteQueryServicePtr;
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_PROXYREMOTEQUERYSERVICE_H_
+#endif  // GEODE_PROXYREMOTEQUERYSERVICE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PutAllPartialResult.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PutAllPartialResult.hpp b/src/cppcache/src/PutAllPartialResult.hpp
index 1234c08..6b44b7b 100644
--- a/src/cppcache/src/PutAllPartialResult.hpp
+++ b/src/cppcache/src/PutAllPartialResult.hpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include <gfcpp/Serializable.hpp>
-#include <gfcpp/CacheableString.hpp>
+#include <geode/Serializable.hpp>
+#include <geode/CacheableString.hpp>
 #include "VersionedCacheableObjectPartList.hpp"
 #include <ace/Task.h>
 
@@ -137,4 +137,4 @@ class PutAllPartialResult : public Serializable {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_PUTALLPARTIALRESULT_H_
+#endif  // GEODE_PUTALLPARTIALRESULT_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/PutAllPartialResultServerException.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PutAllPartialResultServerException.hpp b/src/cppcache/src/PutAllPartialResultServerException.hpp
index a5233a2..5989bb4 100644
--- a/src/cppcache/src/PutAllPartialResultServerException.hpp
+++ b/src/cppcache/src/PutAllPartialResultServerException.hpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include <gfcpp/Serializable.hpp>
-#include <gfcpp/CacheableString.hpp>
+#include <geode/Serializable.hpp>
+#include <geode/CacheableString.hpp>
 #include "VersionedCacheableObjectPartList.hpp"
 #include "PutAllPartialResult.hpp"
 
@@ -145,4 +145,4 @@ class CPPCACHE_EXPORT PutAllPartialResultServerException : public Serializable {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_PUTALLPARTIALRESULTSERVEREXCEPTION_H_
+#endif  // GEODE_PUTALLPARTIALRESULTSERVEREXCEPTION_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/Queue.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/Queue.hpp b/src/cppcache/src/Queue.hpp
index 1d97664..36ec11c 100644
--- a/src/cppcache/src/Queue.hpp
+++ b/src/cppcache/src/Queue.hpp
@@ -168,4 +168,4 @@ class CPPCACHE_EXPORT Queue {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_QUEUE_H_
+#endif  // GEODE_QUEUE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/QueueConnectionRequest.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/QueueConnectionRequest.cpp b/src/cppcache/src/QueueConnectionRequest.cpp
index a3b4410..d6164c3 100644
--- a/src/cppcache/src/QueueConnectionRequest.cpp
+++ b/src/cppcache/src/QueueConnectionRequest.cpp
@@ -16,8 +16,8 @@
  */
 #include "QueueConnectionRequest.hpp"
 #include "GeodeTypeIdsImpl.hpp"
-#include <gfcpp/DataInput.hpp>
-#include <gfcpp/DataOutput.hpp>
+#include <geode/DataInput.hpp>
+#include <geode/DataOutput.hpp>
 using namespace apache::geode::client;
 
 void QueueConnectionRequest::toData(DataOutput& output) const {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/QueueConnectionRequest.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/QueueConnectionRequest.hpp b/src/cppcache/src/QueueConnectionRequest.hpp
index c9eaee9..138c699 100644
--- a/src/cppcache/src/QueueConnectionRequest.hpp
+++ b/src/cppcache/src/QueueConnectionRequest.hpp
@@ -64,4 +64,4 @@ class QueueConnectionRequest : public ServerLocationRequest {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_QUEUECONNECTIONREQUEST_H_
+#endif  // GEODE_QUEUECONNECTIONREQUEST_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/QueueConnectionResponse.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/QueueConnectionResponse.cpp b/src/cppcache/src/QueueConnectionResponse.cpp
index 6cce3e3..3b02ef3 100644
--- a/src/cppcache/src/QueueConnectionResponse.cpp
+++ b/src/cppcache/src/QueueConnectionResponse.cpp
@@ -17,7 +17,7 @@
 
 #include "QueueConnectionResponse.hpp"
 #include "GeodeTypeIdsImpl.hpp"
-#include <gfcpp/DataInput.hpp>
+#include <geode/DataInput.hpp>
 #include "ServerLocation.hpp"
 using namespace apache::geode::client;
 QueueConnectionResponse* QueueConnectionResponse::fromData(DataInput& input) {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/QueueConnectionResponse.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/QueueConnectionResponse.hpp b/src/cppcache/src/QueueConnectionResponse.hpp
index db2dff0..d46a3a3 100644
--- a/src/cppcache/src/QueueConnectionResponse.hpp
+++ b/src/cppcache/src/QueueConnectionResponse.hpp
@@ -21,7 +21,7 @@
  */
 #include <list>
 #include "ServerLocationResponse.hpp"
-#include <gfcpp/DataInput.hpp>
+#include <geode/DataInput.hpp>
 #include "ServerLocation.hpp"
 namespace apache {
 namespace geode {
@@ -53,4 +53,4 @@ typedef SharedPtr<QueueConnectionResponse> QueueConnectionResponsePtr;
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_QUEUECONNECTIONRESPONSE_H_
+#endif  // GEODE_QUEUECONNECTIONRESPONSE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/ReadWriteLock.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ReadWriteLock.hpp b/src/cppcache/src/ReadWriteLock.hpp
index ffd0f13..7b325fd 100644
--- a/src/cppcache/src/ReadWriteLock.hpp
+++ b/src/cppcache/src/ReadWriteLock.hpp
@@ -92,4 +92,4 @@ class TryWriteGuard {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_READWRITELOCK_H_
+#endif  // GEODE_READWRITELOCK_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/Region.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/Region.cpp b/src/cppcache/src/Region.cpp
index af393eb..eab6760 100644
--- a/src/cppcache/src/Region.cpp
+++ b/src/cppcache/src/Region.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/Region.hpp>
+#include <geode/Region.hpp>
 
 namespace apache {
 namespace geode {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/RegionAttributes.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RegionAttributes.cpp b/src/cppcache/src/RegionAttributes.cpp
index a636c7e..1d70caf 100644
--- a/src/cppcache/src/RegionAttributes.cpp
+++ b/src/cppcache/src/RegionAttributes.cpp
@@ -15,17 +15,17 @@
  * limitations under the License.
  */
 
-#include <gfcpp/Cache.hpp>
+#include <geode/Cache.hpp>
 #include <Utils.hpp>
-#include <gfcpp/DataOutput.hpp>
+#include <geode/DataOutput.hpp>
 #include <string.h>
 #include <stdlib.h>
-#include <gfcpp/GeodeTypeIds.hpp>
+#include <geode/GeodeTypeIds.hpp>
 #include <CacheXmlParser.hpp>
 #include <ace/DLL.h>
 #include <ace/OS.h>
-#include <gfcpp/DataInput.hpp>
-#include <gfcpp/Properties.hpp>
+#include <geode/DataInput.hpp>
+#include <geode/Properties.hpp>
 
 using namespace apache::geode::client;
 RegionAttributes::RegionAttributes()

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/RegionCommit.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RegionCommit.hpp b/src/cppcache/src/RegionCommit.hpp
index 397d737..0bc51b5 100644
--- a/src/cppcache/src/RegionCommit.hpp
+++ b/src/cppcache/src/RegionCommit.hpp
@@ -26,13 +26,12 @@
  *      Author: ankurs
  */
 
-
-#include <gfcpp/gf_types.hpp>
-#include <gfcpp/SharedBase.hpp>
-#include <gfcpp/DataInput.hpp>
-#include <gfcpp/VectorOfSharedBase.hpp>
-#include <gfcpp/CacheableString.hpp>
-#include <gfcpp/Cache.hpp>
+#include <geode/gf_types.hpp>
+#include <geode/SharedBase.hpp>
+#include <geode/DataInput.hpp>
+#include <geode/VectorOfSharedBase.hpp>
+#include <geode/CacheableString.hpp>
+#include <geode/Cache.hpp>
 #include <vector>
 #include "FarSideEntryOp.hpp"
 
@@ -63,5 +62,4 @@ class RegionCommit : public apache::geode::client::SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-
-#endif // GEODE_REGIONCOMMIT_H_
+#endif  // GEODE_REGIONCOMMIT_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/RegionConfig.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RegionConfig.hpp b/src/cppcache/src/RegionConfig.hpp
index 003e98d..e4d63f7 100644
--- a/src/cppcache/src/RegionConfig.hpp
+++ b/src/cppcache/src/RegionConfig.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_REGIONCONFIG_H_
+#define GEODE_REGIONCONFIG_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -22,16 +27,10 @@
 //
 //////////////////////////////////////////////////////////////////////
 
-#if !defined(AFX_CACHEREGION_H__B8A44D1C_F9A4_49A8_A3A2_86CAE5E73C6F__INCLUDED_)
-#define AFX_CACHEREGION_H__B8A44D1C_F9A4_49A8_A3A2_86CAE5E73C6F__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif  // _MSC_VER > 1000
-#include <gfcpp/SharedPtr.hpp>
+#include <geode/SharedPtr.hpp>
 
 #include <string>
-#include <gfcpp/Properties.hpp>
+#include <geode/Properties.hpp>
 #include <stdlib.h>
 
 namespace apache {
@@ -63,4 +62,4 @@ class CPPCACHE_EXPORT RegionConfig : virtual public SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // !defined(AFX_CACHEREGION_H__B8A44D1C_F9A4_49A8_A3A2_86CAE5E73C6F__INCLUDED_)
+#endif  // GEODE_REGIONCONFIG_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/RegionEntry.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RegionEntry.cpp b/src/cppcache/src/RegionEntry.cpp
index 351a981..96cfbf2 100644
--- a/src/cppcache/src/RegionEntry.cpp
+++ b/src/cppcache/src/RegionEntry.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#include <gfcpp/Cache.hpp>
-#include <gfcpp/CacheableKey.hpp>
+#include <geode/Cache.hpp>
+#include <geode/CacheableKey.hpp>
 #include <CacheableToken.hpp>
 
 using namespace apache::geode::client;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/RegionEvent.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RegionEvent.cpp b/src/cppcache/src/RegionEvent.cpp
index 099f401..73400a3 100644
--- a/src/cppcache/src/RegionEvent.cpp
+++ b/src/cppcache/src/RegionEvent.cpp
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <gfcpp/RegionEvent.hpp>
+#include <geode/RegionEvent.hpp>
 
 namespace apache {
 namespace geode {


Mime
View raw message