Release 1.50.0

[SVN r79156]
2026-08-06 13:34:14 +02:00 · 2012-06-28 12:37:29 +00:00
29 changed files with 1455 additions and 3553 deletions
@@ -10,13 +10,6 @@
    <meta name="ProgId" content="FrontPage.Editor.Document">

    <title>Header boost/cast.hpp Documentation</title>
-    <style>
-       .copyright
-        {
-            color: #666666;
-            font-size: small;
-        }
-    </style>
  </head>

  <body bgcolor="#FFFFFF" text="#000000">
@@ -138,9 +131,10 @@ void f( Fruit * fruit ) {
                    -->June 23, 2005<!--webbot bot="Timestamp" endspan i-checksum="30348"
                    --></p>

-    <p class="copyright">&copy; Copyright boost.org 1999. 
-    Distributed under the Boost Software License, Version 1.0. (See accompanying
-    file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</a>)
-    </p>
+    <p>&copy; 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.</p>
  </body>
-</html>
+</html>
@@ -1,35 +0,0 @@
-// Copyright 2013 Antony Polukhin
-
-// Distributed under the Boost Software License, Version 1.0.
-// (See the accompanying file LICENSE_1_0.txt
-// or a copy at <http://www.boost.org/LICENSE_1_0.txt>.)
-
-//[lexical_cast_args_example
-//`The following example treats command line arguments as a sequence of numeric data
-
-#include <boost/lexical_cast.hpp>
-#include <vector>
-
-int main(int /*argc*/, char * argv[])
-{
-    using boost::lexical_cast;
-    using boost::bad_lexical_cast;
-
-    std::vector<short> args;
-
-    while (*++argv)
-    {
-        try
-        {
-            args.push_back(lexical_cast<short>(*argv));
-        }
-        catch(const bad_lexical_cast &)
-        {
-            args.push_back(0);
-        }
-    }
-
-    // ...
-}
-
-//] [/lexical_cast_args_example]
@@ -1,61 +0,0 @@
-// Copyright 2013 Antony Polukhin
-
-// Distributed under the Boost Software License, Version 1.0.
-// (See the accompanying file LICENSE_1_0.txt
-// or a copy at <http://www.boost.org/LICENSE_1_0.txt>.)
-
-
-//[lexical_cast_stringize
-/*`
-    In this example we'll make a `stringize` method that accepts a sequence, converts
-    each element of the sequence into string and appends that string to the result.
-
-    Example is based on the example from the [@http://www.packtpub.com/boost-cplusplus-application-development-cookbook/book Boost C++ Application Development Cookbook]
-    by Antony Polukhin, ISBN 9781849514880.
-
-    Step 1: Making a functor that converts any type to a string and remembers result:
-*/
-
-#include <boost/lexical_cast.hpp>
-
-struct stringize_functor {
-private:
-    std::string& result;
-
-public:
-    explicit stringize_functor(std::string& res)
-        : result(res)
-    {}
-
-    template <class T>
-    void operator()(const T& v) const {
-        result += boost::lexical_cast<std::string>(v);
-    }
-};
-
-//` Step 2: Applying `stringize_functor` to each element in sequence:
-#include <boost/fusion/include/for_each.hpp>
-template <class Sequence>
-std::string stringize(const Sequence& seq) {
-    std::string result;
-    boost::fusion::for_each(seq, stringize_functor(result));
-    return result;
-}
-
-//` Step 3: Using the `stringize` with different types:
-#include <cassert>
-#include <boost/fusion/adapted/boost_tuple.hpp>
-#include <boost/fusion/adapted/std_pair.hpp>
-
-int main() {
-    boost::tuple<char, int, char, int> decim('-', 10, 'e', 5);
-    assert(stringize(decim) == "-10e5");
-
-    std::pair<short, std::string> value_and_type(270, "Kelvin");
-    assert(stringize(value_and_type) == "270Kelvin");
-}
-
-//] [/lexical_cast_stringize]
-
-
-
@@ -1,52 +0,0 @@
-// Copyright 2013 Antony Polukhin
-
-// Distributed under the Boost Software License, Version 1.0.
-// (See the accompanying file LICENSE_1_0.txt
-// or a copy at <http://www.boost.org/LICENSE_1_0.txt>.)
-
-#include <boost/lexical_cast.hpp>
-#include <string>
-#include <cstdio>
-
-//[lexical_cast_log_errno
-//`The following example uses numeric data in a string expression: 
-
-void log_message(const std::string &);
-
-void log_errno(int yoko)
-{
-    log_message("Error " + boost::lexical_cast<std::string>(yoko) + ": " + strerror(yoko));
-}
-
-//] [/lexical_cast_log_errno]
-
-
-//[lexical_cast_fixed_buffer
-//`The following example converts some number and puts it to file:
-
-void number_to_file(int number, FILE* file)
-{
-    typedef boost::array<char, 50> buf_t; // You can use std::array if your compiler supports it
-    buf_t buffer = boost::lexical_cast<buf_t>(number); // No dynamic memory allocation
-    fputs(buffer.begin(), file);
-}
-
-//] [/lexical_cast_fixed_buffer]
-
-//[lexical_cast_substring_conversion
-//`The following example takes part of the string and converts it to `int`:
-
-int convert_strings_part(const std::string& s, std::size_t pos, std::size_t n)
-{
-    return boost::lexical_cast<int>(s.data() + pos, n);
-}
-
-//] [/lexical_cast_substring_conversion]
-
-void log_message(const std::string &) {}
-
-int main()
-{
-    return 0;
-}
-
@@ -1,39 +0,0 @@
-// Copyright 2013 Antony Polukhin
-
-// Distributed under the Boost Software License, Version 1.0.
-// (See the accompanying file LICENSE_1_0.txt
-// or a copy at <http://www.boost.org/LICENSE_1_0.txt>.)
-
-
-//[lexical_cast_variant_to_long_double
-/*`
-    In this example we'll make a `to_long_double` method that converts value of the Boost.Variant to `long double`.
-*/
-
-#include <boost/lexical_cast.hpp>
-#include <boost/variant.hpp>
-#include <cassert>
-
-struct to_long_double_functor: boost::static_visitor<long double> {
-    template <class T>
-    long double operator()(const T& v) const {
-        // Lexical cast has many optimizations including optimizations for situations that usually 
-        // occur in generic programming, like std::string to std::string or arithmetic type to arithmetic type conversion. 
-        return boost::lexical_cast<long double>(v);
-    }
-};
-
-// Throws `boost::bad_lexical_cast` if value of the variant is not convertible to `long double`
-template <class Variant>
-long double to_long_double(const Variant& v) {
-    return boost::apply_visitor(to_long_double_functor(), v);
-}
-
-int main() {
-    boost::variant<char, int, std::string> v1('0'), v2("10.0001"), v3(1);
-
-    long double sum = to_long_double(v1) + to_long_double(v2) + to_long_double(v3);
-    assert(sum > 11 && sum < 11.1);
-}
-
-//] [/lexical_cast_variant_to_long_double]
@@ -6,13 +6,6 @@
 <meta name="GENERATOR" content="Microsoft FrontPage 5.0">
 <meta name="ProgId" content="FrontPage.Editor.Document">
 <title>Boost Conversion Library</title>
-<style>
-   .copyright
-    {
-        color: #666666;
-        font-size: small;
-    }
-</style>
 </head>

 <body bgcolor="#FFFFFF" text="#000000">
@@ -39,11 +32,7 @@ supplied by several headers:</p>
 <p>Revised <!--webbot bot="Timestamp" S-Type="EDITED"
 S-Format="%d %B, %Y" startspan -->June 23, 2005<!--webbot bot="Timestamp" endspan i-checksum="30348" -->
 </p>
-<p class="copyright">
-    Copyright 2001 Beman Dawes.
-    Distributed under the Boost Software License, Version 1.0. (See accompanying
-    file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</a>)
-</p>
+
 </body>

-</html>
+</html>
@@ -4,7 +4,7 @@
 //
 //  Copyright Terje Sletteb and Kevlin Henney, 2005.
 //  Copyright Alexander Nasonov, 2006.
-//  Copyright Antony Polukhin, 2011-2012.
+//  Copyright Antony Polukhin, 2011.
 //
 //  Distributed under the Boost
 //  Software License, Version 1.0. (See accompanying file
@@ -36,7 +36,6 @@
 #include <boost/type_traits/integral_promotion.hpp>
 #include <string>
 #include <vector>
-#include <algorithm> // std::transform
 #include <memory>

 #if (defined(BOOST_HAS_LONG_LONG) || defined(BOOST_HAS_MS_INT64)) \
@@ -58,6 +57,13 @@ struct my_allocator : std::allocator<CharT>
 {
 };

+// Test all 65536 values if true:
+bool const lcast_test_small_integral_types_completely = false;
+
+// lcast_integral_test_counter: use when testing all values of an integral
+// types is not possible. Max. portable value is 32767.
+int const lcast_integral_test_counter=1000;
+
 using namespace boost;

 void test_conversion_to_char();
@@ -67,13 +73,25 @@ void test_conversion_to_bool();
 void test_conversion_with_nonconst_char();
 void test_conversion_to_string();
 void test_conversion_from_to_wchar_t_alias();
+void test_conversion_to_pointer();
 void test_conversion_from_wchar_t();
 void test_conversion_to_wchar_t();
 void test_conversion_from_wstring();
 void test_conversion_to_wstring();
 void test_bad_lexical_cast();
 void test_no_whitespace_stripping();
-void test_volatile_types_conversions();
+void test_conversion_from_to_short();
+void test_conversion_from_to_ushort();
+void test_conversion_from_to_int();
+void test_conversion_from_to_uint();
+void test_conversion_from_to_long();
+void test_conversion_from_to_ulong();
+void test_conversion_from_to_intmax_t();
+void test_conversion_from_to_uintmax_t();
+#ifdef LCAST_TEST_LONGLONG
+void test_conversion_from_to_longlong();
+void test_conversion_from_to_ulonglong();
+#endif
 #ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 void test_traits();
 void test_wtraits();
@@ -82,13 +100,13 @@ void test_wallocator();
 #endif
 void test_char_types_conversions();
 void operators_overload_test();
-#if !defined(BOOST_NO_CXX11_CHAR16_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS)
+#if !defined(BOOST_NO_CHAR16_T) && !defined(BOOST_NO_UNICODE_LITERALS)
 void test_char16_conversions();
 #endif
-#if !defined(BOOST_NO_CXX11_CHAR32_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS)
+#if !defined(BOOST_NO_CHAR32_T) && !defined(BOOST_NO_UNICODE_LITERALS)
 void test_char32_conversions();
 #endif
-void test_getting_pointer_to_function();
+

 unit_test::test_suite *init_unit_test_suite(int, char *[])
 {
@@ -99,6 +117,7 @@ unit_test::test_suite *init_unit_test_suite(int, char *[])
    suite->add(BOOST_TEST_CASE(test_conversion_to_double));
    suite->add(BOOST_TEST_CASE(test_conversion_to_bool));
    suite->add(BOOST_TEST_CASE(test_conversion_from_to_wchar_t_alias));
+    suite->add(BOOST_TEST_CASE(test_conversion_to_pointer));
    suite->add(BOOST_TEST_CASE(test_conversion_to_string));
    suite->add(BOOST_TEST_CASE(test_conversion_with_nonconst_char));
 #ifndef BOOST_LCAST_NO_WCHAR_T
@@ -109,7 +128,18 @@ unit_test::test_suite *init_unit_test_suite(int, char *[])
 #endif
    suite->add(BOOST_TEST_CASE(test_bad_lexical_cast));
    suite->add(BOOST_TEST_CASE(test_no_whitespace_stripping));
-    suite->add(BOOST_TEST_CASE(test_volatile_types_conversions));
+    suite->add(BOOST_TEST_CASE(&test_conversion_from_to_short));
+    suite->add(BOOST_TEST_CASE(&test_conversion_from_to_ushort));
+    suite->add(BOOST_TEST_CASE(&test_conversion_from_to_int));
+    suite->add(BOOST_TEST_CASE(&test_conversion_from_to_uint));
+    suite->add(BOOST_TEST_CASE(&test_conversion_from_to_long));
+    suite->add(BOOST_TEST_CASE(&test_conversion_from_to_ulong));
+    suite->add(BOOST_TEST_CASE(&test_conversion_from_to_intmax_t));
+    suite->add(BOOST_TEST_CASE(&test_conversion_from_to_uintmax_t));
+#ifdef LCAST_TEST_LONGLONG
+    suite->add(BOOST_TEST_CASE(&test_conversion_from_to_longlong));
+    suite->add(BOOST_TEST_CASE(&test_conversion_from_to_ulonglong));
+#endif
 #ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
    suite->add(BOOST_TEST_CASE(&test_traits));
    suite->add(BOOST_TEST_CASE(&test_wtraits));
@@ -119,13 +149,12 @@ unit_test::test_suite *init_unit_test_suite(int, char *[])

    suite->add(BOOST_TEST_CASE(&test_char_types_conversions));
    suite->add(BOOST_TEST_CASE(&operators_overload_test));
-#if !defined(BOOST_NO_CXX11_CHAR16_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS)
+#if !defined(BOOST_NO_CHAR16_T) && !defined(BOOST_NO_UNICODE_LITERALS)
    suite->add(BOOST_TEST_CASE(&test_char16_conversions));
 #endif
-#if !defined(BOOST_NO_CXX11_CHAR32_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS)
+#if !defined(BOOST_NO_CHAR32_T) && !defined(BOOST_NO_UNICODE_LITERALS)
    suite->add(BOOST_TEST_CASE(&test_char32_conversions));
 #endif
-    suite->add(BOOST_TEST_CASE(&test_getting_pointer_to_function));

    return suite;
 }
@@ -242,15 +271,9 @@ void test_conversion_to_bool()
    BOOST_CHECK_EQUAL(false, lexical_cast<bool>(0));
    BOOST_CHECK_THROW(lexical_cast<bool>(123), bad_lexical_cast);
    BOOST_CHECK_EQUAL(true, lexical_cast<bool>(1.0));
-    BOOST_CHECK_THROW(lexical_cast<bool>(-123), bad_lexical_cast);
    BOOST_CHECK_EQUAL(false, lexical_cast<bool>(0.0));
-    BOOST_CHECK_THROW(lexical_cast<bool>(1234), bad_lexical_cast);
-#if !defined(_CRAYC)
-    // Looks like a bug in CRAY compiler (throws bad_lexical_cast)
-    // TODO: localize the bug and report it to developers.
    BOOST_CHECK_EQUAL(true, lexical_cast<bool>(true));
    BOOST_CHECK_EQUAL(false, lexical_cast<bool>(false));
-#endif
    BOOST_CHECK_EQUAL(true, lexical_cast<bool>("1"));
    BOOST_CHECK_EQUAL(false, lexical_cast<bool>("0"));
    BOOST_CHECK_THROW(lexical_cast<bool>(""), bad_lexical_cast);
@@ -310,6 +333,14 @@ void test_conversion_from_to_wchar_t_alias()
    BOOST_CHECK_EQUAL(std::string("123"), lexical_cast<std::string>(123ul));
 }

+void test_conversion_to_pointer()
+{
+    BOOST_CHECK_THROW(lexical_cast<char *>("Test"), bad_lexical_cast);
+#ifndef BOOST_LCAST_NO_WCHAR_T
+    BOOST_CHECK_THROW(lexical_cast<wchar_t *>("Test"), bad_lexical_cast);
+#endif
+}
+
 void test_conversion_from_wchar_t()
 {
 #ifndef BOOST_LCAST_NO_WCHAR_T
@@ -368,7 +399,6 @@ void test_conversion_to_wchar_t()
    BOOST_CHECK_THROW(
        lexical_cast<wchar_t>(std::wstring(L"Test")), bad_lexical_cast);
 #endif
-    BOOST_CHECK(true);
 }

 void test_conversion_from_wstring()
@@ -387,7 +417,6 @@ void test_conversion_from_wstring()
    BOOST_CHECK_THROW(
        lexical_cast<bool>(std::wstring(L"Test")), bad_lexical_cast);
 #endif
-    BOOST_CHECK(true);
 }

 void test_conversion_to_wstring()
@@ -412,7 +441,6 @@ void test_conversion_to_wstring()
    BOOST_CHECK(L" " == lexical_cast<std::wstring>(std::wstring(L" ")));
    BOOST_CHECK(L"" == lexical_cast<std::wstring>(std::wstring(L"")));
 #endif
-    BOOST_CHECK(true);
 }

 void test_bad_lexical_cast()
@@ -436,18 +464,445 @@ void test_no_whitespace_stripping()
    BOOST_CHECK_THROW(lexical_cast<int>("123 "), bad_lexical_cast);
 }

-void test_volatile_types_conversions()
+// Replace "-,999" with "-999".
+template<class CharT>
+std::basic_string<CharT> to_str_gcc_workaround(std::basic_string<CharT> str)
 {
-    volatile int i1 = 100000;
-    BOOST_CHECK_EQUAL("100000", boost::lexical_cast<std::string>(i1));
+    std::locale loc;
+    std::numpunct<CharT> const& np = BOOST_USE_FACET(std::numpunct<CharT>, loc);
+    std::ctype<CharT> const& ct = BOOST_USE_FACET(std::ctype<CharT>, loc);

-    volatile const int i2 = 100000;
-    BOOST_CHECK_EQUAL("100000", boost::lexical_cast<std::string>(i2));
+    if(np.grouping().empty())
+        return str;

-    volatile const long int i3 = 1000000;
-    BOOST_CHECK_EQUAL("1000000", boost::lexical_cast<std::string>(i3));
+    CharT prefix[3] = { ct.widen('-'), np.thousands_sep(), CharT() };
+
+    if(str.find(prefix) != 0)
+        return str;
+
+    prefix[1] = CharT();
+    str.replace(0, 2, prefix);
+    return str;
 }

