geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aba...@apache.org
Subject [41/50] [abbrv] geode-native git commit: GEODE-2411: Remove references to Gemfire from include guards.
Date Thu, 09 Feb 2017 18:09:38 GMT
http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientInterestList.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientInterestList.hpp b/src/cppcache/integration-test/ThinClientInterestList.hpp
index f6e10a2..c38e162 100644
--- a/src/cppcache/integration-test/ThinClientInterestList.hpp
+++ b/src/cppcache/integration-test/ThinClientInterestList.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTINTERESTLIST_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTINTERESTLIST_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -414,3 +419,5 @@ DUNIT_TASK_DEFINITION(SERVER1, CloseServer1)
     }
   }
 END_TASK_DEFINITION
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTINTERESTLIST_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientInterestList2.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientInterestList2.hpp b/src/cppcache/integration-test/ThinClientInterestList2.hpp
index 6ddb0b6..1b311a8 100644
--- a/src/cppcache/integration-test/ThinClientInterestList2.hpp
+++ b/src/cppcache/integration-test/ThinClientInterestList2.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTINTERESTLIST2_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTINTERESTLIST2_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -400,3 +405,5 @@ DUNIT_TASK_DEFINITION(SERVER1, CloseServer1)
     }
   }
 END_TASK_DEFINITION
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTINTERESTLIST2_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientListenerInit.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientListenerInit.hpp b/src/cppcache/integration-test/ThinClientListenerInit.hpp
index 8d38dd6..465e0f2 100644
--- a/src/cppcache/integration-test/ThinClientListenerInit.hpp
+++ b/src/cppcache/integration-test/ThinClientListenerInit.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTLISTENERINIT_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTLISTENERINIT_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 THINCLIENTDISTOPS_HPP_
-#define THINCLIENTDISTOPS_HPP_
 
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"
@@ -250,4 +253,5 @@ DUNIT_TASK_DEFINITION(CLIENT1, CloseCache1)
   { cleanProc(); }
 END_TASK_DEFINITION
 
-#endif /*THINCLIENTLISTENERINIT_HPP_*/
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTLISTENERINIT_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientListenerWriter.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientListenerWriter.hpp b/src/cppcache/integration-test/ThinClientListenerWriter.hpp
index ea763c4..93a52b8 100644
--- a/src/cppcache/integration-test/ThinClientListenerWriter.hpp
+++ b/src/cppcache/integration-test/ThinClientListenerWriter.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTLISTENERWRITER_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTLISTENERWRITER_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 THINCLIENTLISTENERWRITER_HPP_
-#define THINCLIENTLISTENERWRITER_HPP_
 
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"
@@ -500,4 +503,5 @@ DUNIT_TASK_DEFINITION(SERVER1, CloseServer1)
   }
 END_TASK_DEFINITION
 
-#endif /*THINCLIENTLISTENERWRITER_HPP_*/
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTLISTENERWRITER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientLocalCacheLoader.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientLocalCacheLoader.hpp b/src/cppcache/integration-test/ThinClientLocalCacheLoader.hpp
index 92c25bd..22fd16a 100644
--- a/src/cppcache/integration-test/ThinClientLocalCacheLoader.hpp
+++ b/src/cppcache/integration-test/ThinClientLocalCacheLoader.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTLOCALCACHELOADER_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTLOCALCACHELOADER_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 THINCLIENTCACHELOADER_HPP_
-#define THINCLIENTCACHELOADER_HPP_
 
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"
@@ -261,4 +264,5 @@ void runCacheLoaderTest() {
   CALL_TASK(CloseCache1);
   CALL_TASK(StopServer)
 }
-#endif /*THINCLIENTCACHELOADER_HPP_*/
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTLOCALCACHELOADER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientNotification.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientNotification.hpp b/src/cppcache/integration-test/ThinClientNotification.hpp
index 4a2f733..ac076cb 100644
--- a/src/cppcache/integration-test/ThinClientNotification.hpp
+++ b/src/cppcache/integration-test/ThinClientNotification.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTNOTIFICATION_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTNOTIFICATION_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -488,3 +493,5 @@ void doThinClientNotification() {
   CALL_TASK(CloseServer1);
   CALL_TASK(CloseLocator1);
 }
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTNOTIFICATION_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientPdxSerializer.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientPdxSerializer.hpp b/src/cppcache/integration-test/ThinClientPdxSerializer.hpp
index 96bdfbc..7a5d3b2 100644
--- a/src/cppcache/integration-test/ThinClientPdxSerializer.hpp
+++ b/src/cppcache/integration-test/ThinClientPdxSerializer.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTPDXSERIALIZER_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTPDXSERIALIZER_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -378,3 +383,5 @@ DUNIT_TASK_DEFINITION(LOCATOR, CloseLocator)
     }
   }
 END_TASK_DEFINITION
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTPDXSERIALIZER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientPdxSerializers.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientPdxSerializers.hpp b/src/cppcache/integration-test/ThinClientPdxSerializers.hpp
index d12f6f9..887fcf2 100644
--- a/src/cppcache/integration-test/ThinClientPdxSerializers.hpp
+++ b/src/cppcache/integration-test/ThinClientPdxSerializers.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTPDXSERIALIZERS_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTPDXSERIALIZERS_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 __PDXSERIALIZERS__
-#define __PDXSERIALIZERS__
 
 static const char *CLASSNAME1 = "PdxTests.PdxType";
 static const char *CLASSNAME2 = "PdxTests.Address";
@@ -295,4 +298,5 @@ class TestPdxSerializer : public PdxSerializer {
   }
 };
 
-#endif  // __PDXSERIALIZERS__
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTPDXSERIALIZERS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientPutAll.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientPutAll.hpp b/src/cppcache/integration-test/ThinClientPutAll.hpp
index 68a98d4..7a8d529 100644
--- a/src/cppcache/integration-test/ThinClientPutAll.hpp
+++ b/src/cppcache/integration-test/ThinClientPutAll.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTPUTALL_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTPUTALL_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 THINCLIENTPUTALL_HPP_
-#define THINCLIENTPUTALL_HPP_
 
 #include "fw_dunit.hpp"
 #include <gfcpp/GeodeCppCache.hpp>
@@ -835,4 +838,5 @@ void runPutAll1(bool concurrencyCheckEnabled = true) {
   CALL_TASK(CloseServer2);
   CALL_TASK(CloseLocator1);
 }
-#endif /* THINCLIENTPUTALL_HPP_ */
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTPUTALL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientPutAllTimeout.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientPutAllTimeout.hpp b/src/cppcache/integration-test/ThinClientPutAllTimeout.hpp
index c1b79a4..16f0d1a 100644
--- a/src/cppcache/integration-test/ThinClientPutAllTimeout.hpp
+++ b/src/cppcache/integration-test/ThinClientPutAllTimeout.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTPUTALLTIMEOUT_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTPUTALLTIMEOUT_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -241,3 +246,5 @@ DUNIT_TASK_DEFINITION(SERVER1, StopServer)
     LOG("SERVER stopped");
   }
 END_TASK_DEFINITION
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTPUTALLTIMEOUT_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientPutAllWithCallBack.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientPutAllWithCallBack.hpp b/src/cppcache/integration-test/ThinClientPutAllWithCallBack.hpp
index 26be6d6..95ad493 100644
--- a/src/cppcache/integration-test/ThinClientPutAllWithCallBack.hpp
+++ b/src/cppcache/integration-test/ThinClientPutAllWithCallBack.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTPUTALLWITHCALLBACK_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTPUTALLWITHCALLBACK_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 ThinClientPutAllWITHCALLBACK_HPP_
-#define ThinClientPutAllWITHCALLBACK_HPP_
 
 #include "fw_dunit.hpp"
 #include <gfcpp/GeodeCppCache.hpp>
@@ -795,4 +798,5 @@ DUNIT_TASK_DEFINITION(SERVER2, CloseServer2)
   }
 END_TASK_DEFINITION
 
-#endif /* ThinClientPutAllWITHCALLBACK_HPP_ */
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTPUTALLWITHCALLBACK_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientPutGetAll.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientPutGetAll.hpp b/src/cppcache/integration-test/ThinClientPutGetAll.hpp
index bbd4094..60fb109 100644
--- a/src/cppcache/integration-test/ThinClientPutGetAll.hpp
+++ b/src/cppcache/integration-test/ThinClientPutGetAll.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTPUTGETALL_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTPUTGETALL_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 THINCLIENTPUTGETALL_HPP_
-#define THINCLIENTPUTGETALL_HPP_
 
 #include "fw_dunit.hpp"
 #include <gfcpp/GeodeCppCache.hpp>
