geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aba...@apache.org
Subject [6/6] geode git commit: GEODE-2411: Remove references to Gemfire from include guards.
Date Tue, 07 Feb 2017 23:53:30 GMT
GEODE-2411: Remove references to Gemfire from include guards.

This closes #387

- Replace Gemfire-related include guards with #pragma once.
- Add Geode-related, Google-style-guide-compliant
  include guards for feature-poor compilers.


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

Branch: refs/heads/next-gen-native-client-software-grant
Commit: 8b53f0a165b10dd4f3669c26b1cbd16ca89c8cf4
Parents: 75b7d92
Author: Sarge <mdodge@pivotal.io>
Authored: Wed Feb 1 13:00:14 2017 -0800
Committer: Anthony Baker <abaker@apache.org>
Committed: Tue Feb 7 15:52:54 2017 -0800

----------------------------------------------------------------------
 src/cppcache/include/gfcpp/Assert.hpp              | 10 ++++++----
 src/cppcache/include/gfcpp/AttributesFactory.hpp   | 10 +++++++---
 src/cppcache/include/gfcpp/AttributesMutator.hpp   | 10 +++++++---
 src/cppcache/include/gfcpp/AuthInitialize.hpp      |  9 ++++++---
 src/cppcache/include/gfcpp/Cache.hpp               | 10 +++++++---
 src/cppcache/include/gfcpp/CacheAttributes.hpp     |  9 ++++++---
 src/cppcache/include/gfcpp/CacheFactory.hpp        |  9 ++++++---
 src/cppcache/include/gfcpp/CacheListener.hpp       | 10 +++++++---
 src/cppcache/include/gfcpp/CacheLoader.hpp         | 10 +++++++---
 src/cppcache/include/gfcpp/CacheStatistics.hpp     | 10 +++++++---
 .../include/gfcpp/CacheTransactionManager.hpp      | 10 +++++++---
 src/cppcache/include/gfcpp/CacheWriter.hpp         |  9 ++++++---
 src/cppcache/include/gfcpp/Cacheable.hpp           |  9 ++++++---
 src/cppcache/include/gfcpp/Cacheable.inl           |  9 ++++++---
 src/cppcache/include/gfcpp/CacheableBuiltins.hpp   |  8 +++++---
 src/cppcache/include/gfcpp/CacheableDate.hpp       |  9 ++++++---
 src/cppcache/include/gfcpp/CacheableEnum.hpp       | 10 +++++++---
 src/cppcache/include/gfcpp/CacheableFileName.hpp   |  8 +++++---
 src/cppcache/include/gfcpp/CacheableKey.hpp        |  9 ++++++---
 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     |  8 +++++---
 src/cppcache/include/gfcpp/CacheableUndefined.hpp  |  8 +++++---
 src/cppcache/include/gfcpp/CqAttributes.hpp        |  9 ++++++---
 src/cppcache/include/gfcpp/CqAttributesFactory.hpp |  9 ++++++---
 src/cppcache/include/gfcpp/CqAttributesMutator.hpp |  9 ++++++---
 src/cppcache/include/gfcpp/CqEvent.hpp             |  9 ++++++---
 src/cppcache/include/gfcpp/CqListener.hpp          |  9 ++++++---
 src/cppcache/include/gfcpp/CqOperation.hpp         | 10 +++++++---
 src/cppcache/include/gfcpp/CqQuery.hpp             |  9 ++++++---
 src/cppcache/include/gfcpp/CqResults.hpp           |  9 ++++++---
 src/cppcache/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           |  8 +++++---
 src/cppcache/include/gfcpp/DataOutput.hpp          |  8 +++++---
 src/cppcache/include/gfcpp/Delta.hpp               | 10 +++++++---
 src/cppcache/include/gfcpp/DiskPolicyType.hpp      | 10 +++++++---
 src/cppcache/include/gfcpp/DistributedSystem.hpp   |  9 ++++++---
 src/cppcache/include/gfcpp/EntryEvent.hpp          |  9 ++++++---
 src/cppcache/include/gfcpp/Exception.hpp           |  9 ++++++---
 src/cppcache/include/gfcpp/ExceptionTypes.hpp      |  9 ++++++---
 src/cppcache/include/gfcpp/Execution.hpp           | 11 +++++++----
 src/cppcache/include/gfcpp/ExpirationAction.hpp    | 10 +++++++---
 .../include/gfcpp/ExpirationAttributes.hpp         | 10 +++++++---
 .../include/gfcpp/FixedPartitionResolver.hpp       | 10 +++++++---
 src/cppcache/include/gfcpp/FunctionService.hpp     | 10 ++++++----
 src/cppcache/include/gfcpp/GemFireCache.hpp        | 10 +++++++---
 src/cppcache/include/gfcpp/GeodeCppCache.hpp       | 10 +++++++---
 src/cppcache/include/gfcpp/GeodeCppCache.inl       |  6 +++---
 src/cppcache/include/gfcpp/GeodeTypeIds.hpp        | 10 +++++++---
 src/cppcache/include/gfcpp/HashFunction.hpp        |  8 +++++---
 src/cppcache/include/gfcpp/HashMapOfSharedBase.hpp |  8 +++++---
 src/cppcache/include/gfcpp/HashMapT.hpp            |  8 +++++---
 src/cppcache/include/gfcpp/HashSetOfSharedBase.hpp |  8 +++++---
 src/cppcache/include/gfcpp/HashSetT.hpp            |  8 +++++---
 .../gfcpp/InternalCacheTransactionManager2PC.hpp   | 10 +++++++---
 src/cppcache/include/gfcpp/Log.hpp                 | 10 +++++-----
 src/cppcache/include/gfcpp/PartitionResolver.hpp   | 10 +++++++---
 src/cppcache/include/gfcpp/PdxAutoSerializer.hpp   | 10 +++++++---
 src/cppcache/include/gfcpp/PdxFieldTypes.hpp       |  9 ++++++---
 src/cppcache/include/gfcpp/PdxInstance.hpp         |  9 ++++++---
 src/cppcache/include/gfcpp/PdxInstanceFactory.hpp  | 10 +++++++---
 src/cppcache/include/gfcpp/PdxReader.hpp           |  9 ++++++---
 src/cppcache/include/gfcpp/PdxSerializable.hpp     |  8 +++++---
 src/cppcache/include/gfcpp/PdxSerializer.hpp       | 10 +++++++---
 src/cppcache/include/gfcpp/PdxUnreadFields.hpp     |  8 +++++---
 src/cppcache/include/gfcpp/PdxWrapper.hpp          | 10 +++++++---
 src/cppcache/include/gfcpp/PdxWriter.hpp           |  9 ++++++---
 src/cppcache/include/gfcpp/PersistenceManager.hpp  | 10 +++++++---
 src/cppcache/include/gfcpp/Pool.hpp                |  9 ++++++---
 src/cppcache/include/gfcpp/PoolFactory.hpp         | 10 +++++++---
 src/cppcache/include/gfcpp/PoolManager.hpp         |  8 +++++---
 src/cppcache/include/gfcpp/Properties.hpp          | 10 +++++++---
 src/cppcache/include/gfcpp/Query.hpp               |  9 ++++++---
 src/cppcache/include/gfcpp/QueryService.hpp        |  9 ++++++---
 src/cppcache/include/gfcpp/Region.hpp              |  8 +++++---
 src/cppcache/include/gfcpp/RegionAttributes.hpp    |  9 ++++++---
 src/cppcache/include/gfcpp/RegionEntry.hpp         |  9 ++++++---
 src/cppcache/include/gfcpp/RegionEvent.hpp         |  9 ++++++---
 src/cppcache/include/gfcpp/RegionFactory.hpp       |  9 ++++++---
 src/cppcache/include/gfcpp/RegionService.hpp       | 10 +++++++---
 src/cppcache/include/gfcpp/RegionShortcut.hpp      |  8 +++++---
 src/cppcache/include/gfcpp/ResultCollector.hpp     | 10 +++++++---
 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        |  9 ++++++---
 src/cppcache/include/gfcpp/Serializer.hpp          |  8 +++++---
 src/cppcache/include/gfcpp/SharedBase.hpp          |  8 +++++---
 src/cppcache/include/gfcpp/SharedPtr.hpp           |  8 +++++---
 src/cppcache/include/gfcpp/SharedPtrHelper.hpp     |  8 +++++---
 src/cppcache/include/gfcpp/Struct.hpp              |  9 ++++++---
 src/cppcache/include/gfcpp/StructSet.hpp           |  9 ++++++---
 src/cppcache/include/gfcpp/SystemProperties.hpp    |  8 +++++---
 src/cppcache/include/gfcpp/TransactionId.hpp       | 10 +++++++---
 src/cppcache/include/gfcpp/TypeHelper.hpp          |  8 +++++---
 src/cppcache/include/gfcpp/UserData.hpp            |  9 ++++++---
 .../gfcpp/UserFunctionExecutionException.hpp       | 10 +++++++---
 src/cppcache/include/gfcpp/VectorOfSharedBase.hpp  |  7 ++++---
 src/cppcache/include/gfcpp/VectorT.hpp             |  7 ++++---
 src/cppcache/include/gfcpp/WritablePdxInstance.hpp | 10 +++++++---
 src/cppcache/include/gfcpp/gf_base.hpp             |  9 ++++++---
 src/cppcache/include/gfcpp/gf_types.hpp            | 10 +++++++---
 src/cppcache/include/gfcpp/gfcpp_globals.hpp       |  9 ++++++---
 .../gfcpp/statistics/StatisticDescriptor.hpp       |  8 +++++---
 .../include/gfcpp/statistics/Statistics.hpp        |  9 ++++++---
 .../include/gfcpp/statistics/StatisticsFactory.hpp |  9 ++++++---
 .../include/gfcpp/statistics/StatisticsType.hpp    |  9 ++++++---
 src/cppcache/integration-test/BBNamingContext.hpp  | 10 +++++++---
 .../integration-test/BuiltinCacheableWrappers.hpp  | 10 +++++++---
 src/cppcache/integration-test/CacheHelper.hpp      | 10 +++++++---
 src/cppcache/integration-test/CacheImplHelper.hpp  | 10 +++++++---
 src/cppcache/integration-test/CacheableWrapper.hpp | 10 +++++++---
 src/cppcache/integration-test/DeltaEx.hpp          | 10 +++++++---
 src/cppcache/integration-test/LocatorHelper.hpp    |  7 +++++++
 src/cppcache/integration-test/QueryHelper.hpp      | 10 +++++++---
 src/cppcache/integration-test/QueryStrings.hpp     | 10 +++++++---
 src/cppcache/integration-test/TallyListener.hpp    | 10 +++++++---
 src/cppcache/integration-test/TallyLoader.hpp      | 10 +++++++---
 src/cppcache/integration-test/TallyWriter.hpp      | 10 +++++++---
 src/cppcache/integration-test/ThinClientCQ.hpp     | 10 +++++++---
 .../integration-test/ThinClientCallbackArg.hpp     | 10 +++++++---
 .../integration-test/ThinClientDistOps.hpp         | 10 +++++++---
 .../integration-test/ThinClientDistOps2.hpp        | 10 +++++++---
 .../integration-test/ThinClientDurable.hpp         | 10 +++++++---
 .../integration-test/ThinClientDurableConnect.hpp  | 10 +++++++---
 .../integration-test/ThinClientDurableFailover.hpp | 10 +++++++---
 .../integration-test/ThinClientDurableInit.hpp     | 10 +++++++---
 .../integration-test/ThinClientDurableInterest.hpp | 10 +++++++---
 .../ThinClientDurableReconnect.hpp                 | 10 +++++++---
 .../integration-test/ThinClientFailover.hpp        |  7 +++++++
 .../integration-test/ThinClientFailover2.hpp       |  7 +++++++
 .../integration-test/ThinClientFailover3.hpp       |  7 +++++++
 .../ThinClientFailoverInterest.hpp                 |  7 +++++++
 .../ThinClientFailoverInterest2.hpp                |  7 +++++++
 .../ThinClientFailoverInterestAllWithCache.hpp     |  7 +++++++
 .../integration-test/ThinClientFailoverRegex.hpp   |  7 +++++++
 .../integration-test/ThinClientGatewayTest.hpp     | 10 +++++++---
 .../integration-test/ThinClientHeapLRU.hpp         | 10 +++++++---
 src/cppcache/integration-test/ThinClientHelper.hpp | 10 +++++++---
 .../integration-test/ThinClientInterest1.hpp       |  7 +++++++
 .../integration-test/ThinClientInterest2.hpp       |  7 +++++++
 .../integration-test/ThinClientInterest3.hpp       |  7 +++++++
 .../ThinClientInterest3Cacheless.hpp               |  7 +++++++
 .../integration-test/ThinClientInterestList.hpp    |  7 +++++++
 .../integration-test/ThinClientInterestList2.hpp   |  7 +++++++
 .../integration-test/ThinClientListenerInit.hpp    | 10 +++++++---
 .../integration-test/ThinClientListenerWriter.hpp  | 10 +++++++---
 .../ThinClientLocalCacheLoader.hpp                 | 10 +++++++---
 .../integration-test/ThinClientNotification.hpp    |  7 +++++++
 .../integration-test/ThinClientPdxSerializer.hpp   |  7 +++++++
 .../integration-test/ThinClientPdxSerializers.hpp  | 10 +++++++---
 src/cppcache/integration-test/ThinClientPutAll.hpp | 10 +++++++---
 .../integration-test/ThinClientPutAllTimeout.hpp   |  7 +++++++
 .../ThinClientPutAllWithCallBack.hpp               | 10 +++++++---
 .../integration-test/ThinClientPutGetAll.hpp       | 10 +++++++---
 .../ThinClientRIwithlocalRegionDestroy.hpp         |  7 +++++++
 src/cppcache/integration-test/ThinClientRegex.hpp  |  7 +++++++
 src/cppcache/integration-test/ThinClientRegex2.hpp |  7 +++++++
 src/cppcache/integration-test/ThinClientRegex3.hpp |  7 +++++++
 .../integration-test/ThinClientRemoveAll.hpp       | 10 +++++++---
 src/cppcache/integration-test/ThinClientSSL.hpp    |  7 +++++++
 .../integration-test/ThinClientSSLWithPassword.hpp |  7 +++++++
 .../integration-test/ThinClientSecurity.hpp        | 10 +++++++---
 .../integration-test/ThinClientSecurityHelper.hpp  |  7 +++++++
 .../integration-test/ThinClientTXFailover.hpp      |  7 +++++++
 .../integration-test/ThinClientTasks_C2S2.hpp      | 10 +++++++---
 .../integration-test/ThinClientTransactions.hpp    | 10 +++++++---
 .../integration-test/ThinClientTransactionsXA.hpp  | 10 +++++++---
 .../integration-test/ThinClientVersionedOps.hpp    |  7 +++++++
 src/cppcache/integration-test/TimeBomb.hpp         | 10 +++++++---
 src/cppcache/integration-test/fw_dunit.hpp         | 10 +++++++---
 src/cppcache/integration-test/fw_helper.hpp        | 10 +++++++---
 src/cppcache/integration-test/fw_perf.hpp          | 10 +++++++---
 src/cppcache/integration-test/fw_spawn.hpp         | 10 +++++++---
 src/cppcache/integration-test/locator_globals.hpp  | 10 +++++++---
 src/cppcache/integration-test/no_cout.hpp          |  7 +++++++
 src/cppcache/integration-test/testCache.cpp        |  2 --
 .../integration-test/testThinClientHAFailover.cpp  |  1 -
 .../testThinClientHAFailoverRegex.cpp              |  1 -
 .../testThinClientHAMixedRedundancy.cpp            |  1 -
 .../integration-test/testThinClientPdxEnum.cpp     |  9 ---------
 .../integration-test/testThinClientPdxInstance.cpp |  9 ---------
 .../integration-test/testThinClientRemoveOps.cpp   |  4 ----
 src/cppcache/integration-test/testUtils.hpp        | 10 +++++++---
 src/cppcache/src/AdminRegion.hpp                   | 10 +++++++---
 src/cppcache/src/AppDomainContext.hpp              | 10 ++++++----
 src/cppcache/src/AtomicInc.hpp                     |  9 ++++++---
 src/cppcache/src/AutoDelete.hpp                    |  8 +++++---
 src/cppcache/src/BucketServerLocation.hpp          | 10 +++++++---
 src/cppcache/src/CacheImpl.hpp                     | 11 ++++++++---
 src/cppcache/src/CachePerfStats.hpp                | 10 ++++++----
 src/cppcache/src/CacheRegionHelper.hpp             | 10 +++++++---
 src/cppcache/src/CacheTransactionManagerImpl.hpp   | 10 +++++++---
 src/cppcache/src/CacheXml.hpp                      | 10 +++++++---
 src/cppcache/src/CacheXmlCreation.hpp              |  9 ++++++---
 src/cppcache/src/CacheXmlParser.hpp                | 11 ++++++++---
 src/cppcache/src/CacheableObjectPartList.hpp       |  8 +++++---
 src/cppcache/src/CacheableToken.hpp                |  9 ++++++---
 src/cppcache/src/CachedDeserializableHelper.hpp    | 10 +++++++---
 src/cppcache/src/ClientConnectionRequest.hpp       | 10 +++++++---
 src/cppcache/src/ClientConnectionResponse.hpp      | 10 +++++++---
 src/cppcache/src/ClientHealthStats.hpp             | 10 +++++++---
 src/cppcache/src/ClientMetadata.hpp                | 10 +++++++---
 src/cppcache/src/ClientMetadataService.hpp         | 10 +++++++---
 src/cppcache/src/ClientProxyMembershipID.hpp       | 10 +++++++---
 src/cppcache/src/ClientReplacementRequest.hpp      | 10 +++++++---
 src/cppcache/src/ConcurrentEntriesMap.hpp          |  9 ++++++---
 src/cppcache/src/Condition.hpp                     |  9 ++++++---
 src/cppcache/src/ConnectCounter.hpp                |  9 ++++++---
 src/cppcache/src/Connector.hpp                     | 10 +++++++---
 src/cppcache/src/CppCacheLibrary.hpp               |  9 ++++++---
 src/cppcache/src/CqAttributesImpl.hpp              |  9 ++++++---
 src/cppcache/src/CqAttributesMutatorImpl.hpp       |  9 ++++++---
 src/cppcache/src/CqEventImpl.hpp                   |  9 ++++++---
 src/cppcache/src/CqQueryImpl.hpp                   |  9 ++++++---
 src/cppcache/src/CqQueryVsdStats.hpp               |  9 ++++++---
 src/cppcache/src/CqService.hpp                     |  9 ++++++---
 src/cppcache/src/CqServiceVsdStats.hpp             | 10 ++++++----
 src/cppcache/src/DSMemberForVersionStamp.hpp       | 10 +++++++---
 src/cppcache/src/DiffieHellman.hpp                 | 10 +++++++---
 src/cppcache/src/DiskStoreId.hpp                   | 10 +++++++---
 src/cppcache/src/DiskVersionTag.hpp                | 10 +++++++---
 src/cppcache/src/DistributedSystemImpl.hpp         | 10 +++++++---
 src/cppcache/src/EntriesMap.hpp                    |  9 ++++++---
 src/cppcache/src/EntriesMapFactory.hpp             |  9 ++++++---
 src/cppcache/src/EntryExpiryHandler.hpp            | 10 +++++++---
 src/cppcache/src/EnumInfo.hpp                      | 10 +++++++---
 src/cppcache/src/EventId.hpp                       |  9 ++++++---
 src/cppcache/src/EventIdMap.hpp                    | 10 +++++++---
 src/cppcache/src/EventType.hpp                     | 10 +++++++---
 src/cppcache/src/EvictionController.hpp            | 10 +++++++---
 src/cppcache/src/EvictionThread.hpp                | 10 +++++++---
 src/cppcache/src/ExecutionImpl.hpp                 |  9 ++++++---
 src/cppcache/src/ExpMapEntry.hpp                   |  9 ++++++---
 src/cppcache/src/ExpiryHandler_T.hpp               | 10 +++++++---
 src/cppcache/src/ExpiryTaskManager.hpp             |  9 ++++++---
 src/cppcache/src/FairQueue.hpp                     |  9 ++++++---
 src/cppcache/src/FarSideEntryOp.hpp                | 10 +++++++---
 src/cppcache/src/FixedPartitionAttributesImpl.hpp  | 10 +++++++---
 src/cppcache/src/FunctionServiceImpl.hpp           |  9 ++++++---
 src/cppcache/src/GF_TASK_T.hpp                     | 10 +++++++---
 src/cppcache/src/GatewayEventCallbackArgument.hpp  | 10 +++++++---
 .../src/GatewaySenderEventCallbackArgument.hpp     | 10 +++++++---
 src/cppcache/src/GeodeTypeIdsImpl.hpp              | 10 +++++++---
 src/cppcache/src/GetAllServersRequest.hpp          | 10 +++++++---
 src/cppcache/src/GetAllServersResponse.hpp         | 10 +++++++---
 src/cppcache/src/HostAsm.hpp                       | 10 +++++++---
 src/cppcache/src/IntQueue.hpp                      |  9 ++++++---
 src/cppcache/src/InterestResultPolicy.hpp          |  9 ++++++---
 .../src/InternalCacheTransactionManager2PCImpl.hpp | 10 +++++++---
 src/cppcache/src/InternalDataView.hpp              | 10 +++++++---
 src/cppcache/src/LRUAction.hpp                     |  9 ++++++---
 src/cppcache/src/LRUEntriesMap.hpp                 |  9 ++++++---
 src/cppcache/src/LRUExpMapEntry.hpp                |  9 ++++++---
 src/cppcache/src/LRUList.hpp                       |  9 ++++++---
 src/cppcache/src/LRULocalDestroyAction.hpp         |  9 ++++++---
 src/cppcache/src/LRUMapEntry.hpp                   |  9 ++++++---
 src/cppcache/src/LocalRegion.hpp                   |  8 +++++---
 src/cppcache/src/LocatorListRequest.hpp            | 10 +++++++---
 src/cppcache/src/LocatorListResponse.hpp           | 10 +++++++---
 src/cppcache/src/MapEntry.hpp                      |  9 ++++++---
 src/cppcache/src/MapEntryT.hpp                     |  8 +++++---
 src/cppcache/src/MapSegment.hpp                    |  9 ++++++---
 src/cppcache/src/MapWithLock.hpp                   |  9 ++++++---
 src/cppcache/src/MemberListForVersionStamp.hpp     | 10 +++++++---
 src/cppcache/src/NanoTimer.hpp                     | 10 ++++++----
 src/cppcache/src/NoResult.hpp                      |  9 ++++++---
 src/cppcache/src/NonCopyable.hpp                   | 10 +++++++---
 src/cppcache/src/PdxEnumInstantiator.hpp           | 14 +++++++-------
 src/cppcache/src/PdxFieldType.hpp                  | 17 +++++++----------
 src/cppcache/src/PdxHelper.hpp                     | 10 +++++++---
 src/cppcache/src/PdxInstanceFactoryImpl.hpp        | 10 +++++++---
 src/cppcache/src/PdxInstanceImpl.hpp               | 10 +++++++---
 src/cppcache/src/PdxInstantiator.hpp               | 17 +++++++----------
 src/cppcache/src/PdxLocalReader.hpp                | 16 +++++++---------
 src/cppcache/src/PdxLocalWriter.hpp                | 17 +++++++----------
 src/cppcache/src/PdxReaderWithTypeCollector.hpp    | 16 ++++++----------
 src/cppcache/src/PdxRemotePreservedData.hpp        | 17 +++++++----------
 src/cppcache/src/PdxRemoteReader.hpp               | 16 +++++++---------
 src/cppcache/src/PdxRemoteWriter.hpp               | 10 +++++++---
 src/cppcache/src/PdxType.hpp                       | 17 +++++++----------
 src/cppcache/src/PdxTypeRegistry.hpp               | 17 +++++++----------
 src/cppcache/src/PdxTypes.hpp                      |  8 +++++---
 src/cppcache/src/PdxWriterWithTypeCollector.hpp    | 17 +++++++----------
 src/cppcache/src/PoolAttributes.hpp                |  9 ++++++---
 src/cppcache/src/PoolStatistics.hpp                | 10 ++++++----
 src/cppcache/src/PoolXmlCreation.hpp               | 10 +++++++---
 src/cppcache/src/PooledBase.hpp                    | 10 ++++------
 src/cppcache/src/PooledBasePool.hpp                |  9 ++++++---
 src/cppcache/src/PreservedDataExpiryHandler.hpp    | 10 +++++++---
 src/cppcache/src/ProxyCache.hpp                    | 10 +++++++---
 src/cppcache/src/ProxyRegion.hpp                   |  8 +++++---
 src/cppcache/src/ProxyRemoteQueryService.hpp       | 10 +++++++---
 src/cppcache/src/PutAllPartialResult.hpp           | 10 +++++++---
 .../src/PutAllPartialResultServerException.hpp     | 10 +++++++---
 src/cppcache/src/Queue.hpp                         |  9 ++++++---
 src/cppcache/src/QueueConnectionRequest.hpp        | 10 +++++++---
 src/cppcache/src/QueueConnectionResponse.hpp       | 10 +++++++---
 src/cppcache/src/ReadWriteLock.hpp                 |  9 ++++++---
 src/cppcache/src/RegionCommit.hpp                  | 10 +++++++---
 src/cppcache/src/RegionExpiryHandler.hpp           |  9 ++++++---
 src/cppcache/src/RegionGlobalLocks.hpp             |  8 +++++---
 src/cppcache/src/RegionInternal.hpp                |  8 +++++---
 src/cppcache/src/RegionStats.hpp                   | 10 ++++++----
 src/cppcache/src/RegionXmlCreation.hpp             | 10 +++++++---
 src/cppcache/src/RemoteQuery.hpp                   |  9 ++++++---
 src/cppcache/src/RemoteQueryService.hpp            | 10 +++++++---
 src/cppcache/src/ResultSetImpl.hpp                 |  9 ++++++---
 src/cppcache/src/SerializationRegistry.hpp         | 10 ++++++----
 src/cppcache/src/ServerLocation.hpp                | 10 +++++++---
 src/cppcache/src/ServerLocationRequest.hpp         | 10 +++++++---
 src/cppcache/src/ServerLocationResponse.hpp        | 10 +++++++---
 src/cppcache/src/Set.hpp                           |  9 ++++++---
 src/cppcache/src/SpinLock.hpp                      |  9 ++++++---
 src/cppcache/src/SslSockStream.hpp                 | 10 +++++++---
 src/cppcache/src/StackFrame.hpp                    | 10 ++++++----
 src/cppcache/src/StackTrace.hpp                    | 10 ++++++----
 src/cppcache/src/StructSetImpl.hpp                 |  9 ++++++---
 src/cppcache/src/SuspendedTxExpiryHandler.hpp      | 10 +++++++---
 src/cppcache/src/TSSTXStateWrapper.hpp             | 10 +++++++---
 src/cppcache/src/TXCleaner.hpp                     | 10 +++++++---
 src/cppcache/src/TXCommitMessage.hpp               | 10 +++++++---
 src/cppcache/src/TXEntryState.hpp                  | 10 +++++++---
 src/cppcache/src/TXId.hpp                          | 10 +++++++---
 src/cppcache/src/TXRegionState.hpp                 | 10 +++++++---
 src/cppcache/src/TXState.hpp                       | 10 +++++++---
 src/cppcache/src/TableOfPrimes.hpp                 |  9 ++++++---
 src/cppcache/src/TcpConn.hpp                       | 10 +++++++---
 src/cppcache/src/TcpSslConn.hpp                    | 10 +++++++---
 src/cppcache/src/TcrChunkedContext.hpp             | 10 +++++++---
 src/cppcache/src/TcrConnection.hpp                 | 10 +++++++---
 src/cppcache/src/TcrConnectionManager.hpp          | 10 +++++++---
 src/cppcache/src/TcrDistributionManager.hpp        | 10 +++++++---
 src/cppcache/src/TcrEndpoint.hpp                   | 10 +++++++---
 src/cppcache/src/TcrHADistributionManager.hpp      | 10 +++++++---
 src/cppcache/src/TcrMessage.hpp                    | 10 +++++++---
 src/cppcache/src/TcrPoolEndPoint.hpp               | 10 +++++++---
 src/cppcache/src/ThinClientBaseDM.hpp              | 10 +++++++---
 .../src/ThinClientCacheDistributionManager.hpp     | 10 +++++++---
 src/cppcache/src/ThinClientDistributionManager.hpp | 10 +++++++---
 src/cppcache/src/ThinClientHARegion.hpp            |  8 +++++---
 src/cppcache/src/ThinClientLocatorHelper.hpp       | 10 +++++++---
 src/cppcache/src/ThinClientPoolDM.hpp              | 10 +++++++---
 src/cppcache/src/ThinClientPoolHADM.hpp            | 10 +++++++---
 src/cppcache/src/ThinClientPoolRegion.hpp          | 10 +++++++---
 src/cppcache/src/ThinClientPoolStickyDM.hpp        | 10 +++++++---
 src/cppcache/src/ThinClientPoolStickyHADM.hpp      | 10 +++++++---
 src/cppcache/src/ThinClientRedundancyManager.hpp   | 10 +++++++---
 src/cppcache/src/ThinClientRegion.hpp              |  8 +++++---
 src/cppcache/src/ThinClientStickyManager.hpp       | 10 +++++++---
 src/cppcache/src/ThreadPool.hpp                    | 10 +++++++---
 src/cppcache/src/TimeoutTimer.hpp                  |  9 ++++++---
 src/cppcache/src/TombstoneExpiryHandler.hpp        |  9 ++++++---
 src/cppcache/src/TombstoneList.hpp                 | 10 ++++++----
 src/cppcache/src/TrackedMapEntry.hpp               | 10 ++++++----
 src/cppcache/src/TransactionSuspender.hpp          | 10 +++++++---
 src/cppcache/src/TransactionalOperation.hpp        | 10 +++++++---
 src/cppcache/src/TssConnectionWrapper.hpp          | 10 +++++++---
 src/cppcache/src/UserAttributes.hpp                |  9 ++++++---
 src/cppcache/src/Utils.hpp                         |  8 +++++---
 src/cppcache/src/Version.hpp                       | 10 +++++++---
 src/cppcache/src/VersionStamp.hpp                  |  9 ++++++---
 src/cppcache/src/VersionTag.hpp                    | 10 +++++++---
 .../src/VersionedCacheableObjectPartList.hpp       |  8 +++++---
 src/cppcache/src/gfcppBanner.hpp                   |  7 +++++++
 .../src/statistics/AtomicStatisticsImpl.hpp        |  9 ++++++---
 .../src/statistics/GeodeStatisticsFactory.hpp      |  8 +++++---
 src/cppcache/src/statistics/HostStatHelper.hpp     | 11 ++++++++---
 .../src/statistics/HostStatHelperLinux.hpp         |  9 ++++++---
 src/cppcache/src/statistics/HostStatHelperNull.hpp |  9 ++++++---
 .../src/statistics/HostStatHelperSolaris.hpp       |  9 ++++++---
 src/cppcache/src/statistics/HostStatHelperWin.hpp  |  9 ++++++---
 src/cppcache/src/statistics/HostStatSampler.hpp    |  8 +++++---
 src/cppcache/src/statistics/LinuxProcessStats.hpp  | 10 +++++++---
 src/cppcache/src/statistics/NullProcessStats.hpp   | 10 +++++++---
 src/cppcache/src/statistics/OsStatisticsImpl.hpp   |  9 ++++++---
 src/cppcache/src/statistics/PoolStatsSampler.hpp   | 10 +++++++---
 src/cppcache/src/statistics/ProcessStats.hpp       |  9 ++++++---
 .../src/statistics/SolarisProcessStats.hpp         |  9 ++++++---
 src/cppcache/src/statistics/StatArchiveWriter.hpp  | 10 ++++++----
 src/cppcache/src/statistics/StatSamplerStats.hpp   | 10 +++++++---
 .../src/statistics/StatisticDescriptorImpl.hpp     | 10 ++++++----
 src/cppcache/src/statistics/StatisticsManager.hpp  |  8 +++++---
 src/cppcache/src/statistics/StatisticsTypeImpl.hpp |  9 ++++++---
 src/cppcache/src/statistics/StatsDef.hpp           |  9 ++++++---
 .../src/statistics/WindowsProcessStats.hpp         |  9 ++++++---
 src/cryptoimpl/DHImpl.hpp                          | 10 +++++++---
 src/cryptoimpl/GFSsl.hpp                           | 10 +++++++---
 src/cryptoimpl/SSLImpl.hpp                         | 10 +++++++---
 src/dhimpl/DHImpl.hpp                              | 10 +++++++---
 src/pdxautoserializer/ASBuiltins.hpp               | 10 +++++++---
 src/pdxautoserializer/ASCLIBuiltins.hpp            | 10 +++++++---
 src/pdxautoserializer/ASCPPInclude.hpp             | 10 +++++++---
 src/pdxautoserializer/CodeGenerator.hpp            | 10 +++++++---
 src/pdxautoserializer/CodeGeneratorFactory.hpp     | 10 +++++++---
 src/pdxautoserializer/InputParser.hpp              | 10 +++++++---
 src/pdxautoserializer/InputParserFactory.hpp       | 10 +++++++---
 src/pdxautoserializer/OutputFormatter.hpp          | 10 +++++++---
 src/pdxautoserializer/base_types.hpp               | 10 +++++++---
 src/pdxautoserializer/impl/CPPCodeGenerator.hpp    | 10 +++++++---
 src/pdxautoserializer/impl/Helper.hpp              | 10 +++++++---
 src/pdxautoserializer/impl/Log.hpp                 | 10 +++++++---
 src/sqliteimpl/SqLiteHelper.hpp                    |  7 +++++++
 src/sqliteimpl/SqLiteImpl.hpp                      | 10 +++++++---
 src/tests/cpp/fwk/UdpIpc.hpp                       | 10 +++++++---
 src/tests/cpp/fwklib/ClientTask.hpp                | 10 +++++++---
 src/tests/cpp/fwklib/FrameworkTest.hpp             | 10 +++++++---
 src/tests/cpp/fwklib/FwkBB.hpp                     | 10 +++++++---
 src/tests/cpp/fwklib/FwkBBClient.hpp               | 10 +++++++---
 src/tests/cpp/fwklib/FwkBBServer.hpp               | 10 +++++++---
 src/tests/cpp/fwklib/FwkException.hpp              | 10 +++++++---
 src/tests/cpp/fwklib/FwkExport.hpp                 |  7 +++++++
 src/tests/cpp/fwklib/FwkLog.hpp                    | 10 +++++++---
 src/tests/cpp/fwklib/FwkObjects.hpp                | 10 +++++++---
 src/tests/cpp/fwklib/FwkStrCvt.hpp                 | 10 +++++++---
 src/tests/cpp/fwklib/GsRandom.hpp                  | 10 +++++++---
 src/tests/cpp/fwklib/IpcHandler.hpp                | 10 +++++++---
 src/tests/cpp/fwklib/MersenneTwister.hpp           | 11 +++++++----
 src/tests/cpp/fwklib/PaceMeter.hpp                 | 10 +++++++---
 src/tests/cpp/fwklib/PerfFwk.hpp                   | 10 +++++++---
 src/tests/cpp/fwklib/PoolHelper.hpp                | 10 +++++++---
 src/tests/cpp/fwklib/QueryHelper.hpp               | 10 +++++++---
 src/tests/cpp/fwklib/RegionHelper.hpp              | 10 +++++++---
 src/tests/cpp/fwklib/Service.hpp                   | 10 +++++++---
 src/tests/cpp/fwklib/TaskClient.hpp                | 10 +++++++---
 src/tests/cpp/fwklib/TcpIpc.hpp                    | 10 +++++++---
 src/tests/cpp/fwklib/TestClient.hpp                | 10 +++++++---
 src/tests/cpp/fwklib/TimeBomb.hpp                  | 10 +++++++---
 src/tests/cpp/fwklib/TimeLimit.hpp                 | 10 +++++++---
 src/tests/cpp/fwklib/TimeSync.hpp                  | 10 +++++++---
 src/tests/cpp/fwklib/Timer.hpp                     | 10 +++++++---
 src/tests/cpp/fwklib/UDPIpc.hpp                    | 10 +++++++---
 .../pdxautoserializerclass/AutoPdxVersioned1.hpp   | 10 +++++++---
 .../pdxautoserializerclass/AutoPdxVersioned2.hpp   | 10 +++++++---
 .../cpp/pdxautoserializerclass/PortfolioPdx.hpp    | 10 +++++++---
 .../cpp/pdxautoserializerclass/PositionPdx.hpp     | 10 +++++++---
 src/tests/cpp/security/CredentialGenerator.hpp     | 10 +++++++---
 .../cpp/security/DummyCredentialGenerator.hpp      | 10 +++++++---
 .../cpp/security/DummyCredentialGenerator2.hpp     | 10 +++++++---
 .../cpp/security/DummyCredentialGenerator3.hpp     | 10 +++++++---
 .../cpp/security/LdapUserCredentialGenerator.hpp   | 10 +++++++---
 src/tests/cpp/security/NoopCredentialGenerator.hpp | 10 +++++++---
 src/tests/cpp/security/PkcsAuthInit.hpp            | 10 +++++++---
 src/tests/cpp/security/PkcsCredentialGenerator.hpp | 10 +++++++---
 src/tests/cpp/security/Security.hpp                | 10 +++++++---
 .../cpp/security/XmlAuthzCredentialGenerator.hpp   | 10 +++++++---
 src/tests/cpp/security/typedefs.hpp                | 10 +++++++---
 src/tests/cpp/testobject/ArrayOfByte.hpp           | 10 +++++++---
 src/tests/cpp/testobject/BatchObject.hpp           | 10 +++++++---
 src/tests/cpp/testobject/DeltaFastAssetAccount.hpp | 10 +++++++---
 src/tests/cpp/testobject/DeltaPSTObject.hpp        | 10 +++++++---
 src/tests/cpp/testobject/DeltaTestImpl.hpp         | 10 +++++++---
 src/tests/cpp/testobject/DeltaTestObj.hpp          | 10 +++++++---
 src/tests/cpp/testobject/EqStruct.hpp              | 10 +++++++---
 src/tests/cpp/testobject/FastAsset.hpp             | 10 +++++++---
 src/tests/cpp/testobject/FastAssetAccount.hpp      | 10 +++++++---
 src/tests/cpp/testobject/InvalidPdxUsage.hpp       | 10 +++++++---
 src/tests/cpp/testobject/NestedPdxObject.hpp       | 10 +++++++---
 src/tests/cpp/testobject/NonPdxType.hpp            | 10 +++++++---
 src/tests/cpp/testobject/NoopAuthInit.hpp          | 10 +++++++---
 src/tests/cpp/testobject/PSTObject.hpp             | 10 +++++++---
 src/tests/cpp/testobject/PdxAutoMegaType.hpp       | 10 +++++++---
 src/tests/cpp/testobject/PdxClassV1.hpp            | 10 +++++++---
 src/tests/cpp/testobject/PdxClassV1WithAuto.hpp    | 10 +++++++---
 src/tests/cpp/testobject/PdxClassV2.hpp            | 10 +++++++---
 src/tests/cpp/testobject/PdxClassV2WithAuto.hpp    | 10 +++++++---
 src/tests/cpp/testobject/PdxType.hpp               | 10 +++++++---
 src/tests/cpp/testobject/PdxTypeWithAuto.hpp       | 10 +++++++---
 src/tests/cpp/testobject/PdxVersioned1.hpp         | 10 +++++++---
 src/tests/cpp/testobject/PdxVersioned2.hpp         | 10 +++++++---
 src/tests/cpp/testobject/Portfolio.hpp             | 10 +++++++---
 src/tests/cpp/testobject/PortfolioPdx.hpp          | 10 +++++++---
 src/tests/cpp/testobject/Position.hpp              | 10 +++++++---
 src/tests/cpp/testobject/PositionPdx.hpp           | 10 +++++++---
 src/tests/cpp/testobject/TestObject1.hpp           | 10 +++++++---
 src/tests/cpp/testobject/TimestampedObject.hpp     | 10 +++++++---
 src/tests/cpp/testobject/VariousPdxTypes.hpp       | 10 +++++++---
 .../cpp/testobject/VariousPdxTypesWithAuto.hpp     | 10 +++++++---
 482 files changed, 3111 insertions(+), 1456 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/Assert.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/Assert.hpp b/src/cppcache/include/gfcpp/Assert.hpp
