geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [11/50] [abbrv] geode git commit: GEODE-2316: Rename namespace gemfire to apache::geode::client.
Date Mon, 23 Jan 2017 19:17:03 GMT
http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/Assert.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/Assert.hpp b/src/cppcache/include/gfcpp/Assert.hpp
index de523ae..b06c027 100644
--- a/src/cppcache/include/gfcpp/Assert.hpp
+++ b/src/cppcache/include/gfcpp/Assert.hpp
@@ -26,7 +26,9 @@
  *  Assertion functions for debugging
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /**
  * @class Assert Assert.hpp
@@ -50,10 +52,13 @@ class CPPCACHE_EXPORT Assert {
   static void throwAssertion(const char* expressionText, const char* file,
                              int line);
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 /** Throws the given assertion. */
-#define GF_R_ASSERT(x) gemfire::Assert::assertTrue(x, #x, __FILE__, __LINE__)
+#define GF_R_ASSERT(x) \
+  apache::geode::client::Assert::assertTrue(x, #x, __FILE__, __LINE__)
 
 #ifndef GF_DEBUG_ASSERTS
 /** Change this to 1 to use assertion functions. */
@@ -76,14 +81,16 @@ class CPPCACHE_EXPORT Assert {
 
 /** Throws the given assertion if GF_DEBUG_ASSERTS is true. */
 #if GF_DEBUG_ASSERTS == 1
-#define GF_D_ASSERT(x) gemfire::Assert::assertTrue(x, #x, __FILE__, __LINE__)
+#define GF_D_ASSERT(x) \
+  apache::geode::client::Assert::assertTrue(x, #x, __FILE__, __LINE__)
 #else
 #define GF_D_ASSERT(x)
 #endif
 
 /** Throws the given assertion if GF_DEVEL_ASSERTS is true. */
 #if GF_DEVEL_ASSERTS == 1
-#define GF_DEV_ASSERT(x) gemfire::Assert::assertTrue(x, #x, __FILE__, __LINE__)
+#define GF_DEV_ASSERT(x) \
+  apache::geode::client::Assert::assertTrue(x, #x, __FILE__, __LINE__)
 #else
 #define GF_DEV_ASSERT(x)
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/AttributesFactory.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/AttributesFactory.hpp b/src/cppcache/include/gfcpp/AttributesFactory.hpp
index d206534..c42ed1e 100644
--- a/src/cppcache/include/gfcpp/AttributesFactory.hpp
+++ b/src/cppcache/include/gfcpp/AttributesFactory.hpp
@@ -33,7 +33,9 @@
  * @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /** Creates instances of {@link RegionAttributes}. An
  * <code>AttributesFactory</code>
@@ -370,5 +372,7 @@ class CPPCACHE_EXPORT AttributesFactory : public SharedBase {
   RegionAttributes m_regionAttributes;
   static void validateAttributes(RegionAttributes& attrs);
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif  // ifndef __GEMFIRE_ATTRIBUTESFACTORY_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/AttributesMutator.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/AttributesMutator.hpp b/src/cppcache/include/gfcpp/AttributesMutator.hpp
index 462d426..c946ea3 100644
--- a/src/cppcache/include/gfcpp/AttributesMutator.hpp
+++ b/src/cppcache/include/gfcpp/AttributesMutator.hpp
@@ -24,7 +24,9 @@
  * @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class CacheListener;
 class CacheLoader;
@@ -181,6 +183,7 @@ class CPPCACHE_EXPORT AttributesMutator : public SharedBase {
    */
   void setCacheWriter(const char* libpath, const char* factoryFuncName);
 };
-
-};      // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif  // ifndef __GEMFIRE_ATTRIBUTESMUTATOR_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/AuthInitialize.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/AuthInitialize.hpp b/src/cppcache/include/gfcpp/AuthInitialize.hpp
index 17a9138..337829b 100644
--- a/src/cppcache/include/gfcpp/AuthInitialize.hpp
+++ b/src/cppcache/include/gfcpp/AuthInitialize.hpp
@@ -24,7 +24,9 @@
 #include "gfcpp_globals.hpp"
 #include "gf_types.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /**
  * @class AuthInitialize AuthInitialize.hpp
@@ -37,7 +39,8 @@ namespace gemfire {
  * AuthInitialize object) as the <code>security-client-auth-factory</code>
  * system property.
  */
-class CPPCACHE_EXPORT AuthInitialize : public SharedBase {
+class CPPCACHE_EXPORT AuthInitialize
+    : public ::apache::geode::client::SharedBase {
  public:
   /**@brief initialize with the given set of security properties
    * and return the credentials for the client as properties.
@@ -55,7 +58,8 @@ class CPPCACHE_EXPORT AuthInitialize : public SharedBase {
   /**@brief Invoked before the cache goes down. */
   virtual void close() = 0;
 };
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // ifndef __GEMFIRE_AUTHINITIALIZE_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/Cache.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/Cache.hpp b/src/cppcache/include/gfcpp/Cache.hpp
index d5740bf..ffaca50 100644
--- a/src/cppcache/include/gfcpp/Cache.hpp
+++ b/src/cppcache/include/gfcpp/Cache.hpp
@@ -32,7 +32,9 @@
  * @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class CacheFactory;
 class CacheRegionHelper;
@@ -241,6 +243,7 @@ class CPPCACHE_EXPORT Cache : public GemFireCache {
   friend class CacheXmlCreation;
   friend class RegionXmlCreation;
 };
-
-};      // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif  // ifndef __GEMFIRE_CACHE_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/CacheAttributes.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CacheAttributes.hpp b/src/cppcache/include/gfcpp/CacheAttributes.hpp
index 3168134..01a53d9 100644
--- a/src/cppcache/include/gfcpp/CacheAttributes.hpp
+++ b/src/cppcache/include/gfcpp/CacheAttributes.hpp
@@ -24,7 +24,9 @@
 #include "gfcpp_globals.hpp"
 #include "gf_types.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /**
  * @class CacheAttributes CacheAttributes.hpp
@@ -96,7 +98,8 @@ class CPPCACHE_EXPORT CacheAttributes : public SharedBase {
 
   const CacheAttributes& operator=(const CacheAttributes&);
 };
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // ifndef __GEMFIRE_CACHEATTRIBUTES_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/CacheFactory.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CacheFactory.hpp b/src/cppcache/include/gfcpp/CacheFactory.hpp
index 85cdabe..4efeecd 100644
--- a/src/cppcache/include/gfcpp/CacheFactory.hpp
+++ b/src/cppcache/include/gfcpp/CacheFactory.hpp
@@ -29,7 +29,9 @@
 
 #define DEFAULT_POOL_NAME "default_gemfireClientPool"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class CppCacheLibrary;
 /**
@@ -493,6 +495,8 @@ class CPPCACHE_EXPORT CacheFactory : public SharedBase {
   friend class RegionXmlCreation;
   friend class CacheXmlCreation;
 };
-};  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // ifndef __GEMFIRE_CACHEFACTORY_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/CacheListener.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CacheListener.hpp b/src/cppcache/include/gfcpp/CacheListener.hpp
index da79382..8d00e34 100644
--- a/src/cppcache/include/gfcpp/CacheListener.hpp
+++ b/src/cppcache/include/gfcpp/CacheListener.hpp
@@ -25,7 +25,9 @@
  * @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class EntryEvent;
 class RegionEvent;
@@ -201,6 +203,7 @@ class CPPCACHE_EXPORT CacheListener : public SharedBase {
   CacheListener(const CacheListener& other);
   void operator=(const CacheListener& other);
 };
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif  // ifndef __GEMFIRE_CACHELISTENER_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/CacheLoader.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CacheLoader.hpp b/src/cppcache/include/gfcpp/CacheLoader.hpp
index 62a684d..efb76f7 100644
--- a/src/cppcache/include/gfcpp/CacheLoader.hpp
+++ b/src/cppcache/include/gfcpp/CacheLoader.hpp
@@ -27,7 +27,9 @@
 #include "Cacheable.hpp"
 #include "UserData.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /**
  * @class CacheLoader CacheLoader.hpp
@@ -93,6 +95,7 @@ class CPPCACHE_EXPORT CacheLoader : public SharedBase {
   CacheLoader(const CacheLoader& other);
   void operator=(const CacheLoader& other);
 };
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif  // ifndef __GEMFIRE_CACHELOADER_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/CacheStatistics.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CacheStatistics.hpp b/src/cppcache/include/gfcpp/CacheStatistics.hpp
index 8406079..68e2416 100644
--- a/src/cppcache/include/gfcpp/CacheStatistics.hpp
+++ b/src/cppcache/include/gfcpp/CacheStatistics.hpp
@@ -23,7 +23,9 @@
  * @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class LocalRegion;
 
@@ -102,6 +104,7 @@ class CPPCACHE_EXPORT CacheStatistics : public SharedBase {
 
   friend class LocalRegion;
 };
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif  // ifndef __GEMFIRE_CACHESTATISTICS_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/CacheTransactionManager.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CacheTransactionManager.hpp b/src/cppcache/include/gfcpp/CacheTransactionManager.hpp
index 2b846be..354a803 100644
--- a/src/cppcache/include/gfcpp/CacheTransactionManager.hpp
+++ b/src/cppcache/include/gfcpp/CacheTransactionManager.hpp
@@ -27,9 +27,12 @@
 #include "gfcpp_globals.hpp"
 #include "gf_types.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
-class CPPCACHE_EXPORT CacheTransactionManager : public gemfire::SharedBase {
+class CPPCACHE_EXPORT CacheTransactionManager
+    : public apache::geode::client::SharedBase {
  public:
   /** Creates a new transaction and associates it with the current thread.
    *
@@ -193,6 +196,8 @@ class CPPCACHE_EXPORT CacheTransactionManager : public gemfire::SharedBase {
   CacheTransactionManager();
   virtual ~CacheTransactionManager();
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif /* CACHETRANSACTIONMANAGER_H_ */

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/CacheWriter.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CacheWriter.hpp b/src/cppcache/include/gfcpp/CacheWriter.hpp
index 753b3e4..431b1e8 100644
--- a/src/cppcache/include/gfcpp/CacheWriter.hpp
+++ b/src/cppcache/include/gfcpp/CacheWriter.hpp
@@ -25,7 +25,9 @@
  *
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class EntryEvent;
 class RegionEvent;
@@ -176,7 +178,8 @@ class CPPCACHE_EXPORT CacheWriter : public SharedBase {
   CacheWriter(const CacheWriter& other);
   void operator=(const CacheWriter& other);
 };
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/Cacheable.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/Cacheable.hpp b/src/cppcache/include/gfcpp/Cacheable.hpp
index 9510cf9..734f297 100644
--- a/src/cppcache/include/gfcpp/Cacheable.hpp
+++ b/src/cppcache/include/gfcpp/Cacheable.hpp
@@ -24,7 +24,9 @@
 #include "gfcpp_globals.hpp"
 #include "Serializable.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 typedef SerializablePtr CacheablePtr;
 typedef Serializable Cacheable;
@@ -34,7 +36,8 @@ inline CacheablePtr createValue(const SharedPtr<TVALUE>& value);
 
 template <typename TVALUE>
 inline CacheablePtr createValue(const TVALUE* value);
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // ifndef __GEMFIRE_CACHEABLE_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/Cacheable.inl
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/Cacheable.inl b/src/cppcache/include/gfcpp/Cacheable.inl
old mode 100755
new mode 100644
index 47ff629..9a1e11b
--- a/src/cppcache/include/gfcpp/Cacheable.inl
+++ b/src/cppcache/include/gfcpp/Cacheable.inl
@@ -23,7 +23,9 @@
 
 #include "Cacheable.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 template< class PRIM >
 inline CacheablePtr Cacheable::create( const PRIM value )
@@ -43,6 +45,8 @@ inline CacheablePtr createValue( const TVALUE* value )
   return createValueArr( value );
 }
 
-} //namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif //ifndef __GEMFIRE_CACHEABLE_I__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/CacheableBuiltins.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CacheableBuiltins.hpp b/src/cppcache/include/gfcpp/CacheableBuiltins.hpp
index 22712b4..793c562 100644
--- a/src/cppcache/include/gfcpp/CacheableBuiltins.hpp
+++ b/src/cppcache/include/gfcpp/CacheableBuiltins.hpp
@@ -29,7 +29,9 @@
 #include "CacheableKeys.hpp"
 #include "CacheableString.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /** sprintf implementation. */
 extern int gf_sprintf(char* buffer, const char* fmt, ...);
