geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aba...@apache.org
Subject [3/6] geode git commit: GEODE-2411: Remove references to Gemfire from include guards.
Date Tue, 07 Feb 2017 23:53:27 GMT
http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/ExecutionImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ExecutionImpl.hpp b/src/cppcache/src/ExecutionImpl.hpp
index c3dedda..7c4d95a 100644
--- a/src/cppcache/src/ExecutionImpl.hpp
+++ b/src/cppcache/src/ExecutionImpl.hpp
@@ -1,5 +1,7 @@
-#ifndef __GEMFIRE_EXECUTION_IMPL_H__
-#define __GEMFIRE_EXECUTION_IMPL_H__
+#pragma once
+
+#ifndef GEODE_EXECUTIONIMPL_H_
+#define GEODE_EXECUTIONIMPL_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -110,4 +112,5 @@ class ExecutionImpl : public Execution {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  //__GEMFIRE_EXECUTION_IMPL_H__
+
+#endif // GEODE_EXECUTIONIMPL_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/ExpMapEntry.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ExpMapEntry.hpp b/src/cppcache/src/ExpMapEntry.hpp
index ac0417f..6f6d8c1 100644
--- a/src/cppcache/src/ExpMapEntry.hpp
+++ b/src/cppcache/src/ExpMapEntry.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_EXPMAPENTRY_H_
+#define GEODE_EXPMAPENTRY_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_IMPL_EXPMAPENTRY_H__
-#define __GEMFIRE_IMPL_EXPMAPENTRY_H__
 
 #include <gfcpp/gfcpp_globals.hpp>
 #include "MapEntry.hpp"
