aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/multi_usrp.cpp
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2022-01-04 17:42:35 +0100
committerAaron Rossetto <aaron.rossetto@ni.com>2022-01-12 15:07:54 -0600
commit2d9a83374760d3b2c36184710e103098566ec3ad (patch)
tree960df052e33b1f2671604a4858bfae5edfb3cc55 /host/lib/usrp/multi_usrp.cpp
parent85e61c7d8f520202d2de94e60ca47ed3d6948155 (diff)
downloaduhd-2d9a83374760d3b2c36184710e103098566ec3ad.tar.gz
uhd-2d9a83374760d3b2c36184710e103098566ec3ad.tar.bz2
uhd-2d9a83374760d3b2c36184710e103098566ec3ad.zip
uhd: Fix non-standard function name macros
Throughout UHD, we are using a random mix of __FUNCTION__, __func__, __PRETTY_FUNCTION__, and BOOST_CURRENT_FUNCTION. Note that the first two macros are non-standard (although many compilers understand them), and the last requires Boost. __func__ is available since C++11, but is not the best choice because the C++ standard doesn't require it to be of any specific value. We thus define UHD_FUNCTION and UHD_PRETTY_FUNCTION as portable macros. The former simply contains the undecorated function name, the latter the expanded function with full signature. As it happens, our currently supported compilers didn't have any issues using non-standard macros, so the main fix here is the removal of the Boost macros and the harmonization of the other macros.
Diffstat (limited to 'host/lib/usrp/multi_usrp.cpp')
-rw-r--r--host/lib/usrp/multi_usrp.cpp2
1 files changed, 1 insertions, 1 deletions
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());