paulmataruso/UHD-Fairwaves
1
0
Fork 0
mirror of https://github.com/fairwaves/UHD-Fairwaves.git synced 2025-11-02 04:53:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Detect uhd/utils/thread_priority.hpp deprecation

Browse Source
This commit is contained in:
Alexander Chemeris
2019-10-31 18:13:32 +03:00
parent 48ad4cd890
commit c87ac1ba32
6 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
host/CMakeLists.txt
View File

@@ -84,6 +84,13 @@ else()
message(STATUS " use log.hpp for logging")
endif()
if (EXISTS "${UHD_INCLUDE_DIRS}/uhd/utils/thread.hpp")
add_definitions(-DTHREAD_PRIORITY_HPP_DEPRECATED)
message(STATUS " use thread.hpp (new interface)")
else()
message(STATUS " use thread_priority.hpp (old interface)")
endif()
########################################################################
# Setup Boost
########################################################################

6
host/umtrx_io_impl.cpp
View File

@@ -27,7 +27,11 @@
#include <boost/thread/thread.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/thread/condition_variable.hpp>
#include <uhd/utils/thread_priority.hpp>
#ifdef THREAD_PRIORITY_HPP_DEPRECATED
# include <uhd/utils/thread.hpp>
#else // THREAD_PRIORITY_HPP_DEPRECATED
# include <uhd/utils/thread_priority.hpp>
#endif // THREAD_PRIORITY_HPP_DEPRECATED
//A reasonable number of frames for send/recv and async/sync
static const size_t DEFAULT_NUM_FRAMES = 32;

1
host/utils/umtrx_pa_ctrl.cpp
View File

@@ -15,7 +15,6 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
#include <uhd/utils/thread_priority.hpp>
#include <uhd/utils/safe_main.hpp>
#include <uhd/utils/paths.hpp>
#include <uhd/utils/algorithm.hpp>

6
host/utils/umtrx_test_chains.cpp
View File

@@ -15,7 +15,11 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
#include <uhd/utils/thread_priority.hpp>
#ifdef THREAD_PRIORITY_HPP_DEPRECATED
# include <uhd/utils/thread.hpp>
#else // THREAD_PRIORITY_HPP_DEPRECATED
# include <uhd/utils/thread_priority.hpp>
#endif // THREAD_PRIORITY_HPP_DEPRECATED
#include <uhd/utils/safe_main.hpp>
#include <uhd/usrp/multi_usrp.hpp>
#include <boost/program_options.hpp>

1
host/utils/umtrx_test_gains.cpp
View File

@@ -15,7 +15,6 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
#include <uhd/utils/thread_priority.hpp>
#include <uhd/utils/safe_main.hpp>
#include <uhd/utils/paths.hpp>
#include <uhd/utils/algorithm.hpp>

6
host/utils/usrp_cal_utils.hpp
View File

@@ -16,7 +16,11 @@
//
#include <uhd/utils/paths.hpp>
#include <uhd/utils/thread_priority.hpp>
#ifdef THREAD_PRIORITY_HPP_DEPRECATED
# include <uhd/utils/thread.hpp>
#else // THREAD_PRIORITY_HPP_DEPRECATED
# include <uhd/utils/thread_priority.hpp>
#endif // THREAD_PRIORITY_HPP_DEPRECATED
#include <uhd/utils/algorithm.hpp>
#include "umtrx_log_adapter.hpp"
#include <uhd/property_tree.hpp>