diff options
| author | Martin Braun <martin.braun@ettus.com> | 2021-06-22 12:43:39 +0200 |
|---|---|---|
| committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2021-06-22 15:07:02 -0500 |
| commit | c399ab8a9b69bca19843eac9ef6cf8e89f816bc4 (patch) | |
| tree | 12ed90b847740b80dfade3de53c52cc5b9f78669 /host | |
| parent | 9f339892f52bbaf616592d65b7c36c7ea2a2cf7d (diff) | |
| download | uhd-c399ab8a9b69bca19843eac9ef6cf8e89f816bc4.tar.gz uhd-c399ab8a9b69bca19843eac9ef6cf8e89f816bc4.tar.bz2 uhd-c399ab8a9b69bca19843eac9ef6cf8e89f816bc4.zip | |
zbx: Fix compilation on clang-10
The ostream<< overloads where in the wrong namespace to be found by the
expert framework. Other compilers are more forgiving; not so clang 10.
This enables compilation on that compiler.
Diffstat (limited to 'host')
| -rw-r--r-- | host/lib/include/uhdlib/usrp/dboard/zbx/zbx_constants.hpp | 4 | ||||
| -rw-r--r-- | host/lib/include/uhdlib/usrp/dboard/zbx/zbx_cpld_ctrl.hpp | 4 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/zbx/zbx_dboard_init.cpp | 5 |
3 files changed, 5 insertions, 8 deletions
diff --git a/host/lib/include/uhdlib/usrp/dboard/zbx/zbx_constants.hpp b/host/lib/include/uhdlib/usrp/dboard/zbx/zbx_constants.hpp index 0d1d7af7c..bc61b9d61 100644 --- a/host/lib/include/uhdlib/usrp/dboard/zbx/zbx_constants.hpp +++ b/host/lib/include/uhdlib/usrp/dboard/zbx/zbx_constants.hpp @@ -261,9 +261,9 @@ static const std::vector<tune_map_item_t> tx_tune_map = { }}} // namespace uhd::usrp::zbx -namespace uhd { namespace experts { +namespace uhd { namespace usrp { namespace zbx { // << Operator overload for expert's node printing (zbx_lo_source_t property) // Any added expert nodes of type enum class will have to define this std::ostream& operator<<( std::ostream& os, const ::uhd::usrp::zbx::zbx_lo_source_t& lo_source); -}} // namespace uhd::experts +}}} // namespace uhd::usrp::zbx diff --git a/host/lib/include/uhdlib/usrp/dboard/zbx/zbx_cpld_ctrl.hpp b/host/lib/include/uhdlib/usrp/dboard/zbx/zbx_cpld_ctrl.hpp index 03f0fa5b7..3f3c144de 100644 --- a/host/lib/include/uhdlib/usrp/dboard/zbx/zbx_cpld_ctrl.hpp +++ b/host/lib/include/uhdlib/usrp/dboard/zbx/zbx_cpld_ctrl.hpp @@ -479,9 +479,9 @@ private: }}} // namespace uhd::usrp::zbx -namespace uhd { namespace experts { +namespace uhd { namespace usrp { namespace zbx { // << Operator overload for expert's node printing (zbx_lo_source_t property) // Any added expert nodes of type enum class will have to define this std::ostream& operator<<( std::ostream& os, const ::uhd::usrp::zbx::zbx_cpld_ctrl::atr_mode& lo_source); -}} // namespace uhd::experts +}}} // namespace uhd::usrp::zbx diff --git a/host/lib/usrp/dboard/zbx/zbx_dboard_init.cpp b/host/lib/usrp/dboard/zbx/zbx_dboard_init.cpp index e6bbf2798..ef86f10b6 100644 --- a/host/lib/usrp/dboard/zbx/zbx_dboard_init.cpp +++ b/host/lib/usrp/dboard/zbx/zbx_dboard_init.cpp @@ -31,7 +31,7 @@ using namespace uhd::rfnoc; // ostream << operator overloads for our enum classes, so that property nodes of that type // can be added to our expert graph -namespace uhd { namespace experts { +namespace uhd { namespace usrp { namespace zbx { std::ostream& operator<<( std::ostream& os, const ::uhd::usrp::zbx::zbx_lo_source_t& lo_source) @@ -65,9 +65,6 @@ std::ostream& operator<<( UHD_THROW_INVALID_CODE_PATH(); } } -}} // namespace uhd::experts - -namespace uhd { namespace usrp { namespace zbx { void zbx_dboard_impl::_init_cpld() { |