diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-08-03 15:53:40 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-08-03 15:53:40 -0700 |
| commit | e2ede2ef8e46762369816d7d66425aee9dca5d1e (patch) | |
| tree | 8dda0a68ac372a60d8d906ff1f4cd2c4e828040e /gr-fec | |
| parent | 96959ba61ab80e2e1766129cb32ed3f589ffe8bf (diff) | |
| parent | d2428961205bf62e6b39966f040f98435e5cc2ed (diff) | |
Merge remote-tracking branch 'github/require-logging' into next
Diffstat (limited to 'gr-fec')
| -rw-r--r-- | gr-fec/lib/generic_decoder.cc | 8 | ||||
| -rw-r--r-- | gr-fec/lib/generic_encoder.cc | 8 |
2 files changed, 2 insertions, 14 deletions
diff --git a/gr-fec/lib/generic_decoder.cc b/gr-fec/lib/generic_decoder.cc index aa11aa8d5e..62d4d2a581 100644 --- a/gr-fec/lib/generic_decoder.cc +++ b/gr-fec/lib/generic_decoder.cc @@ -36,8 +36,6 @@ namespace gr { d_name = name; my_id = base_unique_id++; -#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"); @@ -58,12 +56,8 @@ namespace gr { GR_LOG_SET_FILE_APPENDER(LOG, log_file , true,"%r :%p: %c{1} - %m%n"); } } - d_logger = LOG; -#endif /* HAVE_LOG4CPP */ -#else /* ENABLE_GR_LOG */ - d_logger = NULL; -#endif /* ENABLE_GR_LOG */ + d_logger = LOG; } generic_decoder::~generic_decoder() diff --git a/gr-fec/lib/generic_encoder.cc b/gr-fec/lib/generic_encoder.cc index c5c7f04f55..7872f17068 100644 --- a/gr-fec/lib/generic_encoder.cc +++ b/gr-fec/lib/generic_encoder.cc @@ -36,8 +36,6 @@ namespace gr { d_name = name; my_id = base_unique_id++; -#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"); @@ -58,12 +56,8 @@ namespace gr { GR_LOG_SET_FILE_APPENDER(LOG, log_file , true,"%r :%p: %c{1} - %m%n"); } } - d_logger = LOG; -#endif /* HAVE_LOG4CPP */ -#else /* ENABLE_GR_LOG */ - d_logger = NULL; -#endif /* ENABLE_GR_LOG */ + d_logger = LOG; } generic_encoder::~generic_encoder() |