index b06c027..a589ba8 100644
--- a/src/cppcache/include/gfcpp/Assert.hpp
+++ b/src/cppcache/include/gfcpp/Assert.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_GFCPP_ASSERT_H_
+#define GEODE_GFCPP_ASSERT_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -15,9 +20,6 @@
  * limitations under the License.
  */
 
-#ifndef _GEMFIRE_ASSERT_HPP_
-#define _GEMFIRE_ASSERT_HPP_
-
 #include "gfcpp_globals.hpp"
 
 /**
@@ -95,4 +97,4 @@ class CPPCACHE_EXPORT Assert {
 #define GF_DEV_ASSERT(x)
 #endif
 
-#endif
+#endif // GEODE_GFCPP_ASSERT_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/AttributesFactory.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/AttributesFactory.hpp b/src/cppcache/include/gfcpp/AttributesFactory.hpp
index c42ed1e..93ddd59 100644
--- a/src/cppcache/include/gfcpp/AttributesFactory.hpp
+++ b/src/cppcache/include/gfcpp/AttributesFactory.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_ATTRIBUTESFACTORY_H__
-#define __GEMFIRE_ATTRIBUTESFACTORY_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_ATTRIBUTESFACTORY_H_
+#define GEODE_GFCPP_ATTRIBUTESFACTORY_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -375,4 +378,5 @@ class CPPCACHE_EXPORT AttributesFactory : public SharedBase {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // ifndef __GEMFIRE_ATTRIBUTESFACTORY_H__
+
+#endif // GEODE_GFCPP_ATTRIBUTESFACTORY_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/AttributesMutator.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/AttributesMutator.hpp b/src/cppcache/include/gfcpp/AttributesMutator.hpp
index c946ea3..03bfa81 100644
--- a/src/cppcache/include/gfcpp/AttributesMutator.hpp
+++ b/src/cppcache/include/gfcpp/AttributesMutator.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_ATTRIBUTESMUTATOR_H__
-#define __GEMFIRE_ATTRIBUTESMUTATOR_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_ATTRIBUTESMUTATOR_H_
+#define GEODE_GFCPP_ATTRIBUTESMUTATOR_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -186,4 +189,5 @@ class CPPCACHE_EXPORT AttributesMutator : public SharedBase {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // ifndef __GEMFIRE_ATTRIBUTESMUTATOR_H__
+
+#endif // GEODE_GFCPP_ATTRIBUTESMUTATOR_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/AuthInitialize.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/AuthInitialize.hpp b/src/cppcache/include/gfcpp/AuthInitialize.hpp
index 337829b..8c17de7 100644
--- a/src/cppcache/include/gfcpp/AuthInitialize.hpp
+++ b/src/cppcache/include/gfcpp/AuthInitialize.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_AUTHINITIALIZE_H__
-#define __GEMFIRE_AUTHINITIALIZE_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_AUTHINITIALIZE_H_
+#define GEODE_GFCPP_AUTHINITIALIZE_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -62,4 +65,4 @@ class CPPCACHE_EXPORT AuthInitialize
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_AUTHINITIALIZE_H__
+#endif // GEODE_GFCPP_AUTHINITIALIZE_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/Cache.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/Cache.hpp b/src/cppcache/include/gfcpp/Cache.hpp
index ffaca50..697750c 100644
--- a/src/cppcache/include/gfcpp/Cache.hpp
+++ b/src/cppcache/include/gfcpp/Cache.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_CACHE_H__
-#define __GEMFIRE_CACHE_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_CACHE_H_
+#define GEODE_GFCPP_CACHE_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -246,4 +249,5 @@ class CPPCACHE_EXPORT Cache : public GemFireCache {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // ifndef __GEMFIRE_CACHE_H__
+
+#endif // GEODE_GFCPP_CACHE_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/CacheAttributes.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CacheAttributes.hpp b/src/cppcache/include/gfcpp/CacheAttributes.hpp
index 01a53d9..e52dd89 100644
--- a/src/cppcache/include/gfcpp/CacheAttributes.hpp
+++ b/src/cppcache/include/gfcpp/CacheAttributes.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_CACHEATTRIBUTES_H__
-#define __GEMFIRE_CACHEATTRIBUTES_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_CACHEATTRIBUTES_H_
+#define GEODE_GFCPP_CACHEATTRIBUTES_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -102,4 +105,4 @@ class CPPCACHE_EXPORT CacheAttributes : public SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_CACHEATTRIBUTES_H__
+#endif // GEODE_GFCPP_CACHEATTRIBUTES_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/CacheFactory.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CacheFactory.hpp b/src/cppcache/include/gfcpp/CacheFactory.hpp
index 4efeecd..59d4c1c 100644
--- a/src/cppcache/include/gfcpp/CacheFactory.hpp
+++ b/src/cppcache/include/gfcpp/CacheFactory.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_CACHEFACTORY_H__
-#define __GEMFIRE_CACHEFACTORY_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_CACHEFACTORY_H_
+#define GEODE_GFCPP_CACHEFACTORY_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -499,4 +502,4 @@ class CPPCACHE_EXPORT CacheFactory : public SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_CACHEFACTORY_H__
+#endif // GEODE_GFCPP_CACHEFACTORY_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/CacheListener.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CacheListener.hpp b/src/cppcache/include/gfcpp/CacheListener.hpp
index 8d00e34..95ebf28 100644
--- a/src/cppcache/include/gfcpp/CacheListener.hpp
+++ b/src/cppcache/include/gfcpp/CacheListener.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_CACHELISTENER_H__
-#define __GEMFIRE_CACHELISTENER_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_CACHELISTENER_H_
+#define GEODE_GFCPP_CACHELISTENER_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -206,4 +209,5 @@ class CPPCACHE_EXPORT CacheListener : public SharedBase {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // ifndef __GEMFIRE_CACHELISTENER_H__
+
+#endif // GEODE_GFCPP_CACHELISTENER_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/CacheLoader.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CacheLoader.hpp b/src/cppcache/include/gfcpp/CacheLoader.hpp
index efb76f7..d19deaf 100644
--- a/src/cppcache/include/gfcpp/CacheLoader.hpp
+++ b/src/cppcache/include/gfcpp/CacheLoader.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_CACHELOADER_H__
-#define __GEMFIRE_CACHELOADER_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_CACHELOADER_H_
+#define GEODE_GFCPP_CACHELOADER_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -98,4 +101,5 @@ class CPPCACHE_EXPORT CacheLoader : public SharedBase {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // ifndef __GEMFIRE_CACHELOADER_H__
+
+#endif // GEODE_GFCPP_CACHELOADER_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/CacheStatistics.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CacheStatistics.hpp b/src/cppcache/include/gfcpp/CacheStatistics.hpp
index 68e2416..f0309f3 100644
--- a/src/cppcache/include/gfcpp/CacheStatistics.hpp
+++ b/src/cppcache/include/gfcpp/CacheStatistics.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_CACHESTATISTICS_H__
-#define __GEMFIRE_CACHESTATISTICS_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_CACHESTATISTICS_H_
+#define GEODE_GFCPP_CACHESTATISTICS_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -107,4 +110,5 @@ class CPPCACHE_EXPORT CacheStatistics : public SharedBase {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // ifndef __GEMFIRE_CACHESTATISTICS_H__
+
+#endif // GEODE_GFCPP_CACHESTATISTICS_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/CacheTransactionManager.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CacheTransactionManager.hpp b/src/cppcache/include/gfcpp/CacheTransactionManager.hpp
index 354a803..6ffe9e9 100644
--- a/src/cppcache/include/gfcpp/CacheTransactionManager.hpp
+++ b/src/cppcache/include/gfcpp/CacheTransactionManager.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_GFCPP_CACHETRANSACTIONMANAGER_H_
+#define GEODE_GFCPP_CACHETRANSACTIONMANAGER_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +20,6 @@
  * limitations under the License.
  */
 
