diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-12-06 19:32:56 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-12-06 19:32:56 -0800 |
| commit | 3b62e91fb8a7be8695e3cc362d899b242d3e97f5 (patch) | |
| tree | 3d9e426fae8a9988e8ef066de9461ad81c76e850 /gnuradio-runtime/lib/pmt/pmt_int.h | |
| parent | dd3e3c8198515e10cc91145a16b08d0f37ee1bd1 (diff) | |
| parent | d4a3e0267c32912f234f5c59fc567982958e96e8 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gnuradio-runtime/lib/pmt/pmt_int.h')
| -rw-r--r-- | gnuradio-runtime/lib/pmt/pmt_int.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gnuradio-runtime/lib/pmt/pmt_int.h b/gnuradio-runtime/lib/pmt/pmt_int.h index de91d0ec5b..da48a0ddc8 100644 --- a/gnuradio-runtime/lib/pmt/pmt_int.h +++ b/gnuradio-runtime/lib/pmt/pmt_int.h @@ -24,7 +24,8 @@ #include <pmt/pmt.h> #include <boost/utility.hpp> -#if ((BOOST_VER_MAJOR >= 1) && (BOOST_VER_MINOR >= 53)) +#include <boost/version.hpp> +#if ((BOOST_VERSION / 100000 >= 1) && (BOOST_VERSION / 100 % 1000 >= 53)) #include <boost/atomic.hpp> #else // boost::atomic not available before 1.53 @@ -43,7 +44,7 @@ namespace pmt { class PMT_API pmt_base : boost::noncopyable { -#if ((BOOST_VER_MAJOR >= 1) && (BOOST_VER_MINOR >= 53)) +#if ((BOOST_VERSION / 100000 >= 1) && (BOOST_VERSION / 100 % 1000 >= 53)) mutable boost::atomic<int> refcount_; #else // boost::atomic not available before 1.53 @@ -52,7 +53,7 @@ class PMT_API pmt_base : boost::noncopyable { #endif protected: -#if ((BOOST_VER_MAJOR >= 1) && (BOOST_VER_MINOR >= 53)) +#if ((BOOST_VERSION / 100000 >= 1) && (BOOST_VERSION / 100 % 1000 >= 53)) pmt_base() : refcount_(0) {}; #else // boost::atomic not available before 1.53 |