GEODE-2316: Rename namespace gemfire to apache::geode::client.

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

Branch: refs/heads/next-gen-native-client-software-grant
Commit: e4fd74fbd69cea6d47798de7bd583de6ccd5004f
Parents: fd02a86
Author: Jacob Barrett <jbarr...@pivotal.io>
Authored: Wed Jan 18 14:22:48 2017 -0800
Committer: Jacob Barrett <jbarr...@pivotal.io>
Committed: Mon Jan 23 11:15:37 2017 -0800

----------------------------------------------------------------------
 examples/dist/cacheRunner/CacheRunner.hpp       |   2 +-
 examples/dist/cacheRunner/TestCacheCallback.hpp |   2 +-
 examples/dist/cacheRunner/TestCacheListener.hpp |   2 +-
 examples/dist/cacheRunner/TestCacheLoader.hpp   |   2 +-
 examples/dist/cacheRunner/TestCacheWriter.hpp   |   2 +-
 examples/dist/cqQuery/CqQuery.cpp               |   2 +-
 examples/dist/cqQuery/Updater.cpp               |   2 +-
 .../dist/executeFunction/ExecuteFunctions.cpp   |   2 +-
 examples/dist/userobjects/AccountHistory.cpp    |   2 +-
 examples/dist/userobjects/AccountHistory.hpp    |  10 +-
 examples/dist/userobjects/BankAccount.cpp       |   2 +-
 examples/dist/userobjects/BankAccount.hpp       |  18 +-
 examples/dist/userobjects/ExampleMain.cpp       |   2 +-
 src/clicache/src/AttributesFactory.cpp          |  60 +-
 src/clicache/src/AttributesFactory.hpp          |   4 +-
 src/clicache/src/AttributesMutator.cpp          |  26 +-
 src/clicache/src/AttributesMutator.hpp          |   6 +-
 src/clicache/src/Cache.cpp                      |  36 +-
 src/clicache/src/Cache.hpp                      |   6 +-
 src/clicache/src/CacheFactory.cpp               |  40 +-
 src/clicache/src/CacheFactory.hpp               |   6 +-
 src/clicache/src/CacheStatistics.hpp            |   6 +-
 src/clicache/src/CacheTransactionManager.cpp    |  34 +-
 src/clicache/src/CacheTransactionManager.hpp    |   6 +-
 src/clicache/src/CacheableBuiltins.hpp          |  40 +-
 src/clicache/src/CacheableFileName.cpp          |   6 +-
 src/clicache/src/CacheableHashSet.hpp           |  26 +-
 src/clicache/src/CacheableKey.cpp               |  10 +-
 src/clicache/src/CacheableKey.hpp               |  10 +-
 src/clicache/src/CacheableObjectArray.cpp       |  16 +-
 src/clicache/src/CacheableString.cpp            |  16 +-
 src/clicache/src/CacheableString.hpp            |  20 +-
 src/clicache/src/CacheableStringArray.hpp       |   6 +-
 src/clicache/src/CqAttributes.cpp               |  12 +-
 src/clicache/src/CqAttributes.hpp               |   6 +-
 src/clicache/src/CqAttributesFactory.cpp        |  22 +-
 src/clicache/src/CqAttributesFactory.hpp        |   6 +-
 src/clicache/src/CqAttributesMutator.cpp        |  34 +-
 src/clicache/src/CqAttributesMutator.hpp        |   6 +-
 src/clicache/src/CqEvent.cpp                    |   8 +-
 src/clicache/src/CqEvent.hpp                    |   6 +-
 src/clicache/src/CqListener.hpp                 |  10 +-
 src/clicache/src/CqOperation.hpp                |  20 +-
 src/clicache/src/CqQuery.cpp                    |  16 +-
 src/clicache/src/CqQuery.hpp                    |   6 +-
 src/clicache/src/CqServiceStatistics.hpp        |   6 +-
 src/clicache/src/CqState.cpp                    |  20 +-
 src/clicache/src/CqState.hpp                    |   4 +-
 src/clicache/src/CqStatistics.hpp               |   6 +-
 src/clicache/src/DataInput.cpp                  |  68 +-
 src/clicache/src/DataInput.hpp                  |   6 +-
 src/clicache/src/DataOutput.cpp                 |  66 +-
 src/clicache/src/DataOutput.hpp                 |   8 +-
 src/clicache/src/DistributedSystem.cpp          | 382 +++++------
 src/clicache/src/DistributedSystem.hpp          |   8 +-
 src/clicache/src/EntryEvent.cpp                 |  22 +-
 src/clicache/src/EntryEvent.hpp                 |   8 +-
 src/clicache/src/ExceptionTypes.cpp             |   8 +-
 src/clicache/src/ExceptionTypes.hpp             |  40 +-
 src/clicache/src/Execution.cpp                  |  12 +-
 src/clicache/src/Execution.hpp                  |   6 +-
 src/clicache/src/FunctionService.cpp            |  28 +-
 src/clicache/src/FunctionService.hpp            |   4 +-
 src/clicache/src/GemFireClassIds.hpp            |  82 +--
 src/clicache/src/LocalRegion.cpp                | 144 ++---
 src/clicache/src/LocalRegion.hpp                |  10 +-
 src/clicache/src/Log.cpp                        |  20 +-
 src/clicache/src/Pool.cpp                       |   4 +-
 src/clicache/src/Pool.hpp                       |   6 +-
 src/clicache/src/PoolFactory.cpp                |   2 +-
 src/clicache/src/PoolFactory.hpp                |   6 +-
 src/clicache/src/PoolManager.cpp                |  16 +-
 src/clicache/src/Properties.cpp                 | 134 ++--
 src/clicache/src/Properties.hpp                 |  18 +-
 src/clicache/src/Query.cpp                      |  16 +-
 src/clicache/src/Query.hpp                      |   6 +-
 src/clicache/src/QueryService.cpp               |  26 +-
 src/clicache/src/QueryService.hpp               |   6 +-
 src/clicache/src/Region.cpp                     | 216 +++----
 src/clicache/src/Region.hpp                     |  14 +-
 src/clicache/src/RegionAttributes.cpp           |  46 +-
 src/clicache/src/RegionAttributes.hpp           |   6 +-
 src/clicache/src/RegionEntry.cpp                |   8 +-
 src/clicache/src/RegionEntry.hpp                |   6 +-
 src/clicache/src/RegionEvent.cpp                |   8 +-
 src/clicache/src/RegionEvent.hpp                |   8 +-
 src/clicache/src/RegionFactory.cpp              |  54 +-
 src/clicache/src/RegionFactory.hpp              |   8 +-
 src/clicache/src/ResultCollector.cpp            |   8 +-
 src/clicache/src/ResultCollector.hpp            |   8 +-
 src/clicache/src/ResultSet.cpp                  |   4 +-
 src/clicache/src/ResultSet.hpp                  |   6 +-
 src/clicache/src/SelectResultsIterator.hpp      |   6 +-
 src/clicache/src/Serializable.cpp               | 382 +++++------
 src/clicache/src/Serializable.hpp               | 150 ++---
 src/clicache/src/Struct.cpp                     |  18 +-
 src/clicache/src/Struct.hpp                     |   6 +-
 src/clicache/src/StructSet.cpp                  |   4 +-
 src/clicache/src/StructSet.hpp                  |   6 +-
 src/clicache/src/SystemProperties.cpp           |  10 +-
 src/clicache/src/SystemProperties.hpp           |   6 +-
 src/clicache/src/TransactionEvent.cpp           |   8 +-
 src/clicache/src/TransactionEvent.hpp           |   4 +-
 src/clicache/src/TransactionId.hpp              |   6 +-
 .../src/UserFunctionExecutionException.cpp      |   4 +-
 .../src/UserFunctionExecutionException.hpp      |   4 +-
 src/clicache/src/Utils.cpp                      |   2 +-
 src/clicache/src/impl/AppDomainContext.cpp      |   2 +-
 src/clicache/src/impl/AppDomainContext.hpp      |   4 +-
 src/clicache/src/impl/AuthenticatedCache.cpp    |   6 +-
 src/clicache/src/impl/AuthenticatedCache.hpp    |   6 +-
 src/clicache/src/impl/CacheListener.hpp         |  20 +-
 src/clicache/src/impl/CacheLoader.hpp           |  12 +-
 src/clicache/src/impl/CacheWriter.hpp           |  12 +-
 src/clicache/src/impl/CqListenerProxy.hpp       |   4 +-
 src/clicache/src/impl/CqStatusListenerProxy.hpp |   4 +-
 src/clicache/src/impl/DelegateWrapper.hpp       |  20 +-
 .../src/impl/FixedPartitionResolver.hpp         |  10 +-
 src/clicache/src/impl/ManagedAuthInitialize.cpp | 314 ++++-----
 src/clicache/src/impl/ManagedAuthInitialize.hpp | 169 ++---
 src/clicache/src/impl/ManagedCacheListener.cpp  | 588 ++++++++---------
 src/clicache/src/impl/ManagedCacheListener.hpp  | 406 ++++++------
 src/clicache/src/impl/ManagedCacheLoader.cpp    | 402 ++++++------
 src/clicache/src/impl/ManagedCacheLoader.hpp    | 248 +++----
 src/clicache/src/impl/ManagedCacheWriter.cpp    | 499 +++++++-------
 src/clicache/src/impl/ManagedCacheWriter.hpp    | 312 ++++-----
 src/clicache/src/impl/ManagedCacheableDelta.cpp | 444 ++++++-------
 src/clicache/src/impl/ManagedCacheableDelta.hpp | 274 ++++----
 .../src/impl/ManagedCacheableDeltaBytes.cpp     | 542 ++++++++--------
 .../src/impl/ManagedCacheableDeltaBytes.hpp     | 369 +++++------
 src/clicache/src/impl/ManagedCacheableKey.cpp   | 422 ++++++------
 src/clicache/src/impl/ManagedCacheableKey.hpp   | 262 ++++----
 .../src/impl/ManagedCacheableKeyBytes.cpp       | 446 ++++++-------
 .../src/impl/ManagedCacheableKeyBytes.hpp       | 302 ++++-----
 src/clicache/src/impl/ManagedCqListener.cpp     | 259 ++++----
 src/clicache/src/impl/ManagedCqListener.hpp     | 210 +++---
 .../src/impl/ManagedCqStatusListener.cpp        | 324 +++++-----
 .../src/impl/ManagedCqStatusListener.hpp        | 224 +++----
 .../src/impl/ManagedFixedPartitionResolver.cpp  | 389 +++++------
 .../src/impl/ManagedFixedPartitionResolver.hpp  | 234 +++----
 .../src/impl/ManagedPartitionResolver.cpp       | 371 +++++------
 .../src/impl/ManagedPartitionResolver.hpp       | 210 +++---
 .../src/impl/ManagedPersistenceManager.cpp      | 364 +++++------
 .../src/impl/ManagedPersistenceManager.hpp      |  88 +--
 .../src/impl/ManagedResultCollector.cpp         | 338 +++++-----
 .../src/impl/ManagedResultCollector.hpp         | 136 ++--
 .../src/impl/ManagedTransactionListener.cpp     | 387 +++++------
 .../src/impl/ManagedTransactionListener.hpp     | 128 ++--
 .../src/impl/ManagedTransactionWriter.cpp       | 315 ++++-----
 .../src/impl/ManagedTransactionWriter.hpp       | 116 ++--
 src/clicache/src/impl/ManagedVisitor.cpp        |  40 +-
 src/clicache/src/impl/ManagedVisitor.hpp        |  85 +--
 src/clicache/src/impl/PartitionResolver.hpp     |   4 +-
 src/clicache/src/impl/PdxFieldType.cpp          |   2 +-
 src/clicache/src/impl/PdxInstanceImpl.cpp       |   8 +-
 src/clicache/src/impl/PdxInstanceImpl.hpp       |   4 +-
 .../src/impl/PdxManagedCacheableKey.cpp         | 494 +++++++-------
 .../src/impl/PdxManagedCacheableKey.hpp         | 292 ++++-----
 .../src/impl/PdxManagedCacheableKeyBytes.cpp    | 642 ++++++++++---------
 .../src/impl/PdxManagedCacheableKeyBytes.hpp    |  31 +-
 .../src/impl/PdxReaderWithTypeCollector.cpp     |   4 +-
 .../src/impl/PdxWriterWithTypeCollector.cpp     |   2 +-
 src/clicache/src/impl/ResultCollectorProxy.hpp  |   2 +-
 src/clicache/src/impl/SafeConvert.hpp           | 126 ++--
 src/clicache/src/impl/TransactionListener.hpp   |   6 +-
 src/clicache/src/impl/TransactionWriter.hpp     |   2 +-
 src/cppcache/include/gfcpp/Assert.hpp           |  17 +-
 .../include/gfcpp/AttributesFactory.hpp         |   8 +-
 .../include/gfcpp/AttributesMutator.hpp         |   9 +-
 src/cppcache/include/gfcpp/AuthInitialize.hpp   |  12 +-
 src/cppcache/include/gfcpp/Cache.hpp            |   9 +-
 src/cppcache/include/gfcpp/CacheAttributes.hpp  |   9 +-
 src/cppcache/include/gfcpp/CacheFactory.hpp     |   8 +-
 src/cppcache/include/gfcpp/CacheListener.hpp    |   9 +-
 src/cppcache/include/gfcpp/CacheLoader.hpp      |   9 +-
 src/cppcache/include/gfcpp/CacheStatistics.hpp  |   9 +-
 .../include/gfcpp/CacheTransactionManager.hpp   |  11 +-
 src/cppcache/include/gfcpp/CacheWriter.hpp      |   9 +-
 src/cppcache/include/gfcpp/Cacheable.hpp        |   9 +-
 src/cppcache/include/gfcpp/Cacheable.inl        |   8 +-
 .../include/gfcpp/CacheableBuiltins.hpp         |  36 +-
 src/cppcache/include/gfcpp/CacheableDate.hpp    |   8 +-
 src/cppcache/include/gfcpp/CacheableEnum.hpp    |   8 +-
 .../include/gfcpp/CacheableFileName.hpp         |   8 +-
 src/cppcache/include/gfcpp/CacheableKey.hpp     |  13 +-
 src/cppcache/include/gfcpp/CacheableKey.inl     |   9 +-
 src/cppcache/include/gfcpp/CacheableKeys.hpp    |   8 +-
 .../include/gfcpp/CacheableObjectArray.hpp      |   8 +-
 src/cppcache/include/gfcpp/CacheableString.hpp  |  16 +-
 .../include/gfcpp/CacheableUndefined.hpp        |   8 +-
 src/cppcache/include/gfcpp/CqAttributes.hpp     |   9 +-
 .../include/gfcpp/CqAttributesFactory.hpp       |   9 +-
 .../include/gfcpp/CqAttributesMutator.hpp       |   9 +-
 src/cppcache/include/gfcpp/CqEvent.hpp          |   8 +-
 src/cppcache/include/gfcpp/CqListener.hpp       |   8 +-
 src/cppcache/include/gfcpp/CqOperation.hpp      |   8 +-
 src/cppcache/include/gfcpp/CqQuery.hpp          |   9 +-
 src/cppcache/include/gfcpp/CqResults.hpp        |   9 +-
 .../include/gfcpp/CqServiceStatistics.hpp       |   9 +-
 src/cppcache/include/gfcpp/CqState.hpp          |   9 +-
 src/cppcache/include/gfcpp/CqStatistics.hpp     |   9 +-
 src/cppcache/include/gfcpp/CqStatusListener.hpp |   9 +-
 src/cppcache/include/gfcpp/DataInput.hpp        |  20 +-
 src/cppcache/include/gfcpp/DataOutput.hpp       |   8 +-
 src/cppcache/include/gfcpp/Delta.hpp            |   9 +-
 src/cppcache/include/gfcpp/DiskPolicyType.hpp   |   8 +-
 .../include/gfcpp/DistributedSystem.hpp         |   9 +-
 src/cppcache/include/gfcpp/EntryEvent.hpp       |  10 +-
 src/cppcache/include/gfcpp/Exception.hpp        |   9 +-
 src/cppcache/include/gfcpp/ExceptionTypes.hpp   |  15 +-
 src/cppcache/include/gfcpp/Execution.hpp        |   8 +-
 src/cppcache/include/gfcpp/ExpirationAction.hpp |   8 +-
 .../include/gfcpp/ExpirationAttributes.hpp      |   8 +-
 .../include/gfcpp/FixedPartitionResolver.hpp    |   8 +-
 src/cppcache/include/gfcpp/FunctionService.hpp  |  16 +-
 src/cppcache/include/gfcpp/GemFireCache.hpp     |   9 +-
 src/cppcache/include/gfcpp/GemfireTypeIds.hpp   |   8 +-
 src/cppcache/include/gfcpp/HashFunction.hpp     |   8 +-
 .../include/gfcpp/HashMapOfSharedBase.hpp       |   8 +-
 src/cppcache/include/gfcpp/HashMapT.hpp         |  14 +-
 .../include/gfcpp/HashSetOfSharedBase.hpp       |   8 +-
 src/cppcache/include/gfcpp/HashSetT.hpp         |  14 +-
 .../InternalCacheTransactionManager2PC.hpp      |  16 +-
 src/cppcache/include/gfcpp/Log.hpp              |  70 +-
 .../include/gfcpp/PartitionResolver.hpp         |   8 +-
 .../include/gfcpp/PdxAutoSerializer.hpp         | 289 +++++----
 src/cppcache/include/gfcpp/PdxFieldTypes.hpp    |   8 +-
 src/cppcache/include/gfcpp/PdxInstance.hpp      |   8 +-
 .../include/gfcpp/PdxInstanceFactory.hpp        |   8 +-
 src/cppcache/include/gfcpp/PdxReader.hpp        |   8 +-
 src/cppcache/include/gfcpp/PdxSerializable.hpp  |   8 +-
 src/cppcache/include/gfcpp/PdxSerializer.hpp    |   8 +-
 src/cppcache/include/gfcpp/PdxUnreadFields.hpp  |   8 +-
 src/cppcache/include/gfcpp/PdxWrapper.hpp       |   8 +-
 src/cppcache/include/gfcpp/PdxWriter.hpp        |   8 +-
 .../include/gfcpp/PersistenceManager.hpp        |   9 +-
 src/cppcache/include/gfcpp/Pool.hpp             |   8 +-
 src/cppcache/include/gfcpp/PoolFactory.hpp      |   8 +-
 src/cppcache/include/gfcpp/PoolManager.hpp      |   8 +-
 src/cppcache/include/gfcpp/Properties.hpp       |   9 +-
 src/cppcache/include/gfcpp/Query.hpp            |   9 +-
 src/cppcache/include/gfcpp/QueryService.hpp     |   9 +-
 src/cppcache/include/gfcpp/Region.hpp           |   9 +-
 src/cppcache/include/gfcpp/RegionAttributes.hpp |   9 +-
 src/cppcache/include/gfcpp/RegionEntry.hpp      |   9 +-
 src/cppcache/include/gfcpp/RegionEvent.hpp      |   8 +-
 src/cppcache/include/gfcpp/RegionFactory.hpp    |  10 +-
 src/cppcache/include/gfcpp/RegionService.hpp    |   9 +-
 src/cppcache/include/gfcpp/RegionShortcut.hpp   |   9 +-
 src/cppcache/include/gfcpp/ResultCollector.hpp  |   9 +-
 src/cppcache/include/gfcpp/ResultSet.hpp        |   9 +-
 src/cppcache/include/gfcpp/SelectResults.hpp    |   9 +-
 .../include/gfcpp/SelectResultsIterator.hpp     |   9 +-
 src/cppcache/include/gfcpp/Serializable.hpp     |  13 +-
 src/cppcache/include/gfcpp/Serializer.hpp       | 164 +++--
 src/cppcache/include/gfcpp/SharedBase.hpp       |  10 +-
 src/cppcache/include/gfcpp/SharedPtr.hpp        |  17 +-
 src/cppcache/include/gfcpp/SharedPtrHelper.hpp  |  14 +-
 src/cppcache/include/gfcpp/Struct.hpp           |   9 +-
 src/cppcache/include/gfcpp/StructSet.hpp        |   9 +-
 src/cppcache/include/gfcpp/SystemProperties.hpp |   9 +-
 src/cppcache/include/gfcpp/TransactionId.hpp    |  10 +-
 src/cppcache/include/gfcpp/TypeHelper.hpp       |  30 +-
 src/cppcache/include/gfcpp/UserData.hpp         |   8 +-
 .../gfcpp/UserFunctionExecutionException.hpp    |   8 +-
 .../include/gfcpp/VectorOfSharedBase.hpp        |  12 +-
 src/cppcache/include/gfcpp/VectorT.hpp          |   8 +-
 .../include/gfcpp/WritablePdxInstance.hpp       |   8 +-
 src/cppcache/include/gfcpp/gf_base.hpp          |  13 +-
 src/cppcache/include/gfcpp/gf_types.hpp         |   9 +-
 src/cppcache/include/gfcpp/gfcpp_globals.hpp    |   9 +-
 .../gfcpp/statistics/StatisticDescriptor.hpp    |   2 +-
 .../include/gfcpp/statistics/StatisticsType.hpp |   2 +-
 .../integration-test/BBNamingContext.cpp        |   2 +-
 .../BuiltinCacheableWrappers.hpp                |   6 +-
 src/cppcache/integration-test/CacheHelper.cpp   |   2 +-
 src/cppcache/integration-test/CacheHelper.hpp   |   2 +-
 .../integration-test/CacheImplHelper.hpp        |   2 +-
 .../integration-test/CacheableWrapper.hpp       |   2 +-
 .../integration-test/LibraryCallbacks.cpp       |   6 +-
 src/cppcache/integration-test/QueryHelper.hpp   |   2 +-
 src/cppcache/integration-test/TallyListener.hpp |   4 +-
 src/cppcache/integration-test/TallyLoader.hpp   |   4 +-
 src/cppcache/integration-test/TallyWriter.hpp   |   4 +-
 .../integration-test/ThinClientDistOps.hpp      |   2 +-
 .../integration-test/ThinClientDistOps2.hpp     |   2 +-
 .../integration-test/ThinClientDurable.hpp      |  18 +-
 .../ThinClientDurableFailover.hpp               |  12 +-
 .../ThinClientDurableInterest.hpp               |  12 +-
 .../integration-test/ThinClientFailover.hpp     |   2 +-
 .../integration-test/ThinClientFailover2.hpp    |   2 +-
 .../integration-test/ThinClientFailover3.hpp    |   2 +-
 .../ThinClientFailoverInterest.hpp              |   2 +-
 .../ThinClientFailoverInterest2.hpp             |   2 +-
 .../ThinClientFailoverInterestAllWithCache.hpp  |   2 +-
 .../ThinClientFailoverRegex.hpp                 |   2 +-
 .../integration-test/ThinClientGatewayTest.hpp  |   4 +-
 .../integration-test/ThinClientHeapLRU.hpp      |   2 +-
 .../integration-test/ThinClientHelper.hpp       |   2 +-
 .../integration-test/ThinClientInterest1.hpp    |   2 +-
 .../integration-test/ThinClientInterest2.hpp    |   2 +-
 .../integration-test/ThinClientInterest3.hpp    |   2 +-
 .../ThinClientInterest3Cacheless.hpp            |   2 +-
 .../integration-test/ThinClientInterestList.hpp |   2 +-
 .../ThinClientInterestList2.hpp                 |   2 +-
 .../integration-test/ThinClientListenerInit.hpp |   2 +-
 .../ThinClientListenerWriter.hpp                |   3 +-
 .../ThinClientLocalCacheLoader.hpp              |   2 +-
 .../integration-test/ThinClientNotification.hpp |   2 +-
 .../ThinClientPdxSerializer.hpp                 |   2 +-
 .../integration-test/ThinClientPutAll.hpp       |   2 +-
 .../ThinClientPutAllTimeout.hpp                 |   2 +-
 .../ThinClientPutAllWithCallBack.hpp            |   2 +-
 .../integration-test/ThinClientPutGetAll.hpp    |   2 +-
 .../ThinClientRIwithlocalRegionDestroy.hpp      |   2 +-
 .../integration-test/ThinClientRegex.hpp        |   2 +-
 .../integration-test/ThinClientRegex2.hpp       |   2 +-
 .../integration-test/ThinClientRegex3.hpp       |   2 +-
 .../integration-test/ThinClientRemoveAll.hpp    |   2 +-
 src/cppcache/integration-test/ThinClientSSL.hpp |   2 +-
 .../ThinClientSSLWithPassword.hpp               |   2 +-
 .../ThinClientSecurityHelper.hpp                |  28 +-
 .../integration-test/ThinClientTXFailover.hpp   |   2 +-
 .../integration-test/ThinClientTransactions.hpp |   2 +-
 .../ThinClientTransactionsXA.hpp                |   2 +-
 src/cppcache/integration-test/fw_dunit.cpp      |  10 +-
 src/cppcache/integration-test/fw_dunit.hpp      | 139 ++--
 src/cppcache/integration-test/fw_helper.hpp     |   9 +-
 src/cppcache/integration-test/fw_perf.hpp       |   4 +-
 .../integration-test/testAttributesFactory.cpp  |   2 +-
 .../integration-test/testAttributesMutator.cpp  |   2 +-
 src/cppcache/integration-test/testCache.cpp     |   2 +-
 src/cppcache/integration-test/testCacheless.cpp |   2 +-
 src/cppcache/integration-test/testConnect.cpp   |   2 +-
 .../testCreateAndDestroyPool.cpp                |   2 +-
 .../integration-test/testDataOutput.cpp         |   2 +-
 .../integration-test/testEntriesMap.cpp         |   2 +-
 .../testEntriesMapForVersioning.cpp             |   2 +-
 .../integration-test/testExpiration.cpp         |   2 +-
 src/cppcache/integration-test/testLRUList.cpp   |   2 +-
 src/cppcache/integration-test/testLinkage.cpp   |   2 +-
 src/cppcache/integration-test/testLogger.cpp    |   2 +-
 .../testOverflowPutGetSqLite.cpp                |   9 +-
 .../testRegionAccessThreadSafe.cpp              |   2 +-
 src/cppcache/integration-test/testRegionMap.cpp |   2 +-
 .../integration-test/testRegionTemplateArgs.cpp |   2 +-
 .../integration-test/testSerialization.cpp      |   4 +-
 src/cppcache/integration-test/testSharedPtr.cpp |   2 +-
 src/cppcache/integration-test/testSpinLock.cpp  |  26 +-
 .../integration-test/testSystemProperties.cpp   |   2 +-
 .../testThinClientAfterRegionLive.cpp           |   2 +-
 .../integration-test/testThinClientBigValue.cpp |   2 +-
 .../testThinClientCacheableStringArray.cpp      |   2 +-
 .../testThinClientCacheables.cpp                |   2 +-
 .../testThinClientCacheablesLimits.cpp          |   2 +-
 .../testThinClientClearRegion.cpp               |   2 +-
 .../testThinClientConflation.cpp                |   8 +-
 .../testThinClientContainsKeyOnServer.cpp       |   2 +-
 .../integration-test/testThinClientCq.cpp       |   2 +-
 .../integration-test/testThinClientCqDelta.cpp  |   2 +-
 .../testThinClientCqDurable.cpp                 |  10 +-
 .../testThinClientCqFailover.cpp                |   2 +-
 .../testThinClientCqHAFailover.cpp              |   2 +-
 .../integration-test/testThinClientCqIR.cpp     |   2 +-
 .../testThinClientDeltaWithNotification.cpp     |   2 +-
 .../testThinClientDisconnectionListioner.cpp    |   2 +-
 .../testThinClientFixedPartitionResolver.cpp    |   2 +-
 .../testThinClientGetInterests.cpp              |   2 +-
 .../testThinClientHADistOps.cpp                 |   2 +-
 .../testThinClientHAEventIDMap.cpp              |  21 +-
 .../testThinClientHAFailover.cpp                |   2 +-
 .../testThinClientHAFailoverRegex.cpp           |   2 +-
 .../testThinClientHAMixedRedundancy.cpp         |   2 +-
 .../testThinClientHAPeriodicAck.cpp             |  18 +-
 .../testThinClientHAQueryFailover.cpp           |   2 +-
 .../integration-test/testThinClientHeapLRU.cpp  |   2 +-
 .../testThinClientIntResPolKeysInv.cpp          |   2 +-
 .../testThinClientInterest1Cacheless.cpp        |   4 +-
 .../testThinClientInterest1_Bug1001.cpp         |   2 +-
 .../testThinClientLRUExpiration.cpp             |   2 +-
 .../testThinClientListenerCallbackArgTest.cpp   |   6 +-
 .../testThinClientListenerEvents.cpp            |   9 +-
 ...nClientNotificationWithDeltaWithoutcache.cpp |   2 +-
 .../testThinClientPRPutAllFailover.cpp          |   2 +-
 .../testThinClientPRSingleHop.cpp               |   2 +-
 .../testThinClientPRSingleHopServerGroup.cpp    |   2 +-
 .../testThinClientPartitionResolver.cpp         |   2 +-
 .../testThinClientPdxDeltaWithNotification.cpp  |   2 +-
 .../integration-test/testThinClientPdxEnum.cpp  |   4 +-
 .../testThinClientPdxInstance.cpp               |  32 +-
 .../integration-test/testThinClientPdxTests.cpp |   2 +-
 .../testThinClientPdxTestsAuto.cpp              |   2 +-
 .../testThinClientPdxTestsWithAuto.cpp          |   2 +-
 .../testThinClientPoolExecuteHAFunction.cpp     |   2 +-
 ...estThinClientPoolExecuteHAFunctionPrSHOP.cpp |   2 +-
 .../testThinClientPoolServer.cpp                |   4 +-
 .../testThinClientPutAllPRSingleHop.cpp         |   2 +-
 .../testThinClientPutWithDelta.cpp              |   2 +-
 ...nClientRegionQueryDifferentServerConfigs.cpp |   2 +-
 .../testThinClientRegionQueryExclusiveness.cpp  |   2 +-
 .../testThinClientRemoteQueryFailover.cpp       |   2 +-
 .../testThinClientRemoteQueryFailoverPdx.cpp    |   2 +-
 .../testThinClientRemoteQueryRS.cpp             |   4 +-
 .../testThinClientRemoteQuerySS.cpp             |   4 +-
 .../testThinClientRemoteQueryTimeout.cpp        |   2 +-
 .../testThinClientRemoteRegionQuery.cpp         |  22 +-
 .../testThinClientRemoveOps.cpp                 |   2 +-
 .../testThinClientSSLWithSecurityAuthz.cpp      |  38 +-
 .../testThinClientSecurityAuthentication.cpp    |  39 +-
 .../testThinClientSecurityAuthenticationMU.cpp  |  41 +-
 .../testThinClientSecurityAuthorization.cpp     |  44 +-
 .../testThinClientSecurityAuthorizationMU.cpp   |  42 +-
 .../testThinClientSecurityCQAuthorization.cpp   |   4 +-
 .../testThinClientSecurityCQAuthorizationMU.cpp |   4 +-
 .../testThinClientSecurityDH.cpp                |  14 +-
 .../testThinClientSecurityDH_MU.cpp             |  14 +-
 ...inClientSecurityDurableCQAuthorizationMU.cpp |   4 +-
 .../testThinClientSecurityMultiUserTest.cpp     |  46 +-
 .../testThinClientSecurityPostAuthorization.cpp |  36 +-
 .../testThinClientWriterException.cpp           |  28 +-
 src/cppcache/integration-test/testUtils.hpp     |   2 +-
 .../testXmlCacheCreationWithOverFlow.cpp        |   2 +-
 .../testXmlCacheCreationWithPools.cpp           |   2 +-
 .../testXmlCacheCreationWithRefid.cpp           |   2 +-
 src/cppcache/src/ACEDummy.cpp                   |   8 +-
 src/cppcache/src/AdminRegion.cpp                |   2 +-
 src/cppcache/src/AdminRegion.hpp                |  14 +-
 src/cppcache/src/AppDomainContext.cpp           |   8 +-
 src/cppcache/src/AppDomainContext.hpp           |   8 +-
 src/cppcache/src/Assert.cpp                     |   8 +-
 src/cppcache/src/AtomicInc.hpp                  |   8 +-
 src/cppcache/src/AttributesFactory.cpp          |  10 +-
 src/cppcache/src/AttributesMutator.cpp          |   8 +-
 src/cppcache/src/AutoDelete.hpp                 |   8 +-
 src/cppcache/src/BucketServerLocation.hpp       |  12 +-
 src/cppcache/src/Cache.cpp                      |   6 +-
 src/cppcache/src/CacheAttributes.cpp            |   2 +-
 src/cppcache/src/CacheConfig.cpp                |   8 +-
 src/cppcache/src/CacheConfig.hpp                |   8 +-
 src/cppcache/src/CacheFactory.cpp               |  15 +-
 src/cppcache/src/CacheImpl.cpp                  |   2 +-
 src/cppcache/src/CacheImpl.hpp                  |  11 +-
 src/cppcache/src/CacheListener.cpp              |   8 +-
 src/cppcache/src/CacheLoader.cpp                |   2 +-
 src/cppcache/src/CachePerfStats.hpp             |   8 +-
 src/cppcache/src/CacheRegionHelper.hpp          |   8 +-
 src/cppcache/src/CacheStatistics.cpp            |   2 +-
 src/cppcache/src/CacheTransactionManager.cpp    |   8 +-
 .../src/CacheTransactionManagerImpl.cpp         |   8 +-
 .../src/CacheTransactionManagerImpl.hpp         |  10 +-
 src/cppcache/src/CacheWriter.cpp                |   8 +-
 src/cppcache/src/CacheXml.cpp                   |   2 +-
 src/cppcache/src/CacheXml.hpp                   |   9 +-
 src/cppcache/src/CacheXmlCreation.cpp           |   2 +-
 src/cppcache/src/CacheXmlCreation.hpp           |   8 +-
 src/cppcache/src/CacheXmlParser.cpp             |   8 +-
 src/cppcache/src/CacheXmlParser.hpp             |   9 +-
 src/cppcache/src/CacheableBuiltins.cpp          |   8 +-
 src/cppcache/src/CacheableDate.cpp              |   8 +-
 src/cppcache/src/CacheableEnum.cpp              |  12 +-
 src/cppcache/src/CacheableFileName.cpp          |   8 +-
 src/cppcache/src/CacheableKey.cpp               |   8 +-
 src/cppcache/src/CacheableObjectArray.cpp       |   8 +-
 src/cppcache/src/CacheableObjectPartList.cpp    |   8 +-
 src/cppcache/src/CacheableObjectPartList.hpp    |   8 +-
 src/cppcache/src/CacheableString.cpp            |   2 +-
 src/cppcache/src/CacheableToken.cpp             |   2 +-
 src/cppcache/src/CacheableToken.hpp             |   8 +-
 src/cppcache/src/CacheableUndefined.cpp         |   8 +-
 src/cppcache/src/CachedDeserializableHelper.hpp |   9 +-
 src/cppcache/src/ClientConnectionRequest.cpp    |   2 +-
 src/cppcache/src/ClientConnectionRequest.hpp    |   8 +-
 src/cppcache/src/ClientConnectionResponse.cpp   |   2 +-
 src/cppcache/src/ClientConnectionResponse.hpp   |   8 +-
 src/cppcache/src/ClientHealthStats.cpp          |   8 +-
 src/cppcache/src/ClientHealthStats.hpp          |   9 +-
 src/cppcache/src/ClientMetadata.cpp             |   8 +-
 src/cppcache/src/ClientMetadata.hpp             |   8 +-
 src/cppcache/src/ClientMetadataService.cpp      |   8 +-
 src/cppcache/src/ClientMetadataService.hpp      |  14 +-
 src/cppcache/src/ClientProxyMembershipID.cpp    |   2 +-
 src/cppcache/src/ClientProxyMembershipID.hpp    |   8 +-
 src/cppcache/src/ClientReplacementRequest.cpp   |   2 +-
 src/cppcache/src/ClientReplacementRequest.hpp   |   8 +-
 src/cppcache/src/ConcurrentEntriesMap.cpp       |   2 +-
 src/cppcache/src/ConcurrentEntriesMap.hpp       |   9 +-
 src/cppcache/src/Condition.cpp                  |   8 +-
 src/cppcache/src/Condition.hpp                  |   8 +-
 src/cppcache/src/ConnectCounter.cpp             |   8 +-
 src/cppcache/src/ConnectCounter.hpp             |   8 +-
 src/cppcache/src/Connector.hpp                  |   8 +-
 src/cppcache/src/CppCacheLibrary.cpp            |  17 +-
 src/cppcache/src/CppCacheLibrary.hpp            |   9 +-
 src/cppcache/src/CqAttributesFactory.cpp        |   2 +-
 src/cppcache/src/CqAttributesImpl.cpp           |   2 +-
 src/cppcache/src/CqAttributesImpl.hpp           |   9 +-
 src/cppcache/src/CqAttributesMutatorImpl.cpp    |   2 +-
 src/cppcache/src/CqAttributesMutatorImpl.hpp    |   9 +-
 src/cppcache/src/CqEventImpl.cpp                |   2 +-
 src/cppcache/src/CqEventImpl.hpp                |   9 +-
 src/cppcache/src/CqListener.cpp                 |   2 +-
 src/cppcache/src/CqQueryImpl.cpp                |   2 +-
 src/cppcache/src/CqQueryImpl.hpp                |   9 +-
 src/cppcache/src/CqQueryVsdStats.cpp            |   9 +-
 src/cppcache/src/CqQueryVsdStats.hpp            |   8 +-
 src/cppcache/src/CqService.cpp                  |   2 +-
 src/cppcache/src/CqService.hpp                  |  15 +-
 src/cppcache/src/CqServiceVsdStats.cpp          |   9 +-
 src/cppcache/src/CqServiceVsdStats.hpp          |   8 +-
 src/cppcache/src/CqState.cpp                    |   2 +-
 src/cppcache/src/CqStatusListener.cpp           |   8 +-
 src/cppcache/src/DSMemberForVersionStamp.hpp    |   8 +-
 src/cppcache/src/DataInput.cpp                  |   8 +-
 src/cppcache/src/DataOutput.cpp                 |   8 +-
 src/cppcache/src/Delta.cpp                      |   2 +-
 src/cppcache/src/DiffieHellman.cpp              |   9 +-
 src/cppcache/src/DiffieHellman.hpp              |   9 +-
 src/cppcache/src/DiskPolicyType.cpp             |   2 +-
 src/cppcache/src/DiskStoreId.cpp                |   8 +-
 src/cppcache/src/DiskStoreId.hpp                |   8 +-
 src/cppcache/src/DiskVersionTag.hpp             |   8 +-
 src/cppcache/src/DistributedSystem.cpp          |  14 +-
 src/cppcache/src/DistributedSystemImpl.cpp      |   2 +-
 src/cppcache/src/DistributedSystemImpl.hpp      |   8 +-
 src/cppcache/src/EntriesMap.hpp                 |   9 +-
 src/cppcache/src/EntriesMapFactory.cpp          |   2 +-
 src/cppcache/src/EntriesMapFactory.hpp          |   9 +-
 src/cppcache/src/EntryEvent.cpp                 |   8 +-
 src/cppcache/src/EntryExpiryHandler.cpp         |   2 +-
 src/cppcache/src/EntryExpiryHandler.hpp         |   8 +-
 src/cppcache/src/EnumInfo.cpp                   |  12 +-
 src/cppcache/src/EnumInfo.hpp                   |   8 +-
 src/cppcache/src/EventId.cpp                    |   8 +-
 src/cppcache/src/EventId.hpp                    |   8 +-
 src/cppcache/src/EventIdMap.cpp                 |   2 +-
 src/cppcache/src/EventIdMap.hpp                 |   9 +-
 src/cppcache/src/EventType.hpp                  |   8 +-
 src/cppcache/src/EvictionController.cpp         |   4 +-
 src/cppcache/src/EvictionController.hpp         |   8 +-
 src/cppcache/src/EvictionThread.cpp             |   2 +-
 src/cppcache/src/EvictionThread.hpp             |   8 +-
 src/cppcache/src/Exception.cpp                  |  11 +-
 src/cppcache/src/ExceptionTypes.cpp             |   9 +-
 src/cppcache/src/ExecutionImpl.cpp              |  10 +-
 src/cppcache/src/ExecutionImpl.hpp              |   8 +-
 src/cppcache/src/ExpMapEntry.cpp                |   2 +-
 src/cppcache/src/ExpMapEntry.hpp                |   8 +-
 src/cppcache/src/ExpirationAction.cpp           |   2 +-
 src/cppcache/src/ExpirationAttributes.cpp       |   2 +-
 src/cppcache/src/ExpiryHandler_T.hpp            |   9 +-
 src/cppcache/src/ExpiryTaskManager.cpp          |   2 +-
 src/cppcache/src/ExpiryTaskManager.hpp          |   9 +-
 src/cppcache/src/FairQueue.hpp                  |   9 +-
 src/cppcache/src/FarSideEntryOp.cpp             |   8 +-
 src/cppcache/src/FarSideEntryOp.hpp             |  10 +-
 .../src/FixedPartitionAttributesImpl.hpp        |   8 +-
 src/cppcache/src/FunctionService.cpp            |   2 +-
 src/cppcache/src/FunctionServiceImpl.cpp        |   2 +-
 src/cppcache/src/FunctionServiceImpl.hpp        |   8 +-
 src/cppcache/src/GF_TASK_T.hpp                  |   9 +-
 .../src/GatewayEventCallbackArgument.hpp        |   8 +-
 .../src/GatewaySenderEventCallbackArgument.hpp  |   8 +-
 src/cppcache/src/GemfireTypeIdsImpl.hpp         |   8 +-
 src/cppcache/src/GetAllServersRequest.cpp       |   2 +-
 src/cppcache/src/GetAllServersRequest.hpp       |   8 +-
 src/cppcache/src/GetAllServersResponse.cpp      |   2 +-
 src/cppcache/src/GetAllServersResponse.hpp      |   8 +-
 src/cppcache/src/HashMapOfSharedBase.cpp        |   8 +-
 src/cppcache/src/HashSetOfSharedBase.cpp        |   8 +-
 src/cppcache/src/HostAsm.cpp                    |   2 +-
 src/cppcache/src/HostAsm.hpp                    |  11 +-
 src/cppcache/src/IntQueue.hpp                   |   8 +-
 src/cppcache/src/InterestResultPolicy.cpp       |   2 +-
 src/cppcache/src/InterestResultPolicy.hpp       |   9 +-
 .../src/InternalCacheTransactionManager2PC.cpp  |   8 +-
 .../InternalCacheTransactionManager2PCImpl.cpp  |   8 +-
 .../InternalCacheTransactionManager2PCImpl.hpp  |  12 +-
 src/cppcache/src/InternalDataView.cpp           |   8 +-
 src/cppcache/src/InternalDataView.hpp           |   8 +-
 src/cppcache/src/LRUAction.cpp                  |   2 +-
 src/cppcache/src/LRUAction.hpp                  |   8 +-
 src/cppcache/src/LRUEntriesMap.cpp              |  10 +-
 src/cppcache/src/LRUEntriesMap.hpp              |  15 +-
 src/cppcache/src/LRUExpMapEntry.cpp             |   2 +-
 src/cppcache/src/LRUExpMapEntry.hpp             |   8 +-
 src/cppcache/src/LRUList.cpp                    |   2 +-
 src/cppcache/src/LRUList.hpp                    |   9 +-
 src/cppcache/src/LRULocalDestroyAction.cpp      |   2 +-
 src/cppcache/src/LRULocalDestroyAction.hpp      |   8 +-
 src/cppcache/src/LRUMapEntry.cpp                |   2 +-
 src/cppcache/src/LRUMapEntry.hpp                |   9 +-
 src/cppcache/src/LocalRegion.cpp                |  10 +-
 src/cppcache/src/LocalRegion.hpp                |   9 +-
 src/cppcache/src/LocatorListRequest.cpp         |   2 +-
 src/cppcache/src/LocatorListRequest.hpp         |   8 +-
 src/cppcache/src/LocatorListResponse.cpp        |   2 +-
 src/cppcache/src/LocatorListResponse.hpp        |   8 +-
 src/cppcache/src/Log.cpp                        |  14 +-
 src/cppcache/src/MapEntry.cpp                   |   2 +-
 src/cppcache/src/MapEntry.hpp                   |   9 +-
 src/cppcache/src/MapEntryT.hpp                  |   8 +-
 src/cppcache/src/MapSegment.cpp                 |   2 +-
 src/cppcache/src/MapSegment.hpp                 |  19 +-
 src/cppcache/src/MapWithLock.hpp                |  21 +-
 src/cppcache/src/MemberListForVersionStamp.cpp  |   2 +-
 src/cppcache/src/MemberListForVersionStamp.hpp  |   8 +-
 src/cppcache/src/NanoTimer.cpp                  |   8 +-
 src/cppcache/src/NanoTimer.hpp                  |   8 +-
 src/cppcache/src/NoResult.hpp                   |   9 +-
 src/cppcache/src/NonCopyable.hpp                |   8 +-
 src/cppcache/src/PartitionResolver.cpp          |   8 +-
 src/cppcache/src/PdxEnumInstantiator.cpp        |   8 +-
 src/cppcache/src/PdxEnumInstantiator.hpp        |   8 +-
 src/cppcache/src/PdxFieldType.cpp               |  10 +-
 src/cppcache/src/PdxFieldType.hpp               |   8 +-
 src/cppcache/src/PdxHelper.cpp                  | 146 +++--
 src/cppcache/src/PdxHelper.hpp                  |   8 +-
 src/cppcache/src/PdxInstanceFactoryImpl.cpp     |   8 +-
 src/cppcache/src/PdxInstanceFactoryImpl.hpp     |   8 +-
 src/cppcache/src/PdxInstanceImpl.cpp            |  23 +-
 src/cppcache/src/PdxInstanceImpl.hpp            |   8 +-
 src/cppcache/src/PdxInstantiator.cpp            |   8 +-
 src/cppcache/src/PdxInstantiator.hpp            |   8 +-
 src/cppcache/src/PdxLocalReader.cpp             |   8 +-
 src/cppcache/src/PdxLocalReader.hpp             |   8 +-
 src/cppcache/src/PdxLocalWriter.cpp             |   8 +-
 src/cppcache/src/PdxLocalWriter.hpp             |   8 +-
 src/cppcache/src/PdxReaderWithTypeCollector.cpp |  14 +-
 src/cppcache/src/PdxReaderWithTypeCollector.hpp |   8 +-
 src/cppcache/src/PdxRemotePreservedData.hpp     |   8 +-
 src/cppcache/src/PdxRemoteReader.cpp            |   8 +-
 src/cppcache/src/PdxRemoteReader.hpp            |   8 +-
 src/cppcache/src/PdxRemoteWriter.cpp            |   8 +-
 src/cppcache/src/PdxRemoteWriter.hpp            |   8 +-
 src/cppcache/src/PdxSerializable.cpp            |  10 +-
 src/cppcache/src/PdxType.cpp                    |   8 +-
 src/cppcache/src/PdxType.hpp                    |  12 +-
 src/cppcache/src/PdxTypeRegistry.cpp            |  11 +-
 src/cppcache/src/PdxTypeRegistry.hpp            |   8 +-
 src/cppcache/src/PdxWrapper.cpp                 |  11 +-
 src/cppcache/src/PdxWriterWithTypeCollector.cpp |   8 +-
 src/cppcache/src/PdxWriterWithTypeCollector.hpp |   8 +-
 src/cppcache/src/PersistenceManager.cpp         |   2 +-
 src/cppcache/src/Pool.cpp                       |   2 +-
 src/cppcache/src/PoolAttributes.cpp             |   2 +-
 src/cppcache/src/PoolAttributes.hpp             |   9 +-
 src/cppcache/src/PoolFactory.cpp                |   2 +-
 src/cppcache/src/PoolManager.cpp                |   2 +-
 src/cppcache/src/PoolStatistics.cpp             |   9 +-
 src/cppcache/src/PoolStatistics.hpp             |   8 +-
 src/cppcache/src/PoolXmlCreation.cpp            |   2 +-
 src/cppcache/src/PoolXmlCreation.hpp            |   8 +-
 src/cppcache/src/PooledBase.cpp                 |   8 +-
 src/cppcache/src/PooledBase.hpp                 |   8 +-
 src/cppcache/src/PooledBasePool.hpp             |   8 +-
 src/cppcache/src/PreservedDataExpiryHandler.cpp |   2 +-
 src/cppcache/src/PreservedDataExpiryHandler.hpp |   8 +-
 src/cppcache/src/Properties.cpp                 |  20 +-
 src/cppcache/src/ProxyCache.cpp                 |   2 +-
 src/cppcache/src/ProxyCache.hpp                 |   9 +-
 src/cppcache/src/ProxyRegion.hpp                |   8 +-
 src/cppcache/src/ProxyRemoteQueryService.hpp    |   9 +-
 src/cppcache/src/PutAllPartialResult.cpp        |   8 +-
 src/cppcache/src/PutAllPartialResult.hpp        |   8 +-
 .../src/PutAllPartialResultServerException.cpp  |   8 +-
 .../src/PutAllPartialResultServerException.hpp  |   8 +-
 src/cppcache/src/Queue.hpp                      |   9 +-
 src/cppcache/src/QueueConnectionRequest.cpp     |   2 +-
 src/cppcache/src/QueueConnectionRequest.hpp     |   8 +-
 src/cppcache/src/QueueConnectionResponse.cpp    |   2 +-
 src/cppcache/src/QueueConnectionResponse.hpp    |   8 +-
 src/cppcache/src/ReadWriteLock.cpp              |   2 +-
 src/cppcache/src/ReadWriteLock.hpp              |   8 +-
 src/cppcache/src/Region.cpp                     |   8 +-
 src/cppcache/src/RegionAttributes.cpp           |   2 +-
 src/cppcache/src/RegionCommit.cpp               |   8 +-
 src/cppcache/src/RegionCommit.hpp               |  10 +-
 src/cppcache/src/RegionConfig.cpp               |   8 +-
 src/cppcache/src/RegionConfig.hpp               |   8 +-
 src/cppcache/src/RegionEntry.cpp                |   2 +-
 src/cppcache/src/RegionEvent.cpp                |   8 +-
 src/cppcache/src/RegionExpiryHandler.cpp        |   2 +-
 src/cppcache/src/RegionExpiryHandler.hpp        |   9 +-
 src/cppcache/src/RegionFactory.cpp              |   8 +-
 src/cppcache/src/RegionGlobalLocks.hpp          |   8 +-
 src/cppcache/src/RegionInternal.cpp             |   8 +-
 src/cppcache/src/RegionInternal.hpp             |   9 +-
 src/cppcache/src/RegionStats.cpp                |   9 +-
 src/cppcache/src/RegionStats.hpp                |   8 +-
 src/cppcache/src/RegionXmlCreation.cpp          |   2 +-
 src/cppcache/src/RegionXmlCreation.hpp          |   8 +-
 src/cppcache/src/RemoteQuery.cpp                |   2 +-
 src/cppcache/src/RemoteQuery.hpp                |   9 +-
 src/cppcache/src/RemoteQueryService.cpp         |   2 +-
 src/cppcache/src/RemoteQueryService.hpp         |   9 +-
 src/cppcache/src/ResultCollector.cpp            |   2 +-
 src/cppcache/src/ResultSetImpl.cpp              |   2 +-
 src/cppcache/src/ResultSetImpl.hpp              |   9 +-
 src/cppcache/src/SelectResultsIterator.cpp      |   9 +-
 src/cppcache/src/Serializable.cpp               |   8 +-
 src/cppcache/src/SerializationRegistry.cpp      |  13 +-
 src/cppcache/src/SerializationRegistry.hpp      |   8 +-
 src/cppcache/src/ServerLocation.cpp             |   8 +-
 src/cppcache/src/ServerLocation.hpp             |   8 +-
 src/cppcache/src/ServerLocationRequest.cpp      |   2 +-
 src/cppcache/src/ServerLocationRequest.hpp      |   8 +-
 src/cppcache/src/ServerLocationResponse.hpp     |   8 +-
 src/cppcache/src/Set.hpp                        |  16 +-
 src/cppcache/src/SharedBase.cpp                 |   8 +-
 src/cppcache/src/SharedPtr.cpp                  |   2 +-
 src/cppcache/src/SpinLock.cpp                   |   8 +-
 src/cppcache/src/SpinLock.hpp                   |   8 +-
 src/cppcache/src/SslSockStream.cpp              |  11 +-
 src/cppcache/src/SslSockStream.hpp              |   8 +-
 src/cppcache/src/StackFrame.cpp                 |   8 +-
 src/cppcache/src/StackFrame.hpp                 |   8 +-
 src/cppcache/src/StackTrace.cpp                 |  42 +-
 src/cppcache/src/StackTrace.hpp                 |   8 +-
 src/cppcache/src/Struct.cpp                     |   9 +-
 src/cppcache/src/StructSetImpl.cpp              |   2 +-
 src/cppcache/src/StructSetImpl.hpp              |   9 +-
 src/cppcache/src/SuspendedTxExpiryHandler.cpp   |   2 +-
 src/cppcache/src/SuspendedTxExpiryHandler.hpp   |   8 +-
 src/cppcache/src/SystemProperties.cpp           |   2 +-
 src/cppcache/src/TSSTXStateWrapper.cpp          |   8 +-
 src/cppcache/src/TSSTXStateWrapper.hpp          |   8 +-
 src/cppcache/src/TXCleaner.cpp                  |   8 +-
 src/cppcache/src/TXCleaner.hpp                  |   8 +-
 src/cppcache/src/TXCommitMessage.cpp            |  11 +-
 src/cppcache/src/TXCommitMessage.hpp            |  10 +-
 src/cppcache/src/TXEntryState.cpp               |   8 +-
 src/cppcache/src/TXEntryState.hpp               |  12 +-
 src/cppcache/src/TXId.cpp                       |   8 +-
 src/cppcache/src/TXId.hpp                       |  10 +-
 src/cppcache/src/TXRegionState.cpp              |   8 +-
 src/cppcache/src/TXRegionState.hpp              |  12 +-
 src/cppcache/src/TXState.cpp                    |   8 +-
 src/cppcache/src/TXState.hpp                    |   8 +-
 src/cppcache/src/TableOfPrimes.hpp              |   8 +-
 src/cppcache/src/TcpConn.cpp                    |   2 +-
 src/cppcache/src/TcpConn.hpp                    |   8 +-
 src/cppcache/src/TcpSslConn.cpp                 |   2 +-
 src/cppcache/src/TcpSslConn.hpp                 |   8 +-
 src/cppcache/src/TcrChunkedContext.hpp          |   8 +-
 src/cppcache/src/TcrConnection.cpp              |   2 +-
 src/cppcache/src/TcrConnection.hpp              |   8 +-
 src/cppcache/src/TcrConnectionManager.cpp       |   6 +-
 src/cppcache/src/TcrConnectionManager.hpp       |   9 +-
 src/cppcache/src/TcrDistributionManager.cpp     |   2 +-
 src/cppcache/src/TcrDistributionManager.hpp     |   8 +-
 src/cppcache/src/TcrEndpoint.cpp                |   8 +-
 src/cppcache/src/TcrEndpoint.hpp                |   8 +-
 src/cppcache/src/TcrHADistributionManager.cpp   |   2 +-
 src/cppcache/src/TcrHADistributionManager.hpp   |   9 +-
 src/cppcache/src/TcrMessage.cpp                 |  34 +-
 src/cppcache/src/TcrMessage.hpp                 |  15 +-
 src/cppcache/src/TcrPoolEndPoint.cpp            |   2 +-
 src/cppcache/src/TcrPoolEndPoint.hpp            |   8 +-
 src/cppcache/src/ThinClientBaseDM.cpp           |   2 +-
 src/cppcache/src/ThinClientBaseDM.hpp           |   9 +-
 .../src/ThinClientCacheDistributionManager.cpp  |   2 +-
 .../src/ThinClientCacheDistributionManager.hpp  |   9 +-
 .../src/ThinClientDistributionManager.cpp       |   2 +-
 .../src/ThinClientDistributionManager.hpp       |   9 +-
 src/cppcache/src/ThinClientHARegion.cpp         |   8 +-
 src/cppcache/src/ThinClientHARegion.hpp         |   9 +-
 src/cppcache/src/ThinClientLocatorHelper.cpp    |   2 +-
 src/cppcache/src/ThinClientLocatorHelper.hpp    |   8 +-
 src/cppcache/src/ThinClientPoolDM.cpp           |  30 +-
 src/cppcache/src/ThinClientPoolDM.hpp           |  37 +-
 src/cppcache/src/ThinClientPoolHADM.cpp         |   2 +-
 src/cppcache/src/ThinClientPoolHADM.hpp         |   8 +-
 src/cppcache/src/ThinClientPoolRegion.cpp       |   2 +-
 src/cppcache/src/ThinClientPoolRegion.hpp       |   8 +-
 src/cppcache/src/ThinClientPoolStickyDM.cpp     |   2 +-
 src/cppcache/src/ThinClientPoolStickyDM.hpp     |   8 +-
 src/cppcache/src/ThinClientPoolStickyHADM.cpp   |   2 +-
 src/cppcache/src/ThinClientPoolStickyHADM.hpp   |   8 +-
 .../src/ThinClientRedundancyManager.cpp         |   2 +-
 .../src/ThinClientRedundancyManager.hpp         |   8 +-
 src/cppcache/src/ThinClientRegion.cpp           |  46 +-
 src/cppcache/src/ThinClientRegion.hpp           |   9 +-
 src/cppcache/src/ThinClientStickyManager.cpp    |   2 +-
 src/cppcache/src/ThinClientStickyManager.hpp    |   8 +-
 src/cppcache/src/ThreadPool.cpp                 |   2 +-
 src/cppcache/src/ThreadPool.hpp                 |   8 +-
 src/cppcache/src/TimeoutTimer.hpp               |   8 +-
 src/cppcache/src/TombstoneExpiryHandler.cpp     |   2 +-
 src/cppcache/src/TombstoneExpiryHandler.hpp     |   9 +-
 src/cppcache/src/TombstoneList.cpp              |   2 +-
 src/cppcache/src/TombstoneList.hpp              |   9 +-
 src/cppcache/src/TrackedMapEntry.cpp            |   2 +-
 src/cppcache/src/TrackedMapEntry.hpp            |   8 +-
 src/cppcache/src/TransactionId.cpp              |   8 +-
 src/cppcache/src/TransactionSuspender.cpp       |   8 +-
 src/cppcache/src/TransactionSuspender.hpp       |   8 +-
 src/cppcache/src/TransactionalOperation.cpp     |   8 +-
 src/cppcache/src/TransactionalOperation.hpp     |  10 +-
 src/cppcache/src/TssConnectionWrapper.cpp       |   2 +-
 src/cppcache/src/TssConnectionWrapper.hpp       |   8 +-
 src/cppcache/src/UserAttributes.cpp             |   2 +-
 src/cppcache/src/UserAttributes.hpp             |   9 +-
 .../src/UserFunctionExecutionException.cpp      |   8 +-
 src/cppcache/src/Utils.cpp                      |   6 +-
 src/cppcache/src/Utils.hpp                      |   9 +-
 src/cppcache/src/VectorOfSharedBase.cpp         |  12 +-
 src/cppcache/src/Version.cpp                    |   2 +-
 src/cppcache/src/Version.hpp                    |  14 +-
 src/cppcache/src/VersionStamp.cpp               |   2 +-
 src/cppcache/src/VersionStamp.hpp               |   8 +-
 src/cppcache/src/VersionTag.cpp                 |   2 +-
 src/cppcache/src/VersionTag.hpp                 |   8 +-
 .../src/VersionedCacheableObjectPartList.cpp    |  11 +-
 .../src/VersionedCacheableObjectPartList.hpp    |   8 +-
 src/cppcache/src/dllmain.cpp                    |   9 +-
 src/cppcache/src/gfcppBanner.cpp                |   2 +-
 src/cppcache/src/gfcppBanner.hpp                |   8 +-
 .../src/statistics/AtomicStatisticsImpl.hpp     |   2 +-
 .../src/statistics/GemfireStatisticsFactory.cpp |   2 +-
 .../src/statistics/GemfireStatisticsFactory.hpp |   2 +-
 src/cppcache/src/statistics/HostStatSampler.cpp |   2 +-
 src/cppcache/src/statistics/HostStatSampler.hpp |   2 +-
 .../src/statistics/LinuxProcessStats.hpp        |   2 +-
 .../src/statistics/NullProcessStats.hpp         |   2 +-
 .../src/statistics/OsStatisticsImpl.hpp         |   2 +-
 .../src/statistics/PoolStatsSampler.cpp         |   2 +-
 .../src/statistics/PoolStatsSampler.hpp         |  10 +-
 src/cppcache/src/statistics/ProcessStats.hpp    |   2 +-
 .../src/statistics/SolarisProcessStats.hpp      |   2 +-
 .../src/statistics/StatArchiveWriter.cpp        |   2 +-
 .../src/statistics/StatArchiveWriter.hpp        |   2 +-
 .../src/statistics/StatSamplerStats.hpp         |   2 +-
 .../src/statistics/StatisticDescriptorImpl.cpp  |   5 +-
 .../src/statistics/StatisticsManager.cpp        |   2 +-
 .../src/statistics/WindowsProcessStats.hpp      |   2 +-
 src/cppcache/test/AutoDeleteTest.cpp            |   6 +-
 src/cppcache/test/ByteArray.cpp                 |   8 +-
 src/cppcache/test/ByteArray.hpp                 |   8 +-
 src/cppcache/test/ByteArrayFixture.cpp          |   4 +-
 src/cppcache/test/ByteArrayFixture.hpp          |   2 +-
 src/cppcache/test/ByteArrayTest.cpp             |   2 +-
 src/cppcache/test/CacheXmlParserTest.cpp        |   2 +-
 src/cppcache/test/CacheableKeysTest.cpp         |   2 +-
 src/cppcache/test/DataInputTest.cpp             |  14 +-
 src/cppcache/test/DataOutputTest.cpp            |   2 +-
 src/cppcache/test/DiskPolicyTypeTest.cpp        |   2 +-
 src/cppcache/test/ExpirationActionTest.cpp      |   2 +-
 src/cppcache/test/InterestResultPolicyTest.cpp  |   2 +-
 src/cppcache/test/NanoTimerTest.cpp             |   2 +-
 src/cppcache/test/PdxLocalReaderTest.cpp        |   2 +-
 src/cppcache/test/SharedBaseTest.cpp            |   2 +-
 src/cppcache/test/SharedPtrTest.cpp             |   2 +-
 src/cppcache/test/TcrMessage_unittest.cpp       |   6 +-
 src/cppcache/test/gfcppBannerTest.cpp           |   2 +-
 src/gfcpp/gfcpp.cpp                             |   2 +-
 src/pdxautoserializer/ASBuiltins.hpp            |  27 +-
 src/pdxautoserializer/ASCLIBuiltins.hpp         | 148 +++--
 src/pdxautoserializer/CodeGenerator.hpp         |  10 +-
 src/pdxautoserializer/CodeGeneratorFactory.cpp  |   8 +-
 src/pdxautoserializer/CodeGeneratorFactory.hpp  |  10 +-
 src/pdxautoserializer/InputParser.cpp           |   8 +-
 src/pdxautoserializer/InputParser.hpp           |  10 +-
 src/pdxautoserializer/InputParserFactory.cpp    |   8 +-
 src/pdxautoserializer/InputParserFactory.hpp    |  10 +-
 src/pdxautoserializer/OutputFormatter.cpp       |   8 +-
 src/pdxautoserializer/OutputFormatter.hpp       |  10 +-
 src/pdxautoserializer/base_types.hpp            |  16 +-
 src/pdxautoserializer/impl/CPPCodeGenerator.cpp |  24 +-
 src/pdxautoserializer/impl/CPPCodeGenerator.hpp |  10 +-
 .../impl/CPPParser/CPPInputParser.cpp           |   8 +-
 .../impl/CPPParser/CPPInputParser.hpp           |  10 +-
 src/pdxautoserializer/impl/Helper.cpp           |   8 +-
 src/pdxautoserializer/impl/Helper.hpp           |  10 +-
 src/pdxautoserializer/impl/Log.cpp              |   8 +-
 src/pdxautoserializer/impl/Log.hpp              |  10 +-
 src/pdxautoserializer/impl/Main.cpp             |   5 +-
 src/quickstart/cpp/BasicOperations.cpp          |   2 +-
 src/quickstart/cpp/CqQuery.cpp                  |   2 +-
 src/quickstart/cpp/DataExpiration.cpp           |   8 +-
 src/quickstart/cpp/Delta.cpp                    |   2 +-
 src/quickstart/cpp/DistributedSystem.cpp        |   2 +-
 src/quickstart/cpp/DurableClient.cpp            |   4 +-
 src/quickstart/cpp/Exceptions.cpp               |   2 +-
 src/quickstart/cpp/ExecuteFunctions.cpp         |   2 +-
 src/quickstart/cpp/HACache.cpp                  |   2 +-
 src/quickstart/cpp/LoaderListenerWriter.cpp     |   2 +-
 src/quickstart/cpp/MultiuserSecurity.cpp        |   4 +-
 src/quickstart/cpp/PdxAutoSerializer.cpp        |   2 +-
 src/quickstart/cpp/PdxInstance.cpp              |   2 +-
 src/quickstart/cpp/PdxRemoteQuery.cpp           |   2 +-
 src/quickstart/cpp/PdxSerializer.cpp            |   2 +-
 src/quickstart/cpp/PoolCqQuery.cpp              |   2 +-
 src/quickstart/cpp/PoolRemoteQuery.cpp          |   2 +-
 src/quickstart/cpp/PoolWithEndpoints.cpp        |   2 +-
 src/quickstart/cpp/PutAllGetAllOperations.cpp   |   2 +-
 src/quickstart/cpp/RefIDExample.cpp             |   2 +-
 src/quickstart/cpp/RegisterInterest.cpp         |   2 +-
 src/quickstart/cpp/RemoteQuery.cpp              |   2 +-
 src/quickstart/cpp/Security.cpp                 |   4 +-
 src/quickstart/cpp/Transactions.cpp             |   2 +-
 src/quickstart/cpp/TransactionsXA.cpp           |   2 +-
 .../cpp/deltaobjects/DeltaExample.hpp           |   2 +-
 .../cpp/plugins/DurableCacheListener.hpp        |   2 +-
 .../cpp/plugins/SimpleCacheListener.hpp         |   2 +-
 .../cpp/plugins/SimpleCacheLoader.hpp           |   2 +-
 .../cpp/plugins/SimpleCacheWriter.hpp           |   2 +-
 src/quickstart/cpp/queryobjects/Portfolio.cpp   |   2 +-
 src/quickstart/cpp/queryobjects/Portfolio.hpp   |   2 +-
 .../cpp/queryobjects/PortfolioPdx.cpp           |   2 +-
 .../cpp/queryobjects/PortfolioPdx.hpp           |   2 +-
 .../cpp/queryobjects/PortfolioPdxAuto.cpp       |   2 +-
 .../cpp/queryobjects/PortfolioPdxAuto.hpp       |   4 +-
 src/quickstart/cpp/queryobjects/Position.cpp    |   7 +-
 src/quickstart/cpp/queryobjects/Position.hpp    |  13 +-
 src/quickstart/cpp/queryobjects/PositionPdx.cpp |   2 +-
 src/quickstart/cpp/queryobjects/PositionPdx.hpp |   7 +-
 .../cpp/queryobjects/PositionPdxAuto.cpp        |   2 +-
 .../cpp/queryobjects/PositionPdxAuto.hpp        |   6 +-
 src/sqliteimpl/SqLiteHelper.hpp                 |   2 +-
 src/sqliteimpl/SqLiteImpl.cpp                   |   2 +-
 src/sqliteimpl/SqLiteImpl.hpp                   |   8 +-
 src/templates/security/PkcsAuthInit.cpp         |   8 +-
 src/templates/security/PkcsAuthInit.hpp         |   8 +-
 src/templates/security/UserPasswordAuthInit.cpp |   8 +-
 src/templates/security/UserPasswordAuthInit.hpp |   8 +-
 src/tests/cli/PkcsWrapper/PkcsAuthInitMN.cpp    |   8 +-
 src/tests/cli/PkcsWrapper/PkcsAuthInitMN.hpp    |   4 +-
 src/tests/cpp/fwk/UdpIpc.cpp                    |   4 +-
 src/tests/cpp/fwk/UdpIpc.hpp                    |   8 +-
 src/tests/cpp/fwklib/ClientTask.hpp             |   8 +-
 src/tests/cpp/fwklib/FrameworkTest.cpp          |   4 +-
 src/tests/cpp/fwklib/FrameworkTest.hpp          |  10 +-
 src/tests/cpp/fwklib/FwkBB.hpp                  |   8 +-
 src/tests/cpp/fwklib/FwkBBClient.cpp            |   4 +-
 src/tests/cpp/fwklib/FwkBBClient.hpp            |   8 +-
 src/tests/cpp/fwklib/FwkBBServer.cpp            |   4 +-
 src/tests/cpp/fwklib/FwkBBServer.hpp            |   8 +-
 src/tests/cpp/fwklib/FwkException.hpp           |   8 +-
 src/tests/cpp/fwklib/FwkLog.cpp                 |  17 +-
 src/tests/cpp/fwklib/FwkLog.hpp                 |   8 +-
 src/tests/cpp/fwklib/FwkObjects.cpp             |   4 +-
 src/tests/cpp/fwklib/FwkObjects.hpp             |  13 +-
 src/tests/cpp/fwklib/FwkStrCvt.cpp              |   2 +-
 src/tests/cpp/fwklib/FwkStrCvt.hpp              |  28 +-
 src/tests/cpp/fwklib/GsRandom.cpp               |   4 +-
 src/tests/cpp/fwklib/GsRandom.hpp               |  19 +-
 src/tests/cpp/fwklib/IpcHandler.cpp             |   4 +-
 src/tests/cpp/fwklib/IpcHandler.hpp             |   8 +-
 src/tests/cpp/fwklib/MersenneTwister.cpp        |   4 +-
 src/tests/cpp/fwklib/MersenneTwister.hpp        |   5 +-
 src/tests/cpp/fwklib/PaceMeter.hpp              |   8 +-
 src/tests/cpp/fwklib/PerfFwk.cpp                |   8 +-
 src/tests/cpp/fwklib/PerfFwk.hpp                |  21 +-
 src/tests/cpp/fwklib/PoolHelper.hpp             |   8 +-
 src/tests/cpp/fwklib/QueryHelper.hpp            |  19 +-
 src/tests/cpp/fwklib/RegionHelper.hpp           |  13 +-
 src/tests/cpp/fwklib/Service.cpp                |   4 +-
 src/tests/cpp/fwklib/Service.hpp                |  12 +-
 src/tests/cpp/fwklib/TaskClient.cpp             |   4 +-
 src/tests/cpp/fwklib/TaskClient.hpp             |   8 +-
 src/tests/cpp/fwklib/TcpIpc.cpp                 |   4 +-
 src/tests/cpp/fwklib/TcpIpc.hpp                 |   8 +-
 src/tests/cpp/fwklib/TestClient.cpp             |   6 +-
 src/tests/cpp/fwklib/TestClient.hpp             |   8 +-
 src/tests/cpp/fwklib/TimeBomb.cpp               |   6 +-
 src/tests/cpp/fwklib/TimeBomb.hpp               |   8 +-
 src/tests/cpp/fwklib/TimeLimit.hpp              |   8 +-
 src/tests/cpp/fwklib/TimeSync.cpp               |   4 +-
 src/tests/cpp/fwklib/TimeSync.hpp               |   8 +-
 src/tests/cpp/fwklib/Timer.hpp                  |   8 +-
 src/tests/cpp/fwklib/UDPIpc.cpp                 |   2 +-
 src/tests/cpp/fwklib/UDPIpc.hpp                 |  15 +-
 .../AutoPdxVersioned1.cpp                       |   2 +-
 .../AutoPdxVersioned1.hpp                       |   2 +-
 .../AutoPdxVersioned2.cpp                       |   2 +-
 .../AutoPdxVersioned2.hpp                       |   2 +-
 .../cpp/pdxautoserializerclass/PortfolioPdx.cpp |   2 +-
 .../cpp/pdxautoserializerclass/PortfolioPdx.hpp |   2 +-
 .../cpp/pdxautoserializerclass/PositionPdx.cpp  |   2 +-
 .../cpp/pdxautoserializerclass/PositionPdx.hpp  |   6 +-
 src/tests/cpp/security/CredentialGenerator.cpp  |   2 +-
 src/tests/cpp/security/CredentialGenerator.hpp  |   8 +-
 .../cpp/security/DummyCredentialGenerator.hpp   |  10 +-
 .../cpp/security/DummyCredentialGenerator2.hpp  |  10 +-
 .../cpp/security/DummyCredentialGenerator3.hpp  |  10 +-
 .../security/LdapUserCredentialGenerator.hpp    |   8 +-
 .../cpp/security/NoopCredentialGenerator.hpp    |   8 +-
 src/tests/cpp/security/PkcsAuthInit.cpp         |   8 +-
 src/tests/cpp/security/PkcsAuthInit.hpp         |   9 +-
 .../cpp/security/PkcsCredentialGenerator.hpp    |   8 +-
 src/tests/cpp/security/Security.cpp             |   6 +-
 src/tests/cpp/security/Security.hpp             |   8 +-
 .../security/XmlAuthzCredentialGenerator.hpp    |   8 +-
 src/tests/cpp/security/typedefs.hpp             |   8 +-
 src/tests/cpp/testobject/ArrayOfByte.hpp        |   8 +-
 src/tests/cpp/testobject/BatchObject.cpp        |   7 +-
 src/tests/cpp/testobject/BatchObject.hpp        |  11 +-
 .../cpp/testobject/DeltaFastAssetAccount.cpp    |  14 +-
 .../cpp/testobject/DeltaFastAssetAccount.hpp    |  16 +-
 src/tests/cpp/testobject/DeltaPSTObject.cpp     |   7 +-
 src/tests/cpp/testobject/DeltaPSTObject.hpp     |   9 +-
 src/tests/cpp/testobject/DeltaTestImpl.hpp      |   2 +-
 src/tests/cpp/testobject/DeltaTestObj.hpp       |   4 +-
 src/tests/cpp/testobject/EqStruct.cpp           |   7 +-
 src/tests/cpp/testobject/EqStruct.hpp           |  11 +-
 src/tests/cpp/testobject/FastAsset.cpp          |   7 +-
 src/tests/cpp/testobject/FastAsset.hpp          |  13 +-
 src/tests/cpp/testobject/FastAssetAccount.cpp   |   7 +-
 src/tests/cpp/testobject/FastAssetAccount.hpp   |  11 +-
 src/tests/cpp/testobject/InvalidPdxUsage.cpp    |   2 +-
 src/tests/cpp/testobject/InvalidPdxUsage.hpp    |   4 +-
 src/tests/cpp/testobject/NestedPdxObject.cpp    |   2 +-
 src/tests/cpp/testobject/NestedPdxObject.hpp    |   2 +-
 src/tests/cpp/testobject/NonPdxType.cpp         |   2 +-
 src/tests/cpp/testobject/NonPdxType.hpp         |   2 +-
 src/tests/cpp/testobject/NoopAuthInit.cpp       |   8 +-
 src/tests/cpp/testobject/NoopAuthInit.hpp       |   8 +-
 src/tests/cpp/testobject/PSTObject.cpp          |   7 +-
 src/tests/cpp/testobject/PSTObject.hpp          |  11 +-
 src/tests/cpp/testobject/PdxAutoMegaType.cpp    |   2 +-
 src/tests/cpp/testobject/PdxAutoMegaType.hpp    |   2 +-
 src/tests/cpp/testobject/PdxClassV1.cpp         |   2 +-
 src/tests/cpp/testobject/PdxClassV1.hpp         |   2 +-
 src/tests/cpp/testobject/PdxClassV1WithAuto.cpp |   2 +-
 src/tests/cpp/testobject/PdxClassV1WithAuto.hpp |   2 +-
 src/tests/cpp/testobject/PdxClassV2.cpp         |   2 +-
 src/tests/cpp/testobject/PdxClassV2.hpp         |   2 +-
 src/tests/cpp/testobject/PdxClassV2WithAuto.cpp |   2 +-
 src/tests/cpp/testobject/PdxClassV2WithAuto.hpp |   2 +-
 src/tests/cpp/testobject/PdxType.cpp            |   2 +-
 src/tests/cpp/testobject/PdxType.hpp            |   6 +-
 src/tests/cpp/testobject/PdxTypeWithAuto.cpp    |   2 +-
 src/tests/cpp/testobject/PdxTypeWithAuto.hpp    |   6 +-
 src/tests/cpp/testobject/PdxVersioned1.cpp      |   2 +-
 src/tests/cpp/testobject/PdxVersioned1.hpp      |   2 +-
 src/tests/cpp/testobject/PdxVersioned2.cpp      |   2 +-
 src/tests/cpp/testobject/PdxVersioned2.hpp      |   2 +-
 src/tests/cpp/testobject/Portfolio.cpp          |   2 +-
 src/tests/cpp/testobject/Portfolio.hpp          |   5 +-
 src/tests/cpp/testobject/PortfolioPdx.cpp       |   2 +-
 src/tests/cpp/testobject/PortfolioPdx.hpp       |   2 +-
 src/tests/cpp/testobject/Position.cpp           |   7 +-
 src/tests/cpp/testobject/Position.hpp           |  13 +-
 src/tests/cpp/testobject/PositionPdx.cpp        |   2 +-
 src/tests/cpp/testobject/PositionPdx.hpp        |   7 +-
 src/tests/cpp/testobject/TestObject1.hpp        |   2 +-
 src/tests/cpp/testobject/TimestampedObject.hpp  |  14 +-
 src/tests/cpp/testobject/VariousPdxTypes.hpp    |   2 +-
 .../cpp/testobject/VariousPdxTypesWithAuto.hpp  |   2 +-
 1049 files changed, 12057 insertions(+), 9798 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/examples/dist/cacheRunner/CacheRunner.hpp