-#ifndef CACHETRANSACTIONMANAGER_H_
-#define CACHETRANSACTIONMANAGER_H_
 
 /* The specification of function behaviors is found in the corresponding .cpp
  * file.
@@ -200,4 +203,5 @@ class CPPCACHE_EXPORT CacheTransactionManager
 }  // namespace geode
 }  // namespace apache
 
-#endif /* CACHETRANSACTIONMANAGER_H_ */
+
+#endif // GEODE_GFCPP_CACHETRANSACTIONMANAGER_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/CacheWriter.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CacheWriter.hpp b/src/cppcache/include/gfcpp/CacheWriter.hpp
index 431b1e8..0a1a615 100644
--- a/src/cppcache/include/gfcpp/CacheWriter.hpp
+++ b/src/cppcache/include/gfcpp/CacheWriter.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_CACHEWRITER_H__
-#define __GEMFIRE_CACHEWRITER_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_CACHEWRITER_H_
+#define GEODE_GFCPP_CACHEWRITER_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -182,4 +185,4 @@ class CPPCACHE_EXPORT CacheWriter : public SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif
+#endif // GEODE_GFCPP_CACHEWRITER_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/Cacheable.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/Cacheable.hpp b/src/cppcache/include/gfcpp/Cacheable.hpp
index 734f297..69d9627 100644
--- a/src/cppcache/include/gfcpp/Cacheable.hpp
+++ b/src/cppcache/include/gfcpp/Cacheable.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_CACHEABLE_H__
-#define __GEMFIRE_CACHEABLE_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_CACHEABLE_H_
+#define GEODE_GFCPP_CACHEABLE_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -40,4 +43,4 @@ inline CacheablePtr createValue(const TVALUE* value);
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_CACHEABLE_H__
+#endif // GEODE_GFCPP_CACHEABLE_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/Cacheable.inl
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/Cacheable.inl b/src/cppcache/include/gfcpp/Cacheable.inl
index 9a1e11b..6c9e2d5 100644
--- a/src/cppcache/include/gfcpp/Cacheable.inl
+++ b/src/cppcache/include/gfcpp/Cacheable.inl
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_CACHEABLE_I__
-#define __GEMFIRE_CACHEABLE_I__
+#pragma once
+
+#ifndef GEODE_GFCPP_CACHEABLE_INL_
+#define GEODE_GFCPP_CACHEABLE_INL_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -49,4 +52,4 @@ inline CacheablePtr createValue( const TVALUE* value )
 }  // namespace geode
 }  // namespace apache
 
