geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [06/50] [abbrv] geode git commit: GEODE-2316: Rename namespace gemfire to apache::geode::client.
Date Mon, 23 Jan 2017 19:16:58 GMT
http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/EventType.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/EventType.hpp b/src/cppcache/src/EventType.hpp
index 0e57b79..8463da0 100644
--- a/src/cppcache/src/EventType.hpp
+++ b/src/cppcache/src/EventType.hpp
@@ -17,7 +17,9 @@
 #ifndef _EVENTTYPE_H__
 #define _EVENTTYPE_H__
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 enum EntryEventType {
   BEFORE_CREATE = 0,
   BEFORE_UPDATE,
@@ -37,6 +39,8 @@ enum RegionEventType {
   BEFORE_REGION_CLEAR,
   AFTER_REGION_CLEAR
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // _EVENTTYPE_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/EvictionController.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/EvictionController.cpp b/src/cppcache/src/EvictionController.cpp
index ced13a4..bd70d3d 100644
--- a/src/cppcache/src/EvictionController.cpp
+++ b/src/cppcache/src/EvictionController.cpp
@@ -23,7 +23,7 @@
 #include "ReadWriteLock.hpp"
 #include <string>
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 const char* EvictionController::NC_EC_Thread = "NC EC Thread";
 EvictionController::EvictionController(size_t maxHeapSize,
@@ -105,7 +105,7 @@ void EvictionController::processHeapInfo(int64_t& readInfo,
     if (evictionPercentage > 100) evictionPercentage = 100;
     orderEvictions(evictionPercentage);
     // Sleep for 10 seconds to allow the evictions to catch up
-    //   gemfire::millisleep(10);  //taken this out for now
+    //   apache::geode::client::millisleep(10);  //taken this out for now
   }
 }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/EvictionController.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/EvictionController.hpp b/src/cppcache/src/EvictionController.hpp
index e38c539..e7c6591 100644
--- a/src/cppcache/src/EvictionController.hpp
+++ b/src/cppcache/src/EvictionController.hpp
@@ -55,7 +55,9 @@
  * When a region is destroyed, it deregisters itself with the EvictionController
  * Format of object that is put into the region map (int size, int numEntries)
  */
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 typedef IntQueue<int64_t> HeapSizeInfoQueue;
 typedef std::vector<std::string> VectorOfString;
@@ -113,5 +115,7 @@ class CPPCACHE_EXPORT EvictionController : public ACE_Task_Base,
   EvictionThread* evictionThreadPtr;
   static const char* NC_EC_Thread;
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif  //_EVICTIONCONTROLLER_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/EvictionThread.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/EvictionThread.cpp b/src/cppcache/src/EvictionThread.cpp
index 5997551..36dbd37 100644
--- a/src/cppcache/src/EvictionThread.cpp
+++ b/src/cppcache/src/EvictionThread.cpp
@@ -17,7 +17,7 @@
 #include "EvictionThread.hpp"
 #include "EvictionController.hpp"
 #include "DistributedSystemImpl.hpp"
-using namespace gemfire;
+using namespace apache::geode::client;
 
 const char* EvictionThread::NC_Evic_Thread = "NC Evic Thread";
 EvictionThread::EvictionThread(EvictionController* parent)

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/EvictionThread.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/EvictionThread.hpp b/src/cppcache/src/EvictionThread.hpp
index 4bc3541..1bbb28c 100644
--- a/src/cppcache/src/EvictionThread.hpp
+++ b/src/cppcache/src/EvictionThread.hpp
@@ -28,7 +28,9 @@
 /**
  * This class does the actual evictions
  */
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 class EvictionController;
 typedef IntQueue<int64_t> HeapSizeInfoQueue;
 
@@ -60,6 +62,8 @@ class CPPCACHE_EXPORT EvictionThread : public ACE_Task_Base {
 
   static const char* NC_Evic_Thread;
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  //_EVICTIONTHREAD_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/Exception.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/Exception.cpp b/src/cppcache/src/Exception.cpp
index 8d32017..bffdc47 100644
--- a/src/cppcache/src/Exception.cpp
+++ b/src/cppcache/src/Exception.cpp
@@ -28,7 +28,9 @@ extern "C" {
 
 #include <string>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 // globals can only be trusted to initialize to ZERO.
 bool Exception::s_exceptionStackTraceEnabled = false;
@@ -67,7 +69,7 @@ Exception::Exception(const char* msg1, const char* msg2, bool forceTrace,
 
 Exception::~Exception() {}
 
-const char _exception_name_Exception[] = "gemfire::Exception";
+const char _exception_name_Exception[] = "apache::geode::client::Exception";
 
 const char* Exception::getName() const { return _exception_name_Exception; }
 
@@ -152,5 +154,6 @@ void setTSSExceptionMessage(const char* exMsg) {
 const char* getTSSExceptionMessage() {
   return TSSExceptionString::s_tssExceptionMsg->str().c_str();
 }
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/ExceptionTypes.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ExceptionTypes.cpp b/src/cppcache/src/ExceptionTypes.cpp
index ea54f74..9a2979c 100644
--- a/src/cppcache/src/ExceptionTypes.cpp
+++ b/src/cppcache/src/ExceptionTypes.cpp
@@ -21,7 +21,9 @@
 #include <TXState.hpp>
 #include <TSSTXStateWrapper.hpp>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 void setTSSExceptionMessage(const char* exMsg);
 const char* getTSSExceptionMessage();
 
@@ -336,5 +338,6 @@ void GfErrTypeThrowException(const char* str, GfErrType err) {
     }
   }
 }
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/ExecutionImpl.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ExecutionImpl.cpp b/src/cppcache/src/ExecutionImpl.cpp
index 648e3aa..0d101db 100644
--- a/src/cppcache/src/ExecutionImpl.cpp
+++ b/src/cppcache/src/ExecutionImpl.cpp
@@ -22,7 +22,7 @@
 #include "ThinClientPoolDM.hpp"
 #include "NoResult.hpp"
 #include "UserAttributes.hpp"
-// using namespace gemfire;
+// using namespace apache::geode::client;
 
 FunctionToFunctionAttributes ExecutionImpl::m_func_attrs;
 ACE_Recursive_Thread_Mutex ExecutionImpl::m_func_attrs_lock;
@@ -525,12 +525,14 @@ CacheableVectorPtr ExecutionImpl::executeOnPool(std::string& func,
     ==25848==    at 0x4007D75: operator new(unsigned int)
     (vg_replace_malloc.c:313)
     ==25848==    by 0x42B575A:
-    gemfire::ExecutionImpl::executeOnPool(stlp_std::basic_string<char,
+    apache::geode::client::ExecutionImpl::executeOnPool(stlp_std::basic_string<char,
     stlp_std::char_traits<char>, stlp_std::allocator<char> >&, unsigned char,
     int, unsigned int) (ExecutionImpl.cpp:426)
-    ==25848==    by 0x42B65E6: gemfire::ExecutionImpl::execute(char const*,
+    ==25848==    by 0x42B65E6:
+    apache::geode::client::ExecutionImpl::execute(char const*,
     bool, unsigned int, bool, bool, bool) (ExecutionImpl.cpp:292)
-    ==25848==    by 0x42B7897: gemfire::ExecutionImpl::execute(char const*,
+    ==25848==    by 0x42B7897:
+    apache::geode::client::ExecutionImpl::execute(char const*,
     bool, unsigned int, bool, bool) (ExecutionImpl.cpp:76)
     ==25848==    by 0x8081320: Task_Client1OpTest::doTask() (in
     /export/pnq-gst-dev01a/users/adongre/cedar_dev_Nov12/build-artifacts/linux/tests/cppcache/testThinClientPoolExecuteFunctionPrSHOP)

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/ExecutionImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ExecutionImpl.hpp b/src/cppcache/src/ExecutionImpl.hpp
index 2b98e0f..c3dedda 100644
--- a/src/cppcache/src/ExecutionImpl.hpp
+++ b/src/cppcache/src/ExecutionImpl.hpp
@@ -28,7 +28,9 @@
 #include <ace/Guard_T.h>
 #include <map>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 typedef std::map<std::string, std::vector<int8>*> FunctionToFunctionAttributes;
 
 class ExecutionImpl : public Execution {
@@ -105,5 +107,7 @@ class ExecutionImpl : public Execution {
   std::vector<int8>* getFunctionAttributes(const char* func);
   GfErrType getFuncAttributes(const char* func, std::vector<int8>** attr);
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif  //__GEMFIRE_EXECUTION_IMPL_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/ExpMapEntry.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ExpMapEntry.cpp b/src/cppcache/src/ExpMapEntry.cpp
index c905e93..db17a8e 100644
--- a/src/cppcache/src/ExpMapEntry.cpp
+++ b/src/cppcache/src/ExpMapEntry.cpp
@@ -17,7 +17,7 @@
 #include "ExpMapEntry.hpp"
 #include "MapEntryT.hpp"
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 ExpEntryFactory* ExpEntryFactory::singleton = NULL;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/ExpMapEntry.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ExpMapEntry.hpp b/src/cppcache/src/ExpMapEntry.hpp
index 5b10941..ac0417f 100644
--- a/src/cppcache/src/ExpMapEntry.hpp
+++ b/src/cppcache/src/ExpMapEntry.hpp
@@ -21,7 +21,9 @@
 #include "MapEntry.hpp"
 #include "VersionStamp.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 /**
  * @brief Hold region mapped entry value.
  * This subclass adds expiration times.
@@ -86,6 +88,8 @@ class CPPCACHE_EXPORT ExpEntryFactory : public EntryFactory {
   virtual void newMapEntry(const CacheableKeyPtr& key,
                            MapEntryImplPtr& result) const;
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // __GEMFIRE_IMPL_EXPMAPENTRY_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/ExpirationAction.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ExpirationAction.cpp b/src/cppcache/src/ExpirationAction.cpp
index 2068ca3..23ba6a2 100644
--- a/src/cppcache/src/ExpirationAction.cpp
+++ b/src/cppcache/src/ExpirationAction.cpp
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <ace/OS.h>
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 char* ExpirationAction::names[] = {(char*)"INVALIDATE",
                                    (char*)"LOCAL_INVALIDATE", (char*)"DESTROY",

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/ExpirationAttributes.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ExpirationAttributes.cpp b/src/cppcache/src/ExpirationAttributes.cpp
index 88382be..ec268ff 100644
--- a/src/cppcache/src/ExpirationAttributes.cpp
+++ b/src/cppcache/src/ExpirationAttributes.cpp
@@ -16,7 +16,7 @@
  */
 #include <gfcpp/ExpirationAttributes.hpp>
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 ExpirationAttributes::ExpirationAttributes()
     : m_action(ExpirationAction::INVALIDATE), m_timeout(0) {}

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/ExpiryHandler_T.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ExpiryHandler_T.hpp b/src/cppcache/src/ExpiryHandler_T.hpp
index 0b01f10..ca5465f 100644
--- a/src/cppcache/src/ExpiryHandler_T.hpp
+++ b/src/cppcache/src/ExpiryHandler_T.hpp
@@ -26,7 +26,9 @@
 #include "ace/Event_Handler.h"
 #include <gfcpp/Log.hpp>
 #include "StackTrace.hpp"
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 /**
  * This class manages deletion of the handler so this class should only be
  * used for cases that are cancelled explicitly and never expire otherwise,
@@ -64,6 +66,7 @@ class CPPCACHE_EXPORT ExpiryHandler_T : public ACE_Event_Handler {
   /// Handle timeout events.
   TO_HANDLER to_handler_;
 };
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif  // !defined (EXPIRYHANDLER_T_HPP)

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/ExpiryTaskManager.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ExpiryTaskManager.cpp b/src/cppcache/src/ExpiryTaskManager.cpp
index 776585c..066883e 100644
--- a/src/cppcache/src/ExpiryTaskManager.cpp
+++ b/src/cppcache/src/ExpiryTaskManager.cpp
@@ -30,7 +30,7 @@
 #include <ace/Dev_Poll_Reactor.h>
 #endif
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 const char* ExpiryTaskManager::NC_ETM_Thread = "NC ETM Thread";
 

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/ExpiryTaskManager.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ExpiryTaskManager.hpp b/src/cppcache/src/ExpiryTaskManager.hpp
index 5c7b831..00eac57 100644
--- a/src/cppcache/src/ExpiryTaskManager.hpp
+++ b/src/cppcache/src/ExpiryTaskManager.hpp
@@ -28,7 +28,9 @@
  * @file ExpiryTaskManager.hpp
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 /**
  * @class ExpiryTaskManager ExpiryTaskManager.hpp
  *
@@ -265,7 +267,8 @@ class CPPCACHE_EXPORT ExpiryTaskManager : public ACE_Task_Base {
                                           // of expiry tasks.
   static const char* NC_ETM_Thread;
 };
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // ifndef _GEMFIRE_EXPIRYTASKMANAGER_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/FairQueue.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/FairQueue.hpp b/src/cppcache/src/FairQueue.hpp
index 5a2151b..37d0f72 100644
--- a/src/cppcache/src/FairQueue.hpp
+++ b/src/cppcache/src/FairQueue.hpp
@@ -25,7 +25,9 @@
 #include <ace/Time_Value.h>
 #include <ace/Guard_T.h>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 template <class T, class MUTEX = ACE_Thread_Mutex>
 class FairQueue {
@@ -167,7 +169,8 @@ class FairQueue {
 
   virtual void deleteAction() {}
 };
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // ifndef _GEMFIRE_FAIRQUEUE_HPP_

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/FarSideEntryOp.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/FarSideEntryOp.cpp b/src/cppcache/src/FarSideEntryOp.cpp
index 898d5f7..4a357fa 100644
--- a/src/cppcache/src/FarSideEntryOp.cpp
+++ b/src/cppcache/src/FarSideEntryOp.cpp
@@ -26,7 +26,9 @@
 #include "ClientProxyMembershipID.hpp"
 #include "DiskVersionTag.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 FarSideEntryOp::FarSideEntryOp(RegionCommit* region)
     :  // UNUSED m_region(region),
@@ -228,4 +230,6 @@ EntryEventPtr FarSideEntryOp::getEntryEvent(Cache* cache)
                         false));
 }
 */
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/FarSideEntryOp.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/FarSideEntryOp.hpp b/src/cppcache/src/FarSideEntryOp.hpp
index 8cfdf3f..7081c4c 100644
--- a/src/cppcache/src/FarSideEntryOp.hpp
+++ b/src/cppcache/src/FarSideEntryOp.hpp
@@ -32,7 +32,9 @@
 #include <gfcpp/UserData.hpp>
 #include "LocalRegion.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 enum OPERATION {
   MARKER = 0,
@@ -88,7 +90,7 @@ class RegionCommit;
 
 _GF_PTR_DEF_(FarSideEntryOp, FarSideEntryOpPtr);
 
-class FarSideEntryOp : public gemfire::SharedBase {
+class FarSideEntryOp : public apache::geode::client::SharedBase {
  public:
   FarSideEntryOp(RegionCommit* region);
   virtual ~FarSideEntryOp();
@@ -116,6 +118,8 @@ class FarSideEntryOp : public gemfire::SharedBase {
   bool isInvalidate(int8_t op);
   void skipFilterRoutingInfo(DataInput& input);
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif /* FARSIDEENTRYOP_HPP_ */

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/FixedPartitionAttributesImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/FixedPartitionAttributesImpl.hpp b/src/cppcache/src/FixedPartitionAttributesImpl.hpp
index bf0f90d..da8c281 100644
--- a/src/cppcache/src/FixedPartitionAttributesImpl.hpp
+++ b/src/cppcache/src/FixedPartitionAttributesImpl.hpp
@@ -23,7 +23,9 @@
 #include <gfcpp/CacheableString.hpp>
 #include <gfcpp/CacheableBuiltins.hpp>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 _GF_PTR_DEF_(FixedPartitionAttributesImpl, FixedPartitionAttributesImplPtr)
 
 class FixedPartitionAttributesImpl : public Serializable {
@@ -116,6 +118,8 @@ class FixedPartitionAttributesImpl : public Serializable {
     return getStartingBucketID() <= bucketId && bucketId <= getLastBucketID();
   }
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/FunctionService.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/FunctionService.cpp b/src/cppcache/src/FunctionService.cpp
index f145daa..ef83d15 100644
--- a/src/cppcache/src/FunctionService.cpp
+++ b/src/cppcache/src/FunctionService.cpp
@@ -24,7 +24,7 @@
 #include <CacheRegionHelper.hpp>
 #include <gfcpp/TypeHelper.hpp>
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 ExecutionPtr FunctionService::onRegion(RegionPtr region) {
   LOGDEBUG("FunctionService::onRegion(RegionPtr region)");

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/FunctionServiceImpl.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/FunctionServiceImpl.cpp b/src/cppcache/src/FunctionServiceImpl.cpp
index da4e72c..024cfd1 100644
--- a/src/cppcache/src/FunctionServiceImpl.cpp
+++ b/src/cppcache/src/FunctionServiceImpl.cpp
@@ -19,7 +19,7 @@
 #include "ExecutionImpl.hpp"
 #include <gfcpp/PoolManager.hpp>
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 FunctionServiceImpl::FunctionServiceImpl(ProxyCachePtr proxyCache) {
   m_proxyCache = proxyCache;

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/FunctionServiceImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/FunctionServiceImpl.hpp b/src/cppcache/src/FunctionServiceImpl.hpp
index aaf89ba..de43d7f 100644
--- a/src/cppcache/src/FunctionServiceImpl.hpp
+++ b/src/cppcache/src/FunctionServiceImpl.hpp
@@ -26,7 +26,9 @@
  * @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 /**
  * @class FunctionService FunctionService.hpp
  * entry point for function execution
@@ -58,5 +60,7 @@ class CPPCACHE_EXPORT FunctionServiceImpl : public FunctionService {
   ProxyCachePtr m_proxyCache;
   friend class ProxyCache;
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif  //__GEMFIRE_FUNCTION_SERVICEIMPL_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/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 2f72e31..78e588b 100644
--- a/src/cppcache/src/GF_TASK_T.hpp
+++ b/src/cppcache/src/GF_TASK_T.hpp
@@ -26,7 +26,9 @@
 
 #include "DistributedSystemImpl.hpp"
 #include <ace/Task.h>
-namespace gemfire {
+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 {
@@ -75,6 +77,7 @@ class CPPCACHE_EXPORT GF_TASK_T : public ACE_Task_Base {
   volatile bool m_run;
   const char* m_threadName;
 };
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif  // __GF_TASK_T_HPP__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/GatewayEventCallbackArgument.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/GatewayEventCallbackArgument.hpp b/src/cppcache/src/GatewayEventCallbackArgument.hpp
index d577011..f084e85 100644
--- a/src/cppcache/src/GatewayEventCallbackArgument.hpp
+++ b/src/cppcache/src/GatewayEventCallbackArgument.hpp
@@ -20,7 +20,9 @@
 #include <gfcpp/Serializable.hpp>
 #include "GemfireTypeIdsImpl.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 class GatewayEventCallbackArgument : public Serializable {
   SerializablePtr m_callback;
 
@@ -61,6 +63,8 @@ class GatewayEventCallbackArgument : public Serializable {
     return new GatewayEventCallbackArgument();
   }
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // __GATEWAYEVENTCALLBACKARGUMENT_HPP__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/GatewaySenderEventCallbackArgument.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/GatewaySenderEventCallbackArgument.hpp b/src/cppcache/src/GatewaySenderEventCallbackArgument.hpp
index 4452db4..06836ff 100644
--- a/src/cppcache/src/GatewaySenderEventCallbackArgument.hpp
+++ b/src/cppcache/src/GatewaySenderEventCallbackArgument.hpp
@@ -21,7 +21,9 @@
 #include <gfcpp/Serializable.hpp>
 #include "GemfireTypeIdsImpl.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 class GatewaySenderEventCallbackArgument : public Serializable {
   SerializablePtr m_callback;
 
@@ -65,6 +67,8 @@ class GatewaySenderEventCallbackArgument : public Serializable {
     return new GatewaySenderEventCallbackArgument();
   }
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // __GATEWAYSENDEREVENTCALLBACKARGUMENT_HPP__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/GemfireTypeIdsImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/GemfireTypeIdsImpl.hpp b/src/cppcache/src/GemfireTypeIdsImpl.hpp
index 1bdd5a0..bdec827 100644
--- a/src/cppcache/src/GemfireTypeIdsImpl.hpp
+++ b/src/cppcache/src/GemfireTypeIdsImpl.hpp
@@ -17,7 +17,9 @@
 #ifndef _GEMFIRE_GEMFIRETYPEIDSIMPL_HPP_
 #define _GEMFIRE_GEMFIRETYPEIDSIMPL_HPP_
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class GemfireTypeIdsImpl {
  public:
@@ -73,6 +75,8 @@ class GemfireTypeIdsImpl {
     DiskVersionTag = 2131
   };
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/GetAllServersRequest.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/GetAllServersRequest.cpp b/src/cppcache/src/GetAllServersRequest.cpp
index 6bbedcd..a849990 100644
--- a/src/cppcache/src/GetAllServersRequest.cpp
+++ b/src/cppcache/src/GetAllServersRequest.cpp
@@ -17,7 +17,7 @@
 
 #include "GetAllServersRequest.hpp"
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 void GetAllServersRequest::toData(DataOutput& output) const {
   output.writeObject(m_serverGroup);

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/GetAllServersRequest.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/GetAllServersRequest.hpp b/src/cppcache/src/GetAllServersRequest.hpp
index 24996fa..53ca8ea 100644
--- a/src/cppcache/src/GetAllServersRequest.hpp
+++ b/src/cppcache/src/GetAllServersRequest.hpp
@@ -24,7 +24,9 @@
 #include "GemfireTypeIdsImpl.hpp"
 #include <string>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 class GetAllServersRequest : public Serializable {
   CacheableStringPtr m_serverGroup;
 
@@ -44,6 +46,8 @@ class GetAllServersRequest : public Serializable {
   virtual uint32_t objectSize() const { return m_serverGroup->length(); }
   virtual ~GetAllServersRequest() {}
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/GetAllServersResponse.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/GetAllServersResponse.cpp b/src/cppcache/src/GetAllServersResponse.cpp
index 77d0b3c..b1a793a 100644
--- a/src/cppcache/src/GetAllServersResponse.cpp
+++ b/src/cppcache/src/GetAllServersResponse.cpp
@@ -16,7 +16,7 @@
  */
 #include "GetAllServersResponse.hpp"
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 void GetAllServersResponse::toData(DataOutput& output) const {
   int32_t length = static_cast<int32_t>(m_servers.size());

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/GetAllServersResponse.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/GetAllServersResponse.hpp b/src/cppcache/src/GetAllServersResponse.hpp
index bc4d193..2f0640f 100644
--- a/src/cppcache/src/GetAllServersResponse.hpp
+++ b/src/cppcache/src/GetAllServersResponse.hpp
@@ -23,7 +23,9 @@
 #include <gfcpp/DataOutput.hpp>
 #include <vector>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 class GetAllServersResponse : public Serializable {
   std::vector<ServerLocation> m_servers;
 
@@ -46,6 +48,8 @@ class GetAllServersResponse : public Serializable {
   virtual ~GetAllServersResponse() {}
 };
 typedef SharedPtr<GetAllServersResponse> GetAllServersResponsePtr;
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/HashMapOfSharedBase.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/HashMapOfSharedBase.cpp b/src/cppcache/src/HashMapOfSharedBase.cpp
index a25e051..fe7a8da 100644
--- a/src/cppcache/src/HashMapOfSharedBase.cpp
+++ b/src/cppcache/src/HashMapOfSharedBase.cpp
@@ -17,7 +17,9 @@
 
 #include <gfcpp/HashMapOfSharedBase.hpp>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 // Iterator methods
 
@@ -164,4 +166,6 @@ HashMapOfSharedBase::~HashMapOfSharedBase() {
   m_stdHashMap->clear();
   delete m_stdHashMap;
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/HashSetOfSharedBase.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/HashSetOfSharedBase.cpp b/src/cppcache/src/HashSetOfSharedBase.cpp
index a390f7d..d46fc61 100644
--- a/src/cppcache/src/HashSetOfSharedBase.cpp
+++ b/src/cppcache/src/HashSetOfSharedBase.cpp
@@ -17,7 +17,9 @@
 
 #include <gfcpp/HashSetOfSharedBase.hpp>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 // Iterator methods
 
@@ -160,4 +162,6 @@ HashSetOfSharedBase::~HashSetOfSharedBase() {
   m_stdHashSet->clear();
   delete m_stdHashSet;
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/HostAsm.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/HostAsm.cpp b/src/cppcache/src/HostAsm.cpp
index 6c25455..763256b 100644
--- a/src/cppcache/src/HostAsm.cpp
+++ b/src/cppcache/src/HostAsm.cpp
@@ -23,7 +23,7 @@
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 int32_t HostAsm::m_SpinCount = 0;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/HostAsm.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/HostAsm.hpp b/src/cppcache/src/HostAsm.hpp
index aba477d..4513106 100644
--- a/src/cppcache/src/HostAsm.hpp
+++ b/src/cppcache/src/HostAsm.hpp
@@ -25,7 +25,8 @@
 /*
 
 This file wraps the assembly spinlock routines, and related atomic update
-routines in the class gemfire::util::util_impl::Host. Some ace is included.
+routines in the class apache::geode::client::util::util_impl::Host. Some ace is
+included.
 
 */
 
@@ -47,7 +48,9 @@ routines in the class gemfire::util::util_impl::Host. Some ace is included.
  * @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 typedef volatile uint32_t SpinLockField;
 
@@ -432,7 +435,9 @@ return true;
   }
 #endif  // !defined(_MACOSX)
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
 #pragma clang diagnostic pop

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/IntQueue.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/IntQueue.hpp b/src/cppcache/src/IntQueue.hpp
index 0d13ba6..64d99e9 100644
--- a/src/cppcache/src/IntQueue.hpp
+++ b/src/cppcache/src/IntQueue.hpp
@@ -24,7 +24,9 @@
 #include <ace/Guard_T.h>
 #include <ace/Recursive_Thread_Mutex.h>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 template <class T>
 
@@ -111,6 +113,8 @@ class CPPCACHE_EXPORT IntQueue {
   ACE_Recursive_Thread_Mutex m_mutex;
   ACE_Condition<ACE_Recursive_Thread_Mutex> m_cond;
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // !defined (IMPL_INTQUEUE_INCLUDED)

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/InterestResultPolicy.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/InterestResultPolicy.cpp b/src/cppcache/src/InterestResultPolicy.cpp
index 82104e3..81ce877 100644
--- a/src/cppcache/src/InterestResultPolicy.cpp
+++ b/src/cppcache/src/InterestResultPolicy.cpp
@@ -17,7 +17,7 @@
 
 #include "InterestResultPolicy.hpp"
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 char InterestResultPolicy::nextOrdinal = 0;
 InterestResultPolicy InterestResultPolicy::NONE;

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/InterestResultPolicy.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/InterestResultPolicy.hpp b/src/cppcache/src/InterestResultPolicy.hpp
index 4559b53..4acd783 100644
--- a/src/cppcache/src/InterestResultPolicy.hpp
+++ b/src/cppcache/src/InterestResultPolicy.hpp
@@ -23,7 +23,9 @@
  */
 #include <gfcpp/gfcpp_globals.hpp>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 /**
  * @class InterestResultPolicy InterestResultPolicy.hpp
  * Policy class for interest result.
@@ -44,6 +46,7 @@ class CPPCACHE_EXPORT InterestResultPolicy {
  private:
   InterestResultPolicy() { ordinal = nextOrdinal++; }
 };
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif  // ifndef __GEMFIRE_INTERESTRESULTPOLICY_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/InternalCacheTransactionManager2PC.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/InternalCacheTransactionManager2PC.cpp b/src/cppcache/src/InternalCacheTransactionManager2PC.cpp
index 9185bf7..624495d 100644
--- a/src/cppcache/src/InternalCacheTransactionManager2PC.cpp
+++ b/src/cppcache/src/InternalCacheTransactionManager2PC.cpp
@@ -17,7 +17,11 @@
 
 #include <gfcpp/InternalCacheTransactionManager2PC.hpp>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 InternalCacheTransactionManager2PC::InternalCacheTransactionManager2PC() {}
 InternalCacheTransactionManager2PC::~InternalCacheTransactionManager2PC() {}
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/InternalCacheTransactionManager2PCImpl.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/InternalCacheTransactionManager2PCImpl.cpp b/src/cppcache/src/InternalCacheTransactionManager2PCImpl.cpp
index 1ab66e4..f23898a 100644
--- a/src/cppcache/src/InternalCacheTransactionManager2PCImpl.cpp
+++ b/src/cppcache/src/InternalCacheTransactionManager2PCImpl.cpp
@@ -32,7 +32,9 @@
 #include <gfcpp/PoolManager.hpp>
 #include "TXCleaner.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 InternalCacheTransactionManager2PCImpl::InternalCacheTransactionManager2PCImpl(
     Cache* cache)
@@ -202,4 +204,6 @@ void InternalCacheTransactionManager2PCImpl::afterCompletion(int32_t status) {
     throw ex;
   }
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/InternalCacheTransactionManager2PCImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/InternalCacheTransactionManager2PCImpl.hpp b/src/cppcache/src/InternalCacheTransactionManager2PCImpl.hpp
index b194c1b..2c7be69 100644
--- a/src/cppcache/src/InternalCacheTransactionManager2PCImpl.hpp
+++ b/src/cppcache/src/InternalCacheTransactionManager2PCImpl.hpp
@@ -27,11 +27,13 @@
 #include <gfcpp/InternalCacheTransactionManager2PC.hpp>
 #include "CacheTransactionManagerImpl.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class InternalCacheTransactionManager2PCImpl
-    : public gemfire::CacheTransactionManagerImpl,
-      public gemfire::InternalCacheTransactionManager2PC {
+    : public apache::geode::client::CacheTransactionManagerImpl,
+      public apache::geode::client::InternalCacheTransactionManager2PC {
  public:
   InternalCacheTransactionManager2PCImpl(Cache* cache);
   virtual ~InternalCacheTransactionManager2PCImpl();
@@ -48,6 +50,8 @@ class InternalCacheTransactionManager2PCImpl
   InternalCacheTransactionManager2PCImpl(
       const InternalCacheTransactionManager2PCImpl& other);
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif /* INTERNALCACHETRANSACTIONMANAGER2PCIMPL_H_ */

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/InternalDataView.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/InternalDataView.cpp b/src/cppcache/src/InternalDataView.cpp
index 907835b..ef5ca56 100644
--- a/src/cppcache/src/InternalDataView.cpp
+++ b/src/cppcache/src/InternalDataView.cpp
@@ -23,7 +23,9 @@
 
 #include "InternalDataView.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 InternalDataView::InternalDataView() {
   // TODO Auto-generated constructor stub
@@ -32,4 +34,6 @@ InternalDataView::InternalDataView() {
 InternalDataView::~InternalDataView() {
   // TODO Auto-generated destructor stub
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/InternalDataView.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/InternalDataView.hpp b/src/cppcache/src/InternalDataView.hpp
index 5fc4b43..e4923de 100644
--- a/src/cppcache/src/InternalDataView.hpp
+++ b/src/cppcache/src/InternalDataView.hpp
@@ -24,13 +24,17 @@
 #ifndef INTERNALDATAVIEW_HPP_
 #define INTERNALDATAVIEW_HPP_
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class InternalDataView {
  protected:
   InternalDataView();
   virtual ~InternalDataView();
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif /* INTERNALDATAVIEW_HPP_ */

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/LRUAction.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LRUAction.cpp b/src/cppcache/src/LRUAction.cpp
index 60c589a..9261deb 100644
--- a/src/cppcache/src/LRUAction.cpp
+++ b/src/cppcache/src/LRUAction.cpp
@@ -20,7 +20,7 @@
 #include "LRUEntriesMap.hpp"
 #include "CacheImpl.hpp"
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 LRUAction* LRUAction::newLRUAction(const LRUAction::Action& actionType,
                                    RegionInternal* regionPtr,

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/LRUAction.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LRUAction.hpp b/src/cppcache/src/LRUAction.hpp
index 36fc59c..c71a4dc 100644
--- a/src/cppcache/src/LRUAction.hpp
+++ b/src/cppcache/src/LRUAction.hpp
@@ -25,7 +25,9 @@
 #include "RegionInternal.hpp"
 #include "Utils.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /**
  * @brief abstract behavior for different eviction actions.
@@ -173,6 +175,8 @@ class CPPCACHE_EXPORT LRUOverFlowToDiskAction : public virtual LRUAction {
 
   friend class LRUAction;
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // __GEMFIRE_IMPL_LRUACTION_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/LRUEntriesMap.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LRUEntriesMap.cpp b/src/cppcache/src/LRUEntriesMap.cpp
index 355679b..4b30513 100644
--- a/src/cppcache/src/LRUEntriesMap.cpp
+++ b/src/cppcache/src/LRUEntriesMap.cpp
@@ -20,7 +20,9 @@
 #include "MapSegment.hpp"
 #include "CacheImpl.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 /**
  * @brief LRUAction for testing map outside of a region....
  */
@@ -46,9 +48,11 @@ class CPPCACHE_EXPORT TestMapAction : public virtual LRUAction {
   virtual LRUAction::Action getType() { return LRUAction::LOCAL_DESTROY; }
   friend class LRUAction;
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 LRUEntriesMap::LRUEntriesMap(EntryFactory* entryFactory, RegionInternal* region,
                              const LRUAction::Action& lruAction,

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/LRUEntriesMap.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LRUEntriesMap.hpp b/src/cppcache/src/LRUEntriesMap.hpp
index 38fbd98..0c24658 100644
--- a/src/cppcache/src/LRUEntriesMap.hpp
+++ b/src/cppcache/src/LRUEntriesMap.hpp
@@ -28,7 +28,9 @@
 
 #include "NonCopyable.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 class EvictionController;
 
 /**
@@ -38,13 +40,15 @@ class EvictionController;
 
 /* adongre
  * CID 28728: Other violation (MISSING_COPY)
- * Class "gemfire::LRUEntriesMap" owns resources that are managed in its
+ * Class "apache::geode::client::LRUEntriesMap" owns resources that are managed
+ * in its
  * constructor and destructor but has no user-written copy constructor.
  *
  * FIX : Make the class non copyable
  *
  * CID 28714: Other violation (MISSING_ASSIGN)
- * Class "gemfire::LRUEntriesMap" owns resources that are managed in
+ * Class "apache::geode::client::LRUEntriesMap" owns resources that are managed
+ * in
  * its constructor and destructor but has no user-written assignment operator.
  * Fix : Make the class Non Assinable
  */
@@ -126,7 +130,8 @@ class CPPCACHE_EXPORT LRUEntriesMap : public ConcurrentEntriesMap,
   virtual void clear();
 
 };  // class LRUEntriesMap
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // __GEMFIRE_IMPL_LRUENTRIESMAP_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/LRUExpMapEntry.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LRUExpMapEntry.cpp b/src/cppcache/src/LRUExpMapEntry.cpp
index 6636638..69f7588 100644
--- a/src/cppcache/src/LRUExpMapEntry.cpp
+++ b/src/cppcache/src/LRUExpMapEntry.cpp
@@ -17,7 +17,7 @@
 #include "LRUExpMapEntry.hpp"
 #include "MapEntryT.hpp"
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 LRUExpEntryFactory* LRUExpEntryFactory::singleton = NULL;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/LRUExpMapEntry.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LRUExpMapEntry.hpp b/src/cppcache/src/LRUExpMapEntry.hpp
index 4f76841..493befe 100644
--- a/src/cppcache/src/LRUExpMapEntry.hpp
+++ b/src/cppcache/src/LRUExpMapEntry.hpp
@@ -22,7 +22,9 @@
 #include "LRUList.hpp"
 #include "VersionStamp.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 /**
  * @brief Hold region mapped entry value and lru information.
  */
@@ -91,6 +93,8 @@ class CPPCACHE_EXPORT LRUExpEntryFactory : public EntryFactory {
   virtual void newMapEntry(const CacheableKeyPtr& key,
                            MapEntryImplPtr& result) const;
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  //__GEMFIRE_IMPL_LRUEXPMAPENTRY_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/LRUList.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LRUList.cpp b/src/cppcache/src/LRUList.cpp
index 0ec3a7c..c752faa 100644
--- a/src/cppcache/src/LRUList.cpp
+++ b/src/cppcache/src/LRUList.cpp
@@ -17,7 +17,7 @@
 #include "LRUList.hpp"
 #include "SpinLock.hpp"
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 #define LOCK_HEAD SpinLockGuard headLockGuard(m_headLock)
 #define LOCK_TAIL SpinLockGuard tailLockGuard(m_tailLock)

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/LRUList.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LRUList.hpp b/src/cppcache/src/LRUList.hpp
index 87f2206..aac7d1c 100644
--- a/src/cppcache/src/LRUList.hpp
+++ b/src/cppcache/src/LRUList.hpp
@@ -21,7 +21,9 @@
 #include <gfcpp/SharedPtr.hpp>
 #include "SpinLock.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 // Bit mask for recently used
 #define RECENTLY_USED_BITS 1ul
 // Bit mask for evicted
@@ -144,7 +146,8 @@ class LRUList {
   LRUListNode* m_tailNode;
 
 };  // LRUList
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // __GEMFIRE_IMPL_LRULIST_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/LRULocalDestroyAction.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LRULocalDestroyAction.cpp b/src/cppcache/src/LRULocalDestroyAction.cpp
index a369671..633c5cc 100644
--- a/src/cppcache/src/LRULocalDestroyAction.cpp
+++ b/src/cppcache/src/LRULocalDestroyAction.cpp
@@ -19,7 +19,7 @@
 #include "LRUEntriesMap.hpp"
 #include "CacheImpl.hpp"
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 bool LRULocalDestroyAction::evict(const MapEntryImplPtr& mePtr) {
   CacheableKeyPtr keyPtr;

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/LRULocalDestroyAction.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LRULocalDestroyAction.hpp b/src/cppcache/src/LRULocalDestroyAction.hpp
index 090b3ed..aa9f249 100644
--- a/src/cppcache/src/LRULocalDestroyAction.hpp
+++ b/src/cppcache/src/LRULocalDestroyAction.hpp
@@ -22,7 +22,9 @@
 #include "RegionInternal.hpp"
 #include "MapEntry.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /**
  * @brief LRUAction for localDestroy.
@@ -45,6 +47,8 @@ class CPPCACHE_EXPORT LRULocalDestroyAction : public virtual LRUAction {
   virtual LRUAction::Action getType() { return LRUAction::LOCAL_DESTROY; }
   friend class LRUAction;
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  //__GEMFIRE_IMPL_LRULOCALDESTROYACTION_HPP__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/LRUMapEntry.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LRUMapEntry.cpp b/src/cppcache/src/LRUMapEntry.cpp
index d764637..9972219 100644
--- a/src/cppcache/src/LRUMapEntry.cpp
+++ b/src/cppcache/src/LRUMapEntry.cpp
@@ -17,7 +17,7 @@
 #include "LRUMapEntry.hpp"
 #include "MapEntryT.hpp"
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 LRUEntryFactory* LRUEntryFactory::singleton = NULL;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/LRUMapEntry.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LRUMapEntry.hpp b/src/cppcache/src/LRUMapEntry.hpp
index 7408656..0b4299a 100644
--- a/src/cppcache/src/LRUMapEntry.hpp
+++ b/src/cppcache/src/LRUMapEntry.hpp
@@ -23,7 +23,9 @@
 #include "LRUList.hpp"
 #include "VersionStamp.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 /**
  * This template class adds the recently used, eviction bits and persistence
  * info to the MapEntry class. The earlier design looked like below:
@@ -115,7 +117,8 @@ class CPPCACHE_EXPORT LRUEntryFactory : public EntryFactory {
   virtual void newMapEntry(const CacheableKeyPtr& key,
                            MapEntryImplPtr& result) const;
 };
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  //__GEMFIRE_IMPL_LRUMAPENTRY_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/LocalRegion.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LocalRegion.cpp b/src/cppcache/src/LocalRegion.cpp
index e17babd..8adc23c 100644
--- a/src/cppcache/src/LocalRegion.cpp
+++ b/src/cppcache/src/LocalRegion.cpp
@@ -34,7 +34,7 @@
 #include <vector>
 #include <gfcpp/PoolManager.hpp>
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 LocalRegion::LocalRegion(const std::string& name, CacheImpl* cache,
                          RegionInternal* rPtr,
@@ -1034,7 +1034,9 @@ GfErrType LocalRegion::getAllNoThrow(const VectorOfCacheableKey& keys,
   return err;
 }
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 // encapsulates actions that need to be taken for a put() operation
 class PutActions {
  public:
@@ -1601,7 +1603,9 @@ class InvalidateActions {
  private:
   LocalRegion& m_region;
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 template <typename TAction>
 GfErrType LocalRegion::updateNoThrow(const CacheableKeyPtr& key,

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/LocalRegion.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LocalRegion.hpp b/src/cppcache/src/LocalRegion.hpp
index b7f0281..598b9e0 100644
--- a/src/cppcache/src/LocalRegion.hpp
+++ b/src/cppcache/src/LocalRegion.hpp
@@ -58,7 +58,9 @@
 #include <unordered_map>
 #include "TSSTXStateWrapper.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 #ifndef CHECK_DESTROY_PENDING
 #define CHECK_DESTROY_PENDING(lock, function)                      \
@@ -489,7 +491,8 @@ class CPPCACHE_EXPORT LocalRegion : public RegionInternal {
   friend class RemoveActions;
   friend class InvalidateActions;
 };
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // ifndef __GEMFIRE_LOCALREGION_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/LocatorListRequest.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LocatorListRequest.cpp b/src/cppcache/src/LocatorListRequest.cpp
index 9be7ac6..0296344 100644
--- a/src/cppcache/src/LocatorListRequest.cpp
+++ b/src/cppcache/src/LocatorListRequest.cpp
@@ -19,7 +19,7 @@
 #include <gfcpp/DataOutput.hpp>
 #include "GemfireTypeIdsImpl.hpp"
 #include <gfcpp/CacheableString.hpp>
-using namespace gemfire;
+using namespace apache::geode::client;
 LocatorListRequest::LocatorListRequest(const std::string& servergroup)
     : m_servergroup(servergroup) {}
 

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/LocatorListRequest.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LocatorListRequest.hpp b/src/cppcache/src/LocatorListRequest.hpp
index aa90fb2..96f83c9 100644
--- a/src/cppcache/src/LocatorListRequest.hpp
+++ b/src/cppcache/src/LocatorListRequest.hpp
@@ -19,7 +19,9 @@
 #include <string>
 #include "ServerLocationRequest.hpp"
 #include "GemfireTypeIdsImpl.hpp"
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 class DataOutput;
 class DataInput;
 class Serializable;
@@ -34,5 +36,7 @@ class LocatorListRequest : public ServerLocationRequest {
   virtual int8_t typeId() const;
   virtual uint32_t objectSize() const;
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/LocatorListResponse.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LocatorListResponse.cpp b/src/cppcache/src/LocatorListResponse.cpp
index 2f38084..d25774e 100644
--- a/src/cppcache/src/LocatorListResponse.cpp
+++ b/src/cppcache/src/LocatorListResponse.cpp
@@ -17,7 +17,7 @@
 #include "LocatorListResponse.hpp"
 #include <gfcpp/DataInput.hpp>
 #include <vector>
-using namespace gemfire;
+using namespace apache::geode::client;
 LocatorListResponse* LocatorListResponse::fromData(DataInput& input) {
   readList(input);
   input.readBoolean(&m_isBalanced);

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/LocatorListResponse.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LocatorListResponse.hpp b/src/cppcache/src/LocatorListResponse.hpp
index 122e7e0..e40cbc1 100644
--- a/src/cppcache/src/LocatorListResponse.hpp
+++ b/src/cppcache/src/LocatorListResponse.hpp
@@ -20,7 +20,9 @@
 #include "GemfireTypeIdsImpl.hpp"
 #include "ServerLocationResponse.hpp"
 #include "ServerLocation.hpp"
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 class DataInput;
 class LocatorListResponse : public ServerLocationResponse {
  private:
@@ -43,5 +45,7 @@ class LocatorListResponse : public ServerLocationResponse {
   static Serializable* create();
 };
 typedef SharedPtr<LocatorListResponse> LocatorListResponsePtr;
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/Log.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/Log.cpp b/src/cppcache/src/Log.cpp
index 63acbdb..58bcca1 100644
--- a/src/cppcache/src/Log.cpp
+++ b/src/cppcache/src/Log.cpp
@@ -48,7 +48,7 @@
 
 /*****************************************************************************/
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 /**
  * The implementation of the Log class
@@ -144,7 +144,9 @@ static int comparator(const dirent** d1, const dirent** d2) {
 
 using namespace gemfire_log_globals;
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 // this method is not thread-safe and expected to be invoked once
 // during initialization
 void gf_log_libinit() {
@@ -161,7 +163,9 @@ void gf_log_libinit() {
     throw IllegalStateException("Log not initialized successfully");
   }
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 /*****************************************************************************/
 
@@ -400,7 +404,7 @@ void Log::init(LogLevel level, const char* logFileName, int32 logFileLimit,
           break;
         }
         // continue after some sleep
-        gemfire::millisleep(200);
+        apache::geode::client::millisleep(200);
       }
       /* (don't throw exception; try appending to existing file instead)
       if (renameResult < 0) {
@@ -465,7 +469,7 @@ void Log::writeBanner() {
       break;
     }
     // continue after some sleep
-    gemfire::millisleep(200);
+    apache::geode::client::millisleep(200);
   }
   if (!g_log) {
     // g_log = stdout;

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/MapEntry.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/MapEntry.cpp b/src/cppcache/src/MapEntry.cpp
index 48ecbfd..98e5ba0 100644
--- a/src/cppcache/src/MapEntry.cpp
+++ b/src/cppcache/src/MapEntry.cpp
@@ -17,7 +17,7 @@
 #include "MapEntry.hpp"
 #include "MapEntryT.hpp"
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 EntryFactory* EntryFactory::singleton = NULL;
 MapEntryPtr MapEntry::MapEntry_NullPointer(NULLPTR);

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/MapEntry.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/MapEntry.hpp b/src/cppcache/src/MapEntry.hpp
index 8fc02ae..221b7fd 100644
--- a/src/cppcache/src/MapEntry.hpp
+++ b/src/cppcache/src/MapEntry.hpp
@@ -31,7 +31,9 @@
 #include <ace/OS.h>
 #include <utility>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 class CPPCACHE_EXPORT MapEntry;
 typedef SharedPtr<MapEntry> MapEntryPtr;
 class CPPCACHE_EXPORT MapEntryImpl;
@@ -279,7 +281,8 @@ class CPPCACHE_EXPORT EntryFactory {
  protected:
   bool m_concurrencyChecksEnabled;
 };
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // __GEMFIRE_IMPL_MAPENTRY_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/MapEntryT.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/MapEntryT.hpp b/src/cppcache/src/MapEntryT.hpp
index dfb189e..b680a59 100644
--- a/src/cppcache/src/MapEntryT.hpp
+++ b/src/cppcache/src/MapEntryT.hpp
@@ -25,7 +25,9 @@
 #define GF_TRACK_MAX 4
 #define GF_UPDATE_MAX 8
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 // this class encapsulates the common functionality of the MapEntryT<>
 // generic template class and its specializations
 template <typename TBase, int NUM_TRACKERS, int UPDATE_COUNT>
@@ -284,6 +286,8 @@ template <typename TBase, int UPDATE_COUNT>
 inline int MapEntryST<TBase, 0, UPDATE_COUNT>::incUpdateCount(TBase* loc) {
   return UPDATE_COUNT;
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // __GEMFIRE_IMPL_MAPENTRY_T_HPP__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/MapSegment.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/MapSegment.cpp b/src/cppcache/src/MapSegment.cpp
index 6abcc36..0eb333a 100644
--- a/src/cppcache/src/MapSegment.cpp
+++ b/src/cppcache/src/MapSegment.cpp
@@ -26,7 +26,7 @@
 #include "TombstoneExpiryHandler.hpp"
 #include <ace/OS.h>
 #include "ace/Time_Value.h"
-using namespace gemfire;
+using namespace apache::geode::client;
 
 #define _GF_GUARD_SEGMENT SpinLockGuard mapGuard(m_spinlock)
 #define _VERSION_TAG_NULL_CHK \

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/MapSegment.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/MapSegment.hpp b/src/cppcache/src/MapSegment.hpp
index 66dc955..68ccf33 100644
--- a/src/cppcache/src/MapSegment.hpp
+++ b/src/cppcache/src/MapSegment.hpp
@@ -41,24 +41,26 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <>
-class ACE_Hash<gemfire::CacheableKeyPtr> {
+class ACE_Hash<apache::geode::client::CacheableKeyPtr> {
  public:
-  u_long operator()(const gemfire::CacheableKeyPtr& key) {
+  u_long operator()(const apache::geode::client::CacheableKeyPtr& key) {
     return key->hashcode();
   }
 };
 
 template <>
-class ACE_Equal_To<gemfire::CacheableKeyPtr> {
+class ACE_Equal_To<apache::geode::client::CacheableKeyPtr> {
  public:
-  bool operator()(const gemfire::CacheableKeyPtr& key1,
-                  const gemfire::CacheableKeyPtr& key2) {
+  bool operator()(const apache::geode::client::CacheableKeyPtr& key1,
+                  const apache::geode::client::CacheableKeyPtr& key2) {
     return key1->operator==(*key2);
   }
 };
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class RegionInternal;
 typedef ::ACE_Hash_Map_Manager_Ex<
@@ -301,7 +303,8 @@ class CPPCACHE_EXPORT MapSegment {
 
   static bool boolVal;
 };
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // __GEMFIRE_IMPL_MAPSEGMENT_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/MapWithLock.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/MapWithLock.hpp b/src/cppcache/src/MapWithLock.hpp
index ec1e05f..141c053 100644
--- a/src/cppcache/src/MapWithLock.hpp
+++ b/src/cppcache/src/MapWithLock.hpp
@@ -34,8 +34,8 @@ namespace std {
  * to enable using CacheableKeyPtr's in std::unordered_map/hash_map.
  */
 template <>
-struct hash<gemfire::CacheableKeyPtr> {
-  size_t operator()(const gemfire::CacheableKeyPtr& key) const {
+struct hash<apache::geode::client::CacheableKeyPtr> {
+  size_t operator()(const apache::geode::client::CacheableKeyPtr& key) const {
     return key->hashcode();
   }
 };
@@ -44,17 +44,20 @@ struct hash<gemfire::CacheableKeyPtr> {
  * to enable using CacheableKeyPtr's in std::unordered_map/hash_map.
  */
 template <>
-struct equal_to<gemfire::CacheableKeyPtr> {
-  size_t operator()(const gemfire::CacheableKeyPtr& key1,
-                    const gemfire::CacheableKeyPtr& key2) const {
+struct equal_to<apache::geode::client::CacheableKeyPtr> {
+  size_t operator()(const apache::geode::client::CacheableKeyPtr& key1,
+                    const apache::geode::client::CacheableKeyPtr& key2) const {
     return (*key1.ptr() == *key2.ptr());
   }
 };
 }  // namespace std
 
-typedef std::unordered_map<gemfire::CacheableKeyPtr, int> MapOfUpdateCounters;
+typedef std::unordered_map<apache::geode::client::CacheableKeyPtr, int>
+    MapOfUpdateCounters;
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class Region;
 typedef SharedPtr<Region> RegionPtr;
@@ -73,5 +76,7 @@ typedef ACE_Hash_Map_Manager_Ex<std::string, CqQueryPtr, ACE_Hash<std::string>,
  * other composite operations. ex.. MapOfRegionGuard guard( map->mutex() );
  */
 typedef ACE_Guard<ACE_Recursive_Thread_Mutex> MapOfRegionGuard;
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif  // define __GEMFIRE_IMPL_MAP_WITHLOCK_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/MemberListForVersionStamp.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/MemberListForVersionStamp.cpp b/src/cppcache/src/MemberListForVersionStamp.cpp
index 3c32db1..e58ae70 100644
--- a/src/cppcache/src/MemberListForVersionStamp.cpp
+++ b/src/cppcache/src/MemberListForVersionStamp.cpp
@@ -17,7 +17,7 @@
 #include "MemberListForVersionStamp.hpp"
 #include <gfcpp/Log.hpp>
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 MemberListForVersionStamp::MemberListForVersionStamp() { m_memberCounter = 0; }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/MemberListForVersionStamp.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/MemberListForVersionStamp.hpp b/src/cppcache/src/MemberListForVersionStamp.hpp
index 1342ed1..08bdc72 100644
--- a/src/cppcache/src/MemberListForVersionStamp.hpp
+++ b/src/cppcache/src/MemberListForVersionStamp.hpp
@@ -24,7 +24,9 @@
 #include "ReadWriteLock.hpp"
 #include <unordered_map>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 struct DistributedMemberWithIntIdentifier {
  public:
   DistributedMemberWithIntIdentifier(
@@ -53,6 +55,8 @@ class MemberListForVersionStamp : public SharedBase {
 };
 
 typedef SharedPtr<MemberListForVersionStamp> MemberListForVersionStampPtr;
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // __MemberListForVersionStamp_HPP__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/NanoTimer.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/NanoTimer.cpp b/src/cppcache/src/NanoTimer.cpp
index 5decd94..25ec2e4 100644
--- a/src/cppcache/src/NanoTimer.cpp
+++ b/src/cppcache/src/NanoTimer.cpp
@@ -22,7 +22,9 @@
 
 // @TODO: Make these actually nano granularity when possible.
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 int64_t NanoTimer::now() {
   ACE_Time_Value now = ACE_High_Res_Timer::gettimeofday_hr();
@@ -46,4 +48,6 @@ void millisleep(uint32_t millis) {
   ACE_Time_Value duration(secs, usecs);
   ACE_OS::sleep(duration);
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/NanoTimer.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/NanoTimer.hpp b/src/cppcache/src/NanoTimer.hpp
index a95e414..0d60af5 100644
--- a/src/cppcache/src/NanoTimer.hpp
+++ b/src/cppcache/src/NanoTimer.hpp
@@ -20,7 +20,9 @@
 
 #include <gfcpp/gfcpp_globals.hpp>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class CPPCACHE_EXPORT NanoTimer {
  public:
@@ -28,6 +30,8 @@ class CPPCACHE_EXPORT NanoTimer {
 
   static void sleep(uint32_t nanos);
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/NoResult.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/NoResult.hpp b/src/cppcache/src/NoResult.hpp
index 3dec050..c9d8c96 100644
--- a/src/cppcache/src/NoResult.hpp
+++ b/src/cppcache/src/NoResult.hpp
@@ -25,7 +25,9 @@
 /**
  * @file
  */
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /**
  * A Special ResultCollector implementation. Functions having
@@ -57,7 +59,8 @@ class CPPCACHE_EXPORT NoResult : public ResultCollector {
     throw UnsupportedOperationException("can not clear results on NoResult");
   }
 };
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // ifndef __GEMFIRE_NO_RESULT_HPP__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/NonCopyable.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/NonCopyable.hpp b/src/cppcache/src/NonCopyable.hpp
index 2ce18d8..0524629 100644
--- a/src/cppcache/src/NonCopyable.hpp
+++ b/src/cppcache/src/NonCopyable.hpp
@@ -17,7 +17,9 @@
 #ifndef NON_COPYABLE_H_
 #define NON_COPYABLE_H_
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 class CPPCACHE_EXPORT NonCopyable {
  protected:
   NonCopyable() {}
@@ -34,6 +36,8 @@ class CPPCACHE_EXPORT NonAssignable {
  private:
   const NonAssignable& operator=(const NonAssignable&);
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PartitionResolver.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PartitionResolver.cpp b/src/cppcache/src/PartitionResolver.cpp
index b872fcc..369d3b0 100644
--- a/src/cppcache/src/PartitionResolver.cpp
+++ b/src/cppcache/src/PartitionResolver.cpp
@@ -17,11 +17,15 @@
 #include <gfcpp/PartitionResolver.hpp>
 #include <gfcpp/EntryEvent.hpp>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 PartitionResolver::PartitionResolver() {}
 
 PartitionResolver::~PartitionResolver() {}
 
 const char* PartitionResolver::getName() { return "PartitionResolver"; }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PdxEnumInstantiator.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxEnumInstantiator.cpp b/src/cppcache/src/PdxEnumInstantiator.cpp
index 0c17071..c06bd6a 100644
--- a/src/cppcache/src/PdxEnumInstantiator.cpp
+++ b/src/cppcache/src/PdxEnumInstantiator.cpp
@@ -23,7 +23,9 @@
 #include <gfcpp/CacheableString.hpp>
 #include <gfcpp/DataInput.hpp>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 PdxEnumInstantiator::PdxEnumInstantiator() {}
 
@@ -47,4 +49,6 @@ Serializable* PdxEnumInstantiator::fromData(DataInput& input) {
 CacheableStringPtr PdxEnumInstantiator::toString() const {
   return CacheableString::create("PdxEnumInstantiator");
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PdxEnumInstantiator.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxEnumInstantiator.hpp b/src/cppcache/src/PdxEnumInstantiator.hpp
index 9b78839..4b8126d 100644
--- a/src/cppcache/src/PdxEnumInstantiator.hpp
+++ b/src/cppcache/src/PdxEnumInstantiator.hpp
@@ -24,7 +24,9 @@
 #include <gfcpp/Serializable.hpp>
 #include <gfcpp/CacheableEnum.hpp>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class PdxEnumInstantiator : public Serializable {
  private:
@@ -49,5 +51,7 @@ class PdxEnumInstantiator : public Serializable {
 
   CacheableStringPtr toString() const;
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif /* _GEMFIRE_PDXENUM_INSTANTIATOR_HPP_ */

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PdxFieldType.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxFieldType.cpp b/src/cppcache/src/PdxFieldType.cpp
index 9cd5742..c27ef88 100644
--- a/src/cppcache/src/PdxFieldType.cpp
+++ b/src/cppcache/src/PdxFieldType.cpp
@@ -29,7 +29,9 @@
 
 #include "ace/OS.h"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 PdxFieldType::PdxFieldType() : Serializable() {
   // m_fieldName = NULL;
@@ -124,7 +126,7 @@ int32_t PdxFieldType::getFixedTypeSize() const {
     }
     case PdxFieldTypes::SHORT:
     case PdxFieldTypes::CHAR:
-      // case gemfire::GemfireTypeIds::CacheableChar: //TODO
+      // case apache::geode::client::GemfireTypeIds::CacheableChar: //TODO
       { return PdxTypes::CHAR_SIZE; }
     case PdxFieldTypes::INT:
     case PdxFieldTypes::FLOAT:
@@ -162,4 +164,6 @@ CacheableStringPtr PdxFieldType::toString() const {
       this->m_sequenceId);
   return CacheableString::create(stringBuf);
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PdxFieldType.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxFieldType.hpp b/src/cppcache/src/PdxFieldType.hpp
index cc58903..6e4182c 100644
--- a/src/cppcache/src/PdxFieldType.hpp
+++ b/src/cppcache/src/PdxFieldType.hpp
@@ -31,7 +31,9 @@
 #include <gfcpp/DataOutput.hpp>
 #include <string>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 class PdxFieldType;
 typedef SharedPtr<PdxFieldType> PdxFieldTypePtr;
 class CPPCACHE_EXPORT PdxFieldType : public Serializable {
@@ -106,5 +108,7 @@ class CPPCACHE_EXPORT PdxFieldType : public Serializable {
 
   int32 getRelativeOffset() const { return m_relativeOffset; }
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif /* PDXFIELDTYPE_HPP_ */

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PdxHelper.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxHelper.cpp b/src/cppcache/src/PdxHelper.cpp
index 148dc35..9848039 100644
--- a/src/cppcache/src/PdxHelper.cpp
+++ b/src/cppcache/src/PdxHelper.cpp
@@ -35,7 +35,9 @@
 #include "CacheRegionHelper.hpp"
 #include <gfcpp/Cache.hpp>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 uint8_t PdxHelper::PdxHeader = 8;
 
 PdxHelper::PdxHelper() {}
@@ -83,49 +85,77 @@ void PdxHelper::serializePdx(DataOutput& output,
     of 932
     ==18904==    at 0x400791A: operator new[](unsigned int)
     (vg_replace_malloc.c:378)
-    ==18904==    by 0x4324354: gemfire::PdxLocalWriter::getPdxStream(int&)
+    ==18904==    by 0x4324354:
+    apache::geode::client::PdxLocalWriter::getPdxStream(int&)
     (DataOutput.hpp:744)
     ==18904==    by 0x4303E6F:
-    gemfire::PdxHelper::serializePdx(gemfire::DataOutput&,
-    gemfire::PdxSerializable const&) (PdxHelper.cpp:64)
+    apache::geode::client::PdxHelper::serializePdx(apache::geode::client::DataOutput&,
+    apache::geode::client::PdxSerializable const&) (PdxHelper.cpp:64)
     ==18904==    by 0x4377028:
-    gemfire::TcrMessage::writeObjectPart(gemfire::SharedPtr<gemfire::Serializable>
-    const&, bool, bool, gemfire::VectorOfCacheableKey const*)
+    apache::geode::client::TcrMessage::writeObjectPart(apache::geode::client::SharedPtr<apache::geode::client::Serializable>
+    const&, bool, bool, apache::geode::client::VectorOfCacheableKey const*)
     (DataOutput.hpp:580)
     ==18904==    by 0x437BB9E:
-    gemfire::TcrMessage::TcrMessage(gemfire::TcrMessage::MsgType,
-    gemfire::Region const*, gemfire::SharedPtr<gemfire::CacheableKey> const&,
-    gemfire::SharedPtr<gemfire::Serializable> const&,
-    gemfire::SharedPtr<gemfire::Serializable> const&, bool,
-    gemfire::ThinClientBaseDM*, bool, bool, char const*) (TcrMessage.cpp:2216)
+    apache::geode::client::TcrMessage::TcrMessage(apache::geode::client::TcrMessage::MsgType,
+    apache::geode::client::Region const*,
+    apache::geode::client::SharedPtr<apache::geode::client::CacheableKey>
+    const&,
+    apache::geode::client::SharedPtr<apache::geode::client::Serializable>
+    const&,
+    apache::geode::client::SharedPtr<apache::geode::client::Serializable>
+    const&, bool,
+    apache::geode::client::ThinClientBaseDM*, bool, bool, char const*)
+    (TcrMessage.cpp:2216)
     ==18904==    by 0x43B9EE5:
-    gemfire::ThinClientRegion::putNoThrow_remote(gemfire::SharedPtr<gemfire::CacheableKey>
-    const&, gemfire::SharedPtr<gemfire::Serializable> const&,
-    gemfire::SharedPtr<gemfire::Serializable> const&,
-    gemfire::SharedPtr<gemfire::VersionTag>&, bool) (ThinClientRegion.cpp:909)
+    apache::geode::client::ThinClientRegion::putNoThrow_remote(apache::geode::client::SharedPtr<apache::geode::client::CacheableKey>
+    const&,
+    apache::geode::client::SharedPtr<apache::geode::client::Serializable>
+    const&,
+    apache::geode::client::SharedPtr<apache::geode::client::Serializable>
+    const&,
+    apache::geode::client::SharedPtr<apache::geode::client::VersionTag>&, bool)
+    (ThinClientRegion.cpp:909)
     ==18904==    by 0x42EFCEF: GfErrType
-    gemfire::LocalRegion::updateNoThrow<gemfire::PutActions>(gemfire::SharedPtr<gemfire::CacheableKey>
-    const&, gemfire::SharedPtr<gemfire::Serializable> const&,
-    gemfire::SharedPtr<gemfire::Serializable> const&,
-    gemfire::SharedPtr<gemfire::Serializable>&, int, gemfire::CacheEventFlags,
-    gemfire::SharedPtr<gemfire::VersionTag>, gemfire::DataInput*,
-    gemfire::SharedPtr<gemfire::EventId>) (LocalRegion.cpp:1097)
+    apache::geode::client::LocalRegion::updateNoThrow<apache::geode::client::PutActions>(apache::geode::client::SharedPtr<apache::geode::client::CacheableKey>
+    const&,
+    apache::geode::client::SharedPtr<apache::geode::client::Serializable>
+    const&,
+    apache::geode::client::SharedPtr<apache::geode::client::Serializable>
+    const&,
+    apache::geode::client::SharedPtr<apache::geode::client::Serializable>&, int,
+    apache::geode::client::CacheEventFlags,
+    apache::geode::client::SharedPtr<apache::geode::client::VersionTag>,
+    apache::geode::client::DataInput*,
+    apache::geode::client::SharedPtr<apache::geode::client::EventId>)
+    (LocalRegion.cpp:1097)
     ==18904==    by 0x42E4DC6:
-    gemfire::LocalRegion::putNoThrow(gemfire::SharedPtr<gemfire::CacheableKey>
-    const&, gemfire::SharedPtr<gemfire::Serializable> const&,
-    gemfire::SharedPtr<gemfire::Serializable> const&,
-    gemfire::SharedPtr<gemfire::Serializable>&, int, gemfire::CacheEventFlags,
-    gemfire::SharedPtr<gemfire::VersionTag>, gemfire::DataInput*,
-    gemfire::SharedPtr<gemfire::EventId>) (LocalRegion.cpp:1799)
+    apache::geode::client::LocalRegion::putNoThrow(apache::geode::client::SharedPtr<apache::geode::client::CacheableKey>
+    const&,
+    apache::geode::client::SharedPtr<apache::geode::client::Serializable>
+    const&,
+    apache::geode::client::SharedPtr<apache::geode::client::Serializable>
+    const&,
+    apache::geode::client::SharedPtr<apache::geode::client::Serializable>&, int,
+    apache::geode::client::CacheEventFlags,
+    apache::geode::client::SharedPtr<apache::geode::client::VersionTag>,
+    apache::geode::client::DataInput*,
+    apache::geode::client::SharedPtr<apache::geode::client::EventId>)
+    (LocalRegion.cpp:1799)
     ==18904==    by 0x42DBEB4:
-    gemfire::LocalRegion::put(gemfire::SharedPtr<gemfire::CacheableKey> const&,
-    gemfire::SharedPtr<gemfire::Serializable> const&,
-    gemfire::SharedPtr<gemfire::Serializable> const&) (LocalRegion.cpp:342)
+    apache::geode::client::LocalRegion::put(apache::geode::client::SharedPtr<apache::geode::client::CacheableKey>
+    const&,
+    apache::geode::client::SharedPtr<apache::geode::client::Serializable>
+    const&,
+    apache::geode::client::SharedPtr<apache::geode::client::Serializable>
+    const&) (LocalRegion.cpp:342)
     ==18904==    by 0x8069744: void
-    gemfire::Region::put<gemfire::SharedPtr<gemfire::WritablePdxInstance>
-    >(gemfire::SharedPtr<gemfire::CacheableKey> const&,
-    gemfire::SharedPtr<gemfire::WritablePdxInstance> const&,
-    gemfire::SharedPtr<gemfire::Serializable> const&) (in
+    apache::geode::client::Region::put<apache::geode::client::SharedPtr<apache::geode::client::WritablePdxInstance>
+    >(apache::geode::client::SharedPtr<apache::geode::client::CacheableKey>
+    const&,
+    apache::geode::client::SharedPtr<apache::geode::client::WritablePdxInstance>
+    const&,
+    apache::geode::client::SharedPtr<apache::geode::client::Serializable>
+    const&) (in
     /export/pnq-gst-dev01a/users/adongre/cedar_dev_Nov12/build-artifacts/linux/tests/cppcache/testThinClientPdxInstance)
     ==18904==    by 0x808D107: Task_modifyPdxInstance::doTask() (in
     /export/pnq-gst-dev01a/users/adongre/cedar_dev_Nov12/build-artifacts/linux/tests/cppcache/testThinClientPdxInstance)
@@ -391,42 +421,54 @@ PdxSerializablePtr PdxHelper::deserializePdx(DataInput& dataInput,
     ==2018==    at 0x400791A: operator new[](unsigned int)
     (vg_replace_malloc.c:378)
     ==2018==    by 0x4303969:
-    gemfire::PdxHelper::deserializePdx(gemfire::DataInput&, bool)
+    apache::geode::client::PdxHelper::deserializePdx(apache::geode::client::DataInput&,
+    bool)
     (DataInput.hpp:1007)
     ==2018==    by 0x43210D4:
-    gemfire::PdxInstantiator::fromData(gemfire::DataInput&)
+    apache::geode::client::PdxInstantiator::fromData(apache::geode::client::DataInput&)
     (PdxInstantiator.cpp:30)
     ==2018==    by 0x434A72E:
-    gemfire::SerializationRegistry::deserialize(gemfire::DataInput&, signed
+    apache::geode::client::SerializationRegistry::deserialize(apache::geode::client::DataInput&,
+    signed
     char) (SerializationRegistry.cpp:378)
     ==2018==    by 0x42280FB:
-    gemfire::DataInput::readObjectInternal(gemfire::SharedPtr<gemfire::Serializable>&,
+    apache::geode::client::DataInput::readObjectInternal(apache::geode::client::SharedPtr<apache::geode::client::Serializable>&,
     signed char) (DataInput.cpp:9)
     ==2018==    by 0x438107E:
-    gemfire::TcrMessage::readObjectPart(gemfire::DataInput&, bool)
+    apache::geode::client::TcrMessage::readObjectPart(apache::geode::client::DataInput&,
+    bool)
     (DataInput.hpp:694)
-    ==2018==    by 0x4375638: gemfire::TcrMessage::handleByteArrayResponse(char
+    ==2018==    by 0x4375638:
+    apache::geode::client::TcrMessage::handleByteArrayResponse(char
     const*, int, unsigned short) (TcrMessage.cpp:1087)
-    ==2018==    by 0x4375B2E: gemfire::TcrMessage::setData(char const*, int,
+    ==2018==    by 0x4375B2E: apache::geode::client::TcrMessage::setData(char
+    const*, int,
     unsigned short) (TcrMessage.cpp:3933)
     ==2018==    by 0x4367EE6:
-    gemfire::TcrEndpoint::sendRequestConn(gemfire::TcrMessage const&,
-    gemfire::TcrMessage&, gemfire::TcrConnection*, stlp_std::basic_string<char,
+    apache::geode::client::TcrEndpoint::sendRequestConn(apache::geode::client::TcrMessage
+    const&,
+    apache::geode::client::TcrMessage&, apache::geode::client::TcrConnection*,
+    stlp_std::basic_string<char,
     stlp_std::char_traits<char>, stlp_std::allocator<char> >&)
     (TcrEndpoint.cpp:764)
     ==2018==    by 0x43682E3:
-    gemfire::TcrEndpoint::sendRequestWithRetry(gemfire::TcrMessage const&,
-    gemfire::TcrMessage&, gemfire::TcrConnection*&, bool&,
+    apache::geode::client::TcrEndpoint::sendRequestWithRetry(apache::geode::client::TcrMessage
+    const&,
+    apache::geode::client::TcrMessage&, apache::geode::client::TcrConnection*&,
+    bool&,
     stlp_std::basic_string<char, stlp_std::char_traits<char>,
     stlp_std::allocator<char> >&, int, bool, long long, bool)
     (TcrEndpoint.cpp:869)
     ==2018==    by 0x4368EBA:
-    gemfire::TcrEndpoint::sendRequestConnWithRetry(gemfire::TcrMessage const&,
-    gemfire::TcrMessage&, gemfire::TcrConnection*&, bool) (TcrEndpoint.cpp:1060)
+    apache::geode::client::TcrEndpoint::sendRequestConnWithRetry(apache::geode::client::TcrMessage
+    const&,
+    apache::geode::client::TcrMessage&, apache::geode::client::TcrConnection*&,
+    bool) (TcrEndpoint.cpp:1060)
     ==2018==    by 0x4393D2D:
-    gemfire::ThinClientPoolDM::sendSyncRequest(gemfire::TcrMessage&,
-    gemfire::TcrMessage&, bool, bool,
-    gemfire::SharedPtr<gemfire::BucketServerLocation> const&)
+    apache::geode::client::ThinClientPoolDM::sendSyncRequest(apache::geode::client::TcrMessage&,
+    apache::geode::client::TcrMessage&, bool, bool,
+    apache::geode::client::SharedPtr<apache::geode::client::BucketServerLocation>
+    const&)
     (ThinClientPoolDM.cpp:1408)
     ==2018==
     */
@@ -534,4 +576,6 @@ EnumInfoPtr PdxHelper::getEnum(int enumId) {
   EnumInfoPtr ei = PdxTypeRegistry::getEnum(enumId);
   return ei;
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PdxHelper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxHelper.hpp b/src/cppcache/src/PdxHelper.hpp
index aff24f2..a13ebc1 100644
--- a/src/cppcache/src/PdxHelper.hpp
+++ b/src/cppcache/src/PdxHelper.hpp
@@ -29,7 +29,9 @@
 #include "PdxType.hpp"
 #include "CacheImpl.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class PdxHelper {
  private:
@@ -76,5 +78,7 @@ class PdxHelper {
 
   static CacheImpl* getCacheImpl();
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif /* PDXHELPER_HPP_ */

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PdxInstanceFactoryImpl.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxInstanceFactoryImpl.cpp b/src/cppcache/src/PdxInstanceFactoryImpl.cpp
index 982efa3..6342ec0 100644
--- a/src/cppcache/src/PdxInstanceFactoryImpl.cpp
+++ b/src/cppcache/src/PdxInstanceFactoryImpl.cpp
@@ -20,7 +20,9 @@
 #include "PdxInstanceImpl.hpp"
 #include <ace/OS_NS_stdio.h>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 PdxInstanceFactoryImpl::~PdxInstanceFactoryImpl() {}
 
@@ -401,4 +403,6 @@ void PdxInstanceFactoryImpl::isFieldAdded(const char* fieldName) {
     throw IllegalStateException(excpStr);
   }
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PdxInstanceFactoryImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxInstanceFactoryImpl.hpp b/src/cppcache/src/PdxInstanceFactoryImpl.hpp
index 0d2ae67..e914788 100644
--- a/src/cppcache/src/PdxInstanceFactoryImpl.hpp
+++ b/src/cppcache/src/PdxInstanceFactoryImpl.hpp
@@ -23,7 +23,9 @@
 #include <map>
 #include "PdxType.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 typedef std::map<std::string, CacheablePtr> FieldVsValues;
 
@@ -449,6 +451,8 @@ class CPPCACHE_EXPORT PdxInstanceFactoryImpl : public PdxInstanceFactory {
 
   void isFieldAdded(const char* fieldName);
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif /* __PDXINSTANCE_FACTORY_IMPL_HPP_ */

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PdxInstanceImpl.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxInstanceImpl.cpp b/src/cppcache/src/PdxInstanceImpl.cpp
index 4dd927f..15a3052 100644
--- a/src/cppcache/src/PdxInstanceImpl.cpp
+++ b/src/cppcache/src/PdxInstanceImpl.cpp
@@ -45,7 +45,9 @@
     throw IllegalStateException(excpStr);                               \
   }
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 int8_t PdxInstanceImpl::m_BooleanDefaultBytes[] = {0};
 int8_t PdxInstanceImpl::m_ByteDefaultBytes[] = {0};
@@ -57,9 +59,9 @@ int8_t PdxInstanceImpl::m_FloatDefaultBytes[] = {0, 0, 0, 0};
 int8_t PdxInstanceImpl::m_DoubleDefaultBytes[] = {0, 0, 0, 0, 0, 0, 0, 0};
 int8_t PdxInstanceImpl::m_DateDefaultBytes[] = {-1, -1, -1, -1, -1, -1, -1, -1};
 int8_t PdxInstanceImpl::m_StringDefaultBytes[] = {
-    gemfire::GemfireTypeIds::CacheableNullString};
+    apache::geode::client::GemfireTypeIds::CacheableNullString};
 int8_t PdxInstanceImpl::m_ObjectDefaultBytes[] = {
-    gemfire::GemfireTypeIds::NullObj};
+    apache::geode::client::GemfireTypeIds::NullObj};
 int8_t PdxInstanceImpl::m_NULLARRAYDefaultBytes[] = {-1};
 PdxFieldTypePtr PdxInstanceImpl::m_DefaultPdxFieldType(
     new PdxFieldType("default", "default", static_cast<uint8_t>(-1),
@@ -76,8 +78,9 @@ bool sortFunc(PdxFieldTypePtr field1, PdxFieldTypePtr field2) {
 
 PdxInstanceImpl::~PdxInstanceImpl() { GF_SAFE_DELETE_ARRAY(m_buffer); }
 
-PdxInstanceImpl::PdxInstanceImpl(gemfire::FieldVsValues fieldVsValue,
-                                 gemfire::PdxTypePtr pdxType) {
+PdxInstanceImpl::PdxInstanceImpl(
+    apache::geode::client::FieldVsValues fieldVsValue,
+    apache::geode::client::PdxTypePtr pdxType) {
   m_pdxType = pdxType;
   m_updatedFields = fieldVsValue;
   m_buffer = NULL;
@@ -86,7 +89,8 @@ PdxInstanceImpl::PdxInstanceImpl(gemfire::FieldVsValues fieldVsValue,
 
   m_pdxType->InitializeType();  // to generate static position map
 
-  // gemfire::DataOutput* output = gemfire::DataOutput::getDataOutput();
+  // apache::geode::client::DataOutput* output =
+  // apache::geode::client::DataOutput::getDataOutput();
   DataOutput output;
   PdxHelper::serializePdx(output, *this);
 }
@@ -1749,7 +1753,8 @@ void PdxInstanceImpl::toData(PdxWriterPtr writer) /*const*/ {
   int position = 0;  // ignore typeid and length
   int nextFieldPosition = 0;
   if (m_buffer != NULL) {
-    uint8_t* copy = gemfire::DataInput::getBufferCopy(m_buffer, m_bufferLength);
+    uint8_t* copy = apache::geode::client::DataInput::getBufferCopy(
+        m_buffer, m_bufferLength);
     DataInput dataInput(copy, m_bufferLength);  // this will delete buffer
     for (size_t i = 0; i < pdxFieldList->size(); i++) {
       PdxFieldTypePtr currPf = pdxFieldList->at(i);
@@ -2792,4 +2797,6 @@ uint32_t PdxInstanceImpl::objectSize() const {
   }
   return size;
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PdxInstanceImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxInstanceImpl.hpp b/src/cppcache/src/PdxInstanceImpl.hpp
index 60f287c..7ef755a 100644
--- a/src/cppcache/src/PdxInstanceImpl.hpp
+++ b/src/cppcache/src/PdxInstanceImpl.hpp
@@ -27,7 +27,9 @@
 #include <vector>
 #include <map>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 typedef std::map<std::string, CacheablePtr> FieldVsValues;
 
@@ -1161,6 +1163,8 @@ class CPPCACHE_EXPORT PdxInstanceImpl : public WritablePdxInstance {
   static PdxFieldTypePtr m_DefaultPdxFieldType;
 };
 typedef SharedPtr<PdxInstanceImpl> PdxInstanceImplPtr;
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif /* __PDXINSTANCE_IMPL_HPP_*/

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PdxInstantiator.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxInstantiator.cpp b/src/cppcache/src/PdxInstantiator.cpp
index c1f91d5..a21b62a 100644
--- a/src/cppcache/src/PdxInstantiator.cpp
+++ b/src/cppcache/src/PdxInstantiator.cpp
@@ -28,7 +28,9 @@
 #include "PdxHelper.hpp"
 #include <gfcpp/PdxSerializable.hpp>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 PdxInstantiator::PdxInstantiator() {}
 
@@ -51,4 +53,6 @@ Serializable* PdxInstantiator::fromData(DataInput& input) {
 CacheableStringPtr PdxInstantiator::toString() const {
   return CacheableString::create("PdxInstantiator");
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache


Mime
View raw message