geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aba...@apache.org
Subject [1/6] geode git commit: GEODE-2411: Remove references to Gemfire from include guards.
Date Tue, 07 Feb 2017 23:53:25 GMT
Repository: geode
Updated Branches:
  refs/heads/next-gen-native-client-software-grant 75b7d9268 -> 8b53f0a16


http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/fwk/UdpIpc.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwk/UdpIpc.hpp b/src/tests/cpp/fwk/UdpIpc.hpp
index fb31216..384052c 100644
--- a/src/tests/cpp/fwk/UdpIpc.hpp
+++ b/src/tests/cpp/fwk/UdpIpc.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_ebe55397742f4c3cb6d6e6eaf7338769
+#define APACHE_GEODE_GUARD_ebe55397742f4c3cb6d6e6eaf7338769
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -25,8 +30,6 @@
 
 // ----------------------------------------------------------------------------
 
-#ifndef __UDPIPC_HPP__
-#define __UDPIPC_HPP__
 
 // ----------------------------------------------------------------------------
 #include <gfcpp/GeodeCppCache.hpp>
@@ -88,4 +91,5 @@ class TestProcessor : public ServiceTask {
 }  // namespace apache
 // ----------------------------------------------------------------------------
 
-#endif  // __UDPIPC_HPP__
+
+#endif // APACHE_GEODE_GUARD_ebe55397742f4c3cb6d6e6eaf7338769

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/fwklib/ClientTask.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/ClientTask.hpp b/src/tests/cpp/fwklib/ClientTask.hpp
index a90e6af..54071e9 100644
--- a/src/tests/cpp/fwklib/ClientTask.hpp
+++ b/src/tests/cpp/fwklib/ClientTask.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_27b17454dd8037d9589090f2615d5988
+#define APACHE_GEODE_GUARD_27b17454dd8037d9589090f2615d5988
+
 /*
  * 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 __ClientTask_hpp__
-#define __ClientTask_hpp__
 
 #include <gfcpp/GeodeCppCache.hpp>
 #include <AtomicInc.hpp>
@@ -158,4 +161,5 @@ class ThreadedTask : public ClientTask {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __ClientTask_hpp__
+
+#endif // APACHE_GEODE_GUARD_27b17454dd8037d9589090f2615d5988

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/fwklib/FrameworkTest.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/FrameworkTest.hpp b/src/tests/cpp/fwklib/FrameworkTest.hpp
index 80cf246..08f533b 100644
--- a/src/tests/cpp/fwklib/FrameworkTest.hpp
+++ b/src/tests/cpp/fwklib/FrameworkTest.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_785ebc022f46abcb7ea497df264a48ae
+#define APACHE_GEODE_GUARD_785ebc022f46abcb7ea497df264a48ae
+
 /*
  * 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 __FrameworkTest_hpp__
-#define __FrameworkTest_hpp__
 
 #include "fwklib/TimeSync.hpp"
 #include "fwklib/ClientTask.hpp"
@@ -278,4 +281,5 @@ class FrameworkTest  // Base class all test classes written for xml testing
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // __FrameworkTest_hpp__
+
+#endif // APACHE_GEODE_GUARD_785ebc022f46abcb7ea497df264a48ae

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/fwklib/FwkBB.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/FwkBB.hpp b/src/tests/cpp/fwklib/FwkBB.hpp
index a353c6d..638bb97 100644
--- a/src/tests/cpp/fwklib/FwkBB.hpp
+++ b/src/tests/cpp/fwklib/FwkBB.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_e4048febbad0240d5090fde0a083a7ac
+#define APACHE_GEODE_GUARD_e4048febbad0240d5090fde0a083a7ac
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -22,8 +27,6 @@
   * @see
   */
 
-#ifndef __FWK_BB_HPP__
-#define __FWK_BB_HPP__
 
 #include <gfcpp/gf_base.hpp>
 #include "fwklib/FwkLog.hpp"
