diff options
| author | Martin Braun <martin.braun@ettus.com> | 2017-08-24 14:37:08 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-03-05 13:53:45 -0800 |
| commit | 347bb79d2adef4b5bf3e3a94577ecc18c0408519 (patch) | |
| tree | 9812aa2b939c8697abd91218bda5c0d1dd1131c3 /host | |
| parent | 988b6ecab417dc8e5ac225e112b33c2b2f6193ad (diff) | |
| download | uhd-347bb79d2adef4b5bf3e3a94577ecc18c0408519.tar.gz uhd-347bb79d2adef4b5bf3e3a94577ecc18c0408519.tar.bz2 uhd-347bb79d2adef4b5bf3e3a94577ecc18c0408519.zip | |
uhd: Removed atomic.hpp from public API
atomic.hpp defines a spin lock and a lockfree mutex. There is no reason
to have standard constructs in the public API, where we're contractually
obligated to not touch them. Thus, moving them into the internal API
space.
Diffstat (limited to 'host')
| -rw-r--r-- | host/include/uhd/utils/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | host/lib/include/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | host/lib/include/uhd/utils/atomic.hpp (renamed from host/include/uhd/utils/atomic.hpp) | 5 |
3 files changed, 5 insertions, 5 deletions
diff --git a/host/include/uhd/utils/CMakeLists.txt b/host/include/uhd/utils/CMakeLists.txt index 85afc09bb..9c2fed964 100644 --- a/host/include/uhd/utils/CMakeLists.txt +++ b/host/include/uhd/utils/CMakeLists.txt @@ -9,7 +9,6 @@ UHD_INSTALL(FILES algorithm.hpp assert_has.hpp assert_has.ipp - atomic.hpp byteswap.hpp byteswap.ipp cast.hpp diff --git a/host/lib/include/CMakeLists.txt b/host/lib/include/CMakeLists.txt index 5eea68f80..a688f4ea9 100644 --- a/host/lib/include/CMakeLists.txt +++ b/host/lib/include/CMakeLists.txt @@ -1,7 +1,7 @@ # -# Copyright 2017 Ettus Research, a National Instruments Company +# Copyright 2017 Ettus Research (National Instruments Corp.) # -# SPDX-License-Identifier: GPL-3.0 +# SPDX-License-Identifier: GPL-3.0+ # INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/host/include/uhd/utils/atomic.hpp b/host/lib/include/uhd/utils/atomic.hpp index 4be416a30..86b1dddda 100644 --- a/host/include/uhd/utils/atomic.hpp +++ b/host/lib/include/uhd/utils/atomic.hpp @@ -9,6 +9,7 @@ #define INCLUDED_UHD_UTILS_ATOMIC_HPP #include <uhd/config.hpp> +#include <uhd/utils/system_time.hpp> #include <uhd/types/time_spec.hpp> #include <boost/thread/thread.hpp> #include <atomic> @@ -30,9 +31,9 @@ namespace uhd{ const double timeout ){ if (cond == value) return true; - const time_spec_t exit_time = time_spec_t::get_system_time() + time_spec_t(timeout); + const time_spec_t exit_time = uhd::get_system_time() + time_spec_t(timeout); while (cond != value) { - if (time_spec_t::get_system_time() > exit_time) { + if (uhd::get_system_time() > exit_time) { return false; } boost::this_thread::interruption_point(); |