geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aba...@apache.org
Subject [39/50] [abbrv] geode-native git commit: GEODE-2411: Remove references to Gemfire from include guards.
Date Thu, 09 Feb 2017 18:09:36 GMT
http://git-wip-us.apache.org/repos/asf/geode-native/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-native/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-native/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_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/TSSTXStateWrapper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TSSTXStateWrapper.hpp b/src/cppcache/src/TSSTXStateWrapper.hpp
index d449b18..f2d9621 100644
--- a/src/cppcache/src/TSSTXStateWrapper.hpp
+++ b/src/cppcache/src/TSSTXStateWrapper.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_TSSTXSTATEWRAPPER_H_
+#define GEODE_TSSTXSTATEWRAPPER_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 TSSTXSTATEWRAPPER_HPP_
-#define TSSTXSTATEWRAPPER_HPP_
 
 #include <ace/TSS_T.h>
 #include "TXId.hpp"
@@ -50,4 +53,5 @@ class TSSTXStateWrapper {
 }  // namespace geode
 }  // namespace apache
 
-#endif /* TSSTXSTATEWRAPPER_HPP_ */
+
+#endif // GEODE_TSSTXSTATEWRAPPER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/TXCleaner.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TXCleaner.hpp b/src/cppcache/src/TXCleaner.hpp
index 4e48b7c..fc82478 100644
--- a/src/cppcache/src/TXCleaner.hpp
+++ b/src/cppcache/src/TXCleaner.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_TXCLEANER_H_
+#define GEODE_TXCLEANER_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 TXCLEANER_HPP_
-#define TXCLEANER_HPP_
 
 #include "CacheTransactionManagerImpl.hpp"
 #include "TSSTXStateWrapper.hpp"
@@ -52,4 +55,5 @@ class TXCleaner {
 }  // namespace geode
 }  // namespace apache
 
-#endif /* TXCLEANER_HPP_ */
+
+#endif // GEODE_TXCLEANER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/TXCommitMessage.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TXCommitMessage.hpp b/src/cppcache/src/TXCommitMessage.hpp
index 75f81ed..38f31a3 100644
--- a/src/cppcache/src/TXCommitMessage.hpp
+++ b/src/cppcache/src/TXCommitMessage.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_TXCOMMITMESSAGE_H_
+#define GEODE_TXCOMMITMESSAGE_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 TXCOMMITMESSAGE_HPP_
-#define TXCOMMITMESSAGE_HPP_
 
 #include <gfcpp/gfcpp_globals.hpp>
 #include <gfcpp/gf_types.hpp>
@@ -58,4 +61,5 @@ class TXCommitMessage : public apache::geode::client::Cacheable {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif /* TXCOMMITMESSAGE_HPP_ */
+
+#endif // GEODE_TXCOMMITMESSAGE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/TXEntryState.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TXEntryState.hpp b/src/cppcache/src/TXEntryState.hpp
index 71642fc..e4350a8 100644
--- a/src/cppcache/src/TXEntryState.hpp
+++ b/src/cppcache/src/TXEntryState.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_TXENTRYSTATE_H_
+#define GEODE_TXENTRYSTATE_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 TXENTRYSTATE_HPP_
-#define TXENTRYSTATE_HPP_
 
 #include <gfcpp/gf_types.hpp>
 
@@ -85,4 +88,5 @@ _GF_PTR_DEF_(TXEntryState, TXEntryStatePtr);
 }  // namespace geode
 }  // namespace apache
 
-#endif /* TXENTRYSTATE_HPP_ */
+
+#endif // GEODE_TXENTRYSTATE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/TXId.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TXId.hpp b/src/cppcache/src/TXId.hpp
index ea237c2..a76e98e 100644
--- a/src/cppcache/src/TXId.hpp
+++ b/src/cppcache/src/TXId.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_TXID_H_
+#define GEODE_TXID_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 TXID_H_
-#define TXID_H_
 
 #include <gfcpp/gf_types.hpp>
 #include <gfcpp/TransactionId.hpp>
@@ -52,4 +55,5 @@ class TXId : public apache::geode::client::TransactionId {
 }  // namespace geode
 }  // namespace apache
 
-#endif /* TXID_H_ */
+
+#endif // GEODE_TXID_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/TXRegionState.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TXRegionState.hpp b/src/cppcache/src/TXRegionState.hpp
index fc7c671..88f1856 100644
--- a/src/cppcache/src/TXRegionState.hpp
+++ b/src/cppcache/src/TXRegionState.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_TXREGIONSTATE_H_
+#define GEODE_TXREGIONSTATE_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 TXREGIONSTATE_HPP_
-#define TXREGIONSTATE_HPP_
 
 #include <gfcpp/gf_types.hpp>
 #include <gfcpp/HashMapT.hpp>
@@ -48,4 +51,5 @@ _GF_PTR_DEF_(TXRegionState, TXRegionStatePtr);
 }  // namespace geode
 }  // namespace apache
 
-#endif /* TXREGIONSTATE_HPP_ */
+
+#endif // GEODE_TXREGIONSTATE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/TXState.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TXState.hpp b/src/cppcache/src/TXState.hpp
index 527cd42..cb048f5 100644
--- a/src/cppcache/src/TXState.hpp
+++ b/src/cppcache/src/TXState.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_TXSTATE_H_
+#define GEODE_TXSTATE_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 TXSTATE_HPP_
-#define TXSTATE_HPP_
 
 #include "TXId.hpp"
 #include "TXRegionState.hpp"
@@ -100,4 +103,5 @@ class TXState {
 }  // namespace geode
 }  // namespace apache
 
-#endif /* TXSTATE_HPP_ */
+
+#endif // GEODE_TXSTATE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/TableOfPrimes.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TableOfPrimes.hpp b/src/cppcache/src/TableOfPrimes.hpp
index 0c3eda4..7c2c4ce 100644
--- a/src/cppcache/src/TableOfPrimes.hpp
+++ b/src/cppcache/src/TableOfPrimes.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_TABLEOFPRIMES_H_
+#define GEODE_TABLEOFPRIMES_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_TABLEOFPRIMES_H__
-#define __GEMFIRE_IMPL_TABLEOFPRIMES_H__
 
 #include <gfcpp/gfcpp_globals.hpp>
 #include <algorithm>