@@ -230,4 +233,5 @@ class FwkBBMessage {
 
 // ----------------------------------------------------------------------------
 
-#endif  // __FWK_BB_HPP__
+
+#endif // APACHE_GEODE_GUARD_e4048febbad0240d5090fde0a083a7ac

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/fwklib/FwkBBClient.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/FwkBBClient.hpp b/src/tests/cpp/fwklib/FwkBBClient.hpp
index 527b96c..bfc0c54 100644
--- a/src/tests/cpp/fwklib/FwkBBClient.hpp
+++ b/src/tests/cpp/fwklib/FwkBBClient.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_8443d3966c0b05a9e05eafa7ca28e4c7
+#define APACHE_GEODE_GUARD_8443d3966c0b05a9e05eafa7ca28e4c7
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -22,8 +27,6 @@
   * @see
   */
 
-#ifndef __FWK_BB_CLIENT_HPP__
-#define __FWK_BB_CLIENT_HPP__
 
 #include "FwkBB.hpp"
 #include "UDPIpc.hpp"
@@ -187,4 +190,5 @@ class FwkBBClient {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __FWK_BB_CLIENT_HPP__
+
+#endif // APACHE_GEODE_GUARD_8443d3966c0b05a9e05eafa7ca28e4c7

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/fwklib/FwkBBServer.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/FwkBBServer.hpp b/src/tests/cpp/fwklib/FwkBBServer.hpp
index 56f8f89..f108700 100644
--- a/src/tests/cpp/fwklib/FwkBBServer.hpp
+++ b/src/tests/cpp/fwklib/FwkBBServer.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_bb6131bfb60de61fcfc2f40301c3f02c
+#define APACHE_GEODE_GUARD_bb6131bfb60de61fcfc2f40301c3f02c
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -22,8 +27,6 @@
   * @see
   */
 
-#ifndef __FWK_BB_SERVER_HPP__
-#define __FWK_BB_SERVER_HPP__
 
 #include "FwkBB.hpp"
 #include "UDPIpc.hpp"
@@ -222,4 +225,5 @@ class BBProcessor : public ServiceTask {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __FWK_BB_SERVER_HPP__
+
+#endif // APACHE_GEODE_GUARD_bb6131bfb60de61fcfc2f40301c3f02c

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/fwklib/FwkException.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/FwkException.hpp b/src/tests/cpp/fwklib/FwkException.hpp
index 07689d4..ded470c 100644
--- a/src/tests/cpp/fwklib/FwkException.hpp
+++ b/src/tests/cpp/fwklib/FwkException.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_43257b24105ffca3ff3bd16dc0cd17d2
+#define APACHE_GEODE_GUARD_43257b24105ffca3ff3bd16dc0cd17d2
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -25,8 +30,6 @@
 
 // ----------------------------------------------------------------------------
 
-#ifndef __FWKEXCEPTION_HPP__
-#define __FWKEXCEPTION_HPP__
 
 #include <string>
 
@@ -66,4 +69,5 @@ class FwkException {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __FWKEXCEPTION_HPP__
+
+#endif // APACHE_GEODE_GUARD_43257b24105ffca3ff3bd16dc0cd17d2

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/fwklib/FwkExport.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/FwkExport.hpp b/src/tests/cpp/fwklib/FwkExport.hpp
index 0b60534..4f60be4 100644
--- a/src/tests/cpp/fwklib/FwkExport.hpp
+++ b/src/tests/cpp/fwklib/FwkExport.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_dd058cd17302e55845b453e0c42c27c9
+#define APACHE_GEODE_GUARD_dd058cd17302e55845b453e0c42c27c9
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -29,3 +34,5 @@
 #define TESTTASK extern "C" int32_t
 #define TEST_EXPORT extern "C"
 #endif
+
+#endif // APACHE_GEODE_GUARD_dd058cd17302e55845b453e0c42c27c9

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/fwklib/FwkLog.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/FwkLog.hpp b/src/tests/cpp/fwklib/FwkLog.hpp
index c0f4de7..c90fb87 100644
--- a/src/tests/cpp/fwklib/FwkLog.hpp
+++ b/src/tests/cpp/fwklib/FwkLog.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_09e162ef70ce6628f1f097a2c0333b34
+#define APACHE_GEODE_GUARD_09e162ef70ce6628f1f097a2c0333b34
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -25,8 +30,6 @@
 
 // ----------------------------------------------------------------------------
 
-#ifndef __FWK_LOG_HPP__
-#define __FWK_LOG_HPP__
 
 #include <gfcpp/gf_base.hpp>
 
@@ -123,4 +126,5 @@ const char* getNodeName();
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __FWK_LOG_HPP__
+
+#endif // APACHE_GEODE_GUARD_09e162ef70ce6628f1f097a2c0333b34

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/fwklib/FwkObjects.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/FwkObjects.hpp b/src/tests/cpp/fwklib/FwkObjects.hpp
index 449e741..39be171 100644
--- a/src/tests/cpp/fwklib/FwkObjects.hpp
+++ b/src/tests/cpp/fwklib/FwkObjects.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_e9a3be6b0d737dd314e3ec4bc3a93eba
+#define APACHE_GEODE_GUARD_e9a3be6b0d737dd314e3ec4bc3a93eba
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -24,8 +29,6 @@
 
 // ----------------------------------------------------------------------------
 
-#ifndef __FWK_OBJECTS_HPP__
-#define __FWK_OBJECTS_HPP__
 
 #include <gfcpp/Properties.hpp>
 #include <gfcpp/ExpirationAction.hpp>
@@ -1617,4 +1620,5 @@ class TestDriver {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __FWK_OBJECTS_HPP__
+
+#endif // APACHE_GEODE_GUARD_e9a3be6b0d737dd314e3ec4bc3a93eba

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/fwklib/FwkStrCvt.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/FwkStrCvt.hpp b/src/tests/cpp/fwklib/FwkStrCvt.hpp
index 1998ce2..8e19d10 100644
--- a/src/tests/cpp/fwklib/FwkStrCvt.hpp
+++ b/src/tests/cpp/fwklib/FwkStrCvt.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_596076185d7a905f2040a9113cab41f2
+#define APACHE_GEODE_GUARD_596076185d7a905f2040a9113cab41f2
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -25,8 +30,6 @@
 
 // ----------------------------------------------------------------------------
 
-#ifndef __FWK_STR_CVT_HPP__
-#define __FWK_STR_CVT_HPP__
 
 #include "config.h"
 #include <gfcpp/gfcpp_globals.hpp>
@@ -348,4 +351,5 @@ class FwkStrCvt {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __FWK_STR_CVT_HPP__
+
+#endif // APACHE_GEODE_GUARD_596076185d7a905f2040a9113cab41f2

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/fwklib/GsRandom.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/GsRandom.hpp b/src/tests/cpp/fwklib/GsRandom.hpp
index 776b0d4..059e7d1 100644
--- a/src/tests/cpp/fwklib/GsRandom.hpp
+++ b/src/tests/cpp/fwklib/GsRandom.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_07015f9e9a2d1cdc790e5e202a3742fe
+#define APACHE_GEODE_GUARD_07015f9e9a2d1cdc790e5e202a3742fe
+
 /*
  * 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 __GS_RANDOM_HPP__
-#define __GS_RANDOM_HPP__
 
 #include <gfcpp/gf_base.hpp>
 
@@ -234,4 +237,5 @@ class GsRandom {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // __GS_RANDOM_HPP__
+
+#endif // APACHE_GEODE_GUARD_07015f9e9a2d1cdc790e5e202a3742fe

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/fwklib/IpcHandler.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/IpcHandler.hpp b/src/tests/cpp/fwklib/IpcHandler.hpp
index fec25cd..3cf46f1 100644
--- a/src/tests/cpp/fwklib/IpcHandler.hpp
+++ b/src/tests/cpp/fwklib/IpcHandler.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_450b17d5d954d8270b6906f1510c355c
+#define APACHE_GEODE_GUARD_450b17d5d954d8270b6906f1510c355c
+
 /*
  * 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 __IpcHandler_hpp__
-#define __IpcHandler_hpp__
 
 #include <ace/SOCK_Stream.h>
 #include <ace/OS.h>
@@ -85,4 +88,5 @@ class IpcHandler {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __IpcHandler_hpp__
+
+#endif // APACHE_GEODE_GUARD_450b17d5d954d8270b6906f1510c355c

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/fwklib/MersenneTwister.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/MersenneTwister.hpp b/src/tests/cpp/fwklib/MersenneTwister.hpp
index b4f89cf..c30b1dc 100644
--- a/src/tests/cpp/fwklib/MersenneTwister.hpp
+++ b/src/tests/cpp/fwklib/MersenneTwister.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_2cbb06e4c156792558ba80dbf0fbc5e9
+#define APACHE_GEODE_GUARD_2cbb06e4c156792558ba80dbf0fbc5e9
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -71,8 +76,6 @@
 // It would be nice to CC: rjwagner@writeme.com and Cokus@math.washington.edu
 // when you write.
 
-#ifndef MERSENNETWISTER_H
-#define MERSENNETWISTER_H
 
 // Not thread safe (unless auto-initialization is avoided and each thread has
 // its own MTRand object)
@@ -158,8 +161,6 @@ class MTRand {
   static uint32_t hash(time_t t, clock_t c);
 };
 
-#endif  // MERSENNETWISTER_H
-
 // Change log:
 //
 // v0.1 - First release on 15 May 2000
@@ -199,3 +200,5 @@ class MTRand {
 //      - Fixed out-of-range number generation on 64-bit machines
 //      - Improved portability by substituting literal constants for long enum's
 //      - Changed license from GNU LGPL to BSD
+
+#endif // APACHE_GEODE_GUARD_2cbb06e4c156792558ba80dbf0fbc5e9

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/fwklib/PaceMeter.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/PaceMeter.hpp b/src/tests/cpp/fwklib/PaceMeter.hpp
index 2bf7036..dbe970c 100644
--- a/src/tests/cpp/fwklib/PaceMeter.hpp
+++ b/src/tests/cpp/fwklib/PaceMeter.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_0b9b6fa2558c2b1a9cd9f073630e90aa
+#define APACHE_GEODE_GUARD_0b9b6fa2558c2b1a9cd9f073630e90aa
+
 /*
  * 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 __PaceMeter_hpp__
-#define __PaceMeter_hpp__
 
 #include "fwklib/FwkLog.hpp"
 #include <ace/Time_Value.h>
@@ -129,4 +132,5 @@ class PaceMeter {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __PaceMeter_hpp__
+
+#endif // APACHE_GEODE_GUARD_0b9b6fa2558c2b1a9cd9f073630e90aa

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/fwklib/PerfFwk.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/PerfFwk.hpp b/src/tests/cpp/fwklib/PerfFwk.hpp
index ce7a6b2..be2433a 100644
--- a/src/tests/cpp/fwklib/PerfFwk.hpp
+++ b/src/tests/cpp/fwklib/PerfFwk.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_72e4dc209ca3876b269e52c8a14f412b
+#define APACHE_GEODE_GUARD_72e4dc209ca3876b269e52c8a14f412b
+
 /*
  * 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 __PerfFwk_hpp__
-#define __PerfFwk_hpp__
 
 #include <gfcpp/gf_base.hpp>
 
@@ -333,4 +336,5 @@ class Counter {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __PerfFwk_hpp__
+
+#endif // APACHE_GEODE_GUARD_72e4dc209ca3876b269e52c8a14f412b

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/fwklib/PoolHelper.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/PoolHelper.hpp b/src/tests/cpp/fwklib/PoolHelper.hpp
index 104f68c..4c00c5b 100644
--- a/src/tests/cpp/fwklib/PoolHelper.hpp
+++ b/src/tests/cpp/fwklib/PoolHelper.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_b2a51368e1c04b7833061e32a761f2df
+#define APACHE_GEODE_GUARD_b2a51368e1c04b7833061e32a761f2df
+
 /*
  * 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 __POOL_HELPER_HPP__
-#define __POOL_HELPER_HPP__
 
 #include <gfcpp/GeodeCppCache.hpp>
 #include <AtomicInc.hpp>
@@ -147,4 +150,5 @@ class PoolHelper {
 
 // ----------------------------------------------------------------------------
 
-#endif  // __POOL_HELPER_HPP__
+
+#endif // APACHE_GEODE_GUARD_b2a51368e1c04b7833061e32a761f2df

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/fwklib/QueryHelper.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/QueryHelper.hpp b/src/tests/cpp/fwklib/QueryHelper.hpp
index f8f9d5c..f55566d 100644
--- a/src/tests/cpp/fwklib/QueryHelper.hpp
+++ b/src/tests/cpp/fwklib/QueryHelper.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_f57a1f9a1b1286d041f077ee231e8637
+#define APACHE_GEODE_GUARD_f57a1f9a1b1286d041f077ee231e8637
+
 /*
  * 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_QUERYHELPER_HPP
-#define TEST_QUERYHELPER_HPP
 
 #include <gfcpp/GeodeCppCache.hpp>
 #include <stdlib.h>
@@ -1148,4 +1151,5 @@ bool QueryHelper::verifySS(SelectResultsPtr& structSet, int expectedRows,
   return false;
 }
 
-#endif  // TEST_QUERYHELPER_HPP
+
+#endif // APACHE_GEODE_GUARD_f57a1f9a1b1286d041f077ee231e8637

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/fwklib/RegionHelper.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/RegionHelper.hpp b/src/tests/cpp/fwklib/RegionHelper.hpp
index 34841df..a62d5c5 100644
--- a/src/tests/cpp/fwklib/RegionHelper.hpp
+++ b/src/tests/cpp/fwklib/RegionHelper.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_ecbb34b204212c99ce0936eb50297d23
+#define APACHE_GEODE_GUARD_ecbb34b204212c99ce0936eb50297d23
+
 /*
  * 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 __REGION_HELPER_HPP__
-#define __REGION_HELPER_HPP__
 
 #include <gfcpp/GeodeCppCache.hpp>
 #include <AtomicInc.hpp>
@@ -258,4 +261,5 @@ class RegionHelper {
 
 // ----------------------------------------------------------------------------
 
-#endif  // __REGION_HELPER_HPP__
+
+#endif // APACHE_GEODE_GUARD_ecbb34b204212c99ce0936eb50297d23

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/fwklib/Service.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/Service.hpp b/src/tests/cpp/fwklib/Service.hpp
index 132d066..a6b4b8f 100644
--- a/src/tests/cpp/fwklib/Service.hpp
+++ b/src/tests/cpp/fwklib/Service.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_6024bf86dd8d0d4aad8f988f5ba1655a
+#define APACHE_GEODE_GUARD_6024bf86dd8d0d4aad8f988f5ba1655a
+
 /*
  * 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 __Service_hpp__
-#define __Service_hpp__
 
 #include <gfcpp/gf_base.hpp>
 #include <AtomicInc.hpp>
@@ -163,4 +166,5 @@ class IPCMessage {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // __Service_hpp__
+
+#endif // APACHE_GEODE_GUARD_6024bf86dd8d0d4aad8f988f5ba1655a

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/fwklib/TaskClient.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/TaskClient.hpp b/src/tests/cpp/fwklib/TaskClient.hpp
index 787a916..9008293 100644
--- a/src/tests/cpp/fwklib/TaskClient.hpp
+++ b/src/tests/cpp/fwklib/TaskClient.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_a7058f04d2a065ec8cd9179a5349a649
+#define APACHE_GEODE_GUARD_a7058f04d2a065ec8cd9179a5349a649
+
 /*
  * 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 __TaskClient_hpp__
-#define __TaskClient_hpp__
 
 #include "PerfFwk.hpp"
 #include "FwkLog.hpp"
@@ -182,4 +185,5 @@ class TaskClient : public ACE_Task_Base {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __TaskClient_hpp__
+
+#endif // APACHE_GEODE_GUARD_a7058f04d2a065ec8cd9179a5349a649

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/fwklib/TcpIpc.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/TcpIpc.hpp b/src/tests/cpp/fwklib/TcpIpc.hpp
index 03422d1..5330e69 100644
--- a/src/tests/cpp/fwklib/TcpIpc.hpp
+++ b/src/tests/cpp/fwklib/TcpIpc.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_7dbd8fa103bfe69138e0b0571a737c9c
+#define APACHE_GEODE_GUARD_7dbd8fa103bfe69138e0b0571a737c9c
+
 /*
  * 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 __TcpIpc_hpp__
-#define __TcpIpc_hpp__
 
 #include <gfcpp/gf_base.hpp>
 #include <ace/SOCK_Stream.h>
@@ -73,4 +76,5 @@ class TcpIpc {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __TcpIpc_hpp__
+
+#endif // APACHE_GEODE_GUARD_7dbd8fa103bfe69138e0b0571a737c9c

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/fwklib/TestClient.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/TestClient.hpp b/src/tests/cpp/fwklib/TestClient.hpp
index 707a651..4f1258b 100644
--- a/src/tests/cpp/fwklib/TestClient.hpp
+++ b/src/tests/cpp/fwklib/TestClient.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_b1ca2169435caedbb3e0ccb04094fb46
+#define APACHE_GEODE_GUARD_b1ca2169435caedbb3e0ccb04094fb46
+
 /*
  * 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 __TestClient_hpp__
-#define __TestClient_hpp__
 
 #include "fwklib/PerfFwk.hpp"
 #include "fwklib/ClientTask.hpp"
@@ -117,4 +120,5 @@ class TestClient : public ACE_Task_Base {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // __TestClient_hpp__
+
+#endif // APACHE_GEODE_GUARD_b1ca2169435caedbb3e0ccb04094fb46

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/fwklib/TimeBomb.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/TimeBomb.hpp b/src/tests/cpp/fwklib/TimeBomb.hpp
index 6d8a284..4819f23 100644
--- a/src/tests/cpp/fwklib/TimeBomb.hpp
+++ b/src/tests/cpp/fwklib/TimeBomb.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_79d494cc4b256bbd77fabec6e825390a
+#define APACHE_GEODE_GUARD_79d494cc4b256bbd77fabec6e825390a
+
 /*
  * 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 __TimeBomb_hpp__
-#define __TimeBomb_hpp__
 
 #include "fwklib/PerfFwk.hpp"
 #include "fwklib/FwkLog.hpp"
@@ -81,4 +84,5 @@ class TimeBomb : public ACE_Task_Base {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // __TimeBomb_hpp__
+
+#endif // APACHE_GEODE_GUARD_79d494cc4b256bbd77fabec6e825390a

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/fwklib/TimeLimit.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/TimeLimit.hpp b/src/tests/cpp/fwklib/TimeLimit.hpp
index 33dad8c..5a2c100 100644
--- a/src/tests/cpp/fwklib/TimeLimit.hpp
+++ b/src/tests/cpp/fwklib/TimeLimit.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_1628cb6366f926a3cac7309d67d1a4d7
+#define APACHE_GEODE_GUARD_1628cb6366f926a3cac7309d67d1a4d7
+
 /*
  * 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 __TimeLimit_hpp__
-#define __TimeLimit_hpp__
 
 #include "fwklib/FwkLog.hpp"
 #include <ace/Time_Value.h>
@@ -49,4 +52,5 @@ class TimeLimit {
 }
 }
 
-#endif  // __TimeLimit_hpp__
+
+#endif // APACHE_GEODE_GUARD_1628cb6366f926a3cac7309d67d1a4d7

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/fwklib/TimeSync.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/TimeSync.hpp b/src/tests/cpp/fwklib/TimeSync.hpp
index a5809af..40b1766 100644
--- a/src/tests/cpp/fwklib/TimeSync.hpp
+++ b/src/tests/cpp/fwklib/TimeSync.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_b6cf051f15f6d158175a22b44bbe4b98
+#define APACHE_GEODE_GUARD_b6cf051f15f6d158175a22b44bbe4b98
+
 /*
  * 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 __TimeSync_hpp__
-#define __TimeSync_hpp__
 
 #include "fwklib/PerfFwk.hpp"
 
@@ -90,4 +93,5 @@ class TimeSync : public ACE_Task_Base {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  // __TimeSync_hpp__
+
+#endif // APACHE_GEODE_GUARD_b6cf051f15f6d158175a22b44bbe4b98

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/fwklib/Timer.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/Timer.hpp b/src/tests/cpp/fwklib/Timer.hpp
index 2447ee4..8e7e795 100644
--- a/src/tests/cpp/fwklib/Timer.hpp
+++ b/src/tests/cpp/fwklib/Timer.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_8d07450f18b766edac2c13c91b9680d4
+#define APACHE_GEODE_GUARD_8d07450f18b766edac2c13c91b9680d4
+
 /*
  * 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 __Timer_hpp__
-#define __Timer_hpp__
 
 #include <gfcpp/gf_base.hpp>
 #include "fwklib/FwkLog.hpp"
@@ -177,4 +180,5 @@ class HRTimer {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __Timer_hpp__
+
+#endif // APACHE_GEODE_GUARD_8d07450f18b766edac2c13c91b9680d4

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/fwklib/UDPIpc.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/UDPIpc.hpp b/src/tests/cpp/fwklib/UDPIpc.hpp
index 28060a5..775defc 100644
--- a/src/tests/cpp/fwklib/UDPIpc.hpp
+++ b/src/tests/cpp/fwklib/UDPIpc.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_31f0c15c526e6fca1c0825a818e204d4
+#define APACHE_GEODE_GUARD_31f0c15c526e6fca1c0825a818e204d4
+
 /*
  * 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 __UDPIpc_hpp__
-#define __UDPIpc_hpp__
 
 #include "Service.hpp"
 #include "PerfFwk.hpp"
@@ -295,4 +298,5 @@ class Responder : public ServiceTask {
 }  // namespace geode
 }  // namespace apache
 
-#endif  // __UDPIpc_hpp__
+
+#endif // APACHE_GEODE_GUARD_31f0c15c526e6fca1c0825a818e204d4

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/pdxautoserializerclass/AutoPdxVersioned1.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/pdxautoserializerclass/AutoPdxVersioned1.hpp b/src/tests/cpp/pdxautoserializerclass/AutoPdxVersioned1.hpp
index 3963d52..b8b89f5 100644
--- a/src/tests/cpp/pdxautoserializerclass/AutoPdxVersioned1.hpp
+++ b/src/tests/cpp/pdxautoserializerclass/AutoPdxVersioned1.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_9b6d34ac32115700916ecb8e4bf0d825
+#define APACHE_GEODE_GUARD_9b6d34ac32115700916ecb8e4bf0d825
+
 /*
  * 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 __AUTOPDXVERSIONED1OBJECT_HPP__
-#define __AUTOPDXVERSIONED1OBJECT_HPP__
 
 #include <gfcpp/PdxSerializable.hpp>
 #include <gfcpp/GeodeCppCache.hpp>
@@ -371,4 +374,5 @@ class GFIGNORE(TESTOBJECT_EXPORT) NestedPdx : public PdxSerializable {
 };
 typedef SharedPtr<NestedPdx> NestedPdxPtr;
 }  // namespace AutoPdxTests
-#endif /* __AUTOPDXVERSIONED1OBJECT_HPP__ */
+
+#endif // APACHE_GEODE_GUARD_9b6d34ac32115700916ecb8e4bf0d825

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/pdxautoserializerclass/AutoPdxVersioned2.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/pdxautoserializerclass/AutoPdxVersioned2.hpp b/src/tests/cpp/pdxautoserializerclass/AutoPdxVersioned2.hpp
index 04f96b7..d091278 100644
--- a/src/tests/cpp/pdxautoserializerclass/AutoPdxVersioned2.hpp
+++ b/src/tests/cpp/pdxautoserializerclass/AutoPdxVersioned2.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_6e3336d3474c5bad468aecf72316fc4b
+#define APACHE_GEODE_GUARD_6e3336d3474c5bad468aecf72316fc4b
+
 /*
  * 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 __AUTOPDXVERSIONED2OBJECT_HPP__
-#define __AUTOPDXVERSIONED2OBJECT_HPP__
 
 #include <gfcpp/PdxSerializable.hpp>
 #include <gfcpp/GeodeCppCache.hpp>
@@ -269,4 +272,5 @@ class GFIGNORE(TESTOBJECT_EXPORT) AutoPdxVersioned2 : public PdxSerializable {
 };
 typedef SharedPtr<AutoPdxTests::AutoPdxVersioned2> AutoPdxVersioned2Ptr;
 }  // namespace AutoPdxTests
-#endif /* __AUTOPDXVERSIONED2OBJECT_HPP__ */
+
+#endif // APACHE_GEODE_GUARD_6e3336d3474c5bad468aecf72316fc4b

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/pdxautoserializerclass/PortfolioPdx.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/pdxautoserializerclass/PortfolioPdx.hpp b/src/tests/cpp/pdxautoserializerclass/PortfolioPdx.hpp
index 921b352..182d70b 100644
--- a/src/tests/cpp/pdxautoserializerclass/PortfolioPdx.hpp
+++ b/src/tests/cpp/pdxautoserializerclass/PortfolioPdx.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_115ad9fa08f9b8368045cfda498ff99b
+#define APACHE_GEODE_GUARD_115ad9fa08f9b8368045cfda498ff99b
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -19,8 +24,6 @@
  * @brief User class for testing the put functionality for object.
  */
 
-#ifndef __AutoPORTFOLIOPDX_HPP__
-#define __AutoPORTFOLIOPDX_HPP__
 
 #include "PositionPdx.hpp"
 #define GFIGNORE(X) X
@@ -110,4 +113,5 @@ class GFIGNORE(TESTOBJECT_EXPORT) PortfolioPdx : public PdxSerializable {
 
 typedef SharedPtr<PortfolioPdx> PortfolioPdxPtr;
 }  // namespace AutoPdxTests
-#endif
+
+#endif // APACHE_GEODE_GUARD_115ad9fa08f9b8368045cfda498ff99b

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/pdxautoserializerclass/PositionPdx.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/pdxautoserializerclass/PositionPdx.hpp b/src/tests/cpp/pdxautoserializerclass/PositionPdx.hpp
index 51f39f0..c44bfe5 100644
--- a/src/tests/cpp/pdxautoserializerclass/PositionPdx.hpp
+++ b/src/tests/cpp/pdxautoserializerclass/PositionPdx.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_fc0317ed5799f03f58df423db009e0b5
+#define APACHE_GEODE_GUARD_fc0317ed5799f03f58df423db009e0b5
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -19,8 +24,6 @@
  * @brief User class for testing the put functionality for object.
  */
 
-#ifndef __AutoPOSITIONPDX_HPP__
-#define __AutoPOSITIONPDX_HPP__
 
 #include <gfcpp/GeodeCppCache.hpp>
 #include <gfcpp/PdxSerializable.hpp>
@@ -104,4 +107,5 @@ class GFIGNORE(TESTOBJECT_EXPORT) PositionPdx
 
 typedef apache::geode::client::SharedPtr<PositionPdx> PositionPdxPtr;
 }  // namespace AutoPdxTests
-#endif
+
+#endif // APACHE_GEODE_GUARD_fc0317ed5799f03f58df423db009e0b5

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/security/CredentialGenerator.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/security/CredentialGenerator.hpp b/src/tests/cpp/security/CredentialGenerator.hpp
index 7480479..f6158aa 100644
--- a/src/tests/cpp/security/CredentialGenerator.hpp
+++ b/src/tests/cpp/security/CredentialGenerator.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_602c04192305d5a8fa539c0c989ef65f
+#define APACHE_GEODE_GUARD_602c04192305d5a8fa539c0c989ef65f
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -25,8 +30,6 @@
 
 // ----------------------------------------------------------------------------
 
-#ifndef _GEMFIRE_CREDENTIALGENERATOR_HPP_
-#define _GEMFIRE_CREDENTIALGENERATOR_HPP_
 
 // ----------------------------------------------------------------------------
 
@@ -272,4 +275,5 @@ class CredentialGenerator : public SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif
+
+#endif // APACHE_GEODE_GUARD_602c04192305d5a8fa539c0c989ef65f

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/security/DummyCredentialGenerator.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/security/DummyCredentialGenerator.hpp b/src/tests/cpp/security/DummyCredentialGenerator.hpp
index 58493ba..5fe3042 100644
--- a/src/tests/cpp/security/DummyCredentialGenerator.hpp
+++ b/src/tests/cpp/security/DummyCredentialGenerator.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_329d127281ca21e68d7ebee13db94333
+#define APACHE_GEODE_GUARD_329d127281ca21e68d7ebee13db94333
+
 /*
  * 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_DUMMYCREDENTIALGENERATOR_HPP_
-#define _GEMFIRE_DUMMYCREDENTIALGENERATOR_HPP_
 
 #include "CredentialGenerator.hpp"
 #include "XmlAuthzCredentialGenerator.hpp"
@@ -102,4 +105,5 @@ class DummyCredentialGenerator : public CredentialGenerator {
 }  // namespace geode
 }  // namespace apache
 
-#endif
+
+#endif // APACHE_GEODE_GUARD_329d127281ca21e68d7ebee13db94333

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/security/DummyCredentialGenerator2.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/security/DummyCredentialGenerator2.hpp b/src/tests/cpp/security/DummyCredentialGenerator2.hpp
index 2e01c1c..f7f86b6 100644
--- a/src/tests/cpp/security/DummyCredentialGenerator2.hpp
+++ b/src/tests/cpp/security/DummyCredentialGenerator2.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_0da927e22048b213714a43e14dd590ec
+#define APACHE_GEODE_GUARD_0da927e22048b213714a43e14dd590ec
+
 /*
  * 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_DUMMYCREDENTIALGENERATOR2_HPP_
-#define _GEMFIRE_DUMMYCREDENTIALGENERATOR2_HPP_
 
 #include "CredentialGenerator.hpp"
 #include "XmlAuthzCredentialGenerator.hpp"
@@ -101,4 +104,5 @@ class DummyCredentialGenerator2 : public CredentialGenerator {
 }  // namespace geode
 }  // namespace apache
 
-#endif
+
+#endif // APACHE_GEODE_GUARD_0da927e22048b213714a43e14dd590ec

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/security/DummyCredentialGenerator3.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/security/DummyCredentialGenerator3.hpp b/src/tests/cpp/security/DummyCredentialGenerator3.hpp
index 99d19e0..c84d2a8 100644
--- a/src/tests/cpp/security/DummyCredentialGenerator3.hpp
+++ b/src/tests/cpp/security/DummyCredentialGenerator3.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_51f14f2d7ae4ce792fd44841b21b89dd
+#define APACHE_GEODE_GUARD_51f14f2d7ae4ce792fd44841b21b89dd
+
 /*
  * 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_DUMMYCREDENTIALGENERATOR3_HPP_
-#define _GEMFIRE_DUMMYCREDENTIALGENERATOR3_HPP_
 
 #include "CredentialGenerator.hpp"
 #include "XmlAuthzCredentialGenerator.hpp"
@@ -101,4 +104,5 @@ class DummyCredentialGenerator3 : public CredentialGenerator {
 }  // namespace geode
 }  // namespace apache
 
-#endif
+
+#endif // APACHE_GEODE_GUARD_51f14f2d7ae4ce792fd44841b21b89dd

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/security/LdapUserCredentialGenerator.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/security/LdapUserCredentialGenerator.hpp b/src/tests/cpp/security/LdapUserCredentialGenerator.hpp
index 376ddfd..cb1520c 100644
--- a/src/tests/cpp/security/LdapUserCredentialGenerator.hpp
+++ b/src/tests/cpp/security/LdapUserCredentialGenerator.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_13e33c8479a332a850fc4a6ded808476
+#define APACHE_GEODE_GUARD_13e33c8479a332a850fc4a6ded808476
+
 /*
  * 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_LDAPUSERCREDENTIALGENERATOR_HPP_
-#define _GEMFIRE_LDAPUSERCREDENTIALGENERATOR_HPP_
 
 #include "CredentialGenerator.hpp"
 #include "XmlAuthzCredentialGenerator.hpp"
@@ -114,4 +117,5 @@ class LdapUserCredentialGenerator : public CredentialGenerator {
 }  // namespace geode
 }  // namespace apache
 
-#endif /*_GEMFIRE_LDAPUSERCREDENTIALGENERATOR_HPP_*/
+
+#endif // APACHE_GEODE_GUARD_13e33c8479a332a850fc4a6ded808476

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/security/NoopCredentialGenerator.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/security/NoopCredentialGenerator.hpp b/src/tests/cpp/security/NoopCredentialGenerator.hpp
index 75cac78..36d6d27 100644
--- a/src/tests/cpp/security/NoopCredentialGenerator.hpp
+++ b/src/tests/cpp/security/NoopCredentialGenerator.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_1f7c1dec923abb55cf489a3ad8997066
+#define APACHE_GEODE_GUARD_1f7c1dec923abb55cf489a3ad8997066
+
 /*
  * 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_NOOPCREDENTIALGENERATOR_HPP_
-#define _GEMFIRE_NOOPCREDENTIALGENERATOR_HPP_
 
 #include "CredentialGenerator.hpp"
 
@@ -60,4 +63,5 @@ class NoopCredentialGenerator : public CredentialGenerator {
 }  // namespace geode
 }  // namespace apache
 
-#endif
+
+#endif // APACHE_GEODE_GUARD_1f7c1dec923abb55cf489a3ad8997066

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/security/PkcsAuthInit.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/security/PkcsAuthInit.hpp b/src/tests/cpp/security/PkcsAuthInit.hpp
index 52d170c..05d21c0 100644
--- a/src/tests/cpp/security/PkcsAuthInit.hpp
+++ b/src/tests/cpp/security/PkcsAuthInit.hpp
@@ -1,5 +1,8 @@
-#ifndef _GEMFIRE__PKCSAUTHINIT__HPP
-#define _GEMFIRE__PKCSAUTHINIT__HPP
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_b6aee18fde62b9f395d7603d1d57c641
+#define APACHE_GEODE_GUARD_b6aee18fde62b9f395d7603d1d57c641
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -104,4 +107,5 @@ class PKCSAuthInitInternal : public AuthInitialize {
 }  // namespace geode
 }  // namespace apache
 
-#endif  //_GEMFIRE__PKCSAUTHINIT__HPP
+
+#endif // APACHE_GEODE_GUARD_b6aee18fde62b9f395d7603d1d57c641

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/security/PkcsCredentialGenerator.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/security/PkcsCredentialGenerator.hpp b/src/tests/cpp/security/PkcsCredentialGenerator.hpp
index 86ac159..8c52c6f 100644
--- a/src/tests/cpp/security/PkcsCredentialGenerator.hpp
+++ b/src/tests/cpp/security/PkcsCredentialGenerator.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_7531b050ea22f83a394ce20e9ea4949d
+#define APACHE_GEODE_GUARD_7531b050ea22f83a394ce20e9ea4949d
+
 /*
  * 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_PKCSCREDENTIALGENERATOR_HPP_
-#define _GEMFIRE_PKCSCREDENTIALGENERATOR_HPP_
 
 #include "CredentialGenerator.hpp"
 #include "XmlAuthzCredentialGenerator.hpp"
@@ -142,4 +145,5 @@ class PKCSCredentialGenerator : public CredentialGenerator {
 }  // namespace geode
 }  // namespace apache
 
-#endif /*_GEMFIRE_PKCSCREDENTIALGENERATOR_HPP_*/
+
+#endif // APACHE_GEODE_GUARD_7531b050ea22f83a394ce20e9ea4949d

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/security/Security.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/security/Security.hpp b/src/tests/cpp/security/Security.hpp
index 6bdf671..c93dd9c 100644
--- a/src/tests/cpp/security/Security.hpp
+++ b/src/tests/cpp/security/Security.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_d8d76480867ce6629add87fe227d225f
+#define APACHE_GEODE_GUARD_d8d76480867ce6629add87fe227d225f
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -25,8 +30,6 @@
 
 // ----------------------------------------------------------------------------
 
-#ifndef __SECURITY_HPP__
-#define __SECURITY_HPP__
 
 // ----------------------------------------------------------------------------
 
@@ -119,4 +122,5 @@ class Security : public FrameworkTest {
 }  // namespace apache
 // ----------------------------------------------------------------------------
 
-#endif  // __SECURITY_HPP__
+
+#endif // APACHE_GEODE_GUARD_d8d76480867ce6629add87fe227d225f

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/security/XmlAuthzCredentialGenerator.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/security/XmlAuthzCredentialGenerator.hpp b/src/tests/cpp/security/XmlAuthzCredentialGenerator.hpp
index 41b6a6d..ff0020f 100644
--- a/src/tests/cpp/security/XmlAuthzCredentialGenerator.hpp
+++ b/src/tests/cpp/security/XmlAuthzCredentialGenerator.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_a14b9dccb3fd9b3b05214dc60326e629
+#define APACHE_GEODE_GUARD_a14b9dccb3fd9b3b05214dc60326e629
+
 /*
  * 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_XMLAUTHZCREDENTIALGENERATOR_HPP_
-#define _GEMFIRE_XMLAUTHZCREDENTIALGENERATOR_HPP_
 
 #include <gfcpp/SharedBase.hpp>
 #include <gfcpp/Properties.hpp>
@@ -311,4 +314,5 @@ class XmlAuthzCredentialGenerator : public SharedBase {
 }  // namespace geode
 }  // namespace apache
 
-#endif /*_GEMFIRE_AUTHZCREDENTIALGENERATOR_HPP_*/
+
+#endif // APACHE_GEODE_GUARD_a14b9dccb3fd9b3b05214dc60326e629

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/security/typedefs.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/security/typedefs.hpp b/src/tests/cpp/security/typedefs.hpp
index 286ece6..224704d 100644
--- a/src/tests/cpp/security/typedefs.hpp
+++ b/src/tests/cpp/security/typedefs.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_8a35926faf964b72538dc78519ee0e9b
+#define APACHE_GEODE_GUARD_8a35926faf964b72538dc78519ee0e9b
+
 /*
  * 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 __TYPEDEFS_HPP_
-#define __TYPEDEFS_HPP_
 
 #ifdef _LINUX
 _Pragma("GCC system_header")
@@ -129,4 +132,5 @@ _Pragma("GCC system_header")
   }  // namespace geode
 }  // namespace apache
 
-#endif /*__TYPEDEFS_HPP_*/
+
+#endif // APACHE_GEODE_GUARD_8a35926faf964b72538dc78519ee0e9b

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/testobject/ArrayOfByte.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/ArrayOfByte.hpp b/src/tests/cpp/testobject/ArrayOfByte.hpp
index 9f9907e..3d3c982 100644
--- a/src/tests/cpp/testobject/ArrayOfByte.hpp
+++ b/src/tests/cpp/testobject/ArrayOfByte.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_ec3211e9438cbef839aaab90eac09a4b
+#define APACHE_GEODE_GUARD_ec3211e9438cbef839aaab90eac09a4b
+
 /*
  * 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 __ArrayOfByte_HPP__
-#define __ArrayOfByte_HPP__
 
 #include <gfcpp/GeodeCppCache.hpp>
 #include <string.h>
@@ -122,4 +125,5 @@ class TESTOBJECT_EXPORT ArrayOfByte {
 };
 }  // namespace testobject
 
-#endif
+
+#endif // APACHE_GEODE_GUARD_ec3211e9438cbef839aaab90eac09a4b

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/testobject/BatchObject.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/BatchObject.hpp b/src/tests/cpp/testobject/BatchObject.hpp
index c0336f7..19b8232 100644
--- a/src/tests/cpp/testobject/BatchObject.hpp
+++ b/src/tests/cpp/testobject/BatchObject.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_018c280d1ad9e881b092dcb9f3304d88
+#define APACHE_GEODE_GUARD_018c280d1ad9e881b092dcb9f3304d88
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -19,8 +24,6 @@
  * @brief User class for testing the cq functionality.
  */
 
-#ifndef __BATCHOBJECT_HPP__
-#define __BATCHOBJECT_HPP__
 
 #include <gfcpp/GeodeCppCache.hpp>
 #include <string.h>
@@ -88,4 +91,5 @@ class TESTOBJECT_EXPORT BatchObject : public TimestampedObject {
 
 typedef apache::geode::client::SharedPtr<BatchObject> BatchObjectPtr;
 }  // namespace testobject
-#endif
+
+#endif // APACHE_GEODE_GUARD_018c280d1ad9e881b092dcb9f3304d88

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/testobject/DeltaFastAssetAccount.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/DeltaFastAssetAccount.hpp b/src/tests/cpp/testobject/DeltaFastAssetAccount.hpp
index 42eccd2..a6c8227 100644
--- a/src/tests/cpp/testobject/DeltaFastAssetAccount.hpp
+++ b/src/tests/cpp/testobject/DeltaFastAssetAccount.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_4419550c0ee1c11f3f7580e8ae97f3e4
+#define APACHE_GEODE_GUARD_4419550c0ee1c11f3f7580e8ae97f3e4
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -19,8 +24,6 @@
  * @brief User class for testing the query functionality.
  */
 
-#ifndef __DELTAFASTASSETACT__HPP__
-#define __DELTAFASTASSETACT__HPP__
 
 #include <gfcpp/GeodeCppCache.hpp>
 #include <string.h>
@@ -148,4 +151,5 @@ class TESTOBJECT_EXPORT DeltaFastAssetAccount : public Cacheable, public Delta {
   }
 };
 }  // namespace testobject
-#endif
+
+#endif // APACHE_GEODE_GUARD_4419550c0ee1c11f3f7580e8ae97f3e4

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/testobject/DeltaPSTObject.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/DeltaPSTObject.hpp b/src/tests/cpp/testobject/DeltaPSTObject.hpp
index 22ba962..54074b8 100644
--- a/src/tests/cpp/testobject/DeltaPSTObject.hpp
+++ b/src/tests/cpp/testobject/DeltaPSTObject.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_71203be2b9e093a3e3b66356ee334b67
+#define APACHE_GEODE_GUARD_71203be2b9e093a3e3b66356ee334b67
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -19,8 +24,6 @@
  * @brief User class for testing the put functionality for object.
  */
 
-#ifndef __DELTAPSTOBJECT_HPP__
-#define __DELTAPSTOBJECT_HPP__
 
 #include <gfcpp/GeodeCppCache.hpp>
 #include <string.h>
@@ -92,4 +95,5 @@ class TESTOBJECT_EXPORT DeltaPSTObject : public Cacheable, public Delta {
 };
 typedef apache::geode::client::SharedPtr<DeltaPSTObject> DeltaPSTObjectPtr;
 }  // namespace testobject
-#endif
+
+#endif // APACHE_GEODE_GUARD_71203be2b9e093a3e3b66356ee334b67

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/testobject/DeltaTestImpl.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/DeltaTestImpl.hpp b/src/tests/cpp/testobject/DeltaTestImpl.hpp
index 1f2b4a5..95dfa88 100644
--- a/src/tests/cpp/testobject/DeltaTestImpl.hpp
+++ b/src/tests/cpp/testobject/DeltaTestImpl.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_f0dde88a60c43a402c317bb0bafa6c73
+#define APACHE_GEODE_GUARD_f0dde88a60c43a402c317bb0bafa6c73
+
 /*
  * 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 DELTATESTIMPL_HPP_
-#define DELTATESTIMPL_HPP_
 
 #include <ace/ACE.h>
 #include <ace/OS.h>
@@ -120,4 +123,5 @@ class TESTOBJECT_EXPORT DeltaTestImpl : public Cacheable, public Delta {
   CacheableStringPtr toString() const;
 };
 }  // namespace testobject
-#endif /* DELTATESTIMPL_HPP_ */
+
+#endif // APACHE_GEODE_GUARD_f0dde88a60c43a402c317bb0bafa6c73

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/testobject/DeltaTestObj.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/DeltaTestObj.hpp b/src/tests/cpp/testobject/DeltaTestObj.hpp
index 17ba3f7..8177141 100644
--- a/src/tests/cpp/testobject/DeltaTestObj.hpp
+++ b/src/tests/cpp/testobject/DeltaTestObj.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_ae1a70d692bfcc850903bc09f7fe0b96
+#define APACHE_GEODE_GUARD_ae1a70d692bfcc850903bc09f7fe0b96
+
 /*
  * 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 __DeltaTestObj_HPP__
-#define __DeltaTestObj_HPP__
 
 #include <gfcpp/GeodeCppCache.hpp>
 #include "DeltaTestImpl.hpp"
@@ -94,4 +97,5 @@ class TESTOBJECT_EXPORT DeltaTestObj : public DeltaTestImpl {
 
 typedef apache::geode::client::SharedPtr<DeltaTestObj> DeltaTestObjPtr;
 }
-#endif
+
+#endif // APACHE_GEODE_GUARD_ae1a70d692bfcc850903bc09f7fe0b96

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/testobject/EqStruct.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/EqStruct.hpp b/src/tests/cpp/testobject/EqStruct.hpp
index b2af4d4..ada5a5e 100644
--- a/src/tests/cpp/testobject/EqStruct.hpp
+++ b/src/tests/cpp/testobject/EqStruct.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_01922391216844a010651b52b4fa268b
+#define APACHE_GEODE_GUARD_01922391216844a010651b52b4fa268b
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -19,8 +24,6 @@
  * @brief User class for testing the put functionality for object.
  */
 
-#ifndef __EQSTRUCT_HPP__
-#define __EQSTRUCT_HPP__
 
 #include <gfcpp/GeodeCppCache.hpp>
 #include <string.h>
@@ -149,4 +152,5 @@ class TESTOBJECT_EXPORT EqStruct : public TimestampedObject {
 
 typedef apache::geode::client::SharedPtr<EqStruct> EqStructPtr;
 }  // namespace testobject
-#endif
+
+#endif // APACHE_GEODE_GUARD_01922391216844a010651b52b4fa268b

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/testobject/FastAsset.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/FastAsset.hpp b/src/tests/cpp/testobject/FastAsset.hpp
index 95bc48f..43e72a5 100644
--- a/src/tests/cpp/testobject/FastAsset.hpp
+++ b/src/tests/cpp/testobject/FastAsset.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_d8ed0294ced849b84153696edefc4a35
+#define APACHE_GEODE_GUARD_d8ed0294ced849b84153696edefc4a35
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -19,8 +24,6 @@
  * @brief User class for testing the query functionality.
  */
 
-#ifndef __FASTASSET__HPP__
-#define __FASTASSET__HPP__
 
 #include <gfcpp/GeodeCppCache.hpp>
 #include <string.h>
@@ -113,4 +116,5 @@ class TESTOBJECT_EXPORT FastAsset : public TimestampedObject {
 
 // typedef apache::geode::client::SharedPtr<FastAsset> FastAssetPtr;
 }  // namespace testobject
-#endif
+
+#endif // APACHE_GEODE_GUARD_d8ed0294ced849b84153696edefc4a35

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/testobject/FastAssetAccount.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/FastAssetAccount.hpp b/src/tests/cpp/testobject/FastAssetAccount.hpp
index 4fb995a..8b15052 100644
--- a/src/tests/cpp/testobject/FastAssetAccount.hpp
+++ b/src/tests/cpp/testobject/FastAssetAccount.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_4bb699f806bb1f49d020175dd0840394
+#define APACHE_GEODE_GUARD_4bb699f806bb1f49d020175dd0840394
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -19,8 +24,6 @@
  * @brief User class for testing the query functionality.
  */
 
-#ifndef __FASTASSETACT__HPP__
-#define __FASTASSETACT__HPP__
 
 #include <gfcpp/GeodeCppCache.hpp>
 #include <string.h>
@@ -120,4 +123,5 @@ class TESTOBJECT_EXPORT FastAssetAccount : public TimestampedObject {
 
 typedef apache::geode::client::SharedPtr<FastAssetAccount> FastAssetAccountPtr;
 }  // namespace testobject
-#endif
+
+#endif // APACHE_GEODE_GUARD_4bb699f806bb1f49d020175dd0840394

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/testobject/InvalidPdxUsage.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/InvalidPdxUsage.hpp b/src/tests/cpp/testobject/InvalidPdxUsage.hpp
index f6fef9f..02ac607 100644
--- a/src/tests/cpp/testobject/InvalidPdxUsage.hpp
+++ b/src/tests/cpp/testobject/InvalidPdxUsage.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_a4f4888599d6fc0d8dc148908db41bfb
+#define APACHE_GEODE_GUARD_a4f4888599d6fc0d8dc148908db41bfb
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +26,6 @@
  *      Author: npatel
  */
 
-#ifndef __INVALIDPDXUSAGE_HPP__
-#define __INVALIDPDXUSAGE_HPP__
 
 #include <gfcpp/PdxSerializable.hpp>
 #include <gfcpp/GeodeCppCache.hpp>
@@ -690,4 +693,5 @@ class TESTOBJECT_EXPORT InvalidPdxUsage : public PdxSerializable {
 };
 typedef SharedPtr<PdxTests::InvalidPdxUsage> InvalidPdxUsagePtr;
 }  // namespace PdxTests
-#endif /* PDXOBJECT_HPP_ */
+
+#endif // APACHE_GEODE_GUARD_a4f4888599d6fc0d8dc148908db41bfb

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/testobject/NestedPdxObject.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/NestedPdxObject.hpp b/src/tests/cpp/testobject/NestedPdxObject.hpp
index 03f399a..9cba4a1 100644
--- a/src/tests/cpp/testobject/NestedPdxObject.hpp
+++ b/src/tests/cpp/testobject/NestedPdxObject.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_28158ffb5a5f70ed511fa8baa47de6a8
+#define APACHE_GEODE_GUARD_28158ffb5a5f70ed511fa8baa47de6a8
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -19,8 +24,6 @@
 *
 */
 
-#ifndef __NESTEDPDXOBJECT_HPP__
-#define __NESTEDPDXOBJECT_HPP__
 
 #include <gfcpp/PdxSerializable.hpp>
 #include <gfcpp/GeodeCppCache.hpp>
@@ -335,4 +338,5 @@ class TESTOBJECT_EXPORT SerializePdx : public PdxSerializable {
 };
 typedef SharedPtr<SerializePdx> SerializePdxPtr;
 }  // namespace testobject
