diff options
Diffstat (limited to 'boost/interprocess/detail/intermodule_singleton_common.hpp')
-rw-r--r-- | boost/interprocess/detail/intermodule_singleton_common.hpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/boost/interprocess/detail/intermodule_singleton_common.hpp b/boost/interprocess/detail/intermodule_singleton_common.hpp index 10c9eceabb..c890c326bc 100644 --- a/boost/interprocess/detail/intermodule_singleton_common.hpp +++ b/boost/interprocess/detail/intermodule_singleton_common.hpp @@ -11,7 +11,11 @@ #ifndef BOOST_INTERPROCESS_INTERMODULE_SINGLETON_COMMON_HPP #define BOOST_INTERPROCESS_INTERMODULE_SINGLETON_COMMON_HPP -#if defined(_MSC_VER) +#ifndef BOOST_CONFIG_HPP +# include <boost/config.hpp> +#endif +# +#if defined(BOOST_HAS_PRAGMA_ONCE) #pragma once #endif @@ -21,7 +25,7 @@ #include <boost/interprocess/detail/atomic.hpp> #include <boost/interprocess/detail/os_thread_functions.hpp> #include <boost/interprocess/exceptions.hpp> -#include <boost/type_traits/type_with_alignment.hpp> +#include <boost/container/detail/type_traits.hpp> //alignment_of, aligned_storage #include <boost/interprocess/detail/mpl.hpp> #include <boost/interprocess/sync/spin/wait.hpp> #include <boost/assert.hpp> @@ -286,7 +290,7 @@ class intermodule_singleton_common static union mem_holder_t { unsigned char map_mem [sizeof(ThreadSafeGlobalMap)]; - ::boost::detail::max_align aligner; + ::boost::container::container_detail::max_align_t aligner; } mem_holder; }; |