diff --git a/doc/fusion.qbk b/doc/fusion.qbk index 0a24cb32..6d6987d5 100644 --- a/doc/fusion.qbk +++ b/doc/fusion.qbk @@ -2,6 +2,7 @@ Copyright (C) 2001-2011 Joel de Guzman Copyright (C) 2006 Dan Marsden Copyright (C) 2010 Christopher Schmidt + Copyright (C) 2018 Kohei Takahashi Use, modification and distribution is subject to the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at @@ -20,39 +21,37 @@ ] ] -[def __spirit__ [@http://spirit.sourceforge.net Spirit]] -[def __phoenix__ [@http://www.boost.org/libs/phoenix/index.html Phoenix]] -[def __mpl__ [@http://www.boost.org/libs/mpl/index.html MPL]] +[def __spirit__ [@http://boost-spirit.com/home/ Spirit]] +[def __phoenix__ [@http://www.boost.org/libs/phoenix Phoenix]] +[def __mpl__ [@http://www.boost.org/libs/mpl MPL]] [def __stl__ [@http://en.wikipedia.org/wiki/Standard_Template_Library STL]] -[def __tuple__ [@http://www.boost.org/libs/tuple/doc/tuple_users_guide.html Boost.Tuple]] +[def __tuple__ [@http://www.boost.org/libs/tuple Boost.Tuple]] [def __tr1__tuple__ [@http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2002/n1403.pdf TR1 Tuple]] [def __boost_tools__ [@http://www.boost.org/tools/index.html Boost Tools]] -[def __spirit_list__ [@https://lists.sourceforge.net/lists/listinfo/spirit-general Spirit Mailing List]] -[def __spirit_general__ [@news://news.gmane.org/gmane.comp.spirit.general Spirit General NNTP news portal]] -[def __gmane__ [@http://www.gmane.org Gmane]] -[def __mlist_archive__ [@http://news.gmane.org/gmane.comp.parsers.spirit.general]] +[def __spirit_list__ [@https://sourceforge.net/projects/spirit/lists/spirit-general Spirit Mailing List]] +[def __list_archive__ [@https://sourceforge.net/p/spirit/mailman/spirit-general/ archive]] [def __jaakko_jarvi__ [@http://www.boost.org/people/jaakko_jarvi.htm Jaakko Jarvi]] [def __david_abrahams__ [@http://www.boost.org/people/dave_abrahams.htm David Abrahams]] [def __the_forwarding_problem__ [@http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2002/n1385.htm The Forwarding Problem]] -[def __boost_any__ [@http://www.boost.org/doc/html/any.html Boost.Any]] +[def __boost_any__ [@http://www.boost.org/libs/any Boost.Any Library]] [def __new_iterator_concepts__ [@http://www.boost.org/libs/iterator/doc/new-iter-concepts.html New Iterator Concepts]] -[def __boost_array_library__ [@http://www.boost.org/doc/html/array.html Boost.Array Library]] -[def __boost_variant_library__ [@http://www.boost.org/doc/html/variant.html Boost.Variant Library]] -[def __boost_tuple_library__ [@http://www.boost.org/libs/tuple/doc/tuple_users_guide.html Boost.Tuple Library]] -[def __boost_ref__ [@http://www.boost.org/doc/html/ref.html Boost.Ref]] -[def __boost_ref_call__ [@http://www.boost.org/doc/html/ref.html `ref`]] -[def __boost_result_of__ [@http://www.boost.org/libs/utility/utility.htm#result_of Boost.ResultOf]] +[def __boost_array_library__ [@http://www.boost.org/libs/array Boost.Array Library]] +[def __boost_variant_library__ [@http://www.boost.org/libs/variant Boost.Variant Library]] +[def __boost_tuple_library__ [@http://www.boost.org/libs/tuple Boost.Tuple Library]] +[def __boost_ref__ [@http://www.boost.org/libs/core/ref.html Ref utility]] +[def __boost_ref_call__ [@http://www.boost.org/libs/core/ref.html `ref`]] +[def __boost_result_of__ [@http://www.boost.org/libs/utility/utility.htm#result_of ResultOf utility]] [def __boost_result_of_call__ [@http://www.boost.org/libs/utility/utility.htm#result_of `boost::result_of`]] -[def __boost_enable_if__ [@http://www.boost.org/libs/utility/enable_if.html Boost.EnableIf utility]] -[def __boost_shared_ptr_call__ [@http://www.boost.org/libs/smart_ptr/shared_ptr.htm `boost::shared_ptr`]] -[def __boost_func_forward__ [@http://www.boost.org/libs/functional/forward/doc/html/index.html Boost.Functional/Forward]] -[def __boost_func_factory__ [@http://www.boost.org/libs/functional/factory/doc/html/index.html Boost.Functional/Factory]] -[def __boost_func_hash__ [@http://www.boost.org/doc/html/hash.html Boost.Functional/Hash]] -[def __std_pair_doc__ [@http://www.sgi.com/tech/stl/pair.html `std::pair`]] +[def __boost_enable_if__ [@http://www.boost.org/libs/core/doc/html/core/enable_if.html EnableIf utility]] +[def __boost_shared_ptr_call__ [@http://www.boost.org/libs/smart_ptr#shared_ptr `boost::shared_ptr`]] +[def __boost_func_forward__ [@http://www.boost.org/libs/functional/forward Boost.Functional/Forward Library]] +[def __boost_func_factory__ [@http://www.boost.org/libs/functional/factory Boost.Functional/Factory Library]] +[def __boost_func_hash__ [@http://www.boost.org/doc/html/hash.html Boost.ContainerHash Library]] +[def __std_pair_doc__ [@http://en.cppreference.com/w/cpp/utility/pair `std::pair`]] [def __std_tuple_doc__ [@http://en.cppreference.com/w/cpp/utility/tuple `std::tuple`]] -[def __std_plus_doc__ [@http://www.sgi.com/tech/stl/plus.html `std::plus`]] -[def __std_minus_doc__ [@http://www.sgi.com/tech/stl/minus.html `std::minus`]] +[def __std_plus_doc__ [@http://en.cppreference.com/w/cpp/utility/functional/plus `std::plus`]] +[def __std_minus_doc__ [@http://en.cppreference.com/w/cpp/utility/functional/minus `std::minus`]] [def __mpl_integral_constant__ [@http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html MPL Integral Constant]] [def __mpl_boolean_constant__ [@http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html MPL Boolean Constant]] diff --git a/doc/preface.qbk b/doc/preface.qbk index 2fff963a..a6ab573f 100644 --- a/doc/preface.qbk +++ b/doc/preface.qbk @@ -61,11 +61,8 @@ tool. QuickBook can be found in the __boost_tools__. [heading Support] Please direct all questions to Spirit's mailing list. You can subscribe to the -__spirit_list__. The mailing list has a searchable archive. A search link to -this archive is provided in __spirit__'s home page. You may also read and post -messages to the mailing list through __spirit_general__ (thanks to __gmane__). -The news group mirrors the mailing list. Here is a link to the archives: -__mlist_archive__. +__spirit_list__. The mailing list has a searchable archive. Here is a link to +the archives: __list_archive__. [endsect] diff --git a/doc/references.qbk b/doc/references.qbk index d0d63019..a07815d4 100644 --- a/doc/references.qbk +++ b/doc/references.qbk @@ -1,6 +1,7 @@ [/============================================================================== Copyright (C) 2001-2011 Joel de Guzman Copyright (C) 2006 Dan Marsden + Copyright (C) 2018 Kohei Takahashi Use, modification and distribution is subject to the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at @@ -8,20 +9,20 @@ ===============================================================================/] [section References] -# [@http://boost.org/libs/iterator/doc/new-iter-concepts.html New Iterator Concepts], +# [@http://www.boost.org/libs/iterator/doc/new-iter-concepts.html New Iterator Concepts], David Abrahams, Jeremy Siek, Thomas Witt, 2004-11-01. -# [@http://boost.org/libs/tuple/doc/tuple_users_guide.html The Boost Tuple Library], +# [@http://www.boost.org/libs/tuple The Boost Tuple Library], Jaakko Jarvi, 2001. -# [@http://www.boost.org/libs/spirit/ Spirit Parser Library], +# [@http://www.boost.org/libs/spirit Spirit Parser Library], Joel de Guzman, 2001-2006. -# [@http://www.boost.org/libs/mpl/ The Boost MPL Library], +# [@http://www.boost.org/libs/mpl The Boost MPL Library], Aleksey Gurtovoy and David Abrahams, 2002-2004. -# [@http://www.boost.org/doc/html/array.html Boost Array], +# [@http://www.boost.org/libs/array The Boost Array Library], Nicolai Josuttis, 2002-2004. -# [@http://www.sgi.com/tech/stl/ Standard Template Library Programmer's Guide], - Hewlett-Packard Company, 1994. -# [@http://www.boost.org/doc/html/ref.html Boost.Ref], +# [@http://www.boost.org/libs/core/ref.html Boost.Core / Ref utility], Jaakko Jarvi, Peter Dimov, Douglas Gregor, Dave Abrahams, 1999-2002. +# [@http://www.boost.org/libs/hana The Boost Hana Library], + Louis Dionne, 2017. [endsect] diff --git a/test/support/and.cpp b/test/support/and.cpp index b657ead5..604a68d7 100644 --- a/test/support/and.cpp +++ b/test/support/and.cpp @@ -11,24 +11,18 @@ # error "does not meet requirements" #endif -#include #include #include -#include +#include -int main() { - using namespace boost; - using namespace boost::fusion::detail; - - BOOST_TEST((and_<>::value)); - BOOST_TEST(!(and_::value)); - BOOST_TEST((and_::value)); - BOOST_TEST(!(and_::value)); - BOOST_TEST((and_::value)); - BOOST_TEST(!(and_::value)); - BOOST_TEST((and_::value)); - BOOST_TEST((and_::value)); - - return boost::report_errors(); -} +using namespace boost; +using namespace boost::fusion::detail; +BOOST_MPL_ASSERT((and_<>)); +BOOST_MPL_ASSERT_NOT((and_)); +BOOST_MPL_ASSERT((and_)); +BOOST_MPL_ASSERT_NOT((and_)); +BOOST_MPL_ASSERT((and_)); +BOOST_MPL_ASSERT_NOT((and_)); +BOOST_MPL_ASSERT((and_)); +BOOST_MPL_ASSERT((and_));