From d2428961205bf62e6b39966f040f98435e5cc2ed Mon Sep 17 00:00:00 2001
From: Johnathan Corgan <johnathan@corganlabs.com>
Date: Sun, 26 Jun 2016 15:40:27 -0700
Subject: cmake: remove ENABLE_GR_LOG and require log4cpp
---
gnuradio-runtime/lib/logger.cc | 46 ------------------------------------------
1 file changed, 46 deletions(-)
(limited to 'gnuradio-runtime/lib/logger.cc')
diff --git a/gnuradio-runtime/lib/logger.cc b/gnuradio-runtime/lib/logger.cc
index fd9a482c94..0bb898833b 100644
--- a/gnuradio-runtime/lib/logger.cc
+++ b/gnuradio-runtime/lib/logger.cc
@@ -35,10 +35,6 @@
#include <stdexcept>
#include <algorithm>
-
-#ifdef ENABLE_GR_LOG
-#ifdef HAVE_LOG4CPP
-
namespace gr {
bool logger_config::logger_configured(false);
@@ -311,8 +307,6 @@ namespace gr {
} /* namespace gr */
-#endif /* HAVE_LOG4CPP */
-
/****** Start Methods to provide Python the capabilities of the macros ********/
void
gr_logger_config(const std::string config_filename, unsigned int watch_period)
@@ -336,38 +330,12 @@ gr_logger_reset_config(void)
// Remaining capability provided by gr::logger class in gnuradio/logger.h
-#else /* ENABLE_GR_LOG */
-
-/****** Start Methods to provide Python the capabilities of the macros ********/
-void
-gr_logger_config(const std::string config_filename, unsigned int watch_period)
-{
- //NOP
-}
-
-std::vector<std::string>
-gr_logger_get_logger_names(void)
-{
- return std::vector<std::string>(1, "");
-}
-
-void
-gr_logger_reset_config(void)
-{
- //NOP
-}
-
-#endif /* ENABLE_GR_LOG */
-
-
namespace gr {
bool
configure_default_loggers(gr::logger_ptr &l, gr::logger_ptr &d,
const std::string name)
{
-#ifdef ENABLE_GR_LOG
-#ifdef HAVE_LOG4CPP
prefs *p = prefs::singleton();
std::string config_file = p->get_string("LOG", "log_config", "");
std::string log_level = p->get_string("LOG", "log_level", "off");
@@ -407,21 +375,11 @@ namespace gr {
}
d = DLOG;
return true;
-#endif /* HAVE_LOG4CPP */
-
-#else /* ENABLE_GR_LOG */
- l = NULL;
- d = NULL;
- return false;
-#endif /* ENABLE_GR_LOG */
- return false;
}
bool
update_logger_alias(const std::string &name, const std::string &alias)
{
-#ifdef ENABLE_GR_LOG
-#ifdef HAVE_LOG4CPP
prefs *p = prefs::singleton();
std::string log_file = p->get_string("LOG", "log_file", "");
std::string debug_file = p->get_string("LOG", "debug_file", "");
@@ -442,10 +400,6 @@ namespace gr {
}
}
return true;
-#endif /* HAVE_LOG4CPP */
-#endif /* ENABLE_GR_LOG */
-
- return false;
}
} /* namespace gr */
--
cgit v1.2.3