From 580f4e72f70004519ddc3268c25c0be26c32a9a0 Mon Sep 17 00:00:00 2001 From: Bryce Adelstein-Lelbach Date: Fri, 14 Jan 2011 02:35:58 +0000 Subject: [PATCH] Replacing the use of with across Boost. On Linux, GNU's libstdc++, which is the default stdlib for icc and clang, cannot parse the header in version 4.5+ (which thankfully neither compiler advises the use of yet), as it's original C++98-friendly implementation has been replaced with a gnu++0x implementation. is a portable implementation of , providing boost::detail::setfill, boost::detail::setbase, boost::detail::setw, boost::detail::setprecision, boost::detail::setiosflags and boost::detail::resetiosflags. [SVN r68140] --- test/config_info.cpp | 8 ++++---- test/link/link_test.cpp | 2 +- test/math_info.cpp | 24 ++++++++++++------------ 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/test/config_info.cpp b/test/config_info.cpp index 762e6c56..6d752659 100644 --- a/test/config_info.cpp +++ b/test/config_info.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include @@ -44,7 +44,7 @@ void print_macro(const char* name, const char* value) if(0 != strcmp(name, value+1)) { for(unsigned i = 0; i < indent; ++i) std::cout.put(' '); - std::cout << std::setw(width); + std::cout << boost::detail::setw(width); cout.setf(istream::left, istream::adjustfield); std::cout << name; if(value[1]) @@ -66,7 +66,7 @@ template void print_expression(const char* expression, T val) { for(unsigned i = 0; i < indent; ++i) std::cout.put(' '); - std::cout << std::setw(width); + std::cout << boost::detail::setw(width); std::cout.setf(istream::left, istream::adjustfield); std::cout << expression << "=" << val << std::endl; } @@ -85,7 +85,7 @@ void print_byte_order(const char* what, T /* t */ ) const char* p = reinterpret_cast(&val); for(i = 0; i < indent; ++i) std::cout.put(' '); - std::cout << std::setw(width); + std::cout << boost::detail::setw(width); std::cout.setf(istream::left, istream::adjustfield); std::cout << what << "="; for(i = 0; i < sizeof(T); ++i) diff --git a/test/link/link_test.cpp b/test/link/link_test.cpp index be80bfcd..64e77ed4 100644 --- a/test/link/link_test.cpp +++ b/test/link/link_test.cpp @@ -10,7 +10,7 @@ #include "link_test.hpp" #include -#include +#include bool BOOST_CONFIG_DECL check_options( bool m_dyn_link, diff --git a/test/math_info.cpp b/test/math_info.cpp index e06c7454..b91d8a5e 100644 --- a/test/math_info.cpp +++ b/test/math_info.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include @@ -37,7 +37,7 @@ void print_macro(const char* name, const char* value) if(0 != std::strcmp(name, value+1)) { for(unsigned i = 0; i < indent; ++i) std::cout.put(' '); - std::cout << std::setw(width); + std::cout << boost::detail::setw(width); std::cout.setf(std::istream::left, std::istream::adjustfield); std::cout << name; if(value[1]) @@ -59,9 +59,9 @@ template void print_expression(const char* expression, T val) { for(unsigned i = 0; i < indent; ++i) std::cout.put(' '); - std::cout << std::setw(width); + std::cout << boost::detail::setw(width); std::cout.setf(std::istream::left, std::istream::adjustfield); - std::cout << std::setprecision(std::numeric_limits::digits10+2); + std::cout << boost::detail::setprecision(std::numeric_limits::digits10+2); std::cout << expression << "=" << val << std::endl; } @@ -81,9 +81,9 @@ void print_limits(T, const char* name) std::cout << " is_specialized = " << std::numeric_limits::is_specialized << std::endl; std::cout << - " min" "() = " << std::setprecision(std::numeric_limits::digits10 + 2) << (std::numeric_limits::min)() << std::endl; + " min" "() = " << boost::detail::setprecision(std::numeric_limits::digits10 + 2) << (std::numeric_limits::min)() << std::endl; std::cout << - " max" "() = " << std::setprecision(std::numeric_limits::digits10 + 2) << (std::numeric_limits::max)() << std::endl; + " max" "() = " << boost::detail::setprecision(std::numeric_limits::digits10 + 2) << (std::numeric_limits::max)() << std::endl; std::cout << " digits = " << std::numeric_limits::digits << std::endl; std::cout << @@ -98,9 +98,9 @@ void print_limits(T, const char* name) " radix = " << std::numeric_limits::radix << std::endl; std::cout << - " epsilon() = " << std::setprecision(std::numeric_limits::digits10 + 2) << (std::numeric_limits::epsilon)() << std::endl; + " epsilon() = " << boost::detail::setprecision(std::numeric_limits::digits10 + 2) << (std::numeric_limits::epsilon)() << std::endl; std::cout << - " round_error() = " << std::setprecision(std::numeric_limits::digits10 + 2) << (std::numeric_limits::round_error)() << std::endl; + " round_error() = " << boost::detail::setprecision(std::numeric_limits::digits10 + 2) << (std::numeric_limits::round_error)() << std::endl; std::cout << " min_exponent = " << std::numeric_limits::min_exponent << std::endl; @@ -122,13 +122,13 @@ void print_limits(T, const char* name) " has_denorm_loss = " << std::numeric_limits::has_denorm_loss << std::endl; std::cout << - " infinity() = " << std::setprecision(std::numeric_limits::digits10 + 2) << (std::numeric_limits::infinity)() << std::endl; + " infinity() = " << boost::detail::setprecision(std::numeric_limits::digits10 + 2) << (std::numeric_limits::infinity)() << std::endl; std::cout << - " quiet_NaN() = " << std::setprecision(std::numeric_limits::digits10 + 2) << (std::numeric_limits::quiet_NaN)() << std::endl; + " quiet_NaN() = " << boost::detail::setprecision(std::numeric_limits::digits10 + 2) << (std::numeric_limits::quiet_NaN)() << std::endl; std::cout << - " signaling_NaN() = " << std::setprecision(std::numeric_limits::digits10 + 2) << (std::numeric_limits::signaling_NaN)() << std::endl; + " signaling_NaN() = " << boost::detail::setprecision(std::numeric_limits::digits10 + 2) << (std::numeric_limits::signaling_NaN)() << std::endl; std::cout << - " denorm_min() = " << std::setprecision(std::numeric_limits::digits10 + 2) << (std::numeric_limits::denorm_min)() << std::endl; + " denorm_min() = " << boost::detail::setprecision(std::numeric_limits::digits10 + 2) << (std::numeric_limits::denorm_min)() << std::endl; std::cout <<