----------------------------------------------------------------------
diff --git a/examples/dist/cacheRunner/CacheRunner.hpp 
b/examples/dist/cacheRunner/CacheRunner.hpp
index 9970e52..34c5d1a 100644
--- a/examples/dist/cacheRunner/CacheRunner.hpp
+++ b/examples/dist/cacheRunner/CacheRunner.hpp
@@ -36,7 +36,7 @@
 
 #include <string>
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 // ----------------------------------------------------------------------------
 

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/examples/dist/cacheRunner/TestCacheCallback.hpp
----------------------------------------------------------------------
diff --git a/examples/dist/cacheRunner/TestCacheCallback.hpp 
b/examples/dist/cacheRunner/TestCacheCallback.hpp
index f4d5b73..ec2e765 100644
--- a/examples/dist/cacheRunner/TestCacheCallback.hpp
+++ b/examples/dist/cacheRunner/TestCacheCallback.hpp
@@ -31,7 +31,7 @@
 
 #include <string>
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 /**
  * An abstract superclass of implementation of GemFire cache callbacks

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/examples/dist/cacheRunner/TestCacheListener.hpp
----------------------------------------------------------------------
diff --git a/examples/dist/cacheRunner/TestCacheListener.hpp 
b/examples/dist/cacheRunner/TestCacheListener.hpp
index 010312f..5eea00b 100644
--- a/examples/dist/cacheRunner/TestCacheListener.hpp
+++ b/examples/dist/cacheRunner/TestCacheListener.hpp
@@ -30,7 +30,7 @@
 
 #include "TestCacheCallback.hpp"
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 /**
  * A <code>CacheListener</code> used in testing.  Its callback methods

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/examples/dist/cacheRunner/TestCacheLoader.hpp
----------------------------------------------------------------------
diff --git a/examples/dist/cacheRunner/TestCacheLoader.hpp 
b/examples/dist/cacheRunner/TestCacheLoader.hpp
index b5a45f4..6dc2827 100644
--- a/examples/dist/cacheRunner/TestCacheLoader.hpp
+++ b/examples/dist/cacheRunner/TestCacheLoader.hpp
@@ -30,7 +30,7 @@
 
 #include "TestCacheCallback.hpp"
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 /**
  * A <code>CacheLoader</code> used in testing.  Users should override

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/examples/dist/cacheRunner/TestCacheWriter.hpp
----------------------------------------------------------------------
diff --git a/examples/dist/cacheRunner/TestCacheWriter.hpp 
b/examples/dist/cacheRunner/TestCacheWriter.hpp
index 4997c38..f730ff5 100644
--- a/examples/dist/cacheRunner/TestCacheWriter.hpp
+++ b/examples/dist/cacheRunner/TestCacheWriter.hpp
@@ -30,7 +30,7 @@
 
 #include "TestCacheCallback.hpp"
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 /**
  * A <code>CacheWriter</code> used in testing.  Its callback methods

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/examples/dist/cqQuery/CqQuery.cpp
----------------------------------------------------------------------
diff --git a/examples/dist/cqQuery/CqQuery.cpp 
b/examples/dist/cqQuery/CqQuery.cpp
index 98e64f0..a03a5da 100644
--- a/examples/dist/cqQuery/CqQuery.cpp
+++ b/examples/dist/cqQuery/CqQuery.cpp
@@ -36,7 +36,7 @@
 #include "string.h"
 
 // Use the "gemfire" namespace.
-using namespace gemfire;
+using namespace apache::geode::client;
 
 // Use the "testobject" namespace for the query objects.
 using namespace testobject;

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/examples/dist/cqQuery/Updater.cpp
----------------------------------------------------------------------
diff --git a/examples/dist/cqQuery/Updater.cpp 
b/examples/dist/cqQuery/Updater.cpp
index f85a613..065e8b6 100644
--- a/examples/dist/cqQuery/Updater.cpp
+++ b/examples/dist/cqQuery/Updater.cpp
@@ -30,7 +30,7 @@
 #include "Position.hpp"
 
 // Use the "gemfire" namespace.
-using namespace gemfire;
+using namespace apache::geode::client;
 
 // Use the "testobject" namespace for the query objects.
 using namespace testobject;

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/examples/dist/executeFunction/ExecuteFunctions.cpp
----------------------------------------------------------------------
diff --git a/examples/dist/executeFunction/ExecuteFunctions.cpp 
b/examples/dist/executeFunction/ExecuteFunctions.cpp
index 187e85c..48bb0bc 100644
--- a/examples/dist/executeFunction/ExecuteFunctions.cpp
+++ b/examples/dist/executeFunction/ExecuteFunctions.cpp
@@ -34,7 +34,7 @@
 #endif
 
 // Use the "gemfire" namespace.
-using namespace gemfire;
+using namespace apache::geode::client;
 
 char* getFuncIName = (char*)"MultiGetFunctionI";
 char* putFuncIName = (char*)"MultiPutFunctionI";

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/examples/dist/userobjects/AccountHistory.cpp
----------------------------------------------------------------------
diff --git a/examples/dist/userobjects/AccountHistory.cpp 
b/examples/dist/userobjects/AccountHistory.cpp
index 0f6ef4d..8976fb1 100644
--- a/examples/dist/userobjects/AccountHistory.cpp
+++ b/examples/dist/userobjects/AccountHistory.cpp
@@ -19,7 +19,7 @@
 #include "EClassIds.hpp"
 #include <stdio.h>
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 AccountHistory::AccountHistory( )
 : Cacheable(),

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/examples/dist/userobjects/AccountHistory.hpp
----------------------------------------------------------------------
diff --git a/examples/dist/userobjects/AccountHistory.hpp 
b/examples/dist/userobjects/AccountHistory.hpp
index 935f753..68a6d0b 100644
--- a/examples/dist/userobjects/AccountHistory.hpp
+++ b/examples/dist/userobjects/AccountHistory.hpp
@@ -24,13 +24,13 @@
 #include <vector>
 
 class AccountHistory;
-typedef gemfire::SharedPtr< AccountHistory > AccountHistoryPtr;
+typedef apache::geode::client::SharedPtr< AccountHistory > AccountHistoryPtr;
 
 /** 
  * Defines a custom type that can be used as a value in a
  * gemfire region.
  */