+template<class CharT, class T>
+std::basic_string<CharT> to_str(T t)
+{
+    std::basic_ostringstream<CharT> o;
+    o << t;
+    return to_str_gcc_workaround(o.str());
+}
+
+template<class T, class CharT>
+void test_conversion_from_integral_to_char(CharT zero)
+{
+    BOOST_CHECK(lexical_cast<CharT>(static_cast<T>(0)) == zero + 0);
+    BOOST_CHECK(lexical_cast<CharT>(static_cast<T>(1)) == zero + 1);
+    BOOST_CHECK(lexical_cast<CharT>(static_cast<T>(2)) == zero + 2);
+    BOOST_CHECK(lexical_cast<CharT>(static_cast<T>(3)) == zero + 3);
+    BOOST_CHECK(lexical_cast<CharT>(static_cast<T>(4)) == zero + 4);
+    BOOST_CHECK(lexical_cast<CharT>(static_cast<T>(5)) == zero + 5);
+    BOOST_CHECK(lexical_cast<CharT>(static_cast<T>(6)) == zero + 6);
+    BOOST_CHECK(lexical_cast<CharT>(static_cast<T>(7)) == zero + 7);
+    BOOST_CHECK(lexical_cast<CharT>(static_cast<T>(8)) == zero + 8);
+    BOOST_CHECK(lexical_cast<CharT>(static_cast<T>(9)) == zero + 9);
+
+    BOOST_CHECK_THROW(lexical_cast<CharT>(static_cast<T>(10)), bad_lexical_cast);
+
+    T t = (std::numeric_limits<T>::max)();
+    BOOST_CHECK_THROW(lexical_cast<CharT>(t), bad_lexical_cast);
+}
+
+template<class T, class CharT>
+void test_conversion_from_char_to_integral(CharT zero)
+{
+    BOOST_CHECK(lexical_cast<T>( static_cast<CharT>(zero + 0)) == static_cast<T>(0) );
+    BOOST_CHECK(lexical_cast<T>( static_cast<CharT>(zero + 1)) == static_cast<T>(1) );
+    BOOST_CHECK(lexical_cast<T>( static_cast<CharT>(zero + 2)) == static_cast<T>(2) );
+    BOOST_CHECK(lexical_cast<T>( static_cast<CharT>(zero + 3)) == static_cast<T>(3) );
+    BOOST_CHECK(lexical_cast<T>( static_cast<CharT>(zero + 4)) == static_cast<T>(4) );
+    BOOST_CHECK(lexical_cast<T>( static_cast<CharT>(zero + 5)) == static_cast<T>(5) );
+    BOOST_CHECK(lexical_cast<T>( static_cast<CharT>(zero + 6)) == static_cast<T>(6) );
+    BOOST_CHECK(lexical_cast<T>( static_cast<CharT>(zero + 7)) == static_cast<T>(7) );
+    BOOST_CHECK(lexical_cast<T>( static_cast<CharT>(zero + 8)) == static_cast<T>(8) );
+    BOOST_CHECK(lexical_cast<T>( static_cast<CharT>(zero + 9)) == static_cast<T>(9) );
+
+    BOOST_CHECK_THROW(lexical_cast<T>( static_cast<CharT>(zero + 10)), bad_lexical_cast);
+    BOOST_CHECK_THROW(lexical_cast<T>( static_cast<CharT>(zero - 1)), bad_lexical_cast);
+}
+
+template<class T>
+void test_conversion_from_integral_to_integral()
+{
+    T t = 0;
+    BOOST_CHECK(lexical_cast<T>(t) == t);
+
+    // Next two variables are used to supress warnings.
+    int st = 32767; unsigned int ut = st;
+    t = st;
+    BOOST_CHECK(lexical_cast<short>(t) == st);
+    BOOST_CHECK(lexical_cast<unsigned short>(t) == ut);
+    BOOST_CHECK(lexical_cast<int>(t) == st);
+    BOOST_CHECK(lexical_cast<unsigned int>(t) == ut);
+    BOOST_CHECK(lexical_cast<long>(t) == st);
+    BOOST_CHECK(lexical_cast<unsigned long>(t) == ut);
+
+    t = (std::numeric_limits<T>::max)();
+    BOOST_CHECK(lexical_cast<T>(t) == t);
+
+    t = (std::numeric_limits<T>::min)();
+    BOOST_CHECK(lexical_cast<T>(t) == t);
+}
+
+template<class T, class CharT>
+void test_conversion_from_integral_to_string(CharT)
+{
+    typedef std::numeric_limits<T> limits;
+    typedef std::basic_string<CharT> string_type;
+
+    T t;
+
+    t = (limits::min)();
+    BOOST_CHECK(lexical_cast<string_type>(t) == to_str<CharT>(t));
+
+    t = (limits::max)();
+    BOOST_CHECK(lexical_cast<string_type>(t) == to_str<CharT>(t));
+
+    if(limits::digits <= 16 && lcast_test_small_integral_types_completely)
+        // min and max have already been tested.
+        for(t = 1 + (limits::min)(); t != (limits::max)(); ++t)
+            BOOST_CHECK(lexical_cast<string_type>(t) == to_str<CharT>(t));
+    else
+    {
+        T const min_val = (limits::min)();
+        T const max_val = (limits::max)();
+        T const half_max_val = max_val / 2;
+        T const cnt = lcast_integral_test_counter; // to supress warnings
+        unsigned int const counter = cnt < half_max_val ? cnt : half_max_val;
+
+        unsigned int i;
+
+        // Test values around min:
+        t = min_val;
+        for(i = 0; i < counter; ++i, ++t)
+            BOOST_CHECK(lexical_cast<string_type>(t) == to_str<CharT>(t));
+
+        // Test values around max:
+        t = max_val;
+        for(i = 0; i < counter; ++i, --t)
+            BOOST_CHECK(lexical_cast<string_type>(t) == to_str<CharT>(t));
+
+        // Test values around zero:
+        if(limits::is_signed)
+            for(t = static_cast<T>(-counter); t < static_cast<T>(counter); ++t)
+                BOOST_CHECK(lexical_cast<string_type>(t) == to_str<CharT>(t));
+
+        // Test values around 100, 1000, 10000, ...
+        T ten_power = 100;
+        for(int e = 2; e <= limits::digits10; ++e, ten_power *= 10)
+        {
+            // ten_power + 100 probably never overflows
+            for(t = ten_power - 100; t != ten_power + 100; ++t)
+                BOOST_CHECK(lexical_cast<string_type>(t) == to_str<CharT>(t));
+        }
+    }
+}
+
+template<class T, class CharT>
+void test_conversion_from_string_to_integral(CharT)
+{
+    typedef std::numeric_limits<T> limits;
+    typedef std::basic_string<CharT> string_type;
+
+    string_type s;
+    string_type const zero = to_str<CharT>(0);
+    string_type const nine = to_str<CharT>(9);
+    T const min_val = (limits::min)();
+    T const max_val = (limits::max)();
+
+    s = to_str<CharT>(min_val);
+    BOOST_CHECK_EQUAL(lexical_cast<T>(s), min_val);
+    if(limits::is_signed)
+    {
+        BOOST_CHECK_THROW(lexical_cast<T>(s + zero), bad_lexical_cast);
+        BOOST_CHECK_THROW(lexical_cast<T>(s + nine), bad_lexical_cast);
+    }
+
+    s = to_str<CharT>(max_val);
+    BOOST_CHECK_EQUAL(lexical_cast<T>(s), max_val);
+    {
+        BOOST_CHECK_THROW(lexical_cast<T>(s + zero), bad_lexical_cast);
+        BOOST_CHECK_THROW(lexical_cast<T>(s + nine), bad_lexical_cast);
+
+        s = to_str<CharT>(max_val);
+        for (int i =1; i <=10; ++i) {
+            s[s.size()-1] += 1;
+            BOOST_CHECK_THROW(lexical_cast<T>( s ), bad_lexical_cast);
+        }
+
+        s = to_str<CharT>(max_val);
+        std::locale loc;
+        typedef std::numpunct<char> numpunct;
+        if ( BOOST_USE_FACET(numpunct, loc).grouping().empty() ) {
+            // Following tests work well for locale C
+            BOOST_CHECK_EQUAL(lexical_cast<T>(to_str<CharT>(0)+s), max_val);
+            BOOST_CHECK_EQUAL(lexical_cast<T>(to_str<CharT>(0)+to_str<CharT>(0)+s), max_val);
+            BOOST_CHECK_EQUAL(lexical_cast<T>(to_str<CharT>(0)+to_str<CharT>(0)+to_str<CharT>(0)+s), max_val);
+        }
+
+        for (int i =1; i <=256; ++i) {
+            BOOST_CHECK_THROW(lexical_cast<T>( to_str<CharT>(i)+s ), bad_lexical_cast);
+        }
+
+        typedef BOOST_DEDUCED_TYPENAME boost::integral_promotion<T>::type promoted;
+        if ( !(boost::is_same<T, promoted>::value) )
+        {
+            promoted prom = max_val;
+            s = to_str<CharT>(max_val);
+            for (int i =1; i <=256; ++i) {
+                BOOST_CHECK_THROW(lexical_cast<T>( to_str<CharT>(prom+i) ), bad_lexical_cast);
+                BOOST_CHECK_THROW(lexical_cast<T>( to_str<CharT>(i)+s ), bad_lexical_cast);
+            }
+        }
+    }
+
+    if(limits::digits <= 16 && lcast_test_small_integral_types_completely)
+        // min and max have already been tested.
+        for(T t = 1 + min_val; t != max_val; ++t)
+            BOOST_CHECK(lexical_cast<T>(to_str<CharT>(t)) == t);
+    else
+    {
+        T const half_max_val = max_val / 2;
+        T const cnt = lcast_integral_test_counter; // to supress warnings
+        unsigned int const counter = cnt < half_max_val ? cnt : half_max_val;
+
+        T t;
+        unsigned int i;
+
+        // Test values around min:
+        t = min_val;
+        for(i = 0; i < counter; ++i, ++t)
+            BOOST_CHECK(lexical_cast<T>(to_str<CharT>(t)) == t);
+
+        // Test values around max:
+        t = max_val;
+        for(i = 0; i < counter; ++i, --t)
+            BOOST_CHECK(lexical_cast<T>(to_str<CharT>(t)) == t);
+
+        // Test values around zero:
+        if(limits::is_signed)
+            for(t = static_cast<T>(-counter); t < static_cast<T>(counter); ++t)
+                BOOST_CHECK(lexical_cast<T>(to_str<CharT>(t)) == t);
+
+        // Test values around 100, 1000, 10000, ...
+        T ten_power = 100;
+        for(int e = 2; e <= limits::digits10; ++e, ten_power *= 10)
+        {
+            // ten_power + 100 probably never overflows
+            for(t = ten_power - 100; t != ten_power + 100; ++t)
+                BOOST_CHECK(lexical_cast<T>(to_str<CharT>(t)) == t);
+        }
+    }
+}
+
+template<class T>
+void test_conversion_from_to_integral_for_locale()
+{
+    std::locale current_locale;
+    typedef std::numpunct<char> numpunct;
+    numpunct const& np = BOOST_USE_FACET(numpunct, current_locale);
+    if ( !np.grouping().empty() )
+    {
+        BOOST_CHECK_THROW(
+                lexical_cast<T>( std::string("100") + np.thousands_sep() + np.thousands_sep() + "0" )
+                , bad_lexical_cast);
+        BOOST_CHECK_THROW(lexical_cast<T>( std::string("100") + np.thousands_sep() ), bad_lexical_cast);
+        BOOST_CHECK_THROW(lexical_cast<T>( np.thousands_sep() + std::string("100") ), bad_lexical_cast);
+
+        // Exception must not be thrown, when we are using no separators at all
+        BOOST_CHECK( lexical_cast<T>("30000") == static_cast<T>(30000) );
+    }
+
+    test_conversion_from_integral_to_integral<T>();
+    test_conversion_from_integral_to_string<T>('0');
+    test_conversion_from_string_to_integral<T>('0');
+#if !defined(BOOST_LCAST_NO_WCHAR_T)
+    test_conversion_from_integral_to_string<T>(L'0');
+    test_conversion_from_string_to_integral<T>(L'0');
+#endif
+}
+
+struct restore_oldloc
+{
+    std::locale oldloc;
+    ~restore_oldloc() { std::locale::global(oldloc); }
+};
+
+template<class T>
+void test_conversion_from_to_integral()
+{
+    char const zero = '0';
+    signed char const szero = '0';
+    unsigned char const uzero = '0';
+    test_conversion_from_integral_to_char<T>(zero);
+    test_conversion_from_char_to_integral<T>(zero);
+    test_conversion_from_integral_to_char<T>(szero);
+    test_conversion_from_char_to_integral<T>(szero);
+    test_conversion_from_integral_to_char<T>(uzero);
+    test_conversion_from_char_to_integral<T>(uzero);
+#if !defined(BOOST_LCAST_NO_WCHAR_T) && !defined(BOOST_NO_INTRINSIC_WCHAR_T)
+    wchar_t const wzero = L'0';
+    test_conversion_from_integral_to_char<T>(wzero);
+    test_conversion_from_char_to_integral<T>(wzero);
+#endif
+#if !defined(BOOST_NO_CHAR16_T) && !defined(BOOST_NO_UNICODE_LITERALS)
+    char16_t const u16zero = u'0';
+    test_conversion_from_integral_to_char<T>(u16zero);
+    test_conversion_from_char_to_integral<T>(u16zero);
+#endif
+#if !defined(BOOST_NO_CHAR32_T) && !defined(BOOST_NO_UNICODE_LITERALS)
+    char32_t const u32zero = u'0';
+    test_conversion_from_integral_to_char<T>(u32zero);
+    test_conversion_from_char_to_integral<T>(u32zero);
+#endif
+
+    BOOST_CHECK(lexical_cast<T>("-1") == static_cast<T>(-1));
+    BOOST_CHECK(lexical_cast<T>("-9") == static_cast<T>(-9));
+    BOOST_CHECK(lexical_cast<T>(-1) == static_cast<T>(-1));
+    BOOST_CHECK(lexical_cast<T>(-9) == static_cast<T>(-9));
+
+    BOOST_CHECK_THROW(lexical_cast<T>("-1.0"), bad_lexical_cast);
+    BOOST_CHECK_THROW(lexical_cast<T>("-9.0"), bad_lexical_cast);
+    BOOST_CHECK(lexical_cast<T>(-1.0) == static_cast<T>(-1));
+    BOOST_CHECK(lexical_cast<T>(-9.0) == static_cast<T>(-9));
+
+    BOOST_CHECK(lexical_cast<T>(static_cast<T>(1)) == static_cast<T>(1));
+    BOOST_CHECK(lexical_cast<T>(static_cast<T>(9)) == static_cast<T>(9));
+    BOOST_CHECK_THROW(lexical_cast<T>(1.1f), bad_lexical_cast);
+    BOOST_CHECK_THROW(lexical_cast<T>(1.1), bad_lexical_cast);
+    BOOST_CHECK_THROW(lexical_cast<T>(1.1L), bad_lexical_cast);
+    BOOST_CHECK_THROW(lexical_cast<T>(1.0001f), bad_lexical_cast);
+    BOOST_CHECK_THROW(lexical_cast<T>(1.0001), bad_lexical_cast);
+    BOOST_CHECK_THROW(lexical_cast<T>(1.0001L), bad_lexical_cast);
+
+    BOOST_CHECK(lexical_cast<T>("+1") == static_cast<T>(1) );
+    BOOST_CHECK(lexical_cast<T>("+9") == static_cast<T>(9) );
+    BOOST_CHECK(lexical_cast<T>("+10") == static_cast<T>(10) );
+    BOOST_CHECK(lexical_cast<T>("+90") == static_cast<T>(90) );
+    BOOST_CHECK_THROW(lexical_cast<T>("++1"), bad_lexical_cast);
+    BOOST_CHECK_THROW(lexical_cast<T>("-+9"), bad_lexical_cast);
+    BOOST_CHECK_THROW(lexical_cast<T>("--1"), bad_lexical_cast);
+    BOOST_CHECK_THROW(lexical_cast<T>("+-9"), bad_lexical_cast);
+    // test_conversion_from_to_integral_for_locale
+
+    // Overflow test case from David W. Birdsall
+    std::string must_owerflow_str = "160000000000000000000";
+    std::string must_owerflow_negative_str = "-160000000000000000000";
+    for (int i = 0; i < 15; ++i) {
+        BOOST_CHECK_THROW(lexical_cast<T>(must_owerflow_str), bad_lexical_cast);
+        BOOST_CHECK_THROW(lexical_cast<T>(must_owerflow_negative_str), bad_lexical_cast);
+
+        must_owerflow_str += '0';
+        must_owerflow_negative_str += '0';
+    }
+
+    typedef std::numpunct<char> numpunct;
+
+    restore_oldloc guard;
+    std::locale const& oldloc = guard.oldloc;
+
+    std::string grouping1 = BOOST_USE_FACET(numpunct, oldloc).grouping();
+    std::string grouping2(grouping1);
+
+    test_conversion_from_to_integral_for_locale<T>();
+
+    try
+    {
+        std::locale newloc("");
+        std::locale::global(newloc);
+
+        grouping2 = BOOST_USE_FACET(numpunct, newloc).grouping();
+    }
+    catch(std::exception const& ex)
+    {
+        std::string msg("Failed to set system locale: ");
+        msg += ex.what();
+        BOOST_TEST_MESSAGE(msg);
+    }
+
+    if(grouping1 != grouping2)
+        test_conversion_from_to_integral_for_locale<T>();
+
+    if(grouping1.empty() && grouping2.empty())
+        BOOST_TEST_MESSAGE("Formatting with thousands_sep has not been tested");
+}
+
+void test_conversion_from_to_short()
+{
+    test_conversion_from_to_integral<short>();
+}
+
+void test_conversion_from_to_ushort()
+{
+    test_conversion_from_to_integral<unsigned short>();
+}
+
+void test_conversion_from_to_int()
+{
+    test_conversion_from_to_integral<int>();
+}
+
+void test_conversion_from_to_uint()
+{
+    test_conversion_from_to_integral<unsigned int>();
+}
+
+void test_conversion_from_to_long()
+{
+    test_conversion_from_to_integral<long>();
+}
+
+void test_conversion_from_to_ulong()
+{
+    test_conversion_from_to_integral<unsigned long>();
+}
+
+void test_conversion_from_to_intmax_t()
+{
+    test_conversion_from_to_integral<boost::intmax_t>();
+}
+
+void test_conversion_from_to_uintmax_t()
+{
+    test_conversion_from_to_integral<boost::uintmax_t>();
+}
+
+#if defined(BOOST_HAS_LONG_LONG)
+
+void test_conversion_from_to_longlong()
+{
+    test_conversion_from_to_integral<boost::long_long_type>();
+}
+
+void test_conversion_from_to_ulonglong()
+{
+    test_conversion_from_to_integral<boost::ulong_long_type>();
+}
+
+#elif defined(BOOST_HAS_MS_INT64)
+
+void test_conversion_from_to_longlong()
+{
+    test_conversion_from_to_integral<__int64>();
+}
+
+void test_conversion_from_to_ulonglong()
+{
+    test_conversion_from_to_integral<unsigned __int64>();
+}
+
+#endif
+
 #ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 void test_traits()
 {
@@ -473,11 +928,6 @@ void test_wtraits()

 void test_allocator()
 {
-// Following test cause compilation error on MSVC2012:
-// (Reason: cannot convert from 'std::_Wrap_alloc<_Alloc>' to 'const my_allocator<CharT>')
-// 
-// MSVC developer is notified about this issue
-#if !defined(_MSC_VER) || (_MSC_VER < 1700)
    typedef std::basic_string< char
                             , std::char_traits<char>
                             , my_allocator<char>
@@ -490,16 +940,10 @@ void test_allocator()
    BOOST_CHECK(boost::lexical_cast<my_string>(1) == "1");
    BOOST_CHECK(boost::lexical_cast<my_string>("s") == s);
    BOOST_CHECK(boost::lexical_cast<my_string>(std::string("s")) == s);
-#endif
 }

 void test_wallocator()
 {
-// Following test cause compilation error on MSVC2012:
-// (Reason: cannot convert from 'std::_Wrap_alloc<_Alloc>' to 'const my_allocator<CharT>')
-// 
-// MSVC developer is notified about this issue
-#if !defined(_MSC_VER) || (_MSC_VER < 1700)
    typedef std::basic_string< wchar_t
                             , std::char_traits<wchar_t>
                             , my_allocator<wchar_t>
@@ -512,12 +956,10 @@ void test_wallocator()
    BOOST_CHECK(boost::lexical_cast<my_string>(1) == L"1");
    BOOST_CHECK(boost::lexical_cast<my_string>(L"s") == s);
    BOOST_CHECK(boost::lexical_cast<my_string>(std::wstring(L"s")) == s);
-#endif
 }

 #endif

-
 void test_char_types_conversions()
 {
    const char c_arr[]            = "Test array of chars";
@@ -582,7 +1024,7 @@ void operators_overload_test()
 }


-#if !defined(BOOST_NO_CXX11_CHAR16_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS)
+#if !defined(BOOST_NO_CHAR16_T) && !defined(BOOST_NO_UNICODE_LITERALS)
 void test_char16_conversions()
 {
    BOOST_CHECK(u"100" == lexical_cast<std::u16string>(u"100"));
@@ -590,7 +1032,7 @@ void test_char16_conversions()
 }
 #endif

-#if !defined(BOOST_NO_CXX11_CHAR16_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS)
+#if !defined(BOOST_NO_CHAR16_T) && !defined(BOOST_NO_UNICODE_LITERALS)
 void test_char32_conversions()
 {
    BOOST_CHECK(U"100" == lexical_cast<std::u32string>(U"100"));
@@ -598,25 +1040,3 @@ void test_char32_conversions()
 }
 #endif

-void test_getting_pointer_to_function()
-{
-    // Just checking that &lexical_cast<To, From> is not ambiguous
-    typedef char char_arr[4];    
-    typedef int(*f1)(const char_arr&);
-    f1 p1 = &boost::lexical_cast<int, char_arr>;
-    BOOST_CHECK(p1);
-
-    typedef int(*f2)(const std::string&);
-    f2 p2 = &boost::lexical_cast<int, std::string>;
-    BOOST_CHECK(p2);
-
-    typedef std::string(*f3)(const int&);
-    f3 p3 = &boost::lexical_cast<std::string, int>;
-    BOOST_CHECK(p3);
-
-    std::vector<int> values;
-    std::vector<std::string> ret;
-    std::transform(values.begin(), values.end(), ret.begin(), boost::lexical_cast<std::string, int>);
-}
-
-
@@ -28,7 +28,7 @@ using namespace boost;
 using std::cout;


-int test_main( int , char * [] )
+int test_main( int argc, char * argv[] )
 {

 #   ifdef NDEBUG
@@ -48,7 +48,7 @@ int test_main( int , char * [] )
    long large_negative_value = LONG_MIN;
    signed char c = 0;

-    c = static_cast<signed char>(large_value);
+    c = large_value;  // see if compiler generates warning

    c = numeric_cast<signed char>( small_value );
    BOOST_CHECK( c == 1 );
@@ -96,6 +96,5 @@ int test_main( int , char * [] )
        { cout<<"caught bad_numeric_cast #5\n"; caught_exception = true; }
    BOOST_CHECK ( caught_exception );

-    (void)ul; // Supressing GCC warning about set but unused wariable
    return 0 ;
 }
@@ -13,7 +13,6 @@
 #define BOOST_CHRONO_HEADER_ONLY

 #include <boost/lexical_cast.hpp>
-
 #include <boost/chrono.hpp>
 #include <fstream>
 #include <cstring>
@@ -22,13 +21,6 @@
 // File to output data
 std::fstream fout;

-namespace boost {
-inline std::istream& operator>> (std::istream& in, boost::array<char,50>& res) {
-    in >> res.begin();
-    return in;
-}
-}
-
 template <class OutT, class InT>
 static inline void test_lexical(const InT& in_val) {
    OutT out_val = boost::lexical_cast<OutT>(in_val);
@@ -45,28 +37,6 @@ static inline void test_ss_constr(const InT& in_val) {
    if (ss.fail()) throw std::logic_error("descr");
 }

-template <class OutT, class CharT, std::size_t N>
-static inline void test_ss_constr(const boost::array<CharT, N>& in_val) {
-    OutT out_val;
-    std::stringstream ss;
-    ss << in_val.begin();
-    if (ss.fail()) throw std::logic_error("descr");
-    ss >> out_val;
-    if (ss.fail()) throw std::logic_error("descr");
-}
-
-template <class OutT, class StringStreamT, class CharT, std::size_t N>
-static inline void test_ss_noconstr(StringStreamT& ss, const boost::array<CharT, N>& in_val) {
-    OutT out_val;
-    ss << in_val.begin(); // ss is an instance of std::stringstream
-    if (ss.fail()) throw std::logic_error("descr");
-    ss >> out_val;
-    if (ss.fail()) throw std::logic_error("descr");
-    /* reseting std::stringstream to use it again */
-    ss.str(std::string());
-    ss.clear();
-}
-
 template <class OutT, class StringStreamT, class InT>
 static inline void test_ss_noconstr(StringStreamT& ss, const InT& in_val) {
    OutT out_val;
@@ -94,12 +64,6 @@ struct structure_sprintf {
 };

 struct structure_sscanf {
-    template <class OutT, class BufferT, class CharT, std::size_t N>
-    static inline void test(BufferT* /*buffer*/, const boost::array<CharT, N>& in_val, const char* const conv) {
-        OutT out_val;
-        sscanf(in_val.cbegin(), conv, &out_val);
-    }
-
    template <class OutT, class BufferT, class InT>
    static inline void test(BufferT* /*buffer*/, const InT& in_val, const char* const conv) {
        OutT out_val;
@@ -265,7 +229,7 @@ void string_like_test_set(const std::string& from) {
    perf_test<float, ssc_t>(from + "->float",             conv("1.123"), "%f");
    perf_test<double, ssc_t>(from + "->double",           conv("1.123"), "%lf");
    perf_test<long double, ssc_t>(from + "->long double", conv("1.123"), "%Lf");
-    perf_test<boost::array<char, 50>, ssc_t>(from + "->array<char, 50>", conv("1.123"), "%s");
+

    perf_test<std::string, structure_fake>(from + "->string", conv("string"), "%Lf");
    perf_test<boost::container::string, structure_fake>(from + "->container::string"
@@ -304,14 +268,6 @@ struct to_iterator_range {
    }
 };

-struct to_array_50 {
-    boost::array<char, 50> operator()(const char* const c) const {
-        boost::array<char, 50> ret;
-        std::strcpy(ret.begin(), c);
-        return ret;
-    }
-};
-
 int main(int argc, char** argv) {
    BOOST_ASSERT(argc >= 2);
    std::string output_path(argv[1]);
@@ -354,7 +310,6 @@ int main(int argc, char** argv) {
    string_like_test_set<to_uchar_conv>("unsigned char*");
    string_like_test_set<to_schar_conv>("signed char*");
    string_like_test_set<to_iterator_range>("iterator_range<char*>");
-    string_like_test_set<to_array_50>("array<char, 50>");

    perf_test<int, structure_fake>("int->int", 100, "");
    perf_test<double, structure_fake>("float->double", 100.0f, "");
@@ -1,5 +1,5 @@
 # Copyright (C) 2001-2003 Douglas Gregor
-# Copyright (C) 2011-2013 Antony Polukhin
+# Copyright (C) 2011-2012 Antony Polukhin
 #
 # 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)
@@ -12,14 +12,7 @@ project
    : requirements
        <library>/boost/test//boost_unit_test_framework
        <link>static
-        <toolset>gcc-4.7:<cxxflags>-ftrapv
-        <toolset>gcc-4.6:<cxxflags>-ftrapv
-        <toolset>clang:<cxxflags>-ftrapv
-        # default to all warnings on:
-        <warnings>all
-        # set warnings as errors for those compilers we know we get warning free:
-        <toolset>gcc:<cxxflags>-Wextra
-        <toolset>gcc:<cxxflags>-Wno-uninitialized
+        <toolset>gcc-4.8:<define>BOOST_STL_SUPPORTS_NEW_UNICODE_LOCALES
    ;

 # Thanks to Steven Watanabe for helping with <nowchar> feature
@@ -40,34 +33,19 @@ test-suite conversion
    [ run lexical_cast_wchars_test.cpp ]
    [ run lexical_cast_float_types_test.cpp ]
    [ run lexical_cast_inf_nan_test.cpp ]
-    [ run lexical_cast_containers_test.cpp : : : <toolset>gcc:<cxxflags>-Wno-long-long <toolset>clang:<cxxflags>-Wno-long-long ]
+    [ run lexical_cast_containers_test.cpp ]
    [ run lexical_cast_empty_input_test.cpp ]
    [ run lexical_cast_pointers_test.cpp ]
    [ compile lexical_cast_typedefed_wchar_test.cpp : <toolset>msvc:<nowchar>on ]
    [ run lexical_cast_typedefed_wchar_test_runtime.cpp : : : <toolset>msvc:<nowchar>on <toolset>msvc,<stdlib>stlport:<build>no ]
    [ run lexical_cast_no_locale_test.cpp : : : <define>BOOST_NO_STD_LOCALE <define>BOOST_LEXICAL_CAST_ASSUME_C_LOCALE ]
    [ run lexical_cast_no_exceptions_test.cpp : : : <define>BOOST_NO_EXCEPTIONS
-      <toolset>gcc-4.3:<cxxflags>-fno-exceptions
-      <toolset>gcc-4.4:<cxxflags>-fno-exceptions
-      <toolset>gcc-4.5:<cxxflags>-fno-exceptions
-      <toolset>gcc-4.6:<cxxflags>-fno-exceptions
-      <toolset>gcc-4.7:<cxxflags>-fno-exceptions
-      <toolset>gcc-4.8:<cxxflags>-fno-exceptions
-      <toolset>clang:<cxxflags>-fno-exceptions
+      <toolset>gcc-4.3:<cflags>-fno-exceptions
+      <toolset>gcc-4.4:<cflags>-fno-exceptions
+      <toolset>gcc-4.5:<cflags>-fno-exceptions
+      <toolset>gcc-4.6:<cflags>-fno-exceptions
+      <toolset>gcc-4.7:<cflags>-fno-exceptions
    ]
    [ run lexical_cast_iterator_range_test.cpp ]
-    [ run lexical_cast_arrays_test.cpp ]
-    [ run lexical_cast_integral_types_test.cpp ]
-    [ run lexical_cast_stream_detection_test.cpp ]
-    [ run lexical_cast_stream_traits_test.cpp ]
-    [ compile-fail lexical_cast_to_pointer_test.cpp ]
-    [ run lexical_cast_filesystem_test.cpp ../../filesystem/build//boost_filesystem/<link>static ]
  ;

-# Assuring that examples compile and run. Adding sources from `example` directory to the `conversion` test suite. 
-for local p in [ glob ../example/*.cpp ]
-{
-    conversion += [ run $(p) ] ;
-}
-
-
@@ -28,7 +28,7 @@ int main()

    type<foo> f = check_return(boost::implicit_cast<foo>("hello"));
    type<long> z = check_return(boost::implicit_cast<long>(foo("hello")));
-
+    
    // warning supression:
    (void)x;
    (void)f;
@@ -19,8 +19,4 @@ struct foo
 int test_main(int, char*[])
 {
    foo x = implicit_cast<foo>("foobar");
-    (void)x;            // warning suppression.
-    BOOST_CHECK(false); // suppressing warning about 'boost::unit_test::{anonymous}::unit_test_log' defined but not used
-    return 0;
 }
-
@@ -1,377 +0,0 @@
-//  Testing boost::lexical_cast with boost::container::string.
-//
-//  See http://www.boost.org for most recent version, including documentation.
-//
-//  Copyright Antony Polukhin, 2012.
-//
-//  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).
-
-#include <boost/lexical_cast.hpp>
-
-#include <boost/test/unit_test.hpp>
-    
-#include <boost/array.hpp>
-
-void testing_boost_array_output_conversion();
-void testing_std_array_output_conversion();
-
-void testing_boost_array_input_conversion();
-void testing_std_array_input_conversion();
-
-using namespace boost;
-
-#if !defined(BOOST_NO_CXX11_CHAR16_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS) && !defined(_LIBCPP_VERSION)
-#define BOOST_LC_RUNU16
-#endif
-
-#if !defined(BOOST_NO_CXX11_CHAR32_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS) && !defined(_LIBCPP_VERSION)
-#define BOOST_LC_RUNU32
-#endif
-
-boost::unit_test::test_suite *init_unit_test_suite(int, char *[])
-{
-    unit_test::test_suite *suite =
-        BOOST_TEST_SUITE("Testing boost::lexical_cast with boost::array and std::array");
-
-    suite->add(BOOST_TEST_CASE(testing_boost_array_output_conversion));
-    suite->add(BOOST_TEST_CASE(testing_std_array_output_conversion));
-    suite->add(BOOST_TEST_CASE(testing_boost_array_input_conversion));
-    suite->add(BOOST_TEST_CASE(testing_std_array_input_conversion));
-
-    return suite;
-}
-
-template <template <class, std::size_t> class ArrayT, class T>
-static void testing_template_array_output_on_spec_value(T val) 
-{
-    typedef ArrayT<char, 300>             arr_type;
-    typedef ArrayT<char, 1>               short_arr_type;
-    typedef ArrayT<unsigned char, 300>    uarr_type;
-    typedef ArrayT<unsigned char, 1>      ushort_arr_type;
-    typedef ArrayT<signed char, 4>        sarr_type;
-    typedef ArrayT<signed char, 3>        sshort_arr_type;
-
-    std::string ethalon("100");
-    using namespace std;
-
-    {
-        arr_type res1 = lexical_cast<arr_type>(val);
-        BOOST_CHECK_EQUAL(&res1[0], ethalon);
-        const arr_type res2 = lexical_cast<arr_type>(val);
-        BOOST_CHECK_EQUAL(&res2[0], ethalon);
-        BOOST_CHECK_THROW(lexical_cast<short_arr_type>(val), boost::bad_lexical_cast);
-    }
-    
-    {
-        uarr_type res1 = lexical_cast<uarr_type>(val);
-        BOOST_CHECK_EQUAL(reinterpret_cast<char*>(&res1[0]), ethalon);
-        const uarr_type res2 = lexical_cast<uarr_type>(val);
-        BOOST_CHECK_EQUAL(reinterpret_cast<const char*>(&res2[0]), ethalon);
-        BOOST_CHECK_THROW(lexical_cast<ushort_arr_type>(val), boost::bad_lexical_cast);
-    }
-    
-    {
-        sarr_type res1 = lexical_cast<sarr_type>(val);
-        BOOST_CHECK_EQUAL(reinterpret_cast<char*>(&res1[0]), ethalon);
-        const sarr_type res2 = lexical_cast<sarr_type>(val);
-        BOOST_CHECK_EQUAL(reinterpret_cast<const char*>(&res2[0]), ethalon);
-        BOOST_CHECK_THROW(lexical_cast<sshort_arr_type>(val), boost::bad_lexical_cast);
-    }
-
-#if !defined(BOOST_NO_STRINGSTREAM) && !defined(BOOST_NO_STD_WSTRING)
-    typedef ArrayT<wchar_t, 300> warr_type;
-    typedef ArrayT<wchar_t, 3> wshort_arr_type;
-    std::wstring wethalon(L"100");
-
-    {
-        warr_type res = lexical_cast<warr_type>(val);
-        BOOST_CHECK(&res[0] == wethalon);
-    }
-
-    {
-        const warr_type res = lexical_cast<warr_type>(val);
-        BOOST_CHECK(&res[0] == wethalon);
-    }
-    
-    BOOST_CHECK_THROW(lexical_cast<wshort_arr_type>(val), boost::bad_lexical_cast);
-
-#endif
-
-#ifdef BOOST_LC_RUNU16
-    typedef ArrayT<char16_t, 300> u16arr_type;
-    typedef ArrayT<char16_t, 3> u16short_arr_type;
-    std::u16string u16ethalon(u"100");
-
-    {
-        u16arr_type res = lexical_cast<u16arr_type>(val);
-        BOOST_CHECK(&res[0] == u16ethalon);
-    }
-
-    {
-        const u16arr_type res = lexical_cast<u16arr_type>(val);
-        BOOST_CHECK(&res[0] == u16ethalon);
-    }
-    
-    BOOST_CHECK_THROW(lexical_cast<u16short_arr_type>(val), boost::bad_lexical_cast);
-#endif
-
-#ifdef BOOST_LC_RUNU32
-    typedef ArrayT<char32_t, 300> u32arr_type;
-    typedef ArrayT<char32_t, 3> u32short_arr_type;
-    std::u32string u32ethalon(U"100");
-
-    {
-        u32arr_type res = lexical_cast<u32arr_type>(val);
-        BOOST_CHECK(&res[0] == u32ethalon);
-    }
-
-    {
-        const u32arr_type res = lexical_cast<u32arr_type>(val);
-        BOOST_CHECK(&res[0] == u32ethalon);
-    }
-    
-    BOOST_CHECK_THROW(lexical_cast<u32short_arr_type>(val), boost::bad_lexical_cast);
-#endif
-}
-
-
-template <template <class, std::size_t> class ArrayT>
-static void testing_template_array_output_on_char_value() 
-{
-    typedef ArrayT<char, 300>             arr_type;
-    typedef ArrayT<char, 1>               short_arr_type;
-    typedef ArrayT<unsigned char, 300>    uarr_type;
-    typedef ArrayT<unsigned char, 1>      ushort_arr_type;
-    typedef ArrayT<signed char, 4>        sarr_type;
-    typedef ArrayT<signed char, 3>        sshort_arr_type;
-
-    const char val[] = "100";
-    std::string ethalon("100");
-    using namespace std;
-
-    {
-        arr_type res1 = lexical_cast<arr_type>(val);
-        BOOST_CHECK_EQUAL(&res1[0], ethalon);
-        const arr_type res2 = lexical_cast<arr_type>(val);
-        BOOST_CHECK_EQUAL(&res2[0], ethalon);
-        BOOST_CHECK_THROW(lexical_cast<short_arr_type>(val), boost::bad_lexical_cast);
-    }
-    
-    {
-        uarr_type res1 = lexical_cast<uarr_type>(val);
-        BOOST_CHECK_EQUAL(reinterpret_cast<char*>(&res1[0]), ethalon);
-        const uarr_type res2 = lexical_cast<uarr_type>(val);
-        BOOST_CHECK_EQUAL(reinterpret_cast<const char*>(&res2[0]), ethalon);
-        BOOST_CHECK_THROW(lexical_cast<ushort_arr_type>(val), boost::bad_lexical_cast);
-    }
-    
-    {
-        sarr_type res1 = lexical_cast<sarr_type>(val);
-        BOOST_CHECK_EQUAL(reinterpret_cast<char*>(&res1[0]), ethalon);
-        const sarr_type res2 = lexical_cast<sarr_type>(val);
-        BOOST_CHECK_EQUAL(reinterpret_cast<const char*>(&res2[0]), ethalon);
-        BOOST_CHECK_THROW(lexical_cast<sshort_arr_type>(val), boost::bad_lexical_cast);
-    }
-
-#if !defined(BOOST_NO_STRINGSTREAM) && !defined(BOOST_NO_STD_WSTRING)
-    typedef ArrayT<wchar_t, 4> warr_type;
-    typedef ArrayT<wchar_t, 3> wshort_arr_type;
-    std::wstring wethalon(L"100");
-
-    {
-        warr_type res = lexical_cast<warr_type>(val);
-        BOOST_CHECK(&res[0] == wethalon);
-        warr_type res3 = lexical_cast<warr_type>(wethalon);
-        BOOST_CHECK(&res3[0] == wethalon);
-    }
-
-    {
-        const warr_type res = lexical_cast<warr_type>(val);
-        BOOST_CHECK(&res[0] == wethalon);
-        const warr_type res3 = lexical_cast<warr_type>(wethalon);
-        BOOST_CHECK(&res3[0] == wethalon);
-    }
-    
-    BOOST_CHECK_THROW(lexical_cast<wshort_arr_type>(val), boost::bad_lexical_cast);
-
-#endif
-
-#ifdef BOOST_LC_RUNU16
-    typedef ArrayT<char16_t, 300> u16arr_type;
-    typedef ArrayT<char16_t, 3> u16short_arr_type;
-    std::u16string u16ethalon(u"100");
-
-    {
-#ifdef BOOST_STL_SUPPORTS_NEW_UNICODE_LOCALES
-        u16arr_type res = lexical_cast<u16arr_type>(val);
-        BOOST_CHECK(&res[0] == u16ethalon);  
-#endif
-
-        u16arr_type res3 = lexical_cast<u16arr_type>(u16ethalon);
-        BOOST_CHECK(&res3[0] == u16ethalon);
-    }
-
-    {
-#ifdef BOOST_STL_SUPPORTS_NEW_UNICODE_LOCALES
-        const u16arr_type res = lexical_cast<u16arr_type>(val);
-        BOOST_CHECK(&res[0] == u16ethalon);
-#endif
-        const u16arr_type res3 = lexical_cast<u16arr_type>(u16ethalon);
-        BOOST_CHECK(&res3[0] == u16ethalon);
-    }
-    
-    // Some compillers may throw std::bad_alloc here
-    BOOST_CHECK_THROW(lexical_cast<u16short_arr_type>(val), std::exception); 
-#endif
-
-#ifdef BOOST_LC_RUNU32
-    typedef ArrayT<char32_t, 300> u32arr_type;
-    typedef ArrayT<char32_t, 3> u32short_arr_type;
-    std::u32string u32ethalon(U"100");
-
-    {
-#ifdef BOOST_STL_SUPPORTS_NEW_UNICODE_LOCALES
-        u32arr_type res = lexical_cast<u32arr_type>(val);
-        BOOST_CHECK(&res[0] == u32ethalon);
-#endif
-        u32arr_type res3 = lexical_cast<u32arr_type>(u32ethalon);
-        BOOST_CHECK(&res3[0] == u32ethalon);
-    }
-
-    {
-#ifdef BOOST_STL_SUPPORTS_NEW_UNICODE_LOCALES
-        const u32arr_type res = lexical_cast<u32arr_type>(val);
-        BOOST_CHECK(&res[0] == u32ethalon);
-#endif
-        const u32arr_type res3 = lexical_cast<u32arr_type>(u32ethalon);
-        BOOST_CHECK(&res3[0] == u32ethalon);
-    }
-    
-    // Some compillers may throw std::bad_alloc here
-    BOOST_CHECK_THROW(lexical_cast<u32short_arr_type>(val), std::exception);
-#endif
-}
-
-
-void testing_boost_array_output_conversion()
-{   
-    testing_template_array_output_on_char_value<boost::array>();
-    testing_template_array_output_on_spec_value<boost::array>(100);
-    testing_template_array_output_on_spec_value<boost::array>(static_cast<short>(100));
-    testing_template_array_output_on_spec_value<boost::array>(static_cast<unsigned short>(100));
-    testing_template_array_output_on_spec_value<boost::array>(static_cast<unsigned int>(100));
-}
-
-void testing_std_array_output_conversion()
-{
-#ifndef BOOST_NO_CXX11_HDR_ARRAY
-    testing_template_array_output_on_char_value<std::array>();
-    testing_template_array_output_on_spec_value<std::array>(100);
-    testing_template_array_output_on_spec_value<std::array>(static_cast<short>(100));
-    testing_template_array_output_on_spec_value<std::array>(static_cast<unsigned short>(100));
-    testing_template_array_output_on_spec_value<std::array>(static_cast<unsigned int>(100));
-#endif
-
-    BOOST_CHECK(true);
-}
-
-template <template <class, std::size_t> class ArrayT>
-static void testing_generic_array_input_conversion()
-{
-    {
-        ArrayT<char, 4> var_zero_terminated = {{ '1', '0', '0', '\0'}}; 
-        BOOST_CHECK_EQUAL(lexical_cast<std::string>(var_zero_terminated), "100");
-        BOOST_CHECK_EQUAL(lexical_cast<int>(var_zero_terminated), 100);
-
-        ArrayT<char, 3> var_none_terminated = {{ '1', '0', '0'}}; 
-        BOOST_CHECK_EQUAL(lexical_cast<std::string>(var_none_terminated), "100");
-        BOOST_CHECK_EQUAL(lexical_cast<short>(var_none_terminated), static_cast<short>(100));
-
-        ArrayT<const char, 4> var_zero_terminated_const_char = {{ '1', '0', '0', '\0'}}; 
-        BOOST_CHECK_EQUAL(lexical_cast<std::string>(var_zero_terminated_const_char), "100");
-
-        ArrayT<const char, 3> var_none_terminated_const_char = {{ '1', '0', '0'}}; 
-        BOOST_CHECK_EQUAL(lexical_cast<std::string>(var_none_terminated_const_char), "100");
-
-        const ArrayT<char, 4> var_zero_terminated_const_var = {{ '1', '0', '0', '\0'}}; 
-        BOOST_CHECK_EQUAL(lexical_cast<std::string>(var_zero_terminated_const_var), "100");
-
-        const ArrayT<char, 3> var_none_terminated_const_var = {{ '1', '0', '0'}}; 
-        BOOST_CHECK_EQUAL(lexical_cast<std::string>(var_none_terminated_const_var), "100");
-
-        const ArrayT<const char, 4> var_zero_terminated_const_var_const_char = {{ '1', '0', '0', '\0'}}; 
-        BOOST_CHECK_EQUAL(lexical_cast<std::string>(var_zero_terminated_const_var_const_char), "100");
-
-        const ArrayT<const char, 3> var_none_terminated_const_var_const_char = {{ '1', '0', '0'}}; 
-        BOOST_CHECK_EQUAL(lexical_cast<std::string>(var_none_terminated_const_var_const_char), "100");
-        BOOST_CHECK_EQUAL(lexical_cast<int>(var_none_terminated_const_var_const_char), 100);
-    }
-
-    {
-        const ArrayT<const unsigned char, 4> var_zero_terminated_const_var_const_char = {{ '1', '0', '0', '\0'}}; 
-        BOOST_CHECK_EQUAL(lexical_cast<std::string>(var_zero_terminated_const_var_const_char), "100");
-
-        const ArrayT<const unsigned char, 3> var_none_terminated_const_var_const_char = {{ '1', '0', '0'}}; 
-        BOOST_CHECK_EQUAL(lexical_cast<std::string>(var_none_terminated_const_var_const_char), "100");
-    }
-
-    {
-        const ArrayT<const signed char, 4> var_zero_terminated_const_var_const_char = {{ '1', '0', '0', '\0'}}; 
-        BOOST_CHECK_EQUAL(lexical_cast<std::string>(var_zero_terminated_const_var_const_char), "100");
-
-        const ArrayT<const signed char, 3> var_none_terminated_const_var_const_char = {{ '1', '0', '0'}}; 
-        BOOST_CHECK_EQUAL(lexical_cast<std::string>(var_none_terminated_const_var_const_char), "100");
-        BOOST_CHECK_EQUAL(lexical_cast<unsigned int>(var_none_terminated_const_var_const_char), 100u);
-    }
-
-
-#if !defined(BOOST_NO_STRINGSTREAM) && !defined(BOOST_NO_STD_WSTRING)
-    {
-        const ArrayT<const wchar_t, 4> var_zero_terminated_const_var_const_char = {{ L'1', L'0', L'0', L'\0'}}; 
-        BOOST_CHECK(lexical_cast<std::wstring>(var_zero_terminated_const_var_const_char) == L"100");
-
-        const ArrayT<const wchar_t, 3> var_none_terminated_const_var_const_char = {{ L'1', L'0', L'0'}}; 
-        BOOST_CHECK(lexical_cast<std::wstring>(var_none_terminated_const_var_const_char) == L"100");
-        BOOST_CHECK_EQUAL(lexical_cast<int>(var_none_terminated_const_var_const_char), 100);
-    }
-#endif
-
-#ifdef BOOST_LC_RUNU16
-    {
-        const ArrayT<const char16_t, 4> var_zero_terminated_const_var_const_char = {{ u'1', u'0', u'0', u'\0'}}; 
-        BOOST_CHECK(lexical_cast<std::u16string>(var_zero_terminated_const_var_const_char) == u"100");
-        BOOST_CHECK_EQUAL(lexical_cast<unsigned short>(var_zero_terminated_const_var_const_char), static_cast<unsigned short>(100));
-
-        const ArrayT<const char16_t, 3> var_none_terminated_const_var_const_char = {{ u'1', u'0', u'0'}}; 
-        BOOST_CHECK(lexical_cast<std::u16string>(var_none_terminated_const_var_const_char) == u"100");
-    }
-#endif
-
-#ifdef BOOST_LC_RUNU32
-    {
-        const ArrayT<const char32_t, 4> var_zero_terminated_const_var_const_char = {{ U'1', U'0', U'0', U'\0'}}; 
-        BOOST_CHECK(lexical_cast<std::u32string>(var_zero_terminated_const_var_const_char) == U"100");
-
-        const ArrayT<const char32_t, 3> var_none_terminated_const_var_const_char = {{ U'1', U'0', U'0'}}; 
-        BOOST_CHECK(lexical_cast<std::u32string>(var_none_terminated_const_var_const_char) == U"100");
-        BOOST_CHECK_EQUAL(lexical_cast<int>(var_none_terminated_const_var_const_char), 100);
-    }
-#endif
-}
-
-void testing_boost_array_input_conversion()
-{
-    testing_generic_array_input_conversion<boost::array>();
-}
-
-void testing_std_array_input_conversion()
-{
-#ifndef BOOST_NO_CXX11_HDR_ARRAY
-    testing_generic_array_input_conversion<std::array>();
-#endif
-
-    BOOST_CHECK(true);
-}
-
@@ -71,12 +71,12 @@ void testing_boost_containers_string_widening()
    BOOST_CHECK(boost::lexical_cast<boost::container::wstring>(char_array) == wchar_array);
 #endif

-#if !defined(BOOST_NO_CXX11_CHAR16_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS) && defined(BOOST_STL_SUPPORTS_NEW_UNICODE_LOCALES)
+#if !defined(BOOST_NO_CHAR16_T) && !defined(BOOST_NO_UNICODE_LITERALS) && defined(BOOST_STL_SUPPORTS_NEW_UNICODE_LOCALES)
    const char16_t char16_array[] = u"Test string";
    BOOST_CHECK(boost::lexical_cast<boost::container::basic_string<char16_t> >(char_array) == char16_array);
 #endif

-#if !defined(BOOST_NO_CXX11_CHAR32_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS) && defined(BOOST_STL_SUPPORTS_NEW_UNICODE_LOCALES)
+#if !defined(BOOST_NO_CHAR32_T) && !defined(BOOST_NO_UNICODE_LITERALS) && defined(BOOST_STL_SUPPORTS_NEW_UNICODE_LOCALES)
    const char32_t char32_array[] = U"Test string";
    BOOST_CHECK(boost::lexical_cast<boost::container::basic_string<char32_t> >(char_array) == char32_array);
 #endif
@@ -32,9 +32,7 @@ void do_test_on_empty_input(T& v)
    BOOST_CHECK_THROW(lexical_cast<int>(v), bad_lexical_cast);
    BOOST_CHECK_THROW(lexical_cast<float>(v), bad_lexical_cast);
    BOOST_CHECK_THROW(lexical_cast<double>(v), bad_lexical_cast);
-#ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
    BOOST_CHECK_THROW(lexical_cast<long double>(v), bad_lexical_cast);
-#endif
    BOOST_CHECK_THROW(lexical_cast<unsigned int>(v), bad_lexical_cast);
    BOOST_CHECK_THROW(lexical_cast<unsigned short>(v), bad_lexical_cast);
 #if defined(BOOST_HAS_LONG_LONG)
@@ -86,12 +84,12 @@ void test_empty_string()
 #endif

 // Currently, no compiler and STL library fully support char16_t and char32_t
-//#ifndef BOOST_NO_CXX11_CHAR16_T
+//#ifndef BOOST_NO_CHAR16_T
 //    std::basic_string<char16_t> v16w;
 //    do_test_on_empty_input(v16w);
 //    BOOST_CHECK_THROW(lexical_cast<char16_t>(v16w), bad_lexical_cast);
 //#endif
-//#ifndef BOOST_NO_CXX11_CHAR32_T
+//#ifndef BOOST_NO_CHAR32_T
 //    std::basic_string<char32_t> v32w;
 //    do_test_on_empty_input(v32w);
 //    BOOST_CHECK_THROW(lexical_cast<char32_t>(v32w), bad_lexical_cast);
@@ -1,46 +0,0 @@
-//  Unit test for boost::lexical_cast.
-//
-//  See http://www.boost.org for most recent version, including documentation.
-//
-//  Copyright Antony Polukhin, 2013.
-//
-//  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).
-//
-// Test lexical_cast usage with long filesystem::path. Bug 7704.
-
-#include <boost/config.hpp>
-
-#include <boost/test/unit_test.hpp>
-#include <boost/lexical_cast.hpp>
-#include <boost/filesystem/path.hpp>
-
-using namespace boost;
-
-void test_filesystem();
-
-unit_test::test_suite *init_unit_test_suite(int, char *[])
-{
-    unit_test::test_suite *suite =
-        BOOST_TEST_SUITE("lexical_cast unit test");
-    suite->add(BOOST_TEST_CASE(&test_filesystem));
-
-    return suite;
-}
-
-void test_filesystem()
-{
-    boost::filesystem::path p;
-    std::string s1 = "aaaaaaaaaaaaaaaaaaaaaaa";
-    p = boost::lexical_cast<boost::filesystem::path>(s1);
-    BOOST_CHECK(!p.empty());
-    BOOST_CHECK_EQUAL(p, s1);
-    p.clear();
-
-    const char ab[] = "aaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb";
-    p = boost::lexical_cast<boost::filesystem::path>(ab);
-    BOOST_CHECK(!p.empty());
-    BOOST_CHECK_EQUAL(p, ab);
-}
-
@@ -105,13 +105,13 @@ void test_conversion_from_to_float_for_locale()


 /*
- * Converts char* [and wchar_t*] to float number type and checks, that generated
- * number does not exceeds allowed epsilon.
+ * Converts char* [and wchar_t] to float number type and checks, that generated
+ * number is in interval [base_value-epsilon, base_value+epsilon].
 */
 #ifndef BOOST_LCAST_NO_WCHAR_T
 #define CHECK_CLOSE_ABS_DIFF(VAL,PREFIX)                                                          \
    converted_val = lexical_cast<test_t>(#VAL);                                                   \
-    BOOST_CHECK_CLOSE_FRACTION( (VAL ## L? VAL ## L : std::numeric_limits<test_t>::epsilon()),    \
+    BOOST_CHECK_CLOSE_FRACTION( (VAL ## L? VAL ## L : std::numeric_limits<test_t>::epsilon()),             \
                       (converted_val ? converted_val : std::numeric_limits<test_t>::epsilon()),  \
                       std::numeric_limits<test_t>::epsilon()                                     \
                     );                                                                           \
@@ -120,7 +120,7 @@ void test_conversion_from_to_float_for_locale()
 #else
 #define CHECK_CLOSE_ABS_DIFF(VAL,TYPE)                                                            \
    converted_val = lexical_cast<test_t>(#VAL);                                                   \
-    BOOST_CHECK_CLOSE_FRACTION( (VAL ## L? VAL ## L : std::numeric_limits<test_t>::epsilon()),    \
+    BOOST_CHECK_CLOSE_FRACTION( (VAL ## L? VAL ## L : std::numeric_limits<test_t>::epsilon()),             \
                       (converted_val ? converted_val : std::numeric_limits<test_t>::epsilon()),  \
                       std::numeric_limits<test_t>::epsilon()                                     \
                     );
@@ -264,11 +264,8 @@ void test_converion_to_float_types()
    BOOST_CHECK_THROW(lexical_cast<test_t>("."), bad_lexical_cast);

    BOOST_CHECK_THROW(lexical_cast<test_t>("-B"), 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>("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);
@@ -290,23 +287,19 @@ void test_float_typess_for_overflows()
    test_t minvalue = (std::numeric_limits<test_t>::min)();
    std::string s_min_value = lexical_cast<std::string>(minvalue);
    BOOST_CHECK_CLOSE_FRACTION(minvalue, lexical_cast<test_t>(minvalue), (std::numeric_limits<test_t>::epsilon()));
-    BOOST_CHECK_CLOSE_FRACTION(minvalue, lexical_cast<test_t>(s_min_value), (std::numeric_limits<test_t>::epsilon() * 2));
+    BOOST_CHECK_CLOSE_FRACTION(minvalue, lexical_cast<test_t>(s_min_value), (std::numeric_limits<test_t>::epsilon()));

    test_t maxvalue = (std::numeric_limits<test_t>::max)();
    std::string s_max_value = lexical_cast<std::string>(maxvalue);
    BOOST_CHECK_CLOSE_FRACTION(maxvalue, lexical_cast<test_t>(maxvalue), (std::numeric_limits<test_t>::epsilon()));
    BOOST_CHECK_CLOSE_FRACTION(maxvalue, lexical_cast<test_t>(s_max_value), (std::numeric_limits<test_t>::epsilon()));

-#ifndef _LIBCPP_VERSION
-    // libc++ had a bug in implementation of stream conversions for values that must be represented as infinity. 
-    // http://llvm.org/bugs/show_bug.cgi?id=15723#c4
    BOOST_CHECK_THROW(lexical_cast<test_t>(s_max_value+"1"), bad_lexical_cast);
    BOOST_CHECK_THROW(lexical_cast<test_t>(s_max_value+"9"), bad_lexical_cast);

-    // VC9 can fail the following tests on floats and doubles when using stingstream...
+    // VC9 can fail the fllowing tests on floats and doubles when using stingstream...
    BOOST_CHECK_THROW(lexical_cast<test_t>("1"+s_max_value), bad_lexical_cast);
    BOOST_CHECK_THROW(lexical_cast<test_t>("9"+s_max_value), bad_lexical_cast);
-#endif

    if ( is_same<test_t,float>::value )
    {
@@ -333,14 +326,13 @@ void test_float_typess_for_overflows()

 #undef CHECK_CLOSE_ABS_DIFF

-// Epsilon is multiplied by 2 because of two lexical conversions
 #define TEST_TO_FROM_CAST_AROUND_TYPED(VAL,STRING_TYPE)                             \
    test_value = VAL + std::numeric_limits<test_t>::epsilon() * i ;                 \
    converted_val = lexical_cast<test_t>( lexical_cast<STRING_TYPE>(test_value) );  \
-    BOOST_CHECK_CLOSE_FRACTION(                                                     \
+    BOOST_CHECK_CLOSE_FRACTION(                                                              \
            test_value,                                                             \
            converted_val,                                                          \
-            std::numeric_limits<test_t>::epsilon() * 2                              \
+            std::numeric_limits<test_t>::epsilon()                                  \
        );

 /*
@@ -512,11 +504,7 @@ void test_conversion_from_to_double()
 }
 void test_conversion_from_to_long_double()
 {
-// We do not run tests on compilers with bugs
-#ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
    test_conversion_from_to_float<long double>();
-#endif
-    BOOST_CHECK(true);
 }


@@ -186,11 +186,7 @@ void test_inf_nan_double()

 void test_inf_nan_long_double()
 {
-// We do not run tests on compilers with bugs
-#ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
    test_inf_nan_templated<long double >();
-#endif
-    BOOST_CHECK(true);
 }

 unit_test::test_suite *init_unit_test_suite(int, char *[])
@@ -1,627 +0,0 @@
-//  Unit test for boost::lexical_cast.
-//
-//  See http://www.boost.org for most recent version, including documentation.
-//
-//  Copyright Terje Sletteb and Kevlin Henney, 2005.
-//  Copyright Alexander Nasonov, 2006.
-//  Copyright Antony Polukhin, 2011-2012.
-//
-//  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).
-//
-// Note: The unit test no longer compile on MSVC 6, but lexical_cast itself works for it.
-
-//
-// We need this #define before any #includes: otherwise msvc will emit warnings
-// deep within std::string, resulting from our (perfectly legal) use of basic_string
-// with a custom traits class:
-//
-#define _SCL_SECURE_NO_WARNINGS
-
-#include <boost/config.hpp>
-
-#if defined(__INTEL_COMPILER)
-#pragma warning(disable: 193 383 488 981 1418 1419)
-#elif defined(BOOST_MSVC)
-#pragma warning(disable: 4097 4100 4121 4127 4146 4244 4245 4511 4512 4701 4800)
-#endif
-
-#include <boost/lexical_cast.hpp>
-
-#include <boost/cstdint.hpp>
-#include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
-
-#include <boost/type_traits/integral_promotion.hpp>
-#include <boost/type_traits/make_unsigned.hpp>
-#include <string>
-#include <vector>
-#include <memory>
-
-#if (defined(BOOST_HAS_LONG_LONG) || defined(BOOST_HAS_MS_INT64)) \
-    && !(defined(BOOST_MSVC) && BOOST_MSVC < 1300)
-#define LCAST_TEST_LONGLONG
-#endif
-
-#if defined(BOOST_NO_STRINGSTREAM) || defined(BOOST_NO_STD_WSTRING)
-#define BOOST_LCAST_NO_WCHAR_T
-#endif
-
-// Test all 65536 values if true:
-bool const lcast_test_small_integral_types_completely = false;
-
-// lcast_integral_test_counter: use when testing all values of an integral
-// types is not possible. Max. portable value is 32767.
-int const lcast_integral_test_counter=500;
-
-using namespace boost;
-
-
-
-void test_conversion_from_to_short();
-void test_conversion_from_to_ushort();
-void test_conversion_from_to_int();
-void test_conversion_from_to_uint();
-void test_conversion_from_to_long();
-void test_conversion_from_to_ulong();
-void test_conversion_from_to_intmax_t();
-void test_conversion_from_to_uintmax_t();
-#ifdef LCAST_TEST_LONGLONG
-void test_conversion_from_to_longlong();
-void test_conversion_from_to_ulonglong();
-#endif
-#ifdef BOOST_HAS_INT128
-void test_conversion_from_to_int128();
-void test_conversion_from_to_uint128();
-#endif
-void test_integral_conversions_on_min_max();
-
-
-unit_test::test_suite *init_unit_test_suite(int, char *[])
-{
-    unit_test::test_suite *suite =
-        BOOST_TEST_SUITE("lexical_cast unit test on integral types");
-
-    suite->add(BOOST_TEST_CASE(&test_conversion_from_to_short));
-    suite->add(BOOST_TEST_CASE(&test_conversion_from_to_ushort));
-    suite->add(BOOST_TEST_CASE(&test_conversion_from_to_int));
-    suite->add(BOOST_TEST_CASE(&test_conversion_from_to_uint));
-    suite->add(BOOST_TEST_CASE(&test_conversion_from_to_long));
-    suite->add(BOOST_TEST_CASE(&test_conversion_from_to_ulong));
-    suite->add(BOOST_TEST_CASE(&test_conversion_from_to_intmax_t));
-    suite->add(BOOST_TEST_CASE(&test_conversion_from_to_uintmax_t));
-#ifdef LCAST_TEST_LONGLONG
-    suite->add(BOOST_TEST_CASE(&test_conversion_from_to_longlong));
-    suite->add(BOOST_TEST_CASE(&test_conversion_from_to_ulonglong));
-#endif
-#ifdef BOOST_HAS_INT128
-    suite->add(BOOST_TEST_CASE(&test_conversion_from_to_int128));
-    suite->add(BOOST_TEST_CASE(&test_conversion_from_to_uint128));
-#endif
-    suite->add(BOOST_TEST_CASE(&test_integral_conversions_on_min_max));
-
-    return suite;
-}
-
-template<class T, class CharT>
-void test_conversion_from_integral_to_char(CharT zero)
-{
-    BOOST_CHECK(lexical_cast<CharT>(static_cast<T>(0)) == zero + 0);
-    BOOST_CHECK(lexical_cast<CharT>(static_cast<T>(1)) == zero + 1);
-    BOOST_CHECK(lexical_cast<CharT>(static_cast<T>(2)) == zero + 2);
-    BOOST_CHECK(lexical_cast<CharT>(static_cast<T>(3)) == zero + 3);
-    BOOST_CHECK(lexical_cast<CharT>(static_cast<T>(4)) == zero + 4);
-    BOOST_CHECK(lexical_cast<CharT>(static_cast<T>(5)) == zero + 5);
-    BOOST_CHECK(lexical_cast<CharT>(static_cast<T>(6)) == zero + 6);
-    BOOST_CHECK(lexical_cast<CharT>(static_cast<T>(7)) == zero + 7);
-    BOOST_CHECK(lexical_cast<CharT>(static_cast<T>(8)) == zero + 8);
-    BOOST_CHECK(lexical_cast<CharT>(static_cast<T>(9)) == zero + 9);
-
-    BOOST_CHECK_THROW(lexical_cast<CharT>(static_cast<T>(10)), bad_lexical_cast);
-
-    T t = (std::numeric_limits<T>::max)();
-    BOOST_CHECK_THROW(lexical_cast<CharT>(t), bad_lexical_cast);
-}
-
-template<class T, class CharT>
-void test_conversion_from_char_to_integral(CharT zero)
-{
-    BOOST_CHECK(lexical_cast<T>( static_cast<CharT>(zero + 0)) == static_cast<T>(0) );
-    BOOST_CHECK(lexical_cast<T>( static_cast<CharT>(zero + 1)) == static_cast<T>(1) );
-    BOOST_CHECK(lexical_cast<T>( static_cast<CharT>(zero + 2)) == static_cast<T>(2) );
-    BOOST_CHECK(lexical_cast<T>( static_cast<CharT>(zero + 3)) == static_cast<T>(3) );
-    BOOST_CHECK(lexical_cast<T>( static_cast<CharT>(zero + 4)) == static_cast<T>(4) );
-    BOOST_CHECK(lexical_cast<T>( static_cast<CharT>(zero + 5)) == static_cast<T>(5) );
-    BOOST_CHECK(lexical_cast<T>( static_cast<CharT>(zero + 6)) == static_cast<T>(6) );
-    BOOST_CHECK(lexical_cast<T>( static_cast<CharT>(zero + 7)) == static_cast<T>(7) );
-    BOOST_CHECK(lexical_cast<T>( static_cast<CharT>(zero + 8)) == static_cast<T>(8) );
-    BOOST_CHECK(lexical_cast<T>( static_cast<CharT>(zero + 9)) == static_cast<T>(9) );
-
-    BOOST_CHECK_THROW(lexical_cast<T>( static_cast<CharT>(zero + 10)), bad_lexical_cast);
-    BOOST_CHECK_THROW(lexical_cast<T>( static_cast<CharT>(zero - 1)), bad_lexical_cast);
-}
-
-template<class T>
-void test_conversion_from_integral_to_integral()
-{
-    T t = 0;
-    BOOST_CHECK(lexical_cast<T>(t) == t);
-
-    // Next two variables are used to supress warnings.
-    int st = 32767; unsigned int ut = st;
-    t = st;
-    BOOST_CHECK(lexical_cast<short>(t) == st);
-    BOOST_CHECK(lexical_cast<unsigned short>(t) == ut);
-    BOOST_CHECK(lexical_cast<int>(t) == st);
-    BOOST_CHECK(lexical_cast<unsigned int>(t) == ut);
-    BOOST_CHECK(lexical_cast<long>(t) == st);
-    BOOST_CHECK(lexical_cast<unsigned long>(t) == ut);
-
-    t = (std::numeric_limits<T>::max)();
-    BOOST_CHECK(lexical_cast<T>(t) == t);
-
-    t = (std::numeric_limits<T>::min)();
-    BOOST_CHECK(lexical_cast<T>(t) == t);
-}
-
-
-
-
-// Replace "-,999" with "-999".
-template<class CharT>
-std::basic_string<CharT> to_str_gcc_workaround(std::basic_string<CharT> str)
-{
-    std::locale loc;
-    std::numpunct<CharT> const& np = BOOST_USE_FACET(std::numpunct<CharT>, loc);
-    std::ctype<CharT> const& ct = BOOST_USE_FACET(std::ctype<CharT>, loc);
-
-    if(np.grouping().empty())
-        return str;
-
-    CharT prefix[3] = { ct.widen('-'), np.thousands_sep(), CharT() };
-
-    if(str.find(prefix) != 0)
-        return str;
-
-    prefix[1] = CharT();
-    str.replace(0, 2, prefix);
-    return str;
-}
-
-template<class CharT, class T>
-std::basic_string<CharT> to_str(T t)
-{
-    std::basic_ostringstream<CharT> o;
-    o << t;
-    return to_str_gcc_workaround(o.str());
-}
-
-
-template<class T, class CharT>
-void test_conversion_from_integral_to_string(CharT)
-{
-    typedef std::numeric_limits<T> limits;
-    typedef std::basic_string<CharT> string_type;
-
-    T t;
-
-    t = (limits::min)();
-    BOOST_CHECK(lexical_cast<string_type>(t) == to_str<CharT>(t));
-
-    t = (limits::max)();
-    BOOST_CHECK(lexical_cast<string_type>(t) == to_str<CharT>(t));
-
-    if(limits::digits <= 16 && lcast_test_small_integral_types_completely)
-        // min and max have already been tested.
-        for(t = 1 + (limits::min)(); t != (limits::max)(); ++t)
-            BOOST_CHECK(lexical_cast<string_type>(t) == to_str<CharT>(t));
-    else
-    {
-        T const min_val = (limits::min)();
-        T const max_val = (limits::max)();
-        T const half_max_val = max_val / 2;
-        T const cnt = lcast_integral_test_counter; // to supress warnings
-        unsigned int const counter = cnt < half_max_val ? cnt : half_max_val;
-
-        unsigned int i;
-
-        // Test values around min:
-        t = min_val;
-        for(i = 0; i < counter; ++i, ++t)
-            BOOST_CHECK(lexical_cast<string_type>(t) == to_str<CharT>(t));
-
-        // Test values around max:
-        t = max_val;
-        for(i = 0; i < counter; ++i, --t)
-            BOOST_CHECK(lexical_cast<string_type>(t) == to_str<CharT>(t));
-
-        // Test values around zero:
-        if(limits::is_signed)
-            for(t = static_cast<T>(-counter); t < static_cast<T>(counter); ++t)
-                BOOST_CHECK(lexical_cast<string_type>(t) == to_str<CharT>(t));
-
-        // Test values around 100, 1000, 10000, ...
-        T ten_power = 100;
-        for(int e = 2; e < limits::digits10; ++e, ten_power *= 10)
-        {
-            // ten_power + 100 probably never overflows
-            for(t = ten_power - 100; t != ten_power + 100; ++t)
-                BOOST_CHECK(lexical_cast<string_type>(t) == to_str<CharT>(t));
-        }
-    }
-}
-
-template<class T, class CharT>
-void test_conversion_from_string_to_integral(CharT)
-{
-    typedef std::numeric_limits<T> limits;
-    typedef std::basic_string<CharT> string_type;
-
-    string_type s;
-    string_type const zero = to_str<CharT>(0);
-    string_type const nine = to_str<CharT>(9);
-    T const min_val = (limits::min)();
-    T const max_val = (limits::max)();
-
-    s = to_str<CharT>(min_val);
-    BOOST_CHECK_EQUAL(lexical_cast<T>(s), min_val);
-    if(limits::is_signed)
-    {
-        BOOST_CHECK_THROW(lexical_cast<T>(s + zero), bad_lexical_cast);
-        BOOST_CHECK_THROW(lexical_cast<T>(s + nine), bad_lexical_cast);
-    }
-
-    s = to_str<CharT>(max_val);
-    BOOST_CHECK_EQUAL(lexical_cast<T>(s), max_val);
-    {
-        BOOST_CHECK_THROW(lexical_cast<T>(s + zero), bad_lexical_cast);
-        BOOST_CHECK_THROW(lexical_cast<T>(s + nine), bad_lexical_cast);
-
-        s = to_str<CharT>(max_val);
-        for (int i =1; i <=10; ++i) {
-            s[s.size()-1] += 1;
-            BOOST_CHECK_THROW(lexical_cast<T>( s ), bad_lexical_cast);
-        }
-
-        s = to_str<CharT>(max_val);
-        std::locale loc;
-        typedef std::numpunct<char> numpunct;
-        if ( BOOST_USE_FACET(numpunct, loc).grouping().empty() ) {
-            // Following tests work well for locale C
-            BOOST_CHECK_EQUAL(lexical_cast<T>(to_str<CharT>(0)+s), max_val);
-            BOOST_CHECK_EQUAL(lexical_cast<T>(to_str<CharT>(0)+to_str<CharT>(0)+s), max_val);
-            BOOST_CHECK_EQUAL(lexical_cast<T>(to_str<CharT>(0)+to_str<CharT>(0)+to_str<CharT>(0)+s), max_val);
-        }
-
-        for (int i =1; i <=256; ++i) {
-            BOOST_CHECK_THROW(lexical_cast<T>( to_str<CharT>(i)+s ), bad_lexical_cast);
-        }
-
-        typedef BOOST_DEDUCED_TYPENAME boost::integral_promotion<T>::type promoted;
-        if ( !(boost::is_same<T, promoted>::value) )
-        {
-            promoted prom = max_val;
-            s = to_str<CharT>(max_val);
-            for (int i =1; i <=256; ++i) {
-                BOOST_CHECK_THROW(lexical_cast<T>( to_str<CharT>(prom+i) ), bad_lexical_cast);
-                BOOST_CHECK_THROW(lexical_cast<T>( to_str<CharT>(i)+s ), bad_lexical_cast);
-            }
-        }
-    }
-
-    if(limits::digits <= 16 && lcast_test_small_integral_types_completely)
-        // min and max have already been tested.
-        for(T t = 1 + min_val; t != max_val; ++t)
-            BOOST_CHECK(lexical_cast<T>(to_str<CharT>(t)) == t);
-    else
-    {
-        T const half_max_val = max_val / 2;
-        T const cnt = lcast_integral_test_counter; // to supress warnings
-        unsigned int const counter = cnt < half_max_val ? cnt : half_max_val;
-
-        T t;
-        unsigned int i;
-
-        // Test values around min:
-        t = min_val;
-        for(i = 0; i < counter; ++i, ++t)
-            BOOST_CHECK(lexical_cast<T>(to_str<CharT>(t)) == t);
-
-        // Test values around max:
-        t = max_val;
-        for(i = 0; i < counter; ++i, --t)
-            BOOST_CHECK(lexical_cast<T>(to_str<CharT>(t)) == t);
-
-        // Test values around zero:
-        if(limits::is_signed)
-            for(t = static_cast<T>(-counter); t < static_cast<T>(counter); ++t)
-                BOOST_CHECK(lexical_cast<T>(to_str<CharT>(t)) == t);
-
-        // Test values around 100, 1000, 10000, ...
-        T ten_power = 100;
-        for(int e = 2; e < limits::digits10; ++e, ten_power *= 10)
-        {
-            // ten_power + 100 probably never overflows
-            for(t = ten_power - 100; t != ten_power + 100; ++t)
-                BOOST_CHECK(lexical_cast<T>(to_str<CharT>(t)) == t);
-        }
-    }
-}
-
-template<class T>
-void test_conversion_from_to_integral_for_locale()
-{
-    std::locale current_locale;
-    typedef std::numpunct<char> numpunct;
-    numpunct const& np = BOOST_USE_FACET(numpunct, current_locale);
-    if ( !np.grouping().empty() )
-    {
-        BOOST_CHECK_THROW(
-                lexical_cast<T>( std::string("100") + np.thousands_sep() + np.thousands_sep() + "0" )
-                , bad_lexical_cast);
-        BOOST_CHECK_THROW(lexical_cast<T>( std::string("100") + np.thousands_sep() ), bad_lexical_cast);
-        BOOST_CHECK_THROW(lexical_cast<T>( np.thousands_sep() + std::string("100") ), bad_lexical_cast);
-
-        // Exception must not be thrown, when we are using no separators at all
-        BOOST_CHECK( lexical_cast<T>("30000") == static_cast<T>(30000) );
-    }
-
-    test_conversion_from_integral_to_integral<T>();
-    test_conversion_from_integral_to_string<T>('0');
-    test_conversion_from_string_to_integral<T>('0');
-#if !defined(BOOST_LCAST_NO_WCHAR_T)
-    test_conversion_from_integral_to_string<T>(L'0');
-    test_conversion_from_string_to_integral<T>(L'0');
-#endif
-}
-
-struct restore_oldloc
-{
-    std::locale oldloc;
-    ~restore_oldloc() { std::locale::global(oldloc); }
-};
-
-template<class T>
-void test_conversion_from_to_integral_minimal()
-{
-    char const zero = '0';
-    signed char const szero = '0';
-    unsigned char const uzero = '0';
-    test_conversion_from_integral_to_char<T>(zero);
-    test_conversion_from_char_to_integral<T>(zero);
-    test_conversion_from_integral_to_char<T>(szero);
-    test_conversion_from_char_to_integral<T>(szero);
-    test_conversion_from_integral_to_char<T>(uzero);
-    test_conversion_from_char_to_integral<T>(uzero);
-#if !defined(BOOST_LCAST_NO_WCHAR_T) && !defined(BOOST_NO_INTRINSIC_WCHAR_T)
-    wchar_t const wzero = L'0';
-    test_conversion_from_integral_to_char<T>(wzero);
-    test_conversion_from_char_to_integral<T>(wzero);
-#endif
-#if !defined(BOOST_NO_CXX11_CHAR16_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS) && !defined(_LIBCPP_VERSION)
-    char16_t const u16zero = u'0';
-    test_conversion_from_integral_to_char<T>(u16zero);
-    test_conversion_from_char_to_integral<T>(u16zero);
-#endif
-#if !defined(BOOST_NO_CXX11_CHAR32_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS) && !defined(_LIBCPP_VERSION)
-    char32_t const u32zero = u'0';
-    test_conversion_from_integral_to_char<T>(u32zero);
-    test_conversion_from_char_to_integral<T>(u32zero);
-#endif
-
-    BOOST_CHECK(lexical_cast<T>("-1") == static_cast<T>(-1));
-    BOOST_CHECK(lexical_cast<T>("-9") == static_cast<T>(-9));
-    BOOST_CHECK(lexical_cast<T>(-1) == static_cast<T>(-1));
-    BOOST_CHECK(lexical_cast<T>(-9) == static_cast<T>(-9));
-
-    BOOST_CHECK_THROW(lexical_cast<T>("-1.0"), bad_lexical_cast);
-    BOOST_CHECK_THROW(lexical_cast<T>("-9.0"), bad_lexical_cast);
-    BOOST_CHECK(lexical_cast<T>(-1.0) == static_cast<T>(-1));
-    BOOST_CHECK(lexical_cast<T>(-9.0) == static_cast<T>(-9));
-
-    BOOST_CHECK(lexical_cast<T>(static_cast<T>(1)) == static_cast<T>(1));
-    BOOST_CHECK(lexical_cast<T>(static_cast<T>(9)) == static_cast<T>(9));
-    BOOST_CHECK_THROW(lexical_cast<T>(1.1f), bad_lexical_cast);
-    BOOST_CHECK_THROW(lexical_cast<T>(1.1), bad_lexical_cast);
-    BOOST_CHECK_THROW(lexical_cast<T>(1.1L), bad_lexical_cast);
-    BOOST_CHECK_THROW(lexical_cast<T>(1.0001f), bad_lexical_cast);
-    BOOST_CHECK_THROW(lexical_cast<T>(1.0001), bad_lexical_cast);
-    BOOST_CHECK_THROW(lexical_cast<T>(1.0001L), bad_lexical_cast);
-
-    BOOST_CHECK(lexical_cast<T>("+1") == static_cast<T>(1) );
-    BOOST_CHECK(lexical_cast<T>("+9") == static_cast<T>(9) );
-    BOOST_CHECK(lexical_cast<T>("+10") == static_cast<T>(10) );
-    BOOST_CHECK(lexical_cast<T>("+90") == static_cast<T>(90) );
-    BOOST_CHECK_THROW(lexical_cast<T>("++1"), bad_lexical_cast);
-    BOOST_CHECK_THROW(lexical_cast<T>("-+9"), bad_lexical_cast);
-    BOOST_CHECK_THROW(lexical_cast<T>("--1"), bad_lexical_cast);
-    BOOST_CHECK_THROW(lexical_cast<T>("+-9"), bad_lexical_cast);
-    // test_conversion_from_to_integral_for_locale
-
-    // Overflow test case from David W. Birdsall
-    std::string must_owerflow_str =             (sizeof(T) < 16 ?  "160000000000000000000" :  "1600000000000000000000000000000000000000");
-    std::string must_owerflow_negative_str =    (sizeof(T) < 16 ? "-160000000000000000000" : "-1600000000000000000000000000000000000000");
-    for (int i = 0; i < 15; ++i) {
-        BOOST_CHECK_THROW(lexical_cast<T>(must_owerflow_str), bad_lexical_cast);
-        BOOST_CHECK_THROW(lexical_cast<T>(must_owerflow_negative_str), bad_lexical_cast);
-
-        must_owerflow_str += '0';
-        must_owerflow_negative_str += '0';
-    }
-}
-
-template<class T>
-void test_conversion_from_to_integral()
-{
-    test_conversion_from_to_integral_minimal<T>();
-    typedef std::numpunct<char> numpunct;
-
-    restore_oldloc guard;
-    std::locale const& oldloc = guard.oldloc;
-
-    std::string grouping1 = BOOST_USE_FACET(numpunct, oldloc).grouping();
-    std::string grouping2(grouping1);
-
-    test_conversion_from_to_integral_for_locale<T>();
-
-    try
-    {
-        std::locale newloc("");
-        std::locale::global(newloc);
-
-        grouping2 = BOOST_USE_FACET(numpunct, newloc).grouping();
-    }
-    catch(std::exception const& ex)
-    {
-        std::string msg("Failed to set system locale: ");
-        msg += ex.what();
-        BOOST_TEST_MESSAGE(msg);
-    }
-
-    if(grouping1 != grouping2)
-        test_conversion_from_to_integral_for_locale<T>();
-
-    if(grouping1.empty() && grouping2.empty())
-        BOOST_TEST_MESSAGE("Formatting with thousands_sep has not been tested");
-}
-
-void test_conversion_from_to_short()
-{
-    test_conversion_from_to_integral<short>();
-}
-
-void test_conversion_from_to_ushort()
-{
-    test_conversion_from_to_integral<unsigned short>();
-}
-
-void test_conversion_from_to_int()
-{
-    test_conversion_from_to_integral<int>();
-}
-
-void test_conversion_from_to_uint()
-{
-    test_conversion_from_to_integral<unsigned int>();
-}
-
-void test_conversion_from_to_long()
-{
-    test_conversion_from_to_integral<long>();
-}
-
-void test_conversion_from_to_ulong()
-{
-    test_conversion_from_to_integral<unsigned long>();
-}
-
-void test_conversion_from_to_intmax_t()
-{
-    test_conversion_from_to_integral<boost::intmax_t>();
-}
-
-void test_conversion_from_to_uintmax_t()
-{
-    test_conversion_from_to_integral<boost::uintmax_t>();
-}
-
-#if defined(BOOST_HAS_LONG_LONG)
-
-void test_conversion_from_to_longlong()
-{
-    test_conversion_from_to_integral<boost::long_long_type>();
-}
-
-void test_conversion_from_to_ulonglong()
-{
-    test_conversion_from_to_integral<boost::ulong_long_type>();
-}
-
-#elif defined(BOOST_HAS_MS_INT64)
-
-void test_conversion_from_to_longlong()
-{
-    test_conversion_from_to_integral<__int64>();
-}
-
-void test_conversion_from_to_ulonglong()
-{
-    test_conversion_from_to_integral<unsigned __int64>();
-}
-
-#endif
-
-
-#ifdef BOOST_HAS_INT128
-
-template <bool Specialized, class T>
-struct test_if_specialized {
-    static void test() {}
-};
-
-template <class T>
-struct test_if_specialized<true, T> {
-    static void test() {
-        test_conversion_from_to_integral_minimal<T>();
-    }
-};
-
-void test_conversion_from_to_int128()
-{
-    test_if_specialized<
-        std::numeric_limits<boost::int128_type>::is_specialized, 
-        boost::int128_type
-    >::test();
-}
-
-void test_conversion_from_to_uint128()
-{
-    test_if_specialized<
-        std::numeric_limits<boost::int128_type>::is_specialized, 
-        boost::uint128_type
-    >::test();
-}
-#endif
-
-template <typename SignedT>
-void test_integral_conversions_on_min_max_impl()
-{
-    typedef SignedT signed_t;
-    typedef BOOST_DEDUCED_TYPENAME boost::make_unsigned<signed_t>::type unsigned_t;
-    
-    typedef std::numeric_limits<signed_t> s_limits;
-    typedef std::numeric_limits<unsigned_t> uns_limits;
-
-    BOOST_CHECK_EQUAL(lexical_cast<unsigned_t>((uns_limits::max)()), (uns_limits::max)());
-    BOOST_CHECK_EQUAL(lexical_cast<unsigned_t>((uns_limits::min)()), (uns_limits::min)());
-
-    BOOST_CHECK_EQUAL(lexical_cast<signed_t>((s_limits::max)()), (s_limits::max)());
-    BOOST_CHECK_EQUAL(lexical_cast<signed_t>((uns_limits::min)()), static_cast<signed_t>((uns_limits::min)()));
-
-    BOOST_CHECK_EQUAL(lexical_cast<unsigned_t>((s_limits::max)()), static_cast<unsigned_t>((s_limits::max)()));
-    BOOST_CHECK_EQUAL(lexical_cast<unsigned_t>((s_limits::min)()), static_cast<unsigned_t>((s_limits::min)()));
-}
-
-void test_integral_conversions_on_min_max()
-{
-    test_integral_conversions_on_min_max_impl<int>();
-    test_integral_conversions_on_min_max_impl<short>();
-
-#ifdef _MSC_VER
-    test_integral_conversions_on_min_max_impl<long int>();
-
-#if defined(BOOST_HAS_LONG_LONG)
-    test_integral_conversions_on_min_max_impl<boost::long_long_type>();
-#elif defined(BOOST_HAS_MS_INT64)
-    test_integral_conversions_on_min_max_impl<__int64>();
-#endif
-
-#ifdef BOOST_HAS_INT128
-    test_integral_conversions_on_min_max_impl<boost::int128_type>();
-#endif
-#endif
-
-}
-
-
@@ -27,15 +27,6 @@ using namespace boost;
 #define BOOST_LCAST_NO_WCHAR_T
 #endif

-
-#if !defined(BOOST_NO_CXX11_CHAR16_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS) && !defined(_LIBCPP_VERSION)
-#define BOOST_LC_RUNU16
-#endif
-
-#if !defined(BOOST_NO_CXX11_CHAR32_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS) && !defined(_LIBCPP_VERSION)
-#define BOOST_LC_RUNU32
-#endif
-
 struct class_with_user_defined_sream_operators {
    int i;

@@ -55,39 +46,24 @@ template <class RngT>
 void do_test_iterator_range_impl(const RngT& rng)
 {
    BOOST_CHECK_EQUAL(lexical_cast<int>(rng), 1);
-    BOOST_CHECK_EQUAL(lexical_cast<int>(rng.begin(), rng.size()), 1);
    BOOST_CHECK_EQUAL(lexical_cast<unsigned int>(rng), 1u);
-    BOOST_CHECK_EQUAL(lexical_cast<unsigned int>(rng.begin(), rng.size()), 1u);
    BOOST_CHECK_EQUAL(lexical_cast<short>(rng), 1);
-    BOOST_CHECK_EQUAL(lexical_cast<short>(rng.begin(), rng.size()), 1);
    BOOST_CHECK_EQUAL(lexical_cast<unsigned short>(rng), 1u);
-    BOOST_CHECK_EQUAL(lexical_cast<unsigned short>(rng.begin(), rng.size()), 1u);
    BOOST_CHECK_EQUAL(lexical_cast<long int>(rng), 1);
-    BOOST_CHECK_EQUAL(lexical_cast<long int>(rng.begin(), rng.size()), 1);
    BOOST_CHECK_EQUAL(lexical_cast<unsigned long int>(rng), 1u);
-    BOOST_CHECK_EQUAL(lexical_cast<unsigned long int>(rng.begin(), rng.size()), 1u);

 #ifdef BOOST_STL_SUPPORTS_NEW_UNICODE_LOCALES
    BOOST_CHECK_EQUAL(lexical_cast<float>(rng), 1.0f);
-    BOOST_CHECK_EQUAL(lexical_cast<float>(rng.begin(), rng.size()), 1.0f);
    BOOST_CHECK_EQUAL(lexical_cast<double>(rng), 1.0);
-    BOOST_CHECK_EQUAL(lexical_cast<double>(rng.begin(), rng.size()), 1.0);
-#ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
    BOOST_CHECK_EQUAL(lexical_cast<long double>(rng), 1.0L);
-    BOOST_CHECK_EQUAL(lexical_cast<long double>(rng.begin(), rng.size()), 1.0L);
-#endif
    BOOST_CHECK_EQUAL(lexical_cast<class_with_user_defined_sream_operators>(rng), 1);
 #endif
 #if defined(BOOST_HAS_LONG_LONG)
    BOOST_CHECK_EQUAL(lexical_cast<boost::ulong_long_type>(rng), 1u);
-    BOOST_CHECK_EQUAL(lexical_cast<boost::ulong_long_type>(rng.begin(), rng.size()), 1u);
    BOOST_CHECK_EQUAL(lexical_cast<boost::long_long_type>(rng), 1);
-    BOOST_CHECK_EQUAL(lexical_cast<boost::long_long_type>(rng.begin(), rng.size()), 1);
 #elif defined(BOOST_HAS_MS_INT64)
    BOOST_CHECK_EQUAL(lexical_cast<unsigned __int64>(rng), 1u);
-    BOOST_CHECK_EQUAL(lexical_cast<unsigned __int64>(rng.begin(), rng.size()), 1u);
    BOOST_CHECK_EQUAL(lexical_cast<__int64>(rng), 1);
-    BOOST_CHECK_EQUAL(lexical_cast<__int64>(rng.begin(), rng.size()), 1);
 #endif
 }

@@ -130,16 +106,12 @@ void test_it_range_using_char(CharT* one, CharT* eleven)

    BOOST_CHECK_EQUAL(lexical_cast<float>(rng1), 1.0f);
    BOOST_CHECK_EQUAL(lexical_cast<double>(rng1), 1.0);
-#ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
    BOOST_CHECK_EQUAL(lexical_cast<long double>(rng1), 1.0L);
-#endif
    BOOST_CHECK_EQUAL(lexical_cast<class_with_user_defined_sream_operators>(rng1), 1);

    BOOST_CHECK_EQUAL(lexical_cast<float>(crng2), 1.0f);
    BOOST_CHECK_EQUAL(lexical_cast<double>(crng2), 1.0);
-#ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
    BOOST_CHECK_EQUAL(lexical_cast<long double>(crng2), 1.0L);
-#endif
    BOOST_CHECK_EQUAL(lexical_cast<class_with_user_defined_sream_operators>(crng2), 1);

 #ifndef BOOST_LCAST_NO_WCHAR_T
@@ -149,7 +121,7 @@ void test_it_range_using_char(CharT* one, CharT* eleven)
    BOOST_CHECK(lexical_cast<std::wstring>(crng2) == L"1");
 #endif

-#if defined(BOOST_LC_RUNU16) && defined(BOOST_STL_SUPPORTS_NEW_UNICODE_LOCALES)
+#if !defined(BOOST_NO_CHAR16_T) && !defined(BOOST_NO_UNICODE_LITERALS) && defined(BOOST_STL_SUPPORTS_NEW_UNICODE_LOCALES)
    typedef std::basic_string<char16_t> my_char16_string;
    BOOST_CHECK(lexical_cast<my_char16_string>(rng1) == u"1");
    BOOST_CHECK(lexical_cast<my_char16_string>(crng1) == u"1");
@@ -157,7 +129,7 @@ void test_it_range_using_char(CharT* one, CharT* eleven)
    BOOST_CHECK(lexical_cast<my_char16_string>(crng2) == u"1");
 #endif

-#if defined(BOOST_LC_RUNU32) && defined(BOOST_STL_SUPPORTS_NEW_UNICODE_LOCALES)
+#if !defined(BOOST_NO_CHAR32_T) && !defined(BOOST_NO_UNICODE_LITERALS) && defined(BOOST_STL_SUPPORTS_NEW_UNICODE_LOCALES)
    typedef std::basic_string<char32_t> my_char32_string;
    BOOST_CHECK(lexical_cast<my_char32_string>(rng1) == U"1");
    BOOST_CHECK(lexical_cast<my_char32_string>(crng1) == U"1");
@@ -209,7 +181,7 @@ void test_wchar_iterator_ranges()

 void test_char16_iterator_ranges()
 {
-#if defined(BOOST_LC_RUNU16)
+#if !defined(BOOST_NO_CHAR16_T) && !defined(BOOST_NO_UNICODE_LITERALS)
    typedef char16_t test_char_type;
    test_char_type data1[] = u"1";
    test_char_type data2[] = u"11";
@@ -221,7 +193,7 @@ void test_char16_iterator_ranges()

 void test_char32_iterator_ranges()
 {
-#if defined(BOOST_LC_RUNU32)
+#if !defined(BOOST_NO_CHAR32_T) && !defined(BOOST_NO_UNICODE_LITERALS)
    typedef char32_t test_char_type;
    test_char_type data1[] = U"1";
    test_char_type data2[] = U"11";
@@ -86,11 +86,7 @@ void test_round_conversion_double()

 void test_round_conversion_long_double()
 {
-// We do not run tests on compilers with bugs
-#ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
    test_round_conversion<long double>();
    test_msvc_magic_values<long double>();
-#endif
-    BOOST_CHECK(true);
 }

@@ -37,9 +37,7 @@ void do_test_on_empty_input(T& v)
    BOOST_CHECK_THROW(lexical_cast<int>(v), bad_lexical_cast);
    BOOST_CHECK_THROW(lexical_cast<float>(v), bad_lexical_cast);
    BOOST_CHECK_THROW(lexical_cast<double>(v), bad_lexical_cast);
-#ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
    BOOST_CHECK_THROW(lexical_cast<long double>(v), bad_lexical_cast);
-#endif
    BOOST_CHECK_THROW(lexical_cast<unsigned int>(v), bad_lexical_cast);
    BOOST_CHECK_THROW(lexical_cast<unsigned short>(v), bad_lexical_cast);
 #if defined(BOOST_HAS_LONG_LONG)
@@ -1,307 +0,0 @@
-//  Unit test for boost::lexical_cast.
-//
-//  See http://www.boost.org for most recent version, including documentation.
-//
-//  Copyright Antony Polukhin, 2011-2012.
-//
-//  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).
-
-
-#include <boost/config.hpp>
-#include <boost/test/unit_test.hpp>
-
-#include <boost/lexical_cast.hpp>
-
-#include <iostream>
-
-
-///////////////////////// char streamable classes ///////////////////////////////////////////
-
-struct streamable_easy { enum ENU {value = 0}; };
-std::ostream& operator << (std::ostream& ostr, const streamable_easy&) {
-    return ostr << streamable_easy::value;
-}
-std::istream& operator >> (std::istream& istr, const streamable_easy&) {
-    int i; istr >> i; BOOST_CHECK_EQUAL(i, streamable_easy::value);
-    return istr;
-}
-
-struct streamable_medium { enum ENU {value = 1}; };
-template <class CharT>
-typename boost::enable_if<boost::is_same<CharT, char>, std::basic_ostream<CharT>&>::type 
-operator << (std::basic_ostream<CharT>& ostr, const streamable_medium&) {
-    return ostr << streamable_medium::value;
-}
-template <class CharT>
-typename boost::enable_if<boost::is_same<CharT, char>, std::basic_istream<CharT>&>::type 
-operator >> (std::basic_istream<CharT>& istr, const streamable_medium&) {
-    int i; istr >> i; BOOST_CHECK_EQUAL(i, streamable_medium::value);
-    return istr;
-}
-
-struct streamable_hard { enum ENU {value = 2}; };
-template <class CharT, class TraitsT>
-typename boost::enable_if<boost::is_same<CharT, char>, std::basic_ostream<CharT, TraitsT>&>::type 
-operator << (std::basic_ostream<CharT, TraitsT>& ostr, const streamable_hard&) {
-    return ostr << streamable_hard::value;
-}
-template <class CharT, class TraitsT>
-typename boost::enable_if<boost::is_same<CharT, char>, std::basic_istream<CharT, TraitsT>&>::type 
-operator >> (std::basic_istream<CharT, TraitsT>& istr, const streamable_hard&) {
-    int i; istr >> i; BOOST_CHECK_EQUAL(i, streamable_hard::value);
-    return istr;
-}
-
-struct streamable_hard2 { enum ENU {value = 3}; };
-template <class TraitsT>
-std::basic_ostream<char, TraitsT>& operator << (std::basic_ostream<char, TraitsT>& ostr, const streamable_hard2&) {
-    return ostr << streamable_hard2::value;
-}
-template <class TraitsT>
-std::basic_istream<char, TraitsT>& operator >> (std::basic_istream<char, TraitsT>& istr, const streamable_hard2&) {
-    int i; istr >> i; BOOST_CHECK_EQUAL(i, streamable_hard2::value);
-    return istr;
-}
-
-
-///////////////////////// wchar_t streamable classes ///////////////////////////////////////////
-
-struct wstreamable_easy { enum ENU {value = 4}; };
-std::wostream& operator << (std::wostream& ostr, const wstreamable_easy&) {
-    return ostr << wstreamable_easy::value;
-}
-std::wistream& operator >> (std::wistream& istr, const wstreamable_easy&) {
-    int i; istr >> i; BOOST_CHECK_EQUAL(i, wstreamable_easy::value);
-    return istr;
-}
-
-struct wstreamable_medium { enum ENU {value = 5}; };
-template <class CharT>
-typename boost::enable_if<boost::is_same<CharT, wchar_t>, std::basic_ostream<CharT>& >::type 
-operator << (std::basic_ostream<CharT>& ostr, const wstreamable_medium&) {
-    return ostr << wstreamable_medium::value;
-}
-template <class CharT>
-typename boost::enable_if<boost::is_same<CharT, wchar_t>, std::basic_istream<CharT>& >::type 
-operator >> (std::basic_istream<CharT>& istr, const wstreamable_medium&) {
-    int i; istr >> i; BOOST_CHECK_EQUAL(i, wstreamable_medium::value);
-    return istr;
-}
-
-struct wstreamable_hard { enum ENU {value = 6}; };
-template <class CharT, class TraitsT>
-typename boost::enable_if<boost::is_same<CharT, wchar_t>, std::basic_ostream<CharT, TraitsT>&>::type 
-operator << (std::basic_ostream<CharT, TraitsT>& ostr, const wstreamable_hard&) {
-    return ostr << wstreamable_hard::value;
-}
-template <class CharT, class TraitsT>
-typename boost::enable_if<boost::is_same<CharT, wchar_t>, std::basic_istream<CharT, TraitsT>&>::type 
-operator >> (std::basic_istream<CharT, TraitsT>& istr, const wstreamable_hard&) {
-    int i; istr >> i; BOOST_CHECK_EQUAL(i, wstreamable_hard::value);
-    return istr;
-}
-
-struct wstreamable_hard2 { enum ENU {value = 7}; };
-template <class TraitsT>
-std::basic_ostream<wchar_t, TraitsT>& operator << (std::basic_ostream<wchar_t, TraitsT>& ostr, const wstreamable_hard2&) {
-    return ostr << wstreamable_hard2::value;
-}
-template <class TraitsT>
-std::basic_istream<wchar_t, TraitsT>& operator >> (std::basic_istream<wchar_t, TraitsT>& istr, const wstreamable_hard2&) {
-    int i; istr >> i; BOOST_CHECK_EQUAL(i, wstreamable_hard2::value);
-    return istr;
-}
-
-///////////////////////// char and wchar_t streamable classes ///////////////////////////////////////////
-
-
-struct bistreamable_easy { enum ENU {value = 8}; };
-std::ostream& operator << (std::ostream& ostr, const bistreamable_easy&) {
-    return ostr << bistreamable_easy::value;
-}
-std::istream& operator >> (std::istream& istr, const bistreamable_easy&) {
-    int i; istr >> i; BOOST_CHECK_EQUAL(i, bistreamable_easy::value);
-    return istr;
-}
-
-std::wostream& operator << (std::wostream& ostr, const bistreamable_easy&) {
-    return ostr << bistreamable_easy::value + 100;
-}
-std::wistream& operator >> (std::wistream& istr, const bistreamable_easy&) {
-    int i; istr >> i; BOOST_CHECK_EQUAL(i, bistreamable_easy::value + 100);
-    return istr;
-}
-
-struct bistreamable_medium { enum ENU {value = 9}; };
-template <class CharT>
-std::basic_ostream<CharT>& operator << (std::basic_ostream<CharT>& ostr, const bistreamable_medium&) {
-    return ostr << bistreamable_medium::value + (sizeof(CharT) == 1 ? 0 : 100);
-}
-template <class CharT>
-std::basic_istream<CharT>& operator >> (std::basic_istream<CharT>& istr, const bistreamable_medium&) {
-    int i; istr >> i; BOOST_CHECK_EQUAL(i, bistreamable_medium::value + (sizeof(CharT) == 1 ? 0 : 100));
-    return istr;
-}
-
-struct bistreamable_hard { enum ENU {value = 10}; };
-template <class CharT, class TraitsT>
-std::basic_ostream<CharT, TraitsT>& operator << (std::basic_ostream<CharT, TraitsT>& ostr, const bistreamable_hard&) {
-    return ostr << bistreamable_hard::value + (sizeof(CharT) == 1 ? 0 : 100);
-}
-template <class CharT, class TraitsT>
-std::basic_istream<CharT, TraitsT>& operator >> (std::basic_istream<CharT, TraitsT>& istr, const bistreamable_hard&) {
-    int i; istr >> i; BOOST_CHECK_EQUAL(i, bistreamable_hard::value + (sizeof(CharT) == 1 ? 0 : 100));
-    return istr;
-}
-
-struct bistreamable_hard2 { enum ENU {value = 11}; };
-template <class TraitsT>
-std::basic_ostream<char, TraitsT>& operator << (std::basic_ostream<char, TraitsT>& ostr, const bistreamable_hard2&) {
-    return ostr << bistreamable_hard2::value;
-}
-template <class TraitsT>
-std::basic_istream<char, TraitsT>& operator >> (std::basic_istream<char, TraitsT>& istr, const bistreamable_hard2&) {
-    int i; istr >> i; BOOST_CHECK_EQUAL(i, bistreamable_hard2::value);
-    return istr;
-}
-
-template <class TraitsT>
-std::basic_ostream<wchar_t, TraitsT>& operator << (std::basic_ostream<wchar_t, TraitsT>& ostr, const bistreamable_hard2&) {
-    return ostr << bistreamable_hard2::value + 100;
-}
-template <class TraitsT>
-std::basic_istream<wchar_t, TraitsT>& operator >> (std::basic_istream<wchar_t, TraitsT>& istr, const bistreamable_hard2&) {
-    int i; istr >> i; BOOST_CHECK_EQUAL(i, bistreamable_hard2::value + 100);
-    return istr;
-}
-
-
-void test_ostream_character_detection();
-void test_istream_character_detection();
-void test_mixed_stream_character_detection();
-
-boost::unit_test::test_suite *init_unit_test_suite(int, char *[])
-{
-    boost::unit_test::test_suite *suite = 
-        BOOST_TEST_SUITE("lexical_cast stream character detection");
-    suite->add(BOOST_TEST_CASE(&test_ostream_character_detection));
-    suite->add(BOOST_TEST_CASE(&test_istream_character_detection));
-    suite->add(BOOST_TEST_CASE(&test_mixed_stream_character_detection));
-    
-    return suite;
-}
-
-template <class T>
-static void test_ostr_impl() {
-    T streamable;
-    BOOST_CHECK_EQUAL(T::value,  boost::lexical_cast<int>(streamable));
-    BOOST_CHECK_EQUAL(boost::lexical_cast<std::string>(T::value),  boost::lexical_cast<std::string>(streamable));
-}
-
-template <class T>
-static void test_wostr_impl() {
-    T streamable;
-    BOOST_CHECK_EQUAL(T::value,  boost::lexical_cast<int>(streamable));
-    // BOOST_CHECK_EQUAL(boost::lexical_cast<std::string>(T::value), boost::lexical_cast<std::string>(streamable)); // Shall not compile???
-    BOOST_CHECK(boost::lexical_cast<std::wstring>(T::value) == boost::lexical_cast<std::wstring>(streamable));
-}
-
-template <class T>
-static void test_bistr_impl() {
-    T streamable;
-
-    BOOST_CHECK_EQUAL(T::value,  boost::lexical_cast<int>(streamable));
-    BOOST_CHECK_EQUAL(boost::lexical_cast<std::string>(T::value),  boost::lexical_cast<std::string>(streamable));
-
-    BOOST_CHECK(boost::lexical_cast<std::wstring>(T::value + 100) == boost::lexical_cast<std::wstring>(streamable));
-}
-
-void test_ostream_character_detection() {
-    test_ostr_impl<streamable_easy>();
-    test_ostr_impl<streamable_medium>();
-    test_ostr_impl<streamable_hard>();
-    test_ostr_impl<streamable_hard2>();
-    
-    test_wostr_impl<wstreamable_easy>();
-    test_wostr_impl<wstreamable_medium>();
-    test_wostr_impl<wstreamable_hard>();
-    test_wostr_impl<wstreamable_hard2>();
-    
-    test_bistr_impl<bistreamable_easy>();
-    test_bistr_impl<bistreamable_medium>();
-    test_bistr_impl<bistreamable_hard>();
-    test_bistr_impl<bistreamable_hard2>();
-}
-
-
-template <class T>
-static void test_istr_impl() {
-    boost::lexical_cast<T>(T::value);
-    boost::lexical_cast<T>(boost::lexical_cast<std::string>(T::value));
-}
-
-template <class T>
-static void test_wistr_impl() {
-    boost::lexical_cast<T>(T::value);
-    //boost::lexical_cast<T>(boost::lexical_cast<std::string>(T::value)); // Shall not compile???
-    boost::lexical_cast<T>(boost::lexical_cast<std::wstring>(T::value));
-}
-
-template <class T>
-static void test_bistr_instr_impl() {
-    boost::lexical_cast<T>(T::value);
-    boost::lexical_cast<T>(boost::lexical_cast<std::string>(T::value));
-    boost::lexical_cast<T>(boost::lexical_cast<std::wstring>(T::value + 100));
-}
-
-void test_istream_character_detection() {
-    test_istr_impl<streamable_easy>();
-    test_istr_impl<streamable_medium>();
-    test_istr_impl<streamable_hard>();
-    test_istr_impl<streamable_hard2>();
-    
-    test_wistr_impl<wstreamable_easy>();
-    test_wistr_impl<wstreamable_medium>();
-    test_wistr_impl<wstreamable_hard>();
-    test_wistr_impl<wstreamable_hard2>();
-    
-    test_bistr_instr_impl<bistreamable_easy>();
-    test_bistr_instr_impl<bistreamable_medium>();
-    test_bistr_instr_impl<bistreamable_hard>();
-    test_bistr_instr_impl<bistreamable_hard2>();
-}
-
-
-
-
-
-
-struct wistreamble_ostreamable { enum ENU {value = 200}; };
-std::ostream& operator << (std::ostream& ostr, const wistreamble_ostreamable&) {
-    return ostr << wistreamble_ostreamable::value;
-}
-std::wistream& operator >> (std::wistream& istr, const wistreamble_ostreamable&) {
-    int i; istr >> i; BOOST_CHECK_EQUAL(i, wistreamble_ostreamable::value);
-    return istr;
-}
-
-struct istreamble_wostreamable { enum ENU {value = 201}; };
-std::wostream& operator << (std::wostream& ostr, const istreamble_wostreamable&) {
-    return ostr << istreamble_wostreamable::value;
-}
-std::istream& operator >> (std::istream& istr, const istreamble_wostreamable&) {
-    int i; istr >> i; BOOST_CHECK_EQUAL(i, istreamble_wostreamable::value);
-    return istr;
-}
-
-void test_mixed_stream_character_detection() {
-    //boost::lexical_cast<std::wstring>(std::string("qwe")); // TODO: ALLOW IT AS EXTENSION!
-    
-    boost::lexical_cast<wistreamble_ostreamable>(wistreamble_ostreamable::value);
-    BOOST_CHECK_EQUAL(boost::lexical_cast<int>(wistreamble_ostreamable()), wistreamble_ostreamable::value);
-    
-    boost::lexical_cast<istreamble_wostreamable>(istreamble_wostreamable::value);
-    BOOST_CHECK_EQUAL(boost::lexical_cast<int>(istreamble_wostreamable()), istreamble_wostreamable::value);
-}
@@ -1,158 +0,0 @@
-//  Unit test for boost::lexical_cast.
-//
-//  See http://www.boost.org for most recent version, including documentation.
-//
-//  Copyright Antony Polukhin, 2012.
-//
-//  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).
-
-#include <boost/config.hpp>
-
-#include <boost/lexical_cast.hpp>
-
-#include <boost/test/unit_test.hpp>
-
-template <class T>
-static void test_optimized_types_to_string_const()
-{
-    namespace de = boost::detail;
-    typedef de::lexical_cast_stream_traits<T, std::string> trait_1;
-    BOOST_CHECK(!trait_1::is_source_input_not_optimized_t::value);
-    BOOST_CHECK((boost::is_same<BOOST_DEDUCED_TYPENAME trait_1::src_char_t, char>::value));
-    BOOST_CHECK((boost::is_same<BOOST_DEDUCED_TYPENAME trait_1::target_char_t, char>::value));
-    BOOST_CHECK((boost::is_same<BOOST_DEDUCED_TYPENAME trait_1::char_type, char>::value));
-    BOOST_CHECK(!trait_1::is_string_widening_required_t::value);
-    BOOST_CHECK(!trait_1::is_source_input_not_optimized_t::value);
-        
-    typedef de::lexical_cast_stream_traits<const T, std::string> trait_2;
-    BOOST_CHECK(!trait_2::is_source_input_not_optimized_t::value);
-    BOOST_CHECK((boost::is_same<BOOST_DEDUCED_TYPENAME trait_2::src_char_t, char>::value));
-    BOOST_CHECK((boost::is_same<BOOST_DEDUCED_TYPENAME trait_2::target_char_t, char>::value));
-    BOOST_CHECK((boost::is_same<BOOST_DEDUCED_TYPENAME trait_2::char_type, char>::value));
-    BOOST_CHECK(!trait_2::is_string_widening_required_t::value);
-    BOOST_CHECK(!trait_2::is_source_input_not_optimized_t::value);
-
-    typedef de::lexical_cast_stream_traits<T, std::wstring> trait_3;
-    BOOST_CHECK(!trait_3::is_source_input_not_optimized_t::value);
-    BOOST_CHECK((boost::is_same<BOOST_DEDUCED_TYPENAME trait_3::src_char_t, char>::value));
-    BOOST_CHECK((boost::is_same<BOOST_DEDUCED_TYPENAME trait_3::target_char_t, wchar_t>::value));
-    BOOST_CHECK((boost::is_same<BOOST_DEDUCED_TYPENAME trait_3::char_type, wchar_t>::value));
-
-    BOOST_CHECK((boost::detail::is_char_or_wchar<BOOST_DEDUCED_TYPENAME trait_3::no_cv_src>::value != trait_3::is_string_widening_required_t::value));
-
-    BOOST_CHECK(!trait_3::is_source_input_not_optimized_t::value);
-}    
-
-
-template <class T>
-static void test_optimized_types_to_string()
-{
-    test_optimized_types_to_string_const<T>();
-
-    namespace de = boost::detail;
-    typedef de::lexical_cast_stream_traits<std::string, T> trait_4;
-    BOOST_CHECK(!trait_4::is_source_input_not_optimized_t::value);
-    BOOST_CHECK((boost::is_same<BOOST_DEDUCED_TYPENAME trait_4::src_char_t, char>::value));
-    BOOST_CHECK((boost::is_same<BOOST_DEDUCED_TYPENAME trait_4::target_char_t, char>::value));
-    BOOST_CHECK((boost::is_same<BOOST_DEDUCED_TYPENAME trait_4::char_type, char>::value));
-    BOOST_CHECK(!trait_4::is_string_widening_required_t::value);
-    BOOST_CHECK(!trait_4::is_source_input_not_optimized_t::value);
-        
-    typedef de::lexical_cast_stream_traits<const std::string, T> trait_5;
-    BOOST_CHECK(!trait_5::is_source_input_not_optimized_t::value);
-    BOOST_CHECK((boost::is_same<BOOST_DEDUCED_TYPENAME trait_5::src_char_t, char>::value));
-    BOOST_CHECK((boost::is_same<BOOST_DEDUCED_TYPENAME trait_5::target_char_t, char>::value));
-    BOOST_CHECK((boost::is_same<BOOST_DEDUCED_TYPENAME trait_5::char_type, char>::value));
-    BOOST_CHECK(!trait_5::is_string_widening_required_t::value);
-    BOOST_CHECK(!trait_5::is_source_input_not_optimized_t::value);
-
-    typedef de::lexical_cast_stream_traits<const std::wstring, T> trait_6;
-    BOOST_CHECK(!trait_6::is_source_input_not_optimized_t::value);
-    BOOST_CHECK((boost::is_same<BOOST_DEDUCED_TYPENAME trait_6::src_char_t, wchar_t>::value));
-    BOOST_CHECK((boost::is_same<BOOST_DEDUCED_TYPENAME trait_6::target_char_t, char>::value));
-    BOOST_CHECK((boost::is_same<BOOST_DEDUCED_TYPENAME trait_6::char_type, wchar_t>::value));
-    BOOST_CHECK(!trait_6::is_string_widening_required_t::value);
-}
-
-void test_metafunctions()
-{
-    test_optimized_types_to_string<bool>();
-    test_optimized_types_to_string<char>();
-    test_optimized_types_to_string<unsigned char>();
-    test_optimized_types_to_string<signed char>();
-    test_optimized_types_to_string<short>();
-    test_optimized_types_to_string<unsigned short>();
-    test_optimized_types_to_string<int>();
-    test_optimized_types_to_string<unsigned int>();
-    test_optimized_types_to_string<long>();
-    test_optimized_types_to_string<unsigned long>();
-
-#if defined(BOOST_HAS_LONG_LONG)
-    test_optimized_types_to_string<boost::ulong_long_type>();
-    test_optimized_types_to_string<boost::long_long_type>();
-#elif defined(BOOST_HAS_MS_INT64)
-    test_optimized_types_to_string<unsigned __int64>();
-    test_optimized_types_to_string<__int64>();
-#endif
-
-#if !defined(BOOST_NO_SWPRINTF) && !defined(__MINGW32__)
-    test_optimized_types_to_string<float>();
-#endif
-    
-    test_optimized_types_to_string<std::string>();
-    test_optimized_types_to_string<char*>();
-    //test_optimized_types_to_string<char[5]>();
-    //test_optimized_types_to_string<char[1]>();
-    test_optimized_types_to_string<unsigned char*>();
-    //test_optimized_types_to_string<unsigned char[5]>();
-    //test_optimized_types_to_string<unsigned char[1]>();
-    test_optimized_types_to_string<signed char*>();
-    //test_optimized_types_to_string<signed char[5]>();
-    //test_optimized_types_to_string<signed char[1]>();
-    test_optimized_types_to_string<boost::array<char, 1> >();
-    test_optimized_types_to_string<boost::array<char, 5> >();
-    test_optimized_types_to_string<boost::array<unsigned char, 1> >();
-    test_optimized_types_to_string<boost::array<unsigned char, 5> >();
-    test_optimized_types_to_string<boost::array<signed char, 1> >();
-    test_optimized_types_to_string<boost::array<signed char, 5> >();
-    test_optimized_types_to_string<boost::iterator_range<char*> >();
-    test_optimized_types_to_string<boost::iterator_range<unsigned char*> >();
-    test_optimized_types_to_string<boost::iterator_range<signed char*> >();
-
-    test_optimized_types_to_string_const<boost::array<const char, 1> >();
-    test_optimized_types_to_string_const<boost::array<const char, 5> >();
-    test_optimized_types_to_string_const<boost::array<const unsigned char, 1> >();
-    test_optimized_types_to_string_const<boost::array<const unsigned char, 5> >();
-    test_optimized_types_to_string_const<boost::array<const signed char, 1> >();
-    test_optimized_types_to_string_const<boost::array<const signed char, 5> >();
-    test_optimized_types_to_string_const<boost::iterator_range<const char*> >();
-    test_optimized_types_to_string_const<boost::iterator_range<const unsigned char*> >();
-    test_optimized_types_to_string_const<boost::iterator_range<const signed char*> >();
-
-#ifndef BOOST_NO_CXX11_HDR_ARRAY
-    test_optimized_types_to_string<std::array<char, 1> >();
-    test_optimized_types_to_string<std::array<char, 5> >();
-    test_optimized_types_to_string<std::array<unsigned char, 1> >();
-    test_optimized_types_to_string<std::array<unsigned char, 5> >();
-    test_optimized_types_to_string<std::array<signed char, 1> >();
-    test_optimized_types_to_string<std::array<signed char, 5> >();
-    
-    test_optimized_types_to_string_const<std::array<const char, 1> >();
-    test_optimized_types_to_string_const<std::array<const char, 5> >();
-    test_optimized_types_to_string_const<std::array<const unsigned char, 1> >();
-    test_optimized_types_to_string_const<std::array<const unsigned char, 5> >();
-    test_optimized_types_to_string_const<std::array<const signed char, 1> >();
-    test_optimized_types_to_string_const<std::array<const signed char, 5> >();
-#endif
-}
-
-boost::unit_test::test_suite *init_unit_test_suite(int, char *[])
-{
-    boost::unit_test::test_suite *suite =
-        BOOST_TEST_SUITE("lexical_cast traits tests");
-    suite->add(BOOST_TEST_CASE(&test_metafunctions));
-    return suite;
-}
-
@@ -1,23 +0,0 @@
-//  //  Unit test for boost::lexical_cast.
-//
-//  See http://www.boost.org for most recent version, including documentation.
-//
-//  Copyright Antony Polukhin, 2013.
-//
-//  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).
-
-#include <boost/lexical_cast.hpp>
-#include <boost/type.hpp>
-
-#define BOOST_INCLUDE_MAIN
-#include <boost/test/test_tools.hpp>
-
-int test_main(int, char*[])
-{
-    boost::lexical_cast<char*>("Hello");
-    BOOST_CHECK(false); // suppressing warning about 'boost::unit_test::{anonymous}::unit_test_log' defined but not used
-    return 0;
-}
-
@@ -34,7 +34,7 @@ void test_too_long_number(CharT zero)
    o << (limits::max)() << zero;
    s = o.str();
    BOOST_CHECK_THROW(lexical_cast<T>(s), bad_lexical_cast);
-    s[s.size()-1] += static_cast<CharT>(9); // '0' -> '9'
+    s[s.size()-1] += 9; // '0' -> '9'
    BOOST_CHECK_THROW(lexical_cast<T>(s), bad_lexical_cast);

    if(limits::is_signed)
@@ -43,7 +43,7 @@ void test_too_long_number(CharT zero)
        o << (limits::min)() << zero;
        s = o.str();
        BOOST_CHECK_THROW(lexical_cast<T>(s), bad_lexical_cast);
-        s[s.size()-1] += static_cast<CharT>(9); // '0' -> '9'
+        s[s.size()-1] += 9; // '0' -> '9'
        BOOST_CHECK_THROW(lexical_cast<T>(s), bad_lexical_cast);
    }
 }
@@ -58,7 +58,7 @@ void test_char_types_conversions_wchar_t()

 void test_char_types_conversions_char16_t()
 {
-#if !defined(BOOST_NO_CXX11_CHAR16_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS) && defined(BOOST_STL_SUPPORTS_NEW_UNICODE_LOCALES)
+#if !defined(BOOST_NO_CHAR16_T) && !defined(BOOST_NO_UNICODE_LITERALS) && defined(BOOST_STL_SUPPORTS_NEW_UNICODE_LOCALES)
    test_impl(u"Test array of chars");
 #endif

@@ -67,7 +67,7 @@ void test_char_types_conversions_char16_t()

 void test_char_types_conversions_char32_t()
 {
-#if !defined(BOOST_NO_CXX11_CHAR32_T) && !defined(BOOST_NO_CXX11_UNICODE_LITERALS) && defined(BOOST_STL_SUPPORTS_NEW_UNICODE_LOCALES)
+#if !defined(BOOST_NO_CHAR32_T) && !defined(BOOST_NO_UNICODE_LITERALS) && defined(BOOST_STL_SUPPORTS_NEW_UNICODE_LOCALES)
    test_impl(U"Test array of chars");
 #endif