-#endif /* __NESTEDPDXOBJECT_HPP__ */
+
+#endif // APACHE_GEODE_GUARD_28158ffb5a5f70ed511fa8baa47de6a8

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/testobject/NonPdxType.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/NonPdxType.hpp b/src/tests/cpp/testobject/NonPdxType.hpp
index b1cce56..f3b12b0 100644
--- a/src/tests/cpp/testobject/NonPdxType.hpp
+++ b/src/tests/cpp/testobject/NonPdxType.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_07889e0b6ef2b0613a9cd1037e4e3eb5
+#define APACHE_GEODE_GUARD_07889e0b6ef2b0613a9cd1037e4e3eb5
+
 /*
  * 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 __NONPDXTYPE_HPP__
-#define __NONPDXTYPE_HPP__
 
 #include <gfcpp/GeodeCppCache.hpp>
 
@@ -483,4 +486,5 @@ class TESTOBJECT_EXPORT NonPdxType {
                         int* arrLengths) const;
 };
 }  // namespace PdxTests
-#endif /* __NONPDXTYPE_HPP__ */
+
+#endif // APACHE_GEODE_GUARD_07889e0b6ef2b0613a9cd1037e4e3eb5

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/testobject/NoopAuthInit.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/NoopAuthInit.hpp b/src/tests/cpp/testobject/NoopAuthInit.hpp
index ad7cacc..c0eaed4 100644
--- a/src/tests/cpp/testobject/NoopAuthInit.hpp
+++ b/src/tests/cpp/testobject/NoopAuthInit.hpp
@@ -1,5 +1,8 @@
-#ifndef __NOOPAUTHINIT__
-#define __NOOPAUTHINIT__
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_c4d769074b0c6edf12cc639d50a34284
+#define APACHE_GEODE_GUARD_c4d769074b0c6edf12cc639d50a34284
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -82,4 +85,5 @@ class NoopAuthInit : public AuthInitialize {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
-#endif  //__NOOPAUTHINIT__
+
+#endif // APACHE_GEODE_GUARD_c4d769074b0c6edf12cc639d50a34284

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/testobject/PSTObject.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/PSTObject.hpp b/src/tests/cpp/testobject/PSTObject.hpp
index e23058f..8cfd12b 100644
--- a/src/tests/cpp/testobject/PSTObject.hpp
+++ b/src/tests/cpp/testobject/PSTObject.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_3063688f9fda2bf5152f1eec97ed4928
+#define APACHE_GEODE_GUARD_3063688f9fda2bf5152f1eec97ed4928
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -19,8 +24,6 @@
  * @brief User class for testing the put functionality for object.
  */
 
-#ifndef __PSTOBJECT_HPP__
-#define __PSTOBJECT_HPP__
 
 #include <gfcpp/GeodeCppCache.hpp>
 #include <string.h>
@@ -87,4 +90,5 @@ class TESTOBJECT_EXPORT PSTObject : public TimestampedObject {
 
 typedef apache::geode::client::SharedPtr<PSTObject> PSTObjectPtr;
 }  // namespace testobject
-#endif
+
+#endif // APACHE_GEODE_GUARD_3063688f9fda2bf5152f1eec97ed4928

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/testobject/PdxAutoMegaType.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/PdxAutoMegaType.hpp b/src/tests/cpp/testobject/PdxAutoMegaType.hpp
index b659506..c6d5d73 100644
--- a/src/tests/cpp/testobject/PdxAutoMegaType.hpp
+++ b/src/tests/cpp/testobject/PdxAutoMegaType.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_08829dc10f69fd501e8ecbf245428569
+#define APACHE_GEODE_GUARD_08829dc10f69fd501e8ecbf245428569
+
 /*
  * 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 PDX_AUTO_MEGA_TYPE_HPP_
-#define PDX_AUTO_MEGA_TYPE_HPP_
 
 #include <gfcpp/PdxSerializable.hpp>
 #include <gfcpp/GeodeCppCache.hpp>
@@ -123,4 +126,5 @@ class GFIGNORE(TESTOBJECT_EXPORT) PdxAutoMegaType : public PdxSerializable {
 typedef SharedPtr<PdxAutoMegaType> PdxAutoMegaTypePtr;
 }  // namespace PdxAutoTests
 
-#endif
+
+#endif // APACHE_GEODE_GUARD_08829dc10f69fd501e8ecbf245428569

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/testobject/PdxClassV1.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/PdxClassV1.hpp b/src/tests/cpp/testobject/PdxClassV1.hpp
index 007bbc0..0cfeecf 100644
--- a/src/tests/cpp/testobject/PdxClassV1.hpp
+++ b/src/tests/cpp/testobject/PdxClassV1.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_77cdb69379ae1ddf0404bd7ed757eeb8
+#define APACHE_GEODE_GUARD_77cdb69379ae1ddf0404bd7ed757eeb8
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -20,8 +25,6 @@
  *  Created on: Feb 3, 2012
  *      Author: npatel
  */
-#ifndef __PDXCLASSV1_HPP__
-#define __PDXCLASSV1_HPP__
 
 #include <gfcpp/PdxSerializable.hpp>
 #include <gfcpp/GeodeCppCache.hpp>
@@ -529,4 +532,5 @@ class TESTOBJECT_EXPORT TestEqualsV1 : public PdxSerializable {
 };
 
 } /* namespace PdxTests */
