diff options
| author | Martin Braun <martin.braun@ettus.com> | 2019-09-28 12:59:37 +0200 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2019-11-26 11:49:08 -0800 |
| commit | 96a19dc03fe465f101853e1de9369780445f1724 (patch) | |
| tree | dc3ce76757cf3d306c886546620ef87a0acc7789 | |
| parent | 6f6429c45b87a07b94309c176469063c9bb5658c (diff) | |
| download | uhd-96a19dc03fe465f101853e1de9369780445f1724.tar.gz uhd-96a19dc03fe465f101853e1de9369780445f1724.tar.bz2 uhd-96a19dc03fe465f101853e1de9369780445f1724.zip | |
nirio_fifo: Replace boost::atomic with std::atomic
This is the only occurrence of boost::atomic in UHD.
| -rw-r--r-- | host/include/uhd/transport/nirio/nirio_fifo.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/host/include/uhd/transport/nirio/nirio_fifo.h b/host/include/uhd/transport/nirio/nirio_fifo.h index 5f707e637..317ca777d 100644 --- a/host/include/uhd/transport/nirio/nirio_fifo.h +++ b/host/include/uhd/transport/nirio/nirio_fifo.h @@ -1,6 +1,7 @@ // // Copyright 2013-2015 Ettus Research LLC // Copyright 2018 Ettus Research, a National Instruments Company +// Copyright 2019 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: GPL-3.0-or-later // @@ -15,7 +16,7 @@ #include <uhd/utils/noncopyable.hpp> #include <boost/smart_ptr.hpp> #include <boost/thread/recursive_mutex.hpp> -#include <boost/atomic/atomic.hpp> +#include <atomic> #include <string> #include <chrono> #include <thread> @@ -222,7 +223,7 @@ private: //Members data_t* _elements_buffer; size_t _actual_depth_in_elements; - boost::atomic<size_t> _total_elements_acquired; + std::atomic<size_t> _total_elements_acquired; size_t _frame_size_in_elements; fifo_optimization_option_t _fifo_optimization_option; |