@@ -609,4 +612,5 @@ void runPutGetAll() {
 
   CALL_TASK(CloseLocator1);
 }
-#endif /* THINCLIENTPUTGETALL_HPP_ */
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTPUTGETALL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientRIwithlocalRegionDestroy.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientRIwithlocalRegionDestroy.hpp b/src/cppcache/integration-test/ThinClientRIwithlocalRegionDestroy.hpp
index bf4af66..8e1f0d1 100644
--- a/src/cppcache/integration-test/ThinClientRIwithlocalRegionDestroy.hpp
+++ b/src/cppcache/integration-test/ThinClientRIwithlocalRegionDestroy.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTRIWITHLOCALREGIONDESTROY_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTRIWITHLOCALREGIONDESTROY_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -494,3 +499,5 @@ void testSubregionForLocalRegionDestroy() {
 
   CALL_TASK(CloseLocator1);
 }
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTRIWITHLOCALREGIONDESTROY_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientRegex.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientRegex.hpp b/src/cppcache/integration-test/ThinClientRegex.hpp
index 22021c9..44d9edb 100644
--- a/src/cppcache/integration-test/ThinClientRegex.hpp
+++ b/src/cppcache/integration-test/ThinClientRegex.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTREGEX_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTREGEX_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -419,3 +424,5 @@ DUNIT_TASK_DEFINITION(SERVER1, CloseServer1)
     }
   }
 END_TASK_DEFINITION
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTREGEX_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientRegex2.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientRegex2.hpp b/src/cppcache/integration-test/ThinClientRegex2.hpp
index a24d1a4..079d3cd 100644
--- a/src/cppcache/integration-test/ThinClientRegex2.hpp
+++ b/src/cppcache/integration-test/ThinClientRegex2.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTREGEX2_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTREGEX2_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -456,3 +461,5 @@ DUNIT_TASK_DEFINITION(SERVER1, CloseServer1)
     }
   }
 END_TASK_DEFINITION
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTREGEX2_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientRegex3.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientRegex3.hpp b/src/cppcache/integration-test/ThinClientRegex3.hpp
index e45537c..22e5561 100644
--- a/src/cppcache/integration-test/ThinClientRegex3.hpp
+++ b/src/cppcache/integration-test/ThinClientRegex3.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTREGEX3_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTREGEX3_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -407,3 +412,5 @@ DUNIT_TASK_DEFINITION(SERVER1, CloseServer1)
     }
   }
 END_TASK_DEFINITION
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTREGEX3_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientRemoveAll.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientRemoveAll.hpp b/src/cppcache/integration-test/ThinClientRemoveAll.hpp
index 79f91c6..a03704f 100644
--- a/src/cppcache/integration-test/ThinClientRemoveAll.hpp
+++ b/src/cppcache/integration-test/ThinClientRemoveAll.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTREMOVEALL_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTREMOVEALL_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 THINCLIENTREMOVEALL_HPP_
-#define THINCLIENTREMOVEALL_HPP_
 
 #include "fw_dunit.hpp"
 #include <gfcpp/GeodeCppCache.hpp>
@@ -422,4 +425,5 @@ DUNIT_TASK_DEFINITION(SERVER2, CloseServer2)
   }
 END_TASK_DEFINITION
 
-#endif /* THINCLIENTREMOVEALL_HPP_ */
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTREMOVEALL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientSSL.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientSSL.hpp b/src/cppcache/integration-test/ThinClientSSL.hpp
index caa21d7..1c5f8bc 100644
--- a/src/cppcache/integration-test/ThinClientSSL.hpp
+++ b/src/cppcache/integration-test/ThinClientSSL.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTSSL_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTSSL_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -500,3 +505,5 @@ void doThinClientSSL(bool poolConfig = true, bool poolLocators = true) {
 
   CALL_TASK(CloseLocator1_With_SSL);
 }
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTSSL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientSSLWithPassword.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientSSLWithPassword.hpp b/src/cppcache/integration-test/ThinClientSSLWithPassword.hpp
index bd4e480..6023147 100644
--- a/src/cppcache/integration-test/ThinClientSSLWithPassword.hpp
+++ b/src/cppcache/integration-test/ThinClientSSLWithPassword.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTSSLWITHPASSWORD_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTSSLWITHPASSWORD_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -514,3 +519,5 @@ void doThinClientSSLWithPassword() {
 
   CALL_TASK(CloseLocator1_With_SSL);
 }
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTSSLWITHPASSWORD_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientSecurity.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientSecurity.hpp b/src/cppcache/integration-test/ThinClientSecurity.hpp
index 20b87da..220d437 100644
--- a/src/cppcache/integration-test/ThinClientSecurity.hpp
+++ b/src/cppcache/integration-test/ThinClientSecurity.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTSECURITY_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTSECURITY_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: vrao
  */
 
-#ifndef THINCLIENTSECURITY_HPP_
-#define THINCLIENTSECURITY_HPP_
 
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"
@@ -76,4 +79,5 @@ RegionServicePtr getVirtualCache(PropertiesPtr creds, PoolPtr pool) {
   return cachePtr->createAuthenticatedView(creds, pool->getName());
 }
 
-#endif /* THINCLIENTSECURITY_HPP_ */
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTSECURITY_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientSecurityHelper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientSecurityHelper.hpp b/src/cppcache/integration-test/ThinClientSecurityHelper.hpp
index 1bee0a1..08974aa 100644
--- a/src/cppcache/integration-test/ThinClientSecurityHelper.hpp
+++ b/src/cppcache/integration-test/ThinClientSecurityHelper.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTSECURITYHELPER_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTSECURITYHELPER_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -253,3 +258,5 @@ class putThread : public ACE_Task_Base {
   bool m_regInt;
   int m_waitTime;
 };
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTSECURITYHELPER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientTXFailover.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientTXFailover.hpp b/src/cppcache/integration-test/ThinClientTXFailover.hpp
index 47bded7..aa6680c 100644
--- a/src/cppcache/integration-test/ThinClientTXFailover.hpp
+++ b/src/cppcache/integration-test/ThinClientTXFailover.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTTXFAILOVER_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTTXFAILOVER_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -424,3 +429,5 @@ void runThinClientFailover(bool isSticky = false) {
 
   CALL_TASK(CloseLocator1);
 }
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTTXFAILOVER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientTasks_C2S2.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientTasks_C2S2.hpp b/src/cppcache/integration-test/ThinClientTasks_C2S2.hpp
index 3c452db..a063080 100644
--- a/src/cppcache/integration-test/ThinClientTasks_C2S2.hpp
+++ b/src/cppcache/integration-test/ThinClientTasks_C2S2.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTTASKS_C2S2_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTTASKS_C2S2_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 THINCLIENTTASKS_C2S2_HPP_
-#define THINCLIENTTASKS_C2S2_HPP_
 
 // define our own names for the 4 test processes
 #define PROCESS1 s1p1
@@ -91,4 +94,5 @@ void startServer() { CALL_TASK(startServerWithLocator); }
 
 void closeLocator() { CALL_TASK(CloseLocator); }
 
-#endif /* THINCLIENTTASKS_C2S2_HPP_ */
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTTASKS_C2S2_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientTransactions.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientTransactions.hpp b/src/cppcache/integration-test/ThinClientTransactions.hpp
index c0a30ae..a84ed55 100644
--- a/src/cppcache/integration-test/ThinClientTransactions.hpp
+++ b/src/cppcache/integration-test/ThinClientTransactions.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTTRANSACTIONS_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTTRANSACTIONS_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 THINCLIENTTRANSACTIONS_HPP_
-#define THINCLIENTTRANSACTIONS_HPP_
 
 #include "fw_dunit.hpp"
 #include <gfcpp/GeodeCppCache.hpp>
@@ -1107,4 +1110,5 @@ DUNIT_TASK_DEFINITION(SERVER1, CloseServer1)
   }
 END_TASK_DEFINITION
 
