[geode-native] branch develop updated: GEODE-7612: Fix test breakage

[bbender]

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 cbe6415  GEODE-7612: Fix test breakage
cbe6415 is described below

commit cbe6415a439ddc8685715f24dd221e3df1323cc6
Author: Matthew Reddington <mredding...@pivotal.io>
AuthorDate: Tue Dec 24 11:16:06 2019 -0800

    GEODE-7612: Fix test breakage
    
    Removed broken debug exclusion that never worked anyway
---
 cppcache/src/Log.cpp | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/cppcache/src/Log.cpp b/cppcache/src/Log.cpp
index c5e0a30..e5d958d 100644
--- a/cppcache/src/Log.cpp
+++ b/cppcache/src/Log.cpp
@@ -726,13 +726,7 @@ void Log::exitFn(LogLevel level, const char* functionName) 
{
 }
 
 bool Log::enabled(LogLevel level) {
-#ifdef DEBUG
-  return (((level == LogLevel::Debug) || GEODE_HIGHEST_LOG_LEVEL >= level) &&
-          s_logLevel >= level);
-#else
-  return (((level != LogLevel::Debug) && GEODE_HIGHEST_LOG_LEVEL >= level) &&
-          s_logLevel >= level);
-#endif
+  return GEODE_HIGHEST_LOG_LEVEL >= level && s_logLevel >= level;
 }
 
 void Log::log(LogLevel level, const char* msg) {
@@ -871,12 +865,8 @@ void Log::finestCatch(const char* msg, const Exception& 
ex) {
 }
 
 bool Log::debugEnabled() {
-#ifdef DEBUG
-  return s_logLevel >= LogLevel::Debug;
-#else
-  return (GEODE_HIGHEST_LOG_LEVEL >= LogLevel::Debug) &&
+  return GEODE_HIGHEST_LOG_LEVEL >= LogLevel::Debug &&
          s_logLevel >= LogLevel::Debug;
-#endif
 }
 
 void Log::debug(const char* msg) {