From 5983b75343aee4fd969effaa9afc26fee272408a Mon Sep 17 00:00:00 2001 From: mat007 Date: Sat, 31 May 2014 11:35:36 +0000 Subject: [PATCH] Added boost inspect as part of tests run git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@753 860be788-9bd5-4423-9f1e-828f051e677b --- build/boost/doc/acknowledgements.qbk | 7 +++++++ build/boost/doc/changelog.qbk | 7 +++++++ build/boost/doc/customization.qbk | 7 +++++++ build/boost/doc/example/getting_started.cpp | 8 ++++++++ .../boost/doc/example/limitations_comma_in_macro.cpp | 8 ++++++++ .../example/limitations_const_parameter_warning.cpp | 8 ++++++++ build/boost/doc/example/limitations_literal_zero.cpp | 8 ++++++++ .../doc/example/limitations_non_virtual_method.cpp | 8 ++++++++ .../boost/doc/example/limitations_private_method.cpp | 8 ++++++++ .../doc/example/limitations_template_method.cpp | 8 ++++++++ .../doc/example/limitations_throw_specifier.cpp | 8 ++++++++ build/boost/doc/example/motivation.cpp | 8 ++++++++ build/boost/doc/example/patterns_async_call.cpp | 8 ++++++++ build/boost/doc/example/patterns_invoke_functor.cpp | 8 ++++++++ .../boost/doc/example/patterns_quick_constraint.cpp | 10 +++++++++- build/boost/doc/example/patterns_retrieve_cref.cpp | 8 ++++++++ build/boost/doc/example/rationale.cpp | 2 +- build/boost/doc/example/reference.cpp | 12 +++++++++++- build/boost/doc/getting_started.qbk | 7 +++++++ build/boost/doc/html/boost-no-inspect | 0 build/boost/doc/limitations.qbk | 9 ++++++++- build/boost/doc/mock.qbk | 7 +++++++ build/boost/doc/motivation.qbk | 7 +++++++ build/boost/doc/patterns.qbk | 7 +++++++ build/boost/doc/rationale.qbk | 7 +++++++ build/boost/doc/reference.qbk | 7 +++++++ build/boost/test/Jamfile.jam | 8 ++++++++ build/build.xml | 2 +- test/detail/test_is_functor.cpp | 2 +- test/mock_error.hpp | 4 ---- turtle/config.hpp | 8 ++++++++ 31 files changed, 206 insertions(+), 10 deletions(-) create mode 100644 build/boost/doc/html/boost-no-inspect diff --git a/build/boost/doc/acknowledgements.qbk b/build/boost/doc/acknowledgements.qbk index e42e2e1..b91f13e 100644 --- a/build/boost/doc/acknowledgements.qbk +++ b/build/boost/doc/acknowledgements.qbk @@ -1,3 +1,10 @@ +[/ + / Copyright (c) 2014 Mathieu Champlon + / + / Distributed under 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) + /] + [section Acknowledgements] Many thanks to Adrien Gervaise, Silvin Lubecki and Takatoshi Kondo ! diff --git a/build/boost/doc/changelog.qbk b/build/boost/doc/changelog.qbk index ebd13c9..e942308 100644 --- a/build/boost/doc/changelog.qbk +++ b/build/boost/doc/changelog.qbk @@ -1,3 +1,10 @@ +[/ + / Copyright (c) 2014 Mathieu Champlon + / + / Distributed under 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) + /] + [section Changelog] [section 1.2.6] diff --git a/build/boost/doc/customization.qbk b/build/boost/doc/customization.qbk index dcaa799..60c61dc 100644 --- a/build/boost/doc/customization.qbk +++ b/build/boost/doc/customization.qbk @@ -1,3 +1,10 @@ +[/ + / Copyright (c) 2014 Mathieu Champlon + / + / Distributed under 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) + /] + [section Customization] [import example/customization.cpp] diff --git a/build/boost/doc/example/getting_started.cpp b/build/boost/doc/example/getting_started.cpp index 4285c2a..f3cf2d4 100644 --- a/build/boost/doc/example/getting_started.cpp +++ b/build/boost/doc/example/getting_started.cpp @@ -1,3 +1,11 @@ +// http://turtle.sourceforge.net +// +// Copyright Mathieu Champlon 2014 +// +// Distributed under 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) + //[ prerequisite #define BOOST_AUTO_TEST_MAIN #include diff --git a/build/boost/doc/example/limitations_comma_in_macro.cpp b/build/boost/doc/example/limitations_comma_in_macro.cpp index 036e633..6ae1e50 100644 --- a/build/boost/doc/example/limitations_comma_in_macro.cpp +++ b/build/boost/doc/example/limitations_comma_in_macro.cpp @@ -1,3 +1,11 @@ +// http://turtle.sourceforge.net +// +// Copyright Mathieu Champlon 2014 +// +// Distributed under 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) + #define BOOST_AUTO_TEST_MAIN #include #include diff --git a/build/boost/doc/example/limitations_const_parameter_warning.cpp b/build/boost/doc/example/limitations_const_parameter_warning.cpp index 32cbfe5..871e033 100644 --- a/build/boost/doc/example/limitations_const_parameter_warning.cpp +++ b/build/boost/doc/example/limitations_const_parameter_warning.cpp @@ -1,3 +1,11 @@ +// http://turtle.sourceforge.net +// +// Copyright Mathieu Champlon 2014 +// +// Distributed under 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) + #define BOOST_AUTO_TEST_MAIN #include #include diff --git a/build/boost/doc/example/limitations_literal_zero.cpp b/build/boost/doc/example/limitations_literal_zero.cpp index a55daef..08c2c05 100644 --- a/build/boost/doc/example/limitations_literal_zero.cpp +++ b/build/boost/doc/example/limitations_literal_zero.cpp @@ -1,3 +1,11 @@ +// http://turtle.sourceforge.net +// +// Copyright Mathieu Champlon 2014 +// +// Distributed under 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) + #define BOOST_AUTO_TEST_MAIN #include #include diff --git a/build/boost/doc/example/limitations_non_virtual_method.cpp b/build/boost/doc/example/limitations_non_virtual_method.cpp index 9d1123e..019a59e 100644 --- a/build/boost/doc/example/limitations_non_virtual_method.cpp +++ b/build/boost/doc/example/limitations_non_virtual_method.cpp @@ -1,3 +1,11 @@ +// http://turtle.sourceforge.net +// +// Copyright Mathieu Champlon 2014 +// +// Distributed under 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) + #define BOOST_AUTO_TEST_MAIN #include #include diff --git a/build/boost/doc/example/limitations_private_method.cpp b/build/boost/doc/example/limitations_private_method.cpp index 5121c7f..e1bf2c6 100644 --- a/build/boost/doc/example/limitations_private_method.cpp +++ b/build/boost/doc/example/limitations_private_method.cpp @@ -1,3 +1,11 @@ +// http://turtle.sourceforge.net +// +// Copyright Mathieu Champlon 2014 +// +// Distributed under 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) + #define BOOST_AUTO_TEST_MAIN #include #include diff --git a/build/boost/doc/example/limitations_template_method.cpp b/build/boost/doc/example/limitations_template_method.cpp index 3cf9035..f89d1fe 100644 --- a/build/boost/doc/example/limitations_template_method.cpp +++ b/build/boost/doc/example/limitations_template_method.cpp @@ -1,3 +1,11 @@ +// http://turtle.sourceforge.net +// +// Copyright Mathieu Champlon 2014 +// +// Distributed under 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) + #define BOOST_AUTO_TEST_MAIN #include #include diff --git a/build/boost/doc/example/limitations_throw_specifier.cpp b/build/boost/doc/example/limitations_throw_specifier.cpp index f6c6923..89e3913 100644 --- a/build/boost/doc/example/limitations_throw_specifier.cpp +++ b/build/boost/doc/example/limitations_throw_specifier.cpp @@ -1,3 +1,11 @@ +// http://turtle.sourceforge.net +// +// Copyright Mathieu Champlon 2014 +// +// Distributed under 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) + #define BOOST_AUTO_TEST_MAIN #include #include diff --git a/build/boost/doc/example/motivation.cpp b/build/boost/doc/example/motivation.cpp index ba4dd48..89a6bce 100644 --- a/build/boost/doc/example/motivation.cpp +++ b/build/boost/doc/example/motivation.cpp @@ -1,3 +1,11 @@ +// http://turtle.sourceforge.net +// +// Copyright Mathieu Champlon 2014 +// +// Distributed under 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) + #define BOOST_AUTO_TEST_MAIN #include #include diff --git a/build/boost/doc/example/patterns_async_call.cpp b/build/boost/doc/example/patterns_async_call.cpp index 045d718..83df2ed 100644 --- a/build/boost/doc/example/patterns_async_call.cpp +++ b/build/boost/doc/example/patterns_async_call.cpp @@ -1,3 +1,11 @@ +// http://turtle.sourceforge.net +// +// Copyright Mathieu Champlon 2014 +// +// Distributed under 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) + //[ async_call_problem namespace { diff --git a/build/boost/doc/example/patterns_invoke_functor.cpp b/build/boost/doc/example/patterns_invoke_functor.cpp index 70578e5..0faf8e9 100644 --- a/build/boost/doc/example/patterns_invoke_functor.cpp +++ b/build/boost/doc/example/patterns_invoke_functor.cpp @@ -1,3 +1,11 @@ +// http://turtle.sourceforge.net +// +// Copyright Mathieu Champlon 2014 +// +// Distributed under 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) + //[ invoke_functor_problem #include diff --git a/build/boost/doc/example/patterns_quick_constraint.cpp b/build/boost/doc/example/patterns_quick_constraint.cpp index 2075ce9..eb0821d 100644 --- a/build/boost/doc/example/patterns_quick_constraint.cpp +++ b/build/boost/doc/example/patterns_quick_constraint.cpp @@ -1,3 +1,11 @@ +// http://turtle.sourceforge.net +// +// Copyright Mathieu Champlon 2014 +// +// Distributed under 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) + //[ quick_constraint_problem #define BOOST_AUTO_TEST_MAIN #include @@ -10,7 +18,7 @@ namespace { public: explicit my_class( int data ) - : data_( data ) + : data_( data ) {} int data_; }; diff --git a/build/boost/doc/example/patterns_retrieve_cref.cpp b/build/boost/doc/example/patterns_retrieve_cref.cpp index 027581f..ffc3f40 100644 --- a/build/boost/doc/example/patterns_retrieve_cref.cpp +++ b/build/boost/doc/example/patterns_retrieve_cref.cpp @@ -1,3 +1,11 @@ +// http://turtle.sourceforge.net +// +// Copyright Mathieu Champlon 2014 +// +// Distributed under 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) + //[ retrieve_cref_problem namespace { diff --git a/build/boost/doc/example/rationale.cpp b/build/boost/doc/example/rationale.cpp index 8c0ce77..170e7e7 100644 --- a/build/boost/doc/example/rationale.cpp +++ b/build/boost/doc/example/rationale.cpp @@ -15,6 +15,6 @@ BOOST_AUTO_TEST_CASE( overflow_throws ) { mock_view v; calculator c( v ); - BOOST_CHECK_THROW( c.add( std::numeric_limits< int >::max(), 1 ), std::exception ); + BOOST_CHECK_THROW( c.add( (std::numeric_limits< int >::max)(), 1 ), std::exception ); } //] diff --git a/build/boost/doc/example/reference.cpp b/build/boost/doc/example/reference.cpp index 2665b89..f808d0f 100644 --- a/build/boost/doc/example/reference.cpp +++ b/build/boost/doc/example/reference.cpp @@ -1,3 +1,11 @@ +// http://turtle.sourceforge.net +// +// Copyright Mathieu Champlon 2014 +// +// Distributed under 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) + #define BOOST_AUTO_TEST_MAIN #include #include @@ -672,7 +680,8 @@ BOOST_AUTO_TEST_CASE( demonstrates_adding_a_custom_constraint_with_boost_phoenix //] } -#if !defined(BOOST_NO_CXX11_LAMBDAS) && !defined(BOOST_NO_LAMBDAS) +#ifndef MOCK_NO_LAMBDAS + namespace constraints_example_7 { //[ constraints_example_7 @@ -688,6 +697,7 @@ BOOST_AUTO_TEST_CASE( demonstrates_adding_a_constraint_with_cxx11_lambda ) } //] } + #endif namespace constraints_example_8 diff --git a/build/boost/doc/getting_started.qbk b/build/boost/doc/getting_started.qbk index a33c185..bc90904 100644 --- a/build/boost/doc/getting_started.qbk +++ b/build/boost/doc/getting_started.qbk @@ -1,3 +1,10 @@ +[/ + / Copyright (c) 2014 Mathieu Champlon + / + / Distributed under 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) + /] + [section Getting Started] [import example/getting_started.cpp] diff --git a/build/boost/doc/html/boost-no-inspect b/build/boost/doc/html/boost-no-inspect new file mode 100644 index 0000000..e69de29 diff --git a/build/boost/doc/limitations.qbk b/build/boost/doc/limitations.qbk index b7fde29..6f2274c 100644 --- a/build/boost/doc/limitations.qbk +++ b/build/boost/doc/limitations.qbk @@ -1,3 +1,10 @@ +[/ + / Copyright (c) 2014 Mathieu Champlon + / + / Distributed under 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) + /] + [section Limitations] [import example/limitations_literal_zero.cpp] [import example/limitations_throw_specifier.cpp] @@ -155,7 +162,7 @@ Finally another workaround would be to not use the macro at all : [limitations_comma_in_macro_solution_3] -Note that [@www.boost.org/libs/utility/identity_type/doc/html/index.html Boost.IdentityType] is of little help here because the type is by essence very often abstract, which doesn't work well for some compilers (e.g. gcc). +Note that [@http://www.boost.org/libs/utility/identity_type/doc/html/index.html Boost.IdentityType] is of little help here because the type is by essence very often abstract, which doesn't work well for some compilers (e.g. gcc). [endsect] diff --git a/build/boost/doc/mock.qbk b/build/boost/doc/mock.qbk index 2fc0638..7cdd860 100644 --- a/build/boost/doc/mock.qbk +++ b/build/boost/doc/mock.qbk @@ -1,3 +1,10 @@ +[/ + / Copyright (c) 2014 Mathieu Champlon + / + / Distributed under 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) + /] + [article Turtle [quickbook 1.5] [/ [authors [Champlon, Mathieu]] ] diff --git a/build/boost/doc/motivation.qbk b/build/boost/doc/motivation.qbk index c73f00c..0851aa2 100644 --- a/build/boost/doc/motivation.qbk +++ b/build/boost/doc/motivation.qbk @@ -1,3 +1,10 @@ +[/ + / Copyright (c) 2014 Mathieu Champlon + / + / Distributed under 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) + /] + [section Motivation] [import example/motivation.cpp] [import example/calculator.hpp] diff --git a/build/boost/doc/patterns.qbk b/build/boost/doc/patterns.qbk index 2da67a0..9322966 100644 --- a/build/boost/doc/patterns.qbk +++ b/build/boost/doc/patterns.qbk @@ -1,3 +1,10 @@ +[/ + / Copyright (c) 2014 Mathieu Champlon + / + / Distributed under 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) + /] + [section Patterns] [import example/patterns_async_call.cpp] [import example/patterns_retrieve_cref.cpp] diff --git a/build/boost/doc/rationale.qbk b/build/boost/doc/rationale.qbk index 8f1ebbf..7984ced 100644 --- a/build/boost/doc/rationale.qbk +++ b/build/boost/doc/rationale.qbk @@ -1,3 +1,10 @@ +[/ + / Copyright (c) 2014 Mathieu Champlon + / + / Distributed under 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) + /] + [section:rationale Rationale] [import example/rationale.cpp] diff --git a/build/boost/doc/reference.qbk b/build/boost/doc/reference.qbk index 93d560d..60e4400 100644 --- a/build/boost/doc/reference.qbk +++ b/build/boost/doc/reference.qbk @@ -1,3 +1,10 @@ +[/ + / Copyright (c) 2014 Mathieu Champlon + / + / Distributed under 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) + /] + [section Reference] [import example/reference.cpp] diff --git a/build/boost/test/Jamfile.jam b/build/boost/test/Jamfile.jam index 79e96fd..2a4b494 100644 --- a/build/boost/test/Jamfile.jam +++ b/build/boost/test/Jamfile.jam @@ -15,6 +15,14 @@ project ../include ; +path-constant parent : .. ; + +alias mock_inspect : + [ run /boost/tools/inspect//inspect/release + : $(parent) -text -brief : : : inspect + ] +; + rule run-test ( name ) { run $(name) undefined.cpp /boost//unit_test_framework : : : : $(name)_ ; diff --git a/build/build.xml b/build/build.xml index 979a221..633a2c4 100644 --- a/build/build.xml +++ b/build/build.xml @@ -155,7 +155,7 @@ - + diff --git a/test/detail/test_is_functor.cpp b/test/detail/test_is_functor.cpp index bfc5550..5bbdd90 100644 --- a/test/detail/test_is_functor.cpp +++ b/test/detail/test_is_functor.cpp @@ -142,7 +142,7 @@ BOOST_AUTO_TEST_CASE( class_with_sig_is_functor ) is_functor( sig_functor() ); } -#if !defined(BOOST_NO_CXX11_LAMBDAS) && !defined(BOOST_NO_LAMBDAS) +#ifndef MOCK_NO_LAMBDAS BOOST_AUTO_TEST_CASE( cxx11_lambda_is_functor ) { diff --git a/test/mock_error.hpp b/test/mock_error.hpp index 24569d1..dc64c0d 100644 --- a/test/mock_error.hpp +++ b/test/mock_error.hpp @@ -17,10 +17,6 @@ struct mock_error_data_t : boost::unit_test::singleton< mock_error_data_t > { - ~mock_error_data_t() - { - assert( verify() ); - } void reset() { call_count = 0; diff --git a/turtle/config.hpp b/turtle/config.hpp index b9b5940..8cce9fa 100644 --- a/turtle/config.hpp +++ b/turtle/config.hpp @@ -6,6 +6,8 @@ // (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) +// boost-no-inspect + #ifndef MOCK_CONFIG_HPP_INCLUDED #define MOCK_CONFIG_HPP_INCLUDED @@ -90,4 +92,10 @@ # endif #endif +#if !defined(BOOST_NO_CXX11_LAMBDAS) && !defined(BOOST_NO_LAMBDAS) +# ifndef MOCK_NO_LAMBDAS +# define MOCK_NO_LAMBDAS +# endif +#endif + #endif // MOCK_CONFIG_HPP_INCLUDED