-#endif //ifndef __GEMFIRE_CACHEABLE_I__
+#endif // GEODE_GFCPP_CACHEABLE_INL_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/CacheableBuiltins.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CacheableBuiltins.hpp b/src/cppcache/include/gfcpp/CacheableBuiltins.hpp
index a86c864..d37ce48 100644
--- a/src/cppcache/include/gfcpp/CacheableBuiltins.hpp
+++ b/src/cppcache/include/gfcpp/CacheableBuiltins.hpp
@@ -1,5 +1,7 @@
-#ifndef _GEMFIRE_CACHEABLE_BUILTINS_HPP_
-#define _GEMFIRE_CACHEABLE_BUILTINS_HPP_
+#pragma once
+
+#ifndef GEODE_GFCPP_CACHEABLEBUILTINS_H_
+#define GEODE_GFCPP_CACHEABLEBUILTINS_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -681,4 +683,4 @@ _GF_CACHEABLE_CONTAINER_TYPE_(_HashSetOfCacheableKey, CacheableLinkedHashSet);
 }  // namespace geode
 }  // namespace apache
 
-#endif  // _GEMFIRE_CACHEABLE_BUILTINS_HPP_
+#endif // GEODE_GFCPP_CACHEABLEBUILTINS_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/CacheableDate.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CacheableDate.hpp b/src/cppcache/include/gfcpp/CacheableDate.hpp
index 97b9f74..0686550 100644
--- a/src/cppcache/include/gfcpp/CacheableDate.hpp
+++ b/src/cppcache/include/gfcpp/CacheableDate.hpp
@@ -1,5 +1,8 @@
-#ifndef _GEMFIRE_CACHEABLEDATE_HPP_
-#define _GEMFIRE_CACHEABLEDATE_HPP_
+#pragma once
+
+#ifndef GEODE_GFCPP_CACHEABLEDATE_H_
+#define GEODE_GFCPP_CACHEABLEDATE_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -147,4 +150,4 @@ inline CacheablePtr createValue(const timeval& value) {
 }  // namespace geode
 }  // namespace apache
 