-#endif /* THINCLIENTTRANSACTIONS_HPP_ */
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTTRANSACTIONS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientTransactionsXA.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientTransactionsXA.hpp b/src/cppcache/integration-test/ThinClientTransactionsXA.hpp
index 97a7b9b..c2aaa11 100644
--- a/src/cppcache/integration-test/ThinClientTransactionsXA.hpp
+++ b/src/cppcache/integration-test/ThinClientTransactionsXA.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTTRANSACTIONSXA_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTTRANSACTIONSXA_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 THINCLIENTTRANSACTIONS_HPP_
-#define THINCLIENTTRANSACTIONS_HPP_
 
 #include "fw_dunit.hpp"
 #include <gfcpp/GeodeCppCache.hpp>
@@ -1163,4 +1166,5 @@ void runTransactionOps(bool poolConfig = true, bool isLocator = true,
   CALL_TASK(CloseLocator1);
 }
 
-#endif /* THINCLIENTTRANSACTIONS_HPP_ */
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTTRANSACTIONSXA_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/ThinClientVersionedOps.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientVersionedOps.hpp b/src/cppcache/integration-test/ThinClientVersionedOps.hpp
index a443acd..a1152a1 100644
--- a/src/cppcache/integration-test/ThinClientVersionedOps.hpp
+++ b/src/cppcache/integration-test/ThinClientVersionedOps.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_THINCLIENTVERSIONEDOPS_H_
+#define GEODE_INTEGRATION_TEST_THINCLIENTVERSIONEDOPS_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -581,3 +586,5 @@ DUNIT_TASK_DEFINITION(SERVER1, CloseServers_With_Locator)
     }
   }
 END_TASK_DEFINITION
+
+#endif // GEODE_INTEGRATION_TEST_THINCLIENTVERSIONEDOPS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/TimeBomb.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/TimeBomb.hpp b/src/cppcache/integration-test/TimeBomb.hpp
index a7de640..8ccf811 100644
--- a/src/cppcache/integration-test/TimeBomb.hpp
+++ b/src/cppcache/integration-test/TimeBomb.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_TIMEBOMB_H_
+#define GEODE_INTEGRATION_TEST_TIMEBOMB_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 _TEST_TIMEBOMB_HPP_
-#define _TEST_TIMEBOMB_HPP_
 
 #include <ace/Task.h>
 #include <ace/OS.h>
@@ -108,4 +111,5 @@ class TimeBomb : public ACE_Task_Base {
   ~TimeBomb() {}
 };
 
-#endif
+
+#endif // GEODE_INTEGRATION_TEST_TIMEBOMB_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/fw_dunit.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/fw_dunit.hpp b/src/cppcache/integration-test/fw_dunit.hpp
index 046b2cc..5187fdf 100644
--- a/src/cppcache/integration-test/fw_dunit.hpp
+++ b/src/cppcache/integration-test/fw_dunit.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_FW_DUNIT_H_
+#define GEODE_INTEGRATION_TEST_FW_DUNIT_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 __DUNIT_FW_DUNIT_H__
-#define __DUNIT_FW_DUNIT_H__
 
 /***
 
@@ -362,4 +365,5 @@ int ACE_TMAIN(int argc, ACE_TCHAR* argv[]) { return dunit::dmain(argc, argv); }
 
 #include "no_cout.hpp"
 
-#endif  // __DUNIT_FW_DUNIT_H__
+
+#endif // GEODE_INTEGRATION_TEST_FW_DUNIT_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/fw_helper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/fw_helper.hpp b/src/cppcache/integration-test/fw_helper.hpp
index dfe644a..9af05f7 100644
--- a/src/cppcache/integration-test/fw_helper.hpp
+++ b/src/cppcache/integration-test/fw_helper.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_FW_HELPER_H_
+#define GEODE_INTEGRATION_TEST_FW_HELPER_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -67,8 +72,6 @@ fwtest_Name is defined for you, as a (const char *) with the value given to
 BEGIN_TEST.
 
 */
-#ifndef _FW_HELPER_HPP_
-#define _FW_HELPER_HPP_
 
 #ifdef WIN32
 // Must include WinSock2 so winsock.h doesn't get included.
@@ -228,4 +231,5 @@ int main(int argc, char* argv[])
   }                 \
   a_##x;
 
-#endif
+
+#endif // GEODE_INTEGRATION_TEST_FW_HELPER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/fw_perf.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/fw_perf.hpp b/src/cppcache/integration-test/fw_perf.hpp
index c1b3ac9..9fd7765 100644
--- a/src/cppcache/integration-test/fw_perf.hpp
+++ b/src/cppcache/integration-test/fw_perf.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_FW_PERF_H_
+#define GEODE_INTEGRATION_TEST_FW_PERF_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 _FWPERF_H_
-#define _FWPERF_H_
 
 /**
 
@@ -243,4 +246,5 @@ class Thread : public ACE_Task_Base {
 //};
 }  // namespace perf
 
-#endif
+
+#endif // GEODE_INTEGRATION_TEST_FW_PERF_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/fw_spawn.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/fw_spawn.hpp b/src/cppcache/integration-test/fw_spawn.hpp
index 99e4187..1b5d396 100644
--- a/src/cppcache/integration-test/fw_spawn.hpp
+++ b/src/cppcache/integration-test/fw_spawn.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_FW_SPAWN_H_
+#define GEODE_INTEGRATION_TEST_FW_SPAWN_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 __TEST_FW_SPAWN_H__
-#define __TEST_FW_SPAWN_H__
 // Spawn.cpp,v 1.4 2004/01/07 22:40:16 shuston Exp
 
 // @TODO, this out this include list..
@@ -123,4 +126,5 @@
 
 };  // namespace dunit.
 
-#endif  // __TEST_FW_SPAWN_H__
+
+#endif // GEODE_INTEGRATION_TEST_FW_SPAWN_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/locator_globals.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/locator_globals.hpp b/src/cppcache/integration-test/locator_globals.hpp
index a0ed4cd..f7187bd 100644
--- a/src/cppcache/integration-test/locator_globals.hpp
+++ b/src/cppcache/integration-test/locator_globals.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_LOCATOR_GLOBALS_H_
+#define GEODE_INTEGRATION_TEST_LOCATOR_GLOBALS_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 CPPCACHE_INTEGRATION_TEST_LOCATOR_GLOBALS_HPP_
-#define CPPCACHE_INTEGRATION_TEST_LOCATOR_GLOBALS_HPP_
 
 static int numberOfLocators = 1;
 bool isLocalServer = false;
@@ -24,4 +27,5 @@ bool isLocator = false;
 const char* locatorsG =
     CacheHelper::getLocatorHostPort(isLocator, isLocalServer, numberOfLocators);
 
-#endif /* CPPCACHE_INTEGRATION_TEST_LOCATOR_GLOBALS_HPP_ */
+
+#endif // GEODE_INTEGRATION_TEST_LOCATOR_GLOBALS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/no_cout.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/no_cout.hpp b/src/cppcache/integration-test/no_cout.hpp
index 638e66b..24924fb 100644
--- a/src/cppcache/integration-test/no_cout.hpp
+++ b/src/cppcache/integration-test/no_cout.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_NO_COUT_H_
+#define GEODE_INTEGRATION_TEST_NO_COUT_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -74,3 +79,5 @@ extern NOCout::FLAGS flush;
 extern NOCout::FLAGS hex;
 extern NOCout::FLAGS dec;
 }  // namespace test
+
+#endif // GEODE_INTEGRATION_TEST_NO_COUT_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/testCache.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testCache.cpp b/src/cppcache/integration-test/testCache.cpp
index 2db7696..12e754f 100644
--- a/src/cppcache/integration-test/testCache.cpp
+++ b/src/cppcache/integration-test/testCache.cpp
@@ -26,14 +26,12 @@ using namespace apache::geode::client;
 using namespace test;
 BEGIN_TEST(CacheFunction)
   char* host_name = (char*)"TESTCACHE";
-  char* host = NULL;
   uint16_t port ATTR_UNUSED = 0;
   const uint32_t totalSubRegions = 3;
   char* regionName = (char*)"TESTCACHE_ROOT_REGION";
   char* subRegionName1 = (char*)"TESTCACHE_SUB_REGION1";
   char* subRegionName2 = (char*)"TESTCACHE_SUB_REGION2";
   char* subRegionName21 = (char*)"TESTCACHE_SUB_REGION21";