-class AccountHistory : public gemfire::Cacheable
+class AccountHistory : public apache::geode::client::Cacheable
 {
   private:
     std::vector< std::string > m_history;
@@ -42,17 +42,17 @@ class AccountHistory : public gemfire::Cacheable
    /**
    *@brief serialize this object
    **/
-  virtual void toData( gemfire::DataOutput& output ) const;
+  virtual void toData( apache::geode::client::DataOutput& output ) const;
 
   /**
    *@brief deserialize this object
    **/
-  virtual gemfire::Serializable* fromData( gemfire::DataInput& input );
+  virtual apache::geode::client::Serializable* fromData( 
apache::geode::client::DataInput& input );
   
   /**
    * @brief creation function for strings.
    */
-  static gemfire::Serializable* createDeserializable( );
+  static apache::geode::client::Serializable* createDeserializable( );
 
   /**
    *@brief return the classId of the instance being serialized.

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/examples/dist/userobjects/BankAccount.cpp
----------------------------------------------------------------------
diff --git a/examples/dist/userobjects/BankAccount.cpp 
b/examples/dist/userobjects/BankAccount.cpp
index 807d5c6..26e4c54 100644
--- a/examples/dist/userobjects/BankAccount.cpp
+++ b/examples/dist/userobjects/BankAccount.cpp
@@ -19,7 +19,7 @@
 #include "EClassIds.hpp"
 #include <stdio.h>
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 BankAccount::BankAccount( int customerNum, int accountNum )
 : CacheableKey(),

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/examples/dist/userobjects/BankAccount.hpp
----------------------------------------------------------------------
diff --git a/examples/dist/userobjects/BankAccount.hpp 
b/examples/dist/userobjects/BankAccount.hpp
index ec9e4e2..abd77d4 100644
--- a/examples/dist/userobjects/BankAccount.hpp
+++ b/examples/dist/userobjects/BankAccount.hpp
@@ -23,13 +23,13 @@
 
 
 class BankAccount;
-typedef gemfire::SharedPtr< BankAccount > BankAccountPtr;
+typedef apache::geode::client::SharedPtr< BankAccount > BankAccountPtr;
 
 /**
  * Defines a custom type that can be used as a key in
  * a gemfire region.
  */
-class BankAccount : public gemfire::CacheableKey
+class BankAccount : public apache::geode::client::CacheableKey
 {
   private:
 
@@ -43,17 +43,17 @@ class BankAccount : public gemfire::CacheableKey
    /**
    *@brief serialize this object
    **/
-  virtual void toData( gemfire::DataOutput& output ) const;
+  virtual void toData( apache::geode::client::DataOutput& output ) const;
 
   /**
    *@brief deserialize this object
    **/
-  virtual gemfire::Serializable* fromData( gemfire::DataInput& input );
+  virtual apache::geode::client::Serializable* fromData( 
apache::geode::client::DataInput& input );
   
   /**
    * @brief creation function for strings.
    */
-  static gemfire::Serializable* createDeserializable( );
+  static apache::geode::client::Serializable* createDeserializable( );
 
   /**
    *@brief return the classId of the instance being serialized.
@@ -63,7 +63,7 @@ class BankAccount : public gemfire::CacheableKey
   virtual int32_t classId( ) const;
 
   /** return true if this key matches other. */
-  virtual bool operator==( const gemfire::CacheableKey& other ) const;
+  virtual bool operator==( const apache::geode::client::CacheableKey& other ) 
const;
 
   /** return the hashcode for this key. */
   virtual uint32_t hashcode( ) const;
@@ -74,9 +74,11 @@ class BankAccount : public gemfire::CacheableKey
   virtual uint32_t objectSize() const;   
 };
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
-/** overload of gemfire::createKey to pass CacheableInt32Ptr */
+/** overload of apache::geode::client::createKey to pass CacheableInt32Ptr */
 inline CacheableKeyPtr createKey( const BankAccountPtr& value )
 {
   return value;

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/examples/dist/userobjects/ExampleMain.cpp
----------------------------------------------------------------------
diff --git a/examples/dist/userobjects/ExampleMain.cpp 
b/examples/dist/userobjects/ExampleMain.cpp
index 35f9746..8a8bfbb 100644
--- a/examples/dist/userobjects/ExampleMain.cpp
+++ b/examples/dist/userobjects/ExampleMain.cpp
@@ -19,7 +19,7 @@
 #include "BankAccount.hpp"
 #include "AccountHistory.hpp"
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 /*
   This example registers types, creates the cache, creates a

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/clicache/src/AttributesFactory.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/AttributesFactory.cpp 
b/src/clicache/src/AttributesFactory.cpp
index 8af7b1b..64f8aae 100644
--- a/src/clicache/src/AttributesFactory.cpp
+++ b/src/clicache/src/AttributesFactory.cpp
@@ -51,9 +51,9 @@ namespace GemStone
       AttributesFactory<TKey, TValue>::AttributesFactory( 
GemStone::GemFire::Cache::Generic::RegionAttributes<TKey, TValue>^ 
regionAttributes )
         : UMWrap( )
       {
-        gemfire::RegionAttributesPtr attribptr(
-          GetNativePtrFromSBWrapGeneric<gemfire::RegionAttributes>( 
regionAttributes ) );
-        SetPtr( new gemfire::AttributesFactory( attribptr ), true );
+        apache::geode::client::RegionAttributesPtr attribptr(
+          
GetNativePtrFromSBWrapGeneric<apache::geode::client::RegionAttributes>( 
regionAttributes ) );
+        SetPtr( new apache::geode::client::AttributesFactory( attribptr ), 
true );
       }
 
       // CALLBACKS
@@ -61,12 +61,12 @@ namespace GemStone
       generic<class TKey, class TValue>
       void AttributesFactory<TKey, TValue>::SetCacheLoader( ICacheLoader<TKey, 
TValue>^ cacheLoader )
       {
-        gemfire::CacheLoaderPtr loaderptr;
+        apache::geode::client::CacheLoaderPtr loaderptr;
         if ( cacheLoader != nullptr ) {
           CacheLoaderGeneric<TKey, TValue>^ clg = gcnew 
CacheLoaderGeneric<TKey, TValue>();
           clg->SetCacheLoader(cacheLoader);
-          loaderptr = new gemfire::ManagedCacheLoaderGeneric( /*clg,*/ 
cacheLoader );
-          ((gemfire::ManagedCacheLoaderGeneric*)loaderptr.ptr())->setptr(clg);
+          loaderptr = new apache::geode::client::ManagedCacheLoaderGeneric( 
/*clg,*/ cacheLoader );
+          
((apache::geode::client::ManagedCacheLoaderGeneric*)loaderptr.ptr())->setptr(clg);
         }
         NativePtr->setCacheLoader( loaderptr );
       }
