diff options
Diffstat (limited to 'host')
| -rw-r--r-- | host/include/uhd/utils/log.hpp | 11 | ||||
| -rw-r--r-- | host/lib/rfnoc/chdr_ctrl_endpoint.cpp | 1 | ||||
| -rw-r--r-- | host/lib/utils/log.cpp | 6 | ||||
| -rw-r--r-- | host/lib/utils/log_c.cpp | 2 |
4 files changed, 11 insertions, 9 deletions
diff --git a/host/include/uhd/utils/log.hpp b/host/include/uhd/utils/log.hpp index 85e0d6bc5..f333f9594 100644 --- a/host/include/uhd/utils/log.hpp +++ b/host/include/uhd/utils/log.hpp @@ -9,12 +9,13 @@ #include <uhd/config.hpp> #include <boost/current_function.hpp> -#include <boost/thread/thread.hpp> +#include <boost/date_time/posix_time/posix_time_types.hpp> #include <iomanip> #include <iostream> #include <ostream> #include <sstream> #include <string> +#include <thread> /*! \file log.hpp * @@ -135,7 +136,7 @@ struct UHD_API logging_info const std::string& file_, const unsigned int& line_, const std::string& component_, - const boost::thread::id& thread_id_) + const std::thread::id& thread_id_) : time(time_) , verbosity(verbosity_) , file(file_) @@ -150,7 +151,7 @@ struct UHD_API logging_info std::string file; unsigned int line; std::string component; - boost::thread::id thread_id; + std::thread::id thread_id; std::string message; }; @@ -187,7 +188,7 @@ UHD_API void set_logger_level(const std::string& logger, uhd::log::severity_leve //! \cond //! Internal logging macro to be used in other macros #define _UHD_LOG_INTERNAL(component, level) \ - uhd::_log::log(level, __FILE__, __LINE__, component, boost::this_thread::get_id()) + uhd::_log::log(level, __FILE__, __LINE__, component, std::this_thread::get_id()) //! \endcond // macro-style logging (compile-time determined) @@ -292,7 +293,7 @@ public: const std::string& file, const unsigned int line, const std::string& component, - const boost::thread::id thread_id); + const std::thread::id thread_id); ~log(void); diff --git a/host/lib/rfnoc/chdr_ctrl_endpoint.cpp b/host/lib/rfnoc/chdr_ctrl_endpoint.cpp index 592d3dde8..7d9bb8d1b 100644 --- a/host/lib/rfnoc/chdr_ctrl_endpoint.cpp +++ b/host/lib/rfnoc/chdr_ctrl_endpoint.cpp @@ -12,6 +12,7 @@ #include <uhdlib/rfnoc/chdr_ctrl_endpoint.hpp> #include <uhdlib/rfnoc/chdr_packet_writer.hpp> #include <boost/format.hpp> +#include <boost/thread.hpp> #include <atomic> #include <mutex> #include <thread> diff --git a/host/lib/utils/log.cpp b/host/lib/utils/log.cpp index fa17d79e8..cf18e00c7 100644 --- a/host/lib/utils/log.cpp +++ b/host/lib/utils/log.cpp @@ -266,7 +266,7 @@ public: __FILE__, __LINE__, "LOGGING", - boost::this_thread::get_id()); + std::this_thread::get_id()); final_message.message = ""; push(final_message); # ifndef UHD_LOG_FASTPATH_DISABLE @@ -482,7 +482,7 @@ private: __FILE__, __LINE__, component, - boost::this_thread::get_id()); + std::this_thread::get_id()); log_msg.message = msg; _log_queue.push_with_timed_wait(log_msg, 0.25); } @@ -506,7 +506,7 @@ uhd::_log::log::log(const uhd::log::severity_level verbosity, const std::string& file, const unsigned int line, const std::string& component, - const boost::thread::id thread_id) + const std::thread::id thread_id) : _log_it(verbosity >= log_rs().global_level) { if (_log_it) { diff --git a/host/lib/utils/log_c.cpp b/host/lib/utils/log_c.cpp index be08dbe01..932ab25ff 100644 --- a/host/lib/utils/log_c.cpp +++ b/host/lib/utils/log_c.cpp @@ -48,7 +48,7 @@ void UHD_API _uhd_log(const uhd_log_severity_level_t log_level, filename, unsigned(lineno), component, - boost::this_thread::get_id()) + std::this_thread::get_id()) << c_str; } catch (...) { } |