You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bb...@apache.org on 2022/04/19 17:06:23 UTC
[geode-native] branch develop updated: GEODE-10074: Remove ACE remainings (#928)
This is an automated email from the ASF dual-hosted git repository.
bbender 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 9b5b86ca9 GEODE-10074: Remove ACE remainings (#928)
9b5b86ca9 is described below
commit 9b5b86ca90ae4a2338317450541ac984064dc64a
Author: Mario Salazar de Torres <ma...@est.tech>
AuthorDate: Tue Apr 19 19:06:19 2022 +0200
GEODE-10074: Remove ACE remainings (#928)
- Removed all the ACE includes along the repository
- Removed ACE from CMake project.
- Removed ACE dependency.
- There were a couple of files in which ACE's strcmp was used.
So, its usage was replaced to to std::string::operator==
- Removed non-necessary ACE's getcwd calls.
---
cppcache/CMakeLists.txt | 2 +-
cppcache/acceptance-test/CMakeLists.txt | 1 -
cppcache/integration-test/.clang-format | 2 +-
.../integration-test/BuiltinCacheableWrappers.hpp | 2 -
cppcache/integration-test/CMakeLists.txt | 8 +-
cppcache/integration-test/CacheHelper.cpp | 5 +-
cppcache/integration-test/CacheHelper.hpp | 4 -
cppcache/integration-test/CacheImplHelper.hpp | 1 -
cppcache/integration-test/DeltaEx.hpp | 1 -
cppcache/integration-test/LibraryCallbacks.cpp | 3 -
cppcache/integration-test/QueryHelper.hpp | 2 -
cppcache/integration-test/ThinClientDistOps.hpp | 2 -
cppcache/integration-test/ThinClientDistOps2.hpp | 1 -
cppcache/integration-test/ThinClientFailover.hpp | 2 -
cppcache/integration-test/ThinClientFailover2.hpp | 8 -
cppcache/integration-test/ThinClientFailover3.hpp | 2 -
.../ThinClientFailoverInterest.hpp | 2 -
.../ThinClientFailoverInterest2.hpp | 2 -
.../ThinClientFailoverInterestAllWithCache.hpp | 2 -
.../integration-test/ThinClientFailoverRegex.hpp | 2 -
cppcache/integration-test/ThinClientHeapLRU.hpp | 2 -
cppcache/integration-test/ThinClientHelper.hpp | 1 -
.../integration-test/ThinClientInterestList.hpp | 2 -
.../integration-test/ThinClientInterestList2.hpp | 2 -
.../integration-test/ThinClientNotification.hpp | 2 -
.../integration-test/ThinClientPdxSerializer.hpp | 2 -
cppcache/integration-test/ThinClientPutAll.hpp | 3 -
.../ThinClientPutAllWithCallBack.hpp | 2 -
cppcache/integration-test/ThinClientPutGetAll.hpp | 2 -
.../ThinClientRIwithlocalRegionDestroy.hpp | 2 -
cppcache/integration-test/ThinClientRegex.hpp | 2 -
cppcache/integration-test/ThinClientRegex2.hpp | 2 -
cppcache/integration-test/ThinClientRegex3.hpp | 2 -
cppcache/integration-test/ThinClientRemoveAll.hpp | 2 -
cppcache/integration-test/ThinClientTXFailover.hpp | 2 -
cppcache/integration-test/fw_helper.hpp | 4 +-
.../integration-test/testCreateAndDestroyPool.cpp | 4 +-
.../integration-test/testPdxMetadataCheckTest.cpp | 3 -
cppcache/integration-test/testSystemProperties.cpp | 6 +-
.../testThinClientCacheableStringArray.cpp | 4 +-
.../integration-test/testThinClientCacheables.cpp | 3 -
.../testThinClientCacheablesLimits.cpp | 3 -
cppcache/integration-test/testThinClientCq.cpp | 1 -
.../integration-test/testThinClientCqDurable.cpp | 3 -
.../integration-test/testThinClientCqFailover.cpp | 4 +-
.../testThinClientCqHAFailover.cpp | 4 +-
cppcache/integration-test/testThinClientCqIR.cpp | 2 -
.../testThinClientFixedPartitionResolver.cpp | 2 -
.../integration-test/testThinClientHADistOps.cpp | 2 -
.../testThinClientHAEventIDMap.cpp | 3 -
.../integration-test/testThinClientHAFailover.cpp | 2 -
.../testThinClientHAFailoverRegex.cpp | 2 -
.../testThinClientHAMixedRedundancy.cpp | 2 -
.../testThinClientHAPeriodicAck.cpp | 3 -
.../testThinClientHAQueryFailover.cpp | 4 +-
.../integration-test/testThinClientHeapLRU.cpp | 2 -
.../testThinClientIntResPolKeysInv.cpp | 2 -
.../testThinClientLRUExpiration.cpp | 3 -
.../testThinClientPRPutAllFailover.cpp | 2 -
.../testThinClientPartitionResolver.cpp | 2 -
.../integration-test/testThinClientPdxTests.cpp | 3 -
.../testThinClientRegionQueryExclusiveness.cpp | 4 +-
.../testThinClientRemoteQueryFailover.cpp | 4 +-
.../testThinClientRemoteQueryFailoverPdx.cpp | 4 +-
.../testThinClientRemoteQueryRS.cpp | 2 -
.../testThinClientRemoteQuerySS.cpp | 2 -
.../testThinClientRemoteQueryTimeout.cpp | 2 -
.../testThinClientRemoteRegionQuery.cpp | 2 -
.../integration-test/testThinClientRemoveOps.cpp | 2 -
...ientSecurityAuthenticationSetAuthInitialize.cpp | 3 -
.../testThinClientSecurityPostAuthorization.cpp | 2 +-
cppcache/integration/test/CMakeLists.txt | 1 -
cppcache/src/CppCacheLibrary.cpp | 14 +-
cppcache/src/LRUEntriesMap.cpp | 1 -
cppcache/src/TcrChunkedContext.hpp | 2 -
cppcache/src/ThinClientPoolDM.hpp | 3 -
cppcache/src/config.h.in | 11 --
dependencies/ACE/CMakeLists.txt | 211 ---------------------
dependencies/ACE/config.h.in | 36 ----
dependencies/ACE/patches | 72 -------
dependencies/CMakeLists.txt | 1 -
tests/cpp/testobject/CMakeLists.txt | 1 -
82 files changed, 25 insertions(+), 514 deletions(-)
diff --git a/cppcache/CMakeLists.txt b/cppcache/CMakeLists.txt
index 5d3a0803e..c9966206b 100644
--- a/cppcache/CMakeLists.txt
+++ b/cppcache/CMakeLists.txt
@@ -89,7 +89,6 @@ elseif (WIN32)
endif()
target_link_libraries(_apache-geode INTERFACE
- ACE::ACE
Boost::boost
Boost::filesystem
Boost::thread
@@ -98,6 +97,7 @@ target_link_libraries(_apache-geode INTERFACE
XercesC::XercesC
OpenSSL::SSL
OpenSSL::Crypto
+ ${CMAKE_DL_LIBS}
)
if (USE_PCH)
diff --git a/cppcache/acceptance-test/CMakeLists.txt b/cppcache/acceptance-test/CMakeLists.txt
index 8889d1052..81fe3a36a 100644
--- a/cppcache/acceptance-test/CMakeLists.txt
+++ b/cppcache/acceptance-test/CMakeLists.txt
@@ -32,7 +32,6 @@ target_link_libraries(cpp-acceptance-test
apache-geode
integration-framework
testobject
- ACE::ACE
GTest::gtest
GTest::gtest_main
Boost::boost
diff --git a/cppcache/integration-test/.clang-format b/cppcache/integration-test/.clang-format
index cbbb6d553..5a5ffead2 100644
--- a/cppcache/integration-test/.clang-format
+++ b/cppcache/integration-test/.clang-format
@@ -61,7 +61,7 @@ ForEachMacros:
- BOOST_FOREACH
IncludeBlocks: Regroup
IncludeCategories:
-- Regex: '^<(ace|boost)/'
+- Regex: '^<(boost)/'
Priority: 3
- Regex: '^<(gtest)/'
Priority: 4
diff --git a/cppcache/integration-test/BuiltinCacheableWrappers.hpp b/cppcache/integration-test/BuiltinCacheableWrappers.hpp
index 4659e04e7..210fe4c79 100644
--- a/cppcache/integration-test/BuiltinCacheableWrappers.hpp
+++ b/cppcache/integration-test/BuiltinCacheableWrappers.hpp
@@ -27,8 +27,6 @@
#include <sstream>
#include <iomanip>
-#include <ace/Date_Time.h>
-
#include "CacheHelper.hpp"
#include "CacheRegionHelper.hpp"
#include "CacheableWrapper.hpp"
diff --git a/cppcache/integration-test/CMakeLists.txt b/cppcache/integration-test/CMakeLists.txt
index 901dff2e0..f56a4e04c 100644
--- a/cppcache/integration-test/CMakeLists.txt
+++ b/cppcache/integration-test/CMakeLists.txt
@@ -27,7 +27,6 @@ add_library(test-cppcache-utils STATIC
target_link_libraries(test-cppcache-utils
PRIVATE
integration-framework
- ACE::ACE
_WarningsAsError
PUBLIC
apache-geode
@@ -52,7 +51,6 @@ add_clangformat(test-cppcache-utils)
add_library(unit_test_callbacks SHARED LibraryCallbacks.cpp)
target_link_libraries(unit_test_callbacks
PRIVATE
- ACE::ACE
_WarningsAsError
PUBLIC
apache-geode
@@ -69,6 +67,10 @@ add_clangformat(unit_test_callbacks)
enable_testing()
+if(UNIX AND NOT APPLE)
+ set(PLATFORM_SPECIFIC_LIBS "rt")
+endif()
+
set(LIBRARY_PATH_ENVIRONMENT_VARIABLE LD_LIBRARY_PATH)
if (APPLE)
set(LIBRARY_PATH_ENVIRONMENT_VARIABLE DYLD_LIBRARY_PATH)
@@ -109,11 +111,11 @@ foreach(FILE ${SOURCES})
target_link_libraries(${TEST}
PRIVATE
- ACE::ACE
Boost::boost
Boost::iostreams
Boost::program_options
test-cppcache-utils
+ ${PLATFORM_SPECIFIC_LIBS}
_WarningsAsError
_CppCodeCoverage
internal
diff --git a/cppcache/integration-test/CacheHelper.cpp b/cppcache/integration-test/CacheHelper.cpp
index 467cc4ae1..e694586d2 100644
--- a/cppcache/integration-test/CacheHelper.cpp
+++ b/cppcache/integration-test/CacheHelper.cpp
@@ -19,9 +19,6 @@
#include <iostream>
#include <list>
-#include <ace/INET_Addr.h>
-#include <ace/SOCK_Acceptor.h>
-
#include <boost/process.hpp>
#include <boost/regex.hpp>
@@ -1382,7 +1379,7 @@ void CacheHelper::terminate_process_file(
pidFileName + ", pid=" + pid);
// Didn't exit on its own, kill it.
- LOG("ACE::terminate_process: pid=" + pid);
+ LOG("terminate_process: pid=" + pid);
boost::process::pid_t id =
static_cast<boost::process::pid_t>(std::stoul(pid));
diff --git a/cppcache/integration-test/CacheHelper.hpp b/cppcache/integration-test/CacheHelper.hpp
index 01143f450..fcaaf4db2 100644
--- a/cppcache/integration-test/CacheHelper.hpp
+++ b/cppcache/integration-test/CacheHelper.hpp
@@ -24,10 +24,6 @@
#include <chrono>
#include <cstdlib>
-#include <ace/OS.h>
-#include <ace/INET_Addr.h>
-#include <ace/SOCK_Acceptor.h>
-
#include <geode/SystemProperties.hpp>
#include <geode/PoolManager.hpp>
diff --git a/cppcache/integration-test/CacheImplHelper.hpp b/cppcache/integration-test/CacheImplHelper.hpp
index 9be99c663..54b604ee2 100644
--- a/cppcache/integration-test/CacheImplHelper.hpp
+++ b/cppcache/integration-test/CacheImplHelper.hpp
@@ -22,7 +22,6 @@
#include <cstdlib>
#include <geode/SystemProperties.hpp>
-#include <ace/OS.h>
#include "testUtils.hpp"
#ifndef ROOT_NAME
diff --git a/cppcache/integration-test/DeltaEx.hpp b/cppcache/integration-test/DeltaEx.hpp
index 8026fd323..75fbb7949 100644
--- a/cppcache/integration-test/DeltaEx.hpp
+++ b/cppcache/integration-test/DeltaEx.hpp
@@ -21,7 +21,6 @@
#define GEODE_INTEGRATION_TEST_DELTAEX_H_
#include "fw_dunit.hpp"
-#include <ace/OS.h>
#include <memory>
#include <geode/PdxSerializable.hpp>
#include <geode/PdxWriter.hpp>
diff --git a/cppcache/integration-test/LibraryCallbacks.cpp b/cppcache/integration-test/LibraryCallbacks.cpp
index 67479bdbf..b03053725 100644
--- a/cppcache/integration-test/LibraryCallbacks.cpp
+++ b/cppcache/integration-test/LibraryCallbacks.cpp
@@ -19,9 +19,6 @@
#include <geode/internal/geode_globals.hpp>
-#include <ace/Time_Value.h>
-#include <ace/OS.h>
-
namespace test {
void dummyFunc() {}
diff --git a/cppcache/integration-test/QueryHelper.hpp b/cppcache/integration-test/QueryHelper.hpp
index 6a23b89a6..6a394bc0e 100644
--- a/cppcache/integration-test/QueryHelper.hpp
+++ b/cppcache/integration-test/QueryHelper.hpp
@@ -22,8 +22,6 @@
#include <cstdlib>
-#include <ace/OS.h>
-
#include <geode/Region.hpp>
#include <geode/ResultSet.hpp>
#include <geode/StructSet.hpp>
diff --git a/cppcache/integration-test/ThinClientDistOps.hpp b/cppcache/integration-test/ThinClientDistOps.hpp
index 02ce304fe..710d0e95d 100644
--- a/cppcache/integration-test/ThinClientDistOps.hpp
+++ b/cppcache/integration-test/ThinClientDistOps.hpp
@@ -21,8 +21,6 @@
#define GEODE_INTEGRATION_TEST_THINCLIENTDISTOPS_H_
#include "fw_dunit.hpp"
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
#include "testobject/PdxType.hpp"
#include <string>
#include <limits>
diff --git a/cppcache/integration-test/ThinClientDistOps2.hpp b/cppcache/integration-test/ThinClientDistOps2.hpp
index 3419dba12..416af77a7 100644
--- a/cppcache/integration-test/ThinClientDistOps2.hpp
+++ b/cppcache/integration-test/ThinClientDistOps2.hpp
@@ -21,7 +21,6 @@
#define GEODE_INTEGRATION_TEST_THINCLIENTDISTOPS2_H_
#include "fw_dunit.hpp"
-#include <ace/OS.h>
#include <string>
#include <vector>
diff --git a/cppcache/integration-test/ThinClientFailover.hpp b/cppcache/integration-test/ThinClientFailover.hpp
index 52337f469..1977e16eb 100644
--- a/cppcache/integration-test/ThinClientFailover.hpp
+++ b/cppcache/integration-test/ThinClientFailover.hpp
@@ -21,9 +21,7 @@
*/
#include "fw_dunit.hpp"
-#include <ace/High_Res_Timer.h>
-#include <ace/OS.h>
#include <string>
#define ROOT_NAME "ThinClientFailover"
diff --git a/cppcache/integration-test/ThinClientFailover2.hpp b/cppcache/integration-test/ThinClientFailover2.hpp
index 35f8aa6a5..36e49b97d 100644
--- a/cppcache/integration-test/ThinClientFailover2.hpp
+++ b/cppcache/integration-test/ThinClientFailover2.hpp
@@ -21,9 +21,7 @@
*/
#include "fw_dunit.hpp"
-#include <ace/High_Res_Timer.h>
-#include <ace/OS.h>
#include <string>
#define ThinClientFailover2 "DistOps"
@@ -341,9 +339,6 @@ END_TASK_DEFINITION
DUNIT_TASK_DEFINITION(CLIENT1, StepOne_Pool_Locator)
{
- char buff[2048];
- char* buf = getcwd(buff, 2048);
- LOG(buf);
initClient(true);
createPooledRegion(regionName, USE_ACK, locatorsG, "__TEST_POOL1__", true);
auto regPtr = getHelper()->getRegion(regionName);
@@ -354,9 +349,6 @@ END_TASK_DEFINITION
DUNIT_TASK_DEFINITION(CLIENT2, StepTwo_Pool_Locator)
{
- char buff[2048];
- char* buf = getcwd(buff, 2048);
- LOG(buf);
initClient(true);
createPooledRegion(regionName, USE_ACK, locatorsG, "__TEST_POOL1__", true);
auto regPtr = getHelper()->getRegion(regionName);
diff --git a/cppcache/integration-test/ThinClientFailover3.hpp b/cppcache/integration-test/ThinClientFailover3.hpp
index e989caacf..4ee7fd9b7 100644
--- a/cppcache/integration-test/ThinClientFailover3.hpp
+++ b/cppcache/integration-test/ThinClientFailover3.hpp
@@ -21,8 +21,6 @@
*/
#include "fw_dunit.hpp"
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
#include <string>
#include <vector>
diff --git a/cppcache/integration-test/ThinClientFailoverInterest.hpp b/cppcache/integration-test/ThinClientFailoverInterest.hpp
index 9b16643aa..da0a9b817 100644
--- a/cppcache/integration-test/ThinClientFailoverInterest.hpp
+++ b/cppcache/integration-test/ThinClientFailoverInterest.hpp
@@ -21,8 +21,6 @@
*/
#include "fw_dunit.hpp"
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
#include <string>
#define ROOT_NAME "ThinClientFailoverInterest"
diff --git a/cppcache/integration-test/ThinClientFailoverInterest2.hpp b/cppcache/integration-test/ThinClientFailoverInterest2.hpp
index 1bd1cd405..504a64842 100644
--- a/cppcache/integration-test/ThinClientFailoverInterest2.hpp
+++ b/cppcache/integration-test/ThinClientFailoverInterest2.hpp
@@ -21,8 +21,6 @@
*/
#include "fw_dunit.hpp"
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
#include <string>
#define ROOT_NAME "ThinClientFailoverInterest2"
diff --git a/cppcache/integration-test/ThinClientFailoverInterestAllWithCache.hpp b/cppcache/integration-test/ThinClientFailoverInterestAllWithCache.hpp
index ce87c571d..018aa470f 100644
--- a/cppcache/integration-test/ThinClientFailoverInterestAllWithCache.hpp
+++ b/cppcache/integration-test/ThinClientFailoverInterestAllWithCache.hpp
@@ -20,8 +20,6 @@
* limitations under the License.
*/
#include "fw_dunit.hpp"
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
#include <string>
#define ROOT_NAME "ThinClientFailoverInterestAllWithCache"
diff --git a/cppcache/integration-test/ThinClientFailoverRegex.hpp b/cppcache/integration-test/ThinClientFailoverRegex.hpp
index 6400c2399..69baa0787 100644
--- a/cppcache/integration-test/ThinClientFailoverRegex.hpp
+++ b/cppcache/integration-test/ThinClientFailoverRegex.hpp
@@ -21,8 +21,6 @@
#define GEODE_INTEGRATION_TEST_THINCLIENTFAILOVERREGEX_H_
#include "fw_dunit.hpp"
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
#include <string>
#define ROOT_NAME "ThinClientFailoverRegex"
diff --git a/cppcache/integration-test/ThinClientHeapLRU.hpp b/cppcache/integration-test/ThinClientHeapLRU.hpp
index de5989d01..d9f7df273 100644
--- a/cppcache/integration-test/ThinClientHeapLRU.hpp
+++ b/cppcache/integration-test/ThinClientHeapLRU.hpp
@@ -21,8 +21,6 @@
#define GEODE_INTEGRATION_TEST_THINCLIENTHEAPLRU_H_
#include "fw_dunit.hpp"
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
#include "BuiltinCacheableWrappers.hpp"
#include <string>
diff --git a/cppcache/integration-test/ThinClientHelper.hpp b/cppcache/integration-test/ThinClientHelper.hpp
index 8fc956682..8ecef8869 100644
--- a/cppcache/integration-test/ThinClientHelper.hpp
+++ b/cppcache/integration-test/ThinClientHelper.hpp
@@ -22,7 +22,6 @@
#include <chrono>
-#include <ace/High_Res_Timer.h>
#include <boost/process.hpp>
diff --git a/cppcache/integration-test/ThinClientInterestList.hpp b/cppcache/integration-test/ThinClientInterestList.hpp
index 73a02622c..528a2cc6e 100644
--- a/cppcache/integration-test/ThinClientInterestList.hpp
+++ b/cppcache/integration-test/ThinClientInterestList.hpp
@@ -20,8 +20,6 @@
* limitations under the License.
*/
#include "fw_dunit.hpp"
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
#include <string>
#define ROOT_NAME "ThinClientInterestList.hpp"
diff --git a/cppcache/integration-test/ThinClientInterestList2.hpp b/cppcache/integration-test/ThinClientInterestList2.hpp
index b33e7014a..b6b8d8c71 100644
--- a/cppcache/integration-test/ThinClientInterestList2.hpp
+++ b/cppcache/integration-test/ThinClientInterestList2.hpp
@@ -21,8 +21,6 @@
#define GEODE_INTEGRATION_TEST_THINCLIENTINTERESTLIST2_H_
#include "fw_dunit.hpp"
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
#include <string>
#define ROOT_NAME "ThinClientInterestList2"
diff --git a/cppcache/integration-test/ThinClientNotification.hpp b/cppcache/integration-test/ThinClientNotification.hpp
index 857770a02..39e72354d 100644
--- a/cppcache/integration-test/ThinClientNotification.hpp
+++ b/cppcache/integration-test/ThinClientNotification.hpp
@@ -21,8 +21,6 @@
*/
#include "fw_dunit.hpp"
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
#include <string>
#define ROOT_NAME "ThinClientNotification"
diff --git a/cppcache/integration-test/ThinClientPdxSerializer.hpp b/cppcache/integration-test/ThinClientPdxSerializer.hpp
index e2833fde8..12cfd1de1 100644
--- a/cppcache/integration-test/ThinClientPdxSerializer.hpp
+++ b/cppcache/integration-test/ThinClientPdxSerializer.hpp
@@ -22,8 +22,6 @@
#include <string>
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
#include "fw_dunit.hpp"
#include "ThinClientHelper.hpp"
diff --git a/cppcache/integration-test/ThinClientPutAll.hpp b/cppcache/integration-test/ThinClientPutAll.hpp
index 027df1b61..37aaa54e7 100644
--- a/cppcache/integration-test/ThinClientPutAll.hpp
+++ b/cppcache/integration-test/ThinClientPutAll.hpp
@@ -24,9 +24,6 @@
#include <sstream>
#include <iomanip>
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
-
#include "fw_dunit.hpp"
#include "testobject/PdxType.hpp"
#include "testobject/VariousPdxTypes.hpp"
diff --git a/cppcache/integration-test/ThinClientPutAllWithCallBack.hpp b/cppcache/integration-test/ThinClientPutAllWithCallBack.hpp
index 5e083844f..7ed18a1e6 100644
--- a/cppcache/integration-test/ThinClientPutAllWithCallBack.hpp
+++ b/cppcache/integration-test/ThinClientPutAllWithCallBack.hpp
@@ -25,8 +25,6 @@
#include <iomanip>
#include "fw_dunit.hpp"
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
#include "testobject/PdxType.hpp"
#include "testobject/VariousPdxTypes.hpp"
diff --git a/cppcache/integration-test/ThinClientPutGetAll.hpp b/cppcache/integration-test/ThinClientPutGetAll.hpp
index cda143f26..2101f949e 100644
--- a/cppcache/integration-test/ThinClientPutGetAll.hpp
+++ b/cppcache/integration-test/ThinClientPutGetAll.hpp
@@ -21,8 +21,6 @@
#define GEODE_INTEGRATION_TEST_THINCLIENTPUTGETALL_H_
#include "fw_dunit.hpp"
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
#include <string>
#include <unordered_map>
diff --git a/cppcache/integration-test/ThinClientRIwithlocalRegionDestroy.hpp b/cppcache/integration-test/ThinClientRIwithlocalRegionDestroy.hpp
index 94037b5ac..b323051f7 100644
--- a/cppcache/integration-test/ThinClientRIwithlocalRegionDestroy.hpp
+++ b/cppcache/integration-test/ThinClientRIwithlocalRegionDestroy.hpp
@@ -21,8 +21,6 @@
*/
#include "fw_dunit.hpp"
#include <geode/RegionEvent.hpp>
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
#include <string>
#define ROOT_NAME "ThinClientRIwithlocalRegionDestroy"
diff --git a/cppcache/integration-test/ThinClientRegex.hpp b/cppcache/integration-test/ThinClientRegex.hpp
index 099157fea..738c1dfd2 100644
--- a/cppcache/integration-test/ThinClientRegex.hpp
+++ b/cppcache/integration-test/ThinClientRegex.hpp
@@ -21,8 +21,6 @@
#define GEODE_INTEGRATION_TEST_THINCLIENTREGEX_H_
#include "fw_dunit.hpp"
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
#include <string>
#define ROOT_NAME "ThinClientRegex"
diff --git a/cppcache/integration-test/ThinClientRegex2.hpp b/cppcache/integration-test/ThinClientRegex2.hpp
index daca6e4e0..fff923ccd 100644
--- a/cppcache/integration-test/ThinClientRegex2.hpp
+++ b/cppcache/integration-test/ThinClientRegex2.hpp
@@ -21,8 +21,6 @@
#define GEODE_INTEGRATION_TEST_THINCLIENTREGEX2_H_
#include "fw_dunit.hpp"
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
#include <string>
#define ROOT_NAME "ThinClientRegex2"
diff --git a/cppcache/integration-test/ThinClientRegex3.hpp b/cppcache/integration-test/ThinClientRegex3.hpp
index 65cdf48c8..614f7ed7e 100644
--- a/cppcache/integration-test/ThinClientRegex3.hpp
+++ b/cppcache/integration-test/ThinClientRegex3.hpp
@@ -20,8 +20,6 @@
* limitations under the License.
*/
#include "fw_dunit.hpp"
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
#include <string>
#define ROOT_NAME "ThinClientRegex3"
diff --git a/cppcache/integration-test/ThinClientRemoveAll.hpp b/cppcache/integration-test/ThinClientRemoveAll.hpp
index c786e3279..60327efd3 100644
--- a/cppcache/integration-test/ThinClientRemoveAll.hpp
+++ b/cppcache/integration-test/ThinClientRemoveAll.hpp
@@ -24,8 +24,6 @@
#define ROOT_SCOPE DISTRIBUTED_ACK
#include "fw_dunit.hpp"
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
#include "testobject/PdxType.hpp"
#include "testobject/VariousPdxTypes.hpp"
#include <string>
diff --git a/cppcache/integration-test/ThinClientTXFailover.hpp b/cppcache/integration-test/ThinClientTXFailover.hpp
index 40ad31292..6a59042b7 100644
--- a/cppcache/integration-test/ThinClientTXFailover.hpp
+++ b/cppcache/integration-test/ThinClientTXFailover.hpp
@@ -21,9 +21,7 @@
*/
#include "fw_dunit.hpp"
-#include <ace/High_Res_Timer.h>
-#include <ace/OS.h>
#include <string>
#include <geode/CacheTransactionManager.hpp>
diff --git a/cppcache/integration-test/fw_helper.hpp b/cppcache/integration-test/fw_helper.hpp
index dedd4b4ed..9967af2ed 100644
--- a/cppcache/integration-test/fw_helper.hpp
+++ b/cppcache/integration-test/fw_helper.hpp
@@ -89,8 +89,6 @@ BEGIN_TEST.
#include <string>
#include <typeinfo>
-#include <ace/ACE.h>
-#include <ace/OS.h>
#include <geode/Exception.hpp>
@@ -107,7 +105,7 @@ BEGIN_TEST.
#define ASSERT_EQ(x, y) _ASSERT_EQ(x, y, __LINE__, __FILE__)
#define ASSERT_STREQ(x, y) \
- ASSERT((strcmp(x, y) == 0), \
+ ASSERT(x == y, \
(std::string("Assert: " #x " == " #y ", Expected: \"") + x + \
"\", Actual: \"" + y + "\"") \
.c_str())
diff --git a/cppcache/integration-test/testCreateAndDestroyPool.cpp b/cppcache/integration-test/testCreateAndDestroyPool.cpp
index 8df84fcb8..19806c3e3 100644
--- a/cppcache/integration-test/testCreateAndDestroyPool.cpp
+++ b/cppcache/integration-test/testCreateAndDestroyPool.cpp
@@ -15,9 +15,7 @@
* limitations under the License.
*/
#include "fw_dunit.hpp"
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
-#include <ace/Task.h>
+
#include <string>
#define ROOT_NAME "testCreateAndDestroyPool"
diff --git a/cppcache/integration-test/testPdxMetadataCheckTest.cpp b/cppcache/integration-test/testPdxMetadataCheckTest.cpp
index d8002165f..30f38b906 100644
--- a/cppcache/integration-test/testPdxMetadataCheckTest.cpp
+++ b/cppcache/integration-test/testPdxMetadataCheckTest.cpp
@@ -19,9 +19,6 @@
#include "fw_dunit.hpp"
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
-
#include <geode/PdxInstance.hpp>
#include <geode/UserFunctionExecutionException.hpp>
#include <geode/FunctionService.hpp>
diff --git a/cppcache/integration-test/testSystemProperties.cpp b/cppcache/integration-test/testSystemProperties.cpp
index b60da7f7b..b865f4627 100644
--- a/cppcache/integration-test/testSystemProperties.cpp
+++ b/cppcache/integration-test/testSystemProperties.cpp
@@ -40,8 +40,8 @@ bool checkSecurityProperties(std::shared_ptr<Properties> securityProperties,
if (tempValue == nullptr) {
return (false);
}
- flag = strcmp(tempValue->value().c_str(), value);
- return (!flag);
+
+ return tempValue->value() == value;
}
BEGIN_TEST(DEFAULT)
@@ -58,7 +58,7 @@ BEGIN_TEST(DEFAULT)
ASSERT(statisticsArchiveFileName == "statArchive.gfs",
"Expected statisticsArchiveFileName == \"statArchive.gfs\"");
auto &&logLevel = Log::levelToChars(systemProperties->logLevel());
- ASSERT_STREQ("config", logLevel);
+ ASSERT_STREQ(std::string{"config"}, logLevel);
delete systemProperties;
}
END_TEST(DEFAULT)
diff --git a/cppcache/integration-test/testThinClientCacheableStringArray.cpp b/cppcache/integration-test/testThinClientCacheableStringArray.cpp
index bd58a146d..3f3f00e4b 100644
--- a/cppcache/integration-test/testThinClientCacheableStringArray.cpp
+++ b/cppcache/integration-test/testThinClientCacheableStringArray.cpp
@@ -15,9 +15,7 @@
* limitations under the License.
*/
#include "fw_dunit.hpp"
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
-#include <ace/Task.h>
+
#include <string>
#define ROOT_NAME "TestThinClientCacheableStringArray"
diff --git a/cppcache/integration-test/testThinClientCacheables.cpp b/cppcache/integration-test/testThinClientCacheables.cpp
index 8aa1f2261..2762e8702 100644
--- a/cppcache/integration-test/testThinClientCacheables.cpp
+++ b/cppcache/integration-test/testThinClientCacheables.cpp
@@ -22,9 +22,6 @@
#include "BuiltinCacheableWrappers.hpp"
#include "Utils.hpp"
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
-
#include <iostream>
#include <string>
diff --git a/cppcache/integration-test/testThinClientCacheablesLimits.cpp b/cppcache/integration-test/testThinClientCacheablesLimits.cpp
index 4d13e04c5..bb6c17cd7 100644
--- a/cppcache/integration-test/testThinClientCacheablesLimits.cpp
+++ b/cppcache/integration-test/testThinClientCacheablesLimits.cpp
@@ -21,9 +21,6 @@
#include "fw_dunit.hpp"
#include "BuiltinCacheableWrappers.hpp"
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
-
#include <cstring>
#include "CacheHelper.hpp"
diff --git a/cppcache/integration-test/testThinClientCq.cpp b/cppcache/integration-test/testThinClientCq.cpp
index a8c597fa5..987a5a8ca 100644
--- a/cppcache/integration-test/testThinClientCq.cpp
+++ b/cppcache/integration-test/testThinClientCq.cpp
@@ -19,7 +19,6 @@
#include <geode/CqListener.hpp>
#include <geode/CqStatusListener.hpp>
#include <geode/CqServiceStatistics.hpp>
-#include <ace/OS.h>
#include <string>
#include <sstream>
diff --git a/cppcache/integration-test/testThinClientCqDurable.cpp b/cppcache/integration-test/testThinClientCqDurable.cpp
index d77d6cbc1..d0785fee8 100644
--- a/cppcache/integration-test/testThinClientCqDurable.cpp
+++ b/cppcache/integration-test/testThinClientCqDurable.cpp
@@ -20,9 +20,6 @@
#include <thread>
#include <chrono>
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
-
#include <geode/CqAttributesFactory.hpp>
#include <geode/CqAttributes.hpp>
#include <geode/CqListener.hpp>
diff --git a/cppcache/integration-test/testThinClientCqFailover.cpp b/cppcache/integration-test/testThinClientCqFailover.cpp
index 2ae52d607..07b7d1a4f 100644
--- a/cppcache/integration-test/testThinClientCqFailover.cpp
+++ b/cppcache/integration-test/testThinClientCqFailover.cpp
@@ -19,9 +19,7 @@
#include <geode/CqAttributes.hpp>
#include <geode/CqListener.hpp>
#include <geode/CqQuery.hpp>
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
-#include <ace/Task.h>
+
#include <string>
#define ROOT_NAME "TestThinClientCqFailover"
diff --git a/cppcache/integration-test/testThinClientCqHAFailover.cpp b/cppcache/integration-test/testThinClientCqHAFailover.cpp
index 31a18742b..2006fa937 100644
--- a/cppcache/integration-test/testThinClientCqHAFailover.cpp
+++ b/cppcache/integration-test/testThinClientCqHAFailover.cpp
@@ -19,9 +19,7 @@
#include <geode/CqAttributes.hpp>
#include <geode/CqListener.hpp>
#include <geode/CqQuery.hpp>
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
-#include <ace/Task.h>
+
#include <string>
#define ROOT_NAME "TestThinClientCqHAFailover"
diff --git a/cppcache/integration-test/testThinClientCqIR.cpp b/cppcache/integration-test/testThinClientCqIR.cpp
index a0c724e4e..a6d818bb7 100644
--- a/cppcache/integration-test/testThinClientCqIR.cpp
+++ b/cppcache/integration-test/testThinClientCqIR.cpp
@@ -15,8 +15,6 @@
* limitations under the License.
*/
#include "fw_dunit.hpp"
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
#include <string>
#include <geode/CqAttributesFactory.hpp>
#include <geode/CqAttributes.hpp>
diff --git a/cppcache/integration-test/testThinClientFixedPartitionResolver.cpp b/cppcache/integration-test/testThinClientFixedPartitionResolver.cpp
index c744a41ec..8d3775b6b 100644
--- a/cppcache/integration-test/testThinClientFixedPartitionResolver.cpp
+++ b/cppcache/integration-test/testThinClientFixedPartitionResolver.cpp
@@ -18,8 +18,6 @@
#include "BuiltinCacheableWrappers.hpp"
#include "Utils.hpp"
#include <geode/FixedPartitionResolver.hpp>
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
#include <string>
diff --git a/cppcache/integration-test/testThinClientHADistOps.cpp b/cppcache/integration-test/testThinClientHADistOps.cpp
index 29b0f4911..23a213873 100644
--- a/cppcache/integration-test/testThinClientHADistOps.cpp
+++ b/cppcache/integration-test/testThinClientHADistOps.cpp
@@ -15,8 +15,6 @@
* limitations under the License.
*/
#include "fw_dunit.hpp"
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
#include <string>
diff --git a/cppcache/integration-test/testThinClientHAEventIDMap.cpp b/cppcache/integration-test/testThinClientHAEventIDMap.cpp
index d3e374053..7c6225f48 100644
--- a/cppcache/integration-test/testThinClientHAEventIDMap.cpp
+++ b/cppcache/integration-test/testThinClientHAEventIDMap.cpp
@@ -20,9 +20,6 @@
#include <thread>
#include <chrono>
-#include <ace/High_Res_Timer.h>
-#include <ace/OS.h>
-
#include <geode/EntryEvent.hpp>
#define ROOT_NAME "testThinClientHAEventIDMap"
diff --git a/cppcache/integration-test/testThinClientHAFailover.cpp b/cppcache/integration-test/testThinClientHAFailover.cpp
index 827431730..6880c0972 100644
--- a/cppcache/integration-test/testThinClientHAFailover.cpp
+++ b/cppcache/integration-test/testThinClientHAFailover.cpp
@@ -15,9 +15,7 @@
* limitations under the License.
*/
#include "fw_dunit.hpp"
-#include <ace/High_Res_Timer.h>
-#include <ace/OS.h>
#include <string>
#define ROOT_NAME "testThinClientHAFailover"
diff --git a/cppcache/integration-test/testThinClientHAFailoverRegex.cpp b/cppcache/integration-test/testThinClientHAFailoverRegex.cpp
index 253bbac4e..5a8195543 100644
--- a/cppcache/integration-test/testThinClientHAFailoverRegex.cpp
+++ b/cppcache/integration-test/testThinClientHAFailoverRegex.cpp
@@ -15,9 +15,7 @@
* limitations under the License.
*/
#include "fw_dunit.hpp"
-#include <ace/High_Res_Timer.h>
-#include <ace/OS.h>
#include <string>
#define ROOT_NAME "testThinClientHAFailoverRegex"
diff --git a/cppcache/integration-test/testThinClientHAMixedRedundancy.cpp b/cppcache/integration-test/testThinClientHAMixedRedundancy.cpp
index 355df763e..ee14bf9b3 100644
--- a/cppcache/integration-test/testThinClientHAMixedRedundancy.cpp
+++ b/cppcache/integration-test/testThinClientHAMixedRedundancy.cpp
@@ -15,9 +15,7 @@
* limitations under the License.
*/
#include "fw_dunit.hpp"
-#include <ace/High_Res_Timer.h>
-#include <ace/OS.h>
#include <string>
#define ROOT_NAME "testThinClientHAMixedRedundancy"
diff --git a/cppcache/integration-test/testThinClientHAPeriodicAck.cpp b/cppcache/integration-test/testThinClientHAPeriodicAck.cpp
index 964f5d0ea..b6fc81b1f 100644
--- a/cppcache/integration-test/testThinClientHAPeriodicAck.cpp
+++ b/cppcache/integration-test/testThinClientHAPeriodicAck.cpp
@@ -20,9 +20,6 @@
#include <thread>
#include <chrono>
-#include <ace/High_Res_Timer.h>
-#include <ace/OS.h>
-
#include <geode/EntryEvent.hpp>
#define ROOT_NAME "testThinClientHAPeriodicAck"
diff --git a/cppcache/integration-test/testThinClientHAQueryFailover.cpp b/cppcache/integration-test/testThinClientHAQueryFailover.cpp
index afd217895..9e0b80af0 100644
--- a/cppcache/integration-test/testThinClientHAQueryFailover.cpp
+++ b/cppcache/integration-test/testThinClientHAQueryFailover.cpp
@@ -15,9 +15,7 @@
* limitations under the License.
*/
#include "fw_dunit.hpp"
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
-#include <ace/Task.h>
+
#include <string>
#define ROOT_NAME "testThinClientHAQueryFailover"
diff --git a/cppcache/integration-test/testThinClientHeapLRU.cpp b/cppcache/integration-test/testThinClientHeapLRU.cpp
index d14bc6b85..ff99cf8f5 100644
--- a/cppcache/integration-test/testThinClientHeapLRU.cpp
+++ b/cppcache/integration-test/testThinClientHeapLRU.cpp
@@ -19,8 +19,6 @@
#define ROOT_SCOPE DISTRIBUTED_ACK
#include "fw_dunit.hpp"
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
#include "BuiltinCacheableWrappers.hpp"
#include <string>
diff --git a/cppcache/integration-test/testThinClientIntResPolKeysInv.cpp b/cppcache/integration-test/testThinClientIntResPolKeysInv.cpp
index 210b6a3c1..12f78f65c 100644
--- a/cppcache/integration-test/testThinClientIntResPolKeysInv.cpp
+++ b/cppcache/integration-test/testThinClientIntResPolKeysInv.cpp
@@ -15,8 +15,6 @@
* limitations under the License.
*/
#include "fw_dunit.hpp"
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
#include <string>
#define ROOT_NAME "testThinClientIntResPolKeysInv"
diff --git a/cppcache/integration-test/testThinClientLRUExpiration.cpp b/cppcache/integration-test/testThinClientLRUExpiration.cpp
index 7fdb66bdf..94f334630 100644
--- a/cppcache/integration-test/testThinClientLRUExpiration.cpp
+++ b/cppcache/integration-test/testThinClientLRUExpiration.cpp
@@ -19,9 +19,6 @@
#include <string>
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
-
#include <geode/internal/chrono/duration.hpp>
#define ROOT_NAME "testThinClientLRUExpiration"
diff --git a/cppcache/integration-test/testThinClientPRPutAllFailover.cpp b/cppcache/integration-test/testThinClientPRPutAllFailover.cpp
index 5fab053ff..c5c7d53a2 100644
--- a/cppcache/integration-test/testThinClientPRPutAllFailover.cpp
+++ b/cppcache/integration-test/testThinClientPRPutAllFailover.cpp
@@ -22,8 +22,6 @@
#include "BuiltinCacheableWrappers.hpp"
#include "Utils.hpp"
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
#include "TallyListener.hpp"
#include <string>
#include "CacheHelper.hpp"
diff --git a/cppcache/integration-test/testThinClientPartitionResolver.cpp b/cppcache/integration-test/testThinClientPartitionResolver.cpp
index 0d4dde265..098f900d4 100644
--- a/cppcache/integration-test/testThinClientPartitionResolver.cpp
+++ b/cppcache/integration-test/testThinClientPartitionResolver.cpp
@@ -22,8 +22,6 @@
#include "BuiltinCacheableWrappers.hpp"
#include "Utils.hpp"
#include <geode/PartitionResolver.hpp>
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
#include <string>
diff --git a/cppcache/integration-test/testThinClientPdxTests.cpp b/cppcache/integration-test/testThinClientPdxTests.cpp
index a575837d6..7c3869316 100644
--- a/cppcache/integration-test/testThinClientPdxTests.cpp
+++ b/cppcache/integration-test/testThinClientPdxTests.cpp
@@ -32,9 +32,6 @@ END_MAIN*/
#include "fw_dunit.hpp"
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
-
#include <geode/PdxInstance.hpp>
#include <geode/UserFunctionExecutionException.hpp>
#include <geode/FunctionService.hpp>
diff --git a/cppcache/integration-test/testThinClientRegionQueryExclusiveness.cpp b/cppcache/integration-test/testThinClientRegionQueryExclusiveness.cpp
index 8f9346b3c..b2f53f239 100644
--- a/cppcache/integration-test/testThinClientRegionQueryExclusiveness.cpp
+++ b/cppcache/integration-test/testThinClientRegionQueryExclusiveness.cpp
@@ -16,9 +16,7 @@
*/
#include "fw_dunit.hpp"
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
-#include <ace/Task.h>
+
#include <string>
#define ROOT_NAME "testThinClientRegionQueryExclusiveness"
diff --git a/cppcache/integration-test/testThinClientRemoteQueryFailover.cpp b/cppcache/integration-test/testThinClientRemoteQueryFailover.cpp
index 80255bd5e..ecbcb4524 100644
--- a/cppcache/integration-test/testThinClientRemoteQueryFailover.cpp
+++ b/cppcache/integration-test/testThinClientRemoteQueryFailover.cpp
@@ -16,9 +16,7 @@
*/
#include "fw_dunit.hpp"
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
-#include <ace/Task.h>
+
#include <string>
#define ROOT_NAME "testThinClientRemoteQueryFailover"
diff --git a/cppcache/integration-test/testThinClientRemoteQueryFailoverPdx.cpp b/cppcache/integration-test/testThinClientRemoteQueryFailoverPdx.cpp
index 88ca23348..c7c65dbe5 100644
--- a/cppcache/integration-test/testThinClientRemoteQueryFailoverPdx.cpp
+++ b/cppcache/integration-test/testThinClientRemoteQueryFailoverPdx.cpp
@@ -15,9 +15,7 @@
* limitations under the License.
*/
#include "fw_dunit.hpp"
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
-#include <ace/Task.h>
+
#include <string>
#define ROOT_NAME "testThinClientRemoteQueryFailoverPdx"
diff --git a/cppcache/integration-test/testThinClientRemoteQueryRS.cpp b/cppcache/integration-test/testThinClientRemoteQueryRS.cpp
index 43ccb3137..54ba991cf 100644
--- a/cppcache/integration-test/testThinClientRemoteQueryRS.cpp
+++ b/cppcache/integration-test/testThinClientRemoteQueryRS.cpp
@@ -15,8 +15,6 @@
* limitations under the License.
*/
#include "fw_dunit.hpp"
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
#include <string>
#define ROOT_NAME "testThinClientRemoteQueryRS"
diff --git a/cppcache/integration-test/testThinClientRemoteQuerySS.cpp b/cppcache/integration-test/testThinClientRemoteQuerySS.cpp
index 67cb46295..7b98affb3 100644
--- a/cppcache/integration-test/testThinClientRemoteQuerySS.cpp
+++ b/cppcache/integration-test/testThinClientRemoteQuerySS.cpp
@@ -15,8 +15,6 @@
* limitations under the License.
*/
#include "fw_dunit.hpp"
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
#include <string>
#define ROOT_NAME "testThinClientRemoteQuerySS"
diff --git a/cppcache/integration-test/testThinClientRemoteQueryTimeout.cpp b/cppcache/integration-test/testThinClientRemoteQueryTimeout.cpp
index bf0114d6b..f2555f57a 100644
--- a/cppcache/integration-test/testThinClientRemoteQueryTimeout.cpp
+++ b/cppcache/integration-test/testThinClientRemoteQueryTimeout.cpp
@@ -15,8 +15,6 @@
* limitations under the License.
*/
#include "fw_dunit.hpp"
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
#include <string>
#define ROOT_NAME "testThinClientRemoteQueryTimeout"
diff --git a/cppcache/integration-test/testThinClientRemoteRegionQuery.cpp b/cppcache/integration-test/testThinClientRemoteRegionQuery.cpp
index fbd2c105c..e11ad7e65 100644
--- a/cppcache/integration-test/testThinClientRemoteRegionQuery.cpp
+++ b/cppcache/integration-test/testThinClientRemoteRegionQuery.cpp
@@ -15,8 +15,6 @@
* limitations under the License.
*/
#include "fw_dunit.hpp"
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
#include <string>
#define ROOT_NAME "testThinClientRemoteRegionQuery"
diff --git a/cppcache/integration-test/testThinClientRemoveOps.cpp b/cppcache/integration-test/testThinClientRemoveOps.cpp
index 59d91181c..3f20c0c9e 100644
--- a/cppcache/integration-test/testThinClientRemoveOps.cpp
+++ b/cppcache/integration-test/testThinClientRemoveOps.cpp
@@ -16,8 +16,6 @@
*/
#include "fw_dunit.hpp"
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
#include "testobject/PdxType.hpp"
#include "testobject/VariousPdxTypes.hpp"
diff --git a/cppcache/integration-test/testThinClientSecurityAuthenticationSetAuthInitialize.cpp b/cppcache/integration-test/testThinClientSecurityAuthenticationSetAuthInitialize.cpp
index eb443eaa5..c3600cb3b 100644
--- a/cppcache/integration-test/testThinClientSecurityAuthenticationSetAuthInitialize.cpp
+++ b/cppcache/integration-test/testThinClientSecurityAuthenticationSetAuthInitialize.cpp
@@ -15,9 +15,6 @@
* limitations under the License.
*/
-#include <ace/OS.h>
-#include <ace/High_Res_Timer.h>
-
#include <geode/AuthInitialize.hpp>
#include "fw_dunit.hpp"
diff --git a/cppcache/integration-test/testThinClientSecurityPostAuthorization.cpp b/cppcache/integration-test/testThinClientSecurityPostAuthorization.cpp
index a54ffd5e9..4dc6d0546 100644
--- a/cppcache/integration-test/testThinClientSecurityPostAuthorization.cpp
+++ b/cppcache/integration-test/testThinClientSecurityPostAuthorization.cpp
@@ -26,7 +26,7 @@
#include "fw_dunit.hpp"
#include "CacheHelper.hpp"
#include "ThinClientHelper.hpp"
-#include <ace/Process.h>
+
#include <string>
#include "ThinClientSecurity.hpp"
diff --git a/cppcache/integration/test/CMakeLists.txt b/cppcache/integration/test/CMakeLists.txt
index a84f5577e..ab05a0a06 100644
--- a/cppcache/integration/test/CMakeLists.txt
+++ b/cppcache/integration/test/CMakeLists.txt
@@ -94,7 +94,6 @@ target_link_libraries(cpp-integration-test
apache-geode
integration-framework
testobject
- ACE::ACE
GTest::gtest
GTest::gtest_main
GTest::gmock
diff --git a/cppcache/src/CppCacheLibrary.cpp b/cppcache/src/CppCacheLibrary.cpp
index 45e101bbe..58743a93c 100644
--- a/cppcache/src/CppCacheLibrary.cpp
+++ b/cppcache/src/CppCacheLibrary.cpp
@@ -19,9 +19,6 @@
#include <iostream>
-#include <ace/ACE.h>
-#include <ace/Init_ACE.h>
-
#include "Utils.hpp"
void initLibDllEntry(void) {
@@ -36,18 +33,15 @@ namespace apache {
namespace geode {
namespace client {
-void CppCacheLibrary::initLib(void) { ACE::init(); }
+void CppCacheLibrary::initLib(void) {}
-void CppCacheLibrary::closeLib(void) {
- // DO NOT CALL ACE::fini() HERE!
- // Things might be using ace beyond the life of Geode.
-}
+void CppCacheLibrary::closeLib(void) {}
std::string CppCacheLibrary::initProductLibDir() {
// otherwise... get the DLL path, and work backwards from it.
- char buffer[PATH_MAX + 1];
+ char buffer[4097];
buffer[0] = '\0';
- DllMainGetPath(buffer, PATH_MAX);
+ DllMainGetPath(buffer, 4096);
std::string path(buffer);
diff --git a/cppcache/src/LRUEntriesMap.cpp b/cppcache/src/LRUEntriesMap.cpp
index 2e9413f02..59209ce63 100644
--- a/cppcache/src/LRUEntriesMap.cpp
+++ b/cppcache/src/LRUEntriesMap.cpp
@@ -440,7 +440,6 @@ GfErrType LRUEntriesMap::remove(const std::shared_ptr<CacheableKey>& key,
GfErrType err;
if ((err = segmentRPtr->remove(key, result, me, updateCount, versionTag,
afterRemote, isEntryFound)) == GF_NOERR) {
- // ACE_Guard<MapSegment> _guard(*segmentRPtr);
if (result != nullptr && me != nullptr) {
lru_queue_.remove(me);
LRUEntryProperties& lru_prop = me->getLRUProperties();
diff --git a/cppcache/src/TcrChunkedContext.hpp b/cppcache/src/TcrChunkedContext.hpp
index b90e87ec8..01afed612 100644
--- a/cppcache/src/TcrChunkedContext.hpp
+++ b/cppcache/src/TcrChunkedContext.hpp
@@ -23,8 +23,6 @@
#include <memory>
#include <string>
-#include <ace/Semaphore.h>
-
#include "Utils.hpp"
#include "util/concurrent/binary_semaphore.hpp"
diff --git a/cppcache/src/ThinClientPoolDM.hpp b/cppcache/src/ThinClientPoolDM.hpp
index 9219c03aa..b6bde209f 100644
--- a/cppcache/src/ThinClientPoolDM.hpp
+++ b/cppcache/src/ThinClientPoolDM.hpp
@@ -27,9 +27,6 @@
#include <string>
#include <vector>
-#include <ace/Semaphore.h>
-#include <ace/Time_Value.h>
-
#include <geode/Pool.hpp>
#include <geode/ResultCollector.hpp>
diff --git a/cppcache/src/config.h.in b/cppcache/src/config.h.in
index fa51c86fb..c0384561b 100644
--- a/cppcache/src/config.h.in
+++ b/cppcache/src/config.h.in
@@ -31,7 +31,6 @@
#cmakedefine HAVE_uname
#cmakedefine HAVE_SIGSTKFLT
-#cmakedefine HAVE_ACE_Select_Reactor
// TODO replace with better CMake checks
#cmakedefine _LINUX
@@ -49,16 +48,6 @@
#define GEODE_SYSTEM_PROCESSOR "@CMAKE_SYSTEM_PROCESSOR@"
#define GEODE_SYSTEM_NAME "@CMAKE_SYSTEM_NAME@"
-// TODO relace with CMake checks
-#define WITH_ACE_Select_Reactor 1
-
-// ACE_Thread is a pointer on MacOS *only*
-#if defined(_MACOSX)
-#define ACE_Thread_NULL nullptr
-#else
-#define ACE_Thread_NULL 0
-#endif
-
#cmakedefine WITH_IPV6
#endif // GEODE_CONFIG_H_
diff --git a/dependencies/ACE/CMakeLists.txt b/dependencies/ACE/CMakeLists.txt
deleted file mode 100644
index 6f8975a1f..000000000
--- a/dependencies/ACE/CMakeLists.txt
+++ /dev/null
@@ -1,211 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-project( ACE VERSION 7.0.6 LANGUAGES NONE )
-
-set( SHA256 a1da2213312399c36b0d8a9f54e608eb65357e131e6873d5edba771323179a45 )
-
-if ("SunOS" STREQUAL ${CMAKE_SYSTEM_NAME})
- set( ACE_PLATFORM sunos5_sunc++ )
- set( ACE_CONFIG sunos${CMAKE_SYSTEM_VERSION} )
-elseif ("Linux" STREQUAL ${CMAKE_SYSTEM_NAME} )
- if ("Clang" STREQUAL ${CMAKE_CXX_COMPILER_ID})
- set( ACE_PLATFORM linux_clang )
- else()
- set( ACE_PLATFORM linux )
- endif()
- set( ACE_CONFIG linux )
-elseif ("Darwin" STREQUAL ${CMAKE_SYSTEM_NAME})
- set(ACE_PLATFORM macosx)
- set(ACE_CONFIG macosx)
- foreach(arch ${CMAKE_OSX_ARCHITECTURES})
- string(APPEND CMAKE_CXX_FLAGS " -arch ${arch}")
- string(APPEND CMAKE_STATIC_LINKER_FLAGS " -arch ${arch}")
- endforeach()
- string(APPEND CMAKE_CXX_FLAGS " ${CMAKE_CXX_SYSROOT_FLAG} ${CMAKE_OSX_SYSROOT}")
- string(APPEND CMAKE_CXX_FLAGS " ${CMAKE_CXX_OSX_DEPLOYMENT_TARGET_FLAG}${CMAKE_OSX_DEPLOYMENT_TARGET}")
-elseif ("Windows" STREQUAL ${CMAKE_SYSTEM_NAME} )
- set( ACE_PLATFORM win32-msvc )
- set( ACE_CONFIG win32 )
-endif()
-
-if (NOT DEFINED ACE_PLATFORM)
- message( FATAL_ERROR "ACE_PLATFORM unset for ${CMAKE_SYSTEM_NAME}" )
-endif()
-
-set(ENV_COMMAND ${CMAKE_COMMAND} -E env ACE_ROOT=<SOURCE_DIR>)
-
-if (${WIN32})
- if (64 EQUAL ${BUILD_BITS})
- set( _PLATFORM x64 )
- else()
- set( _PLATFORM win32 )
- endif()
- if (MSVC_TOOLSET_VERSION EQUAL 140)
- set(MPC_TYPE "vc14")
- elseif(MSVC_TOOLSET_VERSION EQUAL 141)
- set(MPC_TYPE "vs2017")
- elseif(MSVC_TOOLSET_VERSION GREATER_EQUAL 142)
- set(MPC_TYPE "vs2019")
- endif()
-
- set ( _COMMAND_PREFIX ${CMAKE_COMMAND} -E chdir ace )
-
- set ( _MSBUILD_FLAGS /m /p:Platform=${_PLATFORM} /p:Configuration=$<$<CONFIG:Debug>:Debug>$<$<NOT:$<CONFIG:Debug>>:Release>)
-
- if(CMAKE_GENERATOR_TOOLSET MATCHES "version=([0-9]+\.[0-9]+\.[0-9]+)")
- list(APPEND _MSBUILD_FLAGS /p:VCToolsVersion=${CMAKE_MATCH_1})
- endif()
-
- set ( _MSBUILD_FLAGS_STATIC ${_MSBUILD_FLAGS} /t:ace_${MPC_TYPE}_static )
-
- include(ProcessorCount)
- ProcessorCount(_NPROCS)
-
- find_package(Perl REQUIRED)
-
- set ( MPC ${PERL_EXECUTABLE} ../bin/mwc.pl )
- set ( MPC_FLAGS -type ${MPC_TYPE} -recurse -hierarchy -workers ${_NPROCS} -apply_project )
-
- #TODO add custom targets to build in parallel?
- #TODO MPC has flag to replace variables with absolute paths, think we need that for devstudio builds
- set ( _CONFIGURE_COMMAND ${MPC} -static ${MPC_FLAGS}
- -name_modifier "*_${MPC_TYPE}_static"
- -value_template MultiProcessorCompilation=true
- -value_template WindowsTargetPlatformVersion=${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}
- -value_template staticflags+=__ACE_INLINE__
- -value_template staticflags+=ACE_BUILD_DLL
- -value_template staticflags+=ACE_AS_STATIC_LIBS
- -value_template runtime_library=Multithreaded$<$<CONFIG:Debug>:Debug>Dll
- )
- set ( _BUILD_COMMAND ${CMAKE_VS_MSBUILD_COMMAND} ACE_${MPC_TYPE}_static.sln ${_MSBUILD_FLAGS_STATIC}
- )
- set ( _INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/lib <INSTALL_DIR>/lib
- COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/ace <INSTALL_DIR>/include/ace
- )
-
- if(MSVC_TOOLSET_VERSION LESS 142)
- set ( _INSTALL_COMMAND ${_INSTALL_COMMAND}
- COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/ace/Static_$<$<CONFIG:Debug>:Debug>$<$<NOT:$<CONFIG:Debug>>:Release>/ace_${MPC_TYPE}_static/AMD64/ACE_${MPC_TYPE}_static.pdb <INSTALL_DIR>/lib
- )
- endif()
-
- set(CMAKE_STATIC_LIBRARY_SUFFIX s$<${MSVC}:$<$<CONFIG:Debug>:d>>.lib)
-
-else()
- # TODO Configure trips up without MAKE
- set( _MAKE $(MAKE) SHELL=/bin/bash debug=$<CONFIG:Debug> optimize=$<NOT:$<CONFIG:Debug>> buildbits=${BUILD_BITS} c++11=1 static_libs_only=1 ${_MAKE_ARGS})
- set ( _CONFIGURE_COMMAND "" )
- set ( _BUILD_COMMAND ${_MAKE} all )
- set ( _INSTALL_COMMAND ${_MAKE} install )
-endif()
-
-string(REPLACE "." "_" _VERSION_UNDERSCORE ${PROJECT_VERSION})
-
-set( EXTERN ${PROJECT_NAME}-extern )
-include(ExternalProject)
-ExternalProject_Add( ${EXTERN}
- URL "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${_VERSION_UNDERSCORE}/ACE-${PROJECT_VERSION}.tar.gz"
- URL_HASH SHA256=${SHA256}
- UPDATE_COMMAND ""
- SOURCE_SUBDIR "ace"
- BUILD_IN_SOURCE 1
- CONFIGURE_COMMAND "${_CONFIGURE_COMMAND}"
- BUILD_COMMAND ${ENV_COMMAND} ${_BUILD_COMMAND}
- INSTALL_COMMAND ${ENV_COMMAND} ${_INSTALL_COMMAND}
- DEPENDS ${DEPENDS}
-)
-
-ExternalProject_Get_Property( ${EXTERN} SOURCE_DIR )
-set( SOURCE_DIR ${SOURCE_DIR} )
-ExternalProject_Get_Property( ${EXTERN} INSTALL_DIR )
-set( INSTALL_DIR ${INSTALL_DIR} )
-set( DEPENDENCIES_DIR ${INSTALL_DIR} PARENT_SCOPE)
-
-if ("SunOS" STREQUAL ${CMAKE_SYSTEM_NAME})
-set( PATCH_FILE ${CMAKE_CURRENT_SOURCE_DIR}/patches )
-ExternalProject_Add_Step( ${EXTERN} patches
- ALWAYS 0
- DEPENDEES download
- DEPENDERS patch
- DEPENDS ${PATCH_FILE}
- BYPRODUCTS ${SOURCE_DIR}/include/makeinclude/platform_sunos5_sunc++.GNU ${SOURCE_DIR}/ace/config-lite.h ${SOURCE_DIR}/ace/Stats.cpp
- WORKING_DIRECTORY ${SOURCE_DIR}
- COMMAND ${Patch_EXECUTABLE} -u -N -p1 < ${PATCH_FILE}
-)
-endif()
-
-configure_file(config.h.in config.h)
-ExternalProject_Add_Step( ${EXTERN} config.h
- DEPENDEES patch
- DEPENDERS configure
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/config.h
- BYPRODUCTS ${SOURCE_DIR}/ace/config.h
- COMMAND ${CMAKE_COMMAND} -E copy config.h ${SOURCE_DIR}/ace/config.h
-)
-
-if (UNIX)
-ExternalProject_Add_Step( ${EXTERN} platform
- DEPENDEES patch
- DEPENDERS configure
- BYPRODUCTS ${SOURCE_DIR}/include/makeinclude/platform_macros.GNU
- COMMAND echo "INSTALL_PREFIX = ${INSTALL_DIR}" > ${SOURCE_DIR}/include/makeinclude/platform_macros.GNU
- COMMAND echo "CC = ${CMAKE_C_COMPILER}" >> ${SOURCE_DIR}/include/makeinclude/platform_macros.GNU
- COMMAND echo "CXX = ${CMAKE_CXX_COMPILER}" >> ${SOURCE_DIR}/include/makeinclude/platform_macros.GNU
- COMMAND echo "CCFLAGS += ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_COMPILE_OPTIONS_PIC}" >> ${SOURCE_DIR}/include/makeinclude/platform_macros.GNU
- COMMAND echo "LDFLAGS += ${CMAKE_STATIC_LINKER_FLAGS}" >> ${SOURCE_DIR}/include/makeinclude/platform_macros.GNU
- COMMAND echo "include ${SOURCE_DIR}/include/makeinclude/platform_${ACE_PLATFORM}.GNU" >> ${SOURCE_DIR}/include/makeinclude/platform_macros.GNU
-)
-endif()
-
-find_package(Threads)
-
-add_library(ACE_ACE INTERFACE)
-target_include_directories(ACE_ACE SYSTEM INTERFACE
- $<BUILD_INTERFACE:${INSTALL_DIR}/include>
-)
-target_compile_definitions(ACE_ACE INTERFACE
- __ACE_INLINE__
- ACE_AS_STATIC_LIBS
- __STDC_FORMAT_MACROS # ACE slurps in inttypes.h before cinttypes and clobbers these macros
-)
-target_link_libraries(ACE_ACE INTERFACE
- ${INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}ACE${CMAKE_STATIC_LIBRARY_SUFFIX}
- Threads::Threads
-)
-
-if ("SunOS" STREQUAL ${CMAKE_SYSTEM_NAME})
- target_link_libraries(ACE_ACE INTERFACE
- rt
- m
- socket
- nsl
- )
- target_compile_definitions(ACE_ACE INTERFACE
- _POSIX_PTHREAD_SEMANTICS
- )
-
-elseif ("Linux" STREQUAL ${CMAKE_SYSTEM_NAME} )
- target_link_libraries(ACE_ACE INTERFACE
- dl
- rt
- )
-elseif ("Darwin" STREQUAL ${CMAKE_SYSTEM_NAME} )
-elseif ("Windows" STREQUAL ${CMAKE_SYSTEM_NAME} )
-endif()
-
-add_dependencies(ACE_ACE ${EXTERN})
-
-add_library(ACE::ACE ALIAS ACE_ACE)
diff --git a/dependencies/ACE/config.h.in b/dependencies/ACE/config.h.in
deleted file mode 100755
index b6ee2e893..000000000
--- a/dependencies/ACE/config.h.in
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define ACE_LACKS_IOSTREAM_TOTALLY 1
-#define ACE_HAS_VERSIONED_NAMESPACE 1
-
-#if __cplusplus >= 201103L
-
-#if defined(__SUNPRO_CC)
-#define ACE_HAS_CPP11 1
-#define _RWSTD_ALLOCATOR 1
-#endif
-
-#endif // __cplusplus >= 201103L
-
-#cmakedefine WITH_IPV6
-#ifdef WITH_IPV6
-#define ACE_HAS_IPV6 1
-#endif
-
-#include "ace/config-@ACE_CONFIG@.h"
-
diff --git a/dependencies/ACE/patches b/dependencies/ACE/patches
deleted file mode 100644
index d755bcd18..000000000
--- a/dependencies/ACE/patches
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -ru a/ace/config-lite.h b/ace/config-lite.h
---- a/ace/config-lite.h 2015-09-16 23:55:18.290052190 -0700
-+++ b/ace/config-lite.h 2015-12-16 13:05:16.451203813 -0800
-@@ -115,7 +115,8 @@
- // adapters, we can drop this generator macro or at least drop the
- // MSVC++ or Sun Studio preprocessor conditional blocks.
- #if defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x5140 \
-- && !defined (_STLPORT_VERSION)
-+ && !defined (_STLPORT_VERSION) \
-+ && __cplusplus < 201103L
- // If we're not using the stlport4 C++ library (which has standard
- // iterators), we need to ensure this is included in order to test
- // the _RWSTD_NO_CLASS_PARTIAL_SPEC feature test macro below.
-diff -ru a/include/makeinclude/platform_sunos5_sunc++.GNU b/include/makeinclude/platform_sunos5_sunc++.GNU
---- a/include/makeinclude/platform_sunos5_sunc++.GNU 2015-09-16 23:55:18.443053145 -0700
-+++ b/include/makeinclude/platform_sunos5_sunc++.GNU 2015-12-16 13:12:05.914217145 -0800
-@@ -45,6 +45,7 @@
- rwtools ?= 0
- stdcpplib ?= 1
- stlport ?= 0
-+c++11 ?= 0
- threads ?= 1
- pthreads ?= 1
- versioned_so ?= 1
-@@ -121,6 +122,10 @@
-
- CCFLAGS += $(CFLAGS)
-
-+ ifeq (C++ 5.13,$(findstring C++ 5.13,$(CC_VERSION)))
-+ CCFLAGS += -features=zla
-+ endif # 5.13
-+
- #### If compat=4 is desired, set up for that. There are syntactic diffs
- #### in the compatibility modes, but here all we need to be concerned with
- #### is turning on -compat=4, and not trying to enable the new libraries.
-@@ -187,6 +192,9 @@
-
- # Support alternate CC libraries (i.e. STLport, Tools.h++, Cstd)
- # See: http://docs.sun.com/app/docs/doc/820-7599/bkaty?a=view
-+ifeq ($(c++11),1)
-+ CCFLAGS += -std=c++11
-+else
- ifeq ($(stlport),1)
- CC_LIBRARY = stlport4
- PLATFORM_STLPORT_CCFLAGS += -library=$(CC_LIBRARY)
-@@ -210,6 +218,7 @@
- CCFLAGS += -library=$(CC_LIBRARY)
- LDFLAGS += -library=$(CC_LIBRARY)
- endif
-+endif
-
- ### CC 5.10 enables annotation support by default; allow user to override
- ### new behavior. This also provides a work around for 64-bit linker crashes,
-diff -ru a/ace/Stats.cpp b/ace/Stats.cpp
---- a/ace/Stats.cpp 2015-09-16 23:55:18.268052000 -0700
-+++ b/ace/Stats.cpp 2015-11-23 17:21:03.000000000 -0800
-@@ -240,12 +240,12 @@
- ACE_Stats_Value minimum (tmp_precision), maximum (tmp_precision);
- if (min_ != 0)
- {
-- const ACE_UINT64 m (min_);
-+ const ACE_UINT64 m = min_;
- quotient (m, scale_factor, minimum);
- }
- if (max_ != 0)
- {
-- const ACE_UINT64 m (max_);
-+ const ACE_UINT64 m = max_;
- quotient (m, scale_factor, maximum);
- }
- ACE_OS::sprintf (min_string, format,
-
diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt
index e3aacaabb..e4e30df3a 100644
--- a/dependencies/CMakeLists.txt
+++ b/dependencies/CMakeLists.txt
@@ -18,7 +18,6 @@ project( dependencies LANGUAGES NONE )
find_package(Patch REQUIRED)
-add_subdirectory(ACE)
add_subdirectory(boost)
add_subdirectory(sqlite)
add_subdirectory(doxygen)
diff --git a/tests/cpp/testobject/CMakeLists.txt b/tests/cpp/testobject/CMakeLists.txt
index ecc558626..59c49c249 100644
--- a/tests/cpp/testobject/CMakeLists.txt
+++ b/tests/cpp/testobject/CMakeLists.txt
@@ -95,7 +95,6 @@ target_link_libraries(testobject
apache-geode
framework
PRIVATE
- ACE::ACE
Boost::boost
_WarningsAsError
)