Another try at C++11/boost spinlock initialization

diff --git a/libs/pbd/pbd/spinlock.h b/libs/pbd/pbd/spinlock.h
index 44bc6c299b7452267151608c02798b911b6f4c10..3f4336ec56149827b4fd00ac63a715c50439a37c 100644 (file)
--- a/libs/pbd/pbd/spinlock.h
+++ b/libs/pbd/pbd/spinlock.h
@@ -41,7 +41,7 @@ public:
        /* C++11 non-static data member initialization,
         * with non-copyable std::atomic ATOMIC_FLAG_INIT
         */
-       spinlock_t () : l {BOOST_DETAIL_SPINLOCK_INIT} {};
+       spinlock_t () {}
 #else
        /* default C++ assign struct's first member */
        spinlock_t ()
@@ -55,7 +55,11 @@ public:
        bool try_lock () { return l.try_lock (); }
 
 private:
+#ifdef BOOST_SMART_PTR_DETAIL_SPINLOCK_STD_ATOMIC_HPP_INCLUDED
+       boost::detail::spinlock l = BOOST_DETAIL_SPINLOCK_INIT;
+#else
        boost::detail::spinlock l;
+#endif
 
        /* prevent copy construction */
        spinlock_t (const spinlock_t&);