@@ -92,4 +95,4 @@ class CPPCACHE_EXPORT ExpEntryFactory : public EntryFactory {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __GEMFIRE_IMPL_EXPMAPENTRY_H__
+#endif // GEODE_EXPMAPENTRY_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/ExpiryHandler_T.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ExpiryHandler_T.hpp b/src/cppcache/src/ExpiryHandler_T.hpp
index ca5465f..484156f 100644
--- a/src/cppcache/src/ExpiryHandler_T.hpp
+++ b/src/cppcache/src/ExpiryHandler_T.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_EXPIRYHANDLER_T_H_
+#define GEODE_EXPIRYHANDLER_T_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -20,8 +25,6 @@
  *@version 1.0
  */
 
-#ifndef EXPIRYHANDLER_T_HPP
-#define EXPIRYHANDLER_T_HPP
 
 #include "ace/Event_Handler.h"
 #include <gfcpp/Log.hpp>
@@ -69,4 +72,5 @@ class CPPCACHE_EXPORT ExpiryHandler_T : public ACE_Event_Handler {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // !defined (EXPIRYHANDLER_T_HPP)
+
+#endif // GEODE_EXPIRYHANDLER_T_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/ExpiryTaskManager.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ExpiryTaskManager.hpp b/src/cppcache/src/ExpiryTaskManager.hpp
index 00eac57..3f489e8 100644
--- a/src/cppcache/src/ExpiryTaskManager.hpp
+++ b/src/cppcache/src/ExpiryTaskManager.hpp
@@ -1,5 +1,8 @@
-#ifndef _GEMFIRE_EXPIRYTASKMANAGER_H__
-#define _GEMFIRE_EXPIRYTASKMANAGER_H__
+#pragma once
+
+#ifndef GEODE_EXPIRYTASKMANAGER_H_
+#define GEODE_EXPIRYTASKMANAGER_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -271,4 +274,4 @@ class CPPCACHE_EXPORT ExpiryTaskManager : public ACE_Task_Base {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef _GEMFIRE_EXPIRYTASKMANAGER_H__
+#endif // GEODE_EXPIRYTASKMANAGER_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/FairQueue.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/FairQueue.hpp b/src/cppcache/src/FairQueue.hpp
index 37d0f72..6d5233a 100644
--- a/src/cppcache/src/FairQueue.hpp
+++ b/src/cppcache/src/FairQueue.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_FAIRQUEUE_H_
+#define GEODE_FAIRQUEUE_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_FAIRQUEUE_HPP_
-#define _GEMFIRE_FAIRQUEUE_HPP_
 
 #include <deque>
 #include <ace/ACE.h>
@@ -173,4 +176,4 @@ class FairQueue {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef _GEMFIRE_FAIRQUEUE_HPP_
+#endif // GEODE_FAIRQUEUE_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/FarSideEntryOp.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/FarSideEntryOp.hpp b/src/cppcache/src/FarSideEntryOp.hpp
index 7081c4c..034180c 100644
--- a/src/cppcache/src/FarSideEntryOp.hpp
+++ b/src/cppcache/src/FarSideEntryOp.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_FARSIDEENTRYOP_H_
+#define GEODE_FARSIDEENTRYOP_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +26,6 @@
  *      Author: ankurs
  */
 
-#ifndef FARSIDEENTRYOP_HPP_
-#define FARSIDEENTRYOP_HPP_
 
 #include <gfcpp/gfcpp_globals.hpp>
 #include <gfcpp/gf_types.hpp>
@@ -122,4 +125,5 @@ class FarSideEntryOp : public apache::geode::client::SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif /* FARSIDEENTRYOP_HPP_ */
+
+#endif // GEODE_FARSIDEENTRYOP_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/FixedPartitionAttributesImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/FixedPartitionAttributesImpl.hpp b/src/cppcache/src/FixedPartitionAttributesImpl.hpp
index ebb8ad7..7824429 100644
--- a/src/cppcache/src/FixedPartitionAttributesImpl.hpp
+++ b/src/cppcache/src/FixedPartitionAttributesImpl.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_FIXEDPARTITIONATTRIBUTESIMPL_H_
+#define GEODE_FIXEDPARTITIONATTRIBUTESIMPL_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 __FIXED_PARTITION_ATTRIBUTES__IMPL__
-#define __FIXED_PARTITION_ATTRIBUTES__IMPL__
 
 #include <gfcpp/Serializable.hpp>
 #include <gfcpp/DataInput.hpp>
@@ -122,4 +125,5 @@ class FixedPartitionAttributesImpl : public Serializable {
 }  // namespace geode
 }  // namespace apache
 
-#endif
+
+#endif // GEODE_FIXEDPARTITIONATTRIBUTESIMPL_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/FunctionServiceImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/FunctionServiceImpl.hpp b/src/cppcache/src/FunctionServiceImpl.hpp
index de43d7f..7eb4626 100644
--- a/src/cppcache/src/FunctionServiceImpl.hpp
+++ b/src/cppcache/src/FunctionServiceImpl.hpp
@@ -1,5 +1,7 @@
-#ifndef __GEMFIRE_FUNCTION_SERVICEIMPL_H__
-#define __GEMFIRE_FUNCTION_SERVICEIMPL_H__
+#pragma once
+
+#ifndef GEODE_FUNCTIONSERVICEIMPL_H_
+#define GEODE_FUNCTIONSERVICEIMPL_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -63,4 +65,5 @@ class CPPCACHE_EXPORT FunctionServiceImpl : public FunctionService {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  //__GEMFIRE_FUNCTION_SERVICEIMPL_H__
+
+#endif // GEODE_FUNCTIONSERVICEIMPL_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/GF_TASK_T.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/GF_TASK_T.hpp b/src/cppcache/src/GF_TASK_T.hpp
index 78e588b..568b814 100644
--- a/src/cppcache/src/GF_TASK_T.hpp
+++ b/src/cppcache/src/GF_TASK_T.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_GF_TASK_T_H_
+#define GEODE_GF_TASK_T_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +26,6 @@
 *@version 1.0
 */
 
-#ifndef __GF_TASK_T_HPP__
-#define __GF_TASK_T_HPP__
 
 #include "DistributedSystemImpl.hpp"
 #include <ace/Task.h>
@@ -80,4 +83,5 @@ class CPPCACHE_EXPORT GF_TASK_T : public ACE_Task_Base {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // __GF_TASK_T_HPP__
+
+#endif // GEODE_GF_TASK_T_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/GatewayEventCallbackArgument.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/GatewayEventCallbackArgument.hpp b/src/cppcache/src/GatewayEventCallbackArgument.hpp
index 1cbaa35..9619951 100644
--- a/src/cppcache/src/GatewayEventCallbackArgument.hpp
+++ b/src/cppcache/src/GatewayEventCallbackArgument.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_GATEWAYEVENTCALLBACKARGUMENT_H_
+#define GEODE_GATEWAYEVENTCALLBACKARGUMENT_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 __GATEWAYEVENTCALLBACKARGUMENT_HPP__
-#define __GATEWAYEVENTCALLBACKARGUMENT_HPP__
 
 #include <gfcpp/Serializable.hpp>
 #include "GeodeTypeIdsImpl.hpp"
@@ -66,4 +69,5 @@ class GatewayEventCallbackArgument : public Serializable {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __GATEWAYEVENTCALLBACKARGUMENT_HPP__
+
+#endif // GEODE_GATEWAYEVENTCALLBACKARGUMENT_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/GatewaySenderEventCallbackArgument.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/GatewaySenderEventCallbackArgument.hpp b/src/cppcache/src/GatewaySenderEventCallbackArgument.hpp
index 04a7b3f..38c9509 100644
--- a/src/cppcache/src/GatewaySenderEventCallbackArgument.hpp
+++ b/src/cppcache/src/GatewaySenderEventCallbackArgument.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_GATEWAYSENDEREVENTCALLBACKARGUMENT_H_
+#define GEODE_GATEWAYSENDEREVENTCALLBACKARGUMENT_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 __GATEWAYSENDEREVENTCALLBACKARGUMENT_HPP__
-#define __GATEWAYSENDEREVENTCALLBACKARGUMENT_HPP__
 
 #include <gfcpp/Serializable.hpp>
 #include "GeodeTypeIdsImpl.hpp"
@@ -71,4 +74,5 @@ class GatewaySenderEventCallbackArgument : public Serializable {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __GATEWAYSENDEREVENTCALLBACKARGUMENT_HPP__
+
+#endif // GEODE_GATEWAYSENDEREVENTCALLBACKARGUMENT_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/GeodeTypeIdsImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/GeodeTypeIdsImpl.hpp b/src/cppcache/src/GeodeTypeIdsImpl.hpp
index c352f32..5a260f4 100644
--- a/src/cppcache/src/GeodeTypeIdsImpl.hpp
+++ b/src/cppcache/src/GeodeTypeIdsImpl.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_GEODETYPEIDSIMPL_H_
+#define GEODE_GEODETYPEIDSIMPL_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_GEODETYPEIDSIMPL_HPP_
-#define _GEODE_GEODETYPEIDSIMPL_HPP_
 
 namespace apache {
 namespace geode {
@@ -79,4 +82,5 @@ class GeodeTypeIdsImpl {
 }  // namespace geode
 }  // namespace apache
 
-#endif
+
+#endif // GEODE_GEODETYPEIDSIMPL_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/GetAllServersRequest.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/GetAllServersRequest.hpp b/src/cppcache/src/GetAllServersRequest.hpp
index 383f396..2e64ba1 100644
--- a/src/cppcache/src/GetAllServersRequest.hpp
+++ b/src/cppcache/src/GetAllServersRequest.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_GETALLSERVERSREQUEST_H_
+#define GEODE_GETALLSERVERSREQUEST_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 __GET_All_SERVERS_REQUEST_HPP_INCLUDED__
-#define __GET_All_SERVERS_REQUEST_HPP_INCLUDED__
 
 #include <gfcpp/Serializable.hpp>
 #include <gfcpp/DataInput.hpp>
@@ -50,4 +53,5 @@ class GetAllServersRequest : public Serializable {
 }  // namespace geode
 }  // namespace apache
 
-#endif
+
+#endif // GEODE_GETALLSERVERSREQUEST_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/GetAllServersResponse.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/GetAllServersResponse.hpp b/src/cppcache/src/GetAllServersResponse.hpp
index 4499dfc..c19d602 100644
--- a/src/cppcache/src/GetAllServersResponse.hpp
+++ b/src/cppcache/src/GetAllServersResponse.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_GETALLSERVERSRESPONSE_H_
+#define GEODE_GETALLSERVERSRESPONSE_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 __GET_All_SERVERS_RESPONSE_HPP_INCLUDED__
-#define __GET_All_SERVERS_RESPONSE_HPP_INCLUDED__
 
 #include <gfcpp/Serializable.hpp>
 #include "ServerLocation.hpp"
@@ -52,4 +55,5 @@ typedef SharedPtr<GetAllServersResponse> GetAllServersResponsePtr;
 }  // namespace geode
 }  // namespace apache
 
-#endif
+
+#endif // GEODE_GETALLSERVERSRESPONSE_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/HostAsm.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/HostAsm.hpp b/src/cppcache/src/HostAsm.hpp
index 4513106..fc227b2 100644
--- a/src/cppcache/src/HostAsm.hpp
+++ b/src/cppcache/src/HostAsm.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_UTIL_IMPL_HOSTASM_HPP__
-#define __GEMFIRE_UTIL_IMPL_HOSTASM_HPP__
+#pragma once
+
+#ifndef GEODE_HOSTASM_H_
+#define GEODE_HOSTASM_H_
+
 #ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
@@ -442,4 +445,5 @@ return true;
 #ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
 #pragma clang diagnostic pop
 #endif
-#endif
+
+#endif // GEODE_HOSTASM_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/IntQueue.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/IntQueue.hpp b/src/cppcache/src/IntQueue.hpp
index 64d99e9..fe3cc9a 100644
--- a/src/cppcache/src/IntQueue.hpp
+++ b/src/cppcache/src/IntQueue.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTQUEUE_H_
+#define GEODE_INTQUEUE_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.
  */
-#if !defined(IMPL_INTQUEUE_INCLUDED)
-#define IMPL_INTQUEUE_INCLUDED
 
 #include <deque>
 #include <ace/ACE.h>
@@ -117,4 +120,4 @@ class CPPCACHE_EXPORT IntQueue {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // !defined (IMPL_INTQUEUE_INCLUDED)
+#endif // GEODE_INTQUEUE_H_

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

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/InternalCacheTransactionManager2PCImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/InternalCacheTransactionManager2PCImpl.hpp b/src/cppcache/src/InternalCacheTransactionManager2PCImpl.hpp
index 2c7be69..12c6831 100644
--- a/src/cppcache/src/InternalCacheTransactionManager2PCImpl.hpp
+++ b/src/cppcache/src/InternalCacheTransactionManager2PCImpl.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTERNALCACHETRANSACTIONMANAGER2PCIMPL_H_
+#define GEODE_INTERNALCACHETRANSACTIONMANAGER2PCIMPL_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +26,6 @@
  *      Author: sshcherbakov
  */
 
-#ifndef INTERNALCACHETRANSACTIONMANAGER2PCIMPL_H_
-#define INTERNALCACHETRANSACTIONMANAGER2PCIMPL_H_
 
 #include <gfcpp/InternalCacheTransactionManager2PC.hpp>
 #include "CacheTransactionManagerImpl.hpp"
@@ -54,4 +57,5 @@ class InternalCacheTransactionManager2PCImpl
 }  // namespace geode
 }  // namespace apache
 
-#endif /* INTERNALCACHETRANSACTIONMANAGER2PCIMPL_H_ */
+
+#endif // GEODE_INTERNALCACHETRANSACTIONMANAGER2PCIMPL_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/InternalDataView.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/InternalDataView.hpp b/src/cppcache/src/InternalDataView.hpp
index e4923de..aa9caa3 100644
--- a/src/cppcache/src/InternalDataView.hpp
+++ b/src/cppcache/src/InternalDataView.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTERNALDATAVIEW_H_
+#define GEODE_INTERNALDATAVIEW_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +26,6 @@
  *      Author: ankurs
  */
 
-#ifndef INTERNALDATAVIEW_HPP_
-#define INTERNALDATAVIEW_HPP_
 
 namespace apache {
 namespace geode {
@@ -37,4 +40,5 @@ class InternalDataView {
 }  // namespace geode
 }  // namespace apache
 
-#endif /* INTERNALDATAVIEW_HPP_ */
+
+#endif // GEODE_INTERNALDATAVIEW_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/LRUAction.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LRUAction.hpp b/src/cppcache/src/LRUAction.hpp
index c71a4dc..6085d09 100644
--- a/src/cppcache/src/LRUAction.hpp
+++ b/src/cppcache/src/LRUAction.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_LRUACTION_H_
+#define GEODE_LRUACTION_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_IMPL_LRUACTION_H__
-#define __GEMFIRE_IMPL_LRUACTION_H__
 
 #include <gfcpp/gfcpp_globals.hpp>
 #include <gfcpp/Cache.hpp>
@@ -179,4 +182,4 @@ class CPPCACHE_EXPORT LRUOverFlowToDiskAction : public virtual LRUAction {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __GEMFIRE_IMPL_LRUACTION_H__
+#endif // GEODE_LRUACTION_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/LRUEntriesMap.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LRUEntriesMap.hpp b/src/cppcache/src/LRUEntriesMap.hpp
index 0c24658..4a85308 100644
--- a/src/cppcache/src/LRUEntriesMap.hpp
+++ b/src/cppcache/src/LRUEntriesMap.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_LRUENTRIESMAP_H_
+#define GEODE_LRUENTRIESMAP_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_IMPL_LRUENTRIESMAP_H__
-#define __GEMFIRE_IMPL_LRUENTRIESMAP_H__
 
 #include <gfcpp/gfcpp_globals.hpp>
 #include <gfcpp/Cache.hpp>
@@ -134,4 +137,4 @@ class CPPCACHE_EXPORT LRUEntriesMap : public ConcurrentEntriesMap,
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __GEMFIRE_IMPL_LRUENTRIESMAP_H__
+#endif // GEODE_LRUENTRIESMAP_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/LRUExpMapEntry.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LRUExpMapEntry.hpp b/src/cppcache/src/LRUExpMapEntry.hpp
index 493befe..50acbb4 100644
--- a/src/cppcache/src/LRUExpMapEntry.hpp
+++ b/src/cppcache/src/LRUExpMapEntry.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_LRUEXPMAPENTRY_H_
+#define GEODE_LRUEXPMAPENTRY_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_IMPL_LRUEXPMAPENTRY_H__
-#define __GEMFIRE_IMPL_LRUEXPMAPENTRY_H__
 
 #include <gfcpp/gfcpp_globals.hpp>
 #include "MapEntry.hpp"
@@ -97,4 +100,4 @@ class CPPCACHE_EXPORT LRUExpEntryFactory : public EntryFactory {
 }  // namespace geode
 }  // namespace apache
 
-#endif  //__GEMFIRE_IMPL_LRUEXPMAPENTRY_H__
+#endif // GEODE_LRUEXPMAPENTRY_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/LRUList.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LRUList.hpp b/src/cppcache/src/LRUList.hpp
index aac7d1c..08f9e54 100644
--- a/src/cppcache/src/LRUList.hpp
+++ b/src/cppcache/src/LRUList.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_LRULIST_H_
+#define GEODE_LRULIST_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_IMPL_LRULIST_H__
-#define __GEMFIRE_IMPL_LRULIST_H__
 
 #include <gfcpp/gfcpp_globals.hpp>
 #include <gfcpp/SharedPtr.hpp>
@@ -150,4 +153,4 @@ class LRUList {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __GEMFIRE_IMPL_LRULIST_H__
+#endif // GEODE_LRULIST_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/LRULocalDestroyAction.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LRULocalDestroyAction.hpp b/src/cppcache/src/LRULocalDestroyAction.hpp
index aa9f249..71238fa 100644
--- a/src/cppcache/src/LRULocalDestroyAction.hpp
+++ b/src/cppcache/src/LRULocalDestroyAction.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_LRULOCALDESTROYACTION_H_
+#define GEODE_LRULOCALDESTROYACTION_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_IMPL_LRULOCALDESTROYACTION_HPP__
-#define __GEMFIRE_IMPL_LRULOCALDESTROYACTION_HPP__
 
 #include <gfcpp/gfcpp_globals.hpp>
 #include "LRUAction.hpp"
@@ -51,4 +54,4 @@ class CPPCACHE_EXPORT LRULocalDestroyAction : public virtual LRUAction {
 }  // namespace geode
 }  // namespace apache
 
-#endif  //__GEMFIRE_IMPL_LRULOCALDESTROYACTION_HPP__
+#endif // GEODE_LRULOCALDESTROYACTION_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/LRUMapEntry.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LRUMapEntry.hpp b/src/cppcache/src/LRUMapEntry.hpp
index 0b4299a..363f60d 100644
--- a/src/cppcache/src/LRUMapEntry.hpp
+++ b/src/cppcache/src/LRUMapEntry.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_LRUMAPENTRY_H_
+#define GEODE_LRUMAPENTRY_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_IMPL_LRUMAPENTRY_H__
-#define __GEMFIRE_IMPL_LRUMAPENTRY_H__
 
 #include <gfcpp/gfcpp_globals.hpp>
 #include <gfcpp/CacheableKey.hpp>
@@ -121,4 +124,4 @@ class CPPCACHE_EXPORT LRUEntryFactory : public EntryFactory {
 }  // namespace geode
 }  // namespace apache
 
-#endif  //__GEMFIRE_IMPL_LRUMAPENTRY_H__
+#endif // GEODE_LRUMAPENTRY_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/LocalRegion.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LocalRegion.hpp b/src/cppcache/src/LocalRegion.hpp
index 598b9e0..e5a8945 100644
--- a/src/cppcache/src/LocalRegion.hpp
+++ b/src/cppcache/src/LocalRegion.hpp
@@ -1,5 +1,7 @@
-#ifndef __GEMFIRE_LOCALREGION_H__
-#define __GEMFIRE_LOCALREGION_H__
+#pragma once
+
+#ifndef GEODE_LOCALREGION_H_
+#define GEODE_LOCALREGION_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -495,4 +497,4 @@ class CPPCACHE_EXPORT LocalRegion : public RegionInternal {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_LOCALREGION_H__
+#endif // GEODE_LOCALREGION_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/LocatorListRequest.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LocatorListRequest.hpp b/src/cppcache/src/LocatorListRequest.hpp
index ab40845..e446981 100644
--- a/src/cppcache/src/LocatorListRequest.hpp
+++ b/src/cppcache/src/LocatorListRequest.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_LOCATORLISTREQUEST_H_
+#define GEODE_LOCATORLISTREQUEST_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 __LOCATORLISTREQUEST__
-#define __LOCATORLISTREQUEST__
 #include <string>
 #include "ServerLocationRequest.hpp"
 #include "GeodeTypeIdsImpl.hpp"
@@ -39,4 +42,5 @@ class LocatorListRequest : public ServerLocationRequest {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif
+
+#endif // GEODE_LOCATORLISTREQUEST_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/LocatorListResponse.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LocatorListResponse.hpp b/src/cppcache/src/LocatorListResponse.hpp
index 284a467..010bc81 100644
--- a/src/cppcache/src/LocatorListResponse.hpp
+++ b/src/cppcache/src/LocatorListResponse.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_LOCATORLISTRESPONSE_H_
+#define GEODE_LOCATORLISTRESPONSE_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 _LOCATOR_LIST_RESPONSE_
-#define _LOCATOR_LIST_RESPONSE_
 #include <vector>
 #include "GeodeTypeIdsImpl.hpp"
 #include "ServerLocationResponse.hpp"
@@ -48,4 +51,5 @@ typedef SharedPtr<LocatorListResponse> LocatorListResponsePtr;
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif
+
+#endif // GEODE_LOCATORLISTRESPONSE_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/MapEntry.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/MapEntry.hpp b/src/cppcache/src/MapEntry.hpp
index 221b7fd..d01b8cf 100644
--- a/src/cppcache/src/MapEntry.hpp
+++ b/src/cppcache/src/MapEntry.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_MAPENTRY_H_
+#define GEODE_MAPENTRY_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_IMPL_MAPENTRY_H__
-#define __GEMFIRE_IMPL_MAPENTRY_H__
 
 #include <gfcpp/gfcpp_globals.hpp>
 #include <gfcpp/Cacheable.hpp>
@@ -285,4 +288,4 @@ class CPPCACHE_EXPORT EntryFactory {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __GEMFIRE_IMPL_MAPENTRY_H__
+#endif // GEODE_MAPENTRY_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/MapEntryT.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/MapEntryT.hpp b/src/cppcache/src/MapEntryT.hpp
index b680a59..18d7235 100644
--- a/src/cppcache/src/MapEntryT.hpp
+++ b/src/cppcache/src/MapEntryT.hpp
@@ -1,5 +1,7 @@
-#ifndef __GEMFIRE_IMPL_MAPENTRY_T_HPP__
-#define __GEMFIRE_IMPL_MAPENTRY_T_HPP__
+#pragma once
+
+#ifndef GEODE_MAPENTRYT_H_
+#define GEODE_MAPENTRYT_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -290,4 +292,4 @@ inline int MapEntryST<TBase, 0, UPDATE_COUNT>::incUpdateCount(TBase* loc) {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __GEMFIRE_IMPL_MAPENTRY_T_HPP__
+#endif // GEODE_MAPENTRYT_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/MapSegment.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/MapSegment.hpp b/src/cppcache/src/MapSegment.hpp
index 68ccf33..feb0cf6 100644
--- a/src/cppcache/src/MapSegment.hpp
+++ b/src/cppcache/src/MapSegment.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_MAPSEGMENT_H_
+#define GEODE_MAPSEGMENT_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_IMPL_MAPSEGMENT_H__
-#define __GEMFIRE_IMPL_MAPSEGMENT_H__
 
 #include <gfcpp/gfcpp_globals.hpp>
 
@@ -307,4 +310,4 @@ class CPPCACHE_EXPORT MapSegment {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __GEMFIRE_IMPL_MAPSEGMENT_H__
+#endif // GEODE_MAPSEGMENT_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/MapWithLock.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/MapWithLock.hpp b/src/cppcache/src/MapWithLock.hpp
index 141c053..e4ed42f 100644
--- a/src/cppcache/src/MapWithLock.hpp
+++ b/src/cppcache/src/MapWithLock.hpp
@@ -1,5 +1,7 @@
-#ifndef __GEMFIRE_IMPL_MAP_WITHLOCK_H__
-#define __GEMFIRE_IMPL_MAP_WITHLOCK_H__
+#pragma once
+
+#ifndef GEODE_MAPWITHLOCK_H_
+#define GEODE_MAPWITHLOCK_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -79,4 +81,5 @@ typedef ACE_Guard<ACE_Recursive_Thread_Mutex> MapOfRegionGuard;
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // define __GEMFIRE_IMPL_MAP_WITHLOCK_H__
+
+#endif // GEODE_MAPWITHLOCK_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/MemberListForVersionStamp.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/MemberListForVersionStamp.hpp b/src/cppcache/src/MemberListForVersionStamp.hpp
index 08bdc72..c2ce1f5 100644
--- a/src/cppcache/src/MemberListForVersionStamp.hpp
+++ b/src/cppcache/src/MemberListForVersionStamp.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_MEMBERLISTFORVERSIONSTAMP_H_
+#define GEODE_MEMBERLISTFORVERSIONSTAMP_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 __MemberListForVersionStamp_HPP__
-#define __MemberListForVersionStamp_HPP__
 
 #include <gfcpp/gfcpp_globals.hpp>
 #include <gfcpp/SharedPtr.hpp>
@@ -59,4 +62,5 @@ typedef SharedPtr<MemberListForVersionStamp> MemberListForVersionStampPtr;
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __MemberListForVersionStamp_HPP__
+
+#endif // GEODE_MEMBERLISTFORVERSIONSTAMP_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/NanoTimer.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/NanoTimer.hpp b/src/cppcache/src/NanoTimer.hpp
index 0d60af5..3a321fa 100644
--- a/src/cppcache/src/NanoTimer.hpp
+++ b/src/cppcache/src/NanoTimer.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_NANOTIMER_H_
+#define GEODE_NANOTIMER_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_IMPL_NANOTIMER_HPP_
-#define _GEMFIRE_IMPL_NANOTIMER_HPP_
-
 #include <gfcpp/gfcpp_globals.hpp>
 
 namespace apache {
@@ -34,4 +36,4 @@ class CPPCACHE_EXPORT NanoTimer {
 }  // namespace geode
 }  // namespace apache
 
-#endif
+#endif // GEODE_NANOTIMER_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/NoResult.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/NoResult.hpp b/src/cppcache/src/NoResult.hpp
index c9d8c96..a89c3a4 100644
--- a/src/cppcache/src/NoResult.hpp
+++ b/src/cppcache/src/NoResult.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_NORESULT_H_
+#define GEODE_NORESULT_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_NO_RESULT_HPP__
-#define __GEMFIRE_NO_RESULT_HPP__
 
 #include <gfcpp/gfcpp_globals.hpp>
 #include <gfcpp/gf_types.hpp>
@@ -63,4 +66,4 @@ class CPPCACHE_EXPORT NoResult : public ResultCollector {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_NO_RESULT_HPP__
+#endif // GEODE_NORESULT_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/NonCopyable.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/NonCopyable.hpp b/src/cppcache/src/NonCopyable.hpp
index 0524629..27b1689 100644
--- a/src/cppcache/src/NonCopyable.hpp
+++ b/src/cppcache/src/NonCopyable.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_NONCOPYABLE_H_
+#define GEODE_NONCOPYABLE_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 NON_COPYABLE_H_
-#define NON_COPYABLE_H_
 
 namespace apache {
 namespace geode {
@@ -40,4 +43,5 @@ class CPPCACHE_EXPORT NonAssignable {
 }  // namespace geode
 }  // namespace apache
 
-#endif
+
+#endif // GEODE_NONCOPYABLE_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/PdxEnumInstantiator.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxEnumInstantiator.hpp b/src/cppcache/src/PdxEnumInstantiator.hpp
index 4b8126d..5457003 100644
--- a/src/cppcache/src/PdxEnumInstantiator.hpp
+++ b/src/cppcache/src/PdxEnumInstantiator.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_PDXENUMINSTANTIATOR_H_
+#define GEODE_PDXENUMINSTANTIATOR_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -14,12 +19,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*
-* PdxEnumInstantiator.hpp
-*/
-
-#ifndef _GEMFIRE_PDXENUM_INSTANTIATOR_HPP_
-#define _GEMFIRE_PDXENUM_INSTANTIATOR_HPP_
 
 #include <gfcpp/Serializable.hpp>
 #include <gfcpp/CacheableEnum.hpp>
@@ -54,4 +53,5 @@ class PdxEnumInstantiator : public Serializable {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif /* _GEMFIRE_PDXENUM_INSTANTIATOR_HPP_ */
+
+#endif // GEODE_PDXENUMINSTANTIATOR_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/PdxFieldType.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxFieldType.hpp b/src/cppcache/src/PdxFieldType.hpp
index 6e4182c..9d43226 100644
--- a/src/cppcache/src/PdxFieldType.hpp
+++ b/src/cppcache/src/PdxFieldType.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_PDXFIELDTYPE_H_
+#define GEODE_PDXFIELDTYPE_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -14,15 +19,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*
- * PdxFieldType.hpp
- *
- *  Created on: Nov 3, 2011
- *      Author: npatel
- */
-
-#ifndef _GEMFIRE_IMPL_PDXFIELDTYPE_HPP_
-#define _GEMFIRE_IMPL_PDXFIELDTYPE_HPP_
 
 #include <gfcpp/gfcpp_globals.hpp>
 #include <gfcpp/Serializable.hpp>
@@ -111,4 +107,5 @@ class CPPCACHE_EXPORT PdxFieldType : public Serializable {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif /* PDXFIELDTYPE_HPP_ */
+
+#endif // GEODE_PDXFIELDTYPE_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/PdxHelper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxHelper.hpp b/src/cppcache/src/PdxHelper.hpp
index a13ebc1..d8d5f0c 100644
--- a/src/cppcache/src/PdxHelper.hpp
+++ b/src/cppcache/src/PdxHelper.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_PDXHELPER_H_
+#define GEODE_PDXHELPER_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +26,6 @@
  *      Author: npatel
  */
 
-#ifndef PDXHELPER_HPP_
-#define PDXHELPER_HPP_
 
 #include <gfcpp/DataOutput.hpp>
 #include "EnumInfo.hpp"
@@ -81,4 +84,5 @@ class PdxHelper {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif /* PDXHELPER_HPP_ */
+
+#endif // GEODE_PDXHELPER_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/PdxInstanceFactoryImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxInstanceFactoryImpl.hpp b/src/cppcache/src/PdxInstanceFactoryImpl.hpp
index e914788..813b2df 100644
--- a/src/cppcache/src/PdxInstanceFactoryImpl.hpp
+++ b/src/cppcache/src/PdxInstanceFactoryImpl.hpp
@@ -1,5 +1,8 @@
-#ifndef __PDXINSTANCE_FACTORY_IMPL_HPP_
-#define __PDXINSTANCE_FACTORY_IMPL_HPP_
+#pragma once
+
+#ifndef GEODE_PDXINSTANCEFACTORYIMPL_H_
+#define GEODE_PDXINSTANCEFACTORYIMPL_H_
+
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -455,4 +458,5 @@ class CPPCACHE_EXPORT PdxInstanceFactoryImpl : public PdxInstanceFactory {
 }  // namespace geode
 }  // namespace apache
 
-#endif /* __PDXINSTANCE_FACTORY_IMPL_HPP_ */
+
+#endif // GEODE_PDXINSTANCEFACTORYIMPL_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/PdxInstanceImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxInstanceImpl.hpp b/src/cppcache/src/PdxInstanceImpl.hpp
index 7ef755a..0536ae9 100644
--- a/src/cppcache/src/PdxInstanceImpl.hpp
+++ b/src/cppcache/src/PdxInstanceImpl.hpp
@@ -1,5 +1,8 @@
-#ifndef __PDXINSTANCE_IMPL_HPP_
-#define __PDXINSTANCE_IMPL_HPP_
+#pragma once
+
+#ifndef GEODE_PDXINSTANCEIMPL_H_
+#define GEODE_PDXINSTANCEIMPL_H_
+
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -1167,4 +1170,5 @@ typedef SharedPtr<PdxInstanceImpl> PdxInstanceImplPtr;
 }  // namespace geode
 }  // namespace apache
 
-#endif /* __PDXINSTANCE_IMPL_HPP_*/
+
+#endif // GEODE_PDXINSTANCEIMPL_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/PdxInstantiator.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxInstantiator.hpp b/src/cppcache/src/PdxInstantiator.hpp
index 452177b..773ef78 100644
--- a/src/cppcache/src/PdxInstantiator.hpp
+++ b/src/cppcache/src/PdxInstantiator.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_PDXINSTANTIATOR_H_
+#define GEODE_PDXINSTANTIATOR_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -14,15 +19,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*
- * PdxInstantiator.hpp
- *
- *  Created on: Dec 28, 2011
- *      Author: npatel
- */
-
-#ifndef _GEMFIRE_PDXINSTANTIATOR_HPP_
-#define _GEMFIRE_PDXINSTANTIATOR_HPP_
 
 #include <gfcpp/Serializable.hpp>
 
@@ -54,4 +50,5 @@ class PdxInstantiator : public Serializable {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif /* _GEMFIRE_PDXINSTANTIATOR_HPP_ */
+
+#endif // GEODE_PDXINSTANTIATOR_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/PdxLocalReader.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxLocalReader.hpp b/src/cppcache/src/PdxLocalReader.hpp
index 0777647..b579ef2 100644
--- a/src/cppcache/src/PdxLocalReader.hpp
+++ b/src/cppcache/src/PdxLocalReader.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_PDXLOCALREADER_H_
+#define GEODE_PDXLOCALREADER_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -14,14 +19,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*
-* PdxLocalReader.hpp
-* Created on: Nov 3, 2011
-*      Author: npatel
-*/
-
-#ifndef _GEMFIRE_IMPL_PDXLOCALREADER_HPP_
-#define _GEMFIRE_IMPL_PDXLOCALREADER_HPP_
 
 #include <gfcpp/PdxReader.hpp>
 #include "PdxType.hpp"
@@ -221,4 +218,5 @@ typedef SharedPtr<PdxLocalReader> PdxLocalReaderPtr;
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif /* PDXLOCALREADER_HPP_ */
+
+#endif // GEODE_PDXLOCALREADER_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/PdxLocalWriter.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxLocalWriter.hpp b/src/cppcache/src/PdxLocalWriter.hpp
index a9708bc..4bbbe3d 100644
--- a/src/cppcache/src/PdxLocalWriter.hpp
+++ b/src/cppcache/src/PdxLocalWriter.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_PDXLOCALWRITER_H_
+#define GEODE_PDXLOCALWRITER_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -14,15 +19,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*
- * PdxLocalWriter.hpp
- *
- *  Created on: Nov 3, 2011
- *      Author: npatel
- */
-
-#ifndef _GEMFIRE_IMPL_PDXLOCALWRITER_HPP_
-#define _GEMFIRE_IMPL_PDXLOCALWRITER_HPP_
 
 #include <gfcpp/PdxWriter.hpp>
 #include "PdxType.hpp"
@@ -342,4 +338,5 @@ typedef SharedPtr<PdxLocalWriter> PdxLocalWriterPtr;
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif /* PDXLOCALWRITER_HPP_ */
+
+#endif // GEODE_PDXLOCALWRITER_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/PdxReaderWithTypeCollector.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxReaderWithTypeCollector.hpp b/src/cppcache/src/PdxReaderWithTypeCollector.hpp
index 4530012..ee2a812 100644
--- a/src/cppcache/src/PdxReaderWithTypeCollector.hpp
+++ b/src/cppcache/src/PdxReaderWithTypeCollector.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_PDXREADERWITHTYPECOLLECTOR_H_
+#define GEODE_PDXREADERWITHTYPECOLLECTOR_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -14,15 +19,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*
-* PdxReaderWithTypeCollector.hpp
-*
-*  Created on: Nov 3, 2011
-*      Author: npatel
-*/
-
-#ifndef _GEMFIRE_IMPL_PDXREADERWITHTYPECOLLECTOR_HPP_
-#define _GEMFIRE_IMPL_PDXREADERWITHTYPECOLLECTOR_HPP_
 
 #include "PdxLocalReader.hpp"
 
@@ -183,4 +179,4 @@ typedef SharedPtr<PdxReaderWithTypeCollector> PdxReaderWithTypeCollectorPtr;
 }  // namespace geode
 }  // namespace apache
 
-#endif /* PDXREADERWITHTYPECOLLECTOR_HPP_ */
+#endif // GEODE_PDXREADERWITHTYPECOLLECTOR_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/PdxRemotePreservedData.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxRemotePreservedData.hpp b/src/cppcache/src/PdxRemotePreservedData.hpp
index 33ff5f3..3384378 100644
--- a/src/cppcache/src/PdxRemotePreservedData.hpp
+++ b/src/cppcache/src/PdxRemotePreservedData.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_PDXREMOTEPRESERVEDDATA_H_
+#define GEODE_PDXREMOTEPRESERVEDDATA_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -14,15 +19,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*
- * PdxType.hpp
- *
- *  Created on: Dec 09, 2011
- *      Author: npatel
- */
-
-#ifndef _GEMFIRE_IMPL_PDXREMOTEPRESERVEDDATA_HPP_
-#define _GEMFIRE_IMPL_PDXREMOTEPRESERVEDDATA_HPP_
 
 #include <gfcpp/PdxUnreadFields.hpp>
 #include <vector>
@@ -117,4 +113,5 @@ class PdxRemotePreservedData : public PdxUnreadFields {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif
+
+#endif // GEODE_PDXREMOTEPRESERVEDDATA_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/PdxRemoteReader.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxRemoteReader.hpp b/src/cppcache/src/PdxRemoteReader.hpp
index 2a7eb9e..3c96ba9 100644
--- a/src/cppcache/src/PdxRemoteReader.hpp
+++ b/src/cppcache/src/PdxRemoteReader.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_PDXREMOTEREADER_H_
+#define GEODE_PDXREMOTEREADER_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -14,14 +19,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*
-* PdxRemoteReader.hpp
-*
-*  Created on: Nov 3, 2011
-*      Author: npatel
-*/
-#ifndef _GEMFIRE_IMPL_PDXREMOTEREADER_HPP_
-#define _GEMFIRE_IMPL_PDXREMOTEREADER_HPP_
 
 #include "PdxLocalReader.hpp"
 
@@ -216,4 +213,5 @@ typedef SharedPtr<PdxRemoteReader> PdxRemoteReaderPtr;
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif /* PDXREMOTEREADER_HPP_ */
+
+#endif // GEODE_PDXREMOTEREADER_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/PdxRemoteWriter.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxRemoteWriter.hpp b/src/cppcache/src/PdxRemoteWriter.hpp
index da05bb9..5819bbd 100644
--- a/src/cppcache/src/PdxRemoteWriter.hpp
+++ b/src/cppcache/src/PdxRemoteWriter.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_PDXREMOTEWRITER_H_
+#define GEODE_PDXREMOTEWRITER_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +26,6 @@
  *      Author: npatel
  */
 
-#ifndef PDXREMOTEWRITER_HPP_
-#define PDXREMOTEWRITER_HPP_
 
 #include "PdxLocalWriter.hpp"
 
@@ -238,4 +241,5 @@ typedef SharedPtr<PdxRemoteWriter> PdxRemoteWriterPtr;
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif /* PDXREMOTEWRITER_HPP_ */
+
+#endif // GEODE_PDXREMOTEWRITER_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/PdxType.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxType.hpp b/src/cppcache/src/PdxType.hpp
index b49af3e..3c20afb 100644
--- a/src/cppcache/src/PdxType.hpp
+++ b/src/cppcache/src/PdxType.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_PDXTYPE_H_
+#define GEODE_PDXTYPE_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -14,15 +19,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*
-* PdxType.hpp
-*
-*  Created on: Nov 3, 2011
-*      Author: npatel
-*/
-
-#ifndef _GEMFIRE_IMPL_PDXTYPE_HPP_
-#define _GEMFIRE_IMPL_PDXTYPE_HPP_
 
 #include <gfcpp/Serializable.hpp>
 #include "PdxFieldType.hpp"
@@ -224,4 +220,5 @@ class PdxType : public Serializable,
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif /* PDXTYPE_HPP_ */
+
+#endif // GEODE_PDXTYPE_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/PdxTypeRegistry.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxTypeRegistry.hpp b/src/cppcache/src/PdxTypeRegistry.hpp
index c54d5ec..b4745f2 100644
--- a/src/cppcache/src/PdxTypeRegistry.hpp
+++ b/src/cppcache/src/PdxTypeRegistry.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_PDXTYPEREGISTRY_H_
+#define GEODE_PDXTYPEREGISTRY_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -14,15 +19,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*
- * PdxTypeRegistry.hpp
- *
- *  Created on: Dec 9, 2011
- *      Author: npatel
- */
-
-#ifndef _GEMFIRE_IMPL_PDXTYPEREGISTRY_HPP_
-#define _GEMFIRE_IMPL_PDXTYPEREGISTRY_HPP_
 
 #include <gfcpp/PdxSerializable.hpp>
 #include "PdxRemotePreservedData.hpp"
@@ -143,4 +139,5 @@ class CPPCACHE_EXPORT PdxTypeRegistry {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif /* PDXTYPEREGISTRY_HPP_ */
+
+#endif // GEODE_PDXTYPEREGISTRY_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/PdxTypes.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxTypes.hpp b/src/cppcache/src/PdxTypes.hpp
index 262c20e..15f5ba2 100644
--- a/src/cppcache/src/PdxTypes.hpp
+++ b/src/cppcache/src/PdxTypes.hpp
@@ -1,5 +1,7 @@
-#ifndef __GEMFIRE_PDXTYPES_H__
-#define __GEMFIRE_PDXTYPES_H__
+#pragma once
+
+#ifndef GEODE_PDXTYPES_H_
+#define GEODE_PDXTYPES_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -41,4 +43,4 @@ class PdxTypes {
   static const int8_t DATE_SIZE = 8;
 };
 
-#endif  // __GEMFIRE_PDXTYPES_H__
+#endif // GEODE_PDXTYPES_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/PdxWriterWithTypeCollector.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxWriterWithTypeCollector.hpp b/src/cppcache/src/PdxWriterWithTypeCollector.hpp
index d598d54..eaff977 100644
--- a/src/cppcache/src/PdxWriterWithTypeCollector.hpp
+++ b/src/cppcache/src/PdxWriterWithTypeCollector.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_PDXWRITERWITHTYPECOLLECTOR_H_
+#define GEODE_PDXWRITERWITHTYPECOLLECTOR_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -14,15 +19,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*
- * PdxWriterWithTypeCollector.hpp
- *
- *  Created on: Nov 3, 2011
- *      Author: npatel
- */
-
-#ifndef _GEMFIRE_IMPL_PDXWRITERWITHTYPECOLLECTOR_HPP_
-#define _GEMFIRE_IMPL_PDXWRITERWITHTYPECOLLECTOR_HPP_
 
 #include "PdxLocalWriter.hpp"
 //#include <map>
@@ -231,4 +227,5 @@ typedef SharedPtr<PdxWriterWithTypeCollector> PdxWriterWithTypeCollectorPtr;
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif /* PDXWRITERWITHTYPECOLLECTOR_HPP_ */
+
+#endif // GEODE_PDXWRITERWITHTYPECOLLECTOR_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/PoolAttributes.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PoolAttributes.hpp b/src/cppcache/src/PoolAttributes.hpp
index 9218044..2431628 100644
--- a/src/cppcache/src/PoolAttributes.hpp
+++ b/src/cppcache/src/PoolAttributes.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_POOL_ATTRIBUTES_HPP__
-#define __GEMFIRE_POOL_ATTRIBUTES_HPP__
+#pragma once
+
+#ifndef GEODE_POOLATTRIBUTES_H_
+#define GEODE_POOLATTRIBUTES_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -160,4 +163,4 @@ class PoolAttributes : public SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_POOL_ATTRIBUTES_HPP__
+#endif // GEODE_POOLATTRIBUTES_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/PoolStatistics.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PoolStatistics.hpp b/src/cppcache/src/PoolStatistics.hpp
index 3e94253..31a70c9 100644
--- a/src/cppcache/src/PoolStatistics.hpp
+++ b/src/cppcache/src/PoolStatistics.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_POOLSTATISTICS_H_
+#define GEODE_POOLSTATISTICS_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_POOLSTATS_H__
-#define __GEMFIRE_POOLSTATS_H__ 1
-
 #include <gfcpp/gfcpp_globals.hpp>
 #include <gfcpp/statistics/Statistics.hpp>
 #include <gfcpp/statistics/StatisticsFactory.hpp>
@@ -249,4 +251,4 @@ class PoolStatType {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __GEMFIRE_POOLSTATS_H__
+#endif // GEODE_POOLSTATISTICS_H_

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

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/PooledBase.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PooledBase.hpp b/src/cppcache/src/PooledBase.hpp
index d47e15e..5bc9786 100644
--- a/src/cppcache/src/PooledBase.hpp
+++ b/src/cppcache/src/PooledBase.hpp
@@ -1,7 +1,7 @@
-#ifndef _GEMFIRE_PooledBase_HPP_
-#define _GEMFIRE_PooledBase_HPP_
+#pragma once
 
-// PooledBase.hpp     -*- mode: c++ -*-
+#ifndef GEODE_POOLEDBASE_H_
+#define GEODE_POOLEDBASE_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -61,6 +61,4 @@ class CPPCACHE_EXPORT PooledBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif
-
-// the end...
+#endif // GEODE_POOLEDBASE_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/PooledBasePool.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PooledBasePool.hpp b/src/cppcache/src/PooledBasePool.hpp
index 99e6c15..d33bb56 100644
--- a/src/cppcache/src/PooledBasePool.hpp
+++ b/src/cppcache/src/PooledBasePool.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_POOLEDBASEPOOL_H_
+#define GEODE_POOLEDBASEPOOL_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_IMPL_POOLEDBASEPOOL_HPP_
-#define _GEMFIRE_IMPL_POOLEDBASEPOOL_HPP_
 
 #include <gfcpp/gfcpp_globals.hpp>
 #include <gfcpp/SharedPtr.hpp>
@@ -79,4 +82,4 @@ class CPPCACHE_EXPORT PooledBasePool {
 }  // namespace geode
 }  // namespace apache
 
-#endif
+#endif // GEODE_POOLEDBASEPOOL_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/PreservedDataExpiryHandler.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PreservedDataExpiryHandler.hpp b/src/cppcache/src/PreservedDataExpiryHandler.hpp
index 3f3feae..906564b 100644
--- a/src/cppcache/src/PreservedDataExpiryHandler.hpp
+++ b/src/cppcache/src/PreservedDataExpiryHandler.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_PRESERVEDDATAEXPIRYHANDLER_H_
+#define GEODE_PRESERVEDDATAEXPIRYHANDLER_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +26,6 @@
  *      Author: npatel
  */
 
-#ifndef __PRESERVEDDATAEXPIRYHANDLER_HPP__
-#define __PRESERVEDDATAEXPIRYHANDLER_HPP__
 #include <gfcpp/gfcpp_globals.hpp>
 #include <gfcpp/Cache.hpp>
 #include <gfcpp/PdxSerializable.hpp>
@@ -72,4 +75,5 @@ class CPPCACHE_EXPORT PreservedDataExpiryHandler : public ACE_Event_Handler {
 }  // namespace geode
 }  // namespace apache
 
-#endif /* __PRESERVEDDATAEXPIRYHANDLER_HPP__*/
+
+#endif // GEODE_PRESERVEDDATAEXPIRYHANDLER_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/ProxyCache.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ProxyCache.hpp b/src/cppcache/src/ProxyCache.hpp
index 0ae3265..8f42996 100644
--- a/src/cppcache/src/ProxyCache.hpp
+++ b/src/cppcache/src/ProxyCache.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_PROXYCACHE_H__
-#define __GEMFIRE_PROXYCACHE_H__
+#pragma once
+
+#ifndef GEODE_PROXYCACHE_H_
+#define GEODE_PROXYCACHE_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -133,4 +136,5 @@ class CPPCACHE_EXPORT ProxyCache : public RegionService {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // ifndef __GEMFIRE_PROXYCACHE_H__
+
+#endif // GEODE_PROXYCACHE_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/ProxyRegion.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ProxyRegion.hpp b/src/cppcache/src/ProxyRegion.hpp
index f69719d..3aa27cf 100644
--- a/src/cppcache/src/ProxyRegion.hpp
+++ b/src/cppcache/src/ProxyRegion.hpp
@@ -1,5 +1,7 @@
-#ifndef __GEMFIRE_PROXYREGION_H__
-#define __GEMFIRE_PROXYREGION_H__
+#pragma once
+
+#ifndef GEODE_PROXYREGION_H_
+#define GEODE_PROXYREGION_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -1519,4 +1521,4 @@ typedef SharedPtr<ProxyRegion> ProxyRegionPtr;
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_PROXYREGION_H__
+#endif // GEODE_PROXYREGION_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/ProxyRemoteQueryService.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ProxyRemoteQueryService.hpp b/src/cppcache/src/ProxyRemoteQueryService.hpp
index 8a73d12..2579c78 100644
--- a/src/cppcache/src/ProxyRemoteQueryService.hpp
+++ b/src/cppcache/src/ProxyRemoteQueryService.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_PROXYREMOTEQUERYSERVICE_H__
-#define __GEMFIRE_PROXYREMOTEQUERYSERVICE_H__
+#pragma once
+
+#ifndef GEODE_PROXYREMOTEQUERYSERVICE_H_
+#define GEODE_PROXYREMOTEQUERYSERVICE_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 @@ typedef SharedPtr<ProxyRemoteQueryService> ProxyRemoteQueryServicePtr;
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // ifndef __GEMFIRE_PROXYREMOTEQUERYSERVICE_H__
+
+#endif // GEODE_PROXYREMOTEQUERYSERVICE_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/PutAllPartialResult.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PutAllPartialResult.hpp b/src/cppcache/src/PutAllPartialResult.hpp
index f3595bc..1234c08 100644
--- a/src/cppcache/src/PutAllPartialResult.hpp
+++ b/src/cppcache/src/PutAllPartialResult.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_PUTALLPARTIALRESULT_H_
+#define GEODE_PUTALLPARTIALRESULT_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 PUTALL_PARTIAL_RESULT
-#define PUTALL_PARTIAL_RESULT
 
 #include <gfcpp/Serializable.hpp>
 #include <gfcpp/CacheableString.hpp>
@@ -133,4 +136,5 @@ class PutAllPartialResult : public Serializable {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif
+
+#endif // GEODE_PUTALLPARTIALRESULT_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/PutAllPartialResultServerException.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PutAllPartialResultServerException.hpp b/src/cppcache/src/PutAllPartialResultServerException.hpp
index 9746a80..dce27fd 100644
--- a/src/cppcache/src/PutAllPartialResultServerException.hpp
+++ b/src/cppcache/src/PutAllPartialResultServerException.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_PUTALLPARTIALRESULTSERVEREXCEPTION_H_
+#define GEODE_PUTALLPARTIALRESULTSERVEREXCEPTION_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 PUTALL_PARTIALRESULT_SERVER_EXCEPTION
-#define PUTALL_PARTIALRESULT_SERVER_EXCEPTION
 
 #include <gfcpp/Serializable.hpp>
 #include <gfcpp/CacheableString.hpp>
@@ -141,4 +144,5 @@ class CPPCACHE_EXPORT PutAllPartialResultServerException : public Serializable {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif
+
+#endif // GEODE_PUTALLPARTIALRESULTSERVEREXCEPTION_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/Queue.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/Queue.hpp b/src/cppcache/src/Queue.hpp
index f5fcc01..1d97664 100644
--- a/src/cppcache/src/Queue.hpp
+++ b/src/cppcache/src/Queue.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_QUEUE_H_
+#define GEODE_QUEUE_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_QUEUE_HPP_
-#define __GEMFIRE_QUEUE_HPP_
 
 #include <deque>
 #include <ace/Time_Value.h>
@@ -165,4 +168,4 @@ class CPPCACHE_EXPORT Queue {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __GEMFIRE_QUEUE_HPP_
+#endif // GEODE_QUEUE_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/QueueConnectionRequest.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/QueueConnectionRequest.hpp b/src/cppcache/src/QueueConnectionRequest.hpp
index ba9f4ff..c9eaee9 100644
--- a/src/cppcache/src/QueueConnectionRequest.hpp
+++ b/src/cppcache/src/QueueConnectionRequest.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_QUEUECONNECTIONREQUEST_H_
+#define GEODE_QUEUECONNECTIONREQUEST_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 __QUEUE_CONNECTION_REQUEST__
-#define __QUEUE_CONNECTION_REQUEST__
 #include "ServerLocationRequest.hpp"
 #include "ServerLocation.hpp"
 #include "ClientProxyMembershipID.hpp"
@@ -60,4 +63,5 @@ class QueueConnectionRequest : public ServerLocationRequest {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif
+
+#endif // GEODE_QUEUECONNECTIONREQUEST_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/QueueConnectionResponse.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/QueueConnectionResponse.hpp b/src/cppcache/src/QueueConnectionResponse.hpp
index b3260a6..db2dff0 100644
--- a/src/cppcache/src/QueueConnectionResponse.hpp
+++ b/src/cppcache/src/QueueConnectionResponse.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_QUEUECONNECTIONRESPONSE_H_
+#define GEODE_QUEUECONNECTIONRESPONSE_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 __QUEUE_CONNECTION_RESPONSE__
-#define __QUEUE_CONNECTION_RESPONSE__
 #include <list>
 #include "ServerLocationResponse.hpp"
 #include <gfcpp/DataInput.hpp>
@@ -49,4 +52,5 @@ typedef SharedPtr<QueueConnectionResponse> QueueConnectionResponsePtr;
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif
+
+#endif // GEODE_QUEUECONNECTIONRESPONSE_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/ReadWriteLock.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ReadWriteLock.hpp b/src/cppcache/src/ReadWriteLock.hpp
index df04619..ffd0f13 100644
--- a/src/cppcache/src/ReadWriteLock.hpp
+++ b/src/cppcache/src/ReadWriteLock.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_READWRITELOCK_H_
+#define GEODE_READWRITELOCK_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_IMPL_READWRITELOCK_HPP_
-#define _GEMFIRE_IMPL_READWRITELOCK_HPP_
 
 #include <ace/RW_Thread_Mutex.h>
 #include "Condition.hpp"
@@ -89,4 +92,4 @@ class TryWriteGuard {
 }  // namespace geode
 }  // namespace apache
 
-#endif
+#endif // GEODE_READWRITELOCK_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/RegionCommit.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RegionCommit.hpp b/src/cppcache/src/RegionCommit.hpp
index 4e10881..397d737 100644
--- a/src/cppcache/src/RegionCommit.hpp
+++ b/src/cppcache/src/RegionCommit.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_REGIONCOMMIT_H_
+#define GEODE_REGIONCOMMIT_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +26,6 @@
  *      Author: ankurs
  */
 
-#ifndef REGIONCOMMIT_HPP_
-#define REGIONCOMMIT_HPP_
 
 #include <gfcpp/gf_types.hpp>
 #include <gfcpp/SharedBase.hpp>
@@ -60,4 +63,5 @@ class RegionCommit : public apache::geode::client::SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif /* REGIONCOMMIT_HPP_ */
+
+#endif // GEODE_REGIONCOMMIT_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/RegionExpiryHandler.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RegionExpiryHandler.hpp b/src/cppcache/src/RegionExpiryHandler.hpp
index d593e97..07b7a68 100644
--- a/src/cppcache/src/RegionExpiryHandler.hpp
+++ b/src/cppcache/src/RegionExpiryHandler.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_REGIONEXPIRYTASK_H__
-#define __GEMFIRE_REGIONEXPIRYTASK_H__
+#pragma once
+
+#ifndef GEODE_REGIONEXPIRYHANDLER_H_
+#define GEODE_REGIONEXPIRYHANDLER_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 RegionExpiryHandler : public ACE_Event_Handler {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_REGIONEXPIRYTASK_H__
+#endif // GEODE_REGIONEXPIRYHANDLER_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/RegionGlobalLocks.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RegionGlobalLocks.hpp b/src/cppcache/src/RegionGlobalLocks.hpp
index 38ced58..1b2a245 100644
--- a/src/cppcache/src/RegionGlobalLocks.hpp
+++ b/src/cppcache/src/RegionGlobalLocks.hpp
@@ -1,5 +1,7 @@
-#ifndef __GEMFIRE_REGIONGLOBAL_H__
-#define __GEMFIRE_REGIONGLOBAL_H__
+#pragma once
+
+#ifndef GEODE_REGIONGLOBALLOCKS_H_
+#define GEODE_REGIONGLOBALLOCKS_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -41,4 +43,4 @@ class CPPCACHE_EXPORT RegionGlobalLocks {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_REGIONGLOBAL_H__
+#endif // GEODE_REGIONGLOBALLOCKS_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/RegionInternal.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RegionInternal.hpp b/src/cppcache/src/RegionInternal.hpp
index 56c7078..d113c6b 100644
--- a/src/cppcache/src/RegionInternal.hpp
+++ b/src/cppcache/src/RegionInternal.hpp
@@ -1,5 +1,7 @@
-#ifndef __GEMFIRE_REGIONINTERNAL_H__
-#define __GEMFIRE_REGIONINTERNAL_H__
+#pragma once
+
+#ifndef GEODE_REGIONINTERNAL_H_
+#define GEODE_REGIONINTERNAL_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -295,4 +297,4 @@ typedef SharedPtr<RegionInternal> RegionInternalPtr;
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_REGIONINTERNAL_H__
+#endif // GEODE_REGIONINTERNAL_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/RegionStats.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RegionStats.hpp b/src/cppcache/src/RegionStats.hpp
index 2677751..46f5091 100644
--- a/src/cppcache/src/RegionStats.hpp
+++ b/src/cppcache/src/RegionStats.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_REGIONSTATS_H_
+#define GEODE_REGIONSTATS_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_REGIONSTATS_H__
-#define __GEMFIRE_REGIONSTATS_H__ 1
-
 #include <gfcpp/gfcpp_globals.hpp>
 #include <gfcpp/statistics/Statistics.hpp>
 #include <gfcpp/statistics/StatisticsFactory.hpp>
@@ -233,4 +235,4 @@ class RegionStatType {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __GEMFIRE_REGIONSTATS_H__
+#endif // GEODE_REGIONSTATS_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/RegionXmlCreation.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RegionXmlCreation.hpp b/src/cppcache/src/RegionXmlCreation.hpp
index 43ea663..b84851f 100644
--- a/src/cppcache/src/RegionXmlCreation.hpp
+++ b/src/cppcache/src/RegionXmlCreation.hpp
@@ -1,5 +1,8 @@
-#ifndef _GEMFIRE_REGIONXMLCREATION_HPP_
-#define _GEMFIRE_REGIONXMLCREATION_HPP_
+#pragma once
+
+#ifndef GEODE_REGIONXMLCREATION_H_
+#define GEODE_REGIONXMLCREATION_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -127,4 +130,5 @@ class CPPCACHE_EXPORT RegionXmlCreation {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // #ifndef  _GEMFIRE_REGIONXMLCREATION_HPP_
+
+#endif // GEODE_REGIONXMLCREATION_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/RemoteQuery.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RemoteQuery.hpp b/src/cppcache/src/RemoteQuery.hpp
index ff92ac7..851acc6 100644
--- a/src/cppcache/src/RemoteQuery.hpp
+++ b/src/cppcache/src/RemoteQuery.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_REMOTEQUERY_H__
-#define __GEMFIRE_REMOTEQUERY_H__
+#pragma once
+
+#ifndef GEODE_REMOTEQUERY_H_
+#define GEODE_REMOTEQUERY_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -82,4 +85,4 @@ typedef SharedPtr<RemoteQuery> RemoteQueryPtr;
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_REMOTEQUERY_H__
+#endif // GEODE_REMOTEQUERY_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/RemoteQueryService.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RemoteQueryService.hpp b/src/cppcache/src/RemoteQueryService.hpp
index e2dda52..6983e37 100644
--- a/src/cppcache/src/RemoteQueryService.hpp
+++ b/src/cppcache/src/RemoteQueryService.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_REMOTEQUERYSERVICE_H__
-#define __GEMFIRE_REMOTEQUERYSERVICE_H__
+#pragma once
+
+#ifndef GEODE_REMOTEQUERYSERVICE_H_
+#define GEODE_REMOTEQUERYSERVICE_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -86,4 +89,5 @@ typedef SharedPtr<RemoteQueryService> RemoteQueryServicePtr;
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // ifndef __GEMFIRE_REMOTEQUERYSERVICE_H__
+
+#endif // GEODE_REMOTEQUERYSERVICE_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/ResultSetImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ResultSetImpl.hpp b/src/cppcache/src/ResultSetImpl.hpp
index d6f7acc..23503e4 100644
--- a/src/cppcache/src/ResultSetImpl.hpp
+++ b/src/cppcache/src/ResultSetImpl.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_RESULTSETIMPL_H__
-#define __GEMFIRE_RESULTSETIMPL_H__
+#pragma once
+
+#ifndef GEODE_RESULTSETIMPL_H_
+#define GEODE_RESULTSETIMPL_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -61,4 +64,4 @@ class CPPCACHE_EXPORT ResultSetImpl : public ResultSet {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_RESULTSETIMPL_H__
+#endif // GEODE_RESULTSETIMPL_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/SerializationRegistry.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/SerializationRegistry.hpp b/src/cppcache/src/SerializationRegistry.hpp
index d1c0ac3..e45a5b9 100644
--- a/src/cppcache/src/SerializationRegistry.hpp
+++ b/src/cppcache/src/SerializationRegistry.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_SERIALIZATIONREGISTRY_H_
+#define GEODE_SERIALIZATIONREGISTRY_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_IMPL_SERIALIZATIONREGISTRY_HPP_
-#define _GEMFIRE_IMPL_SERIALIZATIONREGISTRY_HPP_
-
 #include <gfcpp/gfcpp_globals.hpp>
 
 #include <gfcpp/Serializable.hpp>
@@ -155,4 +157,4 @@ class CPPCACHE_EXPORT SerializationRegistry {
 }  // namespace geode
 }  // namespace apache
 
-#endif
+#endif // GEODE_SERIALIZATIONREGISTRY_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/ServerLocation.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ServerLocation.hpp b/src/cppcache/src/ServerLocation.hpp
index 9a72db5..cd75dd8 100644
--- a/src/cppcache/src/ServerLocation.hpp
+++ b/src/cppcache/src/ServerLocation.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_SERVERLOCATION_H_
+#define GEODE_SERVERLOCATION_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 __SERVER_LOCATION__
-#define __SERVER_LOCATION__
 #include <gfcpp/Serializable.hpp>
 #include <string>
 #include <gfcpp/DataInput.hpp>
@@ -175,4 +178,5 @@ class CPPCACHE_EXPORT ServerLocation : public Serializable {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif
+
+#endif // GEODE_SERVERLOCATION_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/ServerLocationRequest.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ServerLocationRequest.hpp b/src/cppcache/src/ServerLocationRequest.hpp
index 9c554d8..a7e3cf9 100644
--- a/src/cppcache/src/ServerLocationRequest.hpp
+++ b/src/cppcache/src/ServerLocationRequest.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_SERVERLOCATIONREQUEST_H_
+#define GEODE_SERVERLOCATIONREQUEST_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 __SERVER_LOCATION_REQUEST__
-#define __SERVER_LOCATION_REQUEST__
 #include <gfcpp/Serializable.hpp>
 namespace apache {
 namespace geode {
@@ -34,4 +37,5 @@ class ServerLocationRequest : public Serializable {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif
+
+#endif // GEODE_SERVERLOCATIONREQUEST_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/ServerLocationResponse.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ServerLocationResponse.hpp b/src/cppcache/src/ServerLocationResponse.hpp
index 8876aae..f0c7244 100644
--- a/src/cppcache/src/ServerLocationResponse.hpp
+++ b/src/cppcache/src/ServerLocationResponse.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_SERVERLOCATIONRESPONSE_H_
+#define GEODE_SERVERLOCATIONRESPONSE_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 __SERVER_LOCATION__RESPONSE__
-#define __SERVER_LOCATION__RESPONSE__
 #include <gfcpp/Serializable.hpp>
 #include "GeodeTypeIdsImpl.hpp"
 namespace apache {
@@ -39,4 +42,5 @@ class ServerLocationResponse : public Serializable {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif
+
+#endif // GEODE_SERVERLOCATIONRESPONSE_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/Set.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/Set.hpp b/src/cppcache/src/Set.hpp
index 67e10fd..4bb69c3 100644
--- a/src/cppcache/src/Set.hpp
+++ b/src/cppcache/src/Set.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_SET_H_
+#define GEODE_SET_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_SET_HPP_
-#define _GEMFIRE_SET_HPP_
 
 #include <unordered_set>
 #include <ace/Guard_T.h>
@@ -125,4 +128,4 @@ class CPPCACHE_EXPORT Set : private NonAssignable {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // !defined _GEMFIRE_SET_HPP_
+#endif // GEODE_SET_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/SpinLock.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/SpinLock.hpp b/src/cppcache/src/SpinLock.hpp
index 4f56db2..762bab6 100644
--- a/src/cppcache/src/SpinLock.hpp
+++ b/src/cppcache/src/SpinLock.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_SPINLOCK_H_
+#define GEODE_SPINLOCK_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_UTIL_IMPL_SPINLOCK_HPP__
-#define __GEMFIRE_UTIL_IMPL_SPINLOCK_HPP__
 
 #include "HostAsm.hpp"
 
@@ -116,4 +119,4 @@ CPPCACHE_EXPORT void testSpinLockRelease(void* lock);
 }  // namespace geode
 }  // namespace apache
 
-#endif
+#endif // GEODE_SPINLOCK_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/SslSockStream.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/SslSockStream.hpp b/src/cppcache/src/SslSockStream.hpp
index e4dd1ab..99dd0ea 100644
--- a/src/cppcache/src/SslSockStream.hpp
+++ b/src/cppcache/src/SslSockStream.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_SSLSOCKSTREAM_H_
+#define GEODE_SSLSOCKSTREAM_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 __SslSockStream_hpp__
-#define __SslSockStream_hpp__
 
 #include <ace/ACE.h>
 #include <ace/DLL.h>
@@ -90,4 +93,5 @@ class SslSockStream {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __SslSockStream_hpp__
+
+#endif // GEODE_SSLSOCKSTREAM_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/StackFrame.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/StackFrame.hpp b/src/cppcache/src/StackFrame.hpp
index a37f7bf..933e4b0 100644
--- a/src/cppcache/src/StackFrame.hpp
+++ b/src/cppcache/src/StackFrame.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_STACKFRAME_H_
+#define GEODE_STACKFRAME_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_STACKFRAME_HPP_
-#define _GEMFIRE_STACKFRAME_HPP_
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -142,4 +144,4 @@ class StackFrame {
 }  // namespace geode
 }  // namespace apache
 
-#endif /* _GEMFIRE_STACKFRAME_HPP_ */
+#endif // GEODE_STACKFRAME_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/StackTrace.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/StackTrace.hpp b/src/cppcache/src/StackTrace.hpp
index cbc2fa2..917128a 100644
--- a/src/cppcache/src/StackTrace.hpp
+++ b/src/cppcache/src/StackTrace.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_STACKTRACE_H_
+#define GEODE_STACKTRACE_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_STACKTRACE_HPP_
-#define _GEMFIRE_STACKTRACE_HPP_
-
 #define GF_TRACE_LEN 25
 
 #include "StackFrame.hpp"
@@ -64,4 +66,4 @@ class StackTrace : public SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif
+#endif // GEODE_STACKTRACE_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/StructSetImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/StructSetImpl.hpp b/src/cppcache/src/StructSetImpl.hpp
index 5f27d1d..d031013 100644
--- a/src/cppcache/src/StructSetImpl.hpp
+++ b/src/cppcache/src/StructSetImpl.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_STRUCTSETIMPL_H__
-#define __GEMFIRE_STRUCTSETIMPL_H__
+#pragma once
+
+#ifndef GEODE_STRUCTSETIMPL_H_
+#define GEODE_STRUCTSETIMPL_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 StructSetImpl : public StructSet {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_STRUCTSETIMPL_H__
+#endif // GEODE_STRUCTSETIMPL_H_

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/cppcache/src/SuspendedTxExpiryHandler.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/SuspendedTxExpiryHandler.hpp b/src/cppcache/src/SuspendedTxExpiryHandler.hpp
index 68d2cca..da1ed26 100644
--- a/src/cppcache/src/SuspendedTxExpiryHandler.hpp
+++ b/src/cppcache/src/SuspendedTxExpiryHandler.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_SUSPENDEDTXEXPIRYHANDLER_H_
+#define GEODE_SUSPENDEDTXEXPIRYHANDLER_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_SUSPENDEDTXEXPIRYTASK_H__
-#define _GEMFIRE_SUSPENDEDTXEXPIRYTASK_H__
 
 #include <gfcpp/gfcpp_globals.hpp>
 #include <gfcpp/Cache.hpp>
@@ -63,4 +66,5 @@ class CPPCACHE_EXPORT SuspendedTxExpiryHandler : public ACE_Event_Handler {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // ifndef _GEMFIRE_ENTRYEXPIRYTASK_H__
+
+#endif // GEODE_SUSPENDEDTXEXPIRYHANDLER_H_


Mime
View raw message