@@ -74,12 +74,12 @@ namespace GemStone
       generic<class TKey, class TValue>
       void AttributesFactory<TKey, TValue>::SetCacheWriter( ICacheWriter<TKey, 
TValue>^ cacheWriter )
       {
-        gemfire::CacheWriterPtr writerptr;
+        apache::geode::client::CacheWriterPtr writerptr;
         if ( cacheWriter != nullptr ) {
           CacheWriterGeneric<TKey, TValue>^ cwg = gcnew 
CacheWriterGeneric<TKey, TValue>();
           cwg->SetCacheWriter(cacheWriter);
-          writerptr = new gemfire::ManagedCacheWriterGeneric( /*cwg,*/ 
cacheWriter );
-          ((gemfire::ManagedCacheWriterGeneric*)writerptr.ptr())->setptr(cwg);
+          writerptr = new apache::geode::client::ManagedCacheWriterGeneric( 
/*cwg,*/ cacheWriter );
+          
((apache::geode::client::ManagedCacheWriterGeneric*)writerptr.ptr())->setptr(cwg);
         }
         NativePtr->setCacheWriter( writerptr );
       }
@@ -87,13 +87,13 @@ namespace GemStone
       generic<class TKey, class TValue>
       void AttributesFactory<TKey, TValue>::SetCacheListener( 
ICacheListener<TKey, TValue>^ cacheListener )
       {
-        gemfire::CacheListenerPtr listenerptr;
+        apache::geode::client::CacheListenerPtr listenerptr;
         if ( cacheListener != nullptr ) {
           CacheListenerGeneric<TKey, TValue>^ clg = gcnew 
CacheListenerGeneric<TKey, TValue>();
           clg->SetCacheListener(cacheListener);
-          //listenerptr = new gemfire::ManagedCacheListenerGeneric( 
(ICacheListener<Object^, Object^>^)cacheListener );
-          listenerptr = new gemfire::ManagedCacheListenerGeneric( /*clg,*/ 
cacheListener );
-          
((gemfire::ManagedCacheListenerGeneric*)listenerptr.ptr())->setptr(clg);
+          //listenerptr = new 
apache::geode::client::ManagedCacheListenerGeneric( (ICacheListener<Object^, 
Object^>^)cacheListener );
+          listenerptr = new 
apache::geode::client::ManagedCacheListenerGeneric( /*clg,*/ cacheListener );
+          
((apache::geode::client::ManagedCacheListenerGeneric*)listenerptr.ptr())->setptr(clg);
         }
         NativePtr->setCacheListener( listenerptr );
       }
