mirror of
https://github.com/boostorg/optional.git
synced 2025-07-23 17:17:17 +02:00
Full merge from trunk at revision 41356 of entire boost-root tree.
[SVN r41369]
This commit is contained in:
@ -1,43 +1,28 @@
|
|||||||
// Copyright (C) 2003, Fernando Luis Cacciola Carballal.
|
// Copyright (C) 2003, Fernando Luis Cacciola Carballal.
|
||||||
// Copyright (C) 2007, Anthony Williams
|
|
||||||
// Copyright (C) 2007, Steven Watanabe, Richard Smith
|
|
||||||
//
|
//
|
||||||
// Distributed under the Boost Software License, Version 1.0.
|
// Distributed under the Boost Software License, Version 1.0.
|
||||||
// (See accompanying file LICENSE_1_0.txt or copy at
|
// (See accompanying file LICENSE_1_0.txt or copy at
|
||||||
// http://www.boost.org/LICENSE_1_0.txt)
|
// http://www.boost.org/LICENSE_1_0.txt)
|
||||||
//
|
//
|
||||||
// See http://www.boost.org/lib/optional/ for documentation.
|
// See http://www.boost.org/libs/optional for documentation.
|
||||||
//
|
//
|
||||||
// You are welcome to contact the author at:
|
// You are welcome to contact the author at:
|
||||||
// fernando.cacciola@gmail.com
|
// fernando_cacciola@hotmail.com
|
||||||
//
|
//
|
||||||
#ifndef BOOST_NONE_17SEP2003_HPP
|
#ifndef BOOST_NONE_17SEP2003_HPP
|
||||||
#define BOOST_NONE_17SEP2003_HPP
|
#define BOOST_NONE_17SEP2003_HPP
|
||||||
|
|
||||||
namespace boost
|
#include "boost/none_t.hpp"
|
||||||
{
|
|
||||||
namespace detail
|
|
||||||
{
|
|
||||||
class none_helper;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline void none(detail::none_helper);
|
// NOTE: Borland users have to include this header outside any precompiled headers
|
||||||
|
// (bcc<=5.64 cannot include instance data in a precompiled header)
|
||||||
|
// -- * To be verified, now that there's no unnamed namespace
|
||||||
|
|
||||||
namespace detail
|
namespace boost {
|
||||||
{
|
|
||||||
class none_helper
|
|
||||||
{
|
|
||||||
private:
|
|
||||||
|
|
||||||
none_helper( none_helper const& ) {}
|
none_t const none = ((none_t)0) ;
|
||||||
|
|
||||||
friend void boost::none(none_helper);
|
} // namespace boost
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
typedef void (*none_t)(detail::none_helper);
|
|
||||||
|
|
||||||
inline void none(detail::none_helper) {}
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
24
include/boost/none_t.hpp
Normal file
24
include/boost/none_t.hpp
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
// Copyright (C) 2003, Fernando Luis Cacciola Carballal.
|
||||||
|
//
|
||||||
|
// Use, modification, and distribution is subject to 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)
|
||||||
|
//
|
||||||
|
// See http://www.boost.org/libs/optional for documentation.
|
||||||
|
//
|
||||||
|
// You are welcome to contact the author at:
|
||||||
|
// fernando_cacciola@hotmail.com
|
||||||
|
//
|
||||||
|
#ifndef BOOST_NONE_T_17SEP2003_HPP
|
||||||
|
#define BOOST_NONE_T_17SEP2003_HPP
|
||||||
|
|
||||||
|
namespace boost {
|
||||||
|
|
||||||
|
namespace detail { struct none_helper{}; }
|
||||||
|
|
||||||
|
typedef int detail::none_helper::*none_t ;
|
||||||
|
|
||||||
|
} // namespace boost
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
@ -4,7 +4,7 @@
|
|||||||
// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
|
// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
|
||||||
// http://www.boost.org/LICENSE_1_0.txt)
|
// http://www.boost.org/LICENSE_1_0.txt)
|
||||||
//
|
//
|
||||||
// See http://www.boost.org/lib/optional for documentation.
|
// See http://www.boost.org/libs/optional for documentation.
|
||||||
//
|
//
|
||||||
// You are welcome to contact the author at:
|
// You are welcome to contact the author at:
|
||||||
// fernando_cacciola@hotmail.com
|
// fernando_cacciola@hotmail.com
|
||||||
|
Reference in New Issue
Block a user