From e588cfeb76703ee21cde80b13e0ebab9400644bb Mon Sep 17 00:00:00 2001 From: John Maddock Date: Sat, 11 Oct 2008 15:47:59 +0000 Subject: [PATCH] Merge inspection report fixes. [SVN r49283] --- test/boost_no_nested_friendship.ipp | 7 +++++++ test/boost_no_typename_with_ctor.ipp | 7 +++++++ tools/generate.cpp | 6 +++--- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/test/boost_no_nested_friendship.ipp b/test/boost_no_nested_friendship.ipp index eb726509..f6df83b2 100644 --- a/test/boost_no_nested_friendship.ipp +++ b/test/boost_no_nested_friendship.ipp @@ -1,3 +1,10 @@ +// Copyright (C) 2008 N. Musatti +// Use, modification and distribution are 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/config for most recent version. + // MACRO: BOOST_NO_NESTED_FRIENDSHIP // TITLE: Access to private members from nested classes // DESCRIPTION: If the compiler fails to support access to private members diff --git a/test/boost_no_typename_with_ctor.ipp b/test/boost_no_typename_with_ctor.ipp index f3e8679f..68a5a0ec 100644 --- a/test/boost_no_typename_with_ctor.ipp +++ b/test/boost_no_typename_with_ctor.ipp @@ -1,3 +1,10 @@ +// Copyright (C) 2008 N. Musatti +// Use, modification and distribution are 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/config for most recent version. + // MACRO: BOOST_NO_TYPENAME_WITH_CTOR // TITLE: Use of typename keyword with constructors // DESCRIPTION: If the compiler rejects the typename keyword when calling diff --git a/tools/generate.cpp b/tools/generate.cpp index 6af78fdb..87adc55c 100644 --- a/tools/generate.cpp +++ b/tools/generate.cpp @@ -156,12 +156,12 @@ void write_test_file(const fs::path& file, "# undef BOOST_ASSERT_CONFIG\n" "#endif\n\n"; - static const boost::regex tr1_exp("BOOST_HAS_TR1.*"); + static const boost::regex tr1_exp("BOOST_HAS_TR1.*"); ofs << "#include \n"; - if(regex_match(macro_name, tr1_exp)) - ofs << "#include \n"; + if(regex_match(macro_name, tr1_exp)) + ofs << "#include \n"; ofs << "#include \"test.hpp\"\n\n" "#if";