diff options
| author | Marcus Müller <mmueller@gnuradio.org> | 2021-06-13 00:53:12 +0200 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2021-06-17 00:08:24 +0200 |
| commit | a231df45e7bea4d05df96a2e9b4e8165f21b4e1d (patch) | |
| tree | cf574f1b2349863132d412d4f35137e020d35c11 | |
| parent | 72ba8b148d550dc012f98feb222b2a5371fbf89d (diff) | |
logger: move non-interface includes to buffer.cc
Signed-off-by: Marcus Müller <mmueller@gnuradio.org>
| -rw-r--r-- | gnuradio-runtime/include/gnuradio/logger.h | 12 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/logger.cc | 10 | ||||
| -rw-r--r-- | gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc | 2 |
3 files changed, 15 insertions, 9 deletions
diff --git a/gnuradio-runtime/include/gnuradio/logger.h b/gnuradio-runtime/include/gnuradio/logger.h index 17a3e22fbc..1ce26a16d6 100644 --- a/gnuradio-runtime/include/gnuradio/logger.h +++ b/gnuradio-runtime/include/gnuradio/logger.h @@ -23,21 +23,17 @@ typedef int mode_t; #include <sys/types.h> #endif +// Since this file is included in *all* gr::blocks, please make sure this list of includes +// keeps as short as possible; if anything is needed only by the implementation in +// buffer.cc, then only include it there #include <gnuradio/api.h> #include <log4cpp/Category.hh> -#include <log4cpp/FileAppender.hh> -#include <log4cpp/OstreamAppender.hh> -#include <log4cpp/PatternLayout.hh> -#include <log4cpp/PropertyConfigurator.hh> -#include <log4cpp/RollingFileAppender.hh> -#include <pmt/pmt.h> #include <boost/format.hpp> #include <boost/thread.hpp> #include <cassert> -#include <ctime> -#include <filesystem> #include <memory> + namespace gr { /*! diff --git a/gnuradio-runtime/lib/logger.cc b/gnuradio-runtime/lib/logger.cc index ee3bc28e71..ea3febfc34 100644 --- a/gnuradio-runtime/lib/logger.cc +++ b/gnuradio-runtime/lib/logger.cc @@ -19,8 +19,18 @@ #endif #include <gnuradio/logger.h> + #include <gnuradio/prefs.h> + +#include <log4cpp/FileAppender.hh> +#include <log4cpp/OstreamAppender.hh> +#include <log4cpp/PatternLayout.hh> +#include <log4cpp/PropertyConfigurator.hh> +#include <log4cpp/RollingFileAppender.hh> +#include <boost/thread.hpp> + #include <algorithm> +#include <filesystem> #include <iostream> #include <memory> #include <stdexcept> diff --git a/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc b/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc index 38a3ea69a3..1447b76dae 100644 --- a/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc +++ b/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(logger.h) */ -/* BINDTOOL_HEADER_FILE_HASH(56f115dfac11fe07dee83b93e80941a3) */ +/* BINDTOOL_HEADER_FILE_HASH(b071f4deb18875805b73952a7aa43389) */ /***********************************************************************************/ #include <pybind11/complex.h> |