diff options
Diffstat (limited to 'boost/none.hpp')
-rw-r--r-- | boost/none.hpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/boost/none.hpp b/boost/none.hpp index 87a6c707ce..db744e58ac 100644 --- a/boost/none.hpp +++ b/boost/none.hpp @@ -22,8 +22,10 @@ namespace boost { #ifdef BOOST_OPTIONAL_USE_OLD_DEFINITION_OF_NONE + none_t const none = (static_cast<none_t>(0)) ; -#else + +#elif defined BOOST_OPTIONAL_USE_SINGLETON_DEFINITION_OF_NONE namespace detail { namespace optional_detail { @@ -45,9 +47,13 @@ namespace { const none_t& none = detail::optional_detail::none_instance<none_t>::instance; } -#endif +#else + +const none_t none ((none_t::init_tag())); + +#endif // older definitions } // namespace boost -#endif +#endif // header guard |