From 6d4b94df13e9a7df4270494d8376d4b81a0b2b9e Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sun, 28 Jul 2019 20:10:09 +0200 Subject: Reduce compiler warnings when boost uses std-atomics This works around for compilers with non-static-data-member initialization. spinlock_t is-a struct { lockType _; } and BOOST_DETAIL_SPINLOCK_INIT initializes the first member of the struct. All defines of BOOST_DETAIL_SPINLOCK_INIT include c-style curly braces to initialize the struct's data member. However, modern C++ compiler interpret the braces differently resulting in copy constriction of the initializer. --- libs/pbd/spinlock.cc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'libs/pbd') diff --git a/libs/pbd/spinlock.cc b/libs/pbd/spinlock.cc index 45e35daf37..0e53b194b9 100644 --- a/libs/pbd/spinlock.cc +++ b/libs/pbd/spinlock.cc @@ -28,10 +28,17 @@ using namespace PBD; spinlock_t::spinlock_t () +#ifdef BOOST_SMART_PTR_DETAIL_SPINLOCK_STD_ATOMIC_HPP_INCLUDED + /* C++11 non-static data member initialization, + * with non-copyable std::atomic ATOMIC_FLAG_INIT + */ + : l {BOOST_DETAIL_SPINLOCK_INIT} {} +#else + /* default C++ assign struct's first member */ { - boost::detail::spinlock init = BOOST_DETAIL_SPINLOCK_INIT; - std::memcpy (&l, &init, sizeof (init)); + l = BOOST_DETAIL_SPINLOCK_INIT; } +#endif SpinLock::SpinLock (spinlock_t& lock) : _lock (lock) -- cgit v1.2.3