@@ -88,4 +91,4 @@ class CPPCACHE_EXPORT TableOfPrimes {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __GEMFIRE_IMPL_TABLEOFPRIMES_H__
+#endif // GEODE_TABLEOFPRIMES_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/TcpConn.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TcpConn.hpp b/src/cppcache/src/TcpConn.hpp
index 2bdb2b7..b5d6dcb 100644
--- a/src/cppcache/src/TcpConn.hpp
+++ b/src/cppcache/src/TcpConn.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_TCPCONN_H_
+#define GEODE_TCPCONN_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 __TcpConn_hpp__
-#define __TcpConn_hpp__
 
 #include <gfcpp/gfcpp_globals.hpp>
 #include <gfcpp/Log.hpp>
@@ -139,4 +142,5 @@ class CPPCACHE_EXPORT TcpConn : public Connector {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __TcpConn_hpp__
+
+#endif // GEODE_TCPCONN_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/TcpSslConn.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TcpSslConn.hpp b/src/cppcache/src/TcpSslConn.hpp
index 1fd0c3e..41def0a 100644
--- a/src/cppcache/src/TcpSslConn.hpp
+++ b/src/cppcache/src/TcpSslConn.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_TCPSSLCONN_H_
+#define GEODE_TCPSSLCONN_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 __TcpSslConn_hpp__
-#define __TcpSslConn_hpp__
 
 #include "TcpConn.hpp"
 #include <ace/DLL.h>
@@ -85,4 +88,5 @@ class TcpSslConn : public TcpConn {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __TcpSslConn_hpp__
+
+#endif // GEODE_TCPSSLCONN_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/TcrChunkedContext.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TcrChunkedContext.hpp b/src/cppcache/src/TcrChunkedContext.hpp
index 6c6469e..1207792 100644
--- a/src/cppcache/src/TcrChunkedContext.hpp
+++ b/src/cppcache/src/TcrChunkedContext.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_TCRCHUNKEDCONTEXT_H_
+#define GEODE_TCRCHUNKEDCONTEXT_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 @@
  *
  */
 
-#ifndef __TCR_CHUNKED_CONTEXT_HPP__
-#define __TCR_CHUNKED_CONTEXT_HPP__
 
 #include <memory>
 
@@ -184,4 +187,5 @@ class TcrChunkedContext {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __TCR_CHUNKED_CONTEXT_HPP__
+
+#endif // GEODE_TCRCHUNKEDCONTEXT_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/TcrConnection.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TcrConnection.hpp b/src/cppcache/src/TcrConnection.hpp
index 0f1dcb6..9a97fa8 100644
--- a/src/cppcache/src/TcrConnection.hpp
+++ b/src/cppcache/src/TcrConnection.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_TCRCONNECTION_H_
+#define GEODE_TCRCONNECTION_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 __TCR_CONNECTION_HPP__
-#define __TCR_CONNECTION_HPP__
 
 #include <ace/Semaphore.h>
 #include <gfcpp/gfcpp_globals.hpp>
@@ -404,4 +407,5 @@ class CPPCACHE_EXPORT TcrConnection {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __TCR_CONNECTION_HPP__
+
+#endif // GEODE_TCRCONNECTION_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/TcrConnectionManager.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TcrConnectionManager.hpp b/src/cppcache/src/TcrConnectionManager.hpp
index d2dc8c2..e7db605 100644
--- a/src/cppcache/src/TcrConnectionManager.hpp
+++ b/src/cppcache/src/TcrConnectionManager.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_TCRCONNECTIONMANAGER_H_
+#define GEODE_TCRCONNECTIONMANAGER_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 __TCR_CONNECTIONMANAGER_HPP__
-#define __TCR_CONNECTIONMANAGER_HPP__
 
 #include <gfcpp/gfcpp_globals.hpp>
 #include "GF_TASK_T.hpp"
@@ -208,4 +211,5 @@ class DistManagersLockGuard {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __TCR_CONNECTIONMANAGER_HPP__
+
+#endif // GEODE_TCRCONNECTIONMANAGER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/TcrDistributionManager.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TcrDistributionManager.hpp b/src/cppcache/src/TcrDistributionManager.hpp
index aacd5f5..5e4a636 100644
--- a/src/cppcache/src/TcrDistributionManager.hpp
+++ b/src/cppcache/src/TcrDistributionManager.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_TCRDISTRIBUTIONMANAGER_H_
+#define GEODE_TCRDISTRIBUTIONMANAGER_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 __TCR_DISTRIBUTION_MANAGER_HPP__
-#define __TCR_DISTRIBUTION_MANAGER_HPP__
 
 #include <gfcpp/gfcpp_globals.hpp>
 #include "ThinClientDistributionManager.hpp"
@@ -53,4 +56,5 @@ class CPPCACHE_EXPORT TcrDistributionManager
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // __TCR_DISTRIBUTION_MANAGER_HPP__
+
+#endif // GEODE_TCRDISTRIBUTIONMANAGER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/TcrEndpoint.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TcrEndpoint.hpp b/src/cppcache/src/TcrEndpoint.hpp
index abf7ead..d41b11e 100644
--- a/src/cppcache/src/TcrEndpoint.hpp
+++ b/src/cppcache/src/TcrEndpoint.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_TCRENDPOINT_H_
+#define GEODE_TCRENDPOINT_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 __TCR_ENDPOINT_HPP__
-#define __TCR_ENDPOINT_HPP__
 
 #include <gfcpp/gfcpp_globals.hpp>
 #include <string>
@@ -263,4 +266,5 @@ class CPPCACHE_EXPORT TcrEndpoint {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // __TCR_ENDPOINT_HPP__
+
+#endif // GEODE_TCRENDPOINT_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/TcrHADistributionManager.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TcrHADistributionManager.hpp b/src/cppcache/src/TcrHADistributionManager.hpp
index 110086a..23be519 100644
--- a/src/cppcache/src/TcrHADistributionManager.hpp
+++ b/src/cppcache/src/TcrHADistributionManager.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_TCRHADISTRIBUTIONMANAGER_H_
+#define GEODE_TCRHADISTRIBUTIONMANAGER_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 __TCRHA_DISTRIBUTION_MANAGER_HPP__
-#define __TCRHA_DISTRIBUTION_MANAGER_HPP__
 
 #include <gfcpp/gf_base.hpp>
 #include "ThinClientDistributionManager.hpp"
@@ -94,4 +97,5 @@ class CPPCACHE_EXPORT TcrHADistributionManager
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __TCRHA_DISTRIBUTION_MANAGER_HPP__
+
+#endif // GEODE_TCRHADISTRIBUTIONMANAGER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/TcrMessage.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TcrMessage.hpp b/src/cppcache/src/TcrMessage.hpp
index d692184..5097d40 100644
--- a/src/cppcache/src/TcrMessage.hpp
+++ b/src/cppcache/src/TcrMessage.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_TCRMESSAGE_H_
+#define GEODE_TCRMESSAGE_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 __TCR_MESSAGE_HPP__
-#define __TCR_MESSAGE_HPP__
 
 #include <gfcpp/gfcpp_globals.hpp>
 #include "AtomicInc.hpp"
@@ -1224,4 +1227,5 @@ class TcrMessageHelper {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __TCR_MESSAGE_HPP__
+
+#endif // GEODE_TCRMESSAGE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/TcrPoolEndPoint.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TcrPoolEndPoint.hpp b/src/cppcache/src/TcrPoolEndPoint.hpp
index 505d724..5ecbe95 100644
--- a/src/cppcache/src/TcrPoolEndPoint.hpp
+++ b/src/cppcache/src/TcrPoolEndPoint.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_TCRPOOLENDPOINT_H_
+#define GEODE_TCRPOOLENDPOINT_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 __TCR_POOL_ENDPOINT__
-#define __TCR_POOL_ENDPOINT__
 #include "TcrEndpoint.hpp"
 #include "PoolStatistics.hpp"
 namespace apache {
@@ -60,4 +63,5 @@ class TcrPoolEndPoint : public TcrEndpoint {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif
+
+#endif // GEODE_TCRPOOLENDPOINT_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/ThinClientBaseDM.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ThinClientBaseDM.hpp b/src/cppcache/src/ThinClientBaseDM.hpp
index fd55904..990f482 100644
--- a/src/cppcache/src/ThinClientBaseDM.hpp
+++ b/src/cppcache/src/ThinClientBaseDM.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_THINCLIENTBASEDM_H_
+#define GEODE_THINCLIENTBASEDM_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 __THINCLIENT_BASE_DISTRIBUTION_MANAGER_HPP__
-#define __THINCLIENT_BASE_DISTRIBUTION_MANAGER_HPP__
 
 #include <gfcpp/gfcpp_globals.hpp>
 #include "TcrConnectionManager.hpp"
@@ -198,4 +201,5 @@ class ThinClientBaseDM {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __THINCLIENT_DISTRIBUTION_MANAGER_HPP__
+
+#endif // GEODE_THINCLIENTBASEDM_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/ThinClientCacheDistributionManager.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ThinClientCacheDistributionManager.hpp b/src/cppcache/src/ThinClientCacheDistributionManager.hpp
index c73a00d..2f5ab8d 100644
--- a/src/cppcache/src/ThinClientCacheDistributionManager.hpp
+++ b/src/cppcache/src/ThinClientCacheDistributionManager.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_THINCLIENTCACHEDISTRIBUTIONMANAGER_H_
+#define GEODE_THINCLIENTCACHEDISTRIBUTIONMANAGER_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 __THINCLIENT_CACHE_DISTRIBUTION_MANAGER_HPP__
-#define __THINCLIENT_CACHE_DISTRIBUTION_MANAGER_HPP__
 
 #include <gfcpp/gfcpp_globals.hpp>
 #include <gfcpp/SharedPtr.hpp>
@@ -62,4 +65,5 @@ typedef SharedPtr<ThinClientCacheDistributionManager>
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // __THINCLIENT_CACHE_DISTRIBUTION_MANAGER_HPP__
+
+#endif // GEODE_THINCLIENTCACHEDISTRIBUTIONMANAGER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/ThinClientDistributionManager.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ThinClientDistributionManager.hpp b/src/cppcache/src/ThinClientDistributionManager.hpp
index 8c191c0..70442e0 100644
--- a/src/cppcache/src/ThinClientDistributionManager.hpp
+++ b/src/cppcache/src/ThinClientDistributionManager.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_THINCLIENTDISTRIBUTIONMANAGER_H_
+#define GEODE_THINCLIENTDISTRIBUTIONMANAGER_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 __THINCLIENT_DISTRIBUTION_MANAGER_HPP__
-#define __THINCLIENT_DISTRIBUTION_MANAGER_HPP__
 
 #include "ThinClientBaseDM.hpp"
 
@@ -76,4 +79,5 @@ class ThinClientDistributionManager : public ThinClientBaseDM {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __THINCLIENT_DISTRIBUTION_MANAGER_HPP__
+
+#endif // GEODE_THINCLIENTDISTRIBUTIONMANAGER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/ThinClientHARegion.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ThinClientHARegion.hpp b/src/cppcache/src/ThinClientHARegion.hpp
index 37d8ac6..51ea421 100644
--- a/src/cppcache/src/ThinClientHARegion.hpp
+++ b/src/cppcache/src/ThinClientHARegion.hpp
@@ -1,5 +1,7 @@
-#ifndef __GEMFIRE_THINCLIENTHAREGION_H__
-#define __GEMFIRE_THINCLIENTHAREGION_H__
+#pragma once
+
+#ifndef GEODE_THINCLIENTHAREGION_H_
+#define GEODE_THINCLIENTHAREGION_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -86,4 +88,4 @@ class CPPCACHE_EXPORT ThinClientHARegion : public ThinClientRegion {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_THINCLIENTHAREGION_H__
+#endif // GEODE_THINCLIENTHAREGION_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/ThinClientLocatorHelper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ThinClientLocatorHelper.hpp b/src/cppcache/src/ThinClientLocatorHelper.hpp
index 444ceac..6c1dd7d 100644
--- a/src/cppcache/src/ThinClientLocatorHelper.hpp
+++ b/src/cppcache/src/ThinClientLocatorHelper.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_THINCLIENTLOCATORHELPER_H_
+#define GEODE_THINCLIENTLOCATORHELPER_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_HELPER_HPP_INCLUDED__
-#define __LOCATOR_HELPER_HPP_INCLUDED__
 
 #include <string>
 #include <gfcpp/gfcpp_globals.hpp>
@@ -67,4 +70,5 @@ class ThinClientLocatorHelper {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif
+
+#endif // GEODE_THINCLIENTLOCATORHELPER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/ThinClientPoolDM.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ThinClientPoolDM.hpp b/src/cppcache/src/ThinClientPoolDM.hpp
index 84c3481..655e37a 100644
--- a/src/cppcache/src/ThinClientPoolDM.hpp
+++ b/src/cppcache/src/ThinClientPoolDM.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_THINCLIENTPOOLDM_H_
+#define GEODE_THINCLIENTPOOLDM_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 __THINCLIENT_POOL_DISTRIBUTION_MANAGER_HPP__
-#define __THINCLIENT_POOL_DISTRIBUTION_MANAGER_HPP__
 
 #include <string>
 #include "ThinClientBaseDM.hpp"
@@ -678,4 +681,5 @@ class OnRegionFunctionExecution : public PooledWork<GfErrType> {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __THINCLIENT_POOL_DISTRIBUTION_MANAGER_HPP__
+
+#endif // GEODE_THINCLIENTPOOLDM_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/ThinClientPoolHADM.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ThinClientPoolHADM.hpp b/src/cppcache/src/ThinClientPoolHADM.hpp
index 8f53ca7..ea0fe2c 100644
--- a/src/cppcache/src/ThinClientPoolHADM.hpp
+++ b/src/cppcache/src/ThinClientPoolHADM.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_THINCLIENTPOOLHADM_H_
+#define GEODE_THINCLIENTPOOLHADM_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 __THIN_CLIENT_POOL_HADM__
-#define __THIN_CLIENT_POOL_HADM__
 #include "ThinClientPoolDM.hpp"
 #include "PoolAttributes.hpp"
 #include "TcrConnectionManager.hpp"
@@ -145,4 +148,5 @@ typedef SharedPtr<ThinClientPoolHADM> ThinClientPoolHADMPtr;
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif
+
+#endif // GEODE_THINCLIENTPOOLHADM_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/ThinClientPoolRegion.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ThinClientPoolRegion.hpp b/src/cppcache/src/ThinClientPoolRegion.hpp
index fdb815b..38baad5 100644
--- a/src/cppcache/src/ThinClientPoolRegion.hpp
+++ b/src/cppcache/src/ThinClientPoolRegion.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_THINCLIENTPOOLREGION_H_
+#define GEODE_THINCLIENTPOOLREGION_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: abhaware
  */
 
-#ifndef THINCLIENTPOOLREGION_HPP_
-#define THINCLIENTPOOLREGION_HPP_
 
 #include "ThinClientHARegion.hpp"
 
@@ -53,4 +56,5 @@ class ThinClientPoolRegion : public ThinClientRegion {
 }  // namespace geode
 }  // namespace apache
 
-#endif /* THINCLIENTPOOLREGION_HPP_ */
+
+#endif // GEODE_THINCLIENTPOOLREGION_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/ThinClientPoolStickyDM.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ThinClientPoolStickyDM.hpp b/src/cppcache/src/ThinClientPoolStickyDM.hpp
index 671c84e..222bcd8 100644
--- a/src/cppcache/src/ThinClientPoolStickyDM.hpp
+++ b/src/cppcache/src/ThinClientPoolStickyDM.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_THINCLIENTPOOLSTICKYDM_H_
+#define GEODE_THINCLIENTPOOLSTICKYDM_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 __THINCLIENT_POOL_STICKY_DM__
-#define __THINCLIENT_POOL_STICKY_DM__
 #include "ThinClientPoolDM.hpp"
 #include "ThinClientStickyManager.hpp"
 namespace apache {
@@ -53,4 +56,5 @@ typedef SharedPtr<ThinClientPoolStickyDM> ThinClientPoolStickyDMPtr;
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif
+
+#endif // GEODE_THINCLIENTPOOLSTICKYDM_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/ThinClientPoolStickyHADM.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ThinClientPoolStickyHADM.hpp b/src/cppcache/src/ThinClientPoolStickyHADM.hpp
index 10381f9..891b5e7 100644
--- a/src/cppcache/src/ThinClientPoolStickyHADM.hpp
+++ b/src/cppcache/src/ThinClientPoolStickyHADM.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_THINCLIENTPOOLSTICKYHADM_H_
+#define GEODE_THINCLIENTPOOLSTICKYHADM_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 __THINCLIENT_POOL_STICKY_HA_DM__
-#define __THINCLIENT_POOL_STICKY_HA_DM__
 #include "ThinClientPoolHADM.hpp"
 
 namespace apache {
@@ -54,4 +57,5 @@ typedef SharedPtr<ThinClientPoolStickyHADM> ThinClientPoolStickyHADMPtr;
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif
+
+#endif // GEODE_THINCLIENTPOOLSTICKYHADM_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/ThinClientRedundancyManager.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ThinClientRedundancyManager.hpp b/src/cppcache/src/ThinClientRedundancyManager.hpp
index 8914a70..3972442 100644
--- a/src/cppcache/src/ThinClientRedundancyManager.hpp
+++ b/src/cppcache/src/ThinClientRedundancyManager.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_THINCLIENTREDUNDANCYMANAGER_H_
+#define GEODE_THINCLIENTREDUNDANCYMANAGER_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: abhaware
  */
 
-#ifndef THINCLIENTREDUNDANCYMANAGER_HPP_
-#define THINCLIENTREDUNDANCYMANAGER_HPP_
 
 #include "TcrMessage.hpp"
 #include "TcrEndpoint.hpp"
@@ -145,4 +148,5 @@ class ThinClientRedundancyManager {
 }  // namespace geode
 }  // namespace apache
 
-#endif /* THINCLIENTREDUNDANCYMANAGER_HPP_ */
+
+#endif // GEODE_THINCLIENTREDUNDANCYMANAGER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/ThinClientRegion.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ThinClientRegion.hpp b/src/cppcache/src/ThinClientRegion.hpp
index 662402c..75e5a60 100644
--- a/src/cppcache/src/ThinClientRegion.hpp
+++ b/src/cppcache/src/ThinClientRegion.hpp
@@ -1,5 +1,7 @@
-#ifndef __GEMFIRE_THINCLIENTREGION_H__
-#define __GEMFIRE_THINCLIENTREGION_H__
+#pragma once
+
+#ifndef GEODE_THINCLIENTREGION_H_
+#define GEODE_THINCLIENTREGION_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -620,4 +622,4 @@ typedef SharedPtr<ChunkedDurableCQListResponse> ChunkedDurableCQListResponsePtr;
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_THINCLIENTREGION_H__
+#endif // GEODE_THINCLIENTREGION_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/ThinClientStickyManager.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ThinClientStickyManager.hpp b/src/cppcache/src/ThinClientStickyManager.hpp
index 259963b..5272e47 100644
--- a/src/cppcache/src/ThinClientStickyManager.hpp
+++ b/src/cppcache/src/ThinClientStickyManager.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_THINCLIENTSTICKYMANAGER_H_
+#define GEODE_THINCLIENTSTICKYMANAGER_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 __THINCLIENT_POOL_STICKY_MANAGER__
-#define __THINCLIENT_POOL_STICKY_MANAGER__
 
 #include "TssConnectionWrapper.hpp"
 #include <algorithm>
@@ -56,4 +59,5 @@ class ThinClientStickyManager {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif
+
+#endif // GEODE_THINCLIENTSTICKYMANAGER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/ThreadPool.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ThreadPool.hpp b/src/cppcache/src/ThreadPool.hpp
index 3b9e1b4..f336567 100644
--- a/src/cppcache/src/ThreadPool.hpp
+++ b/src/cppcache/src/ThreadPool.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_THREADPOOL_H_
+#define GEODE_THREADPOOL_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 THREADPOOL_HPP_
-#define THREADPOOL_HPP_
 
 #include <ace/Task.h>
 #include <ace/Method_Request.h>
@@ -158,4 +161,5 @@ typedef ACE_Singleton<ThreadPool, ACE_Recursive_Thread_Mutex> TPSingleton;
 }  // namespace geode
 }  // namespace apache
 
-#endif /* THREADPOOL_HPP_ */
+
+#endif // GEODE_THREADPOOL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/TimeoutTimer.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TimeoutTimer.hpp b/src/cppcache/src/TimeoutTimer.hpp
index aac7b46..2dee300 100644
--- a/src/cppcache/src/TimeoutTimer.hpp
+++ b/src/cppcache/src/TimeoutTimer.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_TIMEOUTTIMER_H_
+#define GEODE_TIMEOUTTIMER_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_TIMEOUT_HPP_
-#define _GEMFIRE_TIMEOUT_HPP_
 
 #include <gfcpp/gfcpp_globals.hpp>
 
@@ -67,4 +70,4 @@ class CPPCACHE_EXPORT TimeoutTimer {
 }  // namespace geode
 }  // namespace apache
 
-#endif
+#endif // GEODE_TIMEOUTTIMER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/TombstoneExpiryHandler.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TombstoneExpiryHandler.hpp b/src/cppcache/src/TombstoneExpiryHandler.hpp
index 68858f0..b0ae5a5 100644
--- a/src/cppcache/src/TombstoneExpiryHandler.hpp
+++ b/src/cppcache/src/TombstoneExpiryHandler.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_TOMBSTONEEXPIRYHANDLER_H_
+#define GEODE_TOMBSTONEEXPIRYHANDLER_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_TOMBSTONEEXPIRYTASK_H__
-#define __GEMFIRE_TOMBSTONEEXPIRYTASK_H__
 
 #include <gfcpp/gfcpp_globals.hpp>
 #include <gfcpp/Region.hpp>
@@ -71,4 +74,4 @@ class CPPCACHE_EXPORT TombstoneExpiryHandler : public ACE_Event_Handler {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_TOMBSTONEEXPIRYTASK_H__
+#endif // GEODE_TOMBSTONEEXPIRYHANDLER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/TombstoneList.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TombstoneList.hpp b/src/cppcache/src/TombstoneList.hpp
index 3a816e2..061a29f 100644
--- a/src/cppcache/src/TombstoneList.hpp
+++ b/src/cppcache/src/TombstoneList.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_TOMBSTONELIST_H_
+#define GEODE_TOMBSTONELIST_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_TOMBSTONELIST_H__
-#define __GEMFIRE_IMPL_TOMBSTONELIST_H__
-
 #include <list>
 #include <ace/Recursive_Thread_Mutex.h>
 #include "ace/Guard_T.h"
@@ -98,4 +100,4 @@ typedef SharedPtr<TombstoneList> TombstoneListPtr;
 }  // namespace geode
 }  // namespace apache
 
-#endif  // !defined (__GEMFIRE_IMPL_TOMBSTONELIST_H__)
+#endif // GEODE_TOMBSTONELIST_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/TrackedMapEntry.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TrackedMapEntry.hpp b/src/cppcache/src/TrackedMapEntry.hpp
index 343d766..f8cdf67 100644
--- a/src/cppcache/src/TrackedMapEntry.hpp
+++ b/src/cppcache/src/TrackedMapEntry.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_TRACKEDMAPENTRY_H_
+#define GEODE_TRACKEDMAPENTRY_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_TRACKEDMAPENTRY_HPP__
-#define __GEMFIRE_IMPL_TRACKEDMAPENTRY_HPP__
-
 #include "MapEntry.hpp"
 
 namespace apache {
@@ -79,4 +81,4 @@ class TrackedMapEntry : public MapEntry {
 }  // namespace geode
 }  // namespace apache
 
-#endif /* __GEMFIRE_IMPL_TRACKEDMAPENTRY_HPP__ */
+#endif // GEODE_TRACKEDMAPENTRY_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/TransactionSuspender.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TransactionSuspender.hpp b/src/cppcache/src/TransactionSuspender.hpp
index 454f8d3..f6127c6 100644
--- a/src/cppcache/src/TransactionSuspender.hpp
+++ b/src/cppcache/src/TransactionSuspender.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_TRANSACTIONSUSPENDER_H_
+#define GEODE_TRANSACTIONSUSPENDER_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 TRANSACTIONSUSPENDER_HPP_
-#define TRANSACTIONSUSPENDER_HPP_
 
 #include "TXState.hpp"
 
@@ -42,4 +45,5 @@ class TransactionSuspender {
 }  // namespace geode
 }  // namespace apache
 
-#endif /* TRANSACTIONSUSPENDER_HPP_ */
+
+#endif // GEODE_TRANSACTIONSUSPENDER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/TransactionalOperation.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TransactionalOperation.hpp b/src/cppcache/src/TransactionalOperation.hpp
index ac288eb..0498655 100644
--- a/src/cppcache/src/TransactionalOperation.hpp
+++ b/src/cppcache/src/TransactionalOperation.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_TRANSACTIONALOPERATION_H_
+#define GEODE_TRANSACTIONALOPERATION_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 TRANSACTIONALOPERATION_HPP_
-#define TRANSACTIONALOPERATION_HPP_
 
 #include <gfcpp/gfcpp_globals.hpp>
 #include <gfcpp/gf_types.hpp>
@@ -70,4 +73,5 @@ class TransactionalOperation : public apache::geode::client::SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif /* TRANSACTIONALOPERATION_HPP_ */
+
+#endif // GEODE_TRANSACTIONALOPERATION_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/TssConnectionWrapper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TssConnectionWrapper.hpp b/src/cppcache/src/TssConnectionWrapper.hpp
index f1fce27..3919cb6 100644
--- a/src/cppcache/src/TssConnectionWrapper.hpp
+++ b/src/cppcache/src/TssConnectionWrapper.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_TSSCONNECTIONWRAPPER_H_
+#define GEODE_TSSCONNECTIONWRAPPER_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 _TSS_CONNECTION_WRAPPER_HPP_
-#define _TSS_CONNECTION_WRAPPER_HPP_
 #include <ace/TSS_T.h>
 #include <gfcpp/Pool.hpp>
 #include <map>
@@ -72,4 +75,5 @@ class TssConnectionWrapper {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif
+
+#endif // GEODE_TSSCONNECTIONWRAPPER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/UserAttributes.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/UserAttributes.hpp b/src/cppcache/src/UserAttributes.hpp
index 6c7e1cc..5453e11 100644
--- a/src/cppcache/src/UserAttributes.hpp
+++ b/src/cppcache/src/UserAttributes.hpp
@@ -1,5 +1,7 @@
-#ifndef __GEMFIRE_USERATTRIBUTES_H__
-#define __GEMFIRE_USERATTRIBUTES_H__
+#pragma once
+
+#ifndef GEODE_USERATTRIBUTES_H_
+#define GEODE_USERATTRIBUTES_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,6 +19,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include <gfcpp/gfcpp_globals.hpp>
 #include <gfcpp/Properties.hpp>
 #include "TcrEndpoint.hpp"
@@ -152,4 +155,4 @@ class GuardUserAttribures {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_USERATTRIBUTES_H__
+#endif // GEODE_USERATTRIBUTES_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/Utils.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/Utils.hpp b/src/cppcache/src/Utils.hpp
index 1202566..4111beb 100644
--- a/src/cppcache/src/Utils.hpp
+++ b/src/cppcache/src/Utils.hpp
@@ -1,5 +1,7 @@
-#ifndef __GEMFIRE_IMPL_UTILS_H__
-#define __GEMFIRE_IMPL_UTILS_H__
+#pragma once
+
+#ifndef GEODE_UTILS_H_
+#define GEODE_UTILS_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -224,4 +226,4 @@ class RandGen {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_IMPL_UTILS_H__
+#endif // GEODE_UTILS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/Version.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/Version.hpp b/src/cppcache/src/Version.hpp
index c5a6b0f..a60f48a 100644
--- a/src/cppcache/src/Version.hpp
+++ b/src/cppcache/src/Version.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_VERSION_H_
+#define GEODE_VERSION_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -14,8 +19,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef __GEMFIRE_VERSION_HPP__
-#define __GEMFIRE_VERSION_HPP__
+
 #include "CacheImpl.hpp"
 
 namespace apache {
@@ -36,4 +40,4 @@ class Version {
 }  // namespace geode
 }  // namespace apache
 
-#endif  //__GEMFIRE_VERSION_HPP__s
+#endif // GEODE_VERSION_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/VersionStamp.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/VersionStamp.hpp b/src/cppcache/src/VersionStamp.hpp
index 94472d5..dea4d98 100644
--- a/src/cppcache/src/VersionStamp.hpp
+++ b/src/cppcache/src/VersionStamp.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_VERSIONSTAMP_H_
+#define GEODE_VERSIONSTAMP_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_VERSIONSTAMP_H__
-#define __GEMFIRE_IMPL_VERSIONSTAMP_H__
 
 #include <gfcpp/gfcpp_globals.hpp>
 #include <gfcpp/SharedPtr.hpp>
@@ -80,4 +83,4 @@ typedef SharedPtr<VersionStamp> VersionStampPtr;
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __GEMFIRE_IMPL_VERSIONSTAMP_H__
+#endif // GEODE_VERSIONSTAMP_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/VersionTag.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/VersionTag.hpp b/src/cppcache/src/VersionTag.hpp
index f3d92d7..05e198e 100644
--- a/src/cppcache/src/VersionTag.hpp
+++ b/src/cppcache/src/VersionTag.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_VERSIONTAG_H_
+#define GEODE_VERSIONTAG_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 __VERSIONTAG_HPP__
-#define __VERSIONTAG_HPP__
 
 #include <gfcpp/Cacheable.hpp>
 #include "GeodeTypeIdsImpl.hpp"
@@ -86,4 +89,5 @@ class VersionTag : public Cacheable {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __VERSIONTAG_HPP__
+
+#endif // GEODE_VERSIONTAG_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/VersionedCacheableObjectPartList.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/VersionedCacheableObjectPartList.hpp b/src/cppcache/src/VersionedCacheableObjectPartList.hpp
index 3de15c3..6220c2a 100644
--- a/src/cppcache/src/VersionedCacheableObjectPartList.hpp
+++ b/src/cppcache/src/VersionedCacheableObjectPartList.hpp
@@ -1,5 +1,7 @@
-#ifndef _GEMFIRE_VERSIONEDCACHEABLEOBJECTPARTLIST_HPP_
-#define _GEMFIRE_VERSIONEDCACHEABLEOBJECTPARTLIST_HPP_
+#pragma once
+
+#ifndef GEODE_VERSIONEDCACHEABLEOBJECTPARTLIST_H_
+#define GEODE_VERSIONEDCACHEABLEOBJECTPARTLIST_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -283,4 +285,4 @@ class VersionedCacheableObjectPartList : public CacheableObjectPartList {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // _GEMFIRE_VERSIONEDCACHEABLEOBJECTPARTLIST_HPP_
+#endif // GEODE_VERSIONEDCACHEABLEOBJECTPARTLIST_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/gfcppBanner.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/gfcppBanner.hpp b/src/cppcache/src/gfcppBanner.hpp
index 9af0eb3..9b9fdcc 100644
--- a/src/cppcache/src/gfcppBanner.hpp
+++ b/src/cppcache/src/gfcppBanner.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_GFCPPBANNER_H_
+#define GEODE_GFCPPBANNER_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -26,3 +31,5 @@ class gfcppBanner {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
+
+#endif // GEODE_GFCPPBANNER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/statistics/AtomicStatisticsImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/AtomicStatisticsImpl.hpp b/src/cppcache/src/statistics/AtomicStatisticsImpl.hpp
index 6a7bace..5f11820 100644
--- a/src/cppcache/src/statistics/AtomicStatisticsImpl.hpp
+++ b/src/cppcache/src/statistics/AtomicStatisticsImpl.hpp
@@ -1,5 +1,8 @@
-#ifndef _GEMFIRE_STATISTICS_ATOMICSTATISTICSIMPL_HPP_
-#define _GEMFIRE_STATISTICS_ATOMICSTATISTICSIMPL_HPP_
+#pragma once
+
+#ifndef GEODE_STATISTICS_ATOMICSTATISTICSIMPL_H_
+#define GEODE_STATISTICS_ATOMICSTATISTICSIMPL_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -246,4 +249,4 @@ class AtomicStatisticsImpl : public Statistics, private NonCopyable {
 }  // namespace geode
 }  // namespace apache
 
-#endif  //  _GEMFIRE_STATISTICS_ATOMICSTATISTICSIMPL_HPP_
+#endif // GEODE_STATISTICS_ATOMICSTATISTICSIMPL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/statistics/GeodeStatisticsFactory.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/GeodeStatisticsFactory.hpp b/src/cppcache/src/statistics/GeodeStatisticsFactory.hpp
index 25d3da5..5d6a265 100644
--- a/src/cppcache/src/statistics/GeodeStatisticsFactory.hpp
+++ b/src/cppcache/src/statistics/GeodeStatisticsFactory.hpp
@@ -1,7 +1,8 @@
+#pragma once
 
+#ifndef GEODE_STATISTICS_GEODESTATISTICSFACTORY_H_
+#define GEODE_STATISTICS_GEODESTATISTICSFACTORY_H_
 
-#ifndef _GEMFIRE_STATISTICS_GEMFIRESTATISTICSFACTORY_HPP_
-#define _GEMFIRE_STATISTICS_GEMFIRESTATISTICSFACTORY_HPP_
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -18,6 +19,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include <gfcpp/gfcpp_globals.hpp>
 
 #include <sys/types.h>
@@ -150,4 +152,4 @@ class GeodeStatisticsFactory : public StatisticsFactory {
 }  // namespace geode
 }  // namespace apache
 
-#endif  //  _GEMFIRE_STATISTICS_GEMFIRESTATISTICSFACTORY_HPP_
+#endif // GEODE_STATISTICS_GEODESTATISTICSFACTORY_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/statistics/HostStatHelper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/HostStatHelper.hpp b/src/cppcache/src/statistics/HostStatHelper.hpp
index 648e5fe..9b6fcfe 100644
--- a/src/cppcache/src/statistics/HostStatHelper.hpp
+++ b/src/cppcache/src/statistics/HostStatHelper.hpp
@@ -1,5 +1,8 @@
-#ifndef _GEMFIRE_STATISTICS_HOSTSTATHELPER_HPP_
-#define _GEMFIRE_STATISTICS_HOSTSTATHELPER_HPP_
+#pragma once
+
+#ifndef GEODE_STATISTICS_HOSTSTATHELPER_H_
+#define GEODE_STATISTICS_HOSTSTATHELPER_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -16,6 +19,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include <gfcpp/gfcpp_globals.hpp>
 #include <string>
 #include "StatisticDescriptorImpl.hpp"
@@ -77,4 +81,5 @@ class CPPCACHE_EXPORT HostStatHelper {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  //_GEMFIRE_STATISTICS_HOSTSTATHELPER_HPP_
+
+#endif // GEODE_STATISTICS_HOSTSTATHELPER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/statistics/HostStatHelperLinux.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/HostStatHelperLinux.hpp b/src/cppcache/src/statistics/HostStatHelperLinux.hpp
index ffa5d7e..0ce2e2b 100644
--- a/src/cppcache/src/statistics/HostStatHelperLinux.hpp
+++ b/src/cppcache/src/statistics/HostStatHelperLinux.hpp
@@ -1,5 +1,8 @@
-#ifndef _GEMFIRE_STATISTICS_HOSTSTATHELPERLINUX_HPP_
-#define _GEMFIRE_STATISTICS_HOSTSTATHELPERLINUX_HPP_
+#pragma once
+
+#ifndef GEODE_STATISTICS_HOSTSTATHELPERLINUX_H_
+#define GEODE_STATISTICS_HOSTSTATHELPERLINUX_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -49,4 +52,4 @@ class HostStatHelperLinux {
 
 #endif  // if def(_LINUX)
 
-#endif  // _GEMFIRE_STATISTICS_HOSTSTATHELPERLINUX_HPP_
+#endif // GEODE_STATISTICS_HOSTSTATHELPERLINUX_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/statistics/HostStatHelperNull.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/HostStatHelperNull.hpp b/src/cppcache/src/statistics/HostStatHelperNull.hpp
index 8268552..b5192cc 100644
--- a/src/cppcache/src/statistics/HostStatHelperNull.hpp
+++ b/src/cppcache/src/statistics/HostStatHelperNull.hpp
@@ -1,5 +1,8 @@
-#ifndef _GEMFIRE_STATISTICS_HOSTSTATHELPERNULL_HPP_
-#define _GEMFIRE_STATISTICS_HOSTSTATHELPERNULL_HPP_
+#pragma once
+
+#ifndef GEODE_STATISTICS_HOSTSTATHELPERNULL_H_
+#define GEODE_STATISTICS_HOSTSTATHELPERNULL_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -34,4 +37,4 @@ class HostStatHelperNull {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // _GEMFIRE_STATISTICS_HOSTSTATHELPERLINUX_HPP_
+#endif // GEODE_STATISTICS_HOSTSTATHELPERNULL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/statistics/HostStatHelperSolaris.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/HostStatHelperSolaris.hpp b/src/cppcache/src/statistics/HostStatHelperSolaris.hpp
index 9b553e4..372f527 100644
--- a/src/cppcache/src/statistics/HostStatHelperSolaris.hpp
+++ b/src/cppcache/src/statistics/HostStatHelperSolaris.hpp
@@ -1,5 +1,8 @@
-#ifndef _GEMFIRE_STATISTICS_HOSTSTATHELPERSOLARIS_HPP_
-#define _GEMFIRE_STATISTICS_HOSTSTATHELPERSOLARIS_HPP_
+#pragma once
+
+#ifndef GEODE_STATISTICS_HOSTSTATHELPERSOLARIS_H_
+#define GEODE_STATISTICS_HOSTSTATHELPERSOLARIS_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -65,4 +68,4 @@ class HostStatHelperSolaris {
 
 #endif  // if def(_SOLARIS)
 
-#endif  // _GEMFIRE_STATISTICS_HOSTSTATHELPERSOLARIS_HPP_
+#endif // GEODE_STATISTICS_HOSTSTATHELPERSOLARIS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/statistics/HostStatHelperWin.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/HostStatHelperWin.hpp b/src/cppcache/src/statistics/HostStatHelperWin.hpp
index d941ac5..1402d79 100644
--- a/src/cppcache/src/statistics/HostStatHelperWin.hpp
+++ b/src/cppcache/src/statistics/HostStatHelperWin.hpp
@@ -1,5 +1,8 @@
-#ifndef _GEMFIRE_STATISTICS_HOSTSTATHELPERWIN_HPP_
-#define _GEMFIRE_STATISTICS_HOSTSTATHELPERWIN_HPP_
+#pragma once
+
+#ifndef GEODE_STATISTICS_HOSTSTATHELPERWIN_H_
+#define GEODE_STATISTICS_HOSTSTATHELPERWIN_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -300,4 +303,4 @@ class HostStatHelperWin {
 
 #endif  // (_WIN32)
 
-#endif  // _GEMFIRE_STATISTICS_HOSTSTATHELPERWIN_HPP_
+#endif // GEODE_STATISTICS_HOSTSTATHELPERWIN_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/statistics/HostStatSampler.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/HostStatSampler.hpp b/src/cppcache/src/statistics/HostStatSampler.hpp
index 75c5b1e..66ea210 100644
--- a/src/cppcache/src/statistics/HostStatSampler.hpp
+++ b/src/cppcache/src/statistics/HostStatSampler.hpp
@@ -1,5 +1,7 @@
-#ifndef _GEMFIRE_STATISTICS_HOSTSTATSAMPLER_HPP_
-#define _GEMFIRE_STATISTICS_HOSTSTATSAMPLER_HPP_
+#pragma once
+
+#ifndef GEODE_STATISTICS_HOSTSTATSAMPLER_H_
+#define GEODE_STATISTICS_HOSTSTATSAMPLER_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -251,4 +253,4 @@ class CPPCACHE_EXPORT HostStatSampler : public ACE_Task_Base,
 }  // namespace geode
 }  // namespace apache
 
-#endif  // _GEMFIRE_STATISTICS_HOSTSTATSAMPLER_HPP_
+#endif // GEODE_STATISTICS_HOSTSTATSAMPLER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/statistics/LinuxProcessStats.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/LinuxProcessStats.hpp b/src/cppcache/src/statistics/LinuxProcessStats.hpp
index fb91e41..877cbf5 100644
--- a/src/cppcache/src/statistics/LinuxProcessStats.hpp
+++ b/src/cppcache/src/statistics/LinuxProcessStats.hpp
@@ -1,5 +1,8 @@
-#ifndef _GEMFIRE_STATISTICS_LINUXPROCESSSTATS_HPP_
-#define _GEMFIRE_STATISTICS_LINUXPROCESSSTATS_HPP_
+#pragma once
+
+#ifndef GEODE_STATISTICS_LINUXPROCESSSTATS_H_
+#define GEODE_STATISTICS_LINUXPROCESSSTATS_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -16,6 +19,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include <gfcpp/gfcpp_globals.hpp>
 #include <gfcpp/statistics/Statistics.hpp>
 #include <gfcpp/statistics/StatisticsType.hpp>
@@ -79,4 +83,4 @@ class CPPCACHE_EXPORT LinuxProcessStats : public ProcessStats {
 }  // namespace geode
 }  // namespace apache
 
-#endif  //_GEMFIRE_STATISTICS_LINUXPROCESSSTATS_HPP_
+#endif // GEODE_STATISTICS_LINUXPROCESSSTATS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/statistics/NullProcessStats.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/NullProcessStats.hpp b/src/cppcache/src/statistics/NullProcessStats.hpp
index 1b8662b..937261c 100644
--- a/src/cppcache/src/statistics/NullProcessStats.hpp
+++ b/src/cppcache/src/statistics/NullProcessStats.hpp
@@ -1,5 +1,8 @@
-#ifndef _GEMFIRE_STATISTICS_NULLPROCESSSTATS_HPP_
-#define _GEMFIRE_STATISTICS_NULLPROCESSSTATS_HPP_
+#pragma once
+
+#ifndef GEODE_STATISTICS_NULLPROCESSSTATS_H_
+#define GEODE_STATISTICS_NULLPROCESSSTATS_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -16,6 +19,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include <gfcpp/gfcpp_globals.hpp>
 #include <gfcpp/statistics/Statistics.hpp>
 #include <gfcpp/statistics/StatisticsType.hpp>
@@ -53,4 +57,4 @@ class CPPCACHE_EXPORT NullProcessStats : public ProcessStats {
 }  // namespace geode
 }  // namespace apache
 
-#endif  //_GEMFIRE_STATISTICS_NULLPROCESSSTATS_HPP_
+#endif // GEODE_STATISTICS_NULLPROCESSSTATS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/statistics/OsStatisticsImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/OsStatisticsImpl.hpp b/src/cppcache/src/statistics/OsStatisticsImpl.hpp
index ccec6ee..0084471 100644
--- a/src/cppcache/src/statistics/OsStatisticsImpl.hpp
+++ b/src/cppcache/src/statistics/OsStatisticsImpl.hpp
@@ -1,5 +1,8 @@
-#ifndef _GEMFIRE_STATISTICS_OSSTATISTICSIMPL_HPP_
-#define _GEMFIRE_STATISTICS_OSSTATISTICSIMPL_HPP_
+#pragma once
+
+#ifndef GEODE_STATISTICS_OSSTATISTICSIMPL_H_
+#define GEODE_STATISTICS_OSSTATISTICSIMPL_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -257,4 +260,4 @@ class OsStatisticsImpl : public Statistics,
 }  // namespace geode
 }  // namespace apache
 
-#endif  // _GEMFIRE_STATISTICS_OSSTATISTICSIMPL_HPP_
+#endif // GEODE_STATISTICS_OSSTATISTICSIMPL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/statistics/PoolStatsSampler.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/PoolStatsSampler.hpp b/src/cppcache/src/statistics/PoolStatsSampler.hpp
index 7c7f10f..e421bbb 100644
--- a/src/cppcache/src/statistics/PoolStatsSampler.hpp
+++ b/src/cppcache/src/statistics/PoolStatsSampler.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_STATISTICS_POOLSTATSSAMPLER_H_
+#define GEODE_STATISTICS_POOLSTATSSAMPLER_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 __POOLSTATSSAMPLER__
-#define __POOLSTATSSAMPLER__
 #include <ace/Task.h>
 #include <gfcpp/gfcpp_globals.hpp>
 namespace apache {
@@ -59,4 +62,5 @@ class CPPCACHE_EXPORT PoolStatsSampler : public ACE_Task_Base {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif
+
+#endif // GEODE_STATISTICS_POOLSTATSSAMPLER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/statistics/ProcessStats.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/ProcessStats.hpp b/src/cppcache/src/statistics/ProcessStats.hpp
index 5e23c6b..2af7331 100644
--- a/src/cppcache/src/statistics/ProcessStats.hpp
+++ b/src/cppcache/src/statistics/ProcessStats.hpp
@@ -1,5 +1,7 @@
-#ifndef _GEMFIRE_STATISTICS_PROCESSSTATS_HPP_
-#define _GEMFIRE_STATISTICS_PROCESSSTATS_HPP_
+#pragma once
+
+#ifndef GEODE_STATISTICS_PROCESSSTATS_H_
+#define GEODE_STATISTICS_PROCESSSTATS_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -77,4 +79,5 @@ class CPPCACHE_EXPORT ProcessStats {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // _GEMFIRE_STATISTICS_PROCESSSTATS_HPP_
+
+#endif // GEODE_STATISTICS_PROCESSSTATS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/statistics/SolarisProcessStats.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/SolarisProcessStats.hpp b/src/cppcache/src/statistics/SolarisProcessStats.hpp
index e9ac059..c1a7495 100644
--- a/src/cppcache/src/statistics/SolarisProcessStats.hpp
+++ b/src/cppcache/src/statistics/SolarisProcessStats.hpp
@@ -1,5 +1,8 @@
-#ifndef _GEMFIRE_STATISTICS_SOLARISPROCESSSTATS_HPP_
-#define _GEMFIRE_STATISTICS_SOLARISPROCESSSTATS_HPP_
+#pragma once
+
+#ifndef GEODE_STATISTICS_SOLARISPROCESSSTATS_H_
+#define GEODE_STATISTICS_SOLARISPROCESSSTATS_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 @@ class CPPCACHE_EXPORT SolarisProcessStats : public ProcessStats {
 }  // namespace geode
 }  // namespace apache
 
-#endif  //_GEMFIRE_STATISTICS_SOLARISPROCESSSTATS_HPP_
+#endif // GEODE_STATISTICS_SOLARISPROCESSSTATS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/statistics/StatArchiveWriter.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/StatArchiveWriter.hpp b/src/cppcache/src/statistics/StatArchiveWriter.hpp
index 341bef7..2c3a331 100644
--- a/src/cppcache/src/statistics/StatArchiveWriter.hpp
+++ b/src/cppcache/src/statistics/StatArchiveWriter.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_STATISTICS_STATARCHIVEWRITER_H_
+#define GEODE_STATISTICS_STATARCHIVEWRITER_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_STATISTICS_STATARCHIVERITER_HPP_
-#define _GEMFIRE_STATISTICS_STATARCHIVERITER_HPP_
-
 #include <map>
 #include <list>
 #include <gfcpp/gfcpp_globals.hpp>
@@ -266,4 +268,4 @@ class CPPCACHE_EXPORT StatArchiveWriter {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // _GEMFIRE_STATISTICS_STATARCHIVERITER_HPP_
+#endif // GEODE_STATISTICS_STATARCHIVEWRITER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/statistics/StatSamplerStats.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/StatSamplerStats.hpp b/src/cppcache/src/statistics/StatSamplerStats.hpp
index bc5c75e..309a172 100644
--- a/src/cppcache/src/statistics/StatSamplerStats.hpp
+++ b/src/cppcache/src/statistics/StatSamplerStats.hpp
@@ -1,5 +1,8 @@
-#ifndef _GEMFIRE_STATISTICS_STATISTICSSAMPLERSTATISTICS_HPP_
-#define _GEMFIRE_STATISTICS_STATISTICSSAMPLERSTATISTICS_HPP_
+#pragma once
+
+#ifndef GEODE_STATISTICS_STATSAMPLERSTATS_H_
+#define GEODE_STATISTICS_STATSAMPLERSTATS_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -54,4 +57,5 @@ class CPPCACHE_EXPORT StatSamplerStats {
 }  // namespace statistics
 }  // namespace geode
 }  // namespace apache
-#endif  //_GEMFIRE_STATISTICS_STATISTICSSAMPLERSTATISTICS_HPP_
+
+#endif // GEODE_STATISTICS_STATSAMPLERSTATS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/statistics/StatisticDescriptorImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/StatisticDescriptorImpl.hpp b/src/cppcache/src/statistics/StatisticDescriptorImpl.hpp
index 52598c2..d182168 100644
--- a/src/cppcache/src/statistics/StatisticDescriptorImpl.hpp
+++ b/src/cppcache/src/statistics/StatisticDescriptorImpl.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_STATISTICS_STATISTICDESCRIPTORIMPL_H_
+#define GEODE_STATISTICS_STATISTICDESCRIPTORIMPL_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_STATISTICS_STATISTICDESCRIPTORIMPL_HPP_
-#define _GEMFIRE_STATISTICS_STATISTICDESCRIPTORIMPL_HPP_
-
 #include <string>
 #include <gfcpp/ExceptionTypes.hpp>
 #include <gfcpp/statistics/StatisticDescriptor.hpp>
@@ -248,4 +250,4 @@ s
 }  // namespace geode
 }  // namespace apache
 
-#endif  //  _GEMFIRE_STATISTICS_STATISTICDESCRIPTORIMPL_HPP_
+#endif // GEODE_STATISTICS_STATISTICDESCRIPTORIMPL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/statistics/StatisticsManager.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/StatisticsManager.hpp b/src/cppcache/src/statistics/StatisticsManager.hpp
index dac207e..ca815c0 100644
--- a/src/cppcache/src/statistics/StatisticsManager.hpp
+++ b/src/cppcache/src/statistics/StatisticsManager.hpp
@@ -1,7 +1,8 @@
+#pragma once
 
+#ifndef GEODE_STATISTICS_STATISTICSMANAGER_H_
+#define GEODE_STATISTICS_STATISTICSMANAGER_H_
 
-#ifndef _GEMFIRE_STATISTICS_STATISTICSAPPMANAGER_HPP_
-#define _GEMFIRE_STATISTICS_STATISTICSAPPMANAGER_HPP_
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -18,6 +19,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include <gfcpp/gfcpp_globals.hpp>
 
 #include <sys/types.h>
@@ -129,4 +131,4 @@ class StatisticsManager {
 }  // namespace geode
 }  // namespace apache
 