-#endif
+#endif // GEODE_GFCPP_CACHEABLEDATE_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/CacheableEnum.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CacheableEnum.hpp b/src/cppcache/include/gfcpp/CacheableEnum.hpp
index aa88c30..14ceeca 100644
--- a/src/cppcache/include/gfcpp/CacheableEnum.hpp
+++ b/src/cppcache/include/gfcpp/CacheableEnum.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_GFCPP_CACHEABLEENUM_H_
+#define GEODE_GFCPP_CACHEABLEENUM_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -14,8 +19,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef CACHEABLE_ENUM_HPP
-#define CACHEABLE_ENUM_HPP
 
 #include "CacheableKey.hpp"
 #include "CacheableString.hpp"
@@ -140,4 +143,5 @@ class CPPCACHE_EXPORT CacheableEnum : public CacheableKey {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // CACHEABLE_ENUM_HPP
+
+#endif // GEODE_GFCPP_CACHEABLEENUM_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/CacheableFileName.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CacheableFileName.hpp b/src/cppcache/include/gfcpp/CacheableFileName.hpp
index 0c04dbb..0315799 100644
--- a/src/cppcache/include/gfcpp/CacheableFileName.hpp
+++ b/src/cppcache/include/gfcpp/CacheableFileName.hpp
@@ -1,5 +1,7 @@
-#ifndef _GEMFIRE_CACHEABLEFILENAME_HPP_
-#define _GEMFIRE_CACHEABLEFILENAME_HPP_
+#pragma once
+
+#ifndef GEODE_GFCPP_CACHEABLEFILENAME_H_
+#define GEODE_GFCPP_CACHEABLEFILENAME_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -116,4 +118,4 @@ class CPPCACHE_EXPORT CacheableFileName : public CacheableString {
 }  // namespace geode
 }  // namespace apache
 
-#endif
+#endif // GEODE_GFCPP_CACHEABLEFILENAME_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/CacheableKey.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CacheableKey.hpp b/src/cppcache/include/gfcpp/CacheableKey.hpp
index 9e98f5c..cad1eef 100644
--- a/src/cppcache/include/gfcpp/CacheableKey.hpp
+++ b/src/cppcache/include/gfcpp/CacheableKey.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_CACHEABLEKEY_H__
-#define __GEMFIRE_CACHEABLEKEY_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_CACHEABLEKEY_H_
+#define GEODE_GFCPP_CACHEABLEKEY_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -81,4 +84,4 @@ inline CacheableKeyPtr createKey(const TKEY* value);
 }  // namespace geode
 }  // namespace apache
 