-#endif /* PDXCLASSV1_HPP_ */
+
+#endif // APACHE_GEODE_GUARD_77cdb69379ae1ddf0404bd7ed757eeb8

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/testobject/PdxClassV1WithAuto.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/PdxClassV1WithAuto.hpp b/src/tests/cpp/testobject/PdxClassV1WithAuto.hpp
index f838756..d56d41d 100644
--- a/src/tests/cpp/testobject/PdxClassV1WithAuto.hpp
+++ b/src/tests/cpp/testobject/PdxClassV1WithAuto.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_d211265b7b7a98aa276892bb897cf15f
+#define APACHE_GEODE_GUARD_d211265b7b7a98aa276892bb897cf15f
+
 /*
  * 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 __PDX_CLASSV1_WITH_AUTO_HPP__
-#define __PDX_CLASSV1_WITH_AUTO_HPP__
 
 #include <gfcpp/PdxSerializable.hpp>
 #include <gfcpp/GeodeCppCache.hpp>
@@ -565,4 +568,5 @@ class GFIGNORE(TESTOBJECT_EXPORT) TestEqualsV1 : public PdxSerializable {
 };
 
 } /* namespace PdxTestsAuto */
-#endif /* PDXCLASSV1_HPP_ */
+
+#endif // APACHE_GEODE_GUARD_d211265b7b7a98aa276892bb897cf15f

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/testobject/PdxClassV2.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/PdxClassV2.hpp b/src/tests/cpp/testobject/PdxClassV2.hpp
index e03ec24..c5aeb9f 100644
--- a/src/tests/cpp/testobject/PdxClassV2.hpp
+++ b/src/tests/cpp/testobject/PdxClassV2.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_468cbc833956797cfd132b131985f50c
+#define APACHE_GEODE_GUARD_468cbc833956797cfd132b131985f50c
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -20,8 +25,6 @@
  *  Created on: Feb 3, 2012
  *      Author: npatel
  */