-  bool exception_occured = false;
   CachePtr cptr;
   if (cptr != NULLPTR) {
     cout << "cptr is not null" << endl;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/testThinClientHAFailover.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientHAFailover.cpp b/src/cppcache/integration-test/testThinClientHAFailover.cpp
index 7fd298d..db019b9 100644
--- a/src/cppcache/integration-test/testThinClientHAFailover.cpp
+++ b/src/cppcache/integration-test/testThinClientHAFailover.cpp
@@ -302,7 +302,6 @@ const char* nvals[] = {"New Value-1", "New Value-2", "New Value-3",
 const char* regionNames[] = {"DistRegionAck", "DistRegionNoAck"};
 
 const bool USE_ACK = true;
-const bool NO_ACK = false;
 void initClientAndRegion(int redundancy) {
   PropertiesPtr pp = Properties::create();
   g_redundancyLevel = redundancy;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/testThinClientHAFailoverRegex.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientHAFailoverRegex.cpp b/src/cppcache/integration-test/testThinClientHAFailoverRegex.cpp
index 5ab0112..b7df72a 100644
--- a/src/cppcache/integration-test/testThinClientHAFailoverRegex.cpp
+++ b/src/cppcache/integration-test/testThinClientHAFailoverRegex.cpp
@@ -281,7 +281,6 @@ const char* nvals[] = {"New Value-1", "New Value-2", "New Value-3",
 const char* regionNames[] = {"DistRegionAck", "DistRegionNoAck"};
 
 const bool USE_ACK = true;
-const bool NO_ACK = false;
 void initClientAndRegion(int redundancy) {
   g_redundancyLevel = redundancy;
   PropertiesPtr pp = Properties::create();

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/testThinClientHAMixedRedundancy.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientHAMixedRedundancy.cpp b/src/cppcache/integration-test/testThinClientHAMixedRedundancy.cpp
index 3f9d847..fe52a77 100644
--- a/src/cppcache/integration-test/testThinClientHAMixedRedundancy.cpp
+++ b/src/cppcache/integration-test/testThinClientHAMixedRedundancy.cpp
@@ -286,7 +286,6 @@ const char* nvals[] = {"New Value-1", "New Value-2", "New Value-3",
 const char* regionNames[] = {"DistRegionAck", "DistRegionNoAck"};
 
 const bool USE_ACK = true;
-const bool NO_ACK = false;
 #include "ThinClientTasks_C2S2.hpp"
 void createCommRegions(int redundancy) {
   PropertiesPtr pp = Properties::create();

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/testThinClientPdxEnum.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPdxEnum.cpp b/src/cppcache/integration-test/testThinClientPdxEnum.cpp
index 4538b80..2a45b03 100644
--- a/src/cppcache/integration-test/testThinClientPdxEnum.cpp
+++ b/src/cppcache/integration-test/testThinClientPdxEnum.cpp
@@ -14,13 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*
-* testThinClientPdxEnum.cpp
-*
-*/
-
-#ifndef TEST_THIN_CLIENT_PDX_ENUM_HPP_
-#define TEST_THIN_CLIENT_PDX_ENUM_HPP_
 
 #include "fw_dunit.hpp"
 #include <gfcpp/GeodeCppCache.hpp>
@@ -181,5 +174,3 @@ DUNIT_MAIN
     CALL_TASK(CloseLocator1)
   }
 END_MAIN
-
-#endif /* TEST_THIN_CLIENT_PDX_ENUM_HPP_ */

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/testThinClientPdxInstance.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPdxInstance.cpp b/src/cppcache/integration-test/testThinClientPdxInstance.cpp
index 82e8cd2..c05b856 100644
--- a/src/cppcache/integration-test/testThinClientPdxInstance.cpp
+++ b/src/cppcache/integration-test/testThinClientPdxInstance.cpp
@@ -14,13 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*
-* testThinClientPdxInstance.cpp
-*
-*/
-
-#ifndef TESTTHINCLIENTPDXINSTANCE_HPP_
-#define TESTTHINCLIENTPDXINSTANCE_HPP_
 
 #include "fw_dunit.hpp"
 #include <gfcpp/GeodeCppCache.hpp>
@@ -2754,5 +2747,3 @@ DUNIT_MAIN
         2);  // Locator, caching = false, PdxReadSerialized = true
   }
 END_MAIN
-
-#endif /* TESTTHINCLIENTPDXINSTANCE_HPP_ */

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/testThinClientRemoveOps.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientRemoveOps.cpp b/src/cppcache/integration-test/testThinClientRemoveOps.cpp
index 8868ff6..00c740e 100644
--- a/src/cppcache/integration-test/testThinClientRemoveOps.cpp
+++ b/src/cppcache/integration-test/testThinClientRemoveOps.cpp
@@ -14,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef TESTTHINCLIENTREMOVEOPS_HPP_
-#define TESTTHINCLIENTREMOVEOPS_HPP_
 
 #include "fw_dunit.hpp"
 #include <gfcpp/GeodeCppCache.hpp>
@@ -1737,5 +1735,3 @@ DUNIT_MAIN
     runRemoveOps1();
   }
 END_MAIN
-
-#endif /* TESTTHINCLIENTREMOVEOPS_HPP_ */

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/integration-test/testUtils.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testUtils.hpp b/src/cppcache/integration-test/testUtils.hpp
index c7573e4..2138720 100644
--- a/src/cppcache/integration-test/testUtils.hpp
+++ b/src/cppcache/integration-test/testUtils.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_INTEGRATION_TEST_TESTUTILS_H_
+#define GEODE_INTEGRATION_TEST_TESTUTILS_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 __UNIT_TEST_TEST_UTILS__
-#define __UNIT_TEST_TEST_UTILS__
 #include <gfcpp/GeodeCppCache.hpp>
 
 /* use CacheHelper to gain the impl pointer from cache or region object
@@ -185,4 +188,5 @@ class TestUtils {
   }
 };
 }  // namespace unitTests
-#endif  // define __UNIT_TEST_TEST_UTILS__
+
+#endif // GEODE_INTEGRATION_TEST_TESTUTILS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/AdminRegion.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/AdminRegion.hpp b/src/cppcache/src/AdminRegion.hpp
index c2dcd70..9305cc9 100644
--- a/src/cppcache/src/AdminRegion.hpp
+++ b/src/cppcache/src/AdminRegion.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_ADMINREGION_H_
+#define GEODE_ADMINREGION_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 _ADMIN_REGION_HPP_INCLUDED_
-#define _ADMIN_REGION_HPP_INCLUDED_
 
 #include <gfcpp/gf_types.hpp>
 #include "ThinClientCacheDistributionManager.hpp"
@@ -80,4 +83,5 @@ typedef SharedPtr<AdminRegion> AdminRegionPtr;
 }  // namespace geode
 }  // namespace apache
 
-#endif
+
+#endif // GEODE_ADMINREGION_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/AppDomainContext.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/AppDomainContext.hpp b/src/cppcache/src/AppDomainContext.hpp
index 940ff07..a4894e5 100644
--- a/src/cppcache/src/AppDomainContext.hpp
+++ b/src/cppcache/src/AppDomainContext.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_APPDOMAINCONTEXT_H_
+#define GEODE_APPDOMAINCONTEXT_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_AppDomainContext_h__
-#define __gemfire_AppDomainContext_h__
-
 #include <functional>
 
 namespace apache {
@@ -37,4 +39,4 @@ extern AppDomainContext::factory createAppDomainContext;
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __gemfire_AppDomainContext_h__
+#endif // GEODE_APPDOMAINCONTEXT_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/AtomicInc.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/AtomicInc.hpp b/src/cppcache/src/AtomicInc.hpp
index ef1adc9..3c49fda 100644
--- a/src/cppcache/src/AtomicInc.hpp
+++ b/src/cppcache/src/AtomicInc.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_ATOMICINC_H_
+#define GEODE_ATOMICINC_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_ATOMICINC_HPP_
-#define _GEMFIRE_IMPL_ATOMICINC_HPP_
 
 #include <gfcpp/gfcpp_globals.hpp>
 
@@ -84,4 +87,4 @@ class CPPCACHE_EXPORT AtomicInc {
 }  // namespace geode
 }  // namespace apache
 
-#endif
+#endif // GEODE_ATOMICINC_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/AutoDelete.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/AutoDelete.hpp b/src/cppcache/src/AutoDelete.hpp
index d7449a8..abf1980 100644
--- a/src/cppcache/src/AutoDelete.hpp
+++ b/src/cppcache/src/AutoDelete.hpp
@@ -1,5 +1,7 @@
-#ifndef _GEMFIRE_AUTODELETE_HPP_
-#define _GEMFIRE_AUTODELETE_HPP_
+#pragma once
+
+#ifndef GEODE_AUTODELETE_H_
+#define GEODE_AUTODELETE_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -68,4 +70,4 @@ class DeleteArray {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // #ifndef _GEMFIRE_AUTODELETE_HPP_
+#endif // GEODE_AUTODELETE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/BucketServerLocation.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/BucketServerLocation.hpp b/src/cppcache/src/BucketServerLocation.hpp
index a87cf42..604c62b 100644
--- a/src/cppcache/src/BucketServerLocation.hpp
+++ b/src/cppcache/src/BucketServerLocation.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_BUCKETSERVERLOCATION_H_
+#define GEODE_BUCKETSERVERLOCATION_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 __BUCKET_SERVER_LOCATION__
-#define __BUCKET_SERVER_LOCATION__
 
 #include "ServerLocation.hpp"
 #include <string>
@@ -174,4 +177,5 @@ class BucketServerLocation : public ServerLocation {
 }  // namespace geode
 }  // namespace apache
 
-#endif
+
+#endif // GEODE_BUCKETSERVERLOCATION_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/CacheImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CacheImpl.hpp b/src/cppcache/src/CacheImpl.hpp
index f22721d..2bfc05a 100644
--- a/src/cppcache/src/CacheImpl.hpp
+++ b/src/cppcache/src/CacheImpl.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_CACHEIMPL_H__
-#define __GEMFIRE_CACHEIMPL_H__
+#pragma once
+
+#ifndef GEODE_CACHEIMPL_H_
+#define GEODE_CACHEIMPL_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/SharedPtr.hpp>
 
@@ -336,4 +340,5 @@ class CPPCACHE_EXPORT CacheImpl : private NonCopyable, private NonAssignable {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // ifndef __GEMFIRE_CACHEIMPL_H__
+
+#endif // GEODE_CACHEIMPL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/CachePerfStats.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CachePerfStats.hpp b/src/cppcache/src/CachePerfStats.hpp
index df3bed1..b3b8095 100644
--- a/src/cppcache/src/CachePerfStats.hpp
+++ b/src/cppcache/src/CachePerfStats.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_CACHEPERFSTATS_H_
+#define GEODE_CACHEPERFSTATS_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_CACHEPERFSTATS_H__
-#define __GEMFIRE_CACHEPERFSTATS_H__
-
 #include <gfcpp/gfcpp_globals.hpp>
 #include <gfcpp/statistics/Statistics.hpp>
 #include <gfcpp/statistics/StatisticsFactory.hpp>
@@ -360,4 +362,4 @@ class CPPCACHE_EXPORT CachePerfStats {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __GEMFIRE_CACHEPERFSTATS_H__
+#endif // GEODE_CACHEPERFSTATS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/CacheRegionHelper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CacheRegionHelper.hpp b/src/cppcache/src/CacheRegionHelper.hpp
index d04bc55..86e6dab 100644
--- a/src/cppcache/src/CacheRegionHelper.hpp
+++ b/src/cppcache/src/CacheRegionHelper.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_IMPL_CACHEHELPER_H__
-#define __GEMFIRE_IMPL_CACHEHELPER_H__
+#pragma once
+
+#ifndef GEODE_CACHEREGIONHELPER_H_
+#define GEODE_CACHEREGIONHELPER_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -47,4 +50,5 @@ class CacheRegionHelper {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // ifndef __GEMFIRE_IMPL_CACHEHELPER_H__
+
+#endif // GEODE_CACHEREGIONHELPER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/CacheTransactionManagerImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CacheTransactionManagerImpl.hpp b/src/cppcache/src/CacheTransactionManagerImpl.hpp
index b6f9f8c..619369a 100644
--- a/src/cppcache/src/CacheTransactionManagerImpl.hpp
+++ b/src/cppcache/src/CacheTransactionManagerImpl.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_CACHETRANSACTIONMANAGERIMPL_H_
+#define GEODE_CACHETRANSACTIONMANAGERIMPL_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 CACHETRANSACTIONMANAGERIMPL_H_
-#define CACHETRANSACTIONMANAGERIMPL_H_
 
 #include <gfcpp/CacheTransactionManager.hpp>
 #include <gfcpp/HashSetOfSharedBase.hpp>
@@ -108,4 +111,5 @@ class CacheTransactionManagerImpl
 }  // namespace geode
 }  // namespace apache
 
-#endif /* CACHETRANSACTIONMANAGERIMPL_H_ */
+
+#endif // GEODE_CACHETRANSACTIONMANAGERIMPL_H_

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

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/CacheXmlCreation.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CacheXmlCreation.hpp b/src/cppcache/src/CacheXmlCreation.hpp
index cc002b7..05fbf6c 100644
--- a/src/cppcache/src/CacheXmlCreation.hpp
+++ b/src/cppcache/src/CacheXmlCreation.hpp
@@ -1,5 +1,8 @@
-#ifndef _GEMFIRE_CACHEXMLCREATION_HPP_
-#define _GEMFIRE_CACHEXMLCREATION_HPP_
+#pragma once
+
+#ifndef GEODE_CACHEXMLCREATION_H_
+#define GEODE_CACHEXMLCREATION_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -93,4 +96,4 @@ class CPPCACHE_EXPORT CacheXmlCreation {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // #ifndef  _GEMFIRE_CACHEXMLCREATION_HPP_
+#endif // GEODE_CACHEXMLCREATION_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/CacheXmlParser.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CacheXmlParser.hpp b/src/cppcache/src/CacheXmlParser.hpp
index b7f0b00..234eaea 100644
--- a/src/cppcache/src/CacheXmlParser.hpp
+++ b/src/cppcache/src/CacheXmlParser.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_CACHEXMLPARSER_HPP__
-#define __GEMFIRE_CACHEXMLPARSER_HPP__
+#pragma once
+
+#ifndef GEODE_CACHEXMLPARSER_H_
+#define GEODE_CACHEXMLPARSER_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -153,4 +156,6 @@ class CPPCACHE_EXPORT CacheXmlParser : public CacheXml {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // ifndef __GEMFIRE_CACHEXMLPARSER_HPP__
+
+
+#endif // GEODE_CACHEXMLPARSER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/CacheableObjectPartList.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CacheableObjectPartList.hpp b/src/cppcache/src/CacheableObjectPartList.hpp
index 67596de..7690874 100644
--- a/src/cppcache/src/CacheableObjectPartList.hpp
+++ b/src/cppcache/src/CacheableObjectPartList.hpp
@@ -1,5 +1,7 @@
-#ifndef _GEMFIRE_CACHEABLEOBJECTPARTLIST_HPP_
-#define _GEMFIRE_CACHEABLEOBJECTPARTLIST_HPP_
+#pragma once
+
+#ifndef GEODE_CACHEABLEOBJECTPARTLIST_H_
+#define GEODE_CACHEABLEOBJECTPARTLIST_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -144,4 +146,4 @@ typedef SharedPtr<CacheableObjectPartList> CacheableObjectPartListPtr;
 }  // namespace geode
 }  // namespace apache
 
-#endif  // _GEMFIRE_CACHEABLEOBJECTPARTLIST_HPP_
+#endif // GEODE_CACHEABLEOBJECTPARTLIST_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/CacheableToken.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CacheableToken.hpp b/src/cppcache/src/CacheableToken.hpp
index eeff5e4..f5c11a0 100644
--- a/src/cppcache/src/CacheableToken.hpp
+++ b/src/cppcache/src/CacheableToken.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_CACHEABLETOKEN_H_
+#define GEODE_CACHEABLETOKEN_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_CacheableToken_HPP_
-#define _GEMFIRE_CacheableToken_HPP_
 
 #include <gfcpp/gfcpp_globals.hpp>
 #include <gfcpp/Cacheable.hpp>
@@ -130,4 +133,4 @@ class CPPCACHE_EXPORT CacheableToken : public Cacheable {
 }  // namespace geode
 }  // namespace apache
 