-#endif
+#endif // GEODE_GFCPP_CACHEABLEKEY_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/CacheableKey.inl
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CacheableKey.inl b/src/cppcache/include/gfcpp/CacheableKey.inl
index b5d3a04..1413d0e 100644
--- a/src/cppcache/include/gfcpp/CacheableKey.inl
+++ b/src/cppcache/include/gfcpp/CacheableKey.inl
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_CACHEABLEKEY_I__
-#define __GEMFIRE_CACHEABLEKEY_I__
+#pragma once
+
+#ifndef GEODE_GFCPP_CACHEABLEKEY_INL_
+#define GEODE_GFCPP_CACHEABLEKEY_INL_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -49,4 +52,4 @@ inline CacheableKeyPtr createKey( const TKEY* value )
 }  // namespace geode
 }  // namespace apache
 
-#endif
+#endif // GEODE_GFCPP_CACHEABLEKEY_INL_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/CacheableKeys.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CacheableKeys.hpp b/src/cppcache/include/gfcpp/CacheableKeys.hpp
index 3d31aac..72757e8 100644
--- a/src/cppcache/include/gfcpp/CacheableKeys.hpp
+++ b/src/cppcache/include/gfcpp/CacheableKeys.hpp
@@ -1,5 +1,7 @@
-#ifndef _GEMFIRE_CACHEABLEKEYS_HPP_
-#define _GEMFIRE_CACHEABLEKEYS_HPP_
+#pragma once
+
+#ifndef GEODE_GFCPP_CACHEABLEKEYS_H_
+#define GEODE_GFCPP_CACHEABLEKEYS_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -94,4 +96,4 @@ inline uint32_t hashcode(const double value) {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // _GEMFIRE_CACHEABLEKEYS_HPP_
+#endif // GEODE_GFCPP_CACHEABLEKEYS_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/CacheableObjectArray.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CacheableObjectArray.hpp b/src/cppcache/include/gfcpp/CacheableObjectArray.hpp
index a9f609f..5ebc224 100644
--- a/src/cppcache/include/gfcpp/CacheableObjectArray.hpp
+++ b/src/cppcache/include/gfcpp/CacheableObjectArray.hpp
@@ -1,5 +1,7 @@
-#ifndef _GEMFIRE_CACHEABLEOBJECTARRAY_HPP_
-#define _GEMFIRE_CACHEABLEOBJECTARRAY_HPP_
+#pragma once
+
+#ifndef GEODE_GFCPP_CACHEABLEOBJECTARRAY_H_
+#define GEODE_GFCPP_CACHEABLEOBJECTARRAY_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -101,4 +103,4 @@ class CPPCACHE_EXPORT CacheableObjectArray : public Cacheable,
 }  // namespace geode
 }  // namespace apache
 
-#endif  // _GEMFIRE_CACHEABLEOBJECTARRAY_HPP_
+#endif // GEODE_GFCPP_CACHEABLEOBJECTARRAY_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/CacheableString.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CacheableString.hpp b/src/cppcache/include/gfcpp/CacheableString.hpp
index 1193552..1ddb112 100644
--- a/src/cppcache/include/gfcpp/CacheableString.hpp
+++ b/src/cppcache/include/gfcpp/CacheableString.hpp
@@ -1,5 +1,7 @@
-#ifndef _GEMFIRE_CACHEABLESTRING_HPP_
-#define _GEMFIRE_CACHEABLESTRING_HPP_
+#pragma once
+
+#ifndef GEODE_GFCPP_CACHEABLESTRING_H_
+#define GEODE_GFCPP_CACHEABLESTRING_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -305,4 +307,4 @@ inline CacheablePtr createValueArr(const wchar_t* value) {
 }  // namespace geode
 }  // namespace apache
 
-#endif
+#endif // GEODE_GFCPP_CACHEABLESTRING_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/CacheableUndefined.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CacheableUndefined.hpp b/src/cppcache/include/gfcpp/CacheableUndefined.hpp
index f793e31..0e063e9 100644
--- a/src/cppcache/include/gfcpp/CacheableUndefined.hpp
+++ b/src/cppcache/include/gfcpp/CacheableUndefined.hpp
@@ -1,5 +1,7 @@
-#ifndef _GEMFIRE_CACHEABLEUNDEFINED_HPP_
-#define _GEMFIRE_CACHEABLEUNDEFINED_HPP_
+#pragma once
+
+#ifndef GEODE_GFCPP_CACHEABLEUNDEFINED_H_
+#define GEODE_GFCPP_CACHEABLEUNDEFINED_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -93,4 +95,4 @@ class CPPCACHE_EXPORT CacheableUndefined : public Cacheable {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // _GEMFIRE_CACHEABLEUNDEFINED_HPP_
+#endif // GEODE_GFCPP_CACHEABLEUNDEFINED_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/CqAttributes.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CqAttributes.hpp b/src/cppcache/include/gfcpp/CqAttributes.hpp
index 613e27f..2cda1eb 100644
--- a/src/cppcache/include/gfcpp/CqAttributes.hpp
+++ b/src/cppcache/include/gfcpp/CqAttributes.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_CQ_ATTRIBUTES_H__
-#define __GEMFIRE_CQ_ATTRIBUTES_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_CQATTRIBUTES_H_
+#define GEODE_GFCPP_CQATTRIBUTES_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -58,4 +61,4 @@ class CPPCACHE_EXPORT CqAttributes : virtual public SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_CQ_ATTRIBUTES_H__
+#endif // GEODE_GFCPP_CQATTRIBUTES_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/CqAttributesFactory.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CqAttributesFactory.hpp b/src/cppcache/include/gfcpp/CqAttributesFactory.hpp
index 418e8fe..b5052fd 100644
--- a/src/cppcache/include/gfcpp/CqAttributesFactory.hpp
+++ b/src/cppcache/include/gfcpp/CqAttributesFactory.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_CQ_ATTRIBUTES_FACTORY_H__
-#define __GEMFIRE_CQ_ATTRIBUTES_FACTORY_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_CQATTRIBUTESFACTORY_H_
+#define GEODE_GFCPP_CQATTRIBUTESFACTORY_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -100,4 +103,4 @@ class CPPCACHE_EXPORT CqAttributesFactory : public SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_CQ_ATTRIBUTES_FACTORY_H__
+#endif // GEODE_GFCPP_CQATTRIBUTESFACTORY_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/CqAttributesMutator.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CqAttributesMutator.hpp b/src/cppcache/include/gfcpp/CqAttributesMutator.hpp
index 1591833..13c2363 100644
--- a/src/cppcache/include/gfcpp/CqAttributesMutator.hpp
+++ b/src/cppcache/include/gfcpp/CqAttributesMutator.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_CQ_ATTRIBUTES_MUTATOR_H__
-#define __GEMFIRE_CQ_ATTRIBUTES_MUTATOR_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_CQATTRIBUTESMUTATOR_H_
+#define GEODE_GFCPP_CQATTRIBUTESMUTATOR_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -71,4 +74,4 @@ class CPPCACHE_EXPORT CqAttributesMutator : virtual public SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_CQ_ATTRIBUTES_MUTATOR_H__
+#endif // GEODE_GFCPP_CQATTRIBUTESMUTATOR_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/CqEvent.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CqEvent.hpp b/src/cppcache/include/gfcpp/CqEvent.hpp
index 2af5595..6bbe386 100644
--- a/src/cppcache/include/gfcpp/CqEvent.hpp
+++ b/src/cppcache/include/gfcpp/CqEvent.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_CQ_EVENT_H__
-#define __GEMFIRE_CQ_EVENT_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_CQEVENT_H_
+#define GEODE_GFCPP_CQEVENT_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -105,4 +108,4 @@ class CPPCACHE_EXPORT CqEvent {
 }  // namespace geode
 }  // namespace apache
 
-#endif  //#ifndef __GEMFIRE_CQ_EVENT_H__
+#endif // GEODE_GFCPP_CQEVENT_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/CqListener.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CqListener.hpp b/src/cppcache/include/gfcpp/CqListener.hpp
index 16f1deb..2e5cdef 100644
--- a/src/cppcache/include/gfcpp/CqListener.hpp
+++ b/src/cppcache/include/gfcpp/CqListener.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_CQ_LISTENER_H__
-#define __GEMFIRE_CQ_LISTENER_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_CQLISTENER_H_
+#define GEODE_GFCPP_CQLISTENER_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -93,4 +96,4 @@ class CPPCACHE_EXPORT CqListener : public SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif  //#ifndef __GEMFIRE_CQ_LISTENER_H__
+#endif // GEODE_GFCPP_CQLISTENER_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/CqOperation.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CqOperation.hpp b/src/cppcache/include/gfcpp/CqOperation.hpp
index 97fcc95..b1b4a9a 100644
--- a/src/cppcache/include/gfcpp/CqOperation.hpp
+++ b/src/cppcache/include/gfcpp/CqOperation.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_CQ_OPERATION_H__
-#define __GEMFIRE_CQ_OPERATION_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_CQOPERATION_H_
+#define GEODE_GFCPP_CQOPERATION_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -48,4 +51,5 @@ class CPPCACHE_EXPORT CqOperation {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // ifndef __GEMFIRE_CQ_OPERATION_H__
+
+#endif // GEODE_GFCPP_CQOPERATION_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/CqQuery.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CqQuery.hpp b/src/cppcache/include/gfcpp/CqQuery.hpp
index b054419..1290fe0 100644
--- a/src/cppcache/include/gfcpp/CqQuery.hpp
+++ b/src/cppcache/include/gfcpp/CqQuery.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_CQ_QUERY_H__
-#define __GEMFIRE_CQ_QUERY_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_CQQUERY_H_
+#define GEODE_GFCPP_CQQUERY_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -178,4 +181,4 @@ class CPPCACHE_EXPORT CqQuery : public SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_CQ_QUERY_H__
+#endif // GEODE_GFCPP_CQQUERY_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/CqResults.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CqResults.hpp b/src/cppcache/include/gfcpp/CqResults.hpp
index 2940300..ba4763d 100644
--- a/src/cppcache/include/gfcpp/CqResults.hpp
+++ b/src/cppcache/include/gfcpp/CqResults.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_CQRESULTS_H__
-#define __GEMFIRE_CQRESULTS_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_CQRESULTS_H_
+#define GEODE_GFCPP_CQRESULTS_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -42,4 +45,4 @@ class CPPCACHE_EXPORT CqResults : public SelectResults {};
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_CQRESULTS_H__
+#endif // GEODE_GFCPP_CQRESULTS_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/CqServiceStatistics.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CqServiceStatistics.hpp b/src/cppcache/include/gfcpp/CqServiceStatistics.hpp
index f983bdc..19446de 100644
--- a/src/cppcache/include/gfcpp/CqServiceStatistics.hpp
+++ b/src/cppcache/include/gfcpp/CqServiceStatistics.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_CQ_SERVICE_STATISTICS_H__
-#define __GEMFIRE_CQ_SERVICE_STATISTICS_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_CQSERVICESTATISTICS_H_
+#define GEODE_GFCPP_CQSERVICESTATISTICS_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -73,4 +76,4 @@ class CPPCACHE_EXPORT CqServiceStatistics : public SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_CQ_SERVICE_STATISTICS_H__
+#endif // GEODE_GFCPP_CQSERVICESTATISTICS_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/CqState.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CqState.hpp b/src/cppcache/include/gfcpp/CqState.hpp
index ce25d53..d7dafcd 100644
--- a/src/cppcache/include/gfcpp/CqState.hpp
+++ b/src/cppcache/include/gfcpp/CqState.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_CQ_STATE_H__
-#define __GEMFIRE_CQ_STATE_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_CQSTATE_H_
+#define GEODE_GFCPP_CQSTATE_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -78,4 +81,4 @@ class CPPCACHE_EXPORT CqState {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_CQ_STATE_H__
+#endif // GEODE_GFCPP_CQSTATE_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/CqStatistics.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CqStatistics.hpp b/src/cppcache/include/gfcpp/CqStatistics.hpp
index fe1f7bd..55c2def 100644
--- a/src/cppcache/include/gfcpp/CqStatistics.hpp
+++ b/src/cppcache/include/gfcpp/CqStatistics.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_CQ_STATISTICS_H__
-#define __GEMFIRE_CQ_STATISTICS_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_CQSTATISTICS_H_
+#define GEODE_GFCPP_CQSTATISTICS_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -69,4 +72,4 @@ class CPPCACHE_EXPORT CqStatistics : public SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_CQ_STATISTICS_H__
+#endif // GEODE_GFCPP_CQSTATISTICS_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/CqStatusListener.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/CqStatusListener.hpp b/src/cppcache/include/gfcpp/CqStatusListener.hpp
index 271b018..a93de84 100644
--- a/src/cppcache/include/gfcpp/CqStatusListener.hpp
+++ b/src/cppcache/include/gfcpp/CqStatusListener.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_CQ_STATUS_LISTENER_HPP__
-#define __GEMFIRE_CQ_STATUS_LISTENER_HPP__
+#pragma once
+
+#ifndef GEODE_GFCPP_CQSTATUSLISTENER_H_
+#define GEODE_GFCPP_CQSTATUSLISTENER_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -47,4 +50,4 @@ class CPPCACHE_EXPORT CqStatusListener : public CqListener {
 }  // namespace geode
 }  // namespace apache
 