-#ifndef __PDXCLASSV2_HPP__
-#define __PDXCLASSV2_HPP__
 
 #include <gfcpp/PdxSerializable.hpp>
 #include <gfcpp/GeodeCppCache.hpp>
@@ -570,4 +573,5 @@ public:
 */
 
 } /* namespace PdxTests */
-#endif /* PDXCLASSV1_HPP_ */
+
+#endif // APACHE_GEODE_GUARD_468cbc833956797cfd132b131985f50c

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/testobject/PdxClassV2WithAuto.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/PdxClassV2WithAuto.hpp b/src/tests/cpp/testobject/PdxClassV2WithAuto.hpp
index fe32ebc..b8523dc 100644
--- a/src/tests/cpp/testobject/PdxClassV2WithAuto.hpp
+++ b/src/tests/cpp/testobject/PdxClassV2WithAuto.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_e5b77d2dd656c240f07a78ec6f670100
+#define APACHE_GEODE_GUARD_e5b77d2dd656c240f07a78ec6f670100
+
 /*
  * 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 __PDX_CLASSV2_WITH_AUTO_HPP__
-#define __PDX_CLASSV2_WITH_AUTO_HPP__
 
 #include <gfcpp/PdxSerializable.hpp>
 #include <gfcpp/GeodeCppCache.hpp>
@@ -602,4 +605,5 @@ public:
 */
 
 } /* namespace PdxTestsAuto */
