From 71cac5b439e686e44c8d876acfba3bbeb782c111 Mon Sep 17 00:00:00 2001
From: lganzzzo <lganzzzo@gmail.com>
Date: Tue, 16 Nov 2021 02:26:27 +0200
Subject: [PATCH] Remove unused compiler directives

---
 CMakeLists.txt                      | 12 +++++-------
 src/oatpp/core/base/Environment.cpp |  6 ------
 src/oatpp/core/base/Environment.hpp |  2 --
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index af146aab..c8d671c9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,6 @@ option(OATPP_DISABLE_ENV_OBJECT_COUNTERS "Disable object counting for Release bu
 option(OATPP_DISABLE_POOL_ALLOCATIONS "This will make oatpp::base::memory::MemoryPool, method obtain and free call new and delete directly" OFF)
 
 set(OATPP_THREAD_HARDWARE_CONCURRENCY "AUTO" CACHE STRING "Predefined value for function oatpp::concurrency::Thread::getHardwareConcurrency()")
-set(OATPP_THREAD_DISTRIBUTED_MEM_POOL_SHARDS_COUNT "10" CACHE STRING "Number of shards of ThreadDistributedMemoryPool")
 
 option(OATPP_COMPAT_BUILD_NO_THREAD_LOCAL "Disable 'thread_local' feature" OFF)
 option(OATPP_COMPAT_BUILD_NO_SET_AFFINITY "No 'pthread_setaffinity_np' method" OFF)
@@ -48,10 +47,7 @@ message("\n#####################################################################
 message("## oatpp module compilation config:\n")
 
 message("OATPP_DISABLE_ENV_OBJECT_COUNTERS=${OATPP_DISABLE_ENV_OBJECT_COUNTERS}")
-message("OATPP_DISABLE_POOL_ALLOCATIONS=${OATPP_DISABLE_POOL_ALLOCATIONS}")
 message("OATPP_THREAD_HARDWARE_CONCURRENCY=${OATPP_THREAD_HARDWARE_CONCURRENCY}")
-message("OATPP_THREAD_DISTRIBUTED_MEM_POOL_SHARDS_COUNT=${OATPP_THREAD_DISTRIBUTED_MEM_POOL_SHARDS_COUNT}")
-
 message("OATPP_COMPAT_BUILD_NO_THREAD_LOCAL=${OATPP_COMPAT_BUILD_NO_THREAD_LOCAL}")
 
 ## Set definitions ###############################################################################
@@ -62,6 +58,7 @@ endif()
 
 if(OATPP_DISABLE_POOL_ALLOCATIONS)
     add_definitions (-DOATPP_DISABLE_POOL_ALLOCATIONS)
+    message("WARNING: OATPP_DISABLE_POOL_ALLOCATIONS option is deprecated and has no effect.")
 endif()
 
 set(AUTO_VALUE AUTO)
@@ -69,9 +66,10 @@ if(NOT OATPP_THREAD_HARDWARE_CONCURRENCY STREQUAL AUTO_VALUE)
     add_definitions (-DOATPP_THREAD_HARDWARE_CONCURRENCY=${OATPP_THREAD_HARDWARE_CONCURRENCY})
 endif()
 
-add_definitions (
-    -DOATPP_THREAD_DISTRIBUTED_MEM_POOL_SHARDS_COUNT=${OATPP_THREAD_DISTRIBUTED_MEM_POOL_SHARDS_COUNT}
-)
+if(OATPP_THREAD_DISTRIBUTED_MEM_POOL_SHARDS_COUNT)
+    add_definitions (-DOATPP_THREAD_DISTRIBUTED_MEM_POOL_SHARDS_COUNT=${OATPP_THREAD_DISTRIBUTED_MEM_POOL_SHARDS_COUNT})
+    message("WARNING: OATPP_THREAD_DISTRIBUTED_MEM_POOL_SHARDS_COUNT option is deprecated and has no effect.")
+endif()
 
 if(OATPP_COMPAT_BUILD_NO_THREAD_LOCAL)
     add_definitions(-DOATPP_COMPAT_BUILD_NO_THREAD_LOCAL)
diff --git a/src/oatpp/core/base/Environment.cpp b/src/oatpp/core/base/Environment.cpp
index 5045ed55..f555dd73 100644
--- a/src/oatpp/core/base/Environment.cpp
+++ b/src/oatpp/core/base/Environment.cpp
@@ -313,10 +313,6 @@ void Environment::printCompilationConfig() {
   OATPP_LOGD("oatpp/Config", "OATPP_DISABLE_ENV_OBJECT_COUNTERS");
 #endif
 
-#ifdef OATPP_DISABLE_POOL_ALLOCATIONS
-  OATPP_LOGD("oatpp/Config", "OATPP_DISABLE_POOL_ALLOCATIONS");
-#endif
-
 #ifdef OATPP_COMPAT_BUILD_NO_THREAD_LOCAL
   OATPP_LOGD("oatpp/Config", "OATPP_COMPAT_BUILD_NO_THREAD_LOCAL");
 #endif
@@ -325,8 +321,6 @@ void Environment::printCompilationConfig() {
   OATPP_LOGD("oatpp/Config", "OATPP_THREAD_HARDWARE_CONCURRENCY=%d", OATPP_THREAD_HARDWARE_CONCURRENCY);
 #endif
 
-  OATPP_LOGD("oatpp/Config", "OATPP_THREAD_DISTRIBUTED_MEM_POOL_SHARDS_COUNT=%d", OATPP_THREAD_DISTRIBUTED_MEM_POOL_SHARDS_COUNT);
-
 }
 
 void Environment::log(v_uint32 priority, const std::string& tag, const std::string& message) {
diff --git a/src/oatpp/core/base/Environment.hpp b/src/oatpp/core/base/Environment.hpp
index b6bbdd0f..984afdf2 100644
--- a/src/oatpp/core/base/Environment.hpp
+++ b/src/oatpp/core/base/Environment.hpp
@@ -428,9 +428,7 @@ public:
    * Print debug information of compilation config.<br>
    * Print values for: <br>
    * - `OATPP_DISABLE_ENV_OBJECT_COUNTERS`<br>
-   * - `OATPP_DISABLE_POOL_ALLOCATIONS`<br>
    * - `OATPP_THREAD_HARDWARE_CONCURRENCY`<br>
-   * - `OATPP_THREAD_DISTRIBUTED_MEM_POOL_SHARDS_COUNT`
    */
   static void printCompilationConfig();