-#endif
+#endif // GEODE_CACHEABLETOKEN_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/CachedDeserializableHelper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CachedDeserializableHelper.hpp b/src/cppcache/src/CachedDeserializableHelper.hpp
index 64217e0..430e1a1 100644
--- a/src/cppcache/src/CachedDeserializableHelper.hpp
+++ b/src/cppcache/src/CachedDeserializableHelper.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_CACHEDDESERIALIZABLEHELPER_H_
+#define GEODE_CACHEDDESERIALIZABLEHELPER_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 CACHEDDESERIALIZABLEHELPER_HPP_
-#define CACHEDDESERIALIZABLEHELPER_HPP_
 
 #include <gfcpp/Cacheable.hpp>
 #include <gfcpp/DataInput.hpp>
@@ -99,4 +102,5 @@ typedef SharedPtr<CachedDeserializableHelper> CachedDeserializableHelperPtr;
 }  // namespace geode
 }  // namespace apache
 
-#endif  // CACHEDDESERIALIZABLEHELPER_HPP_
+
+#endif // GEODE_CACHEDDESERIALIZABLEHELPER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/ClientConnectionRequest.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ClientConnectionRequest.hpp b/src/cppcache/src/ClientConnectionRequest.hpp
index 7bc8f46..1ef8b43 100644
--- a/src/cppcache/src/ClientConnectionRequest.hpp
+++ b/src/cppcache/src/ClientConnectionRequest.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_CLIENTCONNECTIONREQUEST_H_
+#define GEODE_CLIENTCONNECTIONREQUEST_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 __CLIENT_CONNECTION_REQUEST__
-#define __CLIENT_CONNECTION_REQUEST__
 #include "ServerLocationRequest.hpp"
 #include "TcrEndpoint.hpp"
 #include <string>