-#endif /* PDXCLASSV1_HPP_ */
+
+#endif // APACHE_GEODE_GUARD_e5b77d2dd656c240f07a78ec6f670100

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/testobject/PdxType.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/PdxType.hpp b/src/tests/cpp/testobject/PdxType.hpp
index bf2f113..a06bdd6 100644
--- a/src/tests/cpp/testobject/PdxType.hpp
+++ b/src/tests/cpp/testobject/PdxType.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_1072d2981f0f5cd29b6a6a69e0abf84f
+#define APACHE_GEODE_GUARD_1072d2981f0f5cd29b6a6a69e0abf84f
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +26,6 @@
  *      Author: npatel
  */
 
-#ifndef __PDXOBJECT_HPP__
-#define __PDXOBJECT_HPP__
 
 #include <gfcpp/PdxSerializable.hpp>
 #include <gfcpp/GeodeCppCache.hpp>
@@ -799,4 +802,5 @@ class TESTOBJECT_EXPORT PdxType : public PdxSerializable {
 };
 typedef SharedPtr<PdxTests::PdxType> PdxTypePtr;
 }  // namespace PdxTests
-#endif /* PDXOBJECT_HPP_ */
+
+#endif // APACHE_GEODE_GUARD_1072d2981f0f5cd29b6a6a69e0abf84f

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/testobject/PdxTypeWithAuto.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/PdxTypeWithAuto.hpp b/src/tests/cpp/testobject/PdxTypeWithAuto.hpp
index 2ef9d34..5ff14fa 100644
--- a/src/tests/cpp/testobject/PdxTypeWithAuto.hpp
+++ b/src/tests/cpp/testobject/PdxTypeWithAuto.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_6db2d9020b4eb2dea09007c460e08e85
+#define APACHE_GEODE_GUARD_6db2d9020b4eb2dea09007c460e08e85
+
 /*
  * 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 __PDX_OBJECT_WITH_AUTO_HPP__
-#define __PDX_OBJECT_WITH_AUTO_HPP__
 
 #include <gfcpp/PdxSerializable.hpp>
 #include <gfcpp/GeodeCppCache.hpp>
@@ -752,4 +755,5 @@ class GFIGNORE(TESTOBJECT_EXPORT) PdxType : public PdxSerializable {
 };
 typedef SharedPtr<PdxTestsAuto::PdxType> PdxTypePtr;
 }  // namespace PdxTestsAuto
-#endif /* PDXOBJECT_HPP_ */
+
+#endif // APACHE_GEODE_GUARD_6db2d9020b4eb2dea09007c460e08e85

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/testobject/PdxVersioned1.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/PdxVersioned1.hpp b/src/tests/cpp/testobject/PdxVersioned1.hpp
index 5cd22a8..98113d2 100644
--- a/src/tests/cpp/testobject/PdxVersioned1.hpp
+++ b/src/tests/cpp/testobject/PdxVersioned1.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_471ba700244b02138198b644dcea79d5
+#define APACHE_GEODE_GUARD_471ba700244b02138198b644dcea79d5
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +26,6 @@
  *      Author: npatel
  */
 
