diff options
Diffstat (limited to 'boost/interprocess/detail/intermodule_singleton.hpp')
| -rw-r--r-- | boost/interprocess/detail/intermodule_singleton.hpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/boost/interprocess/detail/intermodule_singleton.hpp b/boost/interprocess/detail/intermodule_singleton.hpp index 054322699d..a99934893d 100644 --- a/boost/interprocess/detail/intermodule_singleton.hpp +++ b/boost/interprocess/detail/intermodule_singleton.hpp @@ -1,6 +1,6 @@ ////////////////////////////////////////////////////////////////////////////// // -// (C) Copyright Ion Gaztanaga 2009-2011. Distributed under the Boost +// (C) Copyright Ion Gaztanaga 2009-2012. Distributed under the Boost // Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // @@ -11,7 +11,7 @@ #ifndef BOOST_INTERPROCESS_INTERMODULE_SINGLETON_HPP #define BOOST_INTERPROCESS_INTERMODULE_SINGLETON_HPP -#if defined(_MSC_VER)&&(_MSC_VER>=1200) +#if defined(_MSC_VER) #pragma once #endif @@ -20,8 +20,9 @@ #ifdef BOOST_INTERPROCESS_WINDOWS #include <boost/interprocess/detail/windows_intermodule_singleton.hpp> +#else + #include <boost/interprocess/detail/portable_intermodule_singleton.hpp> #endif -#include <boost/interprocess/detail/portable_intermodule_singleton.hpp> namespace boost{ namespace interprocess{ @@ -30,7 +31,7 @@ namespace ipcdetail{ //Now this class is a singleton, initializing the singleton in //the first get() function call if LazyInit is false. If true //then the singleton will be initialized when loading the module. -template<typename C, bool LazyInit = true, bool Phoenix = true> +template<typename C, bool LazyInit = true, bool Phoenix = false> class intermodule_singleton #ifdef BOOST_INTERPROCESS_WINDOWS : public windows_intermodule_singleton<C, LazyInit, Phoenix> |