From 87ff652a07ae083c160678ef6c473569ff140034 Mon Sep 17 00:00:00 2001 From: Beman Dawes Date: Mon, 13 Nov 2006 22:10:57 +0000 Subject: [PATCH] move to namespace detail [SVN r36027] --- include/boost/detail/identifier.hpp | 111 ++++++++++++++-------------- 1 file changed, 57 insertions(+), 54 deletions(-) diff --git a/include/boost/detail/identifier.hpp b/include/boost/detail/identifier.hpp index dee4bef..688a664 100644 --- a/include/boost/detail/identifier.hpp +++ b/include/boost/detail/identifier.hpp @@ -16,71 +16,74 @@ namespace boost { - // class template identifier ---------------------------------------------// - - // Always used as a base class so that different instantiations result in - // different class types even if instantiated with the same value type T. - - // Expected usage is that T is often an integer type, best passed by - // value. There is no reason why T can't be a possibly larger class such as - // std::string, best passed by const reference. - - // This implementation uses pass by value, based on expected common uses. - - template - class identifier + namespace detail { - public: - typedef T value_type; + // class template identifier ---------------------------------------------// - const value_type value() const { return m_value; } - void assign( value_type v ) { m_value = v; } + // Always used as a base class so that different instantiations result in + // different class types even if instantiated with the same value type T. - bool operator==( const D & rhs ) const { return m_value == rhs.m_value; } - bool operator!=( const D & rhs ) const { return m_value != rhs.m_value; } - bool operator< ( const D & rhs ) const { return m_value < rhs.m_value; } - bool operator<=( const D & rhs ) const { return m_value <= rhs.m_value; } - bool operator> ( const D & rhs ) const { return m_value > rhs.m_value; } - bool operator>=( const D & rhs ) const { return m_value >= rhs.m_value; } + // Expected usage is that T is often an integer type, best passed by + // value. There is no reason why T can't be a possibly larger class such as + // std::string, best passed by const reference. - typedef void (*unspecified_bool_type)(D); // without the D, unspecified_bool_type - static void unspecified_bool_true(D){} // conversion allows relational operators - // between different identifier types + // This implementation uses pass by value, based on expected common uses. - operator unspecified_bool_type() const { return m_value == value_type() ? 0 : unspecified_bool_true; } - bool operator!() const { return m_value == value_type(); } + template + class identifier + { + public: + typedef T value_type; - // constructors are protected so that class can only be used as a base class - protected: - identifier() {} - explicit identifier( value_type v ) : m_value(v) {} + const value_type value() const { return m_value; } + void assign( value_type v ) { m_value = v; } -#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300 // 1300 == VC++ 7.0 bug workaround - private: -#endif - T m_value; - }; + bool operator==( const D & rhs ) const { return m_value == rhs.m_value; } + bool operator!=( const D & rhs ) const { return m_value != rhs.m_value; } + bool operator< ( const D & rhs ) const { return m_value < rhs.m_value; } + bool operator<=( const D & rhs ) const { return m_value <= rhs.m_value; } + bool operator> ( const D & rhs ) const { return m_value > rhs.m_value; } + bool operator>=( const D & rhs ) const { return m_value >= rhs.m_value; } -#ifndef BOOST_NO_SFINAE + typedef void (*unspecified_bool_type)(D); // without the D, unspecified_bool_type + static void unspecified_bool_true(D){} // conversion allows relational operators + // between different identifier types - template - typename enable_if< is_base_of< identifier< typename Id::value_type, Id >, Id >, - Ostream & >::type operator<<( Ostream & os, const Id & id ) - { - return os << id.value(); - } + operator unspecified_bool_type() const { return m_value == value_type() ? 0 : unspecified_bool_true; } + bool operator!() const { return m_value == value_type(); } - template - typename enable_if< is_base_of< identifier< typename Id::value_type, Id >, Id >, - Istream & >::type operator>>( Istream & is, Id & id ) - { - typename Id::value_type v; - is >> v; - id.value( v ); - return is; - } -#endif + // constructors are protected so that class can only be used as a base class + protected: + identifier() {} + explicit identifier( value_type v ) : m_value(v) {} + #if !defined(BOOST_MSVC) || BOOST_MSVC > 1300 // 1300 == VC++ 7.0 bug workaround + private: + #endif + T m_value; + }; + + //#ifndef BOOST_NO_SFINAE + + // template + // typename enable_if< is_base_of< identifier< typename Id::value_type, Id >, Id >, + // Ostream & >::type operator<<( Ostream & os, const Id & id ) + // { + // return os << id.value(); + // } + + // template + // typename enable_if< is_base_of< identifier< typename Id::value_type, Id >, Id >, + // Istream & >::type operator>>( Istream & is, Id & id ) + // { + // typename Id::value_type v; + // is >> v; + // id.value( v ); + // return is; + // } + //#endif + + } // namespace detail } // namespace boost #endif // BOOST_IDENTIFIER_HPP