@@ -101,21 +101,21 @@ namespace GemStone
       generic<class TKey, class TValue>
       void AttributesFactory<TKey, TValue>::SetPartitionResolver( 
IPartitionResolver<TKey, TValue>^ partitionresolver )
       {
-        gemfire::PartitionResolverPtr resolverptr;
+        apache::geode::client::PartitionResolverPtr resolverptr;
         if ( partitionresolver != nullptr ) {
           Generic::IFixedPartitionResolver<TKey, TValue>^ resolver = 
             dynamic_cast<Generic::IFixedPartitionResolver<TKey, 
TValue>^>(partitionresolver);
           if (resolver != nullptr) {            
             FixedPartitionResolverGeneric<TKey, TValue>^ prg = gcnew 
FixedPartitionResolverGeneric<TKey, TValue>();
             prg->SetPartitionResolver(partitionresolver);
-            resolverptr = new gemfire::ManagedFixedPartitionResolverGeneric( 
partitionresolver ); 
-            
((gemfire::ManagedFixedPartitionResolverGeneric*)resolverptr.ptr())->setptr(prg);
+            resolverptr = new 
apache::geode::client::ManagedFixedPartitionResolverGeneric( partitionresolver 
); 
+            
((apache::geode::client::ManagedFixedPartitionResolverGeneric*)resolverptr.ptr())->setptr(prg);
           }
           else {            
             PartitionResolverGeneric<TKey, TValue>^ prg = gcnew 
PartitionResolverGeneric<TKey, TValue>();
             prg->SetPartitionResolver(partitionresolver);
-            resolverptr = new gemfire::ManagedPartitionResolverGeneric( 
partitionresolver );
-            
((gemfire::ManagedPartitionResolverGeneric*)resolverptr.ptr())->setptr(prg);    
        
+            resolverptr = new 
apache::geode::client::ManagedPartitionResolverGeneric( partitionresolver );
+            
((apache::geode::client::ManagedPartitionResolverGeneric*)resolverptr.ptr())->setptr(prg);
            
           }         
         }
         NativePtr->setPartitionResolver( resolverptr );
@@ -171,42 +171,42 @@ namespace GemStone
       void AttributesFactory<TKey, TValue>::SetEntryIdleTimeout( 
ExpirationAction action, uint32_t idleTimeout )
       {
         NativePtr->setEntryIdleTimeout(
-          static_cast<gemfire::ExpirationAction::Action>( action ), 
idleTimeout );
+          static_cast<apache::geode::client::ExpirationAction::Action>( action 
), idleTimeout );
       }
 
       generic<class TKey, class TValue>
       void AttributesFactory<TKey, TValue>::SetEntryTimeToLive( 
ExpirationAction action, uint32_t timeToLive )
       {
         NativePtr->setEntryTimeToLive(
-          static_cast<gemfire::ExpirationAction::Action>( action ), timeToLive 
);
+          static_cast<apache::geode::client::ExpirationAction::Action>( action 
), timeToLive );
       }
 
       generic<class TKey, class TValue>
       void AttributesFactory<TKey, TValue>::SetRegionIdleTimeout( 
ExpirationAction action, uint32_t idleTimeout )
       {
         NativePtr->setRegionIdleTimeout(
-          static_cast<gemfire::ExpirationAction::Action>( action ), 
idleTimeout );
+          static_cast<apache::geode::client::ExpirationAction::Action>( action 
), idleTimeout );
       }
 
       generic<class TKey, class TValue>
       void AttributesFactory<TKey, TValue>::SetRegionTimeToLive( 
ExpirationAction action, uint32_t timeToLive )
       {
         NativePtr->setRegionTimeToLive(
-          static_cast<gemfire::ExpirationAction::Action>( action ), timeToLive 
);
+          static_cast<apache::geode::client::ExpirationAction::Action>( action 
), timeToLive );
       }
 
       // PERSISTENCE
        generic<class TKey, class TValue>
       void AttributesFactory<TKey, 