-#ifndef __PDXVERSIONED1OBJECT_HPP__
-#define __PDXVERSIONED1OBJECT_HPP__
 
 #include <gfcpp/PdxSerializable.hpp>
 #include <gfcpp/GeodeCppCache.hpp>
@@ -252,4 +255,5 @@ class TESTOBJECT_EXPORT PdxVersioned1 : public PdxSerializable {
 };
 typedef SharedPtr<PdxTests::PdxVersioned1> PdxVersioned1Ptr;
 }  // namespace PdxTests
-#endif /* __PDXVERSIONED1OBJECT_HPP__ */
+
+#endif // APACHE_GEODE_GUARD_471ba700244b02138198b644dcea79d5

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/testobject/PdxVersioned2.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/PdxVersioned2.hpp b/src/tests/cpp/testobject/PdxVersioned2.hpp
index 188e4b7..a666f9e 100644
--- a/src/tests/cpp/testobject/PdxVersioned2.hpp
+++ b/src/tests/cpp/testobject/PdxVersioned2.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_63ab68609b8ab024ce65b860ce4c14dd
+#define APACHE_GEODE_GUARD_63ab68609b8ab024ce65b860ce4c14dd
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +26,6 @@
  *      Author: npatel
  */
 
-#ifndef __PDXVERSIONED2OBJECT_HPP__
-#define __PDXVERSIONED2OBJECT_HPP__
 
 #include <gfcpp/PdxSerializable.hpp>
 #include <gfcpp/GeodeCppCache.hpp>
