diff options
Diffstat (limited to 'host/lib')
| -rw-r--r-- | host/lib/include/uhdlib/usrp/dboard/debug_dboard.hpp | 7 | ||||
| -rw-r--r-- | host/lib/transport/libusb1_base.cpp | 3 | ||||
| -rw-r--r-- | host/lib/usrp/gps_ctrl.cpp | 4 | ||||
| -rw-r--r-- | host/lib/usrp/multi_usrp.cpp | 2 |
4 files changed, 9 insertions, 7 deletions
diff --git a/host/lib/include/uhdlib/usrp/dboard/debug_dboard.hpp b/host/lib/include/uhdlib/usrp/dboard/debug_dboard.hpp index 0c22831b5..953a4c928 100644 --- a/host/lib/include/uhdlib/usrp/dboard/debug_dboard.hpp +++ b/host/lib/include/uhdlib/usrp/dboard/debug_dboard.hpp @@ -7,6 +7,7 @@ #pragma once #include "x400_dboard_iface.hpp" +#include <uhd/config.hpp> #include <uhd/exception.hpp> #include <uhd/property_tree.hpp> #include <uhd/types/eeprom.hpp> @@ -16,7 +17,7 @@ #define UHD_LOG_SKIP_CFG() \ UHD_LOG_TRACE( \ - "RFNOC::DEBUG_DB", "Skipping unsupported debug db config for " << __FUNCTION__); + "RFNOC::DEBUG_DB", "Skipping unsupported debug db config for " << UHD_FUNCTION); namespace uhd { namespace rfnoc { @@ -397,7 +398,7 @@ public: , _mb_control(mb_controller) , _tree(tree) { - RFNOC_LOG_TRACE("Entering " << __FUNCTION__); + RFNOC_LOG_TRACE("Entering " << UHD_FUNCTION); RFNOC_LOG_TRACE("DB ID: " << _db_idx); UHD_ASSERT_THROW(_mb_control); _rpcc = _mb_control->get_rpc_client(); @@ -407,7 +408,7 @@ public: ~if_test_dboard_impl() { - RFNOC_LOG_TRACE(__FUNCTION__); + RFNOC_LOG_TRACE(UHD_FUNCTION); } // The IF Test dboard muxes a single SMA port (for each of RX and TX) like so: diff --git a/host/lib/transport/libusb1_base.cpp b/host/lib/transport/libusb1_base.cpp index 6808a3e0d..3cb190a6e 100644 --- a/host/lib/transport/libusb1_base.cpp +++ b/host/lib/transport/libusb1_base.cpp @@ -6,6 +6,7 @@ // #include "libusb1_base.hpp" +#include <uhd/config.hpp> #include <uhd/exception.hpp> #include <uhd/types/dict.hpp> #include <uhd/types/serial.hpp> @@ -77,7 +78,7 @@ private: throw uhd::io_error(libusb_strerror(LIBUSB_ERROR_NO_DEVICE)); default: UHD_LOGGER_ERROR("USB") - << __FUNCTION__ << ": " << libusb_strerror((libusb_error)ret); + << UHD_FUNCTION << ": " << libusb_strerror((libusb_error)ret); break; } } diff --git a/host/lib/usrp/gps_ctrl.cpp b/host/lib/usrp/gps_ctrl.cpp index cafc2f662..8026b32a2 100644 --- a/host/lib/usrp/gps_ctrl.cpp +++ b/host/lib/usrp/gps_ctrl.cpp @@ -154,7 +154,7 @@ private: if (msg.length() < 6) { UHD_LOGGER_WARNING("GPS") - << __FUNCTION__ << ": Short GPSDO string: " << msg; + << UHD_FUNCTION << "(): Short GPSDO string: " << msg; continue; } @@ -166,7 +166,7 @@ private: msgs[msg.substr(1, 5)] = msg; } else { UHD_LOGGER_WARNING("GPS") - << __FUNCTION__ << ": Malformed GPSDO string: " << msg; + << UHD_FUNCTION << "(): Malformed GPSDO string: " << msg; } } diff --git a/host/lib/usrp/multi_usrp.cpp b/host/lib/usrp/multi_usrp.cpp index 89c4cbc26..0427a4941 100644 --- a/host/lib/usrp/multi_usrp.cpp +++ b/host/lib/usrp/multi_usrp.cpp @@ -64,7 +64,7 @@ UHD_INLINE std::string string_vector_to_string( throw uhd::exception::runtime_error( \ (boost::format( \ "%s: gain \"%s\" not found for channel %d.\nAvailable gains: %s\n") \ - % __FUNCTION__ % name % chan \ + % UHD_FUNCTION % name % chan \ % string_vector_to_string(get_##dir##_gain_names(chan))) \ .str()); |