-#endif  //  _GEMFIRE_STATISTICS_STATISTICSAPPMANAGER_HPP_
+#endif // GEODE_STATISTICS_STATISTICSMANAGER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/statistics/StatisticsTypeImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/StatisticsTypeImpl.hpp b/src/cppcache/src/statistics/StatisticsTypeImpl.hpp
index ac35eb6..98854ef 100644
--- a/src/cppcache/src/statistics/StatisticsTypeImpl.hpp
+++ b/src/cppcache/src/statistics/StatisticsTypeImpl.hpp
@@ -1,5 +1,8 @@
-#ifndef _GEMFIRE_STATISTICS_STATISTICSTYPEIMPL_HPP_
-#define _GEMFIRE_STATISTICS_STATISTICSTYPEIMPL_HPP_
+#pragma once
+
+#ifndef GEODE_STATISTICS_STATISTICSTYPEIMPL_H_
+#define GEODE_STATISTICS_STATISTICSTYPEIMPL_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -99,4 +102,4 @@ class StatisticsTypeImpl : public StatisticsType {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef _GEMFIRE_STATISTICS_STATISTICSTYPEIMPL_HPP_
+#endif // GEODE_STATISTICS_STATISTICSTYPEIMPL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/statistics/StatsDef.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/StatsDef.hpp b/src/cppcache/src/statistics/StatsDef.hpp
index e0835f3..123a119 100644
--- a/src/cppcache/src/statistics/StatsDef.hpp
+++ b/src/cppcache/src/statistics/StatsDef.hpp
@@ -1,5 +1,7 @@
-#ifndef _GEMFIRE_STATISTICS_STATSDEF_HPP_
-#define _GEMFIRE_STATISTICS_STATSDEF_HPP_
+#pragma once
+
+#ifndef GEODE_STATISTICS_STATSDEF_H_
+#define GEODE_STATISTICS_STATSDEF_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -51,4 +53,5 @@ typedef enum {
 }  // namespace statistics
 }  // namespace geode
 }  // namespace apache