TValue>::SetPersistenceManager(IPersistenceManager<TKey, TValue>^ 
persistenceManager, Properties<String^, String^>^ config )
       {
-        gemfire::PersistenceManagerPtr persistenceManagerptr;
+        apache::geode::client::PersistenceManagerPtr persistenceManagerptr;
         if ( persistenceManager != nullptr ) {
           PersistenceManagerGeneric<TKey, TValue>^ clg = gcnew 
PersistenceManagerGeneric<TKey, TValue>();
           clg->SetPersistenceManager(persistenceManager);
-          persistenceManagerptr = new 
gemfire::ManagedPersistenceManagerGeneric( /*clg,*/ persistenceManager );
-          
((gemfire::ManagedPersistenceManagerGeneric*)persistenceManagerptr.ptr())->setptr(clg);
+          persistenceManagerptr = new 
apache::geode::client::ManagedPersistenceManagerGeneric( /*clg,*/ 
persistenceManager );
+          
((apache::geode::client::ManagedPersistenceManagerGeneric*)persistenceManagerptr.ptr())->setptr(clg);
         }
-         gemfire::PropertiesPtr configptr(GetNativePtr<gemfire::Properties>( 
config ) );
+         apache::geode::client::PropertiesPtr 
configptr(GetNativePtr<apache::geode::client::Properties>( config ) );
          NativePtr->setPersistenceManager( persistenceManagerptr, configptr );
       }
       
