From 8697826604c7dee5256540d50c0b47370fe8f27c Mon Sep 17 00:00:00 2001
From: Martin Braun <martin.braun@ettus.com>
Date: Tue, 24 Aug 2021 12:12:28 +0200
Subject: uhd: Remove Boost version checks for Boost 1.61
UHD requires Boost 1.65, so checks for Boost 1.61 will always be
satisfied.
---
host/lib/utils/paths.cpp | 23 ++++-------------------
1 file changed, 4 insertions(+), 19 deletions(-)
(limited to 'host/lib/utils')
diff --git a/host/lib/utils/paths.cpp b/host/lib/utils/paths.cpp
index e6ed1c177..802dd5e5a 100644
--- a/host/lib/utils/paths.cpp
+++ b/host/lib/utils/paths.cpp
@@ -7,21 +7,19 @@
#include <uhd/config.hpp>
#include <uhd/exception.hpp>
-#include <uhd/utils/paths.hpp>
#include <uhd/utils/log.hpp>
+#include <uhd/utils/paths.hpp>
#include <uhdlib/utils/paths.hpp>
#include <boost/algorithm/string.hpp>
-#include <boost/version.hpp>
-#include <functional>
-#if BOOST_VERSION >= 106100
-# include <boost/dll/runtime_symbol_info.hpp>
-#endif
+#include <boost/dll/runtime_symbol_info.hpp>
#include <boost/filesystem.hpp>
#include <boost/format.hpp>
#include <boost/tokenizer.hpp>
+#include <boost/version.hpp>
#include <cstdio>
#include <cstdlib>
#include <fstream>
+#include <functional>
#include <iostream>
#include <regex>
#include <streambuf>
@@ -283,7 +281,6 @@ std::string uhd::get_appdata_path(void)
}
-#if BOOST_VERSION >= 106100
std::string uhd::get_pkg_path(void)
{
fs::path pkg_path = fs::path(uhd::get_lib_path()).parent_path().lexically_normal();
@@ -297,18 +294,6 @@ std::string uhd::get_lib_path(void)
fs::path lib_path = runtime_libfile_path.lexically_normal().parent_path();
return lib_path.string();
}
-#else
-std::string uhd::get_pkg_path(void)
-{
- return get_env_var("UHD_PKG_PATH", UHD_PKG_PATH);
-}
-
-std::string uhd::get_lib_path(void)
-{
- fs::path lib_path = fs::path(uhd::get_pkg_path()) / UHD_LIB_DIR;
- return lib_path.string();
-}
-#endif
std::string uhd::get_cal_data_path(void)
{
--
cgit v1.2.3