76 lines
2.6 KiB
Diff
76 lines
2.6 KiB
Diff
From 5c012cad7858cadcaa85ec295080f3c8b21fdee0 Mon Sep 17 00:00:00 2001
|
|
From: Martin Braun <martin.braun@ettus.com>
|
|
Date: Wed, 9 Jan 2019 09:17:07 -0800
|
|
Subject: [PATCH] lib: experts: Add potentially missing but sometimes inferred
|
|
include
|
|
|
|
This adds an include for boost/core/noncopyable.hpp. Without it, builds
|
|
would potentially fail on Boost 1.69++.
|
|
---
|
|
host/lib/include/uhdlib/experts/expert_nodes.hpp | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/host/lib/include/uhdlib/experts/expert_nodes.hpp b/host/lib/include/uhdlib/experts/expert_nodes.hpp
|
|
index 697ca19c3..8fa183835 100644
|
|
--- a/host/lib/include/uhdlib/experts/expert_nodes.hpp
|
|
+++ b/host/lib/include/uhdlib/experts/expert_nodes.hpp
|
|
@@ -12,6 +12,7 @@
|
|
#include <uhd/exception.hpp>
|
|
#include <uhd/utils/dirty_tracked.hpp>
|
|
#include <uhd/types/time_spec.hpp>
|
|
+#include <boost/core/noncopyable.hpp>
|
|
#include <boost/function.hpp>
|
|
#include <boost/thread/recursive_mutex.hpp>
|
|
#include <boost/thread.hpp>
|
|
|
|
From f1d6d1e480ca873259c816c0bd2dac5eb7aecd5a Mon Sep 17 00:00:00 2001
|
|
From: Martin Braun <martin.braun@ettus.com>
|
|
Date: Wed, 9 Jan 2019 16:24:01 -0800
|
|
Subject: [PATCH] lib: experts: fixup for including Boost header
|
|
|
|
Header wasn't included until Boost 1.56.
|
|
|
|
Fixes 5c012cad7858 ("lib: experts: Add potentially missing but...")
|
|
---
|
|
host/lib/include/uhdlib/experts/expert_nodes.hpp | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/host/lib/include/uhdlib/experts/expert_nodes.hpp b/host/lib/include/uhdlib/experts/expert_nodes.hpp
|
|
index 8fa183835..a540fc49d 100644
|
|
--- a/host/lib/include/uhdlib/experts/expert_nodes.hpp
|
|
+++ b/host/lib/include/uhdlib/experts/expert_nodes.hpp
|
|
@@ -12,7 +12,9 @@
|
|
#include <uhd/exception.hpp>
|
|
#include <uhd/utils/dirty_tracked.hpp>
|
|
#include <uhd/types/time_spec.hpp>
|
|
+#if BOOST_VERSION >= 105600
|
|
#include <boost/core/noncopyable.hpp>
|
|
+#endif
|
|
#include <boost/function.hpp>
|
|
#include <boost/thread/recursive_mutex.hpp>
|
|
#include <boost/thread.hpp>
|
|
|
|
From 66df76097953ecd3ea7e0154049da949f2306743 Mon Sep 17 00:00:00 2001
|
|
From: Martin Braun <martin.braun@ettus.com>
|
|
Date: Mon, 14 Jan 2019 13:34:13 -0800
|
|
Subject: [PATCH] includes: Make sure BOOST_VERSION is always available
|
|
|
|
Boost changed the includes, and boost/version.hpp was being implicitly
|
|
imported. This makes the include explicit.
|
|
---
|
|
host/include/uhd/config.hpp | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/host/include/uhd/config.hpp b/host/include/uhd/config.hpp
|
|
index 0f619c94a..e7b48e5d8 100644
|
|
--- a/host/include/uhd/config.hpp
|
|
+++ b/host/include/uhd/config.hpp
|
|
@@ -9,6 +9,7 @@
|
|
#define INCLUDED_UHD_CONFIG_HPP
|
|
|
|
#include <boost/config.hpp>
|
|
+#include <boost/version.hpp>
|
|
|
|
#ifdef BOOST_MSVC
|
|
// suppress warnings
|