diff options
Diffstat (limited to 'gnuradio-runtime/lib/pmt/pmt_int.h')
| -rw-r--r-- | gnuradio-runtime/lib/pmt/pmt_int.h | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/gnuradio-runtime/lib/pmt/pmt_int.h b/gnuradio-runtime/lib/pmt/pmt_int.h index da48a0ddc8..ead058598d 100644 --- a/gnuradio-runtime/lib/pmt/pmt_int.h +++ b/gnuradio-runtime/lib/pmt/pmt_int.h @@ -25,13 +25,7 @@ #include <pmt/pmt.h> #include <boost/utility.hpp> #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 - // This section will be removed when support for boost 1.48 ceases - #include <boost/detail/atomic_count.hpp> -#endif +#include <boost/atomic.hpp> /* * EVERYTHING IN THIS FILE IS PRIVATE TO THE IMPLEMENTATION! @@ -43,23 +37,10 @@ namespace pmt { class PMT_API pmt_base : boost::noncopyable { - -#if ((BOOST_VERSION / 100000 >= 1) && (BOOST_VERSION / 100 % 1000 >= 53)) mutable boost::atomic<int> refcount_; -#else - // boost::atomic not available before 1.53 - // This section will be removed when support for boost 1.48 ceases - mutable boost::detail::atomic_count count_; -#endif protected: -#if ((BOOST_VERSION / 100000 >= 1) && (BOOST_VERSION / 100 % 1000 >= 53)) pmt_base() : refcount_(0) {}; -#else - // boost::atomic not available before 1.53 - // This section will be removed when support for boost 1.48 ceases - pmt_base() : count_(0) {}; -#endif virtual ~pmt_base(); public: @@ -261,9 +242,6 @@ public: virtual size_t itemsize() const = 0; virtual const std::string string_ref(size_t k) const { return std::string("not implemented"); } }; - -#include "pmt_unv_int.h" - } /* namespace pmt */ #endif /* INCLUDED_PMT_INT_H */ |