@@ -231,8 +231,8 @@ namespace GemStone
         ManagedString mg_factoryFunctionName( factoryFunctionName );
         //  TODO:
                                //TODO::split
-        gemfire::PropertiesPtr configptr(
-          GetNativePtr<gemfire::Properties>( config ) );
+        apache::geode::client::PropertiesPtr configptr(
+          GetNativePtr<apache::geode::client::Properties>( config ) );
 
         NativePtr->setPersistenceManager( mg_libpath.CharPtr,
           mg_factoryFunctionName.CharPtr, configptr );
@@ -291,7 +291,7 @@ namespace GemStone
       void AttributesFactory<TKey, TValue>::SetDiskPolicy( DiskPolicyType 
diskPolicy )
       {
         NativePtr->setDiskPolicy(
-          static_cast<gemfire::DiskPolicyType::PolicyType>( diskPolicy ) );
+          static_cast<apache::geode::client::DiskPolicyType::PolicyType>( 
diskPolicy ) );
       }
 
       generic<class TKey, class TValue>
@@ -318,7 +318,7 @@ namespace GemStone
       {
         _GF_MG_EXCEPTION_TRY2/* due to auto replace */
 
-          gemfire::RegionAttributesPtr& nativeptr (
+          apache::geode::client::RegionAttributesPtr& nativeptr (
             NativePtr->createRegionAttributes( ) );
           return GemStone::GemFire::Cache::Generic::RegionAttributes<TKey, 
TValue>::Create(nativeptr.ptr());
 

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/clicache/src/AttributesFactory.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/AttributesFactory.hpp 
b/src/clicache/src/AttributesFactory.hpp
index cb27fd6..2e5ecff 100644
--- a/src/clicache/src/AttributesFactory.hpp
+++ b/src/clicache/src/AttributesFactory.hpp
@@ -158,7 +158,7 @@ namespace GemStone
       /// <seealso cref="Region.CreateSubRegion" />
       generic<class TKey, class TValue>
       public ref class AttributesFactory sealed
-        : public Internal::UMWrap<gemfire::AttributesFactory>
+        : public Internal::UMWrap<apache::geode::client::AttributesFactory>
       {
       public:
 
@@ -167,7 +167,7 @@ namespace GemStone
         /// a <c>RegionAttributes</c> with default settings.
         /// </summary>
         inline AttributesFactory<TKey, TValue>( )
-          : UMWrap( new gemfire::AttributesFactory( ), true ) { }
+          : UMWrap( new apache::geode::client::AttributesFactory( ), true ) { }
 
         /// <summary>
         /// Creates a new instance of <c>AttributesFactory</c> ready to create

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/clicache/src/AttributesMutator.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/AttributesMutator.cpp 
b/src/clicache/src/AttributesMutator.cpp
index a63baec..f276f68 100644
--- a/src/clicache/src/AttributesMutator.cpp
+++ b/src/clicache/src/AttributesMutator.cpp
@@ -46,7 +46,7 @@ namespace GemStone
       {
         return static_cast<ExpirationAction>(
           NativePtr->setEntryIdleTimeoutAction(
-          static_cast<gemfire::ExpirationAction::Action>( action ) ) );
+          static_cast<apache::geode::client::ExpirationAction::Action>( action 
) ) );
       }
 
       generic<class TKey, class TValue>
@@ -61,7 +61,7 @@ namespace GemStone
       {
         return static_cast<ExpirationAction>(
           NativePtr->setEntryTimeToLiveAction(
-          static_cast<gemfire::ExpirationAction::Action>( action ) ) );
+          static_cast<apache::geode::client::ExpirationAction::Action>( action 
) ) );
       }
 
       generic<class TKey, class TValue>
