From 5f44bdcae8ce507bc328490993155fbb88cd88c2 Mon Sep 17 00:00:00 2001 From: Antony Polukhin Date: Wed, 24 Jul 2013 08:46:08 +0000 Subject: [PATCH] Fix warnings in lexical_cast found by Boost Inspection program (copyrights restored according to svn history, license text replaced with license name and link to it) [SVN r85149] --- cast.htm | 18 ++++++++++++------ include/boost/lexical_cast.hpp | 4 ++-- index.html | 15 +++++++++++++-- test/implicit_cast_fail.cpp | 2 +- test/lexical_cast_to_pointer_test.cpp | 2 +- 5 files changed, 29 insertions(+), 12 deletions(-) diff --git a/cast.htm b/cast.htm index a1580c3..c8d14c7 100644 --- a/cast.htm +++ b/cast.htm @@ -10,6 +10,13 @@ Header boost/cast.hpp Documentation + @@ -131,10 +138,9 @@ void f( Fruit * fruit ) { -->June 23, 2005

-

© Copyright boost.org 1999. Permission to copy, use, modify, sell - and distribute this document is granted provided this copyright notice - appears in all copies. This document is provided "as is" without express - or implied warranty, and with no claim as to its suitability for any - purpose.

+

© Copyright boost.org 1999. + 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) +

- \ No newline at end of file + diff --git a/include/boost/lexical_cast.hpp b/include/boost/lexical_cast.hpp index 77bacbb..3fc0072 100644 --- a/include/boost/lexical_cast.hpp +++ b/include/boost/lexical_cast.hpp @@ -2557,7 +2557,7 @@ namespace boost { ); } #endif -#ifndef BOOST_NO_CHAR16_T +#ifndef BOOST_NO_CXX11_CHAR16_T template inline Target lexical_cast(const char16_t* chars, std::size_t count) { @@ -2566,7 +2566,7 @@ namespace boost { ); } #endif -#ifndef BOOST_NO_CHAR32_T +#ifndef BOOST_NO_CXX11_CHAR32_T template inline Target lexical_cast(const char32_t* chars, std::size_t count) { diff --git a/index.html b/index.html index 133680c..fbfe63a 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,13 @@ Boost Conversion Library + @@ -32,7 +39,11 @@ supplied by several headers:

Revised June 23, 2005

- +

+ Copyright 2001 Beman Dawes. + 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) +

- \ No newline at end of file + diff --git a/test/implicit_cast_fail.cpp b/test/implicit_cast_fail.cpp index 2bc7068..442fa4c 100644 --- a/test/implicit_cast_fail.cpp +++ b/test/implicit_cast_fail.cpp @@ -20,7 +20,7 @@ int test_main(int, char*[]) { foo x = implicit_cast("foobar"); (void)x; // warning suppression. - BOOST_CHECK(false); // suppressing warning about ‘boost::unit_test::{anonymous}::unit_test_log’ defined but not used + BOOST_CHECK(false); // suppressing warning about 'boost::unit_test::{anonymous}::unit_test_log' defined but not used return 0; } diff --git a/test/lexical_cast_to_pointer_test.cpp b/test/lexical_cast_to_pointer_test.cpp index e008fb1..dcd5e55 100644 --- a/test/lexical_cast_to_pointer_test.cpp +++ b/test/lexical_cast_to_pointer_test.cpp @@ -17,7 +17,7 @@ int test_main(int, char*[]) { boost::lexical_cast("Hello"); - BOOST_CHECK(false); // suppressing warning about ‘boost::unit_test::{anonymous}::unit_test_log’ defined but not used + BOOST_CHECK(false); // suppressing warning about 'boost::unit_test::{anonymous}::unit_test_log' defined but not used return 0; }