mirror of
https://github.com/boostorg/optional.git
synced 2025-07-29 12:07:21 +02:00
Marked none instances as inline variables.
This should avoid duplicating none instances in all translation units. Closes https://github.com/boostorg/optional/issues/33.
This commit is contained in:
committed by
Andrzej Krzemienski
parent
29dfc173c6
commit
9ed20cb085
@ -13,6 +13,7 @@
|
||||
#ifndef BOOST_NONE_17SEP2003_HPP
|
||||
#define BOOST_NONE_17SEP2003_HPP
|
||||
|
||||
#include "boost/config.hpp"
|
||||
#include "boost/none_t.hpp"
|
||||
|
||||
// NOTE: Borland users have to include this header outside any precompiled headers
|
||||
@ -23,7 +24,7 @@ namespace boost {
|
||||
|
||||
#ifdef BOOST_OPTIONAL_USE_OLD_DEFINITION_OF_NONE
|
||||
|
||||
none_t const none = (static_cast<none_t>(0)) ;
|
||||
BOOST_INLINE_VARIABLE none_t const none = (static_cast<none_t>(0)) ;
|
||||
|
||||
#elif defined BOOST_OPTIONAL_USE_SINGLETON_DEFINITION_OF_NONE
|
||||
|
||||
@ -35,7 +36,7 @@ namespace detail { namespace optional_detail {
|
||||
{
|
||||
static const T instance;
|
||||
};
|
||||
|
||||
|
||||
template <typename T>
|
||||
const T none_instance<T>::instance = T(); // global, but because 'tis a template, no cpp file required
|
||||
|
||||
@ -49,7 +50,7 @@ namespace {
|
||||
|
||||
#else
|
||||
|
||||
const none_t none ((none_t::init_tag()));
|
||||
BOOST_INLINE_VARIABLE const none_t none ((none_t::init_tag()));
|
||||
|
||||
#endif // older definitions
|
||||
|
||||
|
Reference in New Issue
Block a user