@@ -76,7 +76,7 @@ namespace GemStone
       {
         return static_cast<ExpirationAction>(
           NativePtr->setRegionIdleTimeoutAction(
-          static_cast<gemfire::ExpirationAction::Action>( action ) ) );
+          static_cast<apache::geode::client::ExpirationAction::Action>( action 
) ) );
       }
 
       generic<class TKey, class TValue>
@@ -91,7 +91,7 @@ namespace GemStone
       {
         return static_cast<ExpirationAction>(
           NativePtr->setRegionTimeToLiveAction(
-          static_cast<gemfire::ExpirationAction::Action>( action ) ) );
+          static_cast<apache::geode::client::ExpirationAction::Action>( action 
) ) );
       }
 
       generic<class TKey, class TValue>
@@ -103,13 +103,13 @@ namespace GemStone
       generic<class TKey, class TValue>
       void AttributesMutator<TKey, TValue>::SetCacheListener( 
ICacheListener<TKey, TValue>^ cacheListener )
       {
-        gemfire::CacheListenerPtr listenerptr;
+        apache::geode::client::CacheListenerPtr listenerptr;
         if (cacheListener != nullptr)
         {
           CacheListenerGeneric<TKey, TValue>^ clg = gcnew 
CacheListenerGeneric<TKey, TValue>();
           clg->SetCacheListener(cacheListener);
-          listenerptr = new gemfire::ManagedCacheListenerGeneric( /*clg,*/ 
cacheListener );
-          
((gemfire::ManagedCacheListenerGeneric*)listenerptr.ptr())->setptr(clg);
+          listenerptr = new 
apache::geode::client::ManagedCacheListenerGeneric( /*clg,*/ cacheListener );
+          
((apache::geode::client::ManagedCacheListenerGeneric*)listenerptr.ptr())->setptr(clg);
         }
         NativePtr->setCacheListener( listenerptr );
       }
@@ -129,13 +129,13 @@ namespace GemStone
       generic<class TKey, class TValue>
       void AttributesMutator<TKey, TValue>::SetCacheLoader( ICacheLoader<TKey, 
TValue>^ cacheLoader )
       {
-        gemfire::CacheLoaderPtr loaderptr;
+        apache::geode::client::CacheLoaderPtr loaderptr;
         if (cacheLoader != nullptr)
         {
           CacheLoaderGeneric<TKey, TValue>^ clg = gcnew 
CacheLoaderGeneric<TKey, TValue>();
           clg->SetCacheLoader(cacheLoader);
-          loaderptr = new gemfire::ManagedCacheLoaderGeneric( /*clg,*/ 
cacheLoader );
-          ((gemfire::ManagedCacheLoaderGeneric*)loaderptr.ptr())->setptr(clg);
+          loaderptr = new apache::geode::client::ManagedCacheLoaderGeneric( 
/*clg,*/ cacheLoader );
+          
((apache::geode::client::ManagedCacheLoaderGeneric*)loaderptr.ptr())->setptr(clg);
         }
         NativePtr->setCacheLoader( loaderptr );
       }
@@ -155,13 +155,13 @@ namespace GemStone
       generic<class TKey, class TValue>
       void AttributesMutator<TKey, TValue>::SetCacheWriter( ICacheWriter<TKey, 
TValue>^ cacheWriter )
       {
-        gemfire::CacheWriterPtr writerptr;
+        apache::geode::client::CacheWriterPtr writerptr;
         if (cacheWriter != nullptr)
         {
           CacheWriterGeneric<TKey, TValue>^ cwg = gcnew 
CacheWriterGeneric<TKey, TValue>();
           cwg->SetCacheWriter(cacheWriter);
-          writerptr = new gemfire::ManagedCacheWriterGeneric( /*cwg,*/ 
cacheWriter );
-          ((gemfire::ManagedCacheWriterGeneric*)writerptr.ptr())->setptr(cwg);
+          writerptr = new apache::geode::client::ManagedCacheWriterGeneric( 
/*cwg,*/ cacheWriter );
+          
((apache::geode::client::ManagedCacheWriterGeneric*)writerptr.ptr())->setptr(cwg);
         }
         NativePtr->setCacheWriter( writerptr );
       }

Reply via email to