From 0ea1644f9e5041627ddef8d685563fb9e6247b8c Mon Sep 17 00:00:00 2001 From: mat007 Date: Sat, 24 May 2014 07:23:28 +0000 Subject: [PATCH] Fixed examples compilation git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@740 860be788-9bd5-4423-9f1e-828f051e677b --- build/boost/doc/Jamfile.jam | 20 +++++++------------ .../example/limitations_comma_in_macro.cpp | 4 ++-- build/build.xml | 2 +- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/build/boost/doc/Jamfile.jam b/build/boost/doc/Jamfile.jam index 313da73..95bad42 100644 --- a/build/boost/doc/Jamfile.jam +++ b/build/boost/doc/Jamfile.jam @@ -31,7 +31,7 @@ boostbook standalone : mock : - reference +# reference boost.image.src=images/boost.png chunk.first.sections=1 # toc.max.depth=3 @@ -44,15 +44,9 @@ project example ../../../../.. ; -compile example/motivation.cpp ; -compile example/getting_started.cpp ; -compile example/customization.cpp ; -compile example/patterns_async_call.cpp ; -compile example/patterns_retrieve_cref.cpp ; -compile example/patterns_invoke_functor.cpp ; -compile example/patterns_quick_constraint.cpp ; -compile example/reference.cpp ; -compile example/limitations_throw_specifier.cpp ; -compile example/limitations_literal_zero.cpp ; -compile example/limitations_template_method.cpp ; -compile example/limitations_private_method.cpp ; +rule compile-examples +{ + for name in [ glob example/*.cpp ] { compile $(name) ; } +} + +alias mock_examples : [ compile-examples ] ; diff --git a/build/boost/doc/example/limitations_comma_in_macro.cpp b/build/boost/doc/example/limitations_comma_in_macro.cpp index a1c85bd..036e633 100644 --- a/build/boost/doc/example/limitations_comma_in_macro.cpp +++ b/build/boost/doc/example/limitations_comma_in_macro.cpp @@ -25,7 +25,7 @@ namespace limitations_comma_in_macro_solution_2 { //[ limitations_comma_in_macro_solution_2 template< typename T1, typename T2 > - MOCK_BASE_CLASS( my_mock, my_base_type< T1 BOOST_PP_COMMA() T2 > ) + MOCK_BASE_CLASS( my_mock, my_base_class< T1 BOOST_PP_COMMA() T2 > ) {}; //] } @@ -34,7 +34,7 @@ namespace limitations_comma_in_macro_solution_3 { //[ limitations_comma_in_macro_solution_3 template< typename T1, typename T2 > - struct my_mock : my_base_type< T1, T2 >, mock::object + struct my_mock : my_base_class< T1, T2 >, mock::object {}; //] } diff --git a/build/build.xml b/build/build.xml index 73a92b5..0ef14f7 100644 --- a/build/build.xml +++ b/build/build.xml @@ -236,7 +236,7 @@ - +