-#endif  //#ifndef __GEMFIRE_CQ_STATUS_LISTENER_HPP__
+#endif // GEODE_GFCPP_CQSTATUSLISTENER_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/DataInput.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/DataInput.hpp b/src/cppcache/include/gfcpp/DataInput.hpp
index a9b332d..67d0766 100644
--- a/src/cppcache/include/gfcpp/DataInput.hpp
+++ b/src/cppcache/include/gfcpp/DataInput.hpp
@@ -1,5 +1,7 @@
-#ifndef __GEMFIRE_DATAINPUT_H__
-#define __GEMFIRE_DATAINPUT_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_DATAINPUT_H_
+#define GEODE_GFCPP_DATAINPUT_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -1077,4 +1079,4 @@ class CPPCACHE_EXPORT DataInput {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __GEMFIRE_DATAINPUT_H__
+#endif // GEODE_GFCPP_DATAINPUT_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/DataOutput.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/DataOutput.hpp b/src/cppcache/include/gfcpp/DataOutput.hpp
index 6f4f1b4..4f03fc4 100644
--- a/src/cppcache/include/gfcpp/DataOutput.hpp
+++ b/src/cppcache/include/gfcpp/DataOutput.hpp
@@ -1,5 +1,7 @@
-#ifndef __GEMFIRE_DATAOUTPUT_H__
-#define __GEMFIRE_DATAOUTPUT_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_DATAOUTPUT_H_
+#define GEODE_GFCPP_DATAOUTPUT_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -818,4 +820,4 @@ class CPPCACHE_EXPORT DataOutput {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __GEMFIRE_DATAOUTPUT_H__
+#endif // GEODE_GFCPP_DATAOUTPUT_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/Delta.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/Delta.hpp b/src/cppcache/include/gfcpp/Delta.hpp
index b53d3ad..ebbc7d5 100644
--- a/src/cppcache/include/gfcpp/Delta.hpp
+++ b/src/cppcache/include/gfcpp/Delta.hpp
@@ -1,5 +1,8 @@
-#ifndef DELTA_HPP_
-#define DELTA_HPP_
+#pragma once
+
+#ifndef GEODE_GFCPP_DELTA_H_
+#define GEODE_GFCPP_DELTA_H_
+
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -94,4 +97,5 @@ class Delta {
 }  // namespace geode
 }  // namespace apache
 
-#endif /* DELTA_HPP_ */
+
+#endif // GEODE_GFCPP_DELTA_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/DiskPolicyType.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/DiskPolicyType.hpp b/src/cppcache/include/gfcpp/DiskPolicyType.hpp
index d343dac..f46f45d 100644
--- a/src/cppcache/include/gfcpp/DiskPolicyType.hpp
+++ b/src/cppcache/include/gfcpp/DiskPolicyType.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_DISKPOLICYTYPE_H__
-#define __GEMFIRE_DISKPOLICYTYPE_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_DISKPOLICYTYPE_H_
+#define GEODE_GFCPP_DISKPOLICYTYPE_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -69,4 +72,5 @@ class CPPCACHE_EXPORT DiskPolicyType {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // ifndef __GEMFIRE_DISKPOLICYTYPE_H__
+
+#endif // GEODE_GFCPP_DISKPOLICYTYPE_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/DistributedSystem.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/DistributedSystem.hpp b/src/cppcache/include/gfcpp/DistributedSystem.hpp
index 017ed16..ad0c311 100644
--- a/src/cppcache/include/gfcpp/DistributedSystem.hpp
+++ b/src/cppcache/include/gfcpp/DistributedSystem.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_DISTRIBUTEDSYSTEM_H__
-#define __GEMFIRE_DISTRIBUTEDSYSTEM_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_DISTRIBUTEDSYSTEM_H_
+#define GEODE_GFCPP_DISTRIBUTEDSYSTEM_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -123,4 +126,4 @@ class CPPCACHE_EXPORT DistributedSystem : public SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_DISTRIBUTEDSYSTEM_H__
+#endif // GEODE_GFCPP_DISTRIBUTEDSYSTEM_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/EntryEvent.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/EntryEvent.hpp b/src/cppcache/include/gfcpp/EntryEvent.hpp
index 5ae9b7d..d492fa5 100644
--- a/src/cppcache/include/gfcpp/EntryEvent.hpp
+++ b/src/cppcache/include/gfcpp/EntryEvent.hpp
@@ -1,5 +1,8 @@
-#ifndef _GEMFIRE_ENTRYEVENT_HPP_
-#define _GEMFIRE_ENTRYEVENT_HPP_
+#pragma once
+
+#ifndef GEODE_GFCPP_ENTRYEVENT_H_
+#define GEODE_GFCPP_ENTRYEVENT_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -90,4 +93,4 @@ class CPPCACHE_EXPORT EntryEvent : public apache::geode::client::SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif
+#endif // GEODE_GFCPP_ENTRYEVENT_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/Exception.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/Exception.hpp b/src/cppcache/include/gfcpp/Exception.hpp
index 1f064b5..f790533 100644
--- a/src/cppcache/include/gfcpp/Exception.hpp
+++ b/src/cppcache/include/gfcpp/Exception.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_EXCEPTION_H__
-#define __GEMFIRE_EXCEPTION_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_EXCEPTION_H_
+#define GEODE_GFCPP_EXCEPTION_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -122,4 +125,4 @@ class CPPCACHE_EXPORT Exception : public SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_EXCEPTION_H__
+#endif // GEODE_GFCPP_EXCEPTION_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/ExceptionTypes.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/ExceptionTypes.hpp b/src/cppcache/include/gfcpp/ExceptionTypes.hpp
index 6e8c0b1..f4e5485 100644
--- a/src/cppcache/include/gfcpp/ExceptionTypes.hpp
+++ b/src/cppcache/include/gfcpp/ExceptionTypes.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_EXCEPTIONTYPES_H__
-#define __GEMFIRE_EXCEPTIONTYPES_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_EXCEPTIONTYPES_H_
+#define GEODE_GFCPP_EXCEPTIONTYPES_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -407,4 +410,4 @@ extern void CPPCACHE_EXPORT GfErrTypeThrowException(const char* str,
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_EXCEPTIONTYPES_H__
+#endif // GEODE_GFCPP_EXCEPTIONTYPES_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/Execution.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/Execution.hpp b/src/cppcache/include/gfcpp/Execution.hpp
index 4c0b40e..a514fcb 100644
--- a/src/cppcache/include/gfcpp/Execution.hpp
+++ b/src/cppcache/include/gfcpp/Execution.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_GFCPP_EXECUTION_H_
+#define GEODE_GFCPP_EXECUTION_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -15,9 +20,6 @@
  * limitations under the License.
  */
 
-#ifndef __GEMFIRE_EXECUTION_H__
-#define __GEMFIRE_EXECUTION_H__
-
 /*
  * The specification of function behaviors is found in the corresponding .cpp
  * file.
@@ -110,4 +112,5 @@ class CPPCACHE_EXPORT Execution : public SharedBase {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  //__GEMFIRE_EXECUTION_H__
+
+#endif // GEODE_GFCPP_EXECUTION_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/ExpirationAction.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/ExpirationAction.hpp b/src/cppcache/include/gfcpp/ExpirationAction.hpp
index e61e6cf..46784bf 100644
--- a/src/cppcache/include/gfcpp/ExpirationAction.hpp
+++ b/src/cppcache/include/gfcpp/ExpirationAction.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_EXPIRATIONACTION_H__
-#define __GEMFIRE_EXPIRATIONACTION_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_EXPIRATIONACTION_H_
+#define GEODE_GFCPP_EXPIRATIONACTION_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -110,4 +113,5 @@ class CPPCACHE_EXPORT ExpirationAction {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // ifndef __GEMFIRE_EXPIRATIONACTION_H__
+
+#endif // GEODE_GFCPP_EXPIRATIONACTION_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/ExpirationAttributes.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/ExpirationAttributes.hpp b/src/cppcache/include/gfcpp/ExpirationAttributes.hpp
index d0c52a0..33c97a5 100644
--- a/src/cppcache/include/gfcpp/ExpirationAttributes.hpp
+++ b/src/cppcache/include/gfcpp/ExpirationAttributes.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_EXPIRATIONATTRIBUTES_H__
-#define __GEMFIRE_EXPIRATIONATTRIBUTES_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_EXPIRATIONATTRIBUTES_H_
+#define GEODE_GFCPP_EXPIRATIONATTRIBUTES_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -96,4 +99,5 @@ class CPPCACHE_EXPORT ExpirationAttributes {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // ifndef __GEMFIRE_EXPIRATIONATTRIBUTES_H__
+
+#endif // GEODE_GFCPP_EXPIRATIONATTRIBUTES_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/FixedPartitionResolver.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/FixedPartitionResolver.hpp b/src/cppcache/include/gfcpp/FixedPartitionResolver.hpp
index 5bc4f08..10057ae 100644
--- a/src/cppcache/include/gfcpp/FixedPartitionResolver.hpp
+++ b/src/cppcache/include/gfcpp/FixedPartitionResolver.hpp
@@ -1,5 +1,8 @@
-#ifndef GEMFIRE_FIXED_PARTITION_RESOLVER
-#define GEMFIRE_FIXED_PARTITION_RESOLVER
+#pragma once
+
+#ifndef GEODE_GFCPP_FIXEDPARTITIONRESOLVER_H_
+#define GEODE_GFCPP_FIXEDPARTITIONRESOLVER_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -89,4 +92,5 @@ class CPPCACHE_EXPORT FixedPartitionResolver : public PartitionResolver {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif
+
+#endif // GEODE_GFCPP_FIXEDPARTITIONRESOLVER_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/FunctionService.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/FunctionService.hpp b/src/cppcache/include/gfcpp/FunctionService.hpp
index 515ad8c..d929e63 100644
--- a/src/cppcache/include/gfcpp/FunctionService.hpp
+++ b/src/cppcache/include/gfcpp/FunctionService.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_GFCPP_FUNCTIONSERVICE_H_
+#define GEODE_GFCPP_FUNCTIONSERVICE_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -15,9 +20,6 @@
  * limitations under the License.
  */
 