@@ -65,4 +68,5 @@ class ClientConnectionRequest : public ServerLocationRequest {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif
+
+#endif // GEODE_CLIENTCONNECTIONREQUEST_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/ClientConnectionResponse.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ClientConnectionResponse.hpp b/src/cppcache/src/ClientConnectionResponse.hpp
index 1ebce7b..2d9952e 100644
--- a/src/cppcache/src/ClientConnectionResponse.hpp
+++ b/src/cppcache/src/ClientConnectionResponse.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_CLIENTCONNECTIONRESPONSE_H_
+#define GEODE_CLIENTCONNECTIONRESPONSE_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 __CLIENT_CONNECTION_RESPONSE__
-#define __CLIENT_CONNECTION_RESPONSE__
 #include "ServerLocationResponse.hpp"
 #include "ServerLocation.hpp"
 #include <gfcpp/SharedPtr.hpp>
@@ -48,4 +51,5 @@ typedef SharedPtr<ClientConnectionResponse> ClientConnectionResponsePtr;
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif
+
+#endif // GEODE_CLIENTCONNECTIONRESPONSE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/ClientHealthStats.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ClientHealthStats.hpp b/src/cppcache/src/ClientHealthStats.hpp
index a44838b..05a0e5e 100644
--- a/src/cppcache/src/ClientHealthStats.hpp
+++ b/src/cppcache/src/ClientHealthStats.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_CLIENTHEALTHSTATS_H_
+#define GEODE_CLIENTHEALTHSTATS_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 _CLIENT_HEALTH_STATS_HPP_INCLUDED_
-#define _CLIENT_HEALTH_STATS_HPP_INCLUDED_
 
 #include <gfcpp/gf_types.hpp>
 #include <gfcpp/Serializable.hpp>
@@ -88,4 +91,5 @@ class ClientHealthStats : public Serializable {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // _CLIENT_HEALTH_STATS_HPP_INCLUDED_
+
+#endif // GEODE_CLIENTHEALTHSTATS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/ClientMetadata.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ClientMetadata.hpp b/src/cppcache/src/ClientMetadata.hpp
index 8d3421c..83bb6d4 100644
--- a/src/cppcache/src/ClientMetadata.hpp
+++ b/src/cppcache/src/ClientMetadata.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_CLIENTMETADATA_H_
+#define GEODE_CLIENTMETADATA_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 CLIENT_METADATA
-#define CLIENT_METADATA
 
 #include <gfcpp/PartitionResolver.hpp>
 #include "ServerLocation.hpp"
@@ -105,4 +108,5 @@ class CPPCACHE_EXPORT ClientMetadata : public SharedBase, public NonAssignable {
 }  // namespace geode
 }  // namespace apache
 
-#endif
+
+#endif // GEODE_CLIENTMETADATA_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/ClientMetadataService.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ClientMetadataService.hpp b/src/cppcache/src/ClientMetadataService.hpp
index 8f97bcb..ae8cbe8 100644
--- a/src/cppcache/src/ClientMetadataService.hpp
+++ b/src/cppcache/src/ClientMetadataService.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_CLIENTMETADATASERVICE_H_
+#define GEODE_CLIENTMETADATASERVICE_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 CLIENT_METADATA_SERVICE
-#define CLIENT_METADATA_SERVICE
 
 #include <ace/Task.h>
 #include "ClientMetadata.hpp"
@@ -207,4 +210,5 @@ class ClientMetadataService : public ACE_Task_Base,
 }  // namespace geode
 }  // namespace apache
 
-#endif
+
+#endif // GEODE_CLIENTMETADATASERVICE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/ClientProxyMembershipID.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ClientProxyMembershipID.hpp b/src/cppcache/src/ClientProxyMembershipID.hpp
index 07abc2a..8856b2c 100644
--- a/src/cppcache/src/ClientProxyMembershipID.hpp
+++ b/src/cppcache/src/ClientProxyMembershipID.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_CLIENTPROXYMEMBERSHIPID_H_
+#define GEODE_CLIENTPROXYMEMBERSHIPID_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 __CLIENTPROXYMEMBERSHIPID_HPP__
-#define __CLIENTPROXYMEMBERSHIPID_HPP__
 
 #include <gfcpp/gfcpp_globals.hpp>
 #include <gfcpp/DataOutput.hpp>