-#endif  // _GEMFIRE_STATISTICS_STATSDEF_HPP_
+
+#endif // GEODE_STATISTICS_STATSDEF_H_

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

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cryptoimpl/DHImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cryptoimpl/DHImpl.hpp b/src/cryptoimpl/DHImpl.hpp
index 91d4c1d..0945d87 100644
--- a/src/cryptoimpl/DHImpl.hpp
+++ b/src/cryptoimpl/DHImpl.hpp
@@ -1,5 +1,8 @@
-#ifndef _DHEIMPL_HPP_INCLUDED_
-#define _DHEIMPL_HPP_INCLUDED_
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_051947d883001c8686df187fe716cbd0
+#define APACHE_GEODE_GUARD_051947d883001c8686df187fe716cbd0
+
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -94,4 +97,5 @@ class DHImpl {
 
 bool DHImpl::m_init = false;
 
-#endif  // _DHEIMPL_HPP_INCLUDED_
+
+#endif // APACHE_GEODE_GUARD_051947d883001c8686df187fe716cbd0

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cryptoimpl/GFSsl.hpp
----------------------------------------------------------------------
diff --git a/src/cryptoimpl/GFSsl.hpp b/src/cryptoimpl/GFSsl.hpp
index 0cea88c..8c554a1 100644
--- a/src/cryptoimpl/GFSsl.hpp
+++ b/src/cryptoimpl/GFSsl.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_66e094f2e630a8aefdce2e4d93340f13
+#define APACHE_GEODE_GUARD_66e094f2e630a8aefdce2e4d93340f13
+
 /*
  * 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 GFSSL_HPP_
-#define GFSSL_HPP_
 
 #include <ace/INET_Addr.h>
 #include <ace/OS.h>
@@ -39,4 +42,5 @@ class GFSsl {
   virtual void close() = 0;
 };
 
-#endif /* GFSSL_HPP_ */
+
+#endif // APACHE_GEODE_GUARD_66e094f2e630a8aefdce2e4d93340f13

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cryptoimpl/SSLImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cryptoimpl/SSLImpl.hpp b/src/cryptoimpl/SSLImpl.hpp
index 0e1c652..d31d8fa 100644
--- a/src/cryptoimpl/SSLImpl.hpp
+++ b/src/cryptoimpl/SSLImpl.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_d7c8a71cb25b1a2fdc896009aee7509f
+#define APACHE_GEODE_GUARD_d7c8a71cb25b1a2fdc896009aee7509f
+
 /*
  * 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 _SSLIMPL_HPP_INCLUDED_
-#define _SSLIMPL_HPP_INCLUDED_
 
 #include <gfcpp/gf_base.hpp>
 #include "ace/ACE.h"
@@ -56,4 +59,5 @@ CPPCACHE_EXPORT void* gf_create_SslImpl(ACE_SOCKET sock, const char* pubkeyfile,
 CPPCACHE_EXPORT void gf_destroy_SslImpl(void* impl);
 }
 
-#endif  // _SSLIMPL_HPP_INCLUDED_
+
+#endif // APACHE_GEODE_GUARD_d7c8a71cb25b1a2fdc896009aee7509f

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/dhimpl/DHImpl.hpp
----------------------------------------------------------------------
diff --git a/src/dhimpl/DHImpl.hpp b/src/dhimpl/DHImpl.hpp
index 57b128f..92bdca9 100644
--- a/src/dhimpl/DHImpl.hpp
+++ b/src/dhimpl/DHImpl.hpp
@@ -1,5 +1,8 @@
-#ifndef _DHEIMPL_HPP_INCLUDED_
-#define _DHEIMPL_HPP_INCLUDED_
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_0b4f257a1a4de03f53b0299148e95656
+#define APACHE_GEODE_GUARD_0b4f257a1a4de03f53b0299148e95656
+
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -64,4 +67,5 @@ CPPCACHE_EXPORT bool gf_verifyDH(const char* subject,
                                  int* reason);
 }
 
-#endif  // _DHEIMPL_HPP_INCLUDED_
+
+#endif // APACHE_GEODE_GUARD_0b4f257a1a4de03f53b0299148e95656

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/pdxautoserializer/ASBuiltins.hpp
----------------------------------------------------------------------
diff --git a/src/pdxautoserializer/ASBuiltins.hpp b/src/pdxautoserializer/ASBuiltins.hpp
index 5ec3381..6134d7d 100644
--- a/src/pdxautoserializer/ASBuiltins.hpp
+++ b/src/pdxautoserializer/ASBuiltins.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_eb7690d50321df9f22960c0ceecdeea5
+#define APACHE_GEODE_GUARD_eb7690d50321df9f22960c0ceecdeea5
+
 /*
  * 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 _GFAS_ASBUILTINS_HPP_
-#define _GFAS_ASBUILTINS_HPP_
 
 #include "DataOutput.hpp"
 #include "DataInput.hpp"
@@ -120,4 +123,5 @@ inline void readObject(apache::geode::client::DataInput& input,
 }
 }
 
-#endif  // _GFAS_ASBUILTINS_HPP_
+
+#endif // APACHE_GEODE_GUARD_eb7690d50321df9f22960c0ceecdeea5

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/pdxautoserializer/ASCLIBuiltins.hpp
----------------------------------------------------------------------
diff --git a/src/pdxautoserializer/ASCLIBuiltins.hpp b/src/pdxautoserializer/ASCLIBuiltins.hpp
index 32bc855..ae3a207 100644
--- a/src/pdxautoserializer/ASCLIBuiltins.hpp
+++ b/src/pdxautoserializer/ASCLIBuiltins.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_435faaccc293c5822dd1ce9185411ec7
+#define APACHE_GEODE_GUARD_435faaccc293c5822dd1ce9185411ec7
+
 /*
  * 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 _GFAS_ASCLIBUILTINS_HPP_
-#define _GFAS_ASCLIBUILTINS_HPP_
 
 #ifdef GEMFIRE_CLR
 
@@ -457,4 +460,5 @@ inline void ReadObject(apache::geode::client::DataInput& input,
 
 #endif  // GEMFIRE_CLR
 
-#endif  // _GFAS_ASCLIBUILTINS_HPP_
+
+#endif // APACHE_GEODE_GUARD_435faaccc293c5822dd1ce9185411ec7

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/pdxautoserializer/ASCPPInclude.hpp
----------------------------------------------------------------------
diff --git a/src/pdxautoserializer/ASCPPInclude.hpp b/src/pdxautoserializer/ASCPPInclude.hpp
index ce4f933..e7941e1 100644
--- a/src/pdxautoserializer/ASCPPInclude.hpp
+++ b/src/pdxautoserializer/ASCPPInclude.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_ce84784877faf1099879ab9252de0187
+#define APACHE_GEODE_GUARD_ce84784877faf1099879ab9252de0187
+
 /*
  * 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 _GFAS_ASCPPINCLUDE_HPP_
-#define _GFAS_ASCPPINCLUDE_HPP_
 
 #define GFINCLUDE
 #define GFEXCLUDE
@@ -33,4 +36,5 @@
  #define __builtin_va_list int
  */
 
-#endif  // _GFAS_ASCPPINCLUDE_HPP_
+
+#endif // APACHE_GEODE_GUARD_ce84784877faf1099879ab9252de0187

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/pdxautoserializer/CodeGenerator.hpp
----------------------------------------------------------------------
diff --git a/src/pdxautoserializer/CodeGenerator.hpp b/src/pdxautoserializer/CodeGenerator.hpp
index 6df1342..34fae30 100644
--- a/src/pdxautoserializer/CodeGenerator.hpp
+++ b/src/pdxautoserializer/CodeGenerator.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_fb876ec7655e479e35df4a1cc2653f47
+#define APACHE_GEODE_GUARD_fb876ec7655e479e35df4a1cc2653f47
+
 /*
  * 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 _GFAS_CODEGENERATOR_HPP_
-#define _GFAS_CODEGENERATOR_HPP_
 
 #include "base_types.hpp"
 
@@ -172,4 +175,5 @@ class CodeGenerator {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // _GFAS_CODEGENERATOR_HPP_
+
+#endif // APACHE_GEODE_GUARD_fb876ec7655e479e35df4a1cc2653f47

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/pdxautoserializer/CodeGeneratorFactory.hpp
----------------------------------------------------------------------
diff --git a/src/pdxautoserializer/CodeGeneratorFactory.hpp b/src/pdxautoserializer/CodeGeneratorFactory.hpp
index 48ffd8d..3b2d6ac 100644
--- a/src/pdxautoserializer/CodeGeneratorFactory.hpp
+++ b/src/pdxautoserializer/CodeGeneratorFactory.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_736109a2751770a130d751c8754e234c
+#define APACHE_GEODE_GUARD_736109a2751770a130d751c8754e234c
+
 /*
  * 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 _GFAS_CODEGENERATORFACTORY_HPP_
-#define _GFAS_CODEGENERATORFACTORY_HPP_
 
 #include "CodeGenerator.hpp"
 
@@ -69,4 +72,5 @@ class CodeGeneratorFactory {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // _GFAS_CODEGENERATORFACTORY_HPP_
+
+#endif // APACHE_GEODE_GUARD_736109a2751770a130d751c8754e234c

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/pdxautoserializer/InputParser.hpp
----------------------------------------------------------------------
diff --git a/src/pdxautoserializer/InputParser.hpp b/src/pdxautoserializer/InputParser.hpp
index 2092a22..0ee39ff 100644
--- a/src/pdxautoserializer/InputParser.hpp
+++ b/src/pdxautoserializer/InputParser.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_906466ac6028b9eac9226aa77077245f
+#define APACHE_GEODE_GUARD_906466ac6028b9eac9226aa77077245f
+
 /*
  * 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 _GFAS_INPUTPARSER_HPP_
-#define _GFAS_INPUTPARSER_HPP_
 
 #include "base_types.hpp"
 #include "CodeGenerator.hpp"
@@ -179,4 +182,5 @@ class InputParser {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // _GFAS_INPUTPARSER_HPP_
+
+#endif // APACHE_GEODE_GUARD_906466ac6028b9eac9226aa77077245f

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/pdxautoserializer/InputParserFactory.hpp
----------------------------------------------------------------------
diff --git a/src/pdxautoserializer/InputParserFactory.hpp b/src/pdxautoserializer/InputParserFactory.hpp
index ac12b23..35a1dc3 100644
--- a/src/pdxautoserializer/InputParserFactory.hpp
+++ b/src/pdxautoserializer/InputParserFactory.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_6c288c7ce306f6376599e765eb252f29
+#define APACHE_GEODE_GUARD_6c288c7ce306f6376599e765eb252f29
+
 /*
  * 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 _GFAS_INPUTPARSERFACTORY_HPP_
-#define _GFAS_INPUTPARSERFACTORY_HPP_
 
 #include "InputParser.hpp"
 #include <utility>
@@ -71,4 +74,5 @@ class InputParserFactory {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // _GFAS_INPUTPARSERFACTORY_HPP_
+
+#endif // APACHE_GEODE_GUARD_6c288c7ce306f6376599e765eb252f29

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/pdxautoserializer/OutputFormatter.hpp
----------------------------------------------------------------------
diff --git a/src/pdxautoserializer/OutputFormatter.hpp b/src/pdxautoserializer/OutputFormatter.hpp
index 7f847d1..99d70ff 100644
--- a/src/pdxautoserializer/OutputFormatter.hpp
+++ b/src/pdxautoserializer/OutputFormatter.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_8157a8a77b151f9beadc02d24c462c34
+#define APACHE_GEODE_GUARD_8157a8a77b151f9beadc02d24c462c34
+
 /*
  * 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 _GFAS_OUTPUTFORMATTER_HPP_
-#define _GFAS_OUTPUTFORMATTER_HPP_
 
 #include <ostream>
 #include <streambuf>
@@ -225,4 +228,5 @@ class OutputFormatter : public std::ostream {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // _GFAS_OUTPUTFORMATTER_HPP_
+
+#endif // APACHE_GEODE_GUARD_8157a8a77b151f9beadc02d24c462c34

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/pdxautoserializer/base_types.hpp
----------------------------------------------------------------------
diff --git a/src/pdxautoserializer/base_types.hpp b/src/pdxautoserializer/base_types.hpp
index 570b82f..a806bf3 100644
--- a/src/pdxautoserializer/base_types.hpp
+++ b/src/pdxautoserializer/base_types.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_dbef31dd4224e58666543cc33c286150
+#define APACHE_GEODE_GUARD_dbef31dd4224e58666543cc33c286150
+
 /*
  * 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 _GFAS_BASETYPES_HPP_
-#define _GFAS_BASETYPES_HPP_
 
 #include <string>
 #include <vector>
@@ -251,4 +254,5 @@ typedef std::vector<VariableInfo>::const_iterator VariableVectorIterator;
 }  // namespace geode
 }  // namespace apache
 
-#endif  // _GFAS_BASETYPES_HPP_
+
+#endif // APACHE_GEODE_GUARD_dbef31dd4224e58666543cc33c286150

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/pdxautoserializer/impl/CPPCodeGenerator.hpp
----------------------------------------------------------------------
diff --git a/src/pdxautoserializer/impl/CPPCodeGenerator.hpp b/src/pdxautoserializer/impl/CPPCodeGenerator.hpp
index 4a150cf..6a351b7 100644
--- a/src/pdxautoserializer/impl/CPPCodeGenerator.hpp
+++ b/src/pdxautoserializer/impl/CPPCodeGenerator.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_571a5e03438f4ddbf05bf82f4b838736
+#define APACHE_GEODE_GUARD_571a5e03438f4ddbf05bf82f4b838736
+
 /*
  * 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 _GFAS_CPPCODEGENERATOR_HPP_
-#define _GFAS_CPPCODEGENERATOR_HPP_
 
 #include "../CodeGenerator.hpp"
 #include "../OutputFormatter.hpp"
@@ -234,4 +237,5 @@ class CPPCodeGenerator : public CodeGenerator {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // _GFAS_CPPCODEGENERATOR_HPP_
+
+#endif // APACHE_GEODE_GUARD_571a5e03438f4ddbf05bf82f4b838736

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/pdxautoserializer/impl/Helper.hpp
----------------------------------------------------------------------
diff --git a/src/pdxautoserializer/impl/Helper.hpp b/src/pdxautoserializer/impl/Helper.hpp
index 4c46d93..bd292ed 100644
--- a/src/pdxautoserializer/impl/Helper.hpp
+++ b/src/pdxautoserializer/impl/Helper.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_debdc61f2b91c81fc06a894ab962375d
+#define APACHE_GEODE_GUARD_debdc61f2b91c81fc06a894ab962375d
+
 /*
  * 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 _GFAS_HELPER_HPP_
-#define _GFAS_HELPER_HPP_
 
 #include "../InputParser.hpp"
 #include <algorithm>
@@ -186,4 +189,5 @@ class Helper {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // _GFAS_HELPER_HPP_
+
+#endif // APACHE_GEODE_GUARD_debdc61f2b91c81fc06a894ab962375d


Mime
View raw message