-#ifndef __GEMFIRE_FUNCTION_SERVICE_H__
-#define __GEMFIRE_FUNCTION_SERVICE_H__
-
 /*
  * The specification of function behaviors is found in the corresponding
  * .cpp file.
@@ -188,4 +190,4 @@ class CPPCACHE_EXPORT FunctionService : public SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif  //__GEMFIRE_FUNCTION_SERVICE_H__
+#endif // GEODE_GFCPP_FUNCTIONSERVICE_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/GemFireCache.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/GemFireCache.hpp b/src/cppcache/include/gfcpp/GemFireCache.hpp
index 0ad4e5b..506d0be 100644
--- a/src/cppcache/include/gfcpp/GemFireCache.hpp
+++ b/src/cppcache/include/gfcpp/GemFireCache.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_GFCPP_GEMFIRECACHE_H_
+#define GEODE_GFCPP_GEMFIRECACHE_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -14,8 +19,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef __GEMFIRE_GEMFIRECACHE_H__
-#define __GEMFIRE_GEMFIRECACHE_H__
 
 #include "gfcpp_globals.hpp"
 #include "gf_types.hpp"
@@ -79,4 +82,5 @@ class CPPCACHE_EXPORT GemFireCache : public RegionService {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // ifndef __GEMFIRE_GEMFIRECACHE_H__
+
+#endif // GEODE_GFCPP_GEMFIRECACHE_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/GeodeCppCache.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/GeodeCppCache.hpp b/src/cppcache/include/gfcpp/GeodeCppCache.hpp
index a0b4279..66e8f11 100644
--- a/src/cppcache/include/gfcpp/GeodeCppCache.hpp
+++ b/src/cppcache/include/gfcpp/GeodeCppCache.hpp
@@ -1,5 +1,8 @@
-#ifndef __APACHE_GEODECPPCACHE_H__
-#define __APACHE_GEODECPPCACHE_H__
+#pragma once
+
+#ifndef GEODE_GFCPP_GEODECPPCACHE_H_
+#define GEODE_GFCPP_GEODECPPCACHE_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -80,4 +83,5 @@
 #include "PdxFieldTypes.hpp"
 
 #include "GeodeCppCache.inl"
-#endif  // define __APACHE_GEODECPPCACHE_H__
+
+#endif // GEODE_GFCPP_GEODECPPCACHE_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/GeodeCppCache.inl
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/GeodeCppCache.inl b/src/cppcache/include/gfcpp/GeodeCppCache.inl
index 24bfabb..f9f9f81 100755
--- a/src/cppcache/include/gfcpp/GeodeCppCache.inl
+++ b/src/cppcache/include/gfcpp/GeodeCppCache.inl
@@ -1,5 +1,5 @@
-#ifndef __APACHE_GEODECPPCACHE_I__
-#define __APACHE_GEODECPPCACHE_I__
+#ifndef __APACHE_GEODECPPCACHE_INL_
+#define __APACHE_GEODECPPCACHE_INL_
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -24,4 +24,4 @@
 #include "Cacheable.inl"
 #include "CacheableKey.inl"
 
-#endif // define __APACHE_GEODECPPCACHE_I__
+#endif // define __APACHE_GEODECPPCACHE_INL_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/GeodeTypeIds.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/GeodeTypeIds.hpp b/src/cppcache/include/gfcpp/GeodeTypeIds.hpp
index 3d95daa..4ea5c58 100644
--- a/src/cppcache/include/gfcpp/GeodeTypeIds.hpp
+++ b/src/cppcache/include/gfcpp/GeodeTypeIds.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_GFCPP_GEODETYPEIDS_H_
+#define GEODE_GFCPP_GEODETYPEIDS_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -14,8 +19,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef _GEODE_GEODETYPEIDS_HPP_
-#define _GEODE_GEODETYPEIDS_HPP_
 
 namespace apache {
 namespace geode {
@@ -82,4 +85,5 @@ class GeodeTypeIds {
 }  // namespace geode
 }  // namespace apache
 
-#endif
+
+#endif // GEODE_GFCPP_GEODETYPEIDS_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/HashFunction.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/HashFunction.hpp b/src/cppcache/include/gfcpp/HashFunction.hpp
index 6654aa8..42cc736 100644
--- a/src/cppcache/include/gfcpp/HashFunction.hpp
+++ b/src/cppcache/include/gfcpp/HashFunction.hpp
@@ -1,5 +1,7 @@
-#ifndef _GEMFIRE_HASHFUNCTION_HPP_
-#define _GEMFIRE_HASHFUNCTION_HPP_
+#pragma once
+
+#ifndef GEODE_GFCPP_HASHFUNCTION_H_
+#define GEODE_GFCPP_HASHFUNCTION_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -76,4 +78,4 @@ inline bool equalToFunction(const TKEY& x, const TKEY& y) {
 }  // namespace geode
 }  // namespace apache
 
-#endif
+#endif // GEODE_GFCPP_HASHFUNCTION_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/HashMapOfSharedBase.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/HashMapOfSharedBase.hpp b/src/cppcache/include/gfcpp/HashMapOfSharedBase.hpp
index 95671d6..be01899 100644
--- a/src/cppcache/include/gfcpp/HashMapOfSharedBase.hpp
+++ b/src/cppcache/include/gfcpp/HashMapOfSharedBase.hpp
@@ -1,5 +1,7 @@
-#ifndef _GEMFIRE_HASHMAPOFSHAREDBASE_HPP_
-#define _GEMFIRE_HASHMAPOFSHAREDBASE_HPP_
+#pragma once
+
+#ifndef GEODE_GFCPP_HASHMAPOFSHAREDBASE_H_
+#define GEODE_GFCPP_HASHMAPOFSHAREDBASE_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -156,4 +158,4 @@ class CPPCACHE_EXPORT HashMapOfSharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif
+#endif // GEODE_GFCPP_HASHMAPOFSHAREDBASE_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/HashMapT.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/HashMapT.hpp b/src/cppcache/include/gfcpp/HashMapT.hpp
index 73dd73e..25d2536 100644
--- a/src/cppcache/include/gfcpp/HashMapT.hpp
+++ b/src/cppcache/include/gfcpp/HashMapT.hpp
@@ -1,5 +1,7 @@
-#ifndef _GEMFIRE_HASHMAPT_HPP_
-#define _GEMFIRE_HASHMAPT_HPP_
+#pragma once
+
+#ifndef GEODE_GFCPP_HASHMAPT_H_
+#define GEODE_GFCPP_HASHMAPT_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -219,4 +221,4 @@ typedef SharedPtr<HashMapOfException> HashMapOfExceptionPtr;
 }  // namespace geode
 }  // namespace apache
 
-#endif
+#endif // GEODE_GFCPP_HASHMAPT_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/HashSetOfSharedBase.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/HashSetOfSharedBase.hpp b/src/cppcache/include/gfcpp/HashSetOfSharedBase.hpp
index f44fcd4..c884cbf 100644
--- a/src/cppcache/include/gfcpp/HashSetOfSharedBase.hpp
+++ b/src/cppcache/include/gfcpp/HashSetOfSharedBase.hpp
@@ -1,5 +1,7 @@
-#ifndef _GEMFIRE_HASHSETOFSHAREDBASE_HPP_
-#define _GEMFIRE_HASHSETOFSHAREDBASE_HPP_
+#pragma once
+
+#ifndef GEODE_GFCPP_HASHSETOFSHAREDBASE_H_
+#define GEODE_GFCPP_HASHSETOFSHAREDBASE_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -148,4 +150,4 @@ class CPPCACHE_EXPORT HashSetOfSharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif
+#endif // GEODE_GFCPP_HASHSETOFSHAREDBASE_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/HashSetT.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/HashSetT.hpp b/src/cppcache/include/gfcpp/HashSetT.hpp
index fa8a51e..b37db6d 100644
--- a/src/cppcache/include/gfcpp/HashSetT.hpp
+++ b/src/cppcache/include/gfcpp/HashSetT.hpp
@@ -1,5 +1,7 @@
-#ifndef _GEMFIRE_HASHSETT_HPP_
-#define _GEMFIRE_HASHSETT_HPP_
+#pragma once
+
+#ifndef GEODE_GFCPP_HASHSETT_H_
+#define GEODE_GFCPP_HASHSETT_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -175,4 +177,4 @@ typedef SharedPtr<HashSetOfCacheableKey> HashSetOfCacheableKeyPtr;
 }  // namespace geode
 }  // namespace apache
 
-#endif
+#endif // GEODE_GFCPP_HASHSETT_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/include/gfcpp/InternalCacheTransactionManager2PC.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/InternalCacheTransactionManager2PC.hpp b/src/cppcache/include/gfcpp/InternalCacheTransactionManager2PC.hpp
index 152ff34..a6c171d 100644
--- a/src/cppcache/include/gfcpp/InternalCacheTransactionManager2PC.hpp
+++ b/src/cppcache/include/gfcpp/InternalCacheTransactionManager2PC.hpp
@@ -1,5 +1,8 @@
-#ifndef INTERNALCACHETRANSACTIONMANAGER2PC_H_
-#define INTERNALCACHETRANSACTIONMANAGER2PC_H_
+#pragma once
+
+#ifndef GEODE_GFCPP_INTERNALCACHETRANSACTIONMANAGER2PC_H_
+#define GEODE_GFCPP_INTERNALCACHETRANSACTIONMANAGER2PC_H_
+
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -70,4 +73,5 @@ class CPPCACHE_EXPORT InternalCacheTransactionManager2PC
 }  // namespace geode
 }  // namespace apache
 
-#endif /* INTERNALCACHETRANSACTIONMANAGER2PC_H_ */
+
+#endif // GEODE_GFCPP_INTERNALCACHETRANSACTIONMANAGER2PC_H_


Mime
View raw message