You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by dg...@apache.org on 2017/11/10 19:31:44 UTC
[geode-native] branch develop updated: GEODE-3421: Cleanup public
API headers (#145)
This is an automated email from the ASF dual-hosted git repository.
dgkimura pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new 2acb708 GEODE-3421: Cleanup public API headers (#145)
2acb708 is described below
commit 2acb7087ed5c0097458ace48e634c0e27f69ccaf
Author: David Kimura <dk...@pivotal.io>
AuthorDate: Fri Nov 10 11:31:42 2017 -0800
GEODE-3421: Cleanup public API headers (#145)
GEODE-3421: Cleanup public API headers
---
clicache/src/CacheTransactionManager.hpp | 2 +-
clicache/src/Log.hpp | 2 +-
cppcache/include/geode/DataOutput.hpp | 2 +-
cppcache/include/geode/HashMapT.hpp | 3 +--
cppcache/include/geode/HashSetT.hpp | 3 +--
cppcache/include/geode/Struct.hpp | 2 --
cppcache/include/geode/SystemProperties.hpp | 2 +-
cppcache/include/geode/geode_globals.hpp | 2 +-
cppcache/integration-test/fw_helper.hpp | 2 +-
cppcache/src/Assert.cpp | 4 ++--
cppcache/{include/geode => src}/Assert.hpp | 12 ++++++------
cppcache/src/CacheTransactionManagerImpl.hpp | 2 +-
cppcache/src/ClientHealthStats.hpp | 2 +-
cppcache/src/ClientMetadata.hpp | 2 +-
cppcache/src/ClientMetadataService.hpp | 2 +-
cppcache/src/CqQueryImpl.cpp | 2 +-
cppcache/src/DataOutput.cpp | 2 +-
cppcache/src/DiffieHellman.cpp | 2 +-
cppcache/src/DistributedSystem.cpp | 2 +-
cppcache/src/EventIdMap.hpp | 4 +---
cppcache/src/EvictionController.hpp | 2 +-
cppcache/src/EvictionThread.hpp | 2 +-
cppcache/src/ExpiryHandler_T.hpp | 2 +-
cppcache/src/ExpiryTaskManager.cpp | 4 ++--
cppcache/src/ExpiryTaskManager.hpp | 2 +-
cppcache/src/InternalCacheTransactionManager2PC.cpp | 2 +-
.../geode => src}/InternalCacheTransactionManager2PC.hpp | 2 +-
cppcache/src/InternalCacheTransactionManager2PCImpl.hpp | 2 +-
cppcache/src/LocalRegion.cpp | 2 +-
cppcache/src/Log.cpp | 2 +-
cppcache/src/MemberListForVersionStamp.cpp | 2 +-
cppcache/src/PdxTypeRegistry.hpp | 2 +-
cppcache/src/SystemProperties.cpp | 2 +-
cppcache/src/TcpConn.cpp | 2 +-
cppcache/src/TcpConn.hpp | 2 +-
cppcache/src/TcrMessage.cpp | 4 ++--
cppcache/src/ThinClientRegion.hpp | 3 +--
cppcache/src/TombstoneList.hpp | 2 +-
cppcache/src/statistics/GeodeStatisticsFactory.cpp | 2 +-
cppcache/src/statistics/HostStatSampler.cpp | 2 +-
cppcache/src/statistics/StatArchiveWriter.hpp | 2 +-
cppcache/src/statistics/StatisticsManager.cpp | 2 +-
cppcache/{include/geode => src/util}/Log.hpp | 2 +-
.../{include/geode/utils.hpp => src/util/functional.hpp} | 0
cppcache/test/CacheableStringEqualityTest.cpp | 3 ++-
templates/security/UserPasswordAuthInit.cpp | 2 +-
tests/cpp/testobject/NoopAuthInit.cpp | 2 +-
47 files changed, 54 insertions(+), 60 deletions(-)
diff --git a/clicache/src/CacheTransactionManager.hpp b/clicache/src/CacheTransactionManager.hpp
index 07f6954..5c435a4 100644
--- a/clicache/src/CacheTransactionManager.hpp
+++ b/clicache/src/CacheTransactionManager.hpp
@@ -20,7 +20,7 @@
#include "geode_defs.hpp"
#include "begin_native.hpp"
#include <geode/CacheTransactionManager.hpp>
-#include <geode/InternalCacheTransactionManager2PC.hpp>
+#include "InternalCacheTransactionManager2PC.hpp"
#include "end_native.hpp"
#include "native_shared_ptr.hpp"
#include "TransactionId.hpp"
diff --git a/clicache/src/Log.hpp b/clicache/src/Log.hpp
index ed5dd28..8e2947b 100644
--- a/clicache/src/Log.hpp
+++ b/clicache/src/Log.hpp
@@ -19,7 +19,7 @@
#include "geode_defs.hpp"
#include "begin_native.hpp"
-#include <geode/Log.hpp>
+#include "util/Log.hpp"
#include "end_native.hpp"
diff --git a/cppcache/include/geode/DataOutput.hpp b/cppcache/include/geode/DataOutput.hpp
index 6bc91e0..fa04bf5 100644
--- a/cppcache/include/geode/DataOutput.hpp
+++ b/cppcache/include/geode/DataOutput.hpp
@@ -22,7 +22,7 @@
#include "geode_globals.hpp"
#include "ExceptionTypes.hpp"
-#include "Log.hpp"
+#include "util/Log.hpp"
#include "Serializable.hpp"
#include "CacheableString.hpp"
diff --git a/cppcache/include/geode/HashMapT.hpp b/cppcache/include/geode/HashMapT.hpp
index 5b5e7e6..8e32261 100644
--- a/cppcache/include/geode/HashMapT.hpp
+++ b/cppcache/include/geode/HashMapT.hpp
@@ -23,12 +23,11 @@
#include <unordered_map>
#include <memory>
-#include <geode/utils.hpp>
-
#include "geode_globals.hpp"
#include "Cacheable.hpp"
#include "CacheableKey.hpp"
#include "Exception.hpp"
+#include "util/functional.hpp"
namespace apache {
namespace geode {
diff --git a/cppcache/include/geode/HashSetT.hpp b/cppcache/include/geode/HashSetT.hpp
index fd5c8b5..488cebb 100644
--- a/cppcache/include/geode/HashSetT.hpp
+++ b/cppcache/include/geode/HashSetT.hpp
@@ -23,10 +23,9 @@
#include <unordered_set>
#include <memory>
-#include <geode/utils.hpp>
-
#include "geode_globals.hpp"
#include "CacheableKey.hpp"
+#include "util/functional.hpp"
namespace apache {
namespace geode {
diff --git a/cppcache/include/geode/Struct.hpp b/cppcache/include/geode/Struct.hpp
index 6dbd296..cea08c3 100644
--- a/cppcache/include/geode/Struct.hpp
+++ b/cppcache/include/geode/Struct.hpp
@@ -23,8 +23,6 @@
#include <unordered_map>
#include <vector>
-#include <geode/utils.hpp>
-
#include "geode_globals.hpp"
#include "geode_types.hpp"
#include "CacheableBuiltins.hpp"
diff --git a/cppcache/include/geode/SystemProperties.hpp b/cppcache/include/geode/SystemProperties.hpp
index ff8960d..18b4814 100644
--- a/cppcache/include/geode/SystemProperties.hpp
+++ b/cppcache/include/geode/SystemProperties.hpp
@@ -21,7 +21,7 @@
*/
#include "Properties.hpp"
-#include "Log.hpp"
+#include "util/Log.hpp"
/** @file
*/
diff --git a/cppcache/include/geode/geode_globals.hpp b/cppcache/include/geode/geode_globals.hpp
index ae3b56d..b5c7ffb 100644
--- a/cppcache/include/geode/geode_globals.hpp
+++ b/cppcache/include/geode/geode_globals.hpp
@@ -122,7 +122,7 @@
#include <cstdint>
-#include "Log.hpp"
+#include "util/Log.hpp"
#include "Assert.hpp"
#endif // GEODE_GFCPP_GLOBALS_H_
diff --git a/cppcache/integration-test/fw_helper.hpp b/cppcache/integration-test/fw_helper.hpp
index 5afc75c..e346888 100644
--- a/cppcache/integration-test/fw_helper.hpp
+++ b/cppcache/integration-test/fw_helper.hpp
@@ -88,7 +88,7 @@ BEGIN_TEST.
#include <CppCacheLibrary.hpp>
#include <geode/Exception.hpp>
-#include <geode/Log.hpp>
+#include "util/Log.hpp"
#include <list>
#include <string>
diff --git a/cppcache/src/Assert.cpp b/cppcache/src/Assert.cpp
index 9dc0d5c..6a0fdc3 100644
--- a/cppcache/src/Assert.cpp
+++ b/cppcache/src/Assert.cpp
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include <geode/Assert.hpp>
#include <geode/ExceptionTypes.hpp>
-#include <geode/Log.hpp>
+#include "Assert.hpp"
+#include "util/Log.hpp"
namespace apache {
namespace geode {
diff --git a/cppcache/include/geode/Assert.hpp b/cppcache/src/Assert.hpp
similarity index 98%
rename from cppcache/include/geode/Assert.hpp
rename to cppcache/src/Assert.hpp
index 0254d6b..aa95ac1 100644
--- a/cppcache/include/geode/Assert.hpp
+++ b/cppcache/src/Assert.hpp
@@ -1,8 +1,3 @@
-#pragma once
-
-#ifndef GEODE_ASSERT_H_
-#define GEODE_ASSERT_H_
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -20,7 +15,12 @@
* limitations under the License.
*/
-#include "geode_globals.hpp"
+#pragma once
+
+#ifndef GEODE_ASSERT_H_
+#define GEODE_ASSERT_H_
+
+#include <geode/geode_globals.hpp>
/**
* @file
diff --git a/cppcache/src/CacheTransactionManagerImpl.hpp b/cppcache/src/CacheTransactionManagerImpl.hpp
index e0b8cb4..3617a11 100644
--- a/cppcache/src/CacheTransactionManagerImpl.hpp
+++ b/cppcache/src/CacheTransactionManagerImpl.hpp
@@ -29,7 +29,7 @@
#include <geode/CacheTransactionManager.hpp>
#include "TXCommitMessage.hpp"
-#include <geode/Log.hpp>
+#include "util/Log.hpp"
#include "SuspendedTxExpiryHandler.hpp"
namespace apache {
diff --git a/cppcache/src/ClientHealthStats.hpp b/cppcache/src/ClientHealthStats.hpp
index e842443..b40f74a 100644
--- a/cppcache/src/ClientHealthStats.hpp
+++ b/cppcache/src/ClientHealthStats.hpp
@@ -22,7 +22,7 @@
#include <geode/geode_types.hpp>
#include <geode/Serializable.hpp>
-#include <geode/Log.hpp>
+#include "util/Log.hpp"
#include <geode/CacheableDate.hpp>
namespace apache {
diff --git a/cppcache/src/ClientMetadata.hpp b/cppcache/src/ClientMetadata.hpp
index b6ab281..c137772 100644
--- a/cppcache/src/ClientMetadata.hpp
+++ b/cppcache/src/ClientMetadata.hpp
@@ -20,7 +20,7 @@
* limitations under the License.
*/
-#include <geode/Log.hpp>
+#include "util/Log.hpp"
#include <geode/PartitionResolver.hpp>
#include "ServerLocation.hpp"
#include "BucketServerLocation.hpp"
diff --git a/cppcache/src/ClientMetadataService.hpp b/cppcache/src/ClientMetadataService.hpp
index 0bc0af1..506c351 100644
--- a/cppcache/src/ClientMetadataService.hpp
+++ b/cppcache/src/ClientMetadataService.hpp
@@ -26,7 +26,6 @@
#include <ace/Task.h>
-#include <geode/utils.hpp>
#include <memory>
#include <geode/CacheableKey.hpp>
#include <geode/Cacheable.hpp>
@@ -38,6 +37,7 @@
#include "Queue.hpp"
#include "DistributedSystemImpl.hpp"
#include "NonCopyable.hpp"
+#include "util/functional.hpp"
namespace apache {
namespace geode {
diff --git a/cppcache/src/CqQueryImpl.cpp b/cppcache/src/CqQueryImpl.cpp
index cdab3d7..f44145a 100644
--- a/cppcache/src/CqQueryImpl.cpp
+++ b/cppcache/src/CqQueryImpl.cpp
@@ -18,7 +18,7 @@
#include "CqQueryImpl.hpp"
#include <geode/CqAttributesFactory.hpp>
#include "CqAttributesMutatorImpl.hpp"
-#include <geode/Log.hpp>
+#include "util/Log.hpp"
#include "ResultSetImpl.hpp"
#include "StructSetImpl.hpp"
#include <geode/ExceptionTypes.hpp>
diff --git a/cppcache/src/DataOutput.cpp b/cppcache/src/DataOutput.cpp
index 62ba33a..ffa3994 100644
--- a/cppcache/src/DataOutput.cpp
+++ b/cppcache/src/DataOutput.cpp
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include <geode/Log.hpp>
+#include "util/Log.hpp"
#include <geode/DataOutput.hpp>
#include <geode/SystemProperties.hpp>
#include <SerializationRegistry.hpp>
diff --git a/cppcache/src/DiffieHellman.cpp b/cppcache/src/DiffieHellman.cpp
index 80748bd..a3532e8 100644
--- a/cppcache/src/DiffieHellman.cpp
+++ b/cppcache/src/DiffieHellman.cpp
@@ -16,7 +16,7 @@
*/
#include "DiffieHellman.hpp"
-#include <geode/Log.hpp>
+#include "util/Log.hpp"
#include <geode/ExceptionTypes.hpp>
#include <geode/SystemProperties.hpp>
#include <ace/Guard_T.h>
diff --git a/cppcache/src/DistributedSystem.cpp b/cppcache/src/DistributedSystem.cpp
index 9c4faf3..a398462 100644
--- a/cppcache/src/DistributedSystem.cpp
+++ b/cppcache/src/DistributedSystem.cpp
@@ -23,7 +23,7 @@
#include <CppCacheLibrary.hpp>
#include <Utils.hpp>
-#include <geode/Log.hpp>
+#include "util/Log.hpp"
#include <geode/CacheFactory.hpp>
#include <ace/OS.h>
diff --git a/cppcache/src/EventIdMap.hpp b/cppcache/src/EventIdMap.hpp
index eb40ab5..1ae44bc 100644
--- a/cppcache/src/EventIdMap.hpp
+++ b/cppcache/src/EventIdMap.hpp
@@ -31,11 +31,9 @@
#include <ace/Recursive_Thread_Mutex.h>
#include <ace/Guard_T.h>
-#include <geode/utils.hpp>
-#include <memory>
-
#include "EventId.hpp"
#include "EventSource.hpp"
+#include "util/functional.hpp"
namespace apache {
namespace geode {
diff --git a/cppcache/src/EvictionController.hpp b/cppcache/src/EvictionController.hpp
index 6879adc..917e699 100644
--- a/cppcache/src/EvictionController.hpp
+++ b/cppcache/src/EvictionController.hpp
@@ -26,7 +26,7 @@
#include <ace/Thread_Mutex.h>
#include <ace/Task.h>
#include <geode/DataOutput.hpp>
-#include <geode/Log.hpp>
+#include "util/Log.hpp"
#include <memory>
#include "IntQueue.hpp"
#include "EvictionThread.hpp"
diff --git a/cppcache/src/EvictionThread.hpp b/cppcache/src/EvictionThread.hpp
index 8560387..2641eec 100644
--- a/cppcache/src/EvictionThread.hpp
+++ b/cppcache/src/EvictionThread.hpp
@@ -26,7 +26,7 @@
#include <ace/Thread_Mutex.h>
#include <ace/Task.h>
#include <geode/DataOutput.hpp>
-#include <geode/Log.hpp>
+#include "util/Log.hpp"
#include "IntQueue.hpp"
/**
* This class does the actual evictions
diff --git a/cppcache/src/ExpiryHandler_T.hpp b/cppcache/src/ExpiryHandler_T.hpp
index 779a606..8efed59 100644
--- a/cppcache/src/ExpiryHandler_T.hpp
+++ b/cppcache/src/ExpiryHandler_T.hpp
@@ -26,7 +26,7 @@
*/
#include "ace/Event_Handler.h"
-#include <geode/Log.hpp>
+#include "util/Log.hpp"
#include "StackTrace.hpp"
namespace apache {
namespace geode {
diff --git a/cppcache/src/ExpiryTaskManager.cpp b/cppcache/src/ExpiryTaskManager.cpp
index 95e3a06..7ac4cd1 100644
--- a/cppcache/src/ExpiryTaskManager.cpp
+++ b/cppcache/src/ExpiryTaskManager.cpp
@@ -16,9 +16,9 @@
*/
#include "config.h"
#include "ExpiryTaskManager.hpp"
-#include <geode/Log.hpp>
-#include <geode/Assert.hpp>
+#include "util/Log.hpp"
#include <geode/DistributedSystem.hpp>
+#include "Assert.hpp"
#include "DistributedSystemImpl.hpp"
#if defined(_WIN32)
diff --git a/cppcache/src/ExpiryTaskManager.hpp b/cppcache/src/ExpiryTaskManager.hpp
index bae3df0..9b00e03 100644
--- a/cppcache/src/ExpiryTaskManager.hpp
+++ b/cppcache/src/ExpiryTaskManager.hpp
@@ -25,7 +25,7 @@
#include "ReadWriteLock.hpp"
#include <geode/geode_globals.hpp>
-#include <geode/Log.hpp>
+#include "util/Log.hpp"
/**
* @file ExpiryTaskManager.hpp
diff --git a/cppcache/src/InternalCacheTransactionManager2PC.cpp b/cppcache/src/InternalCacheTransactionManager2PC.cpp
index 9d0509e..f511acb 100644
--- a/cppcache/src/InternalCacheTransactionManager2PC.cpp
+++ b/cppcache/src/InternalCacheTransactionManager2PC.cpp
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-#include <geode/InternalCacheTransactionManager2PC.hpp>
+#include "InternalCacheTransactionManager2PC.hpp"
namespace apache {
namespace geode {
diff --git a/cppcache/include/geode/InternalCacheTransactionManager2PC.hpp b/cppcache/src/InternalCacheTransactionManager2PC.hpp
similarity index 98%
rename from cppcache/include/geode/InternalCacheTransactionManager2PC.hpp
rename to cppcache/src/InternalCacheTransactionManager2PC.hpp
index 3bb3ef9..22b664d 100644
--- a/cppcache/include/geode/InternalCacheTransactionManager2PC.hpp
+++ b/cppcache/src/InternalCacheTransactionManager2PC.hpp
@@ -20,7 +20,7 @@
* limitations under the License.
*/
-#include "CacheTransactionManager.hpp"
+#include <geode/CacheTransactionManager.hpp>
namespace apache {
namespace geode {
diff --git a/cppcache/src/InternalCacheTransactionManager2PCImpl.hpp b/cppcache/src/InternalCacheTransactionManager2PCImpl.hpp
index 7261643..d4721c4 100644
--- a/cppcache/src/InternalCacheTransactionManager2PCImpl.hpp
+++ b/cppcache/src/InternalCacheTransactionManager2PCImpl.hpp
@@ -26,7 +26,7 @@
* Author: sshcherbakov
*/
-#include <geode/InternalCacheTransactionManager2PC.hpp>
+#include "InternalCacheTransactionManager2PC.hpp"
#include "CacheTransactionManagerImpl.hpp"
namespace apache {
diff --git a/cppcache/src/LocalRegion.cpp b/cppcache/src/LocalRegion.cpp
index c618b3b..8dfedee 100644
--- a/cppcache/src/LocalRegion.cpp
+++ b/cppcache/src/LocalRegion.cpp
@@ -18,7 +18,7 @@
#include <tuple>
#include "LocalRegion.hpp"
-#include <geode/Log.hpp>
+#include "util/Log.hpp"
#include <geode/SystemProperties.hpp>
#include <geode/PoolManager.hpp>
diff --git a/cppcache/src/Log.cpp b/cppcache/src/Log.cpp
index 90cc0c6..2463fb2 100644
--- a/cppcache/src/Log.cpp
+++ b/cppcache/src/Log.cpp
@@ -36,7 +36,7 @@
#include <ace/Dirent_Selector.h>
#include <ace/OS_NS_sys_stat.h>
-#include <geode/Log.hpp>
+#include "util/Log.hpp"
#include <geode/ExceptionTypes.hpp>
#include <geodeBanner.hpp>
diff --git a/cppcache/src/MemberListForVersionStamp.cpp b/cppcache/src/MemberListForVersionStamp.cpp
index 210db09..d351bda 100644
--- a/cppcache/src/MemberListForVersionStamp.cpp
+++ b/cppcache/src/MemberListForVersionStamp.cpp
@@ -15,7 +15,7 @@
* limitations under the License.
*/
#include "MemberListForVersionStamp.hpp"
-#include <geode/Log.hpp>
+#include "util/Log.hpp"
using namespace apache::geode::client;
diff --git a/cppcache/src/PdxTypeRegistry.hpp b/cppcache/src/PdxTypeRegistry.hpp
index 491a347..6ec7a2a 100644
--- a/cppcache/src/PdxTypeRegistry.hpp
+++ b/cppcache/src/PdxTypeRegistry.hpp
@@ -26,7 +26,6 @@
#include <ace/ACE.h>
#include <ace/Recursive_Thread_Mutex.h>
-#include <geode/utils.hpp>
#include <geode/PdxSerializable.hpp>
#include <geode/Cache.hpp>
@@ -36,6 +35,7 @@
#include "EnumInfo.hpp"
#include "PreservedDataExpiryHandler.hpp"
#include "ExpiryTaskManager.hpp"
+#include "util/functional.hpp"
namespace apache {
namespace geode {
diff --git a/cppcache/src/SystemProperties.cpp b/cppcache/src/SystemProperties.cpp
index 8cba215..7b16e0c 100644
--- a/cppcache/src/SystemProperties.cpp
+++ b/cppcache/src/SystemProperties.cpp
@@ -23,7 +23,7 @@
#include <geode/SystemProperties.hpp>
#include <CppCacheLibrary.hpp>
-#include <geode/Log.hpp>
+#include "util/Log.hpp"
#include <geode/ExceptionTypes.hpp>
#include <ace/OS.h>
#include <ace/DLL.h>
diff --git a/cppcache/src/TcpConn.cpp b/cppcache/src/TcpConn.cpp
index 581d267..4f0479d 100644
--- a/cppcache/src/TcpConn.cpp
+++ b/cppcache/src/TcpConn.cpp
@@ -18,7 +18,7 @@
#include "TcpConn.hpp"
#include <geode/DistributedSystem.hpp>
#include <geode/SystemProperties.hpp>
-#include <geode/Log.hpp>
+#include "util/Log.hpp"
#include <memory.h>
diff --git a/cppcache/src/TcpConn.hpp b/cppcache/src/TcpConn.hpp
index 13964d4..41b5199 100644
--- a/cppcache/src/TcpConn.hpp
+++ b/cppcache/src/TcpConn.hpp
@@ -21,7 +21,7 @@
*/
#include <geode/geode_globals.hpp>
-#include <geode/Log.hpp>
+#include "util/Log.hpp"
#include "Connector.hpp"
#include <ace/SOCK_Stream.h>
diff --git a/cppcache/src/TcrMessage.cpp b/cppcache/src/TcrMessage.cpp
index bd79f54..845ae3a 100644
--- a/cppcache/src/TcrMessage.cpp
+++ b/cppcache/src/TcrMessage.cpp
@@ -15,14 +15,14 @@
* limitations under the License.
*/
#include "TcrMessage.hpp"
-#include <geode/Assert.hpp>
#include <geode/CacheableBuiltins.hpp>
#include <geode/DistributedSystem.hpp>
#include <geode/SystemProperties.hpp>
+#include <geode/CacheableObjectArray.hpp>
+#include "Assert.hpp"
#include "TcrConnection.hpp"
#include "AutoDelete.hpp"
#include "TcrChunkedContext.hpp"
-#include <geode/CacheableObjectArray.hpp>
#include "ThinClientRegion.hpp"
#include "ThinClientBaseDM.hpp"
#include "StackTrace.hpp"
diff --git a/cppcache/src/ThinClientRegion.hpp b/cppcache/src/ThinClientRegion.hpp
index 506eb94..5d2d5b3 100644
--- a/cppcache/src/ThinClientRegion.hpp
+++ b/cppcache/src/ThinClientRegion.hpp
@@ -24,7 +24,6 @@
#include <ace/Task.h>
-#include <geode/utils.hpp>
#include <geode/ResultCollector.hpp>
#include "LocalRegion.hpp"
@@ -35,7 +34,7 @@
#include "TcrChunkedContext.hpp"
#include "CacheableObjectPartList.hpp"
#include "ClientMetadataService.hpp"
-
+#include "util/functional.hpp"
/**
* @file
*/
diff --git a/cppcache/src/TombstoneList.hpp b/cppcache/src/TombstoneList.hpp
index 3178b29..c535ea0 100644
--- a/cppcache/src/TombstoneList.hpp
+++ b/cppcache/src/TombstoneList.hpp
@@ -28,9 +28,9 @@
#include <memory>
#include <geode/CacheableBuiltins.hpp>
-#include <geode/utils.hpp>
#include "MapEntry.hpp"
+#include "util/functional.hpp"
namespace apache {
namespace geode {
diff --git a/cppcache/src/statistics/GeodeStatisticsFactory.cpp b/cppcache/src/statistics/GeodeStatisticsFactory.cpp
index b3423e7..2ccac7f 100644
--- a/cppcache/src/statistics/GeodeStatisticsFactory.cpp
+++ b/cppcache/src/statistics/GeodeStatisticsFactory.cpp
@@ -24,7 +24,7 @@
#include <ace/Guard_T.h>
#include <geode/Exception.hpp>
#include "GeodeStatisticsFactory.hpp"
-#include <geode/Log.hpp>
+#include "util/Log.hpp"
#include <string>
#include "AtomicStatisticsImpl.hpp"
#include "OsStatisticsImpl.hpp"
diff --git a/cppcache/src/statistics/HostStatSampler.cpp b/cppcache/src/statistics/HostStatSampler.cpp
index 777fed3..85eed8b 100644
--- a/cppcache/src/statistics/HostStatSampler.cpp
+++ b/cppcache/src/statistics/HostStatSampler.cpp
@@ -35,7 +35,7 @@
#include "StatArchiveWriter.hpp"
#include <geode/DistributedSystem.hpp>
#include <geode/SystemProperties.hpp>
-#include <geode/Log.hpp>
+#include "util/Log.hpp"
#include "GeodeStatisticsFactory.hpp"
#include <ClientHealthStats.hpp>
#include <ClientProxyMembershipID.hpp>
diff --git a/cppcache/src/statistics/StatArchiveWriter.hpp b/cppcache/src/statistics/StatArchiveWriter.hpp
index d908ca9..6f77c6d 100644
--- a/cppcache/src/statistics/StatArchiveWriter.hpp
+++ b/cppcache/src/statistics/StatArchiveWriter.hpp
@@ -31,7 +31,7 @@
#include "StatisticDescriptorImpl.hpp"
#include <geode/statistics/StatisticsType.hpp>
#include "HostStatSampler.hpp"
-#include <geode/Log.hpp>
+#include "util/Log.hpp"
#include <geode/DataOutput.hpp>
#include <NonCopyable.hpp>
#include <chrono>
diff --git a/cppcache/src/statistics/StatisticsManager.cpp b/cppcache/src/statistics/StatisticsManager.cpp
index a4a4df0..57fbb6a 100644
--- a/cppcache/src/statistics/StatisticsManager.cpp
+++ b/cppcache/src/statistics/StatisticsManager.cpp
@@ -24,7 +24,7 @@
#include <ace/Guard_T.h>
#include <geode/Exception.hpp>
#include "StatisticsManager.hpp"
-#include <geode/Log.hpp>
+#include "util/Log.hpp"
#include "GeodeStatisticsFactory.hpp"
#include <string>
#include "AtomicStatisticsImpl.hpp"
diff --git a/cppcache/include/geode/Log.hpp b/cppcache/src/util/Log.hpp
similarity index 99%
rename from cppcache/include/geode/Log.hpp
rename to cppcache/src/util/Log.hpp
index d6a4682..49dfec7 100644
--- a/cppcache/include/geode/Log.hpp
+++ b/cppcache/src/util/Log.hpp
@@ -26,7 +26,7 @@
*
*/
-#include "geode_globals.hpp"
+#include <geode/geode_globals.hpp>
#include <cstdio>
#include <cstdarg>
diff --git a/cppcache/include/geode/utils.hpp b/cppcache/src/util/functional.hpp
similarity index 100%
rename from cppcache/include/geode/utils.hpp
rename to cppcache/src/util/functional.hpp
diff --git a/cppcache/test/CacheableStringEqualityTest.cpp b/cppcache/test/CacheableStringEqualityTest.cpp
index 2f62248..00e1efa 100644
--- a/cppcache/test/CacheableStringEqualityTest.cpp
+++ b/cppcache/test/CacheableStringEqualityTest.cpp
@@ -21,9 +21,10 @@
#include <unordered_set>
#include <unordered_map>
-#include <geode/utils.hpp>
#include <geode/CacheableString.hpp>
+#include "util/functional.hpp"
+
using namespace apache::geode::client;
TEST(CacheableStringEqualityTest, StdHashSpecializationViaStdSharedPtr) {
diff --git a/templates/security/UserPasswordAuthInit.cpp b/templates/security/UserPasswordAuthInit.cpp
index 4714aba..1adb0b0 100644
--- a/templates/security/UserPasswordAuthInit.cpp
+++ b/templates/security/UserPasswordAuthInit.cpp
@@ -17,8 +17,8 @@
#include "UserPasswordAuthInit.hpp"
#include "geode/Properties.hpp"
-#include "geode/Log.hpp"
#include "geode/ExceptionTypes.hpp"
+#include "util/Log.hpp"
#define SECURITY_USERNAME "security-username"
#define SECURITY_PASSWORD "security-password"
diff --git a/tests/cpp/testobject/NoopAuthInit.cpp b/tests/cpp/testobject/NoopAuthInit.cpp
index 94704c8..ac938a5 100644
--- a/tests/cpp/testobject/NoopAuthInit.cpp
+++ b/tests/cpp/testobject/NoopAuthInit.cpp
@@ -17,8 +17,8 @@
#include "NoopAuthInit.hpp"
#include "geode/Properties.hpp"
-#include "geode/Log.hpp"
#include "geode/ExceptionTypes.hpp"
+#include "util/Log.hpp"
namespace apache {
namespace geode {
--
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <co...@geode.apache.org>'].