@@ -45,7 +47,7 @@ class CacheableKeyType : public CacheableKey {
   TObj m_value;
 
   inline CacheableKeyType()
-      : m_value(gemfire::serializer::zeroObject<TObj>()) {}
+      : m_value(apache::geode::client::serializer::zeroObject<TObj>()) {}
 
   inline CacheableKeyType(const TObj value) : m_value(value) {}
 
@@ -57,12 +59,12 @@ class CacheableKeyType : public CacheableKey {
 
   /** Serialize this object to given <code>DataOutput</code>. */
   virtual void toData(DataOutput& output) const {
-    gemfire::serializer::writeObject(output, m_value);
+    apache::geode::client::serializer::writeObject(output, m_value);
   }
 
   /** Deserialize this object from given <code>DataInput</code>. */
   virtual Serializable* fromData(DataInput& input) {
-    gemfire::serializer::readObject(input, m_value);
+    apache::geode::client::serializer::readObject(input, m_value);
     return this;
   }
 
@@ -93,7 +95,7 @@ class CacheableKeyType : public CacheableKey {
 
   /** Return the hashcode for this key. */
   virtual uint32_t hashcode() const {
-    return gemfire::serializer::hashcode(m_value);
+    return apache::geode::client::serializer::hashcode(m_value);
   }
 
   /** Return true if this key matches other. */
@@ -103,12 +105,13 @@ class CacheableKeyType : public CacheableKey {
     }
     const CacheableKeyType& otherValue =
         static_cast<const CacheableKeyType&>(other);
-    return gemfire::serializer::equals(m_value, otherValue.m_value);
+    return apache::geode::client::serializer::equals(m_value,
+                                                     otherValue.m_value);
   }
 
   /** Return true if this key matches other key value. */
   inline bool operator==(const TObj other) const {
-    return gemfire::serializer::equals(m_value, other);
+    return apache::geode::client::serializer::equals(m_value, other);
   }
 
   /**
@@ -223,13 +226,13 @@ class CacheableArrayType : public Cacheable {
 
   /** Serialize this object to the given <code>DataOutput</code>. */
   virtual void toData(DataOutput& output) const {
-    gemfire::serializer::writeObject(output, m_value, m_length);
+    apache::geode::client::serializer::writeObject(output, m_value, m_length);
   }
 
   /** Deserialize this object from the given <code>DataInput</code>. */
   virtual Serializable* fromData(DataInput& input) {
     GF_SAFE_DELETE_ARRAY(m_value);
-    gemfire::serializer::readObject(input, m_value, m_length);
+    apache::geode::client::serializer::readObject(input, m_value, m_length);
     return this;
   }
 
@@ -260,7 +263,7 @@ class CacheableArrayType : public Cacheable {
   virtual uint32_t objectSize() const {
     return static_cast<uint32_t>(
         sizeof(CacheableArrayType) +
-        gemfire::serializer::objectSize(m_value, m_length));
+        apache::geode::client::serializer::objectSize(m_value, m_length));
   }
 };
 
@@ -323,12 +326,12 @@ class CacheableContainerType : public Cacheable, public TBase {
 
   /** Serialize this object to the given <code>DataOutput</code>. */
   virtual void toData(DataOutput& output) const {
-    gemfire::serializer::writeObject(output, *this);
+    apache::geode::client::serializer::writeObject(output, *this);
   }
 
   /** Deserialize this object from the given <code>DataInput</code>. */
   virtual Serializable* fromData(DataInput& input) {
-    gemfire::serializer::readObject(input, *this);
+    apache::geode::client::serializer::readObject(input, *this);
     return this;
   }
 
@@ -357,8 +360,9 @@ class CacheableContainerType : public Cacheable, public TBase {
    * cache memory utilization.
    */
   virtual uint32_t objectSize() const {
-    return static_cast<uint32_t>(sizeof(CacheableContainerType) +
-                                 gemfire::serializer::objectSize(*this));
+    return static_cast<uint32_t>(
+        sizeof(CacheableContainerType) +
+        apache::geode::client::serializer::objectSize(*this));
   }
 };
 
@@ -674,6 +678,8 @@ _GF_CACHEABLE_CONTAINER_TYPE_DEF_(_HashSetOfCacheableKey,
  * iteration semantics of java <code>LinkedHashSet</code>.
  */
 _GF_CACHEABLE_CONTAINER_TYPE_(_HashSetOfCacheableKey, CacheableLinkedHashSet);
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // _GEMFIRE_CACHEABLE_BUILTINS_HPP_

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/CacheableDate.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CacheableDate.hpp b/src/cppcache/include/gfcpp/CacheableDate.hpp
index d4f1398..2362fe0 100644
--- a/src/cppcache/include/gfcpp/CacheableDate.hpp
+++ b/src/cppcache/include/gfcpp/CacheableDate.hpp
@@ -36,7 +36,9 @@
 
 /** @file
 */
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /**
  * Implement a date object based on system epoch that can serve as a
@@ -141,6 +143,8 @@ inline CacheableKeyPtr createKey(const timeval& value) {
 inline CacheablePtr createValue(const timeval& value) {
   return CacheablePtr(CacheableDate::create(value));
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/CacheableEnum.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CacheableEnum.hpp b/src/cppcache/include/gfcpp/CacheableEnum.hpp
index 53b1cb4..72eece5 100644
--- a/src/cppcache/include/gfcpp/CacheableEnum.hpp
+++ b/src/cppcache/include/gfcpp/CacheableEnum.hpp
@@ -20,7 +20,9 @@
 #include "CacheableKey.hpp"
 #include "CacheableString.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /**
 * Since C++ enums cannot be directly passed as a parameter to PdxWriter's
@@ -134,6 +136,8 @@ class CPPCACHE_EXPORT CacheableEnum : public CacheableKey {
   void operator=(const CacheableEnum& other);
   CacheableEnum(const CacheableEnum& other);
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // CACHEABLE_ENUM_HPP

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/CacheableFileName.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CacheableFileName.hpp b/src/cppcache/include/gfcpp/CacheableFileName.hpp
index 09c04c1..0c04dbb 100644
--- a/src/cppcache/include/gfcpp/CacheableFileName.hpp
+++ b/src/cppcache/include/gfcpp/CacheableFileName.hpp
@@ -26,7 +26,9 @@
 /** @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 /**
  * Implement an immutable wrapper for filenames that can serve as a
  * distributable filename object for caching as both key and value.
@@ -110,6 +112,8 @@ class CPPCACHE_EXPORT CacheableFileName : public CacheableString {
  private:
   mutable int m_hashcode;
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/CacheableKey.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CacheableKey.hpp b/src/cppcache/include/gfcpp/CacheableKey.hpp
index f86c747..9e98f5c 100644
--- a/src/cppcache/include/gfcpp/CacheableKey.hpp
+++ b/src/cppcache/include/gfcpp/CacheableKey.hpp
@@ -25,7 +25,9 @@
  * @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /** Represents a cacheable key */
 class CPPCACHE_EXPORT CacheableKey : public Cacheable {
@@ -57,8 +59,9 @@ class CPPCACHE_EXPORT CacheableKey : public Cacheable {
    * Factory method that creates the key type that matches the type of value.
    *
    * For customer defined derivations of CacheableKey, the method
-   * gemfire::createKey may be overloaded. For pointer types (e.g. char*)
-   * the method gemfire::createKeyArr may be overloaded.
+   * apache::geode::client::createKey may be overloaded. For pointer types (e.g.
+   * char*)
+   * the method apache::geode::client::createKeyArr may be overloaded.
    */
   template <class PRIM>
   inline static CacheableKeyPtr create(const PRIM value);
@@ -74,6 +77,8 @@ inline CacheableKeyPtr createKey(const SharedPtr<TKEY>& value);
 
 template <typename TKEY>
 inline CacheableKeyPtr createKey(const TKEY* value);
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/CacheableKey.inl
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CacheableKey.inl b/src/cppcache/include/gfcpp/CacheableKey.inl
index d55ef79..b5d3a04 100644
--- a/src/cppcache/include/gfcpp/CacheableKey.inl
+++ b/src/cppcache/include/gfcpp/CacheableKey.inl
@@ -23,8 +23,9 @@
  * @file
  */
 
-namespace gemfire
-{
+namespace apache {
+namespace geode {
+namespace client {
 
 template< class PRIM >
 inline CacheableKeyPtr CacheableKey::create( const PRIM value )
@@ -44,6 +45,8 @@ inline CacheableKeyPtr createKey( const TKEY* value )
   return createKeyArr( value );
 }
 
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/CacheableKeys.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CacheableKeys.hpp b/src/cppcache/include/gfcpp/CacheableKeys.hpp
index da52d68..3d31aac 100644
--- a/src/cppcache/include/gfcpp/CacheableKeys.hpp
+++ b/src/cppcache/include/gfcpp/CacheableKeys.hpp
@@ -20,7 +20,9 @@
 
 #include "gfcpp_globals.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 namespace serializer {
 
 template <typename TObj>
@@ -88,6 +90,8 @@ inline uint32_t hashcode(const double value) {
   return hashcode(v.u);
 }
 }  // namespace serializer
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // _GEMFIRE_CACHEABLEKEYS_HPP_

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/CacheableObjectArray.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CacheableObjectArray.hpp b/src/cppcache/include/gfcpp/CacheableObjectArray.hpp
index 7f4c3ff..a9f609f 100644
--- a/src/cppcache/include/gfcpp/CacheableObjectArray.hpp
+++ b/src/cppcache/include/gfcpp/CacheableObjectArray.hpp
@@ -25,7 +25,9 @@
 /** @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /**
  * Implement an immutable Vector of <code>Cacheable</code> objects
@@ -95,6 +97,8 @@ class CPPCACHE_EXPORT CacheableObjectArray : public Cacheable,
   CacheableObjectArray& operator=(const CacheableObjectArray& other);
   CacheableObjectArray(const CacheableObjectArray& other);
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // _GEMFIRE_CACHEABLEOBJECTARRAY_HPP_

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/CacheableString.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CacheableString.hpp b/src/cppcache/include/gfcpp/CacheableString.hpp
index 731c0bf..eb51009 100644
--- a/src/cppcache/include/gfcpp/CacheableString.hpp
+++ b/src/cppcache/include/gfcpp/CacheableString.hpp
@@ -27,7 +27,9 @@
 /** @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 #define GF_STRING (int8_t) GemfireTypeIds::CacheableASCIIString
 #define GF_STRING_HUGE (int8_t) GemfireTypeIds::CacheableASCIIStringHuge
@@ -276,29 +278,31 @@ class CPPCACHE_EXPORT CacheableString : public CacheableKey {
   CacheableString(const CacheableString& other);
 };
 
-/** overload of gemfire::createKeyArr to pass char* */
+/** overload of apache::geode::client::createKeyArr to pass char* */
 inline CacheableKeyPtr createKeyArr(const char* value) {
   return (value != NULL ? CacheableKeyPtr(CacheableString::create(value).ptr())
                         : NULLPTR);
 }
 
-/** overload of gemfire::createKeyArr to pass wchar_t* */
+/** overload of apache::geode::client::createKeyArr to pass wchar_t* */
 inline CacheableKeyPtr createKeyArr(const wchar_t* value) {
   return (value != NULL ? CacheableKeyPtr(CacheableString::create(value).ptr())
                         : NULLPTR);
 }
 
-/** overload of gemfire::createValueArr to pass char* */
+/** overload of apache::geode::client::createValueArr to pass char* */
 inline CacheablePtr createValueArr(const char* value) {
   return (value != NULL ? CacheablePtr(CacheableString::create(value).ptr())
                         : NULLPTR);
 }
 
-/** overload of gemfire::createValueArr to pass wchar_t* */
+/** overload of apache::geode::client::createValueArr to pass wchar_t* */
 inline CacheablePtr createValueArr(const wchar_t* value) {
   return (value != NULL ? CacheablePtr(CacheableString::create(value).ptr())
                         : NULLPTR);
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/CacheableUndefined.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CacheableUndefined.hpp b/src/cppcache/include/gfcpp/CacheableUndefined.hpp
index dbfe44e..f793e31 100644
--- a/src/cppcache/include/gfcpp/CacheableUndefined.hpp
+++ b/src/cppcache/include/gfcpp/CacheableUndefined.hpp
@@ -25,7 +25,9 @@
 /** @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /**
  * Encapsulate an undefined query result.
@@ -87,6 +89,8 @@ class CPPCACHE_EXPORT CacheableUndefined : public Cacheable {
   CacheableUndefined& operator=(const CacheableUndefined& other);
   CacheableUndefined(const CacheableUndefined& other);
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // _GEMFIRE_CACHEABLEUNDEFINED_HPP_

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/CqAttributes.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CqAttributes.hpp b/src/cppcache/include/gfcpp/CqAttributes.hpp
index bd8424e..613e27f 100644
--- a/src/cppcache/include/gfcpp/CqAttributes.hpp
+++ b/src/cppcache/include/gfcpp/CqAttributes.hpp
@@ -26,7 +26,9 @@
  * @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /**
  * @cacheserver
@@ -52,7 +54,8 @@ class CPPCACHE_EXPORT CqAttributes : virtual public SharedBase {
    */
   virtual void getCqListeners(VectorOfCqListener& vl) = 0;
 };
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // ifndef __GEMFIRE_CQ_ATTRIBUTES_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/CqAttributesFactory.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CqAttributesFactory.hpp b/src/cppcache/include/gfcpp/CqAttributesFactory.hpp
index f4d2d33..418e8fe 100644
--- a/src/cppcache/include/gfcpp/CqAttributesFactory.hpp
+++ b/src/cppcache/include/gfcpp/CqAttributesFactory.hpp
@@ -26,7 +26,9 @@
  * @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /**
  * @class CqAttributesFactory CqAttributesFactory.hpp
@@ -94,7 +96,8 @@ class CPPCACHE_EXPORT CqAttributesFactory : public SharedBase {
  private:
   CqAttributesPtr m_cqAttributes;
 };
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // ifndef __GEMFIRE_CQ_ATTRIBUTES_FACTORY_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/CqAttributesMutator.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CqAttributesMutator.hpp b/src/cppcache/include/gfcpp/CqAttributesMutator.hpp
index 6d50b23..1591833 100644
--- a/src/cppcache/include/gfcpp/CqAttributesMutator.hpp
+++ b/src/cppcache/include/gfcpp/CqAttributesMutator.hpp
@@ -25,7 +25,9 @@
  * @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /**
  * @class CqAttributesMutator CqAttributesMutator.hpp
@@ -65,7 +67,8 @@ class CPPCACHE_EXPORT CqAttributesMutator : virtual public SharedBase {
    */
   virtual void setCqListeners(VectorOfCqListener& newListeners) = 0;
 };
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // ifndef __GEMFIRE_CQ_ATTRIBUTES_MUTATOR_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/CqEvent.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CqEvent.hpp b/src/cppcache/include/gfcpp/CqEvent.hpp
index 3eae095..2af5595 100644
--- a/src/cppcache/include/gfcpp/CqEvent.hpp
+++ b/src/cppcache/include/gfcpp/CqEvent.hpp
@@ -29,7 +29,9 @@
  * @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /**
  * @class CqEvent CqEvent.hpp
@@ -99,6 +101,8 @@ class CPPCACHE_EXPORT CqEvent {
   CqEvent(const CqEvent&);
   void operator=(const CqEvent&);
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  //#ifndef __GEMFIRE_CQ_EVENT_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/CqListener.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CqListener.hpp b/src/cppcache/include/gfcpp/CqListener.hpp
index 0a47dcb..16f1deb 100644
--- a/src/cppcache/include/gfcpp/CqListener.hpp
+++ b/src/cppcache/include/gfcpp/CqListener.hpp
@@ -25,7 +25,9 @@
  * @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /**
  * @cacheserver
@@ -87,6 +89,8 @@ class CPPCACHE_EXPORT CqListener : public SharedBase {
   CqListener(const CacheListener& other);
   void operator=(const CqListener& other);
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  //#ifndef __GEMFIRE_CQ_LISTENER_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/CqOperation.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CqOperation.hpp b/src/cppcache/include/gfcpp/CqOperation.hpp
index c1019c6..97fcc95 100644
--- a/src/cppcache/include/gfcpp/CqOperation.hpp
+++ b/src/cppcache/include/gfcpp/CqOperation.hpp
@@ -23,7 +23,9 @@
  * @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 /**
  * @class Operation CqOperation.hpp
  * Enumerated type for Operation actions.
@@ -43,5 +45,7 @@ class CPPCACHE_EXPORT CqOperation {
     OP_TYPE_MARKER = 32
   } CqOperationType;
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif  // ifndef __GEMFIRE_CQ_OPERATION_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/CqQuery.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CqQuery.hpp b/src/cppcache/include/gfcpp/CqQuery.hpp
index 73d0256..b054419 100644
--- a/src/cppcache/include/gfcpp/CqQuery.hpp
+++ b/src/cppcache/include/gfcpp/CqQuery.hpp
@@ -30,7 +30,9 @@
  * @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /**
  * @class CqQuery CqQuery.hpp
@@ -172,7 +174,8 @@ class CPPCACHE_EXPORT CqQuery : public SharedBase {
    */
   virtual bool isDurable() = 0;
 };
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // ifndef __GEMFIRE_CQ_QUERY_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/CqResults.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CqResults.hpp b/src/cppcache/include/gfcpp/CqResults.hpp
index 938562b..2940300 100644
--- a/src/cppcache/include/gfcpp/CqResults.hpp
+++ b/src/cppcache/include/gfcpp/CqResults.hpp
@@ -27,7 +27,9 @@
 #include "Serializable.hpp"
 #include "CacheableBuiltins.hpp"
 #include "SelectResults.hpp"
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /**
  * @class CqResults CqResults.hpp
@@ -36,7 +38,8 @@ namespace gemfire {
  * This will be a StructSet.
  */
 class CPPCACHE_EXPORT CqResults : public SelectResults {};
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // ifndef __GEMFIRE_CQRESULTS_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/CqServiceStatistics.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CqServiceStatistics.hpp b/src/cppcache/include/gfcpp/CqServiceStatistics.hpp
index 4bfd7cc..f983bdc 100644
--- a/src/cppcache/include/gfcpp/CqServiceStatistics.hpp
+++ b/src/cppcache/include/gfcpp/CqServiceStatistics.hpp
@@ -24,7 +24,9 @@
  * @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /**
  * @class CqServiceStatistics CqServiceStatistics.hpp
@@ -67,7 +69,8 @@ class CPPCACHE_EXPORT CqServiceStatistics : public SharedBase {
    */
   virtual uint32_t numCqsOnClient() const = 0;
 };
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // ifndef __GEMFIRE_CQ_SERVICE_STATISTICS_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/CqState.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CqState.hpp b/src/cppcache/include/gfcpp/CqState.hpp
index e58ab5f..ce25d53 100644
--- a/src/cppcache/include/gfcpp/CqState.hpp
+++ b/src/cppcache/include/gfcpp/CqState.hpp
@@ -24,7 +24,9 @@
  * @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /**
  * @class CqState CqState.hpp
@@ -72,7 +74,8 @@ class CPPCACHE_EXPORT CqState {
  private:
   StateType m_state;
 };
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // ifndef __GEMFIRE_CQ_STATE_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/CqStatistics.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CqStatistics.hpp b/src/cppcache/include/gfcpp/CqStatistics.hpp
index 4d4f5e3..fe1f7bd 100644
--- a/src/cppcache/include/gfcpp/CqStatistics.hpp
+++ b/src/cppcache/include/gfcpp/CqStatistics.hpp
@@ -24,7 +24,9 @@
  * @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /**
  * @cacheserver
@@ -63,7 +65,8 @@ class CPPCACHE_EXPORT CqStatistics : public SharedBase {
    */
   virtual uint32_t numEvents() const = 0;
 };
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // ifndef __GEMFIRE_CQ_STATISTICS_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/CqStatusListener.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CqStatusListener.hpp b/src/cppcache/include/gfcpp/CqStatusListener.hpp
index e72e815..271b018 100644
--- a/src/cppcache/include/gfcpp/CqStatusListener.hpp
+++ b/src/cppcache/include/gfcpp/CqStatusListener.hpp
@@ -19,7 +19,9 @@
 
 #include "CqListener.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /**
 * Extension of CqListener. Adds two new methods to CqListener, one that
@@ -41,7 +43,8 @@ class CPPCACHE_EXPORT CqStatusListener : public CqListener {
   */
   virtual void onCqConnected();
 };
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  //#ifndef __GEMFIRE_CQ_STATUS_LISTENER_HPP__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/DataInput.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/DataInput.hpp b/src/cppcache/include/gfcpp/DataInput.hpp
index 3503e40..40553c5 100644
--- a/src/cppcache/include/gfcpp/DataInput.hpp
+++ b/src/cppcache/include/gfcpp/DataInput.hpp
@@ -37,7 +37,9 @@
 
 #define checkBufferSize(x) _checkBufferSize(x, __LINE__)
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 extern int gf_sprintf(char* buffer, const char* fmt, ...);
 
@@ -628,19 +630,23 @@ class CPPCACHE_EXPORT DataInput {
     } else if (compId == GemfireTypeIds::CacheableNullString) {
       csPtr = CacheableStringPtr(dynamic_cast<CacheableString*>(
           CacheableString::createDeserializable()));
-    } else if (compId == gemfire::GemfireTypeIds::CacheableASCIIString) {
+    } else if (compId ==
+               apache::geode::client::GemfireTypeIds::CacheableASCIIString) {
       csPtr = CacheableStringPtr(dynamic_cast<CacheableString*>(
           CacheableString::createDeserializable()));
       csPtr.ptr()->fromData(*this);
-    } else if (compId == gemfire::GemfireTypeIds::CacheableASCIIStringHuge) {
+    } else if (compId == apache::geode::client::GemfireTypeIds::
+                             CacheableASCIIStringHuge) {
       csPtr = CacheableStringPtr(dynamic_cast<CacheableString*>(
           CacheableString::createDeserializableHuge()));
       csPtr.ptr()->fromData(*this);
-    } else if (compId == gemfire::GemfireTypeIds::CacheableString) {
+    } else if (compId ==
+               apache::geode::client::GemfireTypeIds::CacheableString) {
       csPtr = CacheableStringPtr(dynamic_cast<CacheableString*>(
           CacheableString::createUTFDeserializable()));
       csPtr.ptr()->fromData(*this);
-    } else if (compId == gemfire::GemfireTypeIds::CacheableStringHuge) {
+    } else if (compId ==
+               apache::geode::client::GemfireTypeIds::CacheableStringHuge) {
       csPtr = CacheableStringPtr(dynamic_cast<CacheableString*>(
           CacheableString::createUTFDeserializableHuge()));
       csPtr.ptr()->fromData(*this);
@@ -1068,6 +1074,8 @@ class CPPCACHE_EXPORT DataInput {
   DataInput(const DataInput&);
   DataInput& operator=(const DataInput&);
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // __GEMFIRE_DATAINPUT_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/DataOutput.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/DataOutput.hpp b/src/cppcache/include/gfcpp/DataOutput.hpp
index c8e87fe..6f4f1b4 100644
--- a/src/cppcache/include/gfcpp/DataOutput.hpp
+++ b/src/cppcache/include/gfcpp/DataOutput.hpp
@@ -33,7 +33,9 @@ extern "C" {
  * @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /**
  * C style memory allocation that throws OutOfMemoryException
@@ -812,6 +814,8 @@ class CPPCACHE_EXPORT DataOutput {
   DataOutput(const DataOutput&);
   DataOutput& operator=(const DataOutput&);
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // __GEMFIRE_DATAOUTPUT_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/Delta.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/Delta.hpp b/src/cppcache/include/gfcpp/Delta.hpp
index 62d3fe0..b53d3ad 100644
--- a/src/cppcache/include/gfcpp/Delta.hpp
+++ b/src/cppcache/include/gfcpp/Delta.hpp
@@ -25,7 +25,9 @@
 #include "Cacheable.hpp"
 #include "DataInput.hpp"
 #include "DataOutput.hpp"
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /**
  * This interface is used for delta propagation.
@@ -88,7 +90,8 @@ class Delta {
 
   virtual ~Delta() {}
 };
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif /* DELTA_HPP_ */

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/DiskPolicyType.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/DiskPolicyType.hpp b/src/cppcache/include/gfcpp/DiskPolicyType.hpp
index 14f1f3d..d343dac 100644
--- a/src/cppcache/include/gfcpp/DiskPolicyType.hpp
+++ b/src/cppcache/include/gfcpp/DiskPolicyType.hpp
@@ -22,7 +22,9 @@
  */
 #include "gfcpp_globals.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 /**
  * @class DiskPolicyType DiskPolicyType.hpp
  * Enumerated type for disk policy.
@@ -64,5 +66,7 @@ class CPPCACHE_EXPORT DiskPolicyType {
   DiskPolicyType(){};
   static const char* names[];
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif  // ifndef __GEMFIRE_DISKPOLICYTYPE_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/DistributedSystem.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/DistributedSystem.hpp b/src/cppcache/include/gfcpp/DistributedSystem.hpp
index ec44ca3..017ed16 100644
--- a/src/cppcache/include/gfcpp/DistributedSystem.hpp
+++ b/src/cppcache/include/gfcpp/DistributedSystem.hpp
@@ -27,7 +27,9 @@
 #include "Properties.hpp"
 #include "VectorT.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 /**
  * @class DistributedSystem DistributedSystem.hpp
  * DistributedSystem encapsulates this applications "connection" into the
@@ -117,7 +119,8 @@ class CPPCACHE_EXPORT DistributedSystem : public SharedBase {
   DistributedSystem(const DistributedSystem&);
   const DistributedSystem& operator=(const DistributedSystem&);
 };
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // ifndef __GEMFIRE_DISTRIBUTEDSYSTEM_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/EntryEvent.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/EntryEvent.hpp b/src/cppcache/include/gfcpp/EntryEvent.hpp
index 04318ae..5ae9b7d 100644
--- a/src/cppcache/include/gfcpp/EntryEvent.hpp
+++ b/src/cppcache/include/gfcpp/EntryEvent.hpp
@@ -25,11 +25,13 @@
 /** @file
 */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /** Represents an entry event affecting an entry, including its identity and the
  * the circumstances of the event. */
-class CPPCACHE_EXPORT EntryEvent : public gemfire::SharedBase {
+class CPPCACHE_EXPORT EntryEvent : public apache::geode::client::SharedBase {
  protected:
   RegionPtr m_region;      /**< Region */
   CacheableKeyPtr m_key;   /**< Cacheable key */
@@ -84,6 +86,8 @@ class CPPCACHE_EXPORT EntryEvent : public gemfire::SharedBase {
   EntryEvent(const EntryEvent& other);
   void operator=(const EntryEvent& other);
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/Exception.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/Exception.hpp b/src/cppcache/include/gfcpp/Exception.hpp
index 16e9788..1f064b5 100644
--- a/src/cppcache/include/gfcpp/Exception.hpp
+++ b/src/cppcache/include/gfcpp/Exception.hpp
@@ -24,7 +24,9 @@
 #include "gfcpp_globals.hpp"
 #include "gf_types.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 #define GF_EX_MSG_LIMIT 2048
 
@@ -116,7 +118,8 @@ class CPPCACHE_EXPORT Exception : public SharedBase {
 
   friend class DistributedSystem;
 };
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // ifndef __GEMFIRE_EXCEPTION_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/ExceptionTypes.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/ExceptionTypes.hpp b/src/cppcache/include/gfcpp/ExceptionTypes.hpp
index 456ad06..6e8c0b1 100644
--- a/src/cppcache/include/gfcpp/ExceptionTypes.hpp
+++ b/src/cppcache/include/gfcpp/ExceptionTypes.hpp
@@ -24,13 +24,15 @@
 #include "gfcpp_globals.hpp"
 #include "Exception.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 #define _GF_EXCEPTION_DEF(x)                                              \
-  const char _exception_name_##x[] = "gemfire::" #x;                      \
+  const char _exception_name_##x[] = "apache::geode::client::" #x;        \
   class x;                                                                \
   typedef SharedPtr<x> x##Ptr;                                            \
-  class CPPCACHE_EXPORT x : public gemfire::Exception {                   \
+  class CPPCACHE_EXPORT x : public apache::geode::client::Exception {     \
    public:                                                                \
     x(const char* msg1, const char* msg2 = NULL, bool forceStack = false, \
       const ExceptionPtr& cause = NULLPTR)                                \
@@ -54,7 +56,8 @@ namespace gemfire {
 
 /*
  *
- * This is the list of exceptions directly derived from gemfire::Exception.
+ * This is the list of exceptions directly derived from
+ * apache::geode::client::Exception.
  *
  */
 
@@ -400,6 +403,8 @@ extern void CPPCACHE_EXPORT GfErrTypeThrowException(const char* str,
       GfErrTypeThrowException(str, err); \
     }                                    \
   }
-};  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // ifndef __GEMFIRE_EXCEPTIONTYPES_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/Execution.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/Execution.hpp b/src/cppcache/include/gfcpp/Execution.hpp
index 0fe37c7..4c0b40e 100644
--- a/src/cppcache/include/gfcpp/Execution.hpp
+++ b/src/cppcache/include/gfcpp/Execution.hpp
@@ -34,7 +34,9 @@
  * @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 /**
  * @class Execution Execution.hpp
  * gathers results from function execution
@@ -105,5 +107,7 @@ class CPPCACHE_EXPORT Execution : public SharedBase {
                                      CacheablePtr& args, ResultCollectorPtr& rs,
                                      const char* func, uint32_t timeout) = 0;
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif  //__GEMFIRE_EXECUTION_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/ExpirationAction.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/ExpirationAction.hpp b/src/cppcache/include/gfcpp/ExpirationAction.hpp
index c4da937..e61e6cf 100644
--- a/src/cppcache/include/gfcpp/ExpirationAction.hpp
+++ b/src/cppcache/include/gfcpp/ExpirationAction.hpp
@@ -23,7 +23,9 @@
  * @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 /**
  * @class ExpirationAction ExpirationAction.hpp
  * Enumerated type for expiration actions.
@@ -105,5 +107,7 @@ class CPPCACHE_EXPORT ExpirationAction {
   ~ExpirationAction();
   static char* names[];
 };
-};      // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif  // ifndef __GEMFIRE_EXPIRATIONACTION_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/ExpirationAttributes.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/ExpirationAttributes.hpp b/src/cppcache/include/gfcpp/ExpirationAttributes.hpp
index 7537428..d0c52a0 100644
--- a/src/cppcache/include/gfcpp/ExpirationAttributes.hpp
+++ b/src/cppcache/include/gfcpp/ExpirationAttributes.hpp
@@ -24,7 +24,9 @@
  * @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 /**
  * @class ExpirationAttributes ExpirationAttributes.hpp
  *
@@ -91,5 +93,7 @@ class CPPCACHE_EXPORT ExpirationAttributes {
    * expires. */
   int m_timeout;
 };
-};      // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif  // ifndef __GEMFIRE_EXPIRATIONATTRIBUTES_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/FixedPartitionResolver.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/FixedPartitionResolver.hpp b/src/cppcache/include/gfcpp/FixedPartitionResolver.hpp
index 6c493c2..5bc4f08 100644
--- a/src/cppcache/include/gfcpp/FixedPartitionResolver.hpp
+++ b/src/cppcache/include/gfcpp/FixedPartitionResolver.hpp
@@ -20,7 +20,9 @@
 #include "PartitionResolver.hpp"
 #include "CacheableBuiltins.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class EntryEvent;
 
@@ -84,5 +86,7 @@ class CPPCACHE_EXPORT FixedPartitionResolver : public PartitionResolver {
   */
   virtual const char* getPartitionName(const EntryEvent& opDetails) = 0;
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/FunctionService.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/FunctionService.hpp b/src/cppcache/include/gfcpp/FunctionService.hpp
index 51d587f..515ad8c 100644
--- a/src/cppcache/include/gfcpp/FunctionService.hpp
+++ b/src/cppcache/include/gfcpp/FunctionService.hpp
@@ -32,12 +32,15 @@
  */
 
 // macros to resolve ambiguity between PoolPtr and RegionServicePtr
-#define GF_TYPE_IS_POOL(T) \
-  gemfire::TypeHelper::SuperSubclass<gemfire::Pool, T>::result
+#define GF_TYPE_IS_POOL(T)                          \
+  apache::geode::client::TypeHelper::SuperSubclass< \
+      apache::geode::client::Pool, T>::result
 #define GF_TYPE_IS_POOL_TYPE(T) \
-  gemfire::TypeHelper::YesNoType<GF_TYPE_IS_POOL(T)>::value
+  apache::geode::client::TypeHelper::YesNoType<GF_TYPE_IS_POOL(T)>::value
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 /**
  * @class FunctionService FunctionService.hpp
  * entry point for function execution
@@ -181,7 +184,8 @@ class CPPCACHE_EXPORT FunctionService : public SharedBase {
     return onServersWithCache(cache);
   }
 };
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  //__GEMFIRE_FUNCTION_SERVICE_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/GemFireCache.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/GemFireCache.hpp b/src/cppcache/include/gfcpp/GemFireCache.hpp
index b109921..0ad4e5b 100644
--- a/src/cppcache/include/gfcpp/GemFireCache.hpp
+++ b/src/cppcache/include/gfcpp/GemFireCache.hpp
@@ -25,7 +25,9 @@
  * @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /**
  * GemFireCache represents the singleton cache that must be created
@@ -74,6 +76,7 @@ class CPPCACHE_EXPORT GemFireCache : public RegionService {
   */
   virtual bool getPdxReadSerialized() = 0;
 };
-
-};      // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif  // ifndef __GEMFIRE_GEMFIRECACHE_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/GemfireTypeIds.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/GemfireTypeIds.hpp b/src/cppcache/include/gfcpp/GemfireTypeIds.hpp
index f59908b..c60f273 100644
--- a/src/cppcache/include/gfcpp/GemfireTypeIds.hpp
+++ b/src/cppcache/include/gfcpp/GemfireTypeIds.hpp
@@ -17,7 +17,9 @@
 #ifndef _GEMFIRE_GEMFIRETYPEIDS_HPP_
 #define _GEMFIRE_GEMFIRETYPEIDS_HPP_
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class GemfireTypeIds {
  public:
@@ -76,6 +78,8 @@ class GemfireTypeIds {
     CacheableEnum = 94
   };
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/HashFunction.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/HashFunction.hpp b/src/cppcache/include/gfcpp/HashFunction.hpp
index 751bc46..6654aa8 100644
--- a/src/cppcache/include/gfcpp/HashFunction.hpp
+++ b/src/cppcache/include/gfcpp/HashFunction.hpp
@@ -25,7 +25,9 @@
 /** @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /** typedef for the hash function used by the hashing schemes. */
 typedef int32_t (*Hasher)(const SharedBasePtr&);
@@ -70,6 +72,8 @@ template <typename TKEY>
 inline bool equalToFunction(const TKEY& x, const TKEY& y) {
   return (*x.ptr() == *y.ptr());
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/HashMapOfSharedBase.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/HashMapOfSharedBase.hpp b/src/cppcache/include/gfcpp/HashMapOfSharedBase.hpp
index 2fb348b..95671d6 100644
--- a/src/cppcache/include/gfcpp/HashMapOfSharedBase.hpp
+++ b/src/cppcache/include/gfcpp/HashMapOfSharedBase.hpp
@@ -28,7 +28,9 @@
 /** @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 #ifdef BUILD_CPPCACHE
 typedef std::unordered_map<SharedBasePtr, SharedBasePtr, HashSB, EqualToSB>
@@ -150,6 +152,8 @@ class CPPCACHE_EXPORT HashMapOfSharedBase {
   /** Destructor, sets all SharedPtr elements to NULLPTR. */
   ~HashMapOfSharedBase();
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/HashMapT.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/HashMapT.hpp b/src/cppcache/include/gfcpp/HashMapT.hpp
index 719e9d3..73dd73e 100644
--- a/src/cppcache/include/gfcpp/HashMapT.hpp
+++ b/src/cppcache/include/gfcpp/HashMapT.hpp
@@ -27,7 +27,9 @@
 /** @file
 */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /** HashMap of <code>TKEY</code> to <code>TVAL</code>. */
 template <typename TKEY, typename TVAL>
@@ -71,12 +73,12 @@ class HashMapT {
   };
 
   static int32_t hasher(const SharedBasePtr& p) {
-    return gemfire::hashFunction<TKEY>(staticCast<TKEY>(p));
+    return apache::geode::client::hashFunction<TKEY>(staticCast<TKEY>(p));
   }
 
   static bool equal_to(const SharedBasePtr& x, const SharedBasePtr& y) {
-    return gemfire::equalToFunction<TKEY>(staticCast<TKEY>(x),
-                                          staticCast<TKEY>(y));
+    return apache::geode::client::equalToFunction<TKEY>(staticCast<TKEY>(x),
+                                                        staticCast<TKEY>(y));
   }
 
   /** Returns the size of the hash map. */
@@ -213,6 +215,8 @@ class CPPCACHE_EXPORT HashMapOfException : public _HashMapOfException,
 
 typedef SharedPtr<HashMapOfCacheable> HashMapOfCacheablePtr;
 typedef SharedPtr<HashMapOfException> HashMapOfExceptionPtr;
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/HashSetOfSharedBase.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/HashSetOfSharedBase.hpp b/src/cppcache/include/gfcpp/HashSetOfSharedBase.hpp
index 7f93d2f..f44fcd4 100644
--- a/src/cppcache/include/gfcpp/HashSetOfSharedBase.hpp
+++ b/src/cppcache/include/gfcpp/HashSetOfSharedBase.hpp
@@ -28,7 +28,9 @@
 /** @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 #ifdef BUILD_CPPCACHE
 typedef std::unordered_set<SharedBasePtr, HashSB, EqualToSB> HSofSBP;
@@ -142,6 +144,8 @@ class CPPCACHE_EXPORT HashSetOfSharedBase {
   /** Destructor, sets all SharedPtr elements to NULLPTR. */
   ~HashSetOfSharedBase();
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/HashSetT.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/HashSetT.hpp b/src/cppcache/include/gfcpp/HashSetT.hpp
index dd3d134..fa8a51e 100644
--- a/src/cppcache/include/gfcpp/HashSetT.hpp
+++ b/src/cppcache/include/gfcpp/HashSetT.hpp
@@ -25,7 +25,9 @@
 /** @file
 */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /** HashSet of <code>TKEY</code>. */
 template <typename TKEY>
@@ -70,12 +72,12 @@ class HashSetT {
   };
 
   inline static int32_t hasher(const SharedBasePtr& p) {
-    return gemfire::hashFunction<TKEY>(staticCast<TKEY>(p));
+    return apache::geode::client::hashFunction<TKEY>(staticCast<TKEY>(p));
   }
 
   inline static bool equal_to(const SharedBasePtr& x, const SharedBasePtr& y) {
-    return gemfire::equalToFunction<TKEY>(staticCast<TKEY>(x),
-                                          staticCast<TKEY>(y));
+    return apache::geode::client::equalToFunction<TKEY>(staticCast<TKEY>(x),
+                                                        staticCast<TKEY>(y));
   }
 
   /** Returns the size of the hash set. */
@@ -169,6 +171,8 @@ class CPPCACHE_EXPORT HashSetOfCacheableKey : public _HashSetOfCacheableKey,
 };
 
 typedef SharedPtr<HashSetOfCacheableKey> HashSetOfCacheableKeyPtr;
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/InternalCacheTransactionManager2PC.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/InternalCacheTransactionManager2PC.hpp b/src/cppcache/include/gfcpp/InternalCacheTransactionManager2PC.hpp
index 01dc661..152ff34 100644
--- a/src/cppcache/include/gfcpp/InternalCacheTransactionManager2PC.hpp
+++ b/src/cppcache/include/gfcpp/InternalCacheTransactionManager2PC.hpp
@@ -20,17 +20,21 @@
 
 #include "CacheTransactionManager.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /**
- * Extension of the gemfire::CacheTransactionManager that enables client
+ * Extension of the apache::geode::client::CacheTransactionManager that enables
+ * client
  * application
  * to use Gemfire transaction as part of the global XA transaction.
  *
  * The prepare method of this class corresponds to the prepare phases of the
  * 2 phase commit protocol driven by a global transaction manager.
  *
- * The implementation of the gemfire::CacheTransactionManager commit() and
+ * The implementation of the apache::geode::client::CacheTransactionManager
+ * commit() and
  * rollback()
  * methods must be 2 phase commit process aware.
  *
@@ -43,7 +47,7 @@ namespace gemfire {
  *
  */
 class CPPCACHE_EXPORT InternalCacheTransactionManager2PC
-    : public virtual gemfire::CacheTransactionManager {
+    : public virtual apache::geode::client::CacheTransactionManager {
  public:
   /**
    * Performs prepare during 2 phase commit completion.
@@ -62,6 +66,8 @@ class CPPCACHE_EXPORT InternalCacheTransactionManager2PC
   InternalCacheTransactionManager2PC();
   virtual ~InternalCacheTransactionManager2PC();
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif /* INTERNALCACHETRANSACTIONMANAGER2PC_H_ */

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/Log.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/Log.hpp b/src/cppcache/include/gfcpp/Log.hpp
index c59905a..6948b47 100644
--- a/src/cppcache/include/gfcpp/Log.hpp
+++ b/src/cppcache/include/gfcpp/Log.hpp
@@ -49,7 +49,9 @@
 /** @file
 */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class Exception;
 
@@ -58,10 +60,10 @@ class Exception;
 
 /* Logs the message if the given level is less than or equal to the current
  * logging level. */
-#define GF_LOG(level, expr)               \
-  if (level > gemfire::Log::logLevel()) { \
-  } else                                  \
-    gemfire::Log::log(level, expr)
+#define GF_LOG(level, expr)                             \
+  if (level > apache::geode::client::Log::logLevel()) { \
+  } else                                                \
+    apache::geode::client::Log::log(level, expr)
 
 /** Defines methods available to clients that want to write a log message
   * to their GemFire system's shared log file.
@@ -603,53 +605,65 @@ class CPPCACHE_EXPORT LogVarargs {
   static void finer(const char* fmt, ...);
   static void finest(const char* fmt, ...);
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 /************************ LOGDEBUG ***********************************/
 
-#define LOGDEBUG                                       \
-  if (gemfire::Log::Debug <= gemfire::Log::logLevel()) \
-  gemfire::LogVarargs::debug
+#define LOGDEBUG                              \
+  if (apache::geode::client::Log::Debug <=    \
+      apache::geode::client::Log::logLevel()) \
+  apache::geode::client::LogVarargs::debug
 
 /************************ LOGERROR ***********************************/
 
-#define LOGERROR                                       \
-  if (gemfire::Log::Error <= gemfire::Log::logLevel()) \
-  gemfire::LogVarargs::error
+#define LOGERROR                              \
+  if (apache::geode::client::Log::Error <=    \
+      apache::geode::client::Log::logLevel()) \
+  apache::geode::client::LogVarargs::error
 
 /************************ LOGWARN ***********************************/
 
-#define LOGWARN                                          \
-  if (gemfire::Log::Warning <= gemfire::Log::logLevel()) \
-  gemfire::LogVarargs::warn
+#define LOGWARN                               \
+  if (apache::geode::client::Log::Warning <=  \
+      apache::geode::client::Log::logLevel()) \
+  apache::geode::client::LogVarargs::warn
 
 /************************ LOGINFO ***********************************/
 
-#define LOGINFO \
-  if (gemfire::Log::Info <= gemfire::Log::logLevel()) gemfire::LogVarargs::info
+#define LOGINFO                               \
+  if (apache::geode::client::Log::Info <=     \
+      apache::geode::client::Log::logLevel()) \
+  apache::geode::client::LogVarargs::info
 
 /************************ LOGCONFIG ***********************************/
 
-#define LOGCONFIG                                       \
-  if (gemfire::Log::Config <= gemfire::Log::logLevel()) \
-  gemfire::LogVarargs::config
+#define LOGCONFIG                             \
+  if (apache::geode::client::Log::Config <=   \
+      apache::geode::client::Log::logLevel()) \
+  apache::geode::client::LogVarargs::config
 
 /************************ LOGFINE ***********************************/
 
-#define LOGFINE \
-  if (gemfire::Log::Fine <= gemfire::Log::logLevel()) gemfire::LogVarargs::fine
+#define LOGFINE                               \
+  if (apache::geode::client::Log::Fine <=     \
+      apache::geode::client::Log::logLevel()) \
+  apache::geode::client::LogVarargs::fine
 
 /************************ LOGFINER ***********************************/
 
-#define LOGFINER                                       \
-  if (gemfire::Log::Finer <= gemfire::Log::logLevel()) \
-  gemfire::LogVarargs::finer
+#define LOGFINER                              \
+  if (apache::geode::client::Log::Finer <=    \
+      apache::geode::client::Log::logLevel()) \
+  apache::geode::client::LogVarargs::finer
 
 /************************ LOGFINEST ***********************************/
 
-#define LOGFINEST                                       \
-  if (gemfire::Log::Finest <= gemfire::Log::logLevel()) \
-  gemfire::LogVarargs::finest
+#define LOGFINEST                             \
+  if (apache::geode::client::Log::Finest <=   \
+      apache::geode::client::Log::logLevel()) \
+  apache::geode::client::LogVarargs::finest
 
 /******************************************************************************/
 

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/include/gfcpp/PartitionResolver.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/PartitionResolver.hpp b/src/cppcache/include/gfcpp/PartitionResolver.hpp
index 9804d0d..8e6eceb 100644
--- a/src/cppcache/include/gfcpp/PartitionResolver.hpp
+++ b/src/cppcache/include/gfcpp/PartitionResolver.hpp
@@ -21,7 +21,9 @@
 #include "Cacheable.hpp"
 #include <string>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class EntryEvent;
 
@@ -99,5 +101,7 @@ class CPPCACHE_EXPORT PartitionResolver : public SharedBase {
   PartitionResolver(const PartitionResolver& other);
   void operator=(const PartitionResolver& other);
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif


Mime
View raw message