@@ -145,4 +148,5 @@ class ClientProxyMembershipID : public DSMemberForVersionStamp {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __CLIENTPROXYMEMBERSHIPID_HPP__
+
+#endif // GEODE_CLIENTPROXYMEMBERSHIPID_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/ClientReplacementRequest.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ClientReplacementRequest.hpp b/src/cppcache/src/ClientReplacementRequest.hpp
index 1d25768..f3229dd 100644
--- a/src/cppcache/src/ClientReplacementRequest.hpp
+++ b/src/cppcache/src/ClientReplacementRequest.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_CLIENTREPLACEMENTREQUEST_H_
+#define GEODE_CLIENTREPLACEMENTREQUEST_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 __CLIENT_REPLACEMENT_REQUEST__
-#define __CLIENT_REPLACEMENT_REQUEST__
 #include "ServerLocationRequest.hpp"
 #include "ClientConnectionRequest.hpp"
 #include "TcrEndpoint.hpp"
@@ -43,4 +46,5 @@ class ClientReplacementRequest : public ClientConnectionRequest {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif
+
+#endif // GEODE_CLIENTREPLACEMENTREQUEST_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/ConcurrentEntriesMap.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ConcurrentEntriesMap.hpp b/src/cppcache/src/ConcurrentEntriesMap.hpp
index 9b9e336..6b70034 100644
--- a/src/cppcache/src/ConcurrentEntriesMap.hpp
+++ b/src/cppcache/src/ConcurrentEntriesMap.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_CONCURRENTENTRIESMAP_H_
+#define GEODE_CONCURRENTENTRIESMAP_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_CONCURRENTENTRIESMAP_H__
-#define __GEMFIRE_IMPL_CONCURRENTENTRIESMAP_H__
 
 #include <gfcpp/gfcpp_globals.hpp>
 #include "EntriesMap.hpp"
@@ -166,4 +169,4 @@ class CPPCACHE_EXPORT ConcurrentEntriesMap : public EntriesMap {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __GEMFIRE_IMPL_CONCURRENTENTRIESMAP_H__
+#endif // GEODE_CONCURRENTENTRIESMAP_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/Condition.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/Condition.hpp b/src/cppcache/src/Condition.hpp
index 5184a3a..c4f74b8 100644
--- a/src/cppcache/src/Condition.hpp
+++ b/src/cppcache/src/Condition.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_CONDITION_H_
+#define GEODE_CONDITION_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_CONDITION_HPP_
-#define _GEMFIRE_IMPL_CONDITION_HPP_ 1
 
 #include <gfcpp/gfcpp_globals.hpp>
 #include <ace/Condition_Recursive_Thread_Mutex.h>
@@ -74,4 +77,4 @@ class CPPCACHE_EXPORT Condition {
 }  // namespace geode
 }  // namespace apache
 
-#endif
+#endif // GEODE_CONDITION_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/ConnectCounter.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ConnectCounter.hpp b/src/cppcache/src/ConnectCounter.hpp
index b3bd722..367b51d 100644
--- a/src/cppcache/src/ConnectCounter.hpp
+++ b/src/cppcache/src/ConnectCounter.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_CONNECTCOUNTER_H_
+#define GEODE_CONNECTCOUNTER_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_CONNECTCOUNTER_HPP_
-#define _GEMFIRE_IMPL_CONNECTCOUNTER_HPP_ 1
 
 #include <gfcpp/gfcpp_globals.hpp>
 
@@ -36,4 +39,4 @@ class CPPCACHE_EXPORT ConnectCounter {
 }  // namespace geode
 }  // namespace apache
 
-#endif
+#endif // GEODE_CONNECTCOUNTER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/Connector.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/Connector.hpp b/src/cppcache/src/Connector.hpp
index ee470a4..73d23d0 100644
--- a/src/cppcache/src/Connector.hpp
+++ b/src/cppcache/src/Connector.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_CONNECTOR_H_
+#define GEODE_CONNECTOR_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 __CONNECTOR_HPP__
-#define __CONNECTOR_HPP__
 
 #include <gfcpp/gfcpp_globals.hpp>
 #include <gfcpp/ExceptionTypes.hpp>
@@ -105,4 +108,5 @@ class Connector {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __CONNECTOR_HPP__
+
+#endif // GEODE_CONNECTOR_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/CppCacheLibrary.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CppCacheLibrary.hpp b/src/cppcache/src/CppCacheLibrary.hpp
index 8d16687..69521a9 100644
--- a/src/cppcache/src/CppCacheLibrary.hpp
+++ b/src/cppcache/src/CppCacheLibrary.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_CPPCACHELIBRARY_H_
+#define GEODE_CPPCACHELIBRARY_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_CPPCACHELIBRARY_H__
-#define __GEMFIRE_IMPL_CPPCACHELIBRARY_H__
 
 #include <gfcpp/gfcpp_globals.hpp>
 #include <string>
@@ -51,4 +54,4 @@ class CPPCACHE_EXPORT CppCacheLibrary {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __GEMFIRE_IMPL_CPPCACHELIBRARY_H__
+#endif // GEODE_CPPCACHELIBRARY_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/CqAttributesImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CqAttributesImpl.hpp b/src/cppcache/src/CqAttributesImpl.hpp
index 77d6cde..eeb5e9a 100644
--- a/src/cppcache/src/CqAttributesImpl.hpp
+++ b/src/cppcache/src/CqAttributesImpl.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_CQ_ATTRIBUTES_IMPL_H__
-#define __GEMFIRE_CQ_ATTRIBUTES_IMPL_H__
+#pragma once
+
+#ifndef GEODE_CQATTRIBUTESIMPL_H_
+#define GEODE_CQATTRIBUTESIMPL_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -76,4 +79,4 @@ class CPPCACHE_EXPORT CqAttributesImpl : public CqAttributes {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_CQ_ATTRIBUTES_IMPL_H__
+#endif // GEODE_CQATTRIBUTESIMPL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/CqAttributesMutatorImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CqAttributesMutatorImpl.hpp b/src/cppcache/src/CqAttributesMutatorImpl.hpp
index 912c387..5e0b324 100644
--- a/src/cppcache/src/CqAttributesMutatorImpl.hpp
+++ b/src/cppcache/src/CqAttributesMutatorImpl.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_CQ_ATTRIBUTES_MUTATOR_IMPL_H__
-#define __GEMFIRE_CQ_ATTRIBUTES_MUTATOR_IMPL_H__
+#pragma once
+
+#ifndef GEODE_CQATTRIBUTESMUTATORIMPL_H_
+#define GEODE_CQATTRIBUTESMUTATORIMPL_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -79,4 +82,4 @@ class CPPCACHE_EXPORT CqAttributesMutatorImpl : public CqAttributesMutator {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_CQ_ATTRIBUTES_MUTATOR_IMPL_H__
+#endif // GEODE_CQATTRIBUTESMUTATORIMPL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/CqEventImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CqEventImpl.hpp b/src/cppcache/src/CqEventImpl.hpp
index 0e77229..9520695 100644
--- a/src/cppcache/src/CqEventImpl.hpp
+++ b/src/cppcache/src/CqEventImpl.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_CQ_EVENT_IMPL_H__
-#define __GEMFIRE_CQ_EVENT_IMPL_H__
+#pragma once
+
+#ifndef GEODE_CQEVENTIMPL_H_
+#define GEODE_CQEVENTIMPL_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -102,4 +105,4 @@ class CqEventImpl : public CqEvent {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_CQ_EVENT_IMPL_H__
+#endif // GEODE_CQEVENTIMPL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/CqQueryImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CqQueryImpl.hpp b/src/cppcache/src/CqQueryImpl.hpp
index 80b5e4a..123c7c7 100644
--- a/src/cppcache/src/CqQueryImpl.hpp
+++ b/src/cppcache/src/CqQueryImpl.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_CQ_QUERY_IMPL_H__
-#define __GEMFIRE_CQ_QUERY_IMPL_H__
+#pragma once
+
+#ifndef GEODE_CQQUERYIMPL_H_
+#define GEODE_CQQUERYIMPL_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -272,4 +275,4 @@ class CqQueryImpl : public CqQuery {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_CQ_QUERY_IMPL_H__
+#endif // GEODE_CQQUERYIMPL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/CqQueryVsdStats.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CqQueryVsdStats.hpp b/src/cppcache/src/CqQueryVsdStats.hpp
index 979f771..56810cb 100644
--- a/src/cppcache/src/CqQueryVsdStats.hpp
+++ b/src/cppcache/src/CqQueryVsdStats.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_CQQUERYVSDSTATS_H_
+#define GEODE_CQQUERYVSDSTATS_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_CQ_QUERY_STATS_H__
-#define __GEMFIRE_CQ_QUERY_STATS_H__
 
 #include <gfcpp/gfcpp_globals.hpp>
 #include <gfcpp/statistics/Statistics.hpp>
@@ -106,4 +109,4 @@ class CqQueryStatType {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __GEMFIRE_CQ_QUERY_STATS_H__
+#endif // GEODE_CQQUERYVSDSTATS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/CqService.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CqService.hpp b/src/cppcache/src/CqService.hpp
index db9c02b..7d4112b 100644
--- a/src/cppcache/src/CqService.hpp
+++ b/src/cppcache/src/CqService.hpp
@@ -1,5 +1,8 @@
-#ifndef __GEMFIRE_CQ_SERVICE_H__
-#define __GEMFIRE_CQ_SERVICE_H__
+#pragma once
+
+#ifndef GEODE_CQSERVICE_H_
+#define GEODE_CQSERVICE_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -261,4 +264,4 @@ typedef SharedPtr<CqService> CqServicePtr;
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __GEMFIRE_CQ_SERVICE_H__
+#endif // GEODE_CQSERVICE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/CqServiceVsdStats.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CqServiceVsdStats.hpp b/src/cppcache/src/CqServiceVsdStats.hpp
index 1e53f2f..bd5b7eb 100644
--- a/src/cppcache/src/CqServiceVsdStats.hpp
+++ b/src/cppcache/src/CqServiceVsdStats.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_CQSERVICEVSDSTATS_H_
+#define GEODE_CQSERVICEVSDSTATS_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_CQ_SERVICE_STATS_H__
-#define __GEMFIRE_CQ_SERVICE_STATS_H__
-
 #include <gfcpp/gfcpp_globals.hpp>
 #include <gfcpp/statistics/Statistics.hpp>
 #include <gfcpp/statistics/StatisticsFactory.hpp>
@@ -143,4 +145,4 @@ class CqServiceStatType {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __GEMFIRE_CQ_SERVICE_STATS_H__
+#endif // GEODE_CQSERVICEVSDSTATS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/DSMemberForVersionStamp.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/DSMemberForVersionStamp.hpp b/src/cppcache/src/DSMemberForVersionStamp.hpp
index d8545a9..ee9c2a2 100644
--- a/src/cppcache/src/DSMemberForVersionStamp.hpp
+++ b/src/cppcache/src/DSMemberForVersionStamp.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_DSMEMBERFORVERSIONSTAMP_H_
+#define GEODE_DSMEMBERFORVERSIONSTAMP_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 __DSMemberForVersionStamp_HPP__
-#define __DSMemberForVersionStamp_HPP__
 
 #include <gfcpp/gfcpp_globals.hpp>
 #include <gfcpp/CacheableKey.hpp>
@@ -43,4 +46,5 @@ class DSMemberForVersionStamp : public CacheableKey {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __DSMemberForVersionStamp_HPP__
+
+#endif // GEODE_DSMEMBERFORVERSIONSTAMP_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/DiffieHellman.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/DiffieHellman.hpp b/src/cppcache/src/DiffieHellman.hpp
index 0ae6719..9dd990c 100644
--- a/src/cppcache/src/DiffieHellman.hpp
+++ b/src/cppcache/src/DiffieHellman.hpp
@@ -1,5 +1,8 @@
-#ifndef __DIFFIEHELLMAN__
-#define __DIFFIEHELLMAN__
+#pragma once
+
+#ifndef GEODE_DIFFIEHELLMAN_H_
+#define GEODE_DIFFIEHELLMAN_H_
+
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -109,4 +112,5 @@ class DiffieHellman {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __DIFFIEHELLMAN__
+
+#endif // GEODE_DIFFIEHELLMAN_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/DiskStoreId.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/DiskStoreId.hpp b/src/cppcache/src/DiskStoreId.hpp
index 50bac61..d85cf98 100644
--- a/src/cppcache/src/DiskStoreId.hpp
+++ b/src/cppcache/src/DiskStoreId.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_DISKSTOREID_H_
+#define GEODE_DISKSTOREID_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 __DiskStoreId_HPP__
-#define __DiskStoreId_HPP__
 
 #include <gfcpp/gfcpp_globals.hpp>
 #include <gfcpp/DataInput.hpp>
@@ -111,4 +114,5 @@ class DiskStoreId : public DSMemberForVersionStamp {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __DiskStoreId_HPP__
+
+#endif // GEODE_DISKSTOREID_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/DiskVersionTag.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/DiskVersionTag.hpp b/src/cppcache/src/DiskVersionTag.hpp
index bbf2145..bf863bd 100644
--- a/src/cppcache/src/DiskVersionTag.hpp
+++ b/src/cppcache/src/DiskVersionTag.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_DISKVERSIONTAG_H_
+#define GEODE_DISKVERSIONTAG_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 __DISKVERSIONTAG_HPP__
-#define __DISKVERSIONTAG_HPP__
 
 #include "VersionTag.hpp"
 #include "GeodeTypeIdsImpl.hpp"
@@ -78,4 +81,5 @@ class DiskVersionTag : public VersionTag {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __DISKVERSIONTAG_HPP__
+
+#endif // GEODE_DISKVERSIONTAG_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/DistributedSystemImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/DistributedSystemImpl.hpp b/src/cppcache/src/DistributedSystemImpl.hpp
index 4b7ecb3..15fed6b 100644
--- a/src/cppcache/src/DistributedSystemImpl.hpp
+++ b/src/cppcache/src/DistributedSystemImpl.hpp
@@ -1,5 +1,8 @@
-#ifndef __IMPL_DISTRIBUTEDSYSTEM_H__
-#define __IMPL_DISTRIBUTEDSYSTEM_H__
+#pragma once
+
+#ifndef GEODE_DISTRIBUTEDSYSTEMIMPL_H_
+#define GEODE_DISTRIBUTEDSYSTEMIMPL_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -138,4 +141,5 @@ class CPPCACHE_EXPORT DistributedSystemImpl : public SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ifndef __IMPL_DISTRIBUTEDSYSTEM_H__
+
+#endif // GEODE_DISTRIBUTEDSYSTEMIMPL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/EntriesMap.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/EntriesMap.hpp b/src/cppcache/src/EntriesMap.hpp
index 026fc12..32c0142 100644
--- a/src/cppcache/src/EntriesMap.hpp
+++ b/src/cppcache/src/EntriesMap.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_ENTRIESMAP_H_
+#define GEODE_ENTRIESMAP_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_ENTRIESMAP_H__
-#define __GEMFIRE_IMPL_ENTRIESMAP_H__
 
 // This needs to be ace free so that the region can include it.
 
@@ -175,4 +178,4 @@ class CPPCACHE_EXPORT EntriesMap {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __GEMFIRE_IMPL_ENTRIESMAP_H__
+#endif // GEODE_ENTRIESMAP_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/EntriesMapFactory.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/EntriesMapFactory.hpp b/src/cppcache/src/EntriesMapFactory.hpp
index 38adbda..75168ff 100644
--- a/src/cppcache/src/EntriesMapFactory.hpp
+++ b/src/cppcache/src/EntriesMapFactory.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_ENTRIESMAPFACTORY_H_
+#define GEODE_ENTRIESMAPFACTORY_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_ENTRIESMAPFACTORY_H__
-#define __GEMFIRE_IMPL_ENTRIESMAPFACTORY_H__
 
 #include <gfcpp/gfcpp_globals.hpp>
 #include "EntriesMap.hpp"
@@ -42,4 +45,4 @@ class CPPCACHE_EXPORT EntriesMapFactory {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __GEMFIRE_IMPL_ENTRIESMAPFACTORY_H__
+#endif // GEODE_ENTRIESMAPFACTORY_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/EntryExpiryHandler.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/EntryExpiryHandler.hpp b/src/cppcache/src/EntryExpiryHandler.hpp
index f63053c..cdecccb 100644
--- a/src/cppcache/src/EntryExpiryHandler.hpp
+++ b/src/cppcache/src/EntryExpiryHandler.hpp
@@ -1,5 +1,8 @@
-#ifndef _GEMFIRE_ENTRYEXPIRYTASK_H__
-#define _GEMFIRE_ENTRYEXPIRYTASK_H__
+#pragma once
+
+#ifndef GEODE_ENTRYEXPIRYHANDLER_H_
+#define GEODE_ENTRYEXPIRYHANDLER_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -73,4 +76,5 @@ class CPPCACHE_EXPORT EntryExpiryHandler : public ACE_Event_Handler {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // ifndef _GEMFIRE_ENTRYEXPIRYTASK_H__
+
+#endif // GEODE_ENTRYEXPIRYHANDLER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/EnumInfo.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/EnumInfo.hpp b/src/cppcache/src/EnumInfo.hpp
index 7c237a5..4cf6ab7 100644
--- a/src/cppcache/src/EnumInfo.hpp
+++ b/src/cppcache/src/EnumInfo.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_ENUMINFO_H_
+#define GEODE_ENUMINFO_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 ENUM_INFO_HPP
-#define ENUM_INFO_HPP
 
 #include <gfcpp/GeodeTypeIds.hpp>
 #include <gfcpp/CacheableString.hpp>
@@ -63,4 +66,5 @@ typedef SharedPtr<EnumInfo> EnumInfoPtr;
 }  // namespace geode
 }  // namespace apache
 
-#endif  // ENUM_INFO_HPP
+
+#endif // GEODE_ENUMINFO_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/EventId.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/EventId.hpp b/src/cppcache/src/EventId.hpp
index cafb134..e5af89b 100644
--- a/src/cppcache/src/EventId.hpp
+++ b/src/cppcache/src/EventId.hpp
@@ -1,5 +1,8 @@
-#ifndef _GEMFIRE_EVENTID_HPP_
-#define _GEMFIRE_EVENTID_HPP_
+#pragma once
+
+#ifndef GEODE_EVENTID_H_
+#define GEODE_EVENTID_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -151,4 +154,4 @@ class CPPCACHE_EXPORT EventId : public Cacheable {
 }  // namespace geode
 }  // namespace apache
 
-#endif  //_GEMFIRE_EVENTID_HPP_
+#endif // GEODE_EVENTID_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/EventIdMap.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/EventIdMap.hpp b/src/cppcache/src/EventIdMap.hpp
index 7452935..a0faa33 100644
--- a/src/cppcache/src/EventIdMap.hpp
+++ b/src/cppcache/src/EventIdMap.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_EVENTIDMAP_H_
+#define GEODE_EVENTIDMAP_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 __EVENT_ID_MAP_HPP__
-#define __EVENT_ID_MAP_HPP__
 
 #include <ace/ACE.h>
 #include <ace/Time_Value.h>
@@ -200,4 +203,5 @@ class CPPCACHE_EXPORT EventSequence : public SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __EVENT_ID_MAP_HPP__
+
+#endif // GEODE_EVENTIDMAP_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/8b53f0a1/src/cppcache/src/EventType.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/EventType.hpp b/src/cppcache/src/EventType.hpp
index 8463da0..8892732 100644
--- a/src/cppcache/src/EventType.hpp
+++ b/src/cppcache/src/EventType.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_EVENTTYPE_H_
+#define GEODE_EVENTTYPE_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 _EVENTTYPE_H__
-#define _EVENTTYPE_H__
 
 namespace apache {
 namespace geode {
@@ -43,4 +46,5 @@ enum RegionEventType {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // _EVENTTYPE_H__
+
+#endif // GEODE_EVENTTYPE_H_


Mime
View raw message