@@ -255,4 +258,5 @@ class TESTOBJECT_EXPORT PdxVersioned2 : public PdxSerializable {
 };
 typedef SharedPtr<PdxTests::PdxVersioned2> PdxVersioned2Ptr;
 }  // namespace PdxTests
-#endif /* __PDXVERSIONED2OBJECT_HPP__ */
+
+#endif // APACHE_GEODE_GUARD_63ab68609b8ab024ce65b860ce4c14dd

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/testobject/Portfolio.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/Portfolio.hpp b/src/tests/cpp/testobject/Portfolio.hpp
index a860efe..4704b7b 100644
--- a/src/tests/cpp/testobject/Portfolio.hpp
+++ b/src/tests/cpp/testobject/Portfolio.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_5dd561945b3f1843d3e6d0d1e94a9a0d
+#define APACHE_GEODE_GUARD_5dd561945b3f1843d3e6d0d1e94a9a0d
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -19,8 +24,6 @@
  * @brief User class for testing the put functionality for object.
  */
 
-#ifndef __PORTFOLIO_HPP__
-#define __PORTFOLIO_HPP__
 
 #include <gfcpp/GeodeCppCache.hpp>
 #include "Position.hpp"
@@ -128,4 +131,5 @@ class TESTOBJECT_EXPORT Portfolio : public Serializable {
 
 typedef SharedPtr<Portfolio> PortfolioPtr;
 }  // namespace testobject
-#endif
+
+#endif // APACHE_GEODE_GUARD_5dd561945b3f1843d3e6d0d1e94a9a0d

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/testobject/PortfolioPdx.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/PortfolioPdx.hpp b/src/tests/cpp/testobject/PortfolioPdx.hpp
index 8020763..9c8acab 100644
--- a/src/tests/cpp/testobject/PortfolioPdx.hpp
+++ b/src/tests/cpp/testobject/PortfolioPdx.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_c671317d09616c448db78f20e3208e41
+#define APACHE_GEODE_GUARD_c671317d09616c448db78f20e3208e41
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -19,8 +24,6 @@
  * @brief User class for testing the put functionality for object.
  */
 
-#ifndef __PORTFOLIOPDX_HPP__
-#define __PORTFOLIOPDX_HPP__
 
 #include "PositionPdx.hpp"
 
@@ -105,4 +108,5 @@ class TESTOBJECT_EXPORT PortfolioPdx : public PdxSerializable {
 
 typedef SharedPtr<PortfolioPdx> PortfolioPdxPtr;
 }  // namespace testobject
-#endif
+
+#endif // APACHE_GEODE_GUARD_c671317d09616c448db78f20e3208e41

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/testobject/Position.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/Position.hpp b/src/tests/cpp/testobject/Position.hpp
index d97fa26..da77be2 100644
--- a/src/tests/cpp/testobject/Position.hpp
+++ b/src/tests/cpp/testobject/Position.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_6b0a46d8e03f0ffb9c53c7c14ef5eed4
+#define APACHE_GEODE_GUARD_6b0a46d8e03f0ffb9c53c7c14ef5eed4
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -19,8 +24,6 @@
  * @brief User class for testing the put functionality for object.
  */
 
-#ifndef __POSITION_HPP__
-#define __POSITION_HPP__
 
 #include <gfcpp/GeodeCppCache.hpp>
 #include <string.h>
@@ -105,4 +108,5 @@ class TESTOBJECT_EXPORT Position : public apache::geode::client::Serializable {
 
 typedef apache::geode::client::SharedPtr<Position> PositionPtr;
 }  // namespace testobject
-#endif
+
+#endif // APACHE_GEODE_GUARD_6b0a46d8e03f0ffb9c53c7c14ef5eed4

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/testobject/PositionPdx.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/PositionPdx.hpp b/src/tests/cpp/testobject/PositionPdx.hpp
index 20f6426..b50b059 100644
--- a/src/tests/cpp/testobject/PositionPdx.hpp
+++ b/src/tests/cpp/testobject/PositionPdx.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_16153fc06e90eeaa167430a34632e57d
+#define APACHE_GEODE_GUARD_16153fc06e90eeaa167430a34632e57d
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -19,8 +24,6 @@
  * @brief User class for testing the put functionality for object.
  */
 
-#ifndef __POSITIONPDX_HPP__
-#define __POSITIONPDX_HPP__
 
 #include <gfcpp/GeodeCppCache.hpp>
 #include <gfcpp/PdxSerializable.hpp>
@@ -101,4 +104,5 @@ class TESTOBJECT_EXPORT PositionPdx
 
 typedef apache::geode::client::SharedPtr<PositionPdx> PositionPdxPtr;
 }  // namespace testobject
-#endif
+
+#endif // APACHE_GEODE_GUARD_16153fc06e90eeaa167430a34632e57d

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/testobject/TestObject1.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/TestObject1.hpp b/src/tests/cpp/testobject/TestObject1.hpp
index fae0654..04ad6e0 100644
--- a/src/tests/cpp/testobject/TestObject1.hpp
+++ b/src/tests/cpp/testobject/TestObject1.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_e0125e37a3eca017a80d206a8d22c2e8
+#define APACHE_GEODE_GUARD_e0125e37a3eca017a80d206a8d22c2e8
+
 /*
  * 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 TESTOBJECT1_HPP_
-#define TESTOBJECT1_HPP_
 
 #include <gfcpp/GeodeCppCache.hpp>
 #include <string>
@@ -65,4 +68,5 @@ class TESTOBJECT_EXPORT TestObject1 : public Cacheable {
 
 typedef SharedPtr<TestObject1> TestObject1Ptr;
 }  // namespace testobject
-#endif /* TESTOBJECT1_HPP_ */
+
+#endif // APACHE_GEODE_GUARD_e0125e37a3eca017a80d206a8d22c2e8

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/testobject/TimestampedObject.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/TimestampedObject.hpp b/src/tests/cpp/testobject/TimestampedObject.hpp
index 8dfaa8e..11e0b09 100644
--- a/src/tests/cpp/testobject/TimestampedObject.hpp
+++ b/src/tests/cpp/testobject/TimestampedObject.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_f3340c9b2d447c884bfa8bef6b826bb9
+#define APACHE_GEODE_GUARD_f3340c9b2d447c884bfa8bef6b826bb9
+
 /*
  * 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 __TimestampedObjectHPP__
-#define __TimestampedObjectHPP__
 
 #include <gfcpp/GeodeCppCache.hpp>
 
@@ -50,4 +53,5 @@ class TESTOBJECT_EXPORT TimestampedObject
 typedef apache::geode::client::SharedPtr<TimestampedObject>
     TimestampedObjectPtr;
 }  // namespace testobject
-#endif  // __TimestampedObjectHPP__
+
+#endif // APACHE_GEODE_GUARD_f3340c9b2d447c884bfa8bef6b826bb9

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/testobject/VariousPdxTypes.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/VariousPdxTypes.hpp b/src/tests/cpp/testobject/VariousPdxTypes.hpp
index 46f47f5..a556a73 100644
--- a/src/tests/cpp/testobject/VariousPdxTypes.hpp
+++ b/src/tests/cpp/testobject/VariousPdxTypes.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_e8d4e6f6728b309933eb81791b61fc90
+#define APACHE_GEODE_GUARD_e8d4e6f6728b309933eb81791b61fc90
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +26,6 @@
  *      Author: npatel
  */
 
-#ifndef __VARIOUSPDXTYPES_HPP_
-#define __VARIOUSPDXTYPES_HPP_
 
 #include <gfcpp/PdxSerializable.hpp>
 #include <gfcpp/GeodeCppCache.hpp>
@@ -535,4 +538,5 @@ class TESTOBJECT_EXPORT PdxInsideIGFSerializable : public Serializable {
 typedef SharedPtr<PdxInsideIGFSerializable> PdxInsideIGFSerializablePtr;
 
 } /* namespace PdxTests */
-#endif /* __VARIOUSPDXTYPES_HPP_ */
+
+#endif // APACHE_GEODE_GUARD_e8d4e6f6728b309933eb81791b61fc90

http://git-wip-us.apache.org/repos/asf/geode/blob/8b53f0a1/src/tests/cpp/testobject/VariousPdxTypesWithAuto.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/VariousPdxTypesWithAuto.hpp b/src/tests/cpp/testobject/VariousPdxTypesWithAuto.hpp
index 40eafb4..698b0cc 100644
--- a/src/tests/cpp/testobject/VariousPdxTypesWithAuto.hpp
+++ b/src/tests/cpp/testobject/VariousPdxTypesWithAuto.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef APACHE_GEODE_GUARD_99a40c6ce49041acf9d03a72cd57e1c2
+#define APACHE_GEODE_GUARD_99a40c6ce49041acf9d03a72cd57e1c2
+
 /*
  * 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 __VARIOUS_PDX_TYPES_WITH_AUTO_HPP_
-#define __VARIOUS_PDX_TYPES_WITH_AUTO_HPP_
 
 #include <gfcpp/PdxSerializable.hpp>
 #include <gfcpp/GeodeCppCache.hpp>
@@ -542,4 +545,5 @@ class GFIGNORE(TESTOBJECT_EXPORT) PdxInsideIGFSerializable
 typedef SharedPtr<PdxInsideIGFSerializable> PdxInsideIGFSerializablePtr;
 
 } /* namespace PdxTestsAuto */
-#endif /* __VARIOUSPDXTYPES_HPP_ */
+
+#endif // APACHE_GEODE_GUARD_99a40c6ce49041acf9d03a72cd57e1c2


Mime
View raw message