Subject: [Boost-commit] svn:boost r84183 - in branches/release: boost libs/conversion/test
From: antoshkka_at_[hidden]
Date: 2013-05-07 15:24:48
Author: apolukhin
Date: 2013-05-07 15:24:47 EDT (Tue, 07 May 2013)
New Revision: 84183
URL: http://svn.boost.org/trac/boost/changeset/84183
Log:
Merge from trunk:
* Fix for GCC-4.8 warning (fixes #8547)
* Disable tests, invalid for C11 (clang specific)
Text files modified:
branches/release/boost/lexical_cast.hpp | 5 ++---
branches/release/libs/conversion/test/lexical_cast_float_types_test.cpp | 7 +++++--
2 files changed, 7 insertions(+), 5 deletions(-)
Modified: branches/release/boost/lexical_cast.hpp
==============================================================================
--- branches/release/boost/lexical_cast.hpp (original)
+++ branches/release/boost/lexical_cast.hpp 2013-05-07 15:24:47 EDT (Tue, 07 May 2013)
@@ -19,7 +19,7 @@
// Beman Dawes, Dave Abrahams, Daryle Walker, Peter Dimov,
// Alexander Nasonov, Antony Polukhin, Justin Viiret, Michael Hofmann,
// Cheng Yang, Matthew Bradbury, David W. Birdsall, Pavel Korzh and other Boosters
-// when: November 2000, March 2003, June 2005, June 2006, March 2011 - 2012
+// when: November 2000, March 2003, June 2005, June 2006, March 2011 - 2013
#include <boost/config.hpp>
#if defined(BOOST_NO_STRINGSTREAM) || defined(BOOST_NO_STD_WSTRING)
@@ -880,7 +880,6 @@
#ifndef BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
BOOST_STATIC_ASSERT(!std::numeric_limits<T>::is_signed);
#endif
- typedef typename Traits::int_type int_type;
CharT const czero = lcast_char_constants<CharT>::zero;
--end;
value = 0;
@@ -2712,7 +2711,7 @@
// Copyright Kevlin Henney, 2000-2005.
// Copyright Alexander Nasonov, 2006-2010.
-// Copyright Antony Polukhin, 2011-2012.
+// Copyright Antony Polukhin, 2011-2013.
//
// Distributed under the Boost Software License, Version 1.0. (See
// accompanying file LICENSE_1_0.txt or copy at
Modified: branches/release/libs/conversion/test/lexical_cast_float_types_test.cpp
==============================================================================
--- branches/release/libs/conversion/test/lexical_cast_float_types_test.cpp (original)
+++ branches/release/libs/conversion/test/lexical_cast_float_types_test.cpp 2013-05-07 15:24:47 EDT (Tue, 07 May 2013)
@@ -264,8 +264,11 @@
BOOST_CHECK_THROW(lexical_cast<test_t>("."), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<test_t>("-B"), bad_lexical_cast);
- BOOST_CHECK_THROW(lexical_cast<test_t>("0xB"), bad_lexical_cast);
- BOOST_CHECK_THROW(lexical_cast<test_t>("0x0"), bad_lexical_cast);
+
+ // Following two tests are not valid for C++11 compilers
+ //BOOST_CHECK_THROW(lexical_cast<test_t>("0xB"), bad_lexical_cast);
+ //BOOST_CHECK_THROW(lexical_cast<test_t>("0x0"), bad_lexical_cast);
+
BOOST_CHECK_THROW(lexical_cast<test_t>("--1.0"), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<test_t>("1.0e--1"), bad_lexical_cast);
BOOST_CHECK_THROW(lexical_cast<test_t>("1.0.0"), bad_lexical_cast);