|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r68168 - in trunk: boost/archive boost/archive/impl boost/config/compiler boost/date_time boost/date_time/gregorian boost/date_time/local_time boost/date_time/posix_time boost/detail boost/exception/detail boost/geometry/extensions/contrib/ttmath boost/geometry/extensions/gis/io/wkb boost/graph boost/graph/distributed boost/math/policies boost/math/special_functions boost/math/tools boost/property_tree/detail boost/spirit/home/support/char_encoding/unicode boost/test/impl boost/units/systems/detail libs/algorithm/minmax/example libs/asio/example/porthopper libs/asio/example/serialization libs/asio/example/socks4 libs/bimap/example/mi_to_b_path libs/chrono/example libs/config/test libs/config/test/link libs/date_time/test/local_time libs/detail/test libs/exception/test libs/filesystem/v2/test libs/filesystem/v3/src libs/filesystem/v3/test libs/format/benchmark libs/format/example libs/format/test libs/geometry/example libs/geometry/example/extensions/gis/latlong libs/geometry/test/algorithms libs/geometry/test/algorithms/overlay libs/geometry/test/algorithms/overlay/robustness libs/geometry/test/extensions/algorithms/buffer libs/geometry/test/extensions/gis/projections libs/geometry/test/strategies libs/graph/example libs/graph/test libs/graph_parallel/test libs/interprocess/example libs/io/test libs/math/build libs/math/example libs/math/minimax libs/math/octonion libs/math/performance libs/math/quaternion libs/math/special_functions libs/math/test libs/math/tools libs/multi_index/example libs/multi_index/perf libs/numeric/conversion/test libs/numeric/interval/examples libs/property_tree/examples libs/proto/test libs/random/test libs/regex/performance libs/serialization/example libs/spirit/optimization/karma libs/spirit/test/karma libs/statechart/example/BitMachine libs/statechart/example/Handcrafted libs/statechart/example/Keyboard libs/statechart/example/Performance libs/test/build libs/test/example libs/test/test libs/tuple/test libs/units/example libs/utility libs/uuid/test libs/wave/samples/cpp_tokens libs/wave/samples/lexed_tokens libs/wave/samples/real_positions libs/xpressive/example libs/xpressive/perf
From: steven_at_[hidden]
Date: 2011-01-15 03:13:05
Author: steven_watanabe
Date: 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
New Revision: 68168
URL: http://svn.boost.org/trac/boost/changeset/68168
Log:
Revert [67111] (addition of boost/detail/iomanip.hpp) and all the commits that depend on it. ([68137], [68140], [68141], [68154], and [68165]).
Removed:
trunk/boost/detail/iomanip.hpp
trunk/libs/detail/test/iomanip_test.cpp
Text files modified:
trunk/boost/archive/basic_text_oprimitive.hpp | 6 +-
trunk/boost/archive/impl/xml_oarchive_impl.ipp | 2
trunk/boost/config/compiler/gcc.hpp | 2
trunk/boost/date_time/date_formatting.hpp | 6 +-
trunk/boost/date_time/date_formatting_limited.hpp | 6 +-
trunk/boost/date_time/date_formatting_locales.hpp | 10 ++--
trunk/boost/date_time/gregorian/formatters.hpp | 4
trunk/boost/date_time/gregorian/formatters_limited.hpp | 4
trunk/boost/date_time/gregorian/greg_facet.hpp | 4
trunk/boost/date_time/local_time/custom_time_zone.hpp | 28 ++++++------
trunk/boost/date_time/local_time/local_date_time.hpp | 6 +-
trunk/boost/date_time/local_time/posix_time_zone.hpp | 28 ++++++------
trunk/boost/date_time/posix_time/time_formatters.hpp | 20 ++++----
trunk/boost/date_time/posix_time/time_formatters_limited.hpp | 20 ++++----
trunk/boost/date_time/time_facet.hpp | 6 +-
trunk/boost/date_time/time_formatting_streams.hpp | 12 ++--
trunk/boost/exception/detail/object_hex_dump.hpp | 6 +-
trunk/boost/geometry/extensions/contrib/ttmath/ttmathuint.h | 8 +-
trunk/boost/geometry/extensions/gis/io/wkb/utility.hpp | 4
trunk/boost/graph/accounting.hpp | 4
trunk/boost/graph/distributed/hohberg_biconnected_components.hpp | 12 ++--
trunk/boost/graph/distributed/strong_components.hpp | 9 +--
trunk/boost/math/policies/error_handling.hpp | 4
trunk/boost/math/special_functions/gamma.hpp | 2
trunk/boost/math/tools/config.hpp | 2
trunk/boost/math/tools/precision.hpp | 2
trunk/boost/math/tools/test.hpp | 2
trunk/boost/property_tree/detail/json_parser_write.hpp | 2
trunk/boost/property_tree/detail/xml_parser_write.hpp | 2
trunk/boost/spirit/home/support/char_encoding/unicode/create_tables.cpp | 4
trunk/boost/test/impl/exception_safety.ipp | 5 -
trunk/boost/test/impl/plain_report_formatter.ipp | 6 +-
trunk/boost/units/systems/detail/constants.hpp | 12 ++--
trunk/libs/algorithm/minmax/example/minmax_timer.cpp | 6 +-
trunk/libs/asio/example/porthopper/protocol.hpp | 18 ++++----
trunk/libs/asio/example/serialization/connection.hpp | 4
trunk/libs/asio/example/socks4/sync_client.cpp | 2
trunk/libs/bimap/example/mi_to_b_path/hashed_indices.cpp | 9 +--
trunk/libs/bimap/example/mi_to_b_path/mi_hashed_indices.cpp | 9 +--
trunk/libs/chrono/example/await_keystroke.cpp | 4
trunk/libs/config/test/config_info.cpp | 8 +-
trunk/libs/config/test/link/link_test.cpp | 2
trunk/libs/config/test/math_info.cpp | 24 +++++-----
trunk/libs/date_time/test/local_time/testlocal_time.cpp | 12 ++--
trunk/libs/exception/test/cloning_test.cpp | 14 ------
trunk/libs/exception/test/diagnostic_information_test.cpp | 13 ------
trunk/libs/exception/test/errinfos_test.cpp | 3 -
trunk/libs/exception/test/no_exceptions_test.cpp | 3 -
trunk/libs/exception/test/throw_exception_test.cpp | 10 ---
trunk/libs/filesystem/v2/test/wide_test.cpp | 2
trunk/libs/filesystem/v3/src/path.cpp | 2
trunk/libs/filesystem/v3/test/path_unit_test.cpp | 2
trunk/libs/format/benchmark/bench_format.cpp | 38 +++++++++---------
trunk/libs/format/example/sample_advanced.cpp | 14 +++---
trunk/libs/format/example/sample_formats.cpp | 8 +-
trunk/libs/format/example/sample_new_features.cpp | 2
trunk/libs/format/example/sample_userType.cpp | 4
trunk/libs/format/test/format_test2.cpp | 14 +++---
trunk/libs/format/test/format_test3.cpp | 32 +++++++-------
trunk/libs/geometry/example/07_a_graph_route_example.cpp | 12 ++--
trunk/libs/geometry/example/07_b_graph_route_example.cpp | 12 ++--
trunk/libs/geometry/example/extensions/gis/latlong/point_ll_example.cpp | 4
trunk/libs/geometry/test/algorithms/overlay/assemble.cpp | 2
trunk/libs/geometry/test/algorithms/overlay/ccw_traverse.cpp | 4
trunk/libs/geometry/test/algorithms/overlay/enrich_intersection_points.cpp | 2
trunk/libs/geometry/test/algorithms/overlay/get_turns.cpp | 2
trunk/libs/geometry/test/algorithms/overlay/robustness/random_ellipses_stars.cpp | 2
trunk/libs/geometry/test/algorithms/overlay/robustness/recursive_polygons.cpp | 2
trunk/libs/geometry/test/algorithms/overlay/robustness/test_overlay_p_q.hpp | 4
trunk/libs/geometry/test/algorithms/overlay/self_intersection_points.cpp | 4
trunk/libs/geometry/test/algorithms/overlay/split_rings.cpp | 2
trunk/libs/geometry/test/algorithms/overlay/traverse.cpp | 8 +-
trunk/libs/geometry/test/algorithms/overlay/traverse_gmp.cpp | 8 +-
trunk/libs/geometry/test/algorithms/test_centroid.hpp | 4
trunk/libs/geometry/test/algorithms/test_difference.hpp | 2
trunk/libs/geometry/test/algorithms/test_intersection.hpp | 4
trunk/libs/geometry/test/extensions/algorithms/buffer/test_buffer.hpp | 2
trunk/libs/geometry/test/extensions/gis/projections/projections.cpp | 4
trunk/libs/geometry/test/strategies/pythagoras.cpp | 2
trunk/libs/graph/example/bellman-example.cpp | 4
trunk/libs/graph/example/closeness_centrality.cpp | 4
trunk/libs/graph/example/clustering_coefficient.cpp | 4
trunk/libs/graph/example/degree_centrality.cpp | 4
trunk/libs/graph/example/eccentricity.cpp | 4
trunk/libs/graph/example/inclusive_mean_geodesic.cpp | 14 +++---
trunk/libs/graph/example/influence_prestige.cpp | 5 -
trunk/libs/graph/example/johnson-eg.cpp | 10 ++--
trunk/libs/graph/example/mean_geodesic.cpp | 4
trunk/libs/graph/example/scaled_closeness_centrality.cpp | 4
trunk/libs/graph/test/bellman-test.cpp | 10 ++--
trunk/libs/graph/test/johnson-test.cpp | 10 ++--
trunk/libs/graph_parallel/test/algorithm_performance.cpp | 4
trunk/libs/graph_parallel/test/distributed_connected_components_test.cpp | 4
trunk/libs/graph_parallel/test/distributed_dimacs_reader.cpp | 4
trunk/libs/graph_parallel/test/distributed_rmat_cc.cpp | 4
trunk/libs/graph_parallel/test/distributed_rmat_cc_ps.cpp | 4
trunk/libs/graph_parallel/test/distributed_rmat_pagerank.cpp | 4
trunk/libs/graph_parallel/test/distributed_shortest_paths_test.cpp | 4
trunk/libs/graph_parallel/test/distributed_st_connected_test.cpp | 2
trunk/libs/graph_parallel/test/distributed_strong_components_test.cpp | 4
trunk/libs/graph_parallel/test/mesh_generator_test.cpp | 4
trunk/libs/graph_parallel/test/ssca.cpp | 4
trunk/libs/interprocess/example/Jamfile.v2 | 2
trunk/libs/io/test/ios_state_test.cpp | 8 +-
trunk/libs/io/test/ios_state_unit_test.cpp | 20 ++++----
trunk/libs/math/build/Jamfile.v2 | 2
trunk/libs/math/example/Jamfile.v2 | 2
trunk/libs/math/example/binomial_coinflip_example.cpp | 9 +--
trunk/libs/math/example/binomial_confidence_limits.cpp | 25 +++++------
trunk/libs/math/example/binomial_example_nag.cpp | 13 ++---
trunk/libs/math/example/binomial_quiz_example.cpp | 11 ++--
trunk/libs/math/example/binomial_sample_sizes.cpp | 17 +++----
trunk/libs/math/example/chi_square_std_dev_test.cpp | 83 +++++++++++++++++++--------------------
trunk/libs/math/example/f_test.cpp | 43 ++++++++++----------
trunk/libs/math/example/find_location_example.cpp | 4
trunk/libs/math/example/find_mean_and_sd_normal.cpp | 5 -
trunk/libs/math/example/find_root_example.cpp | 5 -
trunk/libs/math/example/find_scale_example.cpp | 4
trunk/libs/math/example/geometric_examples.cpp | 5 -
trunk/libs/math/example/inverse_chi_squared_example.cpp | 24 +++++-----
trunk/libs/math/example/inverse_chi_squared_find_df_example.cpp | 6 +-
trunk/libs/math/example/inverse_gamma_distribution_example.cpp | 4
trunk/libs/math/example/inverse_gamma_example.cpp | 4
trunk/libs/math/example/inverse_gaussian_example.cpp | 9 +--
trunk/libs/math/example/laplace_example.cpp | 23 +++++-----
trunk/libs/math/example/nc_chi_sq_example.cpp | 5 -
trunk/libs/math/example/neg_binom_confidence_limits.cpp | 23 +++++-----
trunk/libs/math/example/neg_binomial_sample_sizes.cpp | 13 ++---
trunk/libs/math/example/negative_binomial_example1.cpp | 7 +-
trunk/libs/math/example/negative_binomial_example2.cpp | 18 +++----
trunk/libs/math/example/normal_misc_examples.cpp | 19 ++++----
trunk/libs/math/example/policy_eg_10.cpp | 49 +++++++++++------------
trunk/libs/math/example/policy_eg_9.cpp | 5 -
trunk/libs/math/example/root_finding_example.cpp | 4
trunk/libs/math/example/students_t_example1.cpp | 4
trunk/libs/math/example/students_t_example2.cpp | 8 +-
trunk/libs/math/example/students_t_example3.cpp | 6 +-
trunk/libs/math/example/students_t_single_sample.cpp | 71 ++++++++++++++++-----------------
trunk/libs/math/example/students_t_two_samples.cpp | 65 +++++++++++++++---------------
trunk/libs/math/minimax/Jamfile.v2 | 2
trunk/libs/math/minimax/main.cpp | 34 ++++++++--------
trunk/libs/math/octonion/octonion_test.cpp | 2
trunk/libs/math/performance/main.cpp | 14 ++----
trunk/libs/math/quaternion/quaternion_test.cpp | 2
trunk/libs/math/special_functions/acosh_test.hpp | 8 +-
trunk/libs/math/special_functions/asinh_test.hpp | 8 +-
trunk/libs/math/special_functions/atanh_test.hpp | 14 +++---
trunk/libs/math/special_functions/sinc_test.hpp | 8 +-
trunk/libs/math/special_functions/sinhc_test.hpp | 8 +-
trunk/libs/math/special_functions/special_functions_test.cpp | 8 +-
trunk/libs/math/test/Jamfile.v2 | 8 ---
trunk/libs/math/test/acosh_test.hpp | 12 ++--
trunk/libs/math/test/asinh_test.hpp | 12 ++--
trunk/libs/math/test/atanh_test.hpp | 22 +++++-----
trunk/libs/math/test/complex_test.cpp | 4
trunk/libs/math/test/handle_test_result.hpp | 9 +--
trunk/libs/math/test/sinc_test.hpp | 12 ++--
trunk/libs/math/test/sinhc_test.hpp | 12 ++--
trunk/libs/math/test/special_functions_test.cpp | 8 +-
trunk/libs/math/test/test_bernoulli.cpp | 8 +--
trunk/libs/math/test/test_dist_overloads.cpp | 3
trunk/libs/math/test/test_exponential_dist.cpp | 3
trunk/libs/math/test/test_extreme_value.cpp | 3
trunk/libs/math/test/test_find_location.cpp | 6 -
trunk/libs/math/test/test_find_scale.cpp | 6 -
trunk/libs/math/test/test_gamma_dist.cpp | 3
trunk/libs/math/test/test_geometric.cpp | 4 -
trunk/libs/math/test/test_hypergeometric_dist.cpp | 5 -
trunk/libs/math/test/test_igamma_inv.cpp | 3
trunk/libs/math/test/test_igamma_inva.cpp | 4 -
trunk/libs/math/test/test_inverse_gaussian.cpp | 3
trunk/libs/math/test/test_laplace.cpp | 2
trunk/libs/math/test/test_logistic_dist.cpp | 3
trunk/libs/math/test/test_lognormal.cpp | 3
trunk/libs/math/test/test_long_double_support.cpp | 4
trunk/libs/math/test/test_nc_beta.cpp | 5 -
trunk/libs/math/test/test_nc_chi_squared.cpp | 5 -
trunk/libs/math/test/test_nc_f.cpp | 5 -
trunk/libs/math/test/test_nc_t.cpp | 5 -
trunk/libs/math/test/test_negative_binomial.cpp | 4 -
trunk/libs/math/test/test_normal.cpp | 3
trunk/libs/math/test/test_pareto.cpp | 3
trunk/libs/math/test/test_poisson.cpp | 8 +--
trunk/libs/math/test/test_rayleigh.cpp | 3
trunk/libs/math/test/test_real_concept_neg_bin.cpp | 4 -
trunk/libs/math/test/test_roots.cpp | 3
trunk/libs/math/test/test_round.cpp | 19 ++++----
trunk/libs/math/test/test_sign.cpp | 3
trunk/libs/math/test/test_students_t.cpp | 3
trunk/libs/math/test/test_toms748_solve.cpp | 7 +-
trunk/libs/math/test/test_triangular.cpp | 16 +++----
trunk/libs/math/test/test_uniform.cpp | 3
trunk/libs/math/test/test_weibull.cpp | 3
trunk/libs/math/tools/Jamfile.v2 | 2
trunk/libs/math/tools/bessel_data.cpp | 2
trunk/libs/math/tools/generate_rational_code.cpp | 2
trunk/libs/math/tools/generate_test_values.cpp | 2
trunk/libs/math/tools/igamma_temme_large_coef.cpp | 2
trunk/libs/math/tools/lanczos_generator.cpp | 2
trunk/libs/multi_index/example/hashed.cpp | 8 +-
trunk/libs/multi_index/example/sequenced.cpp | 6 +-
trunk/libs/multi_index/perf/test_perf.cpp | 12 ++--
trunk/libs/numeric/conversion/test/bounds_test.cpp | 4
trunk/libs/numeric/conversion/test/converter_test.cpp | 4
trunk/libs/numeric/conversion/test/traits_test.cpp | 4
trunk/libs/numeric/conversion/test/udt_example_0.cpp | 4
trunk/libs/numeric/conversion/test/udt_support_test.cpp | 4
trunk/libs/numeric/interval/examples/newton-raphson.cpp | 6 +-
trunk/libs/property_tree/examples/empty_ptree_trick.cpp | 2
trunk/libs/proto/test/toy_spirit2.cpp | 2
trunk/libs/random/test/histogram.cpp | 10 ++--
trunk/libs/random/test/statistic_tests.cpp | 2
trunk/libs/random/test/test_binomial.cpp | 4
trunk/libs/random/test/test_chi_squared.cpp | 4
trunk/libs/random/test/test_discrete.cpp | 4
trunk/libs/random/test/test_extreme_value.cpp | 4
trunk/libs/random/test/test_fisher_f.cpp | 4
trunk/libs/random/test/test_gamma.cpp | 4
trunk/libs/random/test/test_negative_binomial.cpp | 4
trunk/libs/random/test/test_normal.cpp | 4
trunk/libs/random/test/test_piecewise_constant.cpp | 4
trunk/libs/random/test/test_piecewise_linear.cpp | 4
trunk/libs/random/test/test_poisson.cpp | 4
trunk/libs/random/test/test_student_t.cpp | 4
trunk/libs/random/test/test_weibull.cpp | 4
trunk/libs/regex/performance/command_line.cpp | 6 +-
trunk/libs/serialization/example/demo.cpp | 2
trunk/libs/serialization/example/demo_gps.hpp | 2
trunk/libs/serialization/example/demo_shared_ptr.cpp | 2
trunk/libs/serialization/example/demo_xml.cpp | 2
trunk/libs/serialization/example/demo_xml.hpp | 2
trunk/libs/spirit/optimization/karma/format_performance.cpp | 8 +-
trunk/libs/spirit/optimization/karma/sequence_performance.cpp | 4
trunk/libs/spirit/test/karma/test.hpp | 4
trunk/libs/statechart/example/BitMachine/BitMachine.cpp | 4
trunk/libs/statechart/example/Handcrafted/Handcrafted.cpp | 2
trunk/libs/statechart/example/Keyboard/Keyboard.cpp | 6 +-
trunk/libs/statechart/example/Performance/Performance.cpp | 8 +-
trunk/libs/test/build/Jamfile.v2 | 3
trunk/libs/test/example/unit_test_example_10.cpp | 2
trunk/libs/test/test/Jamfile.v2 | 1
trunk/libs/test/test/basic_cstring_test.cpp | 8 +-
trunk/libs/test/test/output_test_stream_test.cpp | 4
trunk/libs/test/test/test_tools_test.cpp | 4
trunk/libs/tuple/test/io_test.cpp | 4
trunk/libs/units/example/measurement.hpp | 2
trunk/libs/units/example/performance.cpp | 8 +-
trunk/libs/units/example/temperature.cpp | 2
trunk/libs/utility/call_traits_test.cpp | 2
trunk/libs/uuid/test/test_io.cpp | 10 ++--
trunk/libs/wave/samples/cpp_tokens/slex_token.hpp | 8 +-
trunk/libs/wave/samples/lexed_tokens/lexed_tokens.cpp | 11 ++--
trunk/libs/wave/samples/real_positions/real_positions.cpp | 15 +++---
trunk/libs/xpressive/example/main.cpp | 2
trunk/libs/xpressive/perf/command_line.cpp | 8 +-
255 files changed, 929 insertions(+), 1060 deletions(-)
Modified: trunk/boost/archive/basic_text_oprimitive.hpp
==============================================================================
--- trunk/boost/archive/basic_text_oprimitive.hpp (original)
+++ trunk/boost/archive/basic_text_oprimitive.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -24,7 +24,7 @@
// in such cases. So we can't use basic_ostream<OStream::char_type> but rather
// use two template parameters
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <locale>
#include <boost/config/no_tr1/cmath.hpp> // isnan
#include <boost/assert.hpp>
@@ -130,7 +130,7 @@
boost::serialization::throw_exception(
archive_exception(archive_exception::output_stream_error)
);
- os << boost::detail::setprecision(std::numeric_limits<float>::digits10 + 2);
+ os << std::setprecision(std::numeric_limits<float>::digits10 + 2);
os << t;
}
void save(const double t)
@@ -140,7 +140,7 @@
boost::serialization::throw_exception(
archive_exception(archive_exception::output_stream_error)
);
- os << boost::detail::setprecision(std::numeric_limits<double>::digits10 + 2);
+ os << std::setprecision(std::numeric_limits<double>::digits10 + 2);
os << t;
}
BOOST_ARCHIVE_OR_WARCHIVE_DECL(BOOST_PP_EMPTY())
Modified: trunk/boost/archive/impl/xml_oarchive_impl.ipp
==============================================================================
--- trunk/boost/archive/impl/xml_oarchive_impl.ipp (original)
+++ trunk/boost/archive/impl/xml_oarchive_impl.ipp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -7,7 +7,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
#include <ostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <algorithm>
#include <string>
Modified: trunk/boost/config/compiler/gcc.hpp
==============================================================================
--- trunk/boost/config/compiler/gcc.hpp (original)
+++ trunk/boost/config/compiler/gcc.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -13,8 +13,6 @@
// GNU C++ compiler setup:
-#define BOOST_GCC 1
-
#if __GNUC__ < 3
# if __GNUC_MINOR__ == 91
// egcs 1.1 won't parse shared_ptr.hpp without this:
Modified: trunk/boost/date_time/date_formatting.hpp
==============================================================================
--- trunk/boost/date_time/date_formatting.hpp (original)
+++ trunk/boost/date_time/date_formatting.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -13,7 +13,7 @@
#include "boost/date_time/compiler_config.hpp"
#include <string>
#include <sstream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
/* NOTE: "formatter" code for older compilers, ones that define
* BOOST_DATE_TIME_INCLUDE_LIMITED_HEADERS, is located in
@@ -51,7 +51,7 @@
}
case month_as_integer:
{
- os << boost::detail::setw(2) << boost::detail::setfill(os.widen('0')) << month.as_number();
+ os << std::setw(2) << std::setfill(os.widen('0')) << month.as_number();
break;
}
@@ -88,7 +88,7 @@
if (format_type::has_date_sep_chars()) {
ss << format_type::day_sep_char();
}
- ss << boost::detail::setw(2) << boost::detail::setfill(ss.widen('0'))
+ ss << std::setw(2) << std::setfill(ss.widen('0'))
<< ymd.day;
return ss.str();
}
Modified: trunk/boost/date_time/date_formatting_limited.hpp
==============================================================================
--- trunk/boost/date_time/date_formatting_limited.hpp (original)
+++ trunk/boost/date_time/date_formatting_limited.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -13,7 +13,7 @@
#include "boost/date_time/compiler_config.hpp"
#include <string>
#include <sstream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
namespace boost {
@@ -46,7 +46,7 @@
}
case month_as_integer:
{
- os << boost::detail::setw(2) << boost::detail::setfill('0') << month.as_number();
+ os << std::setw(2) << std::setfill('0') << month.as_number();
break;
}
@@ -83,7 +83,7 @@
if (format_type::has_date_sep_chars()) {
ss << format_type::day_sep_char();
}
- ss << boost::detail::setw(2) << boost::detail::setfill('0')
+ ss << std::setw(2) << std::setfill('0')
<< ymd.day;
return ss.str();
}
Modified: trunk/boost/date_time/date_formatting_locales.hpp
==============================================================================
--- trunk/boost/date_time/date_formatting_locales.hpp (original)
+++ trunk/boost/date_time/date_formatting_locales.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -19,7 +19,7 @@
#include "boost/date_time/parse_format_base.hpp"
//#include <string>
#include <sstream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
namespace boost {
@@ -57,7 +57,7 @@
case month_as_integer:
{
charT fill_char = '0';
- os << boost::detail::setw(2) << boost::detail::setfill(fill_char) << month.as_number();
+ os << std::setw(2) << std::setfill(fill_char) << month.as_number();
break;
}
@@ -144,7 +144,7 @@
if (f.has_date_sep_chars()) {
f.day_sep_char(oitr);
}
- os << boost::detail::setw(2) << boost::detail::setfill(fill_char)
+ os << std::setw(2) << std::setfill(fill_char)
<< ymd.day;
break;
}
@@ -153,7 +153,7 @@
if (f.has_date_sep_chars()) {
f.day_sep_char(oitr);
}
- os << boost::detail::setw(2) << boost::detail::setfill(fill_char)
+ os << std::setw(2) << std::setfill(fill_char)
<< ymd.day;
if (f.has_date_sep_chars()) {
f.month_sep_char(oitr);
@@ -162,7 +162,7 @@
break;
}
case ymd_order_dmy: {
- os << boost::detail::setw(2) << boost::detail::setfill(fill_char)
+ os << std::setw(2) << std::setfill(fill_char)
<< ymd.day;
if (f.has_date_sep_chars()) {
f.day_sep_char(oitr);
Modified: trunk/boost/date_time/gregorian/formatters.hpp
==============================================================================
--- trunk/boost/date_time/gregorian/formatters.hpp (original)
+++ trunk/boost/date_time/gregorian/formatters.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -107,10 +107,10 @@
date::ymd_type ymd = d.year_month_day();
std::basic_ostringstream<charT> ss;
ss << ymd.year << "-"
- << boost::detail::setw(2) << boost::detail::setfill(ss.widen('0'))
+ << std::setw(2) << std::setfill(ss.widen('0'))
<< ymd.month.as_number() //solves problem with gcc 3.1 hanging
<< "-"
- << boost::detail::setw(2) << boost::detail::setfill(ss.widen('0'))
+ << std::setw(2) << std::setfill(ss.widen('0'))
<< ymd.day;
return ss.str();
}
Modified: trunk/boost/date_time/gregorian/formatters_limited.hpp
==============================================================================
--- trunk/boost/date_time/gregorian/formatters_limited.hpp (original)
+++ trunk/boost/date_time/gregorian/formatters_limited.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -65,10 +65,10 @@
date::ymd_type ymd = d.year_month_day();
std::ostringstream ss;
ss << ymd.year << "-"
- << boost::detail::setw(2) << boost::detail::setfill('0')
+ << std::setw(2) << std::setfill('0')
<< ymd.month.as_number() //solves problem with gcc 3.1 hanging
<< "-"
- << boost::detail::setw(2) << boost::detail::setfill('0')
+ << std::setw(2) << std::setfill('0')
<< ymd.day;
return ss.str();
}
Modified: trunk/boost/date_time/gregorian/greg_facet.hpp
==============================================================================
--- trunk/boost/date_time/gregorian/greg_facet.hpp (original)
+++ trunk/boost/date_time/gregorian/greg_facet.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -76,7 +76,7 @@
}
else { //default to numeric
charT fill_char = '0';
- os << boost::detail::setw(2) << boost::detail::setfill(fill_char) << m.as_number();
+ os << std::setw(2) << std::setfill(fill_char) << m.as_number();
}
return os;
@@ -141,7 +141,7 @@
std::basic_ostream<charT, traits>&
operator<<(std::basic_ostream<charT, traits>& os, const partial_date& pd)
{
- os << boost::detail::setw(2) << boost::detail::setfill('0') << pd.day() << ' '
+ os << std::setw(2) << std::setfill('0') << pd.day() << ' '
<< pd.month().as_short_string() ;
return os;
}
Modified: trunk/boost/date_time/local_time/custom_time_zone.hpp
==============================================================================
--- trunk/boost/date_time/local_time/custom_time_zone.hpp (original)
+++ trunk/boost/date_time/local_time/custom_time_zone.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -106,15 +106,15 @@
// offset
if(base_utc_offset().is_negative()) {
// inverting the sign guarantees we get two digits
- ss << '-' << boost::detail::setw(2) << base_utc_offset().invert_sign().hours();
+ ss << '-' << std::setw(2) << base_utc_offset().invert_sign().hours();
}
else {
- ss << '+' << boost::detail::setw(2) << base_utc_offset().hours();
+ ss << '+' << std::setw(2) << base_utc_offset().hours();
}
if(base_utc_offset().minutes() != 0 || base_utc_offset().seconds() != 0) {
- ss << ':' << boost::detail::setw(2) << base_utc_offset().minutes();
+ ss << ':' << std::setw(2) << base_utc_offset().minutes();
if(base_utc_offset().seconds() != 0) {
- ss << ':' << boost::detail::setw(2) << base_utc_offset().seconds();
+ ss << ':' << std::setw(2) << base_utc_offset().seconds();
}
}
if(dst_calc_rules_ != no_rules) {
@@ -123,30 +123,30 @@
// dst offset
if(dst_offset().is_negative()) {
// inverting the sign guarantees we get two digits
- ss << '-' << boost::detail::setw(2) << dst_offset().invert_sign().hours();
+ ss << '-' << std::setw(2) << dst_offset().invert_sign().hours();
}
else {
- ss << '+' << boost::detail::setw(2) << dst_offset().hours();
+ ss << '+' << std::setw(2) << dst_offset().hours();
}
if(dst_offset().minutes() != 0 || dst_offset().seconds() != 0) {
- ss << ':' << boost::detail::setw(2) << dst_offset().minutes();
+ ss << ':' << std::setw(2) << dst_offset().minutes();
if(dst_offset().seconds() != 0) {
- ss << ':' << boost::detail::setw(2) << dst_offset().seconds();
+ ss << ':' << std::setw(2) << dst_offset().seconds();
}
}
// start/time
ss << ',' << date_time::convert_string_type<char, char_type>(dst_calc_rules_->start_rule_as_string()) << '/'
- << boost::detail::setw(2) << dst_offsets_.dst_start_offset_.hours() << ':'
- << boost::detail::setw(2) << dst_offsets_.dst_start_offset_.minutes();
+ << std::setw(2) << dst_offsets_.dst_start_offset_.hours() << ':'
+ << std::setw(2) << dst_offsets_.dst_start_offset_.minutes();
if(dst_offsets_.dst_start_offset_.seconds() != 0) {
- ss << ':' << boost::detail::setw(2) << dst_offsets_.dst_start_offset_.seconds();
+ ss << ':' << std::setw(2) << dst_offsets_.dst_start_offset_.seconds();
}
// end/time
ss << ',' << date_time::convert_string_type<char, char_type>(dst_calc_rules_->end_rule_as_string()) << '/'
- << boost::detail::setw(2) << dst_offsets_.dst_end_offset_.hours() << ':'
- << boost::detail::setw(2) << dst_offsets_.dst_end_offset_.minutes();
+ << std::setw(2) << dst_offsets_.dst_end_offset_.hours() << ':'
+ << std::setw(2) << dst_offsets_.dst_end_offset_.minutes();
if(dst_offsets_.dst_end_offset_.seconds() != 0) {
- ss << ':' << boost::detail::setw(2) << dst_offsets_.dst_end_offset_.seconds();
+ ss << ':' << std::setw(2) << dst_offsets_.dst_end_offset_.seconds();
}
}
Modified: trunk/boost/date_time/local_time/local_date_time.hpp
==============================================================================
--- trunk/boost/date_time/local_time/local_date_time.hpp (original)
+++ trunk/boost/date_time/local_time/local_date_time.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -9,7 +9,7 @@
*/
#include <string>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <sstream>
#include <stdexcept>
#include <boost/shared_ptr.hpp>
@@ -510,10 +510,10 @@
else {
ss << "+";
}
- ss << boost::detail::setw(2) << boost::detail::setfill('0')
+ ss << std::setw(2) << std::setfill('0')
<< date_time::absolute_value(td.hours())
<< separator
- << boost::detail::setw(2) << boost::detail::setfill('0')
+ << std::setw(2) << std::setfill('0')
<< date_time::absolute_value(td.minutes());
return ss.str();
}
Modified: trunk/boost/date_time/local_time/posix_time_zone.hpp
==============================================================================
--- trunk/boost/date_time/local_time/posix_time_zone.hpp (original)
+++ trunk/boost/date_time/local_time/posix_time_zone.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -190,15 +190,15 @@
// offset
if(base_utc_offset().is_negative()) {
// inverting the sign guarantees we get two digits
- ss << '-' << boost::detail::setw(2) << base_utc_offset().invert_sign().hours();
+ ss << '-' << std::setw(2) << base_utc_offset().invert_sign().hours();
}
else {
- ss << '+' << boost::detail::setw(2) << base_utc_offset().hours();
+ ss << '+' << std::setw(2) << base_utc_offset().hours();
}
if(base_utc_offset().minutes() != 0 || base_utc_offset().seconds() != 0) {
- ss << ':' << boost::detail::setw(2) << base_utc_offset().minutes();
+ ss << ':' << std::setw(2) << base_utc_offset().minutes();
if(base_utc_offset().seconds() != 0) {
- ss << ':' << boost::detail::setw(2) << base_utc_offset().seconds();
+ ss << ':' << std::setw(2) << base_utc_offset().seconds();
}
}
if(dst_calc_rules_ != no_rules) {
@@ -207,30 +207,30 @@
// dst offset
if(dst_offset().is_negative()) {
// inverting the sign guarantees we get two digits
- ss << '-' << boost::detail::setw(2) << dst_offset().invert_sign().hours();
+ ss << '-' << std::setw(2) << dst_offset().invert_sign().hours();
}
else {
- ss << '+' << boost::detail::setw(2) << dst_offset().hours();
+ ss << '+' << std::setw(2) << dst_offset().hours();
}
if(dst_offset().minutes() != 0 || dst_offset().seconds() != 0) {
- ss << ':' << boost::detail::setw(2) << dst_offset().minutes();
+ ss << ':' << std::setw(2) << dst_offset().minutes();
if(dst_offset().seconds() != 0) {
- ss << ':' << boost::detail::setw(2) << dst_offset().seconds();
+ ss << ':' << std::setw(2) << dst_offset().seconds();
}
}
// start/time
ss << ',' << date_time::convert_string_type<char, char_type>(dst_calc_rules_->start_rule_as_string()) << '/'
- << boost::detail::setw(2) << dst_offsets_.dst_start_offset_.hours() << ':'
- << boost::detail::setw(2) << dst_offsets_.dst_start_offset_.minutes();
+ << std::setw(2) << dst_offsets_.dst_start_offset_.hours() << ':'
+ << std::setw(2) << dst_offsets_.dst_start_offset_.minutes();
if(dst_offsets_.dst_start_offset_.seconds() != 0) {
- ss << ':' << boost::detail::setw(2) << dst_offsets_.dst_start_offset_.seconds();
+ ss << ':' << std::setw(2) << dst_offsets_.dst_start_offset_.seconds();
}
// end/time
ss << ',' << date_time::convert_string_type<char, char_type>(dst_calc_rules_->end_rule_as_string()) << '/'
- << boost::detail::setw(2) << dst_offsets_.dst_end_offset_.hours() << ':'
- << boost::detail::setw(2) << dst_offsets_.dst_end_offset_.minutes();
+ << std::setw(2) << dst_offsets_.dst_end_offset_.hours() << ':'
+ << std::setw(2) << dst_offsets_.dst_end_offset_.minutes();
if(dst_offsets_.dst_end_offset_.seconds() != 0) {
- ss << ':' << boost::detail::setw(2) << dst_offsets_.dst_end_offset_.seconds();
+ ss << ':' << std::setw(2) << dst_offsets_.dst_end_offset_.seconds();
}
}
Modified: trunk/boost/date_time/posix_time/time_formatters.hpp
==============================================================================
--- trunk/boost/date_time/posix_time/time_formatters.hpp (original)
+++ trunk/boost/date_time/posix_time/time_formatters.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -57,11 +57,11 @@
if(td.is_negative()) {
ss << '-';
}
- ss << boost::detail::setw(2) << boost::detail::setfill(fill_char)
+ ss << std::setw(2) << std::setfill(fill_char)
<< date_time::absolute_value(td.hours()) << ":";
- ss << boost::detail::setw(2) << boost::detail::setfill(fill_char)
+ ss << std::setw(2) << std::setfill(fill_char)
<< date_time::absolute_value(td.minutes()) << ":";
- ss << boost::detail::setw(2) << boost::detail::setfill(fill_char)
+ ss << std::setw(2) << std::setfill(fill_char)
<< date_time::absolute_value(td.seconds());
//TODO the following is totally non-generic, yelling FIXME
#if (defined(BOOST_MSVC) && (_MSC_VER < 1300))
@@ -75,8 +75,8 @@
date_time::absolute_value(td.fractional_seconds());
#endif
if (frac_sec != 0) {
- ss << "." << boost::detail::setw(time_duration::num_fractional_digits())
- << boost::detail::setfill(fill_char)
+ ss << "." << std::setw(time_duration::num_fractional_digits())
+ << std::setfill(fill_char)
// JDG [7/6/02 VC++ compatibility]
#if (defined(BOOST_MSVC) && (_MSC_VER < 1300))
@@ -126,11 +126,11 @@
if(td.is_negative()) {
ss << '-';
}
- ss << boost::detail::setw(2) << boost::detail::setfill(fill_char)
+ ss << std::setw(2) << std::setfill(fill_char)
<< date_time::absolute_value(td.hours());
- ss << boost::detail::setw(2) << boost::detail::setfill(fill_char)
+ ss << std::setw(2) << std::setfill(fill_char)
<< date_time::absolute_value(td.minutes());
- ss << boost::detail::setw(2) << boost::detail::setfill(fill_char)
+ ss << std::setw(2) << std::setfill(fill_char)
<< date_time::absolute_value(td.seconds());
//TODO the following is totally non-generic, yelling FIXME
#if (defined(BOOST_MSVC) && (_MSC_VER < 1300))
@@ -144,8 +144,8 @@
date_time::absolute_value(td.fractional_seconds());
#endif
if (frac_sec != 0) {
- ss << "." << boost::detail::setw(time_duration::num_fractional_digits())
- << boost::detail::setfill(fill_char)
+ ss << "." << std::setw(time_duration::num_fractional_digits())
+ << std::setfill(fill_char)
// JDG [7/6/02 VC++ compatibility]
#if (defined(BOOST_MSVC) && (_MSC_VER < 1300))
Modified: trunk/boost/date_time/posix_time/time_formatters_limited.hpp
==============================================================================
--- trunk/boost/date_time/posix_time/time_formatters_limited.hpp (original)
+++ trunk/boost/date_time/posix_time/time_formatters_limited.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -50,11 +50,11 @@
if(td.is_negative()) {
ss << '-';
}
- ss << boost::detail::setw(2) << boost::detail::setfill('0')
+ ss << std::setw(2) << std::setfill('0')
<< date_time::absolute_value(td.hours()) << ":";
- ss << boost::detail::setw(2) << boost::detail::setfill('0')
+ ss << std::setw(2) << std::setfill('0')
<< date_time::absolute_value(td.minutes()) << ":";
- ss << boost::detail::setw(2) << boost::detail::setfill('0')
+ ss << std::setw(2) << std::setfill('0')
<< date_time::absolute_value(td.seconds());
//TODO the following is totally non-generic, yelling FIXME
#if (defined(BOOST_MSVC) && (_MSC_VER < 1300))
@@ -68,8 +68,8 @@
date_time::absolute_value(td.fractional_seconds());
#endif
if (frac_sec != 0) {
- ss << "." << boost::detail::setw(time_duration::num_fractional_digits())
- << boost::detail::setfill('0')
+ ss << "." << std::setw(time_duration::num_fractional_digits())
+ << std::setfill('0')
// JDG [7/6/02 VC++ compatibility]
#if (defined(BOOST_MSVC) && (_MSC_VER < 1300))
@@ -113,11 +113,11 @@
if(td.is_negative()) {
ss << '-';
}
- ss << boost::detail::setw(2) << boost::detail::setfill('0')
+ ss << std::setw(2) << std::setfill('0')
<< date_time::absolute_value(td.hours());
- ss << boost::detail::setw(2) << boost::detail::setfill('0')
+ ss << std::setw(2) << std::setfill('0')
<< date_time::absolute_value(td.minutes());
- ss << boost::detail::setw(2) << boost::detail::setfill('0')
+ ss << std::setw(2) << std::setfill('0')
<< date_time::absolute_value(td.seconds());
//TODO the following is totally non-generic, yelling FIXME
#if (defined(BOOST_MSVC) && (_MSC_VER < 1300))
@@ -131,8 +131,8 @@
date_time::absolute_value(td.fractional_seconds());
#endif
if (frac_sec != 0) {
- ss << "." << boost::detail::setw(time_duration::num_fractional_digits())
- << boost::detail::setfill('0')
+ ss << "." << std::setw(time_duration::num_fractional_digits())
+ << std::setfill('0')
// JDG [7/6/02 VC++ compatibility]
#if (defined(BOOST_MSVC) && (_MSC_VER < 1300))
Modified: trunk/boost/date_time/time_facet.hpp
==============================================================================
--- trunk/boost/date_time/time_facet.hpp (original)
+++ trunk/boost/date_time/time_facet.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -15,7 +15,7 @@
#include <limits>
#include <string>
#include <sstream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <iterator> // i/ostreambuf_iterator
#include <exception>
#include <boost/assert.hpp>
@@ -578,8 +578,8 @@
{
std::basic_ostringstream<char_type> ss;
ss.imbue(std::locale::classic()); // don't want any formatting
- ss << boost::detail::setw(width)
- << boost::detail::setfill(static_cast<char_type>('0'));
+ ss << std::setw(width)
+ << std::setfill(static_cast<char_type>('0'));
#if (defined(BOOST_MSVC) && (_MSC_VER < 1300))
// JDG [7/6/02 VC++ compatibility]
char_type buff[34];
Modified: trunk/boost/date_time/time_formatting_streams.hpp
==============================================================================
--- trunk/boost/date_time/time_formatting_streams.hpp (original)
+++ trunk/boost/date_time/time_formatting_streams.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -14,7 +14,7 @@
#ifndef BOOST_DATE_TIME_NO_LOCALE
#include <locale>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <iostream>
#include <boost/date_time/date_formatting_locales.hpp>
#include <boost/date_time/time_resolution_traits.hpp>
@@ -44,18 +44,18 @@
if(td.is_negative()) {
os << '-';
}
- os << boost::detail::setw(2) << boost::detail::setfill(fill_char)
+ os << std::setw(2) << std::setfill(fill_char)
<< absolute_value(td.hours()) << ":";
- os << boost::detail::setw(2) << boost::detail::setfill(fill_char)
+ os << std::setw(2) << std::setfill(fill_char)
<< absolute_value(td.minutes()) << ":";
- os << boost::detail::setw(2) << boost::detail::setfill(fill_char)
+ os << std::setw(2) << std::setfill(fill_char)
<< absolute_value(td.seconds());
fractional_seconds_type frac_sec =
absolute_value(td.fractional_seconds());
if (frac_sec != 0) {
os << "."
- << boost::detail::setw(time_duration_type::num_fractional_digits())
- << boost::detail::setfill(fill_char)
+ << std::setw(time_duration_type::num_fractional_digits())
+ << std::setfill(fill_char)
<< frac_sec;
}
} // else
Deleted: trunk/boost/detail/iomanip.hpp
==============================================================================
--- trunk/boost/detail/iomanip.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
+++ (empty file)
@@ -1,246 +0,0 @@
-/*==============================================================================
- Copyright (c) 2010-2011 Bryce Lelbach
-
- 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)
-==============================================================================*/
-
-#ifndef BOOST_DETAIL_IOMANIP_HPP
-#define BOOST_DETAIL_IOMANIP_HPP
-
-#include <boost/config.hpp>
-
-#if (defined(BOOST_CLANG) || defined(BOOST_INTEL_LINUX)) && \
- defined(BOOST_GNU_STDLIB)
- #include <ios>
- #include <istream>
- #include <ostream>
-
- namespace boost {
- namespace detail {
-
- //[resetiosflags
- class resetiosflags_manip {
- private:
- std::ios_base::fmtflags mask;
-
- public:
- explicit resetiosflags_manip (std::ios_base::fmtflags m):
- mask(m) { }
-
- template<class CharT, class Traits>
- friend std::basic_istream<CharT, Traits>&
- operator>> (std::basic_istream<CharT, Traits>& is,
- resetiosflags_manip const& x)
- {
- is.unsetf(x.mask);
- return is;
- }
-
- template<class CharT, class Traits>
- friend std::basic_ostream<CharT, Traits>&
- operator<< (std::basic_ostream<CharT, Traits>& os,
- resetiosflags_manip const& x)
- {
- os.unsetf(x.mask);
- return os;
- }
- };
-
- inline resetiosflags_manip resetiosflags (std::ios_base::fmtflags mask) {
- return resetiosflags_manip(mask);
- }
- //]
-
- //[setiosflags
- class setiosflags_manip {
- private:
- std::ios_base::fmtflags mask;
-
- public:
- explicit setiosflags_manip (std::ios_base::fmtflags m):
- mask(m) { }
-
- template<class CharT, class Traits>
- friend std::basic_istream<CharT, Traits>&
- operator>> (std::basic_istream<CharT, Traits>& is,
- setiosflags_manip const& x) {
- is.setf(x.mask);
- return is;
- }
-
- template<class CharT, class Traits>
- friend std::basic_ostream<CharT, Traits>&
- operator<< (std::basic_ostream<CharT, Traits>& os,
- setiosflags_manip const& x) {
- os.setf(x.mask);
- return os;
- }
- };
-
- inline setiosflags_manip setiosflags (std::ios_base::fmtflags mask) {
- return setiosflags_manip(mask);
- }
- //]
-
- //[setbase
- class setbase_manip {
- private:
- int base;
-
- public:
- explicit setbase_manip (int b):
- base(b) { }
-
- template<class CharT, class Traits>
- friend std::basic_istream<CharT, Traits>&
- operator>> (std::basic_istream<CharT, Traits>& is, setbase_manip const& x) {
- using namespace std;
- switch (x.base) {
- case 8:
- is << std::oct;
- return is;
- case 10:
- is << std::dec;
- return is;
- case 16:
- is << std::hex;
- return is;
- default:
- is.setf(ios_base::fmtflags(0), ios_base::basefield);
- return is;
- }
- }
-
- template <class CharT, class Traits>
- friend std::basic_ostream<CharT, Traits>&
- operator<< (std::basic_ostream<CharT, Traits>& os, setbase_manip const& x) {
- using namespace std;
- switch (x.base) {
- case 8:
- os << std::oct;
- return os;
- case 10:
- os << std::dec;
- return os;
- case 16:
- os << std::hex;
- return os;
- default:
- os.setf(ios_base::fmtflags(0), ios_base::basefield);
- return os;
- }
- }
- };
-
- inline setbase_manip setbase (int base) {
- return setbase_manip(base);
- }
- //]
-
- //[setfill
- template<class CharT>
- class setfill_manip {
- private:
- CharT fill;
-
- public:
- explicit setfill_manip (CharT c):
- fill(c) { }
-
- template<class Traits>
- friend std::basic_ostream<CharT, Traits>&
- operator<< (std::basic_ostream<CharT, Traits>& os, setfill_manip const& x) {
- os.fill(x.fill);
- return os;
- }
- };
-
- template<class CharT>
- inline setfill_manip<CharT> setfill (CharT c) {
- return setfill_manip<CharT>(c);
- }
- //]
-
- //[setprecision
- class setprecision_manip {
- private:
- int n;
-
- public:
- explicit setprecision_manip (int n_):
- n(n_) { }
-
- template<class CharT, class Traits>
- friend std::basic_istream<CharT, Traits>&
- operator>> (std::basic_istream<CharT, Traits>& is,
- setprecision_manip const& x) {
- is.precision(x.n);
- return is;
- }
-
- template<class CharT, class Traits>
- friend std::basic_ostream<CharT, Traits>&
- operator<< (std::basic_ostream<CharT, Traits>& os,
- setprecision_manip const& x) {
- os.precision(x.n);
- return os;
- }
- };
-
- inline setprecision_manip setprecision (int n_) {
- return setprecision_manip(n_);
- }
- //]
-
- //[setw
- class setw_manip {
- private:
- int n;
-
- public:
- explicit setw_manip (int n_):
- n(n_) { }
-
- template<class CharT, class Traits>
- friend std::basic_istream<CharT, Traits>&
- operator>> (std::basic_istream<CharT, Traits>& is, setw_manip const& x) {
- is.width(x.n);
- return is;
- }
-
- template <class CharT, class Traits>
- friend std::basic_ostream<CharT, Traits>&
- operator<< (std::basic_ostream<CharT, Traits>& os, setw_manip const& x) {
- os.width(x.n);
- return os;
- }
- };
-
- inline setw_manip setw (int n_) {
- return setw_manip(n_);
- }
- //]
-
- } // detail
- } // boost
-
-#else
- #include <iomanip>
-
- namespace boost {
- namespace detail {
-
- using ::std::resetiosflags;
- using ::std::setiosflags;
- using ::std::setbase;
- using ::std::setfill;
- using ::std::setprecision;
- using ::std::setw;
-
- } // detail
- } // boost
-
-#endif
-
-#endif // BOOST_DETAIL_IOMANIP_HPP
Modified: trunk/boost/exception/detail/object_hex_dump.hpp
==============================================================================
--- trunk/boost/exception/detail/object_hex_dump.hpp (original)
+++ trunk/boost/exception/detail/object_hex_dump.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -13,7 +13,7 @@
#endif
#include <boost/exception/detail/type_info.hpp>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <ios>
#include <string>
#include <sstream>
@@ -36,9 +36,9 @@
s.fill('0');
s.width(2);
unsigned char const * b=reinterpret_cast<unsigned char const *>(&x);
- s << boost::detail::setw(2) << std::hex << (unsigned int)*b;
+ s << std::setw(2) << std::hex << (unsigned int)*b;
for( unsigned char const * e=b+n; ++b!=e; )
- s << " " << boost::detail::setw(2) << std::hex << (unsigned int)*b;
+ s << " " << std::setw(2) << std::hex << (unsigned int)*b;
return s.str();
}
}
Modified: trunk/boost/geometry/extensions/contrib/ttmath/ttmathuint.h
==============================================================================
--- trunk/boost/geometry/extensions/contrib/ttmath/ttmathuint.h (original)
+++ trunk/boost/geometry/extensions/contrib/ttmath/ttmathuint.h 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -47,7 +47,7 @@
*/
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include "ttmathtypes.h"
@@ -102,12 +102,12 @@
int c = 1;
for(int i=value_size-1 ; i>=0 ; --i)
{
- output << "0x" << boost::detail::setfill('0');
+ output << "0x" << std::setfill('0');
#ifdef TTMATH_PLATFORM32
- output << boost::detail::setw(8);
+ output << std::setw(8);
#else
- output << boost::detail::setw(16);
+ output << std::setw(16);
#endif
output << std::hex << table[i];
Modified: trunk/boost/geometry/extensions/gis/io/wkb/utility.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/io/wkb/utility.hpp (original)
+++ trunk/boost/geometry/extensions/gis/io/wkb/utility.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -8,7 +8,7 @@
#ifndef BOOST_GEOMETRY_IO_WKB_UTILITY_HPP
#define BOOST_GEOMETRY_IO_WKB_UTILITY_HPP
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <iterator>
#include <sstream>
#include <string>
@@ -71,7 +71,7 @@
hexbyte[0] = hexalpha[(byte >> 4) & 0xf];
hexbyte[1] = hexalpha[byte & 0xf];
hexbyte[2] = '\0';
- oss << boost::detail::setw(2) << hexbyte;
+ oss << std::setw(2) << hexbyte;
++it;
}
Modified: trunk/boost/graph/accounting.hpp
==============================================================================
--- trunk/boost/graph/accounting.hpp (original)
+++ trunk/boost/graph/accounting.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -9,7 +9,7 @@
#ifndef BOOST_GRAPH_ACCOUNTING_HPP
#define BOOST_GRAPH_ACCOUNTING_HPP
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <iostream>
#include <string>
#include <sstream>
@@ -27,7 +27,7 @@
inline std::string print_time(time_type t)
{
std::ostringstream out;
- out << boost::detail::setiosflags(std::ios::fixed) << boost::detail::setprecision(2) << t;
+ out << std::setiosflags(std::ios::fixed) << std::setprecision(2) << t;
return out.str();
}
Modified: trunk/boost/graph/distributed/hohberg_biconnected_components.hpp
==============================================================================
--- trunk/boost/graph/distributed/hohberg_biconnected_components.hpp (original)
+++ trunk/boost/graph/distributed/hohberg_biconnected_components.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -611,7 +611,7 @@
BGL_FORALL_OUTEDGES_T(alpha, e, g, Graph) {
per_edge_data& edata = edge_data[idx++];
if (edata.is_tree_edge
- && std::find(edata.M.begin(), edata.M.end(), parent) != edata.M.end()
+ && find(edata.M.begin(), edata.M.end(), parent) != edata.M.end()
&& target(e, g) != parent) {
// Notify our children in the spanning tree of this name
name_header<Edge> header;
@@ -640,7 +640,7 @@
BGL_FORALL_OUTEDGES_T(alpha, e, g, Graph) {
per_edge_data& edata = edge_data[idx++];
if (edata.is_tree_edge
- && std::find(edata.M.begin(), edata.M.end(), parent) == edata.M.end()) {
+ && find(edata.M.begin(), edata.M.end(), parent) == edata.M.end()) {
// Map from local partition numbers to global bicomponent numbers
if (local_to_global_partitions[edata.partition] == not_mapped)
local_to_global_partitions[edata.partition] = result++;
@@ -706,7 +706,7 @@
BGL_FORALL_OUTEDGES_T(alpha, e, g, Graph) {
per_edge_data& edata = edge_data[idx++];
if (edata.is_tree_edge
- && std::find(edata.M.begin(), edata.M.end(), parent) == edata.M.end()) {
+ && find(edata.M.begin(), edata.M.end(), parent) == edata.M.end()) {
// Notify our children in the spanning tree of this new name
name_header<Edge> header;
header.edge = e;
@@ -758,7 +758,7 @@
BGL_FORALL_OUTEDGES_T(alpha, e, g, Graph) {
if (target(e, g) == parent && parent == eta) {
edge_to_parent = e;
- if (std::find(bicomp.begin(), bicomp.end(), alpha) == bicomp.end()) {
+ if (find(bicomp.begin(), bicomp.end(), alpha) == bicomp.end()) {
#if defined(PBGL_HOHBERG_DEBUG) && PBGL_HOHBERG_DEBUG > 1
std::cerr << local(alpha) << '@' << owner(alpha) << ' ';
#endif
@@ -776,7 +776,7 @@
if (pos != edata.msg.path_or_bicomp.end()) {
++pos;
if (pos != edata.msg.path_or_bicomp.end()
- && std::find(bicomp.begin(), bicomp.end(), *pos) == bicomp.end()) {
+ && find(bicomp.begin(), bicomp.end(), *pos) == bicomp.end()) {
#if defined(PBGL_HOHBERG_DEBUG) && PBGL_HOHBERG_DEBUG > 1
std::cerr << local(*pos) << '@' << owner(*pos) << ' ';
#endif
@@ -786,7 +786,7 @@
} else if (edata.msg.is_tree() && edata.msg.gamma == eta) {
for (path_iterator i = edata.msg.path_or_bicomp.begin();
i != edata.msg.path_or_bicomp.end(); ++i) {
- if (std::find(bicomp.begin(), bicomp.end(), *i) == bicomp.end()) {
+ if (find(bicomp.begin(), bicomp.end(), *i) == bicomp.end()) {
#if defined(PBGL_HOHBERG_DEBUG) && PBGL_HOHBERG_DEBUG > 1
std::cerr << local(*i) << '@' << owner(*i) << ' ';
#endif
Modified: trunk/boost/graph/distributed/strong_components.hpp
==============================================================================
--- trunk/boost/graph/distributed/strong_components.hpp (original)
+++ trunk/boost/graph/distributed/strong_components.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -40,11 +40,10 @@
#ifdef PBGL_SCC_DEBUG
#include <iostream>
#include <cstdlib>
- #include <boost/detail/iomanip.hpp>
+ #include <iomanip>
#include <sys/time.h>
#include <boost/graph/distributed/graphviz.hpp> // for ostringstream
#endif
-#include <algorithm>
#include <vector>
#include <map>
#include <boost/graph/parallel/container_traits.hpp>
@@ -689,11 +688,11 @@
vertex_descriptor v = vertex_sets[i][j];
if (get(owner, v) == id) {
boost::tie(estart, eend) = out_edges(v, g);
- while (estart != eend && std::find(vertex_sets[i].begin(), vertex_sets[i].end(),
+ while (estart != eend && find(vertex_sets[i].begin(), vertex_sets[i].end(),
target(*estart,g)) == vertex_sets[i].end()) estart++;
if (estart != eend) {
boost::tie(restart, reend) = out_edges(get(fr, v), gr);
- while (restart != reend && std::find(vertex_sets[i].begin(), vertex_sets[i].end(),
+ while (restart != reend && find(vertex_sets[i].begin(), vertex_sets[i].end(),
get(rf, target(*restart,g))) == vertex_sets[i].end()) restart++;
if (restart != reend)
new_set.push_back(v);
@@ -817,7 +816,7 @@
vertex_iterator vstart, vend;
for( boost::tie(vstart, vend) = vertices(g); vstart != vend; vstart++ )
- if( std::find( my_roots.begin(), my_roots.end(), get(r, *vstart) ) == my_roots.end() )
+ if( find( my_roots.begin(), my_roots.end(), get(r, *vstart) ) == my_roots.end() )
my_roots.push_back( get(r, *vstart) );
all_gather( process_group(g), my_roots.begin(), my_roots.end(), all_roots );
Modified: trunk/boost/math/policies/error_handling.hpp
==============================================================================
--- trunk/boost/math/policies/error_handling.hpp (original)
+++ trunk/boost/math/policies/error_handling.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -9,7 +9,7 @@
#define BOOST_MATH_POLICY_ERROR_HANDLING_HPP
#include <stdexcept>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <string>
#include <cerrno>
#include <boost/config/no_tr1/cmath.hpp>
@@ -108,7 +108,7 @@
msg += message;
int prec = 2 + (boost::math::policies::digits<T, boost::math::policies::policy<> >() * 30103UL) / 100000UL;
- msg = do_format(boost::format(msg), boost::io::group(boost::detail::setprecision(prec), val));
+ msg = do_format(boost::format(msg), boost::io::group(std::setprecision(prec), val));
E e(msg);
boost::throw_exception(e);
Modified: trunk/boost/math/special_functions/gamma.hpp
==============================================================================
--- trunk/boost/math/special_functions/gamma.hpp (original)
+++ trunk/boost/math/special_functions/gamma.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -51,7 +51,7 @@
#ifdef BOOST_MATH_INSTRUMENT
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <typeinfo>
#endif
Modified: trunk/boost/math/tools/config.hpp
==============================================================================
--- trunk/boost/math/tools/config.hpp (original)
+++ trunk/boost/math/tools/config.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -289,7 +289,7 @@
#ifdef BOOST_MATH_INSTRUMENT
#define BOOST_MATH_INSTRUMENT_CODE(x) \
- std::cout << boost::detail::setprecision(35) << __FILE__ << ":" << __LINE__ << " " << x << std::endl;
+ std::cout << std::setprecision(35) << __FILE__ << ":" << __LINE__ << " " << x << std::endl;
#define BOOST_MATH_INSTRUMENT_VARIABLE(name) BOOST_MATH_INSTRUMENT_CODE(BOOST_STRINGIZE(name) << " = " << name)
#else
#define BOOST_MATH_INSTRUMENT_CODE(x)
Modified: trunk/boost/math/tools/precision.hpp
==============================================================================
--- trunk/boost/math/tools/precision.hpp (original)
+++ trunk/boost/math/tools/precision.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -19,7 +19,7 @@
#include <boost/math/policies/policy.hpp>
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
// These two are for LDBL_MAN_DIG:
#include <limits.h>
#include <math.h>
Modified: trunk/boost/math/tools/test.hpp
==============================================================================
--- trunk/boost/math/tools/test.hpp (original)
+++ trunk/boost/math/tools/test.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -156,7 +156,7 @@
{
if(std::numeric_limits<T>::digits10)
{
- std::cout << boost::detail::setprecision(std::numeric_limits<T>::digits10 + 2);
+ std::cout << std::setprecision(std::numeric_limits<T>::digits10 + 2);
}
}
Modified: trunk/boost/property_tree/detail/json_parser_write.hpp
==============================================================================
--- trunk/boost/property_tree/detail/json_parser_write.hpp (original)
+++ trunk/boost/property_tree/detail/json_parser_write.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -15,7 +15,7 @@
#include <boost/type_traits/make_unsigned.hpp>
#include <string>
#include <ostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
namespace boost { namespace property_tree { namespace json_parser
{
Modified: trunk/boost/property_tree/detail/xml_parser_write.hpp
==============================================================================
--- trunk/boost/property_tree/detail/xml_parser_write.hpp (original)
+++ trunk/boost/property_tree/detail/xml_parser_write.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -14,7 +14,7 @@
#include <boost/property_tree/detail/xml_parser_utils.hpp>
#include <string>
#include <ostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
namespace boost { namespace property_tree { namespace xml_parser
{
Modified: trunk/boost/spirit/home/support/char_encoding/unicode/create_tables.cpp
==============================================================================
--- trunk/boost/spirit/home/support/char_encoding/unicode/create_tables.cpp (original)
+++ trunk/boost/spirit/home/support/char_encoding/unicode/create_tables.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -425,7 +425,7 @@
C::size_type size = c.size();
BOOST_ASSERT(size > 1);
print_tab(out, tab);
- out << boost::detail::setw(width) << int(c[0]);
+ out << std::setw(width) << int(c[0]);
for (C::size_type i = 1; i < size; ++i)
{
out << ", ";
@@ -434,7 +434,7 @@
out << std::endl;
print_tab(out, tab);
}
- out << boost::detail::setw(width) << int(c[i]);
+ out << std::setw(width) << int(c[i]);
}
if (trailing_comma)
Modified: trunk/boost/test/impl/exception_safety.ipp
==============================================================================
--- trunk/boost/test/impl/exception_safety.ipp (original)
+++ trunk/boost/test/impl/exception_safety.ipp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -43,8 +43,7 @@
#include <vector>
#include <cstdlib>
#include <map>
-#include <ios>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <cctype>
#include <boost/limits.hpp>
@@ -402,7 +401,7 @@
format_location( wrap_stringstream& formatter, execution_path_point const& /*p*/, unsigned indent )
{
if( indent )
- formatter << std::left << boost::detail::setw( indent ) << "";
+ formatter << std::left << std::setw( indent ) << "";
// !! ?? optional if( p.m_file_name )
// formatter << p.m_file_name << '(' << p.m_line_num << "): ";
Modified: trunk/boost/test/impl/plain_report_formatter.ipp
==============================================================================
--- trunk/boost/test/impl/plain_report_formatter.ipp (original)
+++ trunk/boost/test/impl/plain_report_formatter.ipp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -26,7 +26,7 @@
#include <boost/test/detail/unit_test_parameters.hpp>
// STL
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <boost/config/no_tr1/cmath.hpp>
#include <iostream>
@@ -64,7 +64,7 @@
const_string name, const_string res )
{
if( v > 0 ) {
- ostr << boost::detail::setw( indent ) << ""
+ ostr << std::setw( indent ) << ""
<< v << ' ' << name << ( v != 1 ? "s" : "" );
if( total > 0 )
ostr << " out of " << total;
@@ -114,7 +114,7 @@
else
descr = "failed";
- ostr << boost::detail::setw( m_indent ) << ""
+ ostr << std::setw( m_indent ) << ""
<< "Test " << (tu.p_type == tut_case ? "case " : "suite " ) << quote() << tu.p_name << ' ' << descr;
if( tr.p_skipped ) {
Modified: trunk/boost/units/systems/detail/constants.hpp
==============================================================================
--- trunk/boost/units/systems/detail/constants.hpp (original)
+++ trunk/boost/units/systems/detail/constants.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -13,7 +13,7 @@
#include <boost/config/no_tr1/cmath.hpp>
#include <iosfwd>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <boost/io/ios_state.hpp>
@@ -154,7 +154,7 @@
//boost::io::ios_width_saver width_saver(os);
boost::io::ios_flags_saver flags_saver(os);
- //os << boost::detail::setw(21);
+ //os << std::setw(21);
typedef typename Y::value_type value_type;
if (val.uncertainty() > value_type())
@@ -165,15 +165,15 @@
const long digits_of_precision = static_cast<long>(std::ceil(std::abs(exponent)))+3;
// should try to replicate NIST CODATA syntax
- os << boost::detail::setprecision(digits_of_precision)
- //<< boost::detail::setw(digits_of_precision+8)
+ os << std::setprecision(digits_of_precision)
+ //<< std::setw(digits_of_precision+8)
//<< std::scientific
<< val.value();
// << long(10*(relative_uncertainty/std::pow(Y(10),Y(exponent))));
os << " (rel. unc. = "
- << boost::detail::setprecision(1)
- //<< boost::detail::setw(7)
+ << std::setprecision(1)
+ //<< std::setw(7)
<< std::scientific
<< relative_uncertainty << ")";
}
Modified: trunk/libs/algorithm/minmax/example/minmax_timer.cpp
==============================================================================
--- trunk/libs/algorithm/minmax/example/minmax_timer.cpp (original)
+++ trunk/libs/algorithm/minmax/example/minmax_timer.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -13,7 +13,7 @@
#include <set>
#include <iostream>
// What's the proper BOOST_ flag for <iomanip.h> vs <ios>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <boost/timer.hpp>
#include <boost/algorithm/minmax.hpp>
@@ -58,14 +58,14 @@
#define TIMER( n, cmd , cmdname ) \
t.restart(); \
for (int i=0; i<repeats; ++i) { cmd ; } \
- std::cout << " " << boost::detail::setprecision(4) \
+ std::cout << " " << std::setprecision(4) \
<< (double)n*repeats/t.elapsed()/1.0E6 \
<< "M items/sec " << cmdname << "\n"
#define CTIMER( n, cmd , cmdname, count, opt ) \
t.restart(); lc.reset(); \
for (int i=0; i<repeats; ++i) { cmd ; } \
- std::cout << " " << boost::detail::setprecision(4) \
+ std::cout << " " << std::setprecision(4) \
<< (double)n*repeats/t.elapsed()/1.0E6 \
<< "M items/sec " << cmdname \
<< " ("<< (count)/repeats << " vs " << opt << ")\n"
Modified: trunk/libs/asio/example/porthopper/protocol.hpp
==============================================================================
--- trunk/libs/asio/example/porthopper/protocol.hpp (original)
+++ trunk/libs/asio/example/porthopper/protocol.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -14,7 +14,7 @@
#include <boost/array.hpp>
#include <boost/asio.hpp>
#include <cstring>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <string>
#include <strstream>
@@ -55,7 +55,7 @@
{
std::istrstream is(data_, encoded_port_size);
unsigned short port = 0;
- is >> boost::detail::setw(encoded_port_size) >> std::hex >> port;
+ is >> std::setw(encoded_port_size) >> std::hex >> port;
return port;
}
@@ -64,7 +64,7 @@
{
std::istrstream is(data_ + encoded_port_size, encoded_port_size);
unsigned short port = 0;
- is >> boost::detail::setw(encoded_port_size) >> std::hex >> port;
+ is >> std::setw(encoded_port_size) >> std::hex >> port;
return port;
}
@@ -81,8 +81,8 @@
control_request(unsigned short old_port, unsigned short new_port)
{
std::ostrstream os(data_, control_request_size);
- os << boost::detail::setw(encoded_port_size) << std::hex << old_port;
- os << boost::detail::setw(encoded_port_size) << std::hex << new_port;
+ os << std::setw(encoded_port_size) << std::hex << old_port;
+ os << std::setw(encoded_port_size) << std::hex << new_port;
}
// The length in bytes of a control_request and its components.
@@ -112,9 +112,9 @@
frame(unsigned long number, const std::string& payload)
{
std::ostrstream os(data_, frame_size);
- os << boost::detail::setw(encoded_number_size) << std::hex << number;
- os << boost::detail::setw(payload_size)
- << boost::detail::setfill(' ') << payload.substr(0, payload_size);
+ os << std::setw(encoded_number_size) << std::hex << number;
+ os << std::setw(payload_size)
+ << std::setfill(' ') << payload.substr(0, payload_size);
}
// Get the frame number.
@@ -122,7 +122,7 @@
{
std::istrstream is(data_, encoded_number_size);
unsigned long number = 0;
- is >> boost::detail::setw(encoded_number_size) >> std::hex >> number;
+ is >> std::setw(encoded_number_size) >> std::hex >> number;
return number;
}
Modified: trunk/libs/asio/example/serialization/connection.hpp
==============================================================================
--- trunk/libs/asio/example/serialization/connection.hpp (original)
+++ trunk/libs/asio/example/serialization/connection.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -17,7 +17,7 @@
#include <boost/bind.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/tuple/tuple.hpp>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <string>
#include <sstream>
#include <vector>
@@ -59,7 +59,7 @@
// Format the header.
std::ostringstream header_stream;
- header_stream << boost::detail::setw(header_length)
+ header_stream << std::setw(header_length)
<< std::hex << outbound_data_.size();
if (!header_stream || header_stream.str().size() != header_length)
{
Modified: trunk/libs/asio/example/socks4/sync_client.cpp
==============================================================================
--- trunk/libs/asio/example/socks4/sync_client.cpp (original)
+++ trunk/libs/asio/example/socks4/sync_client.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -9,7 +9,7 @@
//
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <ostream>
#include <string>
#include <boost/asio.hpp>
Modified: trunk/libs/bimap/example/mi_to_b_path/hashed_indices.cpp
==============================================================================
--- trunk/libs/bimap/example/mi_to_b_path/hashed_indices.cpp (original)
+++ trunk/libs/bimap/example/mi_to_b_path/hashed_indices.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -18,9 +18,8 @@
//[ code_mi_to_b_path_hashed_indices
-#include <ios>
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <boost/tokenizer.hpp>
@@ -76,7 +75,7 @@
// list words by frequency of appearance
- std::cout << std::fixed << boost::detail::setprecision(2);
+ std::cout << std::fixed << std::setprecision(2);
for( word_counter::map_by<occurrences>::const_iterator
wit = wc.by<occurrences>().begin(),
@@ -84,8 +83,8 @@
wit != wit_end; ++wit )
{
- std::cout << boost::detail::setw(15) << wit->get<word>() << ": "
- << boost::detail::setw(5)
+ std::cout << std::setw(15) << wit->get<word>() << ": "
+ << std::setw(5)
<< 100.0 * wit->get<occurrences>() / total_occurrences << "%"
<< std::endl;
}
Modified: trunk/libs/bimap/example/mi_to_b_path/mi_hashed_indices.cpp
==============================================================================
--- trunk/libs/bimap/example/mi_to_b_path/mi_hashed_indices.cpp (original)
+++ trunk/libs/bimap/example/mi_to_b_path/mi_hashed_indices.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -15,9 +15,8 @@
//[ code_mi_to_b_path_mi_hashed_indices
-#include <ios>
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <boost/tokenizer.hpp>
@@ -85,13 +84,13 @@
// list words by frequency of appearance
- std::cout << std::fixed << boost::detail::setprecision(2);
+ std::cout << std::fixed << std::setprecision(2);
for( word_counter::iterator wit = wc.begin(), wit_end=wc.end();
wit != wit_end; ++wit )
{
- std::cout << boost::detail::setw(11) << wit->word << ": "
- << boost::detail::setw(5)
+ std::cout << std::setw(11) << wit->word << ": "
+ << std::setw(5)
<< 100.0 * wit->occurrences / total_occurrences << "%"
<< std::endl;
}
Modified: trunk/libs/chrono/example/await_keystroke.cpp
==============================================================================
--- trunk/libs/chrono/example/await_keystroke.cpp (original)
+++ trunk/libs/chrono/example/await_keystroke.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -9,7 +9,7 @@
#include <boost/chrono/chrono.hpp>
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
using namespace boost::chrono;
@@ -41,7 +41,7 @@
std::cout << "Strike any key: ";
std::cin.get();
- std::cout << std::fixed << boost::detail::setprecision(9);
+ std::cout << std::fixed << std::setprecision(9);
std::cout << "system_clock-----------: "
<< t1.seconds() << " seconds\n";
std::cout << "steady_clock--------: "
Modified: trunk/libs/config/test/config_info.cpp
==============================================================================
--- trunk/libs/config/test/config_info.cpp (original)
+++ trunk/libs/config/test/config_info.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -17,7 +17,7 @@
#include <boost/config.hpp>
#include <boost/version.hpp>
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <string.h>
#include <limits.h>
#include <stdlib.h>
@@ -44,7 +44,7 @@
if(0 != strcmp(name, value+1))
{
for(unsigned i = 0; i < indent; ++i) std::cout.put(' ');
- std::cout << boost::detail::setw(width);
+ std::cout << std::setw(width);
cout.setf(istream::left, istream::adjustfield);
std::cout << name;
if(value[1])
@@ -66,7 +66,7 @@
void print_expression(const char* expression, T val)
{
for(unsigned i = 0; i < indent; ++i) std::cout.put(' ');
- std::cout << boost::detail::setw(width);
+ std::cout << std::setw(width);
std::cout.setf(istream::left, istream::adjustfield);
std::cout << expression << "=" << val << std::endl;
}
@@ -85,7 +85,7 @@
const char* p = reinterpret_cast<const char*>(&val);
for(i = 0; i < indent; ++i) std::cout.put(' ');
- std::cout << boost::detail::setw(width);
+ std::cout << std::setw(width);
std::cout.setf(istream::left, istream::adjustfield);
std::cout << what << "=";
for(i = 0; i < sizeof(T); ++i)
Modified: trunk/libs/config/test/link/link_test.cpp
==============================================================================
--- trunk/libs/config/test/link/link_test.cpp (original)
+++ trunk/libs/config/test/link/link_test.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -10,7 +10,7 @@
#include "link_test.hpp"
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
bool BOOST_CONFIG_DECL check_options(
bool m_dyn_link,
Modified: trunk/libs/config/test/math_info.cpp
==============================================================================
--- trunk/libs/config/test/math_info.cpp (original)
+++ trunk/libs/config/test/math_info.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -19,7 +19,7 @@
#include <cmath>
#include <float.h>
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <cstring>
#include <boost/type_traits/alignment_of.hpp>
@@ -37,7 +37,7 @@
if(0 != std::strcmp(name, value+1))
{
for(unsigned i = 0; i < indent; ++i) std::cout.put(' ');
- std::cout << boost::detail::setw(width);
+ std::cout << std::setw(width);
std::cout.setf(std::istream::left, std::istream::adjustfield);
std::cout << name;
if(value[1])
@@ -59,9 +59,9 @@
void print_expression(const char* expression, T val)
{
for(unsigned i = 0; i < indent; ++i) std::cout.put(' ');
- std::cout << boost::detail::setw(width);
+ std::cout << std::setw(width);
std::cout.setf(std::istream::left, std::istream::adjustfield);
- std::cout << boost::detail::setprecision(std::numeric_limits<T>::digits10+2);
+ std::cout << std::setprecision(std::numeric_limits<T>::digits10+2);
std::cout << expression << "=" << val << std::endl;
}
@@ -81,9 +81,9 @@
std::cout <<
" is_specialized = " << std::numeric_limits<T>::is_specialized << std::endl;
std::cout <<
- " min" "() = " << boost::detail::setprecision(std::numeric_limits<T>::digits10 + 2) << (std::numeric_limits<T>::min)() << std::endl;
+ " min" "() = " << std::setprecision(std::numeric_limits<T>::digits10 + 2) << (std::numeric_limits<T>::min)() << std::endl;
std::cout <<
- " max" "() = " << boost::detail::setprecision(std::numeric_limits<T>::digits10 + 2) << (std::numeric_limits<T>::max)() << std::endl;
+ " max" "() = " << std::setprecision(std::numeric_limits<T>::digits10 + 2) << (std::numeric_limits<T>::max)() << std::endl;
std::cout <<
" digits = " << std::numeric_limits<T>::digits << std::endl;
std::cout <<
@@ -98,9 +98,9 @@
" radix = " << std::numeric_limits<T>::radix << std::endl;
std::cout <<
- " epsilon() = " << boost::detail::setprecision(std::numeric_limits<T>::digits10 + 2) << (std::numeric_limits<T>::epsilon)() << std::endl;
+ " epsilon() = " << std::setprecision(std::numeric_limits<T>::digits10 + 2) << (std::numeric_limits<T>::epsilon)() << std::endl;
std::cout <<
- " round_error() = " << boost::detail::setprecision(std::numeric_limits<T>::digits10 + 2) << (std::numeric_limits<T>::round_error)() << std::endl;
+ " round_error() = " << std::setprecision(std::numeric_limits<T>::digits10 + 2) << (std::numeric_limits<T>::round_error)() << std::endl;
std::cout <<
" min_exponent = " << std::numeric_limits<T>::min_exponent << std::endl;
@@ -122,13 +122,13 @@
" has_denorm_loss = " << std::numeric_limits<T>::has_denorm_loss << std::endl;
std::cout <<
- " infinity() = " << boost::detail::setprecision(std::numeric_limits<T>::digits10 + 2) << (std::numeric_limits<T>::infinity)() << std::endl;
+ " infinity() = " << std::setprecision(std::numeric_limits<T>::digits10 + 2) << (std::numeric_limits<T>::infinity)() << std::endl;
std::cout <<
- " quiet_NaN() = " << boost::detail::setprecision(std::numeric_limits<T>::digits10 + 2) << (std::numeric_limits<T>::quiet_NaN)() << std::endl;
+ " quiet_NaN() = " << std::setprecision(std::numeric_limits<T>::digits10 + 2) << (std::numeric_limits<T>::quiet_NaN)() << std::endl;
std::cout <<
- " signaling_NaN() = " << boost::detail::setprecision(std::numeric_limits<T>::digits10 + 2) << (std::numeric_limits<T>::signaling_NaN)() << std::endl;
+ " signaling_NaN() = " << std::setprecision(std::numeric_limits<T>::digits10 + 2) << (std::numeric_limits<T>::signaling_NaN)() << std::endl;
std::cout <<
- " denorm_min() = " << boost::detail::setprecision(std::numeric_limits<T>::digits10 + 2) << (std::numeric_limits<T>::denorm_min)() << std::endl;
+ " denorm_min() = " << std::setprecision(std::numeric_limits<T>::digits10 + 2) << (std::numeric_limits<T>::denorm_min)() << std::endl;
std::cout <<
Modified: trunk/libs/date_time/test/local_time/testlocal_time.cpp
==============================================================================
--- trunk/libs/date_time/test/local_time/testlocal_time.cpp (original)
+++ trunk/libs/date_time/test/local_time/testlocal_time.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -21,12 +21,12 @@
ss
<< ptr.tm_wday << ' ' << ptr.tm_yday << ' '
- << boost::detail::setw(2) << boost::detail::setfill('0') << ptr.tm_mon + 1 << '/'
- << boost::detail::setw(2) << boost::detail::setfill('0') << ptr.tm_mday << '/'
- << boost::detail::setw(2) << boost::detail::setfill('0') << ptr.tm_year + 1900 << ' '
- << boost::detail::setw(2) << boost::detail::setfill('0') << ptr.tm_hour << ':'
- << boost::detail::setw(2) << boost::detail::setfill('0') << ptr.tm_min << ':'
- << boost::detail::setw(2) << boost::detail::setfill('0') << ptr.tm_sec << ' ';
+ << std::setw(2) << std::setfill('0') << ptr.tm_mon + 1 << '/'
+ << std::setw(2) << std::setfill('0') << ptr.tm_mday << '/'
+ << std::setw(2) << std::setfill('0') << ptr.tm_year + 1900 << ' '
+ << std::setw(2) << std::setfill('0') << ptr.tm_hour << ':'
+ << std::setw(2) << std::setfill('0') << ptr.tm_min << ':'
+ << std::setw(2) << std::setfill('0') << ptr.tm_sec << ' ';
if(ptr.tm_isdst >= 0){
ss << (ptr.tm_isdst ? "DST" : "STD");
}
Deleted: trunk/libs/detail/test/iomanip_test.cpp
==============================================================================
--- trunk/libs/detail/test/iomanip_test.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
+++ (empty file)
@@ -1,59 +0,0 @@
-/*==============================================================================
- Copyright (c) 2010-2011 Bryce Lelbach
-
- 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 <iostream>
-#include <sstream>
-
-#include <boost/config.hpp>
-#include <boost/detail/iomanip.hpp>
-#include <boost/detail/lightweight_test.hpp>
-
-int main (void) {
- using namespace boost::detail;
-
- std::ostringstream oss(std::ostringstream::out);
-
- //[setbase_test
- oss << setbase(8) << 8;
- BOOST_TEST_EQ(oss.str(), "10");
-
- oss.str("");
- oss << setbase(10) << 10;
- BOOST_TEST_EQ(oss.str(), "10");
-
- oss.str("");
- oss << setbase(16) << 16;
- BOOST_TEST_EQ(oss.str(), "10");
- //]
-
- //[setiosflags_test
- oss.str("");
- oss << setiosflags(std::ios_base::showbase | std::ios_base::hex) << 16;
- BOOST_TEST_EQ(oss.str(), "0x10");
- //]
-
- //[resetiosflags_test
- oss.str("");
- oss << resetiosflags(std::ios_base::showbase | std::ios_base::hex) << 16;
- BOOST_TEST_EQ(oss.str(), "16");
- //]
-
- //[setprecision_test
- oss.str("");
- oss << setprecision(4) << 3.14159;
- BOOST_TEST_EQ(oss.str(), "3.142");
- //]
-
- //[setfill_and_setw_test
- oss.str("");
- oss << setfill('*') << setw(5) << 9;
- BOOST_TEST_EQ(oss.str(), "****9");
- //]
-
- return boost::report_errors();
-}
-
Modified: trunk/libs/exception/test/cloning_test.cpp
==============================================================================
--- trunk/libs/exception/test/cloning_test.cpp (original)
+++ trunk/libs/exception/test/cloning_test.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -27,10 +27,6 @@
if( throw_ )
throw T();
}
-
- #if defined(__PATHSCALE__)
- ~may_throw_on_copy() throw() {}
- #endif
bool throw_;
};
@@ -63,9 +59,6 @@
derives_std_exception:
std::exception
{
- #if defined(__PATHSCALE__)
- ~derives_std_exception() throw() {}
- #endif
};
struct
@@ -84,19 +77,12 @@
{
return wh_;
}
-
- #if defined(__PATHSCALE__)
- ~derives_std_boost_exception() throw() {}
- #endif
};
struct
derives_boost_exception:
boost::exception
{
- #if defined(__PATHSCALE__)
- ~derives_boost_exception() throw() {}
- #endif
};
template <class T>
Modified: trunk/libs/exception/test/diagnostic_information_test.cpp
==============================================================================
--- trunk/libs/exception/test/diagnostic_information_test.cpp (original)
+++ trunk/libs/exception/test/diagnostic_information_test.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -30,10 +30,6 @@
std::exception,
boost::exception
{
- #if defined(__PATHSCALE__)
- ~error1() throw() {}
- #endif
-
char const *
what() const throw()
{
@@ -45,9 +41,6 @@
error2:
boost::exception
{
- #if defined(__PATHSCALE__)
- ~error2() throw() {}
- #endif
};
struct
@@ -59,9 +52,6 @@
{
return "error3";
}
- #if defined(__PATHSCALE__)
- ~error3() throw() {}
- #endif
};
struct
@@ -74,9 +64,6 @@
{
return diagnostic_information_what(*this);
}
- #if defined(__PATHSCALE__)
- ~error4() throw() {}
- #endif
};
void
Modified: trunk/libs/exception/test/errinfos_test.cpp
==============================================================================
--- trunk/libs/exception/test/errinfos_test.cpp (original)
+++ trunk/libs/exception/test/errinfos_test.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -22,9 +22,6 @@
virtual boost::exception,
virtual std::exception
{
- #if defined(__PATHSCALE__)
- ~test_exception() throw() {}
- #endif
};
int
Modified: trunk/libs/exception/test/no_exceptions_test.cpp
==============================================================================
--- trunk/libs/exception/test/no_exceptions_test.cpp (original)
+++ trunk/libs/exception/test/no_exceptions_test.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -21,9 +21,6 @@
{
return "my_exception";
}
- #if defined(__PATHSCALE__)
- ~my_exception() throw() {}
- #endif
};
typedef boost::error_info<struct my_tag,int> my_int;
Modified: trunk/libs/exception/test/throw_exception_test.cpp
==============================================================================
--- trunk/libs/exception/test/throw_exception_test.cpp (original)
+++ trunk/libs/exception/test/throw_exception_test.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -15,9 +15,6 @@
exception1:
std::exception
{
- #if defined(__PATHSCALE__)
- ~exception1() throw() {}
- #endif
};
struct
@@ -25,9 +22,6 @@
std::exception,
boost::exception
{
- #if defined(__PATHSCALE__)
- ~exception2() throw() {}
- #endif
};
void
@@ -46,7 +40,7 @@
int const * line=boost::get_error_info<boost::throw_line>(x);
BOOST_TEST( file && *file );
BOOST_TEST( function && *function );
- BOOST_TEST( line && *line==38 );
+ BOOST_TEST( line && *line==32 );
}
catch(
... )
@@ -67,7 +61,7 @@
int const * data=boost::get_error_info<test_data>(x);
BOOST_TEST( file && *file );
BOOST_TEST( function && *function );
- BOOST_TEST( line && *line==58 );
+ BOOST_TEST( line && *line==52 );
BOOST_TEST( data && *data==42 );
}
catch(
Modified: trunk/libs/filesystem/v2/test/wide_test.cpp
==============================================================================
--- trunk/libs/filesystem/v2/test/wide_test.cpp (original)
+++ trunk/libs/filesystem/v2/test/wide_test.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -36,7 +36,7 @@
namespace fs = boost::filesystem;
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <ios>
#include <string>
#include <cerrno>
Modified: trunk/libs/filesystem/v3/src/path.cpp
==============================================================================
--- trunk/libs/filesystem/v3/src/path.cpp (original)
+++ trunk/libs/filesystem/v3/src/path.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -40,7 +40,7 @@
#ifdef BOOST_FILESYSTEM_DEBUG
# include <iostream>
-# include <boost/detail/iomanip.hpp>
+# include <iomanip>
#endif
namespace fs = boost::filesystem3;
Modified: trunk/libs/filesystem/v3/test/path_unit_test.cpp
==============================================================================
--- trunk/libs/filesystem/v3/test/path_unit_test.cpp (original)
+++ trunk/libs/filesystem/v3/test/path_unit_test.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -45,7 +45,7 @@
#include <boost/smart_ptr.hpp> // used constructor tests
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <sstream>
#include <string>
#include <cstring>
Modified: trunk/libs/format/benchmark/bench_format.cpp
==============================================================================
--- trunk/libs/format/benchmark/bench_format.cpp (original)
+++ trunk/libs/format/benchmark/bench_format.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -23,7 +23,7 @@
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <cstdio> // sprintf
#include <cstring>
#include <fstream>
@@ -169,7 +169,7 @@
sprintf(buf, fstring.c_str(), arg1, arg2, arg3);
}
tpf=chrono.elapsed();
- cout << left << boost::detail::setw(20) <<"printf time"<< right <<":" << tpf << endl;
+ cout << left << setw(20) <<"printf time"<< right <<":" << tpf << endl;
}
void test_try1()
@@ -183,7 +183,7 @@
dummy += oss.cur_size();
}
double t = chrono.elapsed();
- cout << left << boost::detail::setw(20) <<"try1 time"<< right <<":" << boost::detail::setw(5) << t
+ cout << left << setw(20) <<"try1 time"<< right <<":" << setw(5) << t
<< ", = " << t / tpf << " * printf "
<< ", = " << t / tstream << " * nullStream \n";
}
@@ -205,7 +205,7 @@
dummy += oss.cur_size();
}
double t = chrono.elapsed();
- cout << left << boost::detail::setw(20) <<"try2 time"<< right <<":" << boost::detail::setw(5) << t
+ cout << left << setw(20) <<"try2 time"<< right <<":" << setw(5) << t
<< ", = " << t / tpf << " * printf "
<< ", = " << t / tstream << " * nullStream \n";
}
@@ -213,14 +213,14 @@
void do_stream(std::ostream& os) {
using namespace std;
std::ios_base::fmtflags f = os.flags();
- os << hex << showbase << internal << boost::detail::setfill('0') << boost::detail::setw(6) << arg3
- << dec << noshowbase << right << boost::detail::setfill(' ')
+ os << hex << showbase << internal << setfill('0') << setw(6) << arg3
+ << dec << noshowbase << right << setfill(' ')
<< " "
- << scientific << boost::detail::setw(20) << boost::detail::setprecision(10) << uppercase << arg1
- << boost::detail::setprecision(6) << nouppercase ;
+ << scientific << setw(20) << setprecision(10) << uppercase << arg1
+ << setprecision(6) << nouppercase ;
os.flags(f);
os << " " << arg2 << " "
- << showpos << boost::detail::setw(5) << internal << boost::detail::setfill('0') << arg3 << " \n" ;
+ << showpos << setw(5) << internal << setfill('0') << arg3 << " \n" ;
os.flags(f);
}
@@ -245,14 +245,14 @@
// std::ios_base::fmtflags f0 = nullStream.flags();
// nullStream << hex << showbase << arg3
// << dec << noshowbase << " "
-// << scientific << boost::detail::setw(20) << boost::detail::setprecision(10) << uppercase << arg1
-// << boost::detail::setprecision(0);
+// << scientific << setw(20) << setprecision(10) << uppercase << arg1
+// << setprecision(0);
// nullStream.flags(f0);
// nullStream << " " << arg2 << " " << arg3 << " \n" ;
// }
double t = chrono.elapsed();
- cout << left << boost::detail::setw(20) <<"ostream time"<< right <<":" << boost::detail::setw(5) << t
+ cout << left << setw(20) <<"ostream time"<< right <<":" << setw(5) << t
<< ", = " << t / tpf << " * printf \n";
tstream = t;
}
@@ -272,7 +272,7 @@
oss << arg3;
oss.flags(f0);
- oss << " " << scientific << boost::detail::setw(20) << boost::detail::setprecision(10) << uppercase;
+ oss << " " << scientific << setw(20) << setprecision(10) << uppercase;
f2 = oss.flags();
oss << arg1;
@@ -288,7 +288,7 @@
nullStream.flags(f1);
nullStream << arg3;
- nullStream << boost::detail::setw(20) << boost::detail::setprecision(10);
+ nullStream << setw(20) << setprecision(10);
nullStream.flags(f2);
nullStream << arg1;
@@ -296,7 +296,7 @@
nullStream << " " << arg2 << " " << arg3 << " \n" ;
}
double t = chrono.elapsed();
- cout << left << boost::detail::setw(20) <<"opti-stream time"<< right <<":" << boost::detail::setw(5) << t
+ cout << left << setw(20) <<"opti-stream time"<< right <<":" << setw(5) << t
<< ", = " << t / tpf << " * printf \n";
// tstream = t;
}
@@ -320,7 +320,7 @@
nullStream << boost::format(fmter) % arg1 % arg2 % arg3;
}
double t=chrono.elapsed();
- cout << left << boost::detail::setw(20) <<"parsed-once time"<< right <<":" << boost::detail::setw(5) << t
+ cout << left << setw(20) <<"parsed-once time"<< right <<":" << setw(5) << t
<< ", = " << t / tpf << " * printf "
<< ", = " << t / tstream << " * nullStream \n";
}
@@ -340,7 +340,7 @@
nullStream << fmter.parse(fstring) % arg1 % arg2 % arg3;
}
double t = chrono.elapsed();
- cout << left << boost::detail::setw(20) <<"reused format time"<< right <<":" << boost::detail::setw(5) << t
+ cout << left << setw(20) <<"reused format time"<< right <<":" << setw(5) << t
<< ", = " << t / tpf << " * printf "
<< ", = " << t / tstream << " * nullStream \n";
}
@@ -359,7 +359,7 @@
nullStream << boost::format(fstring) % arg1 % arg2 % arg3;
}
double t = chrono.elapsed();
- cout << left << boost::detail::setw(20) <<"format time"<< right <<":" << boost::detail::setw(5) << t
+ cout << left << setw(20) <<"format time"<< right <<":" << setw(5) << t
<< ", = " << t / tpf << " * printf "
<< ", = " << t / tstream << " * nullStream \n";
}
@@ -380,7 +380,7 @@
nullStream << KNelson::boost::format(fstring.c_str(), arg1, arg2, arg3);
}
double t = chrono.elapsed();
- cout << left << boost::detail::setw(20) <<"format3 time"<< right <<":" << boost::detail::setw(5) << t
+ cout << left << setw(20) <<"format3 time"<< right <<":" << setw(5) << t
<< ", = " << t / tpf << " * printf "
<< ", = " << t / tstream << " * nullStream \n" ;
}
Modified: trunk/libs/format/example/sample_advanced.cpp
==============================================================================
--- trunk/libs/format/example/sample_advanced.cpp (original)
+++ trunk/libs/format/example/sample_advanced.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -11,7 +11,7 @@
// ----------------------------------------------------------------------------
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include "boost/format.hpp"
@@ -26,8 +26,8 @@
}
namespace MyNS_Manips {
- using boost::detail::setfill;
- using boost::detail::setw;
+ using std::setfill;
+ using std::setw;
using std::hex ;
using std::dec ;
using std::showbase ;
@@ -82,7 +82,7 @@
// modify the formatting options for a given directive :
fmter = format("%1% %2% %3% %2% %1% \n");
- fmter.modify_item(4, group(boost::detail::setfill('_'), hex, showbase, boost::detail::setw(5)) );
+ fmter.modify_item(4, group(setfill('_'), hex, showbase, setw(5)) );
cout << fmter % 1 % 2 % 3;
// prints "1 2 3 __0x2 1 \n"
@@ -92,7 +92,7 @@
// prints "18 0x14 30 _0x14 18 \n"
- fmter.modify_item(4, boost::detail::setw(0)); // cancels previous width-5
+ fmter.modify_item(4, setw(0)); // cancels previous width-5
fmter.bind_arg(1, 77); // replace 18 with 77 for first argument.
cout << fmter % 10 % 20;
// prints "77 10 20 0xa 77 \n"
@@ -139,9 +139,9 @@
// manipulators conflicting with format-string : manipulators win.
- cout << format("%2s") % group(boost::detail::setfill('0'), boost::detail::setw(6), 1) << endl;
+ cout << format("%2s") % group(setfill('0'), setw(6), 1) << endl;
// prints "000001"
- cout << format("%2$5s %1% %2$3s\n") % 1 % group(boost::detail::setfill('X'), boost::detail::setw(4), 2) ;
+ cout << format("%2$5s %1% %2$3s\n") % 1 % group(setfill('X'), setw(4), 2) ;
// prints "XXX2 1 XXX2\n"
// width is 4, as set by manip, not the format-string.
Modified: trunk/libs/format/example/sample_formats.cpp
==============================================================================
--- trunk/libs/format/example/sample_formats.cpp (original)
+++ trunk/libs/format/example/sample_formats.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -10,7 +10,7 @@
// ----------------------------------------------------------------------------
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <cassert>
#include "boost/format.hpp"
@@ -27,8 +27,8 @@
}
namespace MyNS_Manips {
- using boost::detail::setfill;
- using boost::detail::setw;
+ using std::setfill;
+ using std::setw;
using std::hex ;
using std::dec ;
// gcc-2.95 doesnt define the next ones
@@ -62,7 +62,7 @@
// Using manipulators, via 'group' :
- cout << format("%2% %1% %2%\n") % 1 % group(boost::detail::setfill('X'), hex, boost::detail::setw(4), 16+3) ;
+ cout << format("%2% %1% %2%\n") % 1 % group(setfill('X'), hex, setw(4), 16+3) ;
// prints "XX13 1 XX13\n"
Modified: trunk/libs/format/example/sample_new_features.cpp
==============================================================================
--- trunk/libs/format/example/sample_new_features.cpp (original)
+++ trunk/libs/format/example/sample_new_features.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -11,7 +11,7 @@
// ----------------------------------------------------------------------------
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include "boost/format.hpp"
Modified: trunk/libs/format/example/sample_userType.cpp
==============================================================================
--- trunk/libs/format/example/sample_userType.cpp (original)
+++ trunk/libs/format/example/sample_userType.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -12,7 +12,7 @@
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include "boost/format.hpp"
@@ -114,7 +114,7 @@
else {
n2 -= s2-s1; // adjust for '/', n2 is still w/2.
}
- os << boost::detail::setw(n1) << r.n_ << "/" << noshowpos << boost::detail::setw(n2) << r.d_;
+ os << setw(n1) << r.n_ << "/" << noshowpos << setw(n2) << r.d_;
}
else {
if(! (os.flags() & std::ios_base::left)) {
Modified: trunk/libs/format/test/format_test2.cpp
==============================================================================
--- trunk/libs/format/test/format_test2.cpp (original)
+++ trunk/libs/format/test/format_test2.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -10,10 +10,10 @@
// ------------------------------------------------------------------------------
-#include <boost/format.hpp>
+#include "boost/format.hpp"
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#define BOOST_INCLUDE_MAIN
#include <boost/test/test_tools.hpp>
@@ -41,7 +41,7 @@
string s;
s = str(format("%5%. %5$=6s . %1% format %5%, c'%3% %1% %2%.\n")
- % "le" % "bonheur" % "est" % "trop" % group(boost::detail::setfill('_'), "bref") );
+ % "le" % "bonheur" % "est" % "trop" % group(setfill('_'), "bref") );
if(s != "bref. _bref_ . le format bref, c'est le bonheur.\n") {
cerr << s;
@@ -78,12 +78,12 @@
BOOST_ERROR("(truncation) formatting result incorrect");
}
- // width in format-string is overridden by boost::detail::setw manipulator :
- s = str( format("%|1$4| %|1$|") % group(boost::detail::setfill('0'), boost::detail::setw(6), 1) );
+ // width in format-string is overridden by setw manipulator :
+ s = str( format("%|1$4| %|1$|") % group(setfill('0'), setw(6), 1) );
if( s!= "000001 000001")
BOOST_ERROR("width in format VS in argument misbehaved");
- s = str( format("%|=s|") % group(boost::detail::setfill('_'), boost::detail::setw(6), r) );
+ s = str( format("%|=s|") % group(setfill('_'), setw(6), r) );
if( s!= "_16/9_") {
cerr << s << endl;
BOOST_ERROR("width in group context is not handled correctly");
@@ -99,7 +99,7 @@
// and hex in argument overrrides type-char d (->decimal) :
s = str( format("%2$#4d %|1$4| %|2$#4| %|3$|")
% 101
- % group(boost::detail::setfill('_'), hex, 2)
+ % group(setfill('_'), hex, 2)
% 103 );
if(s != "_0x2 101 _0x2 103")
BOOST_ERROR("formatting error. (not-restoring state ?)");
Modified: trunk/libs/format/test/format_test3.cpp
==============================================================================
--- trunk/libs/format/test/format_test3.cpp (original)
+++ trunk/libs/format/test/format_test3.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -14,7 +14,7 @@
#include "boost/format.hpp"
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#define BOOST_INCLUDE_MAIN
#include <boost/test/test_tools.hpp>
@@ -40,10 +40,10 @@
// special paddings
s = str( format("[%=6s] [%+6s] [%+6s] [% 6s] [%+6s]\n")
% 123
- % group(internal, boost::detail::setfill('W'), 234)
- % group(internal, boost::detail::setfill('X'), -345)
- % group(boost::detail::setfill('Y'), 456)
- % group(boost::detail::setfill('Z'), -10 ) );
+ % group(internal, setfill('W'), 234)
+ % group(internal, setfill('X'), -345)
+ % group(setfill('Y'), 456)
+ % group(setfill('Z'), -10 ) );
if(s != "[ 123 ] [+WW234] [-XX345] [YY 456] [ZZZ-10]\n" ) {
cerr << s ;
@@ -51,9 +51,9 @@
}
s = str( format("[% 6.8s] [% 8.6s] [% 7.7s]\n")
- % group(internal, boost::detail::setfill('x'), Rational(12345,54321))
- % group(internal, boost::detail::setfill('x'), Rational(123,45))
- % group(internal, boost::detail::setfill('x'), Rational(123,321))
+ % group(internal, setfill('x'), Rational(12345,54321))
+ % group(internal, setfill('x'), Rational(123,45))
+ % group(internal, setfill('x'), Rational(123,321))
);
if(s != (s2="[ 12345/5] [ xx123/4] [ 123/32]\n" )) {
cerr << s << s2;
@@ -62,10 +62,10 @@
s = str( format("[% 6.8s] [% 6.8s] [% 6.8s] [% 6.8s] [%6.8s]\n")
% 1234567897
- % group(boost::detail::setfill('x'), 12)
- % group(internal, boost::detail::setfill('x'), 12)
- % group(internal, boost::detail::setfill('x'), 1234567890)
- % group(internal, boost::detail::setfill('x'), 123456)
+ % group(setfill('x'), 12)
+ % group(internal, setfill('x'), 12)
+ % group(internal, setfill('x'), 1234567890)
+ % group(internal, setfill('x'), 123456)
);
if(s != (s2="[ 1234567] [xxx 12] [ xxx12] [ 1234567] [123456]\n") ) {
cerr << s << s2;
@@ -74,10 +74,10 @@
s = str( format("[% 8.6s] [% 6.4s] [% 6.4s] [% 8.6s] [% 8.6s]\n")
% 1234567897
- % group(boost::detail::setfill('x'), 12)
- % group(internal, boost::detail::setfill('x'), 12)
- % group(internal, boost::detail::setfill('x'), 1234567890)
- % group(internal, boost::detail::setfill('x'), 12345)
+ % group(setfill('x'), 12)
+ % group(internal, setfill('x'), 12)
+ % group(internal, setfill('x'), 1234567890)
+ % group(internal, setfill('x'), 12345)
);
if(s != (s2="[ 12345] [xxx 12] [ xxx12] [ xx12345] [ xx12345]\n") ) {
cerr << s << s2;
Modified: trunk/libs/geometry/example/07_a_graph_route_example.cpp
==============================================================================
--- trunk/libs/geometry/example/07_a_graph_route_example.cpp (original)
+++ trunk/libs/geometry/example/07_a_graph_route_example.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -12,7 +12,7 @@
#include <iostream>
#include <fstream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <limits>
#include <boost/tuple/tuple.hpp>
@@ -301,7 +301,7 @@
double const km = 1000.0;
std::cout << "distances, all in KM" << std::endl
- << std::fixed << boost::detail::setprecision(0);
+ << std::fixed << std::setprecision(0);
// Main functionality: calculate shortest routes from/to all cities
@@ -332,12 +332,12 @@
double acof = boost::geometry::distance(city1.get<0>(), city2.get<0>()) / km;
std::cout
- << boost::detail::setiosflags (std::ios_base::left) << boost::detail::setw(15)
+ << std::setiosflags (std::ios_base::left) << std::setw(15)
<< city1.get<1>() << " - "
- << boost::detail::setiosflags (std::ios_base::left) << boost::detail::setw(15)
+ << std::setiosflags (std::ios_base::left) << std::setw(15)
<< city2.get<1>()
- << " -> through the air: " << boost::detail::setw(4) << acof
- << " , over the road: " << boost::detail::setw(4) << distance
+ << " -> through the air: " << std::setw(4) << acof
+ << " , over the road: " << std::setw(4) << distance
<< std::endl;
if (first)
Modified: trunk/libs/geometry/example/07_b_graph_route_example.cpp
==============================================================================
--- trunk/libs/geometry/example/07_b_graph_route_example.cpp (original)
+++ trunk/libs/geometry/example/07_b_graph_route_example.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -16,7 +16,7 @@
#include <iostream>
#include <fstream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <limits>
#include <boost/tuple/tuple.hpp>
@@ -289,7 +289,7 @@
double const km = 1000.0;
std::cout << "distances, all in KM" << std::endl
- << std::fixed << boost::detail::setprecision(0);
+ << std::fixed << std::setprecision(0);
// Main functionality: calculate shortest routes from/to all cities
@@ -320,12 +320,12 @@
double acof = boost::geometry::distance(city1.get<0>(), city2.get<0>()) / km;
std::cout
- << boost::detail::setiosflags (std::ios_base::left) << boost::detail::setw(15)
+ << std::setiosflags (std::ios_base::left) << std::setw(15)
<< city1.get<1>() << " - "
- << boost::detail::setiosflags (std::ios_base::left) << boost::detail::setw(15)
+ << std::setiosflags (std::ios_base::left) << std::setw(15)
<< city2.get<1>()
- << " -> through the air: " << boost::detail::setw(4) << acof
- << " , over the road: " << boost::detail::setw(4) << distance
+ << " -> through the air: " << std::setw(4) << acof
+ << " , over the road: " << std::setw(4) << distance
<< std::endl;
if (first)
Modified: trunk/libs/geometry/example/extensions/gis/latlong/point_ll_example.cpp
==============================================================================
--- trunk/libs/geometry/example/extensions/gis/latlong/point_ll_example.cpp (original)
+++ trunk/libs/geometry/example/extensions/gis/latlong/point_ll_example.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -9,7 +9,7 @@
// Point Example - showing geographic (latitude longitude) points
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <boost/geometry/geometry.hpp>
@@ -86,7 +86,7 @@
std::cout << "Amsterdam: " << boost::geometry::dsv(amsterdam) << std::endl;
// Calculate the distance using the default strategy (Andoyer), and Vincenty
- std::cout << boost::detail::setprecision(9);
+ std::cout << std::setprecision(9);
std::cout << "Distance Paris-Lima, Andoyer (default) "
<< 0.001 * distance(paris, lima)
<< " km" << std::endl;
Modified: trunk/libs/geometry/test/algorithms/overlay/assemble.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/assemble.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/assemble.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -6,7 +6,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <string>
Modified: trunk/libs/geometry/test/algorithms/overlay/ccw_traverse.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/ccw_traverse.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/ccw_traverse.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -7,7 +7,7 @@
#include <fstream>
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <boost/foreach.hpp>
@@ -151,7 +151,7 @@
out
- << boost::detail::setprecision(3)
+ << std::setprecision(3)
<< "dist: " << turn.operations[0].enriched.distance
<< " / " << turn.operations[1].enriched.distance
<< std::endl;
Modified: trunk/libs/geometry/test/algorithms/overlay/enrich_intersection_points.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/enrich_intersection_points.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/enrich_intersection_points.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -53,7 +53,7 @@
bg::enrich_intersection_points(ips, true);
std::ostringstream out;
- out << boost::detail::setprecision(2);
+ out << std::setprecision(2);
bool first = true;
for (iterator it = boost::begin(ips); it != boost::end(ips); ++it, first = false)
Modified: trunk/libs/geometry/test/algorithms/overlay/get_turns.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/get_turns.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/get_turns.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -7,7 +7,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <geometry_test_common.hpp>
Modified: trunk/libs/geometry/test/algorithms/overlay/robustness/random_ellipses_stars.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/robustness/random_ellipses_stars.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/robustness/random_ellipses_stars.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -8,7 +8,7 @@
#include <iostream>
#include <sstream>
#include <fstream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <string>
#define BOOST_GEOMETRY_REPORT_OVERLAY_ERROR
Modified: trunk/libs/geometry/test/algorithms/overlay/robustness/recursive_polygons.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/robustness/recursive_polygons.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/robustness/recursive_polygons.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -8,7 +8,7 @@
#include <iostream>
#include <sstream>
#include <fstream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <string>
#define BOOST_GEOMETRY_REPORT_OVERLAY_ERROR
Modified: trunk/libs/geometry/test/algorithms/overlay/robustness/test_overlay_p_q.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/robustness/test_overlay_p_q.hpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/robustness/test_overlay_p_q.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -9,7 +9,7 @@
#define BOOST_GEOMETRY_TEST_OVERLAY_P_Q_HPP
#include <fstream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
// #define BOOST_GEOMETRY_ROBUSTNESS_USE_DIFFERENCE
@@ -91,7 +91,7 @@
<< " sum d: " << sum_d
#endif
<< std::endl
- << boost::detail::setprecision(20)
+ << std::setprecision(20)
<< " p: " << bg::wkt(p) << std::endl
<< " q: " << bg::wkt(q) << std::endl
;
Modified: trunk/libs/geometry/test/algorithms/overlay/self_intersection_points.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/self_intersection_points.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/self_intersection_points.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -7,7 +7,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <string>
#include <geometry_test_common.hpp>
@@ -65,7 +65,7 @@
x /= n;
y /= n;
}
- /*std::cout << boost::detail::setprecision(8) << x << ", " << y << " "
+ /*std::cout << std::setprecision(8) << x << ", " << y << " "
<< expected_count_and_center.get<1>()
<< " " << expected_count_and_center.get<2>()
<< std::endl;
Modified: trunk/libs/geometry/test/algorithms/overlay/split_rings.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/split_rings.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/split_rings.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -7,7 +7,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <string>
#include <geometry_test_common.hpp>
Modified: trunk/libs/geometry/test/algorithms/overlay/traverse.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/traverse.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/traverse.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -7,7 +7,7 @@
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <fstream>
#include <sstream>
#include <string>
@@ -104,7 +104,7 @@
G2 cg2 = g2;
bg::correct(cg1);
bg::correct(cg2);
- std::cout << boost::detail::setprecision(12)
+ std::cout << std::setprecision(12)
<< bg::wkt(cg1) << std::endl
<< bg::wkt(cg2) << std::endl;
}
@@ -269,7 +269,7 @@
/*out
- << boost::detail::setprecision(3)
+ << std::setprecision(3)
<< "dist: " << boost::numeric_cast<double>(turn.operations[0].enriched.distance)
<< " / " << boost::numeric_cast<double>(turn.operations[1].enriched.distance)
<< std::endl
@@ -304,7 +304,7 @@
<< "/" << turn.operations[1].enriched.travels_to_vertex_index
<< std::endl
- << boost::detail::setprecision(3)
+ << std::setprecision(3)
<< "dist: " << turn.operations[0].enriched.distance
<< " / " << turn.operations[1].enriched.distance
<< std::endl
Modified: trunk/libs/geometry/test/algorithms/overlay/traverse_gmp.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/traverse_gmp.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/traverse_gmp.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -15,7 +15,7 @@
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <string>
#include <fstream>
@@ -158,9 +158,9 @@
{
typedef bg::model::polygon<P> polygon;
std::cout << typeid(typename bg::coordinate_type<P>::type).name() << std::endl;
- std::cout << boost::detail::setprecision(30) << std::numeric_limits<float>::epsilon() << std::endl;
- std::cout << boost::detail::setprecision(30) << std::numeric_limits<double>::epsilon() << std::endl;
- std::cout << boost::detail::setprecision(30) << std::numeric_limits<long double>::epsilon() << std::endl;
+ std::cout << std::setprecision(30) << std::numeric_limits<float>::epsilon() << std::endl;
+ std::cout << std::setprecision(30) << std::numeric_limits<double>::epsilon() << std::endl;
+ std::cout << std::setprecision(30) << std::numeric_limits<long double>::epsilon() << std::endl;
static std::string brandon[3] =
{
Modified: trunk/libs/geometry/test/algorithms/test_centroid.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_centroid.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_centroid.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -59,7 +59,7 @@
bg::centroid(geometry, c2,
bg::strategy::centroid::bashein_detmer<point_type, point_type, CalculationType>());
- std::cout << typeid(CalculationType).name() << ": " << boost::detail::setprecision(20)
+ std::cout << typeid(CalculationType).name() << ": " << std::setprecision(20)
<< bg::get<0>(c2) << " " << bg::get<1>(c2)
<< " -> difference: " << bg::distance(c1, c2)
<< std::endl;
@@ -76,7 +76,7 @@
check_result<bg::dimension<Geometry>::type::value>::apply(c1, x, y, z);
#ifdef REPORT_RESULTS
- std::cout << "normal: " << boost::detail::setprecision(20) << bg::get<0>(c1) << " " << bg::get<1>(c1) << std::endl;
+ std::cout << "normal: " << std::setprecision(20) << bg::get<0>(c1) << " " << bg::get<1>(c1) << std::endl;
//test_with_other_calculation_type<long long>(geometry, c1);
test_with_other_calculation_type<float>(geometry, c1);
Modified: trunk/libs/geometry/test/algorithms/test_difference.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_difference.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_difference.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -9,7 +9,7 @@
#define BOOST_GEOMETRY_TEST_DIFFERENCE_HPP
#include <fstream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <boost/foreach.hpp>
#include <geometry_test_common.hpp>
Modified: trunk/libs/geometry/test/algorithms/test_intersection.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_intersection.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_intersection.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -9,7 +9,7 @@
#define BOOST_GEOMETRY_TEST_INTERSECTION_HPP
#include <fstream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <boost/foreach.hpp>
#include <geometry_test_common.hpp>
@@ -97,7 +97,7 @@
/*
std::cout << std::endl << "case " << caseid << " ";
std::cout
- << boost::detail::setprecision(20)
+ << std::setprecision(20)
<< bg::dsv(*it) << std::endl;
*/
}
Modified: trunk/libs/geometry/test/extensions/algorithms/buffer/test_buffer.hpp
==============================================================================
--- trunk/libs/geometry/test/extensions/algorithms/buffer/test_buffer.hpp (original)
+++ trunk/libs/geometry/test/extensions/algorithms/buffer/test_buffer.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -25,7 +25,7 @@
#endif
#include <fstream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <boost/foreach.hpp>
#include <geometry_test_common.hpp>
Modified: trunk/libs/geometry/test/extensions/gis/projections/projections.cpp
==============================================================================
--- trunk/libs/geometry/test/extensions/gis/projections/projections.cpp (original)
+++ trunk/libs/geometry/test/extensions/gis/projections/projections.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -70,7 +70,7 @@
P xy;
prj->forward(ll, xy);
- //std::cout << boost::detail::setprecision(16) << bg::get<0>(xy) << " " << bg::get<1>(xy) << std::endl;
+ //std::cout << std::setprecision(16) << bg::get<0>(xy) << " " << bg::get<1>(xy) << std::endl;
check(bg::get<0>(xy), x, name, "x");
check(bg::get<1>(xy), y, name, "y");
@@ -98,7 +98,7 @@
lonlat_type ll;
prj->inverse(xy, ll);
- //std::cout << boost::detail::setprecision(16) << bg::get<0>(ll) << " " << bg::get<1>(ll) << std::endl;
+ //std::cout << std::setprecision(16) << bg::get<0>(ll) << " " << bg::get<1>(ll) << std::endl;
check(bg::get<0>(ll), lon, name, "lon");
check(bg::get<1>(ll), lat, name, "lat");
Modified: trunk/libs/geometry/test/strategies/pythagoras.cpp
==============================================================================
--- trunk/libs/geometry/test/strategies/pythagoras.cpp (original)
+++ trunk/libs/geometry/test/strategies/pythagoras.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -201,7 +201,7 @@
/***
std::cout << typeid(CalculationType).name()
- << " " << std::fixed << boost::detail::setprecision(20) << d
+ << " " << std::fixed << std::setprecision(20) << d
<< std::endl << std::endl;
***/
Modified: trunk/libs/graph/example/bellman-example.cpp
==============================================================================
--- trunk/libs/graph/example/bellman-example.cpp (original)
+++ trunk/libs/graph/example/bellman-example.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -9,7 +9,7 @@
#include <vector>
#include <iostream>
#include <fstream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/bellman_ford_shortest_paths.hpp>
@@ -95,7 +95,7 @@
if (r)
for (i = 0; i < N; ++i)
- std::cout << name[i] << ": " << boost::detail::setw(3) << distance[i]
+ std::cout << name[i] << ": " << std::setw(3) << distance[i]
<< " " << name[parent[i]] << std::endl;
else
std::cout << "negative cycle" << std::endl;
Modified: trunk/libs/graph/example/closeness_centrality.cpp
==============================================================================
--- trunk/libs/graph/example/closeness_centrality.cpp (original)
+++ trunk/libs/graph/example/closeness_centrality.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -6,7 +6,7 @@
//[closeness_centrality_example
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <boost/graph/undirected_graph.hpp>
#include <boost/graph/exterior_property.hpp>
@@ -76,7 +76,7 @@
// Print the closeness centrality of each vertex.
graph_traits<Graph>::vertex_iterator i, end;
for(tie(i, end) = vertices(g); i != end; ++i) {
- cout << boost::detail::setw(12) << boost::detail::setiosflags(ios::left)
+ cout << setw(12) << setiosflags(ios::left)
<< g[*i].name << get(cm, *i) << endl;
}
Modified: trunk/libs/graph/example/clustering_coefficient.cpp
==============================================================================
--- trunk/libs/graph/example/clustering_coefficient.cpp (original)
+++ trunk/libs/graph/example/clustering_coefficient.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -7,7 +7,7 @@
//[code_clustering_coefficient
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <boost/graph/undirected_graph.hpp>
#include <boost/graph/exterior_property.hpp>
@@ -59,7 +59,7 @@
// Print the clustering coefficient of each vertex.
graph_traits<Graph>::vertex_iterator i, end;
for(tie(i, end) = vertices(g); i != end; ++i) {
- cout << boost::detail::setw(12) << boost::detail::setiosflags(ios::left)
+ cout << setw(12) << setiosflags(ios::left)
<< g[*i].name << get(cm, *i) << endl;
}
cout << "mean clustering coefficient: " << cc << endl;
Modified: trunk/libs/graph/example/degree_centrality.cpp
==============================================================================
--- trunk/libs/graph/example/degree_centrality.cpp (original)
+++ trunk/libs/graph/example/degree_centrality.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -7,7 +7,7 @@
//[degree_centrality_example
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <boost/graph/undirected_graph.hpp>
#include <boost/graph/exterior_property.hpp>
@@ -58,7 +58,7 @@
// Print the degree centrality of each vertex.
graph_traits<Graph>::vertex_iterator i, end;
for(tie(i, end) = vertices(g); i != end; ++i) {
- cout << boost::detail::setiosflags(ios::left) << boost::detail::setw(12)
+ cout << setiosflags(ios::left) << setw(12)
<< g[*i].name << cm[*i] << endl;
}
Modified: trunk/libs/graph/example/eccentricity.cpp
==============================================================================
--- trunk/libs/graph/example/eccentricity.cpp (original)
+++ trunk/libs/graph/example/eccentricity.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -7,7 +7,7 @@
//[eccentricity_example
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <boost/graph/undirected_graph.hpp>
#include <boost/graph/exterior_property.hpp>
@@ -78,7 +78,7 @@
// Print the closeness centrality of each vertex.
graph_traits<Graph>::vertex_iterator i, end;
for(boost::tie(i, end) = vertices(g); i != end; ++i) {
- cout << boost::detail::setw(12) << boost::detail::setiosflags(ios::left)
+ cout << setw(12) << setiosflags(ios::left)
<< g[*i].name << get(em, *i) << endl;
}
cout << "radius: " << r << endl;
Modified: trunk/libs/graph/example/inclusive_mean_geodesic.cpp
==============================================================================
--- trunk/libs/graph/example/inclusive_mean_geodesic.cpp (original)
+++ trunk/libs/graph/example/inclusive_mean_geodesic.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -6,7 +6,7 @@
//[inclusive_mean_geodesic_example
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <boost/graph/directed_graph.hpp>
#include <boost/graph/exterior_property.hpp>
@@ -117,15 +117,15 @@
// Print the mean geodesic distance of each vertex and finally,
// the graph itself.
- cout << boost::detail::setw(12) << boost::detail::setiosflags(ios::left) << "vertex";
- cout << boost::detail::setw(12) << boost::detail::setiosflags(ios::left) << "excluding";
- cout << boost::detail::setw(12) << boost::detail::setiosflags(ios::left) << "including" << endl;
+ cout << setw(12) << setiosflags(ios::left) << "vertex";
+ cout << setw(12) << setiosflags(ios::left) << "excluding";
+ cout << setw(12) << setiosflags(ios::left) << "including" << endl;
graph_traits<Graph>::vertex_iterator i, end;
for(tie(i, end) = vertices(g); i != end; ++i) {
- cout << boost::detail::setw(12) << boost::detail::setiosflags(ios::left)
+ cout << setw(12) << setiosflags(ios::left)
<< g[*i].name
- << boost::detail::setw(12) << get(exmap, *i)
- << boost::detail::setw(12) << get(inmap, *i) << endl;
+ << setw(12) << get(exmap, *i)
+ << setw(12) << get(inmap, *i) << endl;
}
cout << "small world (excluding self-loops): " << ex << endl;
cout << "small world (including self-loops): " << in << endl;
Modified: trunk/libs/graph/example/influence_prestige.cpp
==============================================================================
--- trunk/libs/graph/example/influence_prestige.cpp (original)
+++ trunk/libs/graph/example/influence_prestige.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -6,7 +6,7 @@
//[influence_prestige_example
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <boost/graph/directed_graph.hpp>
#include <boost/graph/exterior_property.hpp>
@@ -64,8 +64,7 @@
graph_traits<Graph>::vertex_iterator i, end;
for(tie(i, end) = vertices(g); i != end; ++i) {
Vertex v = *i;
- cout << ::boost::detail::setiosflags(ios::left)
- << ::boost::detail::setw(12)
+ cout << setiosflags(ios::left) << setw(12)
<< g[v].name << "\t"
<< im[v] << "\t"
<< pm[v] << endl;
Modified: trunk/libs/graph/example/johnson-eg.cpp
==============================================================================
--- trunk/libs/graph/example/johnson-eg.cpp (original)
+++ trunk/libs/graph/example/johnson-eg.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -9,7 +9,7 @@
#include <fstream>
#include <iostream>
#include <vector>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <boost/property_map/property_map.hpp>
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/graphviz.hpp>
@@ -52,15 +52,15 @@
std::cout << " ";
for (int k = 0; k < V; ++k)
- std::cout << boost::detail::setw(5) << k;
+ std::cout << std::setw(5) << k;
std::cout << std::endl;
for (int i = 0; i < V; ++i) {
- std::cout << boost::detail::setw(3) << i << " -> ";
+ std::cout << std::setw(3) << i << " -> ";
for (int j = 0; j < V; ++j) {
if (D[i][j] == (std::numeric_limits<int>::max)())
- std::cout << boost::detail::setw(5) << "inf";
+ std::cout << std::setw(5) << "inf";
else
- std::cout << boost::detail::setw(5) << D[i][j];
+ std::cout << std::setw(5) << D[i][j];
}
std::cout << std::endl;
}
Modified: trunk/libs/graph/example/mean_geodesic.cpp
==============================================================================
--- trunk/libs/graph/example/mean_geodesic.cpp (original)
+++ trunk/libs/graph/example/mean_geodesic.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -6,7 +6,7 @@
//[mean_geodesic_example
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <boost/graph/undirected_graph.hpp>
#include <boost/graph/exterior_property.hpp>
@@ -78,7 +78,7 @@
// the graph itself.
graph_traits<Graph>::vertex_iterator i, end;
for(tie(i, end) = vertices(g); i != end; ++i) {
- cout << boost::detail::setw(12) << boost::detail::setiosflags(ios::left)
+ cout << setw(12) << setiosflags(ios::left)
<< g[*i].name << get(gm, *i) << endl;
}
cout << "small world distance: " << sw << endl;
Modified: trunk/libs/graph/example/scaled_closeness_centrality.cpp
==============================================================================
--- trunk/libs/graph/example/scaled_closeness_centrality.cpp (original)
+++ trunk/libs/graph/example/scaled_closeness_centrality.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -6,7 +6,7 @@
//[scaled_closeness_centrality_example
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <boost/graph/undirected_graph.hpp>
#include <boost/graph/exterior_property.hpp>
@@ -105,7 +105,7 @@
// Print the scaled closeness centrality of each vertex.
graph_traits<Graph>::vertex_iterator i, end;
for(tie(i, end) = vertices(g); i != end; ++i) {
- cout << boost::detail::setw(12) << boost::detail::setiosflags(ios::left)
+ cout << setw(12) << setiosflags(ios::left)
<< g[*i].name << get(cm, *i) << endl;
}
Modified: trunk/libs/graph/test/bellman-test.cpp
==============================================================================
--- trunk/libs/graph/test/bellman-test.cpp (original)
+++ trunk/libs/graph/test/bellman-test.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -14,7 +14,7 @@
*/
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/bellman_ford_shortest_paths.hpp>
#include <boost/cstdlib.hpp>
@@ -66,9 +66,9 @@
for(int i = 0; i < numVertex; ++i) {
std::cout << name[i] << ": ";
if (distance[i] == inf)
- std::cout << boost::detail::setw(3) << "inf";
+ std::cout << std::setw(3) << "inf";
else
- std::cout << boost::detail::setw(3) << distance[i];
+ std::cout << std::setw(3) << distance[i];
std::cout << " " << name[parent[i]] << std::endl;
}
} else {
@@ -87,9 +87,9 @@
for(int i = 0; i < numVertex; ++i) {
std::cout << name[i] << ": ";
if (distance2[i] == inf)
- std::cout << boost::detail::setw(3) << "inf";
+ std::cout << std::setw(3) << "inf";
else
- std::cout << boost::detail::setw(3) << distance2[i];
+ std::cout << std::setw(3) << distance2[i];
std::cout << " " << name[parent2[i]] << std::endl;
}
} else {
Modified: trunk/libs/graph/test/johnson-test.cpp
==============================================================================
--- trunk/libs/graph/test/johnson-test.cpp (original)
+++ trunk/libs/graph/test/johnson-test.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -26,7 +26,7 @@
#include <fstream>
#include <iostream>
#include <vector>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <boost/property_map/property_map.hpp>
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/graphviz.hpp>
@@ -63,14 +63,14 @@
int D[V][V];
johnson_all_pairs_shortest_paths(g, D, distance_map(&d[0]));
- std::cout << boost::detail::setw(5) <<" ";
+ std::cout << std::setw(5) <<" ";
for (int k = 0; k < 10; ++k)
- std::cout << boost::detail::setw(5) << k ;
+ std::cout << std::setw(5) << k ;
std::cout << std::endl;
for (int i = 0; i < 10; ++i) {
- std::cout <<boost::detail::setw(5) << i ;
+ std::cout <<std::setw(5) << i ;
for (int j = 0; j < 10; ++j) {
- std::cout << boost::detail::setw(5) << D[i][j] ;
+ std::cout << std::setw(5) << D[i][j] ;
}
std::cout << std::endl;
}
Modified: trunk/libs/graph_parallel/test/algorithm_performance.cpp
==============================================================================
--- trunk/libs/graph_parallel/test/algorithm_performance.cpp (original)
+++ trunk/libs/graph_parallel/test/algorithm_performance.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -36,7 +36,7 @@
#include <sys/time.h>
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <vector>
#include <stdint.h>
@@ -64,7 +64,7 @@
std::string print_time(time_type t)
{
std::ostringstream out;
- out << boost::detail::setiosflags(std::ios::fixed) << boost::detail::setprecision(2) << t;
+ out << std::setiosflags(std::ios::fixed) << std::setprecision(2) << t;
return out.str();
}
Modified: trunk/libs/graph_parallel/test/distributed_connected_components_test.cpp
==============================================================================
--- trunk/libs/graph_parallel/test/distributed_connected_components_test.cpp (original)
+++ trunk/libs/graph_parallel/test/distributed_connected_components_test.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -21,7 +21,7 @@
#include <boost/graph/distributed/graphviz.hpp>
#include <iostream>
#include <cstdlib>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <boost/random.hpp>
#include <boost/test/minimal.hpp>
@@ -50,7 +50,7 @@
std::string print_time(time_type t)
{
std::ostringstream out;
- out << boost::detail::setiosflags(std::ios::fixed) << boost::detail::setprecision(2) << t;
+ out << std::setiosflags(std::ios::fixed) << std::setprecision(2) << t;
return out.str();
}
Modified: trunk/libs/graph_parallel/test/distributed_dimacs_reader.cpp
==============================================================================
--- trunk/libs/graph_parallel/test/distributed_dimacs_reader.cpp (original)
+++ trunk/libs/graph_parallel/test/distributed_dimacs_reader.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -20,7 +20,7 @@
#include <iostream>
#include <cstdlib>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <fstream>
#ifdef BOOST_NO_EXCEPTIONS
@@ -46,7 +46,7 @@
std::string print_time(time_type t)
{
std::ostringstream out;
- out << boost::detail::setiosflags(std::ios::fixed) << boost::detail::setprecision(2) << t;
+ out << std::setiosflags(std::ios::fixed) << std::setprecision(2) << t;
return out.str();
}
Modified: trunk/libs/graph_parallel/test/distributed_rmat_cc.cpp
==============================================================================
--- trunk/libs/graph_parallel/test/distributed_rmat_cc.cpp (original)
+++ trunk/libs/graph_parallel/test/distributed_rmat_cc.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -24,7 +24,7 @@
#include <iostream>
#include <cstdlib>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#ifdef BOOST_NO_EXCEPTIONS
void
@@ -48,7 +48,7 @@
std::string print_time(time_type t)
{
std::ostringstream out;
- out << boost::detail::setiosflags(std::ios::fixed) << boost::detail::setprecision(2) << t;
+ out << std::setiosflags(std::ios::fixed) << std::setprecision(2) << t;
return out.str();
}
Modified: trunk/libs/graph_parallel/test/distributed_rmat_cc_ps.cpp
==============================================================================
--- trunk/libs/graph_parallel/test/distributed_rmat_cc_ps.cpp (original)
+++ trunk/libs/graph_parallel/test/distributed_rmat_cc_ps.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -24,7 +24,7 @@
#include <iostream>
#include <cstdlib>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#ifdef BOOST_NO_EXCEPTIONS
void
@@ -48,7 +48,7 @@
std::string print_time(time_type t)
{
std::ostringstream out;
- out << boost::detail::setiosflags(std::ios::fixed) << boost::detail::setprecision(2) << t;
+ out << std::setiosflags(std::ios::fixed) << std::setprecision(2) << t;
return out.str();
}
Modified: trunk/libs/graph_parallel/test/distributed_rmat_pagerank.cpp
==============================================================================
--- trunk/libs/graph_parallel/test/distributed_rmat_pagerank.cpp (original)
+++ trunk/libs/graph_parallel/test/distributed_rmat_pagerank.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -24,7 +24,7 @@
#include <iostream>
#include <cstdlib>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#ifdef BOOST_NO_EXCEPTIONS
void
@@ -48,7 +48,7 @@
std::string print_time(time_type t)
{
std::ostringstream out;
- out << boost::detail::setiosflags(std::ios::fixed) << boost::detail::setprecision(2) << t;
+ out << std::setiosflags(std::ios::fixed) << std::setprecision(2) << t;
return out.str();
}
Modified: trunk/libs/graph_parallel/test/distributed_shortest_paths_test.cpp
==============================================================================
--- trunk/libs/graph_parallel/test/distributed_shortest_paths_test.cpp (original)
+++ trunk/libs/graph_parallel/test/distributed_shortest_paths_test.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -23,7 +23,7 @@
#include <boost/graph/iteration_macros.hpp>
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#ifdef BOOST_NO_EXCEPTIONS
void
@@ -47,7 +47,7 @@
std::string print_time(time_type t)
{
std::ostringstream out;
- out << boost::detail::setiosflags(std::ios::fixed) << boost::detail::setprecision(2) << t;
+ out << std::setiosflags(std::ios::fixed) << std::setprecision(2) << t;
return out.str();
}
Modified: trunk/libs/graph_parallel/test/distributed_st_connected_test.cpp
==============================================================================
--- trunk/libs/graph_parallel/test/distributed_st_connected_test.cpp (original)
+++ trunk/libs/graph_parallel/test/distributed_st_connected_test.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -19,7 +19,7 @@
#include <boost/graph/small_world_generator.hpp>
#include <iostream>
#include <cstdlib>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <boost/random.hpp>
#include <boost/test/minimal.hpp>
Modified: trunk/libs/graph_parallel/test/distributed_strong_components_test.cpp
==============================================================================
--- trunk/libs/graph_parallel/test/distributed_strong_components_test.cpp (original)
+++ trunk/libs/graph_parallel/test/distributed_strong_components_test.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -33,7 +33,7 @@
#include <boost/graph/distributed/graphviz.hpp>
#include <iostream>
#include <cstdlib>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <boost/random.hpp>
#include <boost/test/minimal.hpp>
@@ -56,7 +56,7 @@
std::string print_time(time_type t)
{
std::ostringstream out;
- out << boost::detail::setiosflags(std::ios::fixed) << boost::detail::setprecision(2) << t;
+ out << std::setiosflags(std::ios::fixed) << std::setprecision(2) << t;
return out.str();
}
Modified: trunk/libs/graph_parallel/test/mesh_generator_test.cpp
==============================================================================
--- trunk/libs/graph_parallel/test/mesh_generator_test.cpp (original)
+++ trunk/libs/graph_parallel/test/mesh_generator_test.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -18,7 +18,7 @@
#include <boost/graph/iteration_macros.hpp>
#include <iostream>
#include <sstream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <string>
#include <boost/test/minimal.hpp>
@@ -47,7 +47,7 @@
std::string print_time(time_type t)
{
std::ostringstream out;
- out << boost::detail::setiosflags(std::ios::fixed) << boost::detail::setprecision(2) << t;
+ out << std::setiosflags(std::ios::fixed) << std::setprecision(2) << t;
return out.str();
}
Modified: trunk/libs/graph_parallel/test/ssca.cpp
==============================================================================
--- trunk/libs/graph_parallel/test/ssca.cpp (original)
+++ trunk/libs/graph_parallel/test/ssca.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -51,7 +51,7 @@
#include <vector>
#include <string>
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <fstream>
#include <string>
#include <sstream>
@@ -80,7 +80,7 @@
std::string print_time(time_type t)
{
std::ostringstream out;
- out << boost::detail::setiosflags(std::ios::fixed) << boost::detail::setprecision(2) << t;
+ out << std::setiosflags(std::ios::fixed) << std::setprecision(2) << t;
return out.str();
}
Modified: trunk/libs/interprocess/example/Jamfile.v2
==============================================================================
--- trunk/libs/interprocess/example/Jamfile.v2 (original)
+++ trunk/libs/interprocess/example/Jamfile.v2 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -48,4 +48,4 @@
return $(all_rules) ;
}
-test-suite interprocess_example : [ test_all r ] : <threading>multi ;
+test-suite interprocess_example : [ test_all r ] : <threading>multi ;
\ No newline at end of file
Modified: trunk/libs/io/test/ios_state_test.cpp
==============================================================================
--- trunk/libs/io/test/ios_state_test.cpp (original)
+++ trunk/libs/io/test/ios_state_test.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -16,7 +16,7 @@
#include <boost/io/ios_state.hpp> // for boost::io::ios_flags_saver, etc.
#include <cstddef> // for std::size_t
-#include <boost/detail/iomanip.hpp> // for boost::detail::setw
+#include <iomanip> // for std::setw
#include <ios> // for std::ios_base, std::streamsize, etc.
#include <iostream> // for std::cout, etc.
#include <istream> // for std::istream
@@ -143,7 +143,7 @@
{
using std::locale;
using std::ios_base;
- using boost::detail::setw;
+ using std::setw;
boost::io::ios_flags_saver const ifls( output );
boost::io::ios_precision_saver const iprs( output );
@@ -168,8 +168,8 @@
output.fill( '@' );
output.precision( 9 );
output << '\t' << test_string << '\n';
- output << '\t' << boost::detail::setw( 10 ) << test_num1 << '\n';
- output << '\t' << boost::detail::setw( 15 ) << test_num2 << '\n';
+ output << '\t' << setw( 10 ) << test_num1 << '\n';
+ output << '\t' << setw( 15 ) << test_num2 << '\n';
output.imbue( loc );
output << '\t' << test_bool << '\n';
Modified: trunk/libs/io/test/ios_state_unit_test.cpp
==============================================================================
--- trunk/libs/io/test/ios_state_unit_test.cpp (original)
+++ trunk/libs/io/test/ios_state_unit_test.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -13,7 +13,7 @@
#include <boost/test/unit_test.hpp> // for main, BOOST_CHECK, etc.
#include <cstddef> // for NULL
-#include <boost/detail/iomanip.hpp> // for boost::detail::setiosflags, etc.
+#include <iomanip> // for std::setiosflags, etc.
#include <ios> // for std::ios_base
#include <iostream> // for std::cout, std::cerr, etc.
#include <istream> // for std::iostream
@@ -77,7 +77,7 @@
BOOST_CHECK_EQUAL( (ios_base::showbase | ios_base::internal),
ss.flags() );
- ss << boost::detail::setiosflags( ios_base::unitbuf );
+ ss << setiosflags( ios_base::unitbuf );
BOOST_CHECK_EQUAL( (ios_base::showbase | ios_base::internal
| ios_base::unitbuf), ss.flags() );
}
@@ -102,7 +102,7 @@
BOOST_CHECK_EQUAL( 6, ss.precision() );
- ss << boost::detail::setprecision( 4 );
+ ss << setprecision( 4 );
BOOST_CHECK_EQUAL( 4, ss.precision() );
}
@@ -113,7 +113,7 @@
BOOST_CHECK_EQUAL( 8, ss.precision() );
- ss << boost::detail::setprecision( 10 );
+ ss << setprecision( 10 );
BOOST_CHECK_EQUAL( 10, ss.precision() );
}
@@ -137,7 +137,7 @@
BOOST_CHECK_EQUAL( 0, ss.width() );
- ss << boost::detail::setw( 4 );
+ ss << setw( 4 );
BOOST_CHECK_EQUAL( 4, ss.width() );
}
@@ -148,7 +148,7 @@
BOOST_CHECK_EQUAL( 8, ss.width() );
- ss << boost::detail::setw( 10 );
+ ss << setw( 10 );
BOOST_CHECK_EQUAL( 10, ss.width() );
}
@@ -507,7 +507,7 @@
BOOST_CHECK_EQUAL( 6, ss.precision() );
BOOST_CHECK_EQUAL( 0, ss.width() );
- ss << hex << unitbuf << boost::detail::setprecision( 5 ) << boost::detail::setw( 7 );
+ ss << hex << unitbuf << setprecision( 5 ) << setw( 7 );
BOOST_CHECK_EQUAL( (ios_base::unitbuf | ios_base::hex
| ios_base::skipws), ss.flags() );
BOOST_CHECK_EQUAL( 5, ss.precision() );
@@ -560,10 +560,10 @@
ss << oct << showpos << noskipws;
BOOST_CHECK_EQUAL( (ios_base::showpos | ios_base::oct), ss.flags() );
- ss << boost::detail::setprecision( 3 );
+ ss << setprecision( 3 );
BOOST_CHECK_EQUAL( 3, ss.precision() );
- ss << boost::detail::setw( 9 );
+ ss << setw( 9 );
BOOST_CHECK_EQUAL( 9, ss.width() );
ss.setstate( ios_base::eofbit );
@@ -586,7 +586,7 @@
ss.rdbuf( cerr.rdbuf() );
BOOST_CHECK_EQUAL( cerr.rdbuf(), ss.rdbuf() );
- ss << boost::detail::setfill( 'x' );
+ ss << setfill( 'x' );
BOOST_CHECK_EQUAL( 'x', ss.fill() );
ss.imbue( locale(locale::classic(), new backward_bool_names) );
Modified: trunk/libs/math/build/Jamfile.v2
==============================================================================
--- trunk/libs/math/build/Jamfile.v2 (original)
+++ trunk/libs/math/build/Jamfile.v2 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -7,7 +7,7 @@
import pch ;
project
- : requirements
+ : requirements
<toolset>intel-win:<cxxflags>-nologo
<toolset>intel-win:<linkflags>-nologo
#<toolset>intel-linux:<pch>off
Modified: trunk/libs/math/example/Jamfile.v2
==============================================================================
--- trunk/libs/math/example/Jamfile.v2 (original)
+++ trunk/libs/math/example/Jamfile.v2 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -10,8 +10,6 @@
project
: requirements
- <toolset>pathscale:<cxxflags>-Wno-missing-braces
- <toolset>clang:<cxxflags>-Wno-missing-braces
<toolset>gcc:<cxxflags>-Wno-missing-braces
<toolset>darwin:<cxxflags>-Wno-missing-braces
<toolset>acc:<cxxflags>+W2068,2461,2236,4070
Modified: trunk/libs/math/example/binomial_coinflip_example.cpp
==============================================================================
--- trunk/libs/math/example/binomial_coinflip_example.cpp (original)
+++ trunk/libs/math/example/binomial_coinflip_example.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -46,11 +46,10 @@
#include <boost/math/distributions/binomial.hpp>
using boost::math::binomial;
-#include <ios>
#include <iostream>
using std::cout; using std::endl; using std::left;
-#include <boost/detail/iomanip.hpp>
- using boost::detail::setw;
+#include <iomanip>
+ using std::setw;
int main()
{
@@ -142,7 +141,7 @@
for (int successes = 0; successes <= flips; successes++)
{ // Say success means getting a head (or equally success means getting a tail).
double probability = pdf(flip, successes);
- cout << left << boost::detail::setw(2) << successes << " " << boost::detail::setw(10)
+ cout << left << setw(2) << successes << " " << setw(10)
<< probability << " or 1 in " << 1. / probability
<< ", or " << probability * 100. << "%" << endl;
} // for i
@@ -154,7 +153,7 @@
{ // Say success means getting a head
// (equally success could mean getting a tail).
double probability = cdf(flip, successes); // P(X <= heads)
- cout << boost::detail::setw(2) << successes << " " << boost::detail::setw(10) << left
+ cout << setw(2) << successes << " " << setw(10) << left
<< probability << " or 1 in " << 1. / probability << ", or "
<< probability * 100. << "%"<< endl;
} // for i
Modified: trunk/libs/math/example/binomial_confidence_limits.cpp
==============================================================================
--- trunk/libs/math/example/binomial_confidence_limits.cpp (original)
+++ trunk/libs/math/example/binomial_confidence_limits.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -12,12 +12,11 @@
# pragma warning(disable: 4610) // can never be instantiated - user defined constructor required.
#endif
-#include <ios>
-#include <boost/detail/iomanip.hpp>
#include <iostream>
using std::cout; using std::endl;
-using std::fixed; using std::left; using std::right; using std::right; using boost::detail::setw;
-using boost::detail::setprecision;
+#include <iomanip>
+using std::fixed; using std::left; using std::right; using std::right; using std::setw;
+using std::setprecision;
#include <boost/math/distributions/binomial.hpp>
@@ -39,10 +38,10 @@
"___________________________________________\n"
"2-Sided Confidence Limits For Success Ratio\n"
"___________________________________________\n\n";
- cout << boost::detail::setprecision(7);
- cout << boost::detail::setw(40) << left << "Number of Observations" << "= " << trials << "\n";
- cout << boost::detail::setw(40) << left << "Number of successes" << "= " << successes << "\n";
- cout << boost::detail::setw(40) << left << "Sample frequency of occurrence" << "= " << double(successes) / trials << "\n";
+ cout << setprecision(7);
+ cout << setw(40) << left << "Number of Observations" << "= " << trials << "\n";
+ cout << setw(40) << left << "Number of successes" << "= " << successes << "\n";
+ cout << setw(40) << left << "Sample frequency of occurrence" << "= " << double(successes) / trials << "\n";
//
// Define a table of significance levels:
//
@@ -61,19 +60,19 @@
for(unsigned i = 0; i < sizeof(alpha)/sizeof(alpha[0]); ++i)
{
// Confidence value:
- cout << fixed << boost::detail::setprecision(3) << boost::detail::setw(10) << right << 100 * (1-alpha[i]);
+ cout << fixed << setprecision(3) << setw(10) << right << 100 * (1-alpha[i]);
// Calculate Clopper Pearson bounds:
double l = binomial_distribution<>::find_lower_bound_on_p(trials, successes, alpha[i]/2);
double u = binomial_distribution<>::find_upper_bound_on_p(trials, successes, alpha[i]/2);
// Print Clopper Pearson Limits:
- cout << fixed << boost::detail::setprecision(5) << boost::detail::setw(15) << right << l;
- cout << fixed << boost::detail::setprecision(5) << boost::detail::setw(15) << right << u;
+ cout << fixed << setprecision(5) << setw(15) << right << l;
+ cout << fixed << setprecision(5) << setw(15) << right << u;
// Calculate Jeffreys Prior Bounds:
l = binomial_distribution<>::find_lower_bound_on_p(trials, successes, alpha[i]/2, binomial_distribution<>::jeffreys_prior_interval);
u = binomial_distribution<>::find_upper_bound_on_p(trials, successes, alpha[i]/2, binomial_distribution<>::jeffreys_prior_interval);
// Print Jeffreys Prior Limits:
- cout << fixed << boost::detail::setprecision(5) << boost::detail::setw(15) << right << l;
- cout << fixed << boost::detail::setprecision(5) << boost::detail::setw(15) << right << u << std::endl;
+ cout << fixed << setprecision(5) << setw(15) << right << l;
+ cout << fixed << setprecision(5) << setw(15) << right << u << std::endl;
}
cout << endl;
} // void confidence_limits_on_frequency()
Modified: trunk/libs/math/example/binomial_example_nag.cpp
==============================================================================
--- trunk/libs/math/example/binomial_example_nag.cpp (original)
+++ trunk/libs/math/example/binomial_example_nag.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -16,11 +16,10 @@
#include <boost/math/distributions/binomial.hpp>
-#include <ios>
#include <iostream>
using std::cout; using std::endl; using std::ios; using std::showpoint;
-#include <boost/detail/iomanip.hpp>
- using std::fixed; using boost::detail::setw;
+#include <iomanip>
+ using std::fixed; using std::setw;
int main()
{
@@ -56,21 +55,21 @@
cout << " n p k plek pgtk peqk " << endl;
binomial_distribution<>my_dist(4, 0.5);
- cout << boost::detail::setw(4) << (int)my_dist.trials() << " " << my_dist.success_fraction()
+ cout << setw(4) << (int)my_dist.trials() << " " << my_dist.success_fraction()
<< " " << 2 << " " << cdf(my_dist, 2) << " "
<< cdf(complement(my_dist, 2)) << " " << pdf(my_dist, 2) << endl;
binomial_distribution<>two(19, 0.440);
- cout << boost::detail::setw(4) << (int)two.trials() << " " << two.success_fraction()
+ cout << setw(4) << (int)two.trials() << " " << two.success_fraction()
<< " " << 13 << " " << cdf(two, 13) << " "
<< cdf(complement(two, 13)) << " " << pdf(two, 13) << endl;
binomial_distribution<>three(100, 0.750);
- cout << boost::detail::setw(4) << (int)three.trials() << " " << three.success_fraction()
+ cout << setw(4) << (int)three.trials() << " " << three.success_fraction()
<< " " << 67 << " " << cdf(three, 67) << " " << cdf(complement(three, 67))
<< " " << pdf(three, 67) << endl;
binomial_distribution<>four(2000, 0.330);
- cout << boost::detail::setw(4) << (int)four.trials() << " " << four.success_fraction()
+ cout << setw(4) << (int)four.trials() << " " << four.success_fraction()
<< " " << 700 << " "
<< cdf(four, 700) << " " << cdf(complement(four, 700))
<< " " << pdf(four, 700) << endl;
Modified: trunk/libs/math/example/binomial_quiz_example.cpp
==============================================================================
--- trunk/libs/math/example/binomial_quiz_example.cpp (original)
+++ trunk/libs/math/example/binomial_quiz_example.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -33,12 +33,11 @@
#include <boost/math/distributions/binomial.hpp>
using boost::math::binomial;
-#include <ios>
#include <iostream>
using std::cout; using std::endl;
using std::ios; using std::flush; using std::left; using std::right; using std::fixed;
-#include <boost/detail/iomanip.hpp>
- using boost::detail::setw; using boost::detail::setprecision;
+#include <iomanip>
+ using std::setw; using std::setprecision;
#include <exception>
using std::exception;
@@ -94,7 +93,7 @@
for (int successes = 0; successes <= questions; successes++)
{
double probability = pdf(quiz, successes);
- cout << boost::detail::setw(2) << successes << " " << probability << endl;
+ cout << setw(2) << successes << " " << probability << endl;
}
cout << endl;
/*`
@@ -191,7 +190,7 @@
cout << "\n" "At most (<=)""\n""Guessed OK Probability" << right << endl;
for (int score = 0; score <= questions; score++)
{
- cout << boost::detail::setw(2) << score << " " << boost::detail::setprecision(10)
+ cout << setw(2) << score << " " << setprecision(10)
<< cdf(quiz, score) << endl;
}
cout << endl;
@@ -221,7 +220,7 @@
cout << "\n" "At least (>)""\n""Guessed OK Probability" << right << endl;
for (int score = 0; score <= questions; score++)
{
- cout << boost::detail::setw(2) << score << " " << boost::detail::setprecision(10)
+ cout << setw(2) << score << " " << setprecision(10)
<< cdf(complement(quiz, score)) << endl;
}
/*`
Modified: trunk/libs/math/example/binomial_sample_sizes.cpp
==============================================================================
--- trunk/libs/math/example/binomial_sample_sizes.cpp (original)
+++ trunk/libs/math/example/binomial_sample_sizes.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -12,12 +12,11 @@
# pragma warning(disable: 4610) // can never be instantiated - user defined constructor required.
#endif
-#include <ios>
-#include <boost/detail/iomanip.hpp>
#include <iostream>
using std::cout; using std::endl;
-using std::fixed; using std::left; using std::right; using std::right; using boost::detail::setw;
-using boost::detail::setprecision;
+#include <iomanip>
+using std::fixed; using std::left; using std::right; using std::right; using std::setw;
+using std::setprecision;
#include <boost/math/distributions/binomial.hpp>
@@ -41,9 +40,9 @@
"________________________\n"
"Maximum Number of Trials\n"
"________________________\n\n";
- cout << boost::detail::setprecision(7);
- cout << boost::detail::setw(40) << left << "Success ratio" << "= " << p << "\n";
- cout << boost::detail::setw(40) << left << "Maximum Number of \"successes\" permitted" << "= " << successes << "\n";
+ cout << setprecision(7);
+ cout << setw(40) << left << "Success ratio" << "= " << p << "\n";
+ cout << setw(40) << left << "Maximum Number of \"successes\" permitted" << "= " << successes << "\n";
//
// Define a table of confidence intervals:
//
@@ -62,12 +61,12 @@
for(unsigned i = 0; i < sizeof(alpha)/sizeof(alpha[0]); ++i)
{
// Confidence value:
- cout << fixed << boost::detail::setprecision(3) << boost::detail::setw(10) << right << 100 * (1-alpha[i]);
+ cout << fixed << setprecision(3) << setw(10) << right << 100 * (1-alpha[i]);
// calculate trials:
double t = binomial_distribution<>::find_maximum_number_of_trials(successes, p, alpha[i]);
t = floor(t);
// Print Trials:
- cout << fixed << boost::detail::setprecision(0) << boost::detail::setw(15) << right << t << endl;
+ cout << fixed << setprecision(0) << setw(15) << right << t << endl;
}
cout << endl;
}
Modified: trunk/libs/math/example/chi_square_std_dev_test.cpp
==============================================================================
--- trunk/libs/math/example/chi_square_std_dev_test.cpp (original)
+++ trunk/libs/math/example/chi_square_std_dev_test.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -6,13 +6,12 @@
// (See accompanying file LICENSE_1_0.txt
// or copy at http://www.boost.org/LICENSE_1_0.txt)
-#include <ios>
-#include <boost/detail/iomanip.hpp>
#include <iostream>
using std::cout; using std::endl;
using std::left; using std::fixed; using std::right; using std::scientific;
-using boost::detail::setw;
-using boost::detail::setprecision;
+#include <iomanip>
+using std::setw;
+using std::setprecision;
#include <boost/math/distributions/chi_squared.hpp>
@@ -42,9 +41,9 @@
"________________________________________________\n"
"2-Sided Confidence Limits For Standard Deviation\n"
"________________________________________________\n\n";
- cout << boost::detail::setprecision(7);
- cout << boost::detail::setw(40) << left << "Number of Observations" << "= " << N << "\n";
- cout << boost::detail::setw(40) << left << "Standard Deviation" << "= " << Sd << "\n";
+ cout << setprecision(7);
+ cout << setw(40) << left << "Number of Observations" << "= " << N << "\n";
+ cout << setw(40) << left << "Standard Deviation" << "= " << Sd << "\n";
//
// Define a table of significance/risk levels:
double alpha[] = { 0.5, 0.25, 0.1, 0.05, 0.01, 0.001, 0.0001, 0.00001 };
@@ -64,13 +63,13 @@
for(unsigned i = 0; i < sizeof(alpha)/sizeof(alpha[0]); ++i)
{
// Confidence value:
- cout << fixed << boost::detail::setprecision(3) << boost::detail::setw(10) << right << 100 * (1-alpha[i]);
+ cout << fixed << setprecision(3) << setw(10) << right << 100 * (1-alpha[i]);
// Calculate limits:
double lower_limit = sqrt((N - 1) * Sd * Sd / quantile(complement(dist, alpha[i] / 2)));
double upper_limit = sqrt((N - 1) * Sd * Sd / quantile(dist, alpha[i] / 2));
// Print Limits:
- cout << fixed << boost::detail::setprecision(5) << boost::detail::setw(15) << right << lower_limit;
- cout << fixed << boost::detail::setprecision(5) << boost::detail::setw(15) << right << upper_limit << endl;
+ cout << fixed << setprecision(5) << setw(15) << right << lower_limit;
+ cout << fixed << setprecision(5) << setw(15) << right << upper_limit << endl;
}
cout << endl;
} // void confidence_limits_on_std_deviation
@@ -98,9 +97,9 @@
"________________________________________________\n"
"2-Sided Confidence Limits For Standard Deviation\n"
"________________________________________________\n\n";
- cout << boost::detail::setprecision(7);
- cout << boost::detail::setw(40) << left << "Confidence level (two-sided) " << "= " << alpha << "\n";
- cout << boost::detail::setw(40) << left << "Standard Deviation" << "= " << Sd << "\n";
+ cout << setprecision(7);
+ cout << setw(40) << left << "Confidence level (two-sided) " << "= " << alpha << "\n";
+ cout << setw(40) << left << "Standard Deviation" << "= " << Sd << "\n";
cout << "\n\n" // Print table header:
"_____________________________________________\n"
@@ -114,13 +113,13 @@
chi_squared dist(N - 1);
// Now print out the data for the table row.
- cout << fixed << boost::detail::setprecision(3) << boost::detail::setw(10) << right << N;
+ cout << fixed << setprecision(3) << setw(10) << right << N;
// Calculate limits: (alpha /2 because it is a two-sided (upper and lower limit) test.
double lower_limit = sqrt((N - 1) * Sd * Sd / quantile(complement(dist, alpha / 2)));
double upper_limit = sqrt((N - 1) * Sd * Sd / quantile(dist, alpha / 2));
// Print Limits:
- cout << fixed << boost::detail::setprecision(4) << boost::detail::setw(15) << right << lower_limit;
- cout << fixed << boost::detail::setprecision(4) << boost::detail::setw(15) << right << upper_limit << endl;
+ cout << fixed << setprecision(4) << setw(15) << right << lower_limit;
+ cout << fixed << setprecision(4) << setw(15) << right << upper_limit << endl;
}
cout << endl;
}// void confidence_limits_on_std_deviation_alpha
@@ -150,53 +149,53 @@
"______________________________________________\n"
"Chi Squared test for sample standard deviation\n"
"______________________________________________\n\n";
- cout << boost::detail::setprecision(5);
- cout << boost::detail::setw(55) << left << "Number of Observations" << "= " << N << "\n";
- cout << boost::detail::setw(55) << left << "Sample Standard Deviation" << "= " << Sd << "\n";
- cout << boost::detail::setw(55) << left << "Expected True Standard Deviation" << "= " << D << "\n\n";
+ cout << setprecision(5);
+ cout << setw(55) << left << "Number of Observations" << "= " << N << "\n";
+ cout << setw(55) << left << "Sample Standard Deviation" << "= " << Sd << "\n";
+ cout << setw(55) << left << "Expected True Standard Deviation" << "= " << D << "\n\n";
//
// Now we can calculate and output some stats:
//
// test-statistic:
double t_stat = (N - 1) * (Sd / D) * (Sd / D);
- cout << boost::detail::setw(55) << left << "Test Statistic" << "= " << t_stat << "\n";
+ cout << setw(55) << left << "Test Statistic" << "= " << t_stat << "\n";
//
// Finally define our distribution, and get the probability:
//
chi_squared dist(N - 1);
double p = cdf(dist, t_stat);
- cout << boost::detail::setw(55) << left << "CDF of test statistic: " << "= "
- << boost::detail::setprecision(3) << scientific << p << "\n";
+ cout << setw(55) << left << "CDF of test statistic: " << "= "
+ << setprecision(3) << scientific << p << "\n";
double ucv = quantile(complement(dist, alpha));
double ucv2 = quantile(complement(dist, alpha / 2));
double lcv = quantile(dist, alpha);
double lcv2 = quantile(dist, alpha / 2);
- cout << boost::detail::setw(55) << left << "Upper Critical Value at alpha: " << "= "
- << boost::detail::setprecision(3) << scientific << ucv << "\n";
- cout << boost::detail::setw(55) << left << "Upper Critical Value at alpha/2: " << "= "
- << boost::detail::setprecision(3) << scientific << ucv2 << "\n";
- cout << boost::detail::setw(55) << left << "Lower Critical Value at alpha: " << "= "
- << boost::detail::setprecision(3) << scientific << lcv << "\n";
- cout << boost::detail::setw(55) << left << "Lower Critical Value at alpha/2: " << "= "
- << boost::detail::setprecision(3) << scientific << lcv2 << "\n\n";
+ cout << setw(55) << left << "Upper Critical Value at alpha: " << "= "
+ << setprecision(3) << scientific << ucv << "\n";
+ cout << setw(55) << left << "Upper Critical Value at alpha/2: " << "= "
+ << setprecision(3) << scientific << ucv2 << "\n";
+ cout << setw(55) << left << "Lower Critical Value at alpha: " << "= "
+ << setprecision(3) << scientific << lcv << "\n";
+ cout << setw(55) << left << "Lower Critical Value at alpha/2: " << "= "
+ << setprecision(3) << scientific << lcv2 << "\n\n";
//
// Finally print out results of alternative hypothesis:
//
- cout << boost::detail::setw(55) << left <<
+ cout << setw(55) << left <<
"Results for Alternative Hypothesis and alpha" << "= "
- << boost::detail::setprecision(4) << fixed << alpha << "\n\n";
+ << setprecision(4) << fixed << alpha << "\n\n";
cout << "Alternative Hypothesis Conclusion\n";
- cout << "Standard Deviation != " << boost::detail::setprecision(3) << fixed << D << " ";
+ cout << "Standard Deviation != " << setprecision(3) << fixed << D << " ";
if((ucv2 < t_stat) || (lcv2 > t_stat))
cout << "NOT REJECTED\n";
else
cout << "REJECTED\n";
- cout << "Standard Deviation < " << boost::detail::setprecision(3) << fixed << D << " ";
+ cout << "Standard Deviation < " << setprecision(3) << fixed << D << " ";
if(lcv > t_stat)
cout << "NOT REJECTED\n";
else
cout << "REJECTED\n";
- cout << "Standard Deviation > " << boost::detail::setprecision(3) << fixed << D << " ";
+ cout << "Standard Deviation > " << setprecision(3) << fixed << D << " ";
if(ucv < t_stat)
cout << "NOT REJECTED\n";
else
@@ -221,9 +220,9 @@
"_____________________________________________________________\n"
"Estimated sample sizes required for various confidence levels\n"
"_____________________________________________________________\n\n";
- cout << boost::detail::setprecision(5);
- cout << boost::detail::setw(40) << left << "True Variance" << "= " << variance << "\n";
- cout << boost::detail::setw(40) << left << "Difference to detect" << "= " << diff << "\n";
+ cout << setprecision(5);
+ cout << setw(40) << left << "True Variance" << "= " << variance << "\n";
+ cout << setw(40) << left << "Difference to detect" << "= " << diff << "\n";
//
// Define a table of significance levels:
//
@@ -244,21 +243,21 @@
for(unsigned i = 0; i < sizeof(alpha)/sizeof(alpha[0]); ++i)
{
// Confidence value:
- cout << fixed << boost::detail::setprecision(3) << boost::detail::setw(10) << right << 100 * (1-alpha[i]);
+ cout << fixed << setprecision(3) << setw(10) << right << 100 * (1-alpha[i]);
// Calculate df for a lower single-sided test:
double df = chi_squared::find_degrees_of_freedom(
-diff, alpha[i], alpha[i], variance);
// Convert to integral sample size (df is a floating point value in this implementation):
double size = ceil(df) + 1;
// Print size:
- cout << fixed << boost::detail::setprecision(0) << boost::detail::setw(16) << right << size;
+ cout << fixed << setprecision(0) << setw(16) << right << size;
// Calculate df for an upper single-sided test:
df = chi_squared::find_degrees_of_freedom(
diff, alpha[i], alpha[i], variance);
// Convert to integral sample size:
size = ceil(df) + 1;
// Print size:
- cout << fixed << boost::detail::setprecision(0) << boost::detail::setw(16) << right << size << endl;
+ cout << fixed << setprecision(0) << setw(16) << right << size << endl;
}
cout << endl;
}
Modified: trunk/libs/math/example/f_test.cpp
==============================================================================
--- trunk/libs/math/example/f_test.cpp (original)
+++ trunk/libs/math/example/f_test.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -13,13 +13,12 @@
# pragma warning(disable: 4180) // qualifier has no effect (in Fusion).
#endif
-#include <ios>
-#include <boost/detail/iomanip.hpp>
#include <iostream>
using std::cout; using std::endl;
using std::left; using std::fixed; using std::right; using std::scientific;
-using boost::detail::setw;
-using boost::detail::setprecision;
+#include <iomanip>
+using std::setw;
+using std::setprecision;
#include <boost/math/distributions/fisher_f.hpp>
@@ -47,45 +46,45 @@
"____________________________________\n"
"F test for equal standard deviations\n"
"____________________________________\n\n";
- cout << boost::detail::setprecision(5);
+ cout << setprecision(5);
cout << "Sample 1:\n";
- cout << boost::detail::setw(55) << left << "Number of Observations" << "= " << N1 << "\n";
- cout << boost::detail::setw(55) << left << "Sample Standard Deviation" << "= " << sd1 << "\n\n";
+ cout << setw(55) << left << "Number of Observations" << "= " << N1 << "\n";
+ cout << setw(55) << left << "Sample Standard Deviation" << "= " << sd1 << "\n\n";
cout << "Sample 2:\n";
- cout << boost::detail::setw(55) << left << "Number of Observations" << "= " << N2 << "\n";
- cout << boost::detail::setw(55) << left << "Sample Standard Deviation" << "= " << sd2 << "\n\n";
+ cout << setw(55) << left << "Number of Observations" << "= " << N2 << "\n";
+ cout << setw(55) << left << "Sample Standard Deviation" << "= " << sd2 << "\n\n";
//
// Now we can calculate and output some stats:
//
// F-statistic:
double F = (sd1 / sd2);
F *= F;
- cout << boost::detail::setw(55) << left << "Test Statistic" << "= " << F << "\n\n";
+ cout << setw(55) << left << "Test Statistic" << "= " << F << "\n\n";
//
// Finally define our distribution, and get the probability:
//
fisher_f dist(N1 - 1, N2 - 1);
double p = cdf(dist, F);
- cout << boost::detail::setw(55) << left << "CDF of test statistic: " << "= "
- << boost::detail::setprecision(3) << scientific << p << "\n";
+ cout << setw(55) << left << "CDF of test statistic: " << "= "
+ << setprecision(3) << scientific << p << "\n";
double ucv = quantile(complement(dist, alpha));
double ucv2 = quantile(complement(dist, alpha / 2));
double lcv = quantile(dist, alpha);
double lcv2 = quantile(dist, alpha / 2);
- cout << boost::detail::setw(55) << left << "Upper Critical Value at alpha: " << "= "
- << boost::detail::setprecision(3) << scientific << ucv << "\n";
- cout << boost::detail::setw(55) << left << "Upper Critical Value at alpha/2: " << "= "
- << boost::detail::setprecision(3) << scientific << ucv2 << "\n";
- cout << boost::detail::setw(55) << left << "Lower Critical Value at alpha: " << "= "
- << boost::detail::setprecision(3) << scientific << lcv << "\n";
- cout << boost::detail::setw(55) << left << "Lower Critical Value at alpha/2: " << "= "
- << boost::detail::setprecision(3) << scientific << lcv2 << "\n\n";
+ cout << setw(55) << left << "Upper Critical Value at alpha: " << "= "
+ << setprecision(3) << scientific << ucv << "\n";
+ cout << setw(55) << left << "Upper Critical Value at alpha/2: " << "= "
+ << setprecision(3) << scientific << ucv2 << "\n";
+ cout << setw(55) << left << "Lower Critical Value at alpha: " << "= "
+ << setprecision(3) << scientific << lcv << "\n";
+ cout << setw(55) << left << "Lower Critical Value at alpha/2: " << "= "
+ << setprecision(3) << scientific << lcv2 << "\n\n";
//
// Finally print out results of null and alternative hypothesis:
//
- cout << boost::detail::setw(55) << left <<
+ cout << setw(55) << left <<
"Results for Alternative Hypothesis and alpha" << "= "
- << boost::detail::setprecision(4) << fixed << alpha << "\n\n";
+ << setprecision(4) << fixed << alpha << "\n\n";
cout << "Alternative Hypothesis Conclusion\n";
cout << "Standard deviations are unequal (two sided test) ";
if((ucv2 < F) || (lcv2 > F))
Modified: trunk/libs/math/example/find_location_example.cpp
==============================================================================
--- trunk/libs/math/example/find_location_example.cpp (original)
+++ trunk/libs/math/example/find_location_example.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -36,8 +36,8 @@
#include <iostream>
using std::cout; using std::endl;
-#include <boost/detail/iomanip.hpp>
- using boost::detail::setw; using boost::detail::setprecision;
+#include <iomanip>
+ using std::setw; using std::setprecision;
#include <limits>
using std::numeric_limits;
Modified: trunk/libs/math/example/find_mean_and_sd_normal.cpp
==============================================================================
--- trunk/libs/math/example/find_mean_and_sd_normal.cpp (original)
+++ trunk/libs/math/example/find_mean_and_sd_normal.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -30,11 +30,10 @@
using boost::math::complement;
using boost::math::policies::policy;
-#include <ios>
#include <iostream>
using std::cout; using std::endl; using std::left; using std::showpoint; using std::noshowpoint;
-#include <boost/detail/iomanip.hpp>
- using boost::detail::setw; using boost::detail::setprecision;
+#include <iomanip>
+ using std::setw; using std::setprecision;
#include <limits>
using std::numeric_limits;
#include <stdexcept>
Modified: trunk/libs/math/example/find_root_example.cpp
==============================================================================
--- trunk/libs/math/example/find_root_example.cpp (original)
+++ trunk/libs/math/example/find_root_example.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -23,11 +23,10 @@
#include <boost/math/distributions/normal.hpp> // for normal_distribution
using boost::math::normal; // typedef provides default type is double.
-#include <ios>
#include <iostream>
using std::cout; using std::endl; using std::left; using std::showpoint; using std::noshowpoint;
-#include <boost/detail/iomanip.hpp>
- using boost::detail::setw; using boost::detail::setprecision;
+#include <iomanip>
+ using std::setw; using std::setprecision;
#include <limits>
using std::numeric_limits;
#include <stdexcept>
Modified: trunk/libs/math/example/find_scale_example.cpp
==============================================================================
--- trunk/libs/math/example/find_scale_example.cpp (original)
+++ trunk/libs/math/example/find_scale_example.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -27,8 +27,8 @@
#include <iostream>
using std::cout; using std::endl;
-#include <boost/detail/iomanip.hpp>
- using boost::detail::setw; using boost::detail::setprecision;
+#include <iomanip>
+ using std::setw; using std::setprecision;
#include <limits>
using std::numeric_limits;
//] [/find_scale1]
Modified: trunk/libs/math/example/geometric_examples.cpp
==============================================================================
--- trunk/libs/math/example/geometric_examples.cpp (original)
+++ trunk/libs/math/example/geometric_examples.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -48,12 +48,11 @@
// for negative_binomial_distribution
using boost::math::normal; // typedef provides default type is double.
-#include <ios>
#include <iostream>
using std::cout; using std::endl;
using std::noshowpoint; using std::fixed; using std::right; using std::left;
-#include <boost/detail/iomanip.hpp>
- using boost::detail::setprecision; using boost::detail::setw;
+#include <iomanip>
+ using std::setprecision; using std::setw;
#include <limits>
using std::numeric_limits;
Modified: trunk/libs/math/example/inverse_chi_squared_example.cpp
==============================================================================
--- trunk/libs/math/example/inverse_chi_squared_example.cpp (original)
+++ trunk/libs/math/example/inverse_chi_squared_example.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -15,9 +15,9 @@
#include <iostream>
using std::cout; using std::endl;
-#include <boost/detail/iomanip.hpp>
-using boost::detail::setprecision;
-using boost::detail::setw;
+#include <iomanip>
+using std::setprecision;
+using std::setw;
#include <cmath>
using std::sqrt;
@@ -120,15 +120,15 @@
for (double x = 0.0; x < 1.; x += 0.1)
{
cout
- << boost::detail::setw(width) << x
- << ' ' << boost::detail::setw(width) << pdf(ichsq, x) // unscaled
- << ' ' << boost::detail::setw(width) << naive_pdf1(nu, x) // Wiki def 1 unscaled matches graph
- << ' ' << boost::detail::setw(width) << naive_pdf2(nu, x) // scale = 1 - 2nd definition.
- << ' ' << boost::detail::setw(width) << naive_pdf3(nu, 1/nu, x) // scaled
- << ' ' << boost::detail::setw(width) << naive_pdf4(nu, 1/nu, x) // scaled
- << ' ' << boost::detail::setw(width) << pdf(sichsq, x) // scaled
- << ' ' << boost::detail::setw(width) << cdf(sichsq, x) // scaled
- << ' ' << boost::detail::setw(width) << cdf(ichsq, x) // unscaled
+ << setw(width) << x
+ << ' ' << setw(width) << pdf(ichsq, x) // unscaled
+ << ' ' << setw(width) << naive_pdf1(nu, x) // Wiki def 1 unscaled matches graph
+ << ' ' << setw(width) << naive_pdf2(nu, x) // scale = 1 - 2nd definition.
+ << ' ' << setw(width) << naive_pdf3(nu, 1/nu, x) // scaled
+ << ' ' << setw(width) << naive_pdf4(nu, 1/nu, x) // scaled
+ << ' ' << setw(width) << pdf(sichsq, x) // scaled
+ << ' ' << setw(width) << cdf(sichsq, x) // scaled
+ << ' ' << setw(width) << cdf(ichsq, x) // unscaled
<< endl;
}
}
Modified: trunk/libs/math/example/inverse_chi_squared_find_df_example.cpp
==============================================================================
--- trunk/libs/math/example/inverse_chi_squared_find_df_example.cpp (original)
+++ trunk/libs/math/example/inverse_chi_squared_find_df_example.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -17,9 +17,9 @@
#include <iostream>
using std::cout; using std::endl;
-#include <boost/detail/iomanip.hpp>
-using boost::detail::setprecision;
-using boost::detail::setw;
+#include <iomanip>
+using std::setprecision;
+using std::setw;
#include <cmath>
using std::sqrt;
Modified: trunk/libs/math/example/inverse_gamma_distribution_example.cpp
==============================================================================
--- trunk/libs/math/example/inverse_gamma_distribution_example.cpp (original)
+++ trunk/libs/math/example/inverse_gamma_distribution_example.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -21,8 +21,8 @@
#include <iostream>
using std::cout; using std::endl;
-#include <boost/detail/iomanip.hpp>
-using boost::detail::setprecision;
+#include <iomanip>
+using std::setprecision;
#include <cmath>
using std::sqrt;
Modified: trunk/libs/math/example/inverse_gamma_example.cpp
==============================================================================
--- trunk/libs/math/example/inverse_gamma_example.cpp (original)
+++ trunk/libs/math/example/inverse_gamma_example.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -18,8 +18,8 @@
#include <iostream>
using std::cout; using std::endl;
-#include <boost/detail/iomanip.hpp>
- using boost::detail::setprecision;
+#include <iomanip>
+ using std::setprecision;
#include <cmath>
using std::sqrt;
#include <limits>
Modified: trunk/libs/math/example/inverse_gaussian_example.cpp
==============================================================================
--- trunk/libs/math/example/inverse_gaussian_example.cpp (original)
+++ trunk/libs/math/example/inverse_gaussian_example.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -45,17 +45,16 @@
#include <boost/array.hpp>
using boost::array;
-#include <ios>
#include <iostream>
using std::cout; using std::endl; using std::left; using std::showpoint; using std::noshowpoint;
-#include <boost/detail/iomanip.hpp>
- using boost::detail::setw; using boost::detail::setprecision;
+#include <iomanip>
+ using std::setw; using std::setprecision;
#include <limits>
using std::numeric_limits;
#include <sstream>
- using std::stringstream;
-#include <string>
using std::string;
+#include <string>
+ using std::stringstream;
// const double tol = 3 * numeric_limits<double>::epsilon();
Modified: trunk/libs/math/example/laplace_example.cpp
==============================================================================
--- trunk/libs/math/example/laplace_example.cpp (original)
+++ trunk/libs/math/example/laplace_example.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -23,11 +23,10 @@
#include <boost/math/distributions/normal.hpp> // for normal_distribution
using boost::math::normal; // typedef provides default type is double.
-#include <ios>
#include <iostream>
using std::cout; using std::endl; using std::left; using std::showpoint; using std::noshowpoint;
-#include <boost/detail/iomanip.hpp>
- using boost::detail::setw; using boost::detail::setprecision;
+#include <iomanip>
+ using std::setw; using std::setprecision;
#include <limits>
using std::numeric_limits;
@@ -44,7 +43,7 @@
double range = 4; // min and max z = -range to +range.
//int precision = 17; // traditional tables are only computed to much lower precision.
int precision = 4; // traditional table at much lower precision.
- int width = 10; // for use with boost::detail::setw.
+ int width = 10; // for use with setw.
// Construct standard laplace & normal distributions l & s
normal s; // (default location or mean = zero, and scale or standard deviation = unity)
@@ -61,10 +60,10 @@
cout.precision(5);
for (double z = -range; z < range + step; z += step)
{
- cout << left << boost::detail::setprecision(3) << boost::detail::setw(6) << z << " "
- << boost::detail::setprecision(precision) << boost::detail::setw(width) << pdf(s, z) << " "
- << boost::detail::setprecision(precision) << boost::detail::setw(width) << pdf(l, z)<< " ("
- << boost::detail::setprecision(precision) << boost::detail::setw(width) << pdf(l, z) - pdf(s, z) // difference.
+ cout << left << setprecision(3) << setw(6) << z << " "
+ << setprecision(precision) << setw(width) << pdf(s, z) << " "
+ << setprecision(precision) << setw(width) << pdf(l, z)<< " ("
+ << setprecision(precision) << setw(width) << pdf(l, z) - pdf(s, z) // difference.
<< ")" << endl;
}
cout.precision(6); // default
@@ -80,10 +79,10 @@
cout << " z CDF normal laplace (difference)" << endl;
for (double z = -range; z < range + step; z += step)
{
- cout << left << boost::detail::setprecision(3) << boost::detail::setw(6) << z << " "
- << boost::detail::setprecision(precision) << boost::detail::setw(width) << cdf(s, z) << " "
- << boost::detail::setprecision(precision) << boost::detail::setw(width) << cdf(l, z) << " ("
- << boost::detail::setprecision(precision) << boost::detail::setw(width) << cdf(l, z) - cdf(s, z) // difference.
+ cout << left << setprecision(3) << setw(6) << z << " "
+ << setprecision(precision) << setw(width) << cdf(s, z) << " "
+ << setprecision(precision) << setw(width) << cdf(l, z) << " ("
+ << setprecision(precision) << setw(width) << cdf(l, z) - cdf(s, z) // difference.
<< ")" << endl;
}
cout.precision(6); // default
Modified: trunk/libs/math/example/nc_chi_sq_example.cpp
==============================================================================
--- trunk/libs/math/example/nc_chi_sq_example.cpp (original)
+++ trunk/libs/math/example/nc_chi_sq_example.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -30,8 +30,7 @@
#include <iostream>
using std::cout; using std::endl;
-#include <boost/detail/iomanip.hpp>
-using boost::detail::setprecision;
+using std::setprecision;
int main()
{
@@ -70,7 +69,7 @@
/*`
Then output the cell value:
*/
- cout << "[" << boost::detail::setprecision(3) << beta << "]";
+ cout << "[" << setprecision(3) << beta << "]";
}
cout << "]" << endl;
}
Modified: trunk/libs/math/example/neg_binom_confidence_limits.cpp
==============================================================================
--- trunk/libs/math/example/neg_binom_confidence_limits.cpp (original)
+++ trunk/libs/math/example/neg_binom_confidence_limits.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -22,12 +22,11 @@
#include <boost/math/distributions/negative_binomial.hpp>
using boost::math::negative_binomial;
-#include <ios>
#include <iostream>
using std::cout; using std::endl;
-#include <boost/detail/iomanip.hpp>
-using boost::detail::setprecision;
-using boost::detail::setw; using std::left; using std::fixed; using std::right;
+#include <iomanip>
+using std::setprecision;
+using std::setw; using std::left; using std::fixed; using std::right;
/*`
First define a table of significance levels: these are the
@@ -58,11 +57,11 @@
"______________________________________________\n"
"2-Sided Confidence Limits For Success Fraction\n"
"______________________________________________\n\n";
- cout << boost::detail::setprecision(7);
- cout << boost::detail::setw(40) << left << "Number of trials" << " = " << trials << "\n";
- cout << boost::detail::setw(40) << left << "Number of successes" << " = " << successes << "\n";
- cout << boost::detail::setw(40) << left << "Number of failures" << " = " << trials - successes << "\n";
- cout << boost::detail::setw(40) << left << "Observed frequency of occurrence" << " = " << double(successes) / trials << "\n";
+ cout << setprecision(7);
+ cout << setw(40) << left << "Number of trials" << " = " << trials << "\n";
+ cout << setw(40) << left << "Number of successes" << " = " << successes << "\n";
+ cout << setw(40) << left << "Number of failures" << " = " << trials - successes << "\n";
+ cout << setw(40) << left << "Observed frequency of occurrence" << " = " << double(successes) / trials << "\n";
// Print table header:
cout << "\n\n"
@@ -87,13 +86,13 @@
for(unsigned i = 0; i < sizeof(alpha)/sizeof(alpha[0]); ++i)
{
// Confidence value:
- cout << fixed << boost::detail::setprecision(3) << boost::detail::setw(10) << right << 100 * (1-alpha[i]);
+ cout << fixed << setprecision(3) << setw(10) << right << 100 * (1-alpha[i]);
// Calculate bounds:
double lower = negative_binomial::find_lower_bound_on_p(trials, successes, alpha[i]/2);
double upper = negative_binomial::find_upper_bound_on_p(trials, successes, alpha[i]/2);
// Print limits:
- cout << fixed << boost::detail::setprecision(5) << boost::detail::setw(15) << right << lower;
- cout << fixed << boost::detail::setprecision(5) << boost::detail::setw(15) << right << upper << endl;
+ cout << fixed << setprecision(5) << setw(15) << right << lower;
+ cout << fixed << setprecision(5) << setw(15) << right << upper << endl;
}
cout << endl;
} // void confidence_limits_on_frequency(unsigned trials, unsigned successes)
Modified: trunk/libs/math/example/neg_binomial_sample_sizes.cpp
==============================================================================
--- trunk/libs/math/example/neg_binomial_sample_sizes.cpp (original)
+++ trunk/libs/math/example/neg_binomial_sample_sizes.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -17,15 +17,14 @@
double p, // fraction of trails for which event occurs, 0 <= p <= 1.
double probability); // probability threshold, 0 <= probability <= 1.
-#include <ios>
#include <iostream>
using std::cout;
using std::endl;
using std::fixed;
using std::right;
-#include <boost/detail/iomanip.hpp>
-using boost::detail::setprecision;
-using boost::detail::setw;
+#include <iomanip>
+using std::setprecision;
+using std::setw;
//[neg_binomial_sample_sizes
@@ -65,7 +64,7 @@
// required number of failures DOES exceed "failures".
cout << "\n""Target number of failures = " << (int)failures;
- cout << ", Success fraction = " << fixed << boost::detail::setprecision(1) << 100 * p << "%" << endl;
+ cout << ", Success fraction = " << fixed << setprecision(1) << 100 * p << "%" << endl;
// Print table header:
cout << "____________________________\n"
"Confidence Min Number\n"
@@ -74,9 +73,9 @@
// Now print out the data for the alpha table values.
for(unsigned i = 0; i < sizeof(alpha)/sizeof(alpha[0]); ++i)
{ // Confidence values %:
- cout << fixed << boost::detail::setprecision(3) << boost::detail::setw(10) << right << 100 * (1-alpha[i]) << " "
+ cout << fixed << setprecision(3) << setw(10) << right << 100 * (1-alpha[i]) << " "
// find_minimum_number_of_trials
- << boost::detail::setw(6) << right
+ << setw(6) << right
<< (int)ceil(negative_binomial::find_minimum_number_of_trials(failures, p, alpha[i]))
<< endl;
}
Modified: trunk/libs/math/example/negative_binomial_example1.cpp
==============================================================================
--- trunk/libs/math/example/negative_binomial_example1.cpp (original)
+++ trunk/libs/math/example/negative_binomial_example1.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -59,12 +59,11 @@
using ::boost::math::cdf; // Cumulative density function.
using ::boost::math::quantile;
-#include <ios>
#include <iostream>
using std::cout; using std::endl;
using std::noshowpoint; using std::fixed; using std::right; using std::left;
-#include <boost/detail/iomanip.hpp>
- using boost::detail::setprecision; using boost::detail::setw;
+#include <iomanip>
+ using std::setprecision; using std::setw;
#include <limits>
using std::numeric_limits;
@@ -376,7 +375,7 @@
cout.precision(5);
for (int i = (int)sales_quota; i < all_houses+1; i++)
{
- cout << left << boost::detail::setw(3) << i << " " << boost::detail::setw(8) << cdf(nb, i - sales_quota) << endl;
+ cout << left << setw(3) << i << " " << setw(8) << cdf(nb, i - sales_quota) << endl;
}
cout << endl;
/*`
Modified: trunk/libs/math/example/negative_binomial_example2.cpp
==============================================================================
--- trunk/libs/math/example/negative_binomial_example2.cpp (original)
+++ trunk/libs/math/example/negative_binomial_example2.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -19,14 +19,12 @@
// negative_binomial is the probability that k or fewer failures
// preceed the r th trial's success.
-#include <ios>
#include <iostream>
-#include <boost/detail/iomanip.hpp>
using std::cout;
using std::endl;
-using boost::detail::setprecision;
+using std::setprecision;
using std::showpoint;
-using boost::detail::setw;
+using std::setw;
using std::left;
using std::right;
#include <limits>
@@ -65,10 +63,10 @@
// Compare with the cdf
double cdf8 = cdf(mynbdist, static_cast<double>(k));
double diff = sum - cdf8; // Expect the diference to be very small.
- cout << boost::detail::setprecision(17) << "Sum pdfs = " << sum << ' ' // sum = 0.40025683281803698
+ cout << setprecision(17) << "Sum pdfs = " << sum << ' ' // sum = 0.40025683281803698
<< ", cdf = " << cdf(mynbdist, static_cast<double>(k)) // cdf = 0.40025683281803687
<< ", difference = " // difference = 0.50000000000000000
- << boost::detail::setprecision(1) << diff/ (std::numeric_limits<double>::epsilon() * sum)
+ << setprecision(1) << diff/ (std::numeric_limits<double>::epsilon() * sum)
<< " in epsilon units." << endl;
// Note: Use boost::math::tools::epsilon rather than std::numeric_limits
@@ -87,10 +85,10 @@
cout << "\n"" k pdf cdf""\n" << endl;
for (int k = 0; k < maxk; k++)
{
- cout << right << boost::detail::setprecision(17) << showpoint
- << right << boost::detail::setw(3) << k << ", "
- << left << boost::detail::setw(25) << pdf(mynbdist, static_cast<double>(k))
- << left << boost::detail::setw(25) << cdf(mynbdist, static_cast<double>(k))
+ cout << right << setprecision(17) << showpoint
+ << right << setw(3) << k << ", "
+ << left << setw(25) << pdf(mynbdist, static_cast<double>(k))
+ << left << setw(25) << cdf(mynbdist, static_cast<double>(k))
<< endl;
}
cout << endl;
Modified: trunk/libs/math/example/normal_misc_examples.cpp
==============================================================================
--- trunk/libs/math/example/normal_misc_examples.cpp (original)
+++ trunk/libs/math/example/normal_misc_examples.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -21,11 +21,10 @@
#include <boost/math/distributions/normal.hpp> // for normal_distribution
using boost::math::normal; // typedef provides default type is double.
-#include <ios>
#include <iostream>
using std::cout; using std::endl; using std::left; using std::showpoint; using std::noshowpoint;
-#include <boost/detail/iomanip.hpp>
- using boost::detail::setw; using boost::detail::setprecision;
+#include <iomanip>
+ using std::setw; using std::setprecision;
#include <limits>
using std::numeric_limits;
@@ -58,8 +57,8 @@
cout.precision(5);
for (double z = -range; z < range + step; z += step)
{
- cout << left << boost::detail::setprecision(3) << boost::detail::setw(6) << z << " "
- << boost::detail::setprecision(precision) << boost::detail::setw(12) << pdf(s, z) << endl;
+ cout << left << setprecision(3) << setw(6) << z << " "
+ << setprecision(precision) << setw(12) << pdf(s, z) << endl;
}
cout.precision(6); // default
/*`And the area under the normal curve from -[infin] up to z,
@@ -72,8 +71,8 @@
cout << " z " " cdf " << endl;
for (double z = -range; z < range + step; z += step)
{
- cout << left << boost::detail::setprecision(3) << boost::detail::setw(6) << z << " "
- << boost::detail::setprecision(precision) << boost::detail::setw(12) << cdf(s, z) << endl;
+ cout << left << setprecision(3) << setw(6) << z << " "
+ << setprecision(precision) << setw(12) << cdf(s, z) << endl;
}
cout.precision(6); // default
@@ -111,7 +110,7 @@
This will not be some nice neat number like 0.05, but we can easily calculate it,
*/
double alpha1 = cdf(s, -1) * 2; // 0.3173105078629142
- cout << boost::detail::setprecision(17) << "Significance level for z == 1 is " << alpha1 << endl;
+ cout << setprecision(17) << "Significance level for z == 1 is " << alpha1 << endl;
/*`
and place in our array of favorite alpha values.
*/
@@ -123,11 +122,11 @@
that the true occurrence frequency lies *inside* the calculated interval.
*/
- cout << "level of significance (alpha)" << boost::detail::setprecision(4) << endl;
+ cout << "level of significance (alpha)" << setprecision(4) << endl;
cout << "2-sided 1 -sided z(alpha) " << endl;
for (int i = 0; i < sizeof(alpha)/sizeof(alpha[0]); ++i)
{
- cout << boost::detail::setw(15) << alpha[i] << boost::detail::setw(15) << alpha[i] /2 << boost::detail::setw(10) << quantile(complement(s, alpha[i]/2)) << endl;
+ cout << setw(15) << alpha[i] << setw(15) << alpha[i] /2 << setw(10) << quantile(complement(s, alpha[i]/2)) << endl;
// Use quantile(complement(s, alpha[i]/2)) to avoid potential loss of accuracy from quantile(s, 1 - alpha[i]/2)
}
cout << endl;
Modified: trunk/libs/math/example/policy_eg_10.cpp
==============================================================================
--- trunk/libs/math/example/policy_eg_10.cpp (original)
+++ trunk/libs/math/example/policy_eg_10.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -20,13 +20,12 @@
Begin by including the needed headers (and some using statements for conciseness):
*/
-#include <ios>
#include <iostream>
using std::cout; using std::endl;
using std::left; using std::fixed; using std::right; using std::scientific;
-#include <boost/detail/iomanip.hpp>
-using boost::detail::setw;
-using boost::detail::setprecision;
+#include <iomanip>
+using std::setw;
+using std::setprecision;
#include <boost/math/distributions/binomial.hpp>
/*`
@@ -97,62 +96,62 @@
"Lower quantiles are calculated at p = 0.05\n\n"
"Upper quantiles at p = 0.95.\n\n";
- cout << boost::detail::setw(25) << right
- << "Policy"<< boost::detail::setw(18) << right
- << "Lower Quantile" << boost::detail::setw(18) << right
+ cout << setw(25) << right
+ << "Policy"<< setw(18) << right
+ << "Lower Quantile" << setw(18) << right
<< "Upper Quantile" << endl;
// Test integer_round_outwards:
- cout << boost::detail::setw(25) << right
+ cout << setw(25) << right
<< "integer_round_outwards"
- << boost::detail::setw(18) << right
+ << setw(18) << right
<< quantile(binom_round_outwards(50, 0.5), 0.05)
- << boost::detail::setw(18) << right
+ << setw(18) << right
<< quantile(binom_round_outwards(50, 0.5), 0.95)
<< endl;
// Test integer_round_inwards:
- cout << boost::detail::setw(25) << right
+ cout << setw(25) << right
<< "integer_round_inwards"
- << boost::detail::setw(18) << right
+ << setw(18) << right
<< quantile(binom_round_inwards(50, 0.5), 0.05)
- << boost::detail::setw(18) << right
+ << setw(18) << right
<< quantile(binom_round_inwards(50, 0.5), 0.95)
<< endl;
// Test integer_round_down:
- cout << boost::detail::setw(25) << right
+ cout << setw(25) << right
<< "integer_round_down"
- << boost::detail::setw(18) << right
+ << setw(18) << right
<< quantile(binom_round_down(50, 0.5), 0.05)
- << boost::detail::setw(18) << right
+ << setw(18) << right
<< quantile(binom_round_down(50, 0.5), 0.95)
<< endl;
// Test integer_round_up:
- cout << boost::detail::setw(25) << right
+ cout << setw(25) << right
<< "integer_round_up"
- << boost::detail::setw(18) << right
+ << setw(18) << right
<< quantile(binom_round_up(50, 0.5), 0.05)
- << boost::detail::setw(18) << right
+ << setw(18) << right
<< quantile(binom_round_up(50, 0.5), 0.95)
<< endl;
// Test integer_round_nearest:
- cout << boost::detail::setw(25) << right
+ cout << setw(25) << right
<< "integer_round_nearest"
- << boost::detail::setw(18) << right
+ << setw(18) << right
<< quantile(binom_round_nearest(50, 0.5), 0.05)
- << boost::detail::setw(18) << right
+ << setw(18) << right
<< quantile(binom_round_nearest(50, 0.5), 0.95)
<< endl;
// Test real:
- cout << boost::detail::setw(25) << right
+ cout << setw(25) << right
<< "real"
- << boost::detail::setw(18) << right
+ << setw(18) << right
<< quantile(binom_real_quantile(50, 0.5), 0.05)
- << boost::detail::setw(18) << right
+ << setw(18) << right
<< quantile(binom_real_quantile(50, 0.5), 0.95)
<< endl;
} // int main()
Modified: trunk/libs/math/example/policy_eg_9.cpp
==============================================================================
--- trunk/libs/math/example/policy_eg_9.cpp (original)
+++ trunk/libs/math/example/policy_eg_9.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -7,7 +7,6 @@
// Note that this file contains quickbook mark-up as well as code
// and comments, don't change any of the special comment mark-ups!
-#include <boost/detail/iomanip.hpp>
#include <iostream>
using std::cout; using std::endl; using std::cerr;
@@ -84,7 +83,7 @@
msg += ": \n";
int prec = 2 + (std::numeric_limits<T>::digits * 30103UL) / 100000UL;
// int prec = std::numeric_limits<T>::max_digits10; // For C++0X Standard Library
- msg += (boost::format(message) % boost::io::group(boost::detail::setprecision(prec), val)).str();
+ msg += (boost::format(message) % boost::io::group(std::setprecision(prec), val)).str();
/*`
Now we just have to do something with the message, we could throw an
exception, but for the purposes of this example we'll just dump the message
@@ -202,7 +201,7 @@
msg += ": \n";
int prec = 2 + (std::numeric_limits<T>::digits * 30103UL) / 100000UL;
// int prec = std::numeric_limits<T>::max_digits10; // For C++0X Standard Library
- msg += (boost::format(message) % boost::io::group(boost::detail::setprecision(prec), val)).str();
+ msg += (boost::format(message) % boost::io::group(std::setprecision(prec), val)).str();
std::cerr << msg << std::endl;
Modified: trunk/libs/math/example/root_finding_example.cpp
==============================================================================
--- trunk/libs/math/example/root_finding_example.cpp (original)
+++ trunk/libs/math/example/root_finding_example.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -51,8 +51,8 @@
#include <iostream>
using std::cout; using std::endl;
-#include <boost/detail/iomanip.hpp>
-using boost::detail::setw; using boost::detail::setprecision;
+#include <iomanip>
+using std::setw; using std::setprecision;
#include <limits>
using std::numeric_limits;
Modified: trunk/libs/math/example/students_t_example1.cpp
==============================================================================
--- trunk/libs/math/example/students_t_example1.cpp (original)
+++ trunk/libs/math/example/students_t_example1.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -47,8 +47,8 @@
#include <iostream>
using std::cout; using std::endl;
-#include <boost/detail/iomanip.hpp>
- using boost::detail::setprecision;
+#include <iomanip>
+ using std::setprecision;
#include <cmath>
using std::sqrt;
Modified: trunk/libs/math/example/students_t_example2.cpp
==============================================================================
--- trunk/libs/math/example/students_t_example2.cpp (original)
+++ trunk/libs/math/example/students_t_example2.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -35,9 +35,9 @@
#include <iostream>
using std::cout;
using std::endl;
-#include <boost/detail/iomanip.hpp>
- using boost::detail::setprecision;
- using boost::detail::setw;
+#include <iomanip>
+ using std::setprecision;
+ using std::setw;
#include <cmath>
using std::sqrt;
@@ -68,7 +68,7 @@
for (int value = 0; value < values; value++)
{ // Echo data and calculate mean.
sum += data[value];
- cout << boost::detail::setw(4) << value << ' ' << boost::detail::setw(14) << data[value] << endl;
+ cout << setw(4) << value << ' ' << setw(14) << data[value] << endl;
}
double mean = sum /static_cast<double>(values);
cout << "Mean = " << mean << endl; // 25.2283
Modified: trunk/libs/math/example/students_t_example3.cpp
==============================================================================
--- trunk/libs/math/example/students_t_example3.cpp (original)
+++ trunk/libs/math/example/students_t_example3.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -34,8 +34,8 @@
#include <iostream>
using std::cout; using std::endl;
-#include <boost/detail/iomanip.hpp>
- using boost::detail::setprecision; using boost::detail::setw;
+#include <iomanip>
+ using std::setprecision; using std::setw;
#include <cmath>
using std::sqrt;
@@ -71,7 +71,7 @@
{ // Echo data and differences.
diffs[portion] = data[portion][0] - data[portion][1];
mean_diff += diffs[portion];
- cout << boost::detail::setw(4) << portion << ' ' << boost::detail::setw(14) << data[portion][0] << ' ' << boost::detail::setw(18)<< data[portion][1] << ' ' << boost::detail::setw(9) << diffs[portion] << endl;
+ cout << setw(4) << portion << ' ' << setw(14) << data[portion][0] << ' ' << setw(18)<< data[portion][1] << ' ' << setw(9) << diffs[portion] << endl;
}
mean_diff /= portions;
cout << "Mean difference = " << mean_diff << endl; // -1.75
Modified: trunk/libs/math/example/students_t_single_sample.cpp
==============================================================================
--- trunk/libs/math/example/students_t_single_sample.cpp (original)
+++ trunk/libs/math/example/students_t_single_sample.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -16,13 +16,12 @@
// avoid "using namespace std;" and "using namespace boost::math;"
// to avoid potential ambiguity with names in std random.
-#include <ios>
#include <iostream>
using std::cout; using std::endl;
using std::left; using std::fixed; using std::right; using std::scientific;
-#include <boost/detail/iomanip.hpp>
-using boost::detail::setw;
-using boost::detail::setprecision;
+#include <iomanip>
+using std::setw;
+using std::setprecision;
void confidence_limits_on_mean(double Sm, double Sd, unsigned Sn)
{
@@ -50,10 +49,10 @@
"__________________________________\n"
"2-Sided Confidence Limits For Mean\n"
"__________________________________\n\n";
- cout << boost::detail::setprecision(7);
- cout << boost::detail::setw(40) << left << "Number of Observations" << "= " << Sn << "\n";
- cout << boost::detail::setw(40) << left << "Mean" << "= " << Sm << "\n";
- cout << boost::detail::setw(40) << left << "Standard Deviation" << "= " << Sd << "\n";
+ cout << setprecision(7);
+ cout << setw(40) << left << "Number of Observations" << "= " << Sn << "\n";
+ cout << setw(40) << left << "Mean" << "= " << Sm << "\n";
+ cout << setw(40) << left << "Standard Deviation" << "= " << Sd << "\n";
//
// Define a table of significance/risk levels:
//
@@ -76,21 +75,21 @@
for(unsigned i = 0; i < sizeof(alpha)/sizeof(alpha[0]); ++i)
{
// Confidence value:
- cout << fixed << boost::detail::setprecision(3) << boost::detail::setw(10) << right << 100 * (1-alpha[i]);
+ cout << fixed << setprecision(3) << setw(10) << right << 100 * (1-alpha[i]);
// calculate T:
double T = quantile(complement(dist, alpha[i] / 2));
// Print T:
- cout << fixed << boost::detail::setprecision(3) << boost::detail::setw(10) << right << T;
+ cout << fixed << setprecision(3) << setw(10) << right << T;
// Calculate width of interval (one sided):
double w = T * Sd / sqrt(double(Sn));
// Print width:
if(w < 0.01)
- cout << scientific << boost::detail::setprecision(3) << boost::detail::setw(17) << right << w;
+ cout << scientific << setprecision(3) << setw(17) << right << w;
else
- cout << fixed << boost::detail::setprecision(3) << boost::detail::setw(17) << right << w;
+ cout << fixed << setprecision(3) << setw(17) << right << w;
// Print Limits:
- cout << fixed << boost::detail::setprecision(5) << boost::detail::setw(15) << right << Sm - w;
- cout << fixed << boost::detail::setprecision(5) << boost::detail::setw(15) << right << Sm + w << endl;
+ cout << fixed << setprecision(5) << setw(15) << right << Sm - w;
+ cout << fixed << setprecision(5) << setw(15) << right << Sm + w << endl;
}
cout << endl;
} // void confidence_limits_on_mean
@@ -118,48 +117,48 @@
"__________________________________\n"
"Student t test for a single sample\n"
"__________________________________\n\n";
- cout << boost::detail::setprecision(5);
- cout << boost::detail::setw(55) << left << "Number of Observations" << "= " << Sn << "\n";
- cout << boost::detail::setw(55) << left << "Sample Mean" << "= " << Sm << "\n";
- cout << boost::detail::setw(55) << left << "Sample Standard Deviation" << "= " << Sd << "\n";
- cout << boost::detail::setw(55) << left << "Expected True Mean" << "= " << M << "\n\n";
+ cout << setprecision(5);
+ cout << setw(55) << left << "Number of Observations" << "= " << Sn << "\n";
+ cout << setw(55) << left << "Sample Mean" << "= " << Sm << "\n";
+ cout << setw(55) << left << "Sample Standard Deviation" << "= " << Sd << "\n";
+ cout << setw(55) << left << "Expected True Mean" << "= " << M << "\n\n";
//
// Now we can calculate and output some stats:
//
// Difference in means:
double diff = Sm - M;
- cout << boost::detail::setw(55) << left << "Sample Mean - Expected Test Mean" << "= " << diff << "\n";
+ cout << setw(55) << left << "Sample Mean - Expected Test Mean" << "= " << diff << "\n";
// Degrees of freedom:
unsigned v = Sn - 1;
- cout << boost::detail::setw(55) << left << "Degrees of Freedom" << "= " << v << "\n";
+ cout << setw(55) << left << "Degrees of Freedom" << "= " << v << "\n";
// t-statistic:
double t_stat = diff * sqrt(double(Sn)) / Sd;
- cout << boost::detail::setw(55) << left << "T Statistic" << "= " << t_stat << "\n";
+ cout << setw(55) << left << "T Statistic" << "= " << t_stat << "\n";
//
// Finally define our distribution, and get the probability:
//
students_t dist(v);
double q = cdf(complement(dist, fabs(t_stat)));
- cout << boost::detail::setw(55) << left << "Probability that difference is due to chance" << "= "
- << boost::detail::setprecision(3) << scientific << 2 * q << "\n\n";
+ cout << setw(55) << left << "Probability that difference is due to chance" << "= "
+ << setprecision(3) << scientific << 2 * q << "\n\n";
//
// Finally print out results of alternative hypothesis:
//
- cout << boost::detail::setw(55) << left <<
+ cout << setw(55) << left <<
"Results for Alternative Hypothesis and alpha" << "= "
- << boost::detail::setprecision(4) << fixed << alpha << "\n\n";
+ << setprecision(4) << fixed << alpha << "\n\n";
cout << "Alternative Hypothesis Conclusion\n";
- cout << "Mean != " << boost::detail::setprecision(3) << fixed << M << " ";
+ cout << "Mean != " << setprecision(3) << fixed << M << " ";
if(q < alpha / 2)
cout << "NOT REJECTED\n";
else
cout << "REJECTED\n";
- cout << "Mean < " << boost::detail::setprecision(3) << fixed << M << " ";
+ cout << "Mean < " << setprecision(3) << fixed << M << " ";
if(cdf(dist, t_stat) < alpha)
cout << "NOT REJECTED\n";
else
cout << "REJECTED\n";
- cout << "Mean > " << boost::detail::setprecision(3) << fixed << M << " ";
+ cout << "Mean > " << setprecision(3) << fixed << M << " ";
if(cdf(complement(dist, t_stat)) < alpha)
cout << "NOT REJECTED\n";
else
@@ -182,10 +181,10 @@
"_____________________________________________________________\n"
"Estimated sample sizes required for various confidence levels\n"
"_____________________________________________________________\n\n";
- cout << boost::detail::setprecision(5);
- cout << boost::detail::setw(40) << left << "True Mean" << "= " << M << "\n";
- cout << boost::detail::setw(40) << left << "Sample Mean" << "= " << Sm << "\n";
- cout << boost::detail::setw(40) << left << "Sample Standard Deviation" << "= " << Sd << "\n";
+ cout << setprecision(5);
+ cout << setw(40) << left << "True Mean" << "= " << M << "\n";
+ cout << setw(40) << left << "Sample Mean" << "= " << Sm << "\n";
+ cout << setw(40) << left << "Sample Standard Deviation" << "= " << Sd << "\n";
//
// Define a table of significance intervals:
//
@@ -205,21 +204,21 @@
for(unsigned i = 1; i < sizeof(alpha)/sizeof(alpha[0]); ++i)
{
// Confidence value:
- cout << fixed << boost::detail::setprecision(3) << boost::detail::setw(10) << right << 100 * (1-alpha[i]);
+ cout << fixed << setprecision(3) << setw(10) << right << 100 * (1-alpha[i]);
// calculate df for single sided test:
double df = students_t::find_degrees_of_freedom(
fabs(M - Sm), alpha[i], alpha[i], Sd);
// convert to sample size, always one more than the degrees of freedom:
double size = ceil(df) + 1;
// Print size:
- cout << fixed << boost::detail::setprecision(0) << boost::detail::setw(16) << right << size;
+ cout << fixed << setprecision(0) << setw(16) << right << size;
// calculate df for two sided test:
df = students_t::find_degrees_of_freedom(
fabs(M - Sm), alpha[i]/2, alpha[i], Sd);
// convert to sample size:
size = ceil(df) + 1;
// Print size:
- cout << fixed << boost::detail::setprecision(0) << boost::detail::setw(16) << right << size << endl;
+ cout << fixed << setprecision(0) << setw(16) << right << size << endl;
}
cout << endl;
} // void single_sample_find_df
Modified: trunk/libs/math/example/students_t_two_samples.cpp
==============================================================================
--- trunk/libs/math/example/students_t_two_samples.cpp (original)
+++ trunk/libs/math/example/students_t_two_samples.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -12,13 +12,12 @@
# pragma warning(disable: 4610) // can never be instantiated - user defined constructor required.
#endif
-#include <ios>
#include <iostream>
using std::cout; using std::endl;
using std::left; using std::fixed; using std::right; using std::scientific;
-#include <boost/detail/iomanip.hpp>
-using boost::detail::setw;
-using boost::detail::setprecision;
+#include <iomanip>
+using std::setw;
+using std::setprecision;
#include <boost/math/distributions/students_t.hpp>
using boost::math::students_t;
@@ -39,7 +38,7 @@
// if due to chance.
// See http://www.itl.nist.gov/div898/handbook/eda/section3/eda353.htm
//
- // using namespace std;
+ using namespace std;
// using namespace boost::math;
using boost::math::students_t;
@@ -49,38 +48,38 @@
"_______________________________________________\n"
"Student t test for two samples (equal variances)\n"
"_______________________________________________\n\n";
- cout << boost::detail::setprecision(5);
- cout << boost::detail::setw(55) << left << "Number of Observations (Sample 1)" << "= " << Sn1 << "\n";
- cout << boost::detail::setw(55) << left << "Sample 1 Mean" << "= " << Sm1 << "\n";
- cout << boost::detail::setw(55) << left << "Sample 1 Standard Deviation" << "= " << Sd1 << "\n";
- cout << boost::detail::setw(55) << left << "Number of Observations (Sample 2)" << "= " << Sn2 << "\n";
- cout << boost::detail::setw(55) << left << "Sample 2 Mean" << "= " << Sm2 << "\n";
- cout << boost::detail::setw(55) << left << "Sample 2 Standard Deviation" << "= " << Sd2 << "\n";
+ cout << setprecision(5);
+ cout << setw(55) << left << "Number of Observations (Sample 1)" << "= " << Sn1 << "\n";
+ cout << setw(55) << left << "Sample 1 Mean" << "= " << Sm1 << "\n";
+ cout << setw(55) << left << "Sample 1 Standard Deviation" << "= " << Sd1 << "\n";
+ cout << setw(55) << left << "Number of Observations (Sample 2)" << "= " << Sn2 << "\n";
+ cout << setw(55) << left << "Sample 2 Mean" << "= " << Sm2 << "\n";
+ cout << setw(55) << left << "Sample 2 Standard Deviation" << "= " << Sd2 << "\n";
//
// Now we can calculate and output some stats:
//
// Degrees of freedom:
double v = Sn1 + Sn2 - 2;
- cout << boost::detail::setw(55) << left << "Degrees of Freedom" << "= " << v << "\n";
+ cout << setw(55) << left << "Degrees of Freedom" << "= " << v << "\n";
// Pooled variance:
double sp = sqrt(((Sn1-1) * Sd1 * Sd1 + (Sn2-1) * Sd2 * Sd2) / v);
- cout << boost::detail::setw(55) << left << "Pooled Standard Deviation" << "= " << v << "\n";
+ cout << setw(55) << left << "Pooled Standard Deviation" << "= " << v << "\n";
// t-statistic:
double t_stat = (Sm1 - Sm2) / (sp * sqrt(1.0 / Sn1 + 1.0 / Sn2));
- cout << boost::detail::setw(55) << left << "T Statistic" << "= " << t_stat << "\n";
+ cout << setw(55) << left << "T Statistic" << "= " << t_stat << "\n";
//
// Define our distribution, and get the probability:
//
students_t dist(v);
double q = cdf(complement(dist, fabs(t_stat)));
- cout << boost::detail::setw(55) << left << "Probability that difference is due to chance" << "= "
- << boost::detail::setprecision(3) << scientific << 2 * q << "\n\n";
+ cout << setw(55) << left << "Probability that difference is due to chance" << "= "
+ << setprecision(3) << scientific << 2 * q << "\n\n";
//
// Finally print out results of alternative hypothesis:
//
- cout << boost::detail::setw(55) << left <<
+ cout << setw(55) << left <<
"Results for Alternative Hypothesis and alpha" << "= "
- << boost::detail::setprecision(4) << fixed << alpha << "\n\n";
+ << setprecision(4) << fixed << alpha << "\n\n";
cout << "Alternative Hypothesis Conclusion\n";
cout << "Sample 1 Mean != Sample 2 Mean " ;
if(q < alpha / 2)
@@ -115,7 +114,7 @@
// that any difference is due to chance.
// See http://www.itl.nist.gov/div898/handbook/eda/section3/eda353.htm
//
- //using namespace std;
+ using namespace std;
using boost::math::students_t;
// Print header:
@@ -123,13 +122,13 @@
"_________________________________________________\n"
"Student t test for two samples (unequal variances)\n"
"_________________________________________________\n\n";
- cout << boost::detail::setprecision(5);
- cout << boost::detail::setw(55) << left << "Number of Observations (Sample 1)" << "= " << Sn1 << "\n";
- cout << boost::detail::setw(55) << left << "Sample 1 Mean" << "= " << Sm1 << "\n";
- cout << boost::detail::setw(55) << left << "Sample 1 Standard Deviation" << "= " << Sd1 << "\n";
- cout << boost::detail::setw(55) << left << "Number of Observations (Sample 2)" << "= " << Sn2 << "\n";
- cout << boost::detail::setw(55) << left << "Sample 2 Mean" << "= " << Sm2 << "\n";
- cout << boost::detail::setw(55) << left << "Sample 2 Standard Deviation" << "= " << Sd2 << "\n";
+ cout << setprecision(5);
+ cout << setw(55) << left << "Number of Observations (Sample 1)" << "= " << Sn1 << "\n";
+ cout << setw(55) << left << "Sample 1 Mean" << "= " << Sm1 << "\n";
+ cout << setw(55) << left << "Sample 1 Standard Deviation" << "= " << Sd1 << "\n";
+ cout << setw(55) << left << "Number of Observations (Sample 2)" << "= " << Sn2 << "\n";
+ cout << setw(55) << left << "Sample 2 Mean" << "= " << Sm2 << "\n";
+ cout << setw(55) << left << "Sample 2 Standard Deviation" << "= " << Sd2 << "\n";
//
// Now we can calculate and output some stats:
//
@@ -143,23 +142,23 @@
t2 *= t2;
t2 /= (Sn2 - 1);
v /= (t1 + t2);
- cout << boost::detail::setw(55) << left << "Degrees of Freedom" << "= " << v << "\n";
+ cout << setw(55) << left << "Degrees of Freedom" << "= " << v << "\n";
// t-statistic:
double t_stat = (Sm1 - Sm2) / sqrt(Sd1 * Sd1 / Sn1 + Sd2 * Sd2 / Sn2);
- cout << boost::detail::setw(55) << left << "T Statistic" << "= " << t_stat << "\n";
+ cout << setw(55) << left << "T Statistic" << "= " << t_stat << "\n";
//
// Define our distribution, and get the probability:
//
students_t dist(v);
double q = cdf(complement(dist, fabs(t_stat)));
- cout << boost::detail::setw(55) << left << "Probability that difference is due to chance" << "= "
- << boost::detail::setprecision(3) << scientific << 2 * q << "\n\n";
+ cout << setw(55) << left << "Probability that difference is due to chance" << "= "
+ << setprecision(3) << scientific << 2 * q << "\n\n";
//
// Finally print out results of alternative hypothesis:
//
- cout << boost::detail::setw(55) << left <<
+ cout << setw(55) << left <<
"Results for Alternative Hypothesis and alpha" << "= "
- << boost::detail::setprecision(4) << fixed << alpha << "\n\n";
+ << setprecision(4) << fixed << alpha << "\n\n";
cout << "Alternative Hypothesis Conclusion\n";
cout << "Sample 1 Mean != Sample 2 Mean " ;
if(q < alpha / 2)
Modified: trunk/libs/math/minimax/Jamfile.v2
==============================================================================
--- trunk/libs/math/minimax/Jamfile.v2 (original)
+++ trunk/libs/math/minimax/Jamfile.v2 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -14,8 +14,6 @@
project
: requirements
- <toolset>pathscale:<cxxflags>-Wno-missing-braces
- <toolset>clang:<cxxflags>-Wno-missing-braces
<toolset>gcc:<cxxflags>-Wno-missing-braces
<toolset>darwin:<cxxflags>-Wno-missing-braces
<toolset>acc:<cxxflags>+W2068,2461,2236,4070,4069
Modified: trunk/libs/math/minimax/main.cpp
==============================================================================
--- trunk/libs/math/minimax/main.cpp (original)
+++ trunk/libs/math/minimax/main.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -18,7 +18,7 @@
#include <boost/spirit/actor.hpp>
#include <boost/lexical_cast.hpp>
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <string>
#include <boost/test/included/test_exec_monitor.hpp> // for test_main
@@ -88,7 +88,7 @@
rel_error,
skew,
working_precision));
- std::cout << "Max error in interpolated form: " << boost::detail::setprecision(3) << std::scientific << boost::math::tools::real_cast<double>(p_remez->max_error()) << std::endl;
+ std::cout << "Max error in interpolated form: " << std::setprecision(3) << std::scientific << boost::math::tools::real_cast<double>(p_remez->max_error()) << std::endl;
//
// Signal that we've started:
//
@@ -102,9 +102,9 @@
boost::math::ntl::RR r = p_remez->iterate();
NTL::RR::SetOutputPrecision(3);
std::cout
- << "Maximum Deviation Found: " << boost::detail::setprecision(3) << std::scientific << boost::math::tools::real_cast<double>(p_remez->max_error()) << std::endl
- << "Expected Error Term: " << boost::detail::setprecision(3) << std::scientific << boost::math::tools::real_cast<double>(p_remez->error_term()) << std::endl
- << "Maximum Relative Change in Control Points: " << boost::detail::setprecision(3) << std::scientific << boost::math::tools::real_cast<double>(r) << std::endl;
+ << "Maximum Deviation Found: " << std::setprecision(3) << std::scientific << boost::math::tools::real_cast<double>(p_remez->max_error()) << std::endl
+ << "Expected Error Term: " << std::setprecision(3) << std::scientific << boost::math::tools::real_cast<double>(p_remez->error_term()) << std::endl
+ << "Maximum Relative Change in Control Points: " << std::setprecision(3) << std::scientific << boost::math::tools::real_cast<double>(r) << std::endl;
}
}
catch(const std::exception& e)
@@ -128,7 +128,7 @@
std::vector<boost::math::ntl::RR> cn = n.chebyshev();
std::vector<boost::math::ntl::RR> cd = d.chebyshev();
int prec = 2 + (target_precision * 3010LL)/10000;
- std::cout << std::scientific << boost::detail::setprecision(prec);
+ std::cout << std::scientific << std::setprecision(prec);
NTL::RR::SetOutputPrecision(prec);
boost::numeric::ublas::vector<boost::math::ntl::RR> v = p_remez->zero_points();
@@ -196,12 +196,12 @@
while(points > 1)
{
NTL::RR::SetOutputPrecision(10);
- std::cout << boost::detail::setprecision(10) << boost::detail::setw(30) << std::left
+ std::cout << std::setprecision(10) << std::setw(30) << std::left
<< boost::lexical_cast<std::string>(x) << the_function(x) << std::endl;
--points;
x += step;
}
- std::cout << boost::detail::setprecision(10) << boost::detail::setw(30) << std::left
+ std::cout << std::setprecision(10) << std::setw(30) << std::left
<< boost::lexical_cast<std::string>(b) << the_function(b) << std::endl;
}
@@ -277,8 +277,8 @@
max_error = err;
if(cheb_err > cheb_max_error)
cheb_max_error = cheb_err;
- std::cout << boost::detail::setprecision(6) << boost::detail::setw(15) << std::left << absissa
- << boost::detail::setw(15) << std::left << boost::math::tools::real_cast<T>(err) << boost::math::tools::real_cast<T>(cheb_err) << std::endl;
+ std::cout << std::setprecision(6) << std::setw(15) << std::left << absissa
+ << std::setw(15) << std::left << boost::math::tools::real_cast<T>(err) << boost::math::tools::real_cast<T>(cheb_err) << std::endl;
}
//
// Do the tests at the Chebeshev control points:
@@ -302,15 +302,15 @@
}
if(err > max_error)
max_error = err;
- std::cout << boost::detail::setprecision(6) << boost::detail::setw(15) << std::left << absissa
- << boost::detail::setw(15) << std::left << boost::math::tools::real_cast<T>(err) <<
+ std::cout << std::setprecision(6) << std::setw(15) << std::left << absissa
+ << std::setw(15) << std::left << boost::math::tools::real_cast<T>(err) <<
boost::math::tools::real_cast<T>(cheb_err) << std::endl;
}
std::string msg = "Max Error found at ";
msg += name;
msg += " precision = ";
msg.append(62 - 17 - msg.size(), ' ');
- std::cout << msg << boost::detail::setprecision(6) << "Poly: " << boost::detail::setw(20) << std::left
+ std::cout << msg << std::setprecision(6) << "Poly: " << std::setw(20) << std::left
<< boost::math::tools::real_cast<T>(max_error) << "Cheb: " << boost::math::tools::real_cast<T>(cheb_max_error) << std::endl;
}
else
@@ -401,8 +401,8 @@
max_error = err;
if(cheb_err > max_cheb_error)
max_cheb_error = cheb_err;
- std::cout << boost::detail::setprecision(6) << boost::detail::setw(15) << std::left << boost::math::tools::real_cast<double>(absissa)
- << (test_result < true_result ? "-" : "") << boost::detail::setw(20) << std::left
+ std::cout << std::setprecision(6) << std::setw(15) << std::left << boost::math::tools::real_cast<double>(absissa)
+ << (test_result < true_result ? "-" : "") << std::setw(20) << std::left
<< boost::math::tools::real_cast<double>(err)
<< boost::math::tools::real_cast<double>(cheb_err) << std::endl;
}
@@ -410,8 +410,8 @@
msg += name;
msg += " precision = ";
//msg.append(62 - 17 - msg.size(), ' ');
- std::cout << msg << "Poly: " << boost::detail::setprecision(6)
- //<< boost::detail::setw(15) << std::left
+ std::cout << msg << "Poly: " << std::setprecision(6)
+ //<< std::setw(15) << std::left
<< boost::math::tools::real_cast<T>(max_error)
<< " Cheb: " << boost::math::tools::real_cast<T>(max_cheb_error) << std::endl;
}
Modified: trunk/libs/math/octonion/octonion_test.cpp
==============================================================================
--- trunk/libs/math/octonion/octonion_test.cpp (original)
+++ trunk/libs/math/octonion/octonion_test.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -6,7 +6,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <boost/mpl/list.hpp>
Modified: trunk/libs/math/performance/main.cpp
==============================================================================
--- trunk/libs/math/performance/main.cpp (original)
+++ trunk/libs/math/performance/main.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -8,7 +8,7 @@
#include <map>
#include <set>
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <string>
#include <cstring>
#include <boost/math/tools/config.hpp>
@@ -77,24 +77,20 @@
name = "msvc-";
#elif defined(BOOST_MSVC) && defined(_DEBUG) && !defined(__ICL)
name = "msvc-debug-";
-#elif defined(BOOST_CLANG)
- name = "clang-"
-#elif defined(__PATHSCALE__)
- name = "pathscale-"
+#elif defined(__GNUC__)
+ name = "gcc-";
#elif defined(__ICL)
name = "intel-";
#elif defined(__ICC)
name = "intel-linux-";
-#elif defined(__GNUC__)
- name = "gcc-";
#endif
}
name += i->name;
set_call_count(1);
- std::cout << "Testing " << std::left << boost::detail::setw(50) << name << std::flush;
+ std::cout << "Testing " << std::left << std::setw(50) << name << std::flush;
double time = performance_measure(i->proc) - reference_time;
time /= call_count;
- std::cout << boost::detail::setprecision(3) << std::scientific << time << std::endl;
+ std::cout << std::setprecision(3) << std::scientific << time << std::endl;
}
}
Modified: trunk/libs/math/quaternion/quaternion_test.cpp
==============================================================================
--- trunk/libs/math/quaternion/quaternion_test.cpp (original)
+++ trunk/libs/math/quaternion/quaternion_test.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -6,7 +6,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <boost/mpl/list.hpp>
Modified: trunk/libs/math/special_functions/acosh_test.hpp
==============================================================================
--- trunk/libs/math/special_functions/acosh_test.hpp (original)
+++ trunk/libs/math/special_functions/acosh_test.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -7,7 +7,7 @@
#include <functional>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <iostream>
@@ -70,11 +70,11 @@
long double xl =
static_cast<long double>(i-50)/static_cast<long double>(5);
- BOOST_MESSAGE( ::boost::detail::setw(15)
+ BOOST_MESSAGE( ::std::setw(15)
<< acosh_error_evaluator(xf)
- << ::boost::detail::setw(15)
+ << ::std::setw(15)
<< acosh_error_evaluator(xd)
- << ::boost::detail::setw(15)
+ << ::std::setw(15)
<< acosh_error_evaluator(xl));
}
Modified: trunk/libs/math/special_functions/asinh_test.hpp
==============================================================================
--- trunk/libs/math/special_functions/asinh_test.hpp (original)
+++ trunk/libs/math/special_functions/asinh_test.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -7,7 +7,7 @@
#include <functional>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <iostream>
@@ -70,11 +70,11 @@
long double xl =
static_cast<long double>(i-50)/static_cast<long double>(5);
- BOOST_MESSAGE( ::boost::detail::setw(15)
+ BOOST_MESSAGE( ::std::setw(15)
<< asinh_error_evaluator(xf)
- << ::boost::detail::setw(15)
+ << ::std::setw(15)
<< asinh_error_evaluator(xd)
- << ::boost::detail::setw(15)
+ << ::std::setw(15)
<< asinh_error_evaluator(xl));
}
Modified: trunk/libs/math/special_functions/atanh_test.hpp
==============================================================================
--- trunk/libs/math/special_functions/atanh_test.hpp (original)
+++ trunk/libs/math/special_functions/atanh_test.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -7,7 +7,7 @@
#include <functional>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
//#include <iostream>
@@ -116,11 +116,11 @@
std::numeric_limits<long double>::has_infinity
)
{
- BOOST_MESSAGE( ::boost::detail::setw(15)
+ BOOST_MESSAGE( ::std::setw(15)
<< atanh_error_evaluator(xf)
- << ::boost::detail::setw(15)
+ << ::std::setw(15)
<< atanh_error_evaluator(xd)
- << ::boost::detail::setw(15)
+ << ::std::setw(15)
<< atanh_error_evaluator(xl));
}
else
@@ -144,11 +144,11 @@
}
else
{
- BOOST_MESSAGE( ::boost::detail::setw(15)
+ BOOST_MESSAGE( ::std::setw(15)
<< atanh_error_evaluator(xf)
- << ::boost::detail::setw(15)
+ << ::std::setw(15)
<< atanh_error_evaluator(xd)
- << ::boost::detail::setw(15)
+ << ::std::setw(15)
<< atanh_error_evaluator(xl));
}
}
Modified: trunk/libs/math/special_functions/sinc_test.hpp
==============================================================================
--- trunk/libs/math/special_functions/sinc_test.hpp (original)
+++ trunk/libs/math/special_functions/sinc_test.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -7,7 +7,7 @@
#include <functional>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <iostream>
#include <complex>
@@ -66,13 +66,13 @@
for (int i = 0; i <= 100; i++)
{
- BOOST_MESSAGE( ::boost::detail::setw(15)
+ BOOST_MESSAGE( ::std::setw(15)
<< sinc_pi<float>(static_cast<float>(i-50)/
static_cast<float>(50))
- << ::boost::detail::setw(15)
+ << ::std::setw(15)
<< sinc_pi<double>(static_cast<double>(i-50)/
static_cast<double>(50))
- << ::boost::detail::setw(15)
+ << ::std::setw(15)
<< sinc_pi<long double>(static_cast<long double>(i-50)/
static_cast<long double>(50)));
}
Modified: trunk/libs/math/special_functions/sinhc_test.hpp
==============================================================================
--- trunk/libs/math/special_functions/sinhc_test.hpp (original)
+++ trunk/libs/math/special_functions/sinhc_test.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -7,7 +7,7 @@
#include <functional>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <iostream>
#include <complex>
@@ -66,13 +66,13 @@
for (int i = 0; i <= 100; i++)
{
- BOOST_MESSAGE( ::boost::detail::setw(15)
+ BOOST_MESSAGE( ::std::setw(15)
<< sinhc_pi<float>(static_cast<float>(i-50)/
static_cast<float>(50))
- << ::boost::detail::setw(15)
+ << ::std::setw(15)
<< sinhc_pi<double>(static_cast<double>(i-50)/
static_cast<double>(50))
- << ::boost::detail::setw(15)
+ << ::std::setw(15)
<< sinhc_pi<long double>(static_cast<long double>(i-50)/
static_cast<long double>(50)));
}
Modified: trunk/libs/math/special_functions/special_functions_test.cpp
==============================================================================
--- trunk/libs/math/special_functions/special_functions_test.cpp (original)
+++ trunk/libs/math/special_functions/special_functions_test.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -6,7 +6,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <boost/mpl/list.hpp>
@@ -121,9 +121,9 @@
BOOST_MESSAGE("epsilon");
- BOOST_MESSAGE( ::boost::detail::setw(15) << numeric_limits<float>::epsilon()
- << ::boost::detail::setw(15) << numeric_limits<double>::epsilon()
- << ::boost::detail::setw(15) << numeric_limits<long double>::epsilon());
+ BOOST_MESSAGE( ::std::setw(15) << numeric_limits<float>::epsilon()
+ << ::std::setw(15) << numeric_limits<double>::epsilon()
+ << ::std::setw(15) << numeric_limits<long double>::epsilon());
BOOST_MESSAGE(" ");
Modified: trunk/libs/math/test/Jamfile.v2
==============================================================================
--- trunk/libs/math/test/Jamfile.v2 (original)
+++ trunk/libs/math/test/Jamfile.v2 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -17,13 +17,7 @@
local gmp_path = [ modules.peek : GMP_PATH ] ;
project
- : requirements
- <toolset>pathscale:<cxxflags>-fno-fast-math
- <toolset>pathscale:<cxxflags>-fno-unsafe-math-optimizations
- <toolset>pathscale:<cxxflags>-mieee-fp
- <toolset>pathscale:<cxxflags>-fstrict-overflow
- <toolset>pathscale:<cxxflags>-Wno-missing-braces
- <toolset>clang:<cxxflags>-Wno-missing-braces
+ : requirements
<toolset>gcc:<cxxflags>-Wno-missing-braces
<toolset>darwin:<cxxflags>-Wno-missing-braces
<toolset>acc:<cxxflags>+W2068,2461,2236,4070,4069
Modified: trunk/libs/math/test/acosh_test.hpp
==============================================================================
--- trunk/libs/math/test/acosh_test.hpp (original)
+++ trunk/libs/math/test/acosh_test.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -7,7 +7,7 @@
#include <functional>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <iostream>
@@ -71,16 +71,16 @@
static_cast<long double>(i-50)/static_cast<long double>(5);
#ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
- BOOST_MESSAGE( ::boost::detail::setw(15)
+ BOOST_MESSAGE( ::std::setw(15)
<< acosh_error_evaluator(xf)
- << ::boost::detail::setw(15)
+ << ::std::setw(15)
<< acosh_error_evaluator(xd)
- << ::boost::detail::setw(15)
+ << ::std::setw(15)
<< acosh_error_evaluator(xl));
#else
- BOOST_MESSAGE( ::boost::detail::setw(15)
+ BOOST_MESSAGE( ::std::setw(15)
<< acosh_error_evaluator(xf)
- << ::boost::detail::setw(15)
+ << ::std::setw(15)
<< acosh_error_evaluator(xd));
#endif
}
Modified: trunk/libs/math/test/asinh_test.hpp
==============================================================================
--- trunk/libs/math/test/asinh_test.hpp (original)
+++ trunk/libs/math/test/asinh_test.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -7,7 +7,7 @@
#include <functional>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <iostream>
@@ -71,16 +71,16 @@
static_cast<long double>(i-40)/static_cast<long double>(4);
#ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
- BOOST_MESSAGE( ::boost::detail::setw(15)
+ BOOST_MESSAGE( ::std::setw(15)
<< asinh_error_evaluator(xf)
- << ::boost::detail::setw(15)
+ << ::std::setw(15)
<< asinh_error_evaluator(xd)
- << ::boost::detail::setw(15)
+ << ::std::setw(15)
<< asinh_error_evaluator(xl));
#else
- BOOST_MESSAGE( ::boost::detail::setw(15)
+ BOOST_MESSAGE( ::std::setw(15)
<< asinh_error_evaluator(xf)
- << ::boost::detail::setw(15)
+ << ::std::setw(15)
<< asinh_error_evaluator(xd));
#endif
}
Modified: trunk/libs/math/test/atanh_test.hpp
==============================================================================
--- trunk/libs/math/test/atanh_test.hpp (original)
+++ trunk/libs/math/test/atanh_test.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -7,7 +7,7 @@
#include <functional>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
//#include <iostream>
@@ -117,16 +117,16 @@
)
{
#ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
- BOOST_MESSAGE( ::boost::detail::setw(15)
+ BOOST_MESSAGE( ::std::setw(15)
<< atanh_error_evaluator(xf)
- << ::boost::detail::setw(15)
+ << ::std::setw(15)
<< atanh_error_evaluator(xd)
- << ::boost::detail::setw(15)
+ << ::std::setw(15)
<< atanh_error_evaluator(xl));
#else
- BOOST_MESSAGE( ::boost::detail::setw(15)
+ BOOST_MESSAGE( ::std::setw(15)
<< atanh_error_evaluator(xf)
- << ::boost::detail::setw(15)
+ << ::std::setw(15)
<< atanh_error_evaluator(xd));
#endif
}
@@ -152,16 +152,16 @@
else
{
#ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
- BOOST_MESSAGE( ::boost::detail::setw(15)
+ BOOST_MESSAGE( ::std::setw(15)
<< atanh_error_evaluator(xf)
- << ::boost::detail::setw(15)
+ << ::std::setw(15)
<< atanh_error_evaluator(xd)
- << ::boost::detail::setw(15)
+ << ::std::setw(15)
<< atanh_error_evaluator(xl));
#else
- BOOST_MESSAGE( ::boost::detail::setw(15)
+ BOOST_MESSAGE( ::std::setw(15)
<< atanh_error_evaluator(xf)
- << ::boost::detail::setw(15)
+ << ::std::setw(15)
<< atanh_error_evaluator(xd));
#endif
}
Modified: trunk/libs/math/test/complex_test.cpp
==============================================================================
--- trunk/libs/math/test/complex_test.cpp (original)
+++ trunk/libs/math/test/complex_test.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -13,7 +13,7 @@
#include <boost/math/complex.hpp>
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <cmath>
#include <typeinfo>
@@ -116,7 +116,7 @@
T x, y;
- std::cout << boost::detail::setprecision(std::numeric_limits<T>::digits10+2);
+ std::cout << std::setprecision(std::numeric_limits<T>::digits10+2);
for(x = -1; x <= 1; x += interval)
{
Modified: trunk/libs/math/test/handle_test_result.hpp
==============================================================================
--- trunk/libs/math/test/handle_test_result.hpp (original)
+++ trunk/libs/math/test/handle_test_result.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -11,7 +11,6 @@
#include <boost/math/tools/precision.hpp>
#include <boost/regex.hpp>
#include <boost/test/test_tools.hpp>
-#include <boost/detail/iomanip.hpp>
#if defined(BOOST_INTEL)
# pragma warning(disable:239)
@@ -119,7 +118,7 @@
{
using namespace std; // To aid selection of the right pow.
T eps = boost::math::tools::epsilon<T>();
- std::cout << boost::detail::setprecision(4);
+ std::cout << std::setprecision(4);
T max_error_found = (result.max)()/eps;
T mean_error_found = result.rms()/eps;
@@ -138,11 +137,11 @@
<< row << "\n { ";
if(std::numeric_limits<T>::digits10)
{
- std::cout << boost::detail::setprecision(std::numeric_limits<T>::digits10 + 2);
+ std::cout << std::setprecision(std::numeric_limits<T>::digits10 + 2);
}
else
{
- std::cout << boost::detail::setprecision(std::numeric_limits<long double>::digits10 + 2);
+ std::cout << std::setprecision(std::numeric_limits<long double>::digits10 + 2);
}
for(unsigned i = 0; i < worst.size(); ++i)
{
@@ -180,7 +179,7 @@
{
using namespace std; // To aid selection of the right pow.
T eps = boost::math::tools::epsilon<T>();
- std::cout << boost::detail::setprecision(4);
+ std::cout << std::setprecision(4);
T max_error_found = (result.max)()/eps;
T mean_error_found = result.rms()/eps;
Modified: trunk/libs/math/test/sinc_test.hpp
==============================================================================
--- trunk/libs/math/test/sinc_test.hpp (original)
+++ trunk/libs/math/test/sinc_test.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -7,7 +7,7 @@
#include <functional>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <iostream>
#include <complex>
@@ -67,20 +67,20 @@
for (int i = 0; i <= 100; i++)
{
#ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
- BOOST_MESSAGE( ::boost::detail::setw(15)
+ BOOST_MESSAGE( ::std::setw(15)
<< sinc_pi<float>(static_cast<float>(i-50)/
static_cast<float>(50))
- << ::boost::detail::setw(15)
+ << ::std::setw(15)
<< sinc_pi<double>(static_cast<double>(i-50)/
static_cast<double>(50))
- << ::boost::detail::setw(15)
+ << ::std::setw(15)
<< sinc_pi<long double>(static_cast<long double>(i-50)/
static_cast<long double>(50)));
#else
- BOOST_MESSAGE( ::boost::detail::setw(15)
+ BOOST_MESSAGE( ::std::setw(15)
<< sinc_pi<float>(static_cast<float>(i-50)/
static_cast<float>(50))
- << ::boost::detail::setw(15)
+ << ::std::setw(15)
<< sinc_pi<double>(static_cast<double>(i-50)/
static_cast<double>(50)));
#endif
Modified: trunk/libs/math/test/sinhc_test.hpp
==============================================================================
--- trunk/libs/math/test/sinhc_test.hpp (original)
+++ trunk/libs/math/test/sinhc_test.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -7,7 +7,7 @@
#include <functional>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <iostream>
#include <complex>
@@ -67,20 +67,20 @@
for (int i = 0; i <= 100; i++)
{
#ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
- BOOST_MESSAGE( ::boost::detail::setw(15)
+ BOOST_MESSAGE( ::std::setw(15)
<< sinhc_pi<float>(static_cast<float>(i-50)/
static_cast<float>(50))
- << ::boost::detail::setw(15)
+ << ::std::setw(15)
<< sinhc_pi<double>(static_cast<double>(i-50)/
static_cast<double>(50))
- << ::boost::detail::setw(15)
+ << ::std::setw(15)
<< sinhc_pi<long double>(static_cast<long double>(i-50)/
static_cast<long double>(50)));
#else
- BOOST_MESSAGE( ::boost::detail::setw(15)
+ BOOST_MESSAGE( ::std::setw(15)
<< sinhc_pi<float>(static_cast<float>(i-50)/
static_cast<float>(50))
- << ::boost::detail::setw(15)
+ << ::std::setw(15)
<< sinhc_pi<double>(static_cast<double>(i-50)/
static_cast<double>(50)));
#endif
Modified: trunk/libs/math/test/special_functions_test.cpp
==============================================================================
--- trunk/libs/math/test/special_functions_test.cpp (original)
+++ trunk/libs/math/test/special_functions_test.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -6,7 +6,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <boost/mpl/list.hpp>
@@ -128,9 +128,9 @@
BOOST_MESSAGE("epsilon");
- BOOST_MESSAGE( ::boost::detail::setw(15) << numeric_limits<float>::epsilon()
- << ::boost::detail::setw(15) << numeric_limits<double>::epsilon()
- << ::boost::detail::setw(15) << numeric_limits<long double>::epsilon());
+ BOOST_MESSAGE( ::std::setw(15) << numeric_limits<float>::epsilon()
+ << ::std::setw(15) << numeric_limits<double>::epsilon()
+ << ::std::setw(15) << numeric_limits<long double>::epsilon());
BOOST_MESSAGE(" ");
Modified: trunk/libs/math/test/test_bernoulli.cpp
==============================================================================
--- trunk/libs/math/test/test_bernoulli.cpp (original)
+++ trunk/libs/math/test/test_bernoulli.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -28,8 +28,6 @@
#include <boost/test/test_exec_monitor.hpp> // for test_main
#include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE_FRACTION, BOOST_CHECK_EQUAL...
-#include <ios>
-#include <boost/detail/iomanip.hpp>
#include <iostream>
using std::cout;
using std::endl;
@@ -38,8 +36,8 @@
using std::left;
using std::showpoint;
using std::showpos;
-using boost::detail::setw;
-using boost::detail::setprecision;
+using std::setw;
+using std::setprecision;
#include <limits>
using std::numeric_limits;
@@ -59,7 +57,7 @@
tolerance *= 100;
cout << "Tolerance for type " << typeid(RealType).name() << " is "
- << boost::detail::setprecision(3) << tolerance << " (or " << tolerance * 100 << "%)." << endl;
+ << setprecision(3) << tolerance << " (or " << tolerance * 100 << "%)." << endl;
// Sources of spot test values - calculator,
// or Steve Moshier's command interpreter V1.3 100 decimal digit calculator,
Modified: trunk/libs/math/test/test_dist_overloads.cpp
==============================================================================
--- trunk/libs/math/test/test_dist_overloads.cpp (original)
+++ trunk/libs/math/test/test_dist_overloads.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -15,11 +15,10 @@
#include <boost/test/test_exec_monitor.hpp> // Boost.Test
#include <boost/test/floating_point_comparison.hpp>
-#include <boost/detail/iomanip.hpp>
#include <iostream>
using std::cout;
using std::endl;
- using boost::detail::setprecision;
+ using std::setprecision;
template <class RealType>
void test_spots(RealType)
Modified: trunk/libs/math/test/test_exponential_dist.cpp
==============================================================================
--- trunk/libs/math/test/test_exponential_dist.cpp (original)
+++ trunk/libs/math/test/test_exponential_dist.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -15,11 +15,10 @@
#include <boost/test/test_exec_monitor.hpp> // Boost.Test
#include <boost/test/floating_point_comparison.hpp>
-#include <boost/detail/iomanip.hpp>
#include <iostream>
using std::cout;
using std::endl;
- using boost::detail::setprecision;
+ using std::setprecision;
template <class RealType>
void test_spot(RealType l, RealType x, RealType p, RealType q, RealType tolerance)
Modified: trunk/libs/math/test/test_extreme_value.cpp
==============================================================================
--- trunk/libs/math/test/test_extreme_value.cpp (original)
+++ trunk/libs/math/test/test_extreme_value.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -14,11 +14,10 @@
#include <boost/test/test_exec_monitor.hpp> // Boost.Test
#include <boost/test/floating_point_comparison.hpp>
-#include <boost/detail/iomanip.hpp>
#include <iostream>
using std::cout;
using std::endl;
- using boost::detail::setprecision;
+ using std::setprecision;
template <class RealType>
void test_spot(RealType a, RealType b, RealType x, RealType p, RealType q, RealType tolerance)
Modified: trunk/libs/math/test/test_find_location.cpp
==============================================================================
--- trunk/libs/math/test/test_find_location.cpp (original)
+++ trunk/libs/math/test/test_find_location.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -32,12 +32,10 @@
#include <boost/test/test_exec_monitor.hpp> // for test_main
#include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE_FRACTION, BOOST_CHECK_EQUAL...
-#include <ios>
-#include <boost/detail/iomanip.hpp>
#include <iostream>
using std::cout; using std::endl; using std::fixed;
using std::right; using std::left; using std::showpoint;
- using std::showpos; using boost::detail::setw; using boost::detail::setprecision;
+ using std::showpos; using std::setw; using std::setprecision;
#include <limits>
using std::numeric_limits;
@@ -57,7 +55,7 @@
tolerance *= 100; // 100 eps as a fraction.
cout << "Tolerance for type " << typeid(RealType).name() << " is "
- << boost::detail::setprecision(3) << tolerance << " (or " << tolerance * 100 << "%)." << endl;
+ << setprecision(3) << tolerance << " (or " << tolerance * 100 << "%)." << endl;
BOOST_CHECK_THROW( // Probability outside 0 to 1.
find_location<normal_distribution<RealType> >(
Modified: trunk/libs/math/test/test_find_scale.cpp
==============================================================================
--- trunk/libs/math/test/test_find_scale.cpp (original)
+++ trunk/libs/math/test/test_find_scale.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -32,12 +32,10 @@
#include <boost/test/test_exec_monitor.hpp> // for test_main
#include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE_FRACTION, BOOST_CHECK_EQUAL...
-#include <ios>
-#include <boost/detail/iomanip.hpp>
#include <iostream>
using std::cout; using std::endl; using std::fixed;
using std::right; using std::left; using std::showpoint;
- using std::showpos; using boost::detail::setw; using boost::detail::setprecision;
+ using std::showpos; using std::setw; using std::setprecision;
#include <limits>
using std::numeric_limits;
@@ -57,7 +55,7 @@
tolerance *= 100; // 100 eps as a fraction.
cout << "Tolerance for type " << typeid(RealType).name() << " is "
- << boost::detail::setprecision(3) << tolerance << " (or " << tolerance * 100 << "%)." << endl;
+ << setprecision(3) << tolerance << " (or " << tolerance * 100 << "%)." << endl;
BOOST_CHECK_THROW( // Probability outside 0 to 1.
find_scale<normal_distribution<RealType> >(
Modified: trunk/libs/math/test/test_gamma_dist.cpp
==============================================================================
--- trunk/libs/math/test/test_gamma_dist.cpp (original)
+++ trunk/libs/math/test/test_gamma_dist.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -25,11 +25,10 @@
using boost::math::gamma_distribution;
#include <boost/math/tools/test.hpp>
-#include <boost/detail/iomanip.hpp>
#include <iostream>
using std::cout;
using std::endl;
- using boost::detail::setprecision;
+ using std::setprecision;
#include <limits>
using std::numeric_limits;
Modified: trunk/libs/math/test/test_geometric.cpp
==============================================================================
--- trunk/libs/math/test/test_geometric.cpp (original)
+++ trunk/libs/math/test/test_geometric.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -38,12 +38,10 @@
#include <boost/test/test_exec_monitor.hpp> // for test_main
#include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE_FRACTION
-#include <ios>
-#include <boost/detail/iomanip.hpp>
#include <iostream>
using std::cout;
using std::endl;
-using boost::detail::setprecision;
+using std::setprecision;
using std::showpoint;
#include <limits>
using std::numeric_limits;
Modified: trunk/libs/math/test/test_hypergeometric_dist.cpp
==============================================================================
--- trunk/libs/math/test/test_hypergeometric_dist.cpp (original)
+++ trunk/libs/math/test/test_hypergeometric_dist.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -16,11 +16,10 @@
#include <boost/test/unit_test.hpp>
#include <boost/test/floating_point_comparison.hpp>
-#include <boost/detail/iomanip.hpp>
#include <iostream>
using std::cout;
using std::endl;
- using boost::detail::setprecision;
+ using std::setprecision;
#include <boost/array.hpp>
#include "functor.hpp"
@@ -33,7 +32,7 @@
if(failures != boost::unit_test::results_collector.results( boost::unit_test::framework::current_test_case().p_id ).p_assertions_failed)\
{\
std::cerr << "Failure was with data ";\
- std::cerr << boost::detail::setprecision(35); \
+ std::cerr << std::setprecision(35); \
std::cerr << "x = " << x << ", r = " << r << ", n = " << n\
<< ", N = " << N << ", p = " << cp << ", q = " << ccp << std::endl;\
}\
Modified: trunk/libs/math/test/test_igamma_inv.cpp
==============================================================================
--- trunk/libs/math/test/test_igamma_inv.cpp (original)
+++ trunk/libs/math/test/test_igamma_inv.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -15,7 +15,6 @@
#include <boost/math/tools/test.hpp>
#include <boost/math/constants/constants.hpp>
#include <boost/type_traits/is_floating_point.hpp>
-#include <boost/detail/iomanip.hpp>
#include <boost/array.hpp>
#include "functor.hpp"
@@ -197,7 +196,7 @@
if(failures != boost::unit_test::results_collector.results( boost::unit_test::framework::current_test_case().p_id ).p_assertions_failed)\
{\
std::cerr << "Failure was at row " << i << std::endl;\
- std::cerr << boost::detail::setprecision(35); \
+ std::cerr << std::setprecision(35); \
std::cerr << "{ " << data[i][0] << " , " << data[i][1] << " , " << data[i][2];\
std::cerr << " , " << data[i][3] << " , " << data[i][4] << " , " << data[i][5] << " } " << std::endl;\
}\
Modified: trunk/libs/math/test/test_igamma_inva.cpp
==============================================================================
--- trunk/libs/math/test/test_igamma_inva.cpp (original)
+++ trunk/libs/math/test/test_igamma_inva.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -17,11 +17,9 @@
#include <boost/math/tools/test.hpp>
#include <boost/math/constants/constants.hpp>
#include <boost/type_traits/is_floating_point.hpp>
-#include <boost/detail/iomanip.hpp>
#include <boost/array.hpp>
#include "functor.hpp"
-
#include "handle_test_result.hpp"
#if !defined(TEST_FLOAT) && !defined(TEST_DOUBLE) && !defined(TEST_LDOUBLE) && !defined(TEST_REAL_CONCEPT)
@@ -126,7 +124,7 @@
if(failures != boost::unit_test::results_collector.results( boost::unit_test::framework::current_test_case().p_id ).p_assertions_failed)\
{\
std::cerr << "Failure was at row " << i << std::endl;\
- std::cerr << boost::detail::setprecision(35); \
+ std::cerr << std::setprecision(35); \
std::cerr << "{ " << data[i][0] << " , " << data[i][1] << " , " << data[i][2];\
std::cerr << " , " << data[i][3] << " , " << data[i][4] << " , " << data[i][5] << " } " << std::endl;\
}\
Modified: trunk/libs/math/test/test_inverse_gaussian.cpp
==============================================================================
--- trunk/libs/math/test/test_inverse_gaussian.cpp (original)
+++ trunk/libs/math/test/test_inverse_gaussian.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -26,11 +26,10 @@
#include <boost/math/tools/test.hpp>
-#include <boost/detail/iomanip.hpp>
#include <iostream>
using std::cout;
using std::endl;
-using boost::detail::setprecision;
+using std::setprecision;
#include <limits>
using std::numeric_limits;
Modified: trunk/libs/math/test/test_laplace.cpp
==============================================================================
--- trunk/libs/math/test/test_laplace.cpp (original)
+++ trunk/libs/math/test/test_laplace.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -68,7 +68,7 @@
#include <iostream>
using std::cout;
using std::endl;
- using boost::detail::setprecision;
+ using std::setprecision;
#include <limits>
using std::numeric_limits;
Modified: trunk/libs/math/test/test_logistic_dist.cpp
==============================================================================
--- trunk/libs/math/test/test_logistic_dist.cpp (original)
+++ trunk/libs/math/test/test_logistic_dist.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -15,11 +15,10 @@
#include <boost/test/floating_point_comparison.hpp>
-#include <boost/detail/iomanip.hpp>
#include <iostream>
using std::cout;
using std::endl;
- using boost::detail::setprecision;
+ using std::setprecision;
template <class RealType>
Modified: trunk/libs/math/test/test_lognormal.cpp
==============================================================================
--- trunk/libs/math/test/test_lognormal.cpp (original)
+++ trunk/libs/math/test/test_lognormal.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -16,11 +16,10 @@
using boost::math::lognormal_distribution;
#include <boost/math/tools/test.hpp>
-#include <boost/detail/iomanip.hpp>
#include <iostream>
using std::cout;
using std::endl;
- using boost::detail::setprecision;
+ using std::setprecision;
#include <limits>
using std::numeric_limits;
#include <cassert>
Modified: trunk/libs/math/test/test_long_double_support.cpp
==============================================================================
--- trunk/libs/math/test/test_long_double_support.cpp (original)
+++ trunk/libs/math/test/test_long_double_support.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -15,10 +15,10 @@
#include <boost/test/floating_point_comparison.hpp>
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
using std::cout;
using std::endl;
- using boost::detail::setprecision;
+ using std::setprecision;
#include <boost/array.hpp>
#include "functor.hpp"
Modified: trunk/libs/math/test/test_nc_beta.cpp
==============================================================================
--- trunk/libs/math/test/test_nc_beta.cpp (original)
+++ trunk/libs/math/test/test_nc_beta.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -35,7 +35,6 @@
#include "handle_test_result.hpp"
#include "test_ncbeta_hooks.hpp"
-#include <boost/detail/iomanip.hpp>
#include <iostream>
using std::cout;
using std::endl;
@@ -49,7 +48,7 @@
if(failures != boost::unit_test::results_collector.results( boost::unit_test::framework::current_test_case().p_id ).p_assertions_failed)\
{\
std::cerr << "Failure was at row " << i << std::endl;\
- std::cerr << boost::detail::setprecision(35); \
+ std::cerr << std::setprecision(35); \
std::cerr << "{ " << data[i][0] << " , " << data[i][1] << " , " << data[i][2];\
std::cerr << " , " << data[i][3] << " , " << data[i][4] << " } " << std::endl;\
}\
@@ -62,7 +61,7 @@
if(failures != boost::unit_test::results_collector.results( boost::unit_test::framework::current_test_case().p_id ).p_assertions_failed)\
{\
std::cerr << "Failure was at row " << i << std::endl;\
- std::cerr << boost::detail::setprecision(35); \
+ std::cerr << std::setprecision(35); \
std::cerr << "{ " << data[i][0] << " , " << data[i][1] << " , " << data[i][2];\
std::cerr << " , " << data[i][3] << " , " << data[i][4] << " } " << std::endl;\
}\
Modified: trunk/libs/math/test/test_nc_chi_squared.cpp
==============================================================================
--- trunk/libs/math/test/test_nc_chi_squared.cpp (original)
+++ trunk/libs/math/test/test_nc_chi_squared.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -32,7 +32,6 @@
#include "handle_test_result.hpp"
#include "test_nccs_hooks.hpp"
-#include <boost/detail/iomanip.hpp>
#include <iostream>
using std::cout;
using std::endl;
@@ -46,7 +45,7 @@
if(failures != boost::unit_test::results_collector.results( boost::unit_test::framework::current_test_case().p_id ).p_assertions_failed)\
{\
std::cerr << "Failure was at row " << i << std::endl;\
- std::cerr << boost::detail::setprecision(35); \
+ std::cerr << std::setprecision(35); \
std::cerr << "{ " << data[i][0] << " , " << data[i][1] << " , " << data[i][2];\
std::cerr << " , " << data[i][3] << " , " << data[i][4] << " } " << std::endl;\
}\
@@ -59,7 +58,7 @@
if(failures != boost::unit_test::results_collector.results( boost::unit_test::framework::current_test_case().p_id ).p_assertions_failed)\
{\
std::cerr << "Failure was at row " << i << std::endl;\
- std::cerr << boost::detail::setprecision(35); \
+ std::cerr << std::setprecision(35); \
std::cerr << "{ " << data[i][0] << " , " << data[i][1] << " , " << data[i][2];\
std::cerr << " , " << data[i][3] << " , " << data[i][4] << " } " << std::endl;\
}\
Modified: trunk/libs/math/test/test_nc_f.cpp
==============================================================================
--- trunk/libs/math/test/test_nc_f.cpp (original)
+++ trunk/libs/math/test/test_nc_f.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -30,7 +30,6 @@
#include "functor.hpp"
#include "handle_test_result.hpp"
-#include <boost/detail/iomanip.hpp>
#include <iostream>
using std::cout;
using std::endl;
@@ -44,7 +43,7 @@
if(failures != boost::unit_test::results_collector.results( boost::unit_test::framework::current_test_case().p_id ).p_assertions_failed)\
{\
std::cerr << "Failure was at row " << i << std::endl;\
- std::cerr << boost::detail::setprecision(35); \
+ std::cerr << std::setprecision(35); \
std::cerr << "{ " << data[i][0] << " , " << data[i][1] << " , " << data[i][2];\
std::cerr << " , " << data[i][3] << " , " << data[i][4] << " } " << std::endl;\
}\
@@ -57,7 +56,7 @@
if(failures != boost::unit_test::results_collector.results( boost::unit_test::framework::current_test_case().p_id ).p_assertions_failed)\
{\
std::cerr << "Failure was at row " << i << std::endl;\
- std::cerr << boost::detail::setprecision(35); \
+ std::cerr << std::setprecision(35); \
std::cerr << "{ " << data[i][0] << " , " << data[i][1] << " , " << data[i][2];\
std::cerr << " , " << data[i][3] << " , " << data[i][4] << " } " << std::endl;\
}\
Modified: trunk/libs/math/test/test_nc_t.cpp
==============================================================================
--- trunk/libs/math/test/test_nc_t.cpp (original)
+++ trunk/libs/math/test/test_nc_t.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -30,7 +30,6 @@
#include "functor.hpp"
#include "handle_test_result.hpp"
-#include <boost/detail/iomanip.hpp>
#include <iostream>
using std::cout;
using std::endl;
@@ -44,7 +43,7 @@
if(failures != boost::unit_test::results_collector.results( boost::unit_test::framework::current_test_case().p_id ).p_assertions_failed)\
{\
std::cerr << "Failure was at row " << i << std::endl;\
- std::cerr << boost::detail::setprecision(35); \
+ std::cerr << std::setprecision(35); \
std::cerr << "{ " << data[i][0] << " , " << data[i][1] << " , " << data[i][2];\
std::cerr << " , " << data[i][3] << " , " << data[i][4] << " } " << std::endl;\
}\
@@ -57,7 +56,7 @@
if(failures != boost::unit_test::results_collector.results( boost::unit_test::framework::current_test_case().p_id ).p_assertions_failed)\
{\
std::cerr << "Failure was at row " << i << std::endl;\
- std::cerr << boost::detail::setprecision(35); \
+ std::cerr << std::setprecision(35); \
std::cerr << "{ " << data[i][0] << " , " << data[i][1] << " , " << data[i][2];\
std::cerr << " , " << data[i][3] << " , " << data[i][4] << " } " << std::endl;\
}\
Modified: trunk/libs/math/test/test_negative_binomial.cpp
==============================================================================
--- trunk/libs/math/test/test_negative_binomial.cpp (original)
+++ trunk/libs/math/test/test_negative_binomial.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -38,12 +38,10 @@
#include <boost/test/test_exec_monitor.hpp> // for test_main
#include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE
-#include <ios>
-#include <boost/detail/iomanip.hpp>
#include <iostream>
using std::cout;
using std::endl;
-using boost::detail::setprecision;
+using std::setprecision;
using std::showpoint;
#include <limits>
using std::numeric_limits;
Modified: trunk/libs/math/test/test_normal.cpp
==============================================================================
--- trunk/libs/math/test/test_normal.cpp (original)
+++ trunk/libs/math/test/test_normal.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -31,11 +31,10 @@
using boost::math::normal_distribution;
#include <boost/math/tools/test.hpp>
-#include <boost/detail/iomanip.hpp>
#include <iostream>
using std::cout;
using std::endl;
- using boost::detail::setprecision;
+ using std::setprecision;
#include <limits>
using std::numeric_limits;
Modified: trunk/libs/math/test/test_pareto.cpp
==============================================================================
--- trunk/libs/math/test/test_pareto.cpp (original)
+++ trunk/libs/math/test/test_pareto.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -31,11 +31,10 @@
using boost::math::pareto_distribution;
#include <boost/math/tools/test.hpp>
-#include <boost/detail/iomanip.hpp>
#include <iostream>
using std::cout;
using std::endl;
- using boost::detail::setprecision;
+ using std::setprecision;
#include <limits>
using std::numeric_limits;
Modified: trunk/libs/math/test/test_poisson.cpp
==============================================================================
--- trunk/libs/math/test/test_poisson.cpp (original)
+++ trunk/libs/math/test/test_poisson.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -34,12 +34,10 @@
#include <boost/math/special_functions/gamma.hpp> // for (incomplete) gamma.
// using boost::math::qamma_Q;
-#include <ios>
-#include <boost/detail/iomanip.hpp>
#include <iostream>
using std::cout;
using std::endl;
- using boost::detail::setprecision;
+ using std::setprecision;
using std::showpoint;
using std::ios;
#include <limits>
@@ -558,7 +556,7 @@
{
cout << boost::math::gamma_q<double>(i+1, mean); // cdf
double diff = boost::math::gamma_q<double>(i+1, mean) - sum; // cdf -sum
- cout << boost::detail::setprecision (2) << ' ' << diff; // 0 0 to 4, 1 eps 5 to 9, 10 to 20 2 eps, 21 upwards 3 eps
+ cout << setprecision (2) << ' ' << diff; // 0 0 to 4, 1 eps 5 to 9, 10 to 20 2 eps, 21 upwards 3 eps
}
BOOST_CHECK_CLOSE(
@@ -566,7 +564,7 @@
sum, // of pdfs.
4e-14); // Fails at 2e-14
// This call puts the precision etc back to default 6 !!!
- cout << boost::detail::setprecision(17) << showpoint;
+ cout << setprecision(17) << showpoint;
cout << endl;
Modified: trunk/libs/math/test/test_rayleigh.cpp
==============================================================================
--- trunk/libs/math/test/test_rayleigh.cpp (original)
+++ trunk/libs/math/test/test_rayleigh.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -19,11 +19,10 @@
#include <boost/test/test_exec_monitor.hpp> // Boost.Test
#include <boost/test/floating_point_comparison.hpp>
-#include <boost/detail/iomanip.hpp>
#include <iostream>
using std::cout;
using std::endl;
- using boost::detail::setprecision;
+ using std::setprecision;
template <class RealType>
void test_spot(RealType s, RealType x, RealType p, RealType q, RealType tolerance)
Modified: trunk/libs/math/test/test_real_concept_neg_bin.cpp
==============================================================================
--- trunk/libs/math/test/test_real_concept_neg_bin.cpp (original)
+++ trunk/libs/math/test/test_real_concept_neg_bin.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -20,12 +20,10 @@
#include <boost/math/distributions/negative_binomial.hpp> // for some comparisons.
-#include <ios>
-#include <boost/detail/iomanip.hpp>
#include <iostream>
using std::cout;
using std::endl;
-using boost::detail::setprecision;
+using std::setprecision;
using std::showpoint;
#include <limits>
using std::numeric_limits;
Modified: trunk/libs/math/test/test_roots.cpp
==============================================================================
--- trunk/libs/math/test/test_roots.cpp (original)
+++ trunk/libs/math/test/test_roots.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -13,7 +13,6 @@
#include <boost/test/results_collector.hpp>
#include <boost/test/unit_test.hpp>
#include <boost/array.hpp>
-#include <boost/detail/iomanip.hpp>
#define BOOST_CHECK_CLOSE_EX(a, b, prec, i) \
{\
@@ -22,7 +21,7 @@
if(failures != boost::unit_test::results_collector.results( boost::unit_test::framework::current_test_case().p_id ).p_assertions_failed)\
{\
std::cerr << "Failure was at row " << i << std::endl;\
- std::cerr << boost::detail::setprecision(35); \
+ std::cerr << std::setprecision(35); \
std::cerr << "{ " << data[i][0] << " , " << data[i][1] << " , " << data[i][2];\
std::cerr << " , " << data[i][3] << " , " << data[i][4] << " , " << data[i][5] << " } " << std::endl;\
}\
Modified: trunk/libs/math/test/test_round.cpp
==============================================================================
--- trunk/libs/math/test/test_round.cpp (original)
+++ trunk/libs/math/test/test_round.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -13,7 +13,6 @@
#include <boost/math/special_functions/modf.hpp>
#include <boost/math/special_functions/sign.hpp>
#include <boost/random/mersenne_twister.hpp>
-#include <boost/detail/iomanip.hpp>
boost::mt19937 rng;
@@ -46,13 +45,13 @@
if(fabs(a-u) > 0.5f)
{
BOOST_ERROR("Rounded result differed by more than 0.5 from the original");
- std::cerr << "Values were: " << boost::detail::setprecision(35) << boost::detail::setw(40)
+ std::cerr << "Values were: " << std::setprecision(35) << std::setw(40)
<< std::left << a << u << std::endl;
}
if((fabs(a - u) == 0.5f) && (fabs(static_cast<T>(u)) < fabs(a)))
{
BOOST_ERROR("Rounded result was towards zero with boost::round");
- std::cerr << "Values were: " << boost::detail::setprecision(35) << boost::detail::setw(40)
+ std::cerr << "Values were: " << std::setprecision(35) << std::setw(40)
<< std::left << a << u << std::endl;
}
}
@@ -73,19 +72,19 @@
if(fabs(a-u) >= 1)
{
BOOST_ERROR("Rounded result differed by more than 1 from the original");
- std::cerr << "Values were: " << boost::detail::setprecision(35) << boost::detail::setw(40)
+ std::cerr << "Values were: " << std::setprecision(35) << std::setw(40)
<< std::left << a << u << std::endl;
}
if(abs(a) < safe_abs(u))
{
BOOST_ERROR("Truncated result had larger absolute value than the original");
- std::cerr << "Values were: " << boost::detail::setprecision(35) << boost::detail::setw(40)
+ std::cerr << "Values were: " << std::setprecision(35) << std::setw(40)
<< std::left << a << u << std::endl;
}
if(fabs(static_cast<T>(u)) > fabs(a))
{
BOOST_ERROR("Rounded result was away from zero with boost::trunc");
- std::cerr << "Values were: " << boost::detail::setprecision(35) << boost::detail::setw(40)
+ std::cerr << "Values were: " << std::setprecision(35) << std::setw(40)
<< std::left << a << u << std::endl;
}
}
@@ -97,25 +96,25 @@
if(fract + ipart != a)
{
BOOST_ERROR("Fractional and integer results do not add up to the original value");
- std::cerr << "Values were: " << boost::detail::setprecision(35) << " "
+ std::cerr << "Values were: " << std::setprecision(35) << " "
<< std::left << a << ipart << " " << fract << std::endl;
}
if((boost::math::sign(a) != boost::math::sign(fract)) && boost::math::sign(fract))
{
BOOST_ERROR("Original and fractional parts have differing signs");
- std::cerr << "Values were: " << boost::detail::setprecision(35) << " "
+ std::cerr << "Values were: " << std::setprecision(35) << " "
<< std::left << a << ipart << " " << fract << std::endl;
}
if((boost::math::sign(a) != boost::math::sign(ipart)) && boost::math::sign(ipart))
{
BOOST_ERROR("Original and integer parts have differing signs");
- std::cerr << "Values were: " << boost::detail::setprecision(35) << " "
+ std::cerr << "Values were: " << std::setprecision(35) << " "
<< std::left << a << ipart << " " << ipart << std::endl;
}
if(fabs(a-ipart) >= 1)
{
BOOST_ERROR("Rounded result differed by more than 1 from the original");
- std::cerr << "Values were: " << boost::detail::setprecision(35) << boost::detail::setw(40)
+ std::cerr << "Values were: " << std::setprecision(35) << std::setw(40)
<< std::left << a << ipart << std::endl;
}
}
Modified: trunk/libs/math/test/test_sign.cpp
==============================================================================
--- trunk/libs/math/test/test_sign.cpp (original)
+++ trunk/libs/math/test/test_sign.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -13,11 +13,10 @@
#include <boost/test/unit_test.hpp>
#include <boost/test/floating_point_comparison.hpp>
-#include <boost/detail/iomanip.hpp>
#include <iostream>
using std::cout;
using std::endl;
- using boost::detail::setprecision;
+ using std::setprecision;
template <class RealType>
void test_spots(RealType /*T*/, const char* /*type_name*/)
Modified: trunk/libs/math/test/test_students_t.cpp
==============================================================================
--- trunk/libs/math/test/test_students_t.cpp (original)
+++ trunk/libs/math/test/test_students_t.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -22,11 +22,10 @@
using boost::math::students_t_distribution;
#include <boost/math/tools/test.hpp> // for real_concept
-#include <boost/detail/iomanip.hpp>
#include <iostream>
using std::cout;
using std::endl;
- using boost::detail::setprecision;
+ using std::setprecision;
#include <limits>
using std::numeric_limits;
Modified: trunk/libs/math/test/test_toms748_solve.cpp
==============================================================================
--- trunk/libs/math/test/test_toms748_solve.cpp (original)
+++ trunk/libs/math/test/test_toms748_solve.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -11,7 +11,6 @@
#include <boost/math/tools/toms748_solve.hpp>
#include <boost/math/special_functions/gamma.hpp>
#include <boost/math/special_functions/beta.hpp>
-#include <boost/detail/iomanip.hpp>
//
// Test functor implements the same test cases as used by
@@ -164,7 +163,7 @@
int test_main(int, char* [])
{
- std::cout << boost::detail::setprecision(18);
+ std::cout << std::setprecision(18);
run_test(3.14/2, 3.14, 1);
for(int i = 1; i <= 10; i += 1)
@@ -244,7 +243,7 @@
BOOST_CHECK(invocations < 3150);
- std::cout << boost::detail::setprecision(18);
+ std::cout << std::setprecision(18);
for(int n = 5; n <= 100; n += 10)
run_test(sqrt(double(n)), double(n+1), 16, (double)n, 0.4);
@@ -262,7 +261,7 @@
true,
boost::math::tools::eps_tolerance<double>(std::numeric_limits<double>::digits),
c);
- std::cout << boost::detail::setprecision(18);
+ std::cout << std::setprecision(18);
std::cout << "Function " << 4 << "\n Result={" << r.first << ", " << r.second << "} total calls=" << toms748tester<double>::total_calls() << "\n\n";
toms748tester<double>::reset();
BOOST_CHECK(c < 20);
Modified: trunk/libs/math/test/test_triangular.cpp
==============================================================================
--- trunk/libs/math/test/test_triangular.cpp (original)
+++ trunk/libs/math/test/test_triangular.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -24,8 +24,6 @@
#include <boost/math/tools/test.hpp>
#include <boost/math/special_functions/fpclassify.hpp>
-#include <ios>
-#include <boost/detail/iomanip.hpp>
#include <iostream>
using std::cout;
using std::endl;
@@ -33,8 +31,8 @@
using std::fixed;
using std::left;
using std::right;
-using boost::detail::setw;
-using boost::detail::setprecision;
+using std::setw;
+using std::setprecision;
using std::showpos;
#include <limits>
using std::numeric_limits;
@@ -639,10 +637,10 @@
BOOST_CHECK_EQUAL(quantile(complement(*dists[i], 1.)), quantile(*dists[i], 0.));
BOOST_CHECK_CLOSE_FRACTION(quantile(*dists[i], 0.5), quantile(complement(*dist, 0.5)), tol5eps); // OK
BOOST_CHECK_CLOSE_FRACTION(quantile(*dists[i], 0.98), quantile(complement(*dist, 1. - 0.98)),tol5eps);
- // cout << boost::detail::setprecision(17) << median(*dist) << endl;
+ // cout << setprecision(17) << median(*dist) << endl;
}
- cout << showpos << boost::detail::setprecision(2) << endl;
+ cout << showpos << setprecision(2) << endl;
//triangular_distribution<double>& dist = trim12;
for (unsigned i = 0; i < sizeof(xs) /sizeof(double); i++)
@@ -650,13 +648,13 @@
double x = xs[i] * (trim12.upper() - trim12.lower()) + trim12.lower();
double dx = cdf(trim12, x);
double cx = cdf(complement(trim12, x));
- //cout << fixed << showpos << boost::detail::setprecision(3)
+ //cout << fixed << showpos << setprecision(3)
// << xs[i] << ", " << x << ", " << pdf(trim12, x) << ", " << dx << ", " << cx << ",, " ;
BOOST_CHECK_CLOSE_FRACTION(cx, 1 - dx, tol500eps); // cx == 1 - dx
- // << boost::detail::setprecision(2) << scientific << cr - x << ", " // difference x - quan(cdf)
- // << boost::detail::setprecision(3) << fixed
+ // << setprecision(2) << scientific << cr - x << ", " // difference x - quan(cdf)
+ // << setprecision(3) << fixed
// << quantile(trim12, dx) << ", "
// << quantile(complement(trim12, 1 - dx)) << ", "
// << quantile(complement(trim12, cx)) << ", "
Modified: trunk/libs/math/test/test_uniform.cpp
==============================================================================
--- trunk/libs/math/test/test_uniform.cpp (original)
+++ trunk/libs/math/test/test_uniform.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -23,11 +23,10 @@
using boost::math::uniform_distribution;
#include <boost/math/tools/test.hpp>
-#include <boost/detail/iomanip.hpp>
#include <iostream>
using std::cout;
using std::endl;
- using boost::detail::setprecision;
+ using std::setprecision;
#include <limits>
using std::numeric_limits;
Modified: trunk/libs/math/test/test_weibull.cpp
==============================================================================
--- trunk/libs/math/test/test_weibull.cpp (original)
+++ trunk/libs/math/test/test_weibull.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -16,11 +16,10 @@
using boost::math::weibull_distribution;
#include <boost/math/tools/test.hpp>
-#include <boost/detail/iomanip.hpp>
#include <iostream>
using std::cout;
using std::endl;
- using boost::detail::setprecision;
+ using std::setprecision;
#include <limits>
using std::numeric_limits;
Modified: trunk/libs/math/tools/Jamfile.v2
==============================================================================
--- trunk/libs/math/tools/Jamfile.v2 (original)
+++ trunk/libs/math/tools/Jamfile.v2 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -14,8 +14,6 @@
project
: requirements
- <toolset>pathscale:<cxxflags>-Wno-missing-braces
- <toolset>clang:<cxxflags>-Wno-missing-braces
<toolset>gcc:<cxxflags>-Wno-missing-braces
<toolset>darwin:<cxxflags>-Wno-missing-braces
<toolset>acc:<cxxflags>+W2068,2461,2236,4070,4069
Modified: trunk/libs/math/tools/bessel_data.cpp
==============================================================================
--- trunk/libs/math/tools/bessel_data.cpp (original)
+++ trunk/libs/math/tools/bessel_data.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -263,7 +263,7 @@
int main(int argc, char* argv[])
{
- std::cout << boost::detail::setprecision(17) << std::scientific;
+ std::cout << std::setprecision(17) << std::scientific;
std::cout << sph_bessel_j_bare(0., 0.1185395751953125e4) << std::endl;
std::cout << sph_bessel_j_bare(22., 0.6540834903717041015625) << std::endl;
Modified: trunk/libs/math/tools/generate_rational_code.cpp
==============================================================================
--- trunk/libs/math/tools/generate_rational_code.cpp (original)
+++ trunk/libs/math/tools/generate_rational_code.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -4,7 +4,7 @@
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <fstream>
#include <string>
#include <sstream>
Modified: trunk/libs/math/tools/generate_test_values.cpp
==============================================================================
--- trunk/libs/math/tools/generate_test_values.cpp (original)
+++ trunk/libs/math/tools/generate_test_values.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -9,7 +9,7 @@
#include <NTL/RR.h>
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
int main()
{
Modified: trunk/libs/math/tools/igamma_temme_large_coef.cpp
==============================================================================
--- trunk/libs/math/tools/igamma_temme_large_coef.cpp (original)
+++ trunk/libs/math/tools/igamma_temme_large_coef.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -9,7 +9,7 @@
#include <boost/math/constants/constants.hpp>
#include <map>
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
using namespace std;
using namespace NTL;
Modified: trunk/libs/math/tools/lanczos_generator.cpp
==============================================================================
--- trunk/libs/math/tools/lanczos_generator.cpp (original)
+++ trunk/libs/math/tools/lanczos_generator.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -27,7 +27,7 @@
#include <boost/math/special_functions/gamma.hpp>
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <vector>
using boost::numeric::ublas::matrix;
Modified: trunk/libs/multi_index/example/hashed.cpp
==============================================================================
--- trunk/libs/multi_index/example/hashed.cpp (original)
+++ trunk/libs/multi_index/example/hashed.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -18,7 +18,7 @@
#include <boost/multi_index/member.hpp>
#include <boost/multi_index/ordered_index.hpp>
#include <boost/tokenizer.hpp>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <iostream>
#include <string>
@@ -112,11 +112,11 @@
/* list words by frequency of appearance */
- std::cout<<std::fixed<<boost::detail::setprecision(2);
+ std::cout<<std::fixed<<std::setprecision(2);
for(word_counter::iterator wit=wc.begin(),wit_end=wc.end();
wit!=wit_end;++wit){
- std::cout<<boost::detail::setw(11)<<wit->word<<": "
- <<boost::detail::setw(5) <<100.0*wit->occurrences/total_occurrences<<"%"
+ std::cout<<std::setw(11)<<wit->word<<": "
+ <<std::setw(5) <<100.0*wit->occurrences/total_occurrences<<"%"
<<std::endl;
}
Modified: trunk/libs/multi_index/example/sequenced.cpp
==============================================================================
--- trunk/libs/multi_index/example/sequenced.cpp (original)
+++ trunk/libs/multi_index/example/sequenced.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -19,7 +19,7 @@
#include <boost/multi_index/sequenced_index.hpp>
#include <boost/tokenizer.hpp>
#include <algorithm>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <iostream>
#include <iterator>
#include <string>
@@ -66,9 +66,9 @@
ordered_text& ot=get<1>(tc);
for(ordered_text::iterator it=ot.begin();it!=ot.end();){
- std::cout<<std::left<<boost::detail::setw(14)<<*it<<":"; /* print the word */
+ std::cout<<std::left<<std::setw(14)<<*it<<":"; /* print the word */
ordered_text::iterator it2=ot.upper_bound(*it); /* jump to next */
- std::cout<<std::right<<boost::detail::setw(3) /* and compute the distance */
+ std::cout<<std::right<<std::setw(3) /* and compute the distance */
<<std::distance(it,it2)<<" times"<<std::endl;
it=it2;
}
Modified: trunk/libs/multi_index/perf/test_perf.cpp
==============================================================================
--- trunk/libs/multi_index/perf/test_perf.cpp (original)
+++ trunk/libs/multi_index/perf/test_perf.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -19,7 +19,7 @@
#include <boost/next_prior.hpp>
#include <climits>
#include <ctime>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <iostream>
#include <list>
#include <set>
@@ -344,17 +344,17 @@
BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(IndexedTest)
BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(ManualTest))
{
- cout<<fixed<<boost::detail::setprecision(2);
+ cout<<fixed<<setprecision(2);
cout<<title<<endl;
int n=1000;
for(int i=0;i<3;++i){
double indexed_t=measure(IndexedTest(n));
double manual_t=measure(ManualTest(n));
cout<<" 10^"<<i+3<<" elmts: "
- <<boost::detail::setw(6)<<100.0*indexed_t/manual_t<<"% "
+ <<setw(6)<<100.0*indexed_t/manual_t<<"% "
<<"("
- <<boost::detail::setw(6)<<1000.0*indexed_t/CLOCKS_PER_SEC<<" ms / "
- <<boost::detail::setw(6)<<1000.0*manual_t/CLOCKS_PER_SEC<<" ms)"
+ <<setw(6)<<1000.0*indexed_t/CLOCKS_PER_SEC<<" ms / "
+ <<setw(6)<<1000.0*manual_t/CLOCKS_PER_SEC<<" ms)"
<<endl;
n*=10;
}
@@ -364,7 +364,7 @@
if(manual_t_node_size){
cout<<" space gain: "
- <<boost::detail::setw(6)<<100.0*indexed_t_node_size/manual_t_node_size<<"%"<<endl;
+ <<setw(6)<<100.0*indexed_t_node_size/manual_t_node_size<<"%"<<endl;
}
}
Modified: trunk/libs/numeric/conversion/test/bounds_test.cpp
==============================================================================
--- trunk/libs/numeric/conversion/test/bounds_test.cpp (original)
+++ trunk/libs/numeric/conversion/test/bounds_test.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -9,7 +9,7 @@
//
#include<typeinfo>
#include<iostream>
-#include<boost/detail/iomanip.hpp>
+#include<iomanip>
#include "boost/numeric/conversion/bounds.hpp"
@@ -92,7 +92,7 @@
int test_main( int, char * [] )
{
- cout << boost::detail::setprecision( std::numeric_limits<long double>::digits10 ) ;
+ cout << setprecision( std::numeric_limits<long double>::digits10 ) ;
test_bounds();
Modified: trunk/libs/numeric/conversion/test/converter_test.cpp
==============================================================================
--- trunk/libs/numeric/conversion/test/converter_test.cpp (original)
+++ trunk/libs/numeric/conversion/test/converter_test.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -9,7 +9,7 @@
//
#include<cstdlib>
#include<iostream>
-#include<boost/detail/iomanip.hpp>
+#include<iomanip>
#include<string>
#include<typeinfo>
#include<vector>
@@ -547,7 +547,7 @@
int test_main( int, char* argv[] )
{
- std::cout << boost::detail::setprecision( std::numeric_limits<long double>::digits10 ) ;
+ std::cout << std::setprecision( std::numeric_limits<long double>::digits10 ) ;
test_conversions();
test_overflow_handlers( SET_FNTPL_ARG(boost::int16_t), SET_FNTPL_ARG(boost::int32_t));
Modified: trunk/libs/numeric/conversion/test/traits_test.cpp
==============================================================================
--- trunk/libs/numeric/conversion/test/traits_test.cpp (original)
+++ trunk/libs/numeric/conversion/test/traits_test.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -6,7 +6,7 @@
//
//
#include<iostream>
-#include<boost/detail/iomanip.hpp>
+#include<iomanip>
#include<string>
#include<typeinfo>
#include<vector>
@@ -331,7 +331,7 @@
int test_main( int, char * [])
{
- std::cout << boost::detail::setprecision( std::numeric_limits<long double>::digits10 ) ;
+ std::cout << std::setprecision( std::numeric_limits<long double>::digits10 ) ;
test_traits();
Modified: trunk/libs/numeric/conversion/test/udt_example_0.cpp
==============================================================================
--- trunk/libs/numeric/conversion/test/udt_example_0.cpp (original)
+++ trunk/libs/numeric/conversion/test/udt_example_0.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -11,7 +11,7 @@
#include "boost/utility.hpp"
#include<iostream>
-#include<boost/detail/iomanip.hpp>
+#include<iomanip>
#include<string>
#include<cmath>
@@ -224,7 +224,7 @@
int test_main( int, char* [] )
{
- cout << boost::detail::setprecision( numeric_limits<long double>::digits10 ) ;
+ cout << setprecision( numeric_limits<long double>::digits10 ) ;
simplest_case();
rounding();
Modified: trunk/libs/numeric/conversion/test/udt_support_test.cpp
==============================================================================
--- trunk/libs/numeric/conversion/test/udt_support_test.cpp (original)
+++ trunk/libs/numeric/conversion/test/udt_support_test.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -6,7 +6,7 @@
//
//
#include<iostream>
-#include<boost/detail/iomanip.hpp>
+#include<iomanip>
#include<string>
#include<typeinfo>
#include<vector>
@@ -294,7 +294,7 @@
int test_main( int, char* [] )
{
- cout << boost::detail::setprecision( numeric_limits<long double>::digits10 ) ;
+ cout << setprecision( numeric_limits<long double>::digits10 ) ;
test_udt_conversions_with_defaults();
test_udt_conversions_with_custom_range_checking();
Modified: trunk/libs/numeric/interval/examples/newton-raphson.cpp
==============================================================================
--- trunk/libs/numeric/interval/examples/newton-raphson.cpp (original)
+++ trunk/libs/numeric/interval/examples/newton-raphson.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -13,7 +13,7 @@
#include <algorithm>
#include <utility>
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
template <class I> I f(const I& x)
{ return x * (x - 1.) * (x - 2.) * (x - 3.) * (x - 4.); }
@@ -130,7 +130,7 @@
{
I1_aux::traits_type::rounding rnd;
std::vector<I1> res = newton_raphson(I1(-1, 5.1));
- std::cout << "Results: " << std::endl << boost::detail::setprecision(12);
+ std::cout << "Results: " << std::endl << std::setprecision(12);
for(std::vector<I1>::const_iterator i = res.begin(); i != res.end(); ++i)
std::cout << " " << *i << std::endl;
std::cout << std::endl;
@@ -138,7 +138,7 @@
{
I2_aux::traits_type::rounding rnd;
std::vector<I2> res = newton_raphson(I2(-1, 5.1));
- std::cout << "Results: " << std::endl << boost::detail::setprecision(12);
+ std::cout << "Results: " << std::endl << std::setprecision(12);
for(std::vector<I2>::const_iterator i = res.begin(); i != res.end(); ++i)
std::cout << " " << *i << std::endl;
std::cout << std::endl;
Modified: trunk/libs/property_tree/examples/empty_ptree_trick.cpp
==============================================================================
--- trunk/libs/property_tree/examples/empty_ptree_trick.cpp (original)
+++ trunk/libs/property_tree/examples/empty_ptree_trick.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -11,7 +11,7 @@
#include <boost/property_tree/ptree.hpp>
#include <boost/property_tree/info_parser.hpp>
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <string>
using namespace boost::property_tree;
Modified: trunk/libs/proto/test/toy_spirit2.cpp
==============================================================================
--- trunk/libs/proto/test/toy_spirit2.cpp (original)
+++ trunk/libs/proto/test/toy_spirit2.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -8,7 +8,7 @@
#include <cctype>
#include <string>
#include <cstring>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <iostream>
#include <boost/assert.hpp>
#include <boost/mpl/assert.hpp>
Modified: trunk/libs/random/test/histogram.cpp
==============================================================================
--- trunk/libs/random/test/histogram.cpp (original)
+++ trunk/libs/random/test/histogram.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -12,7 +12,7 @@
*/
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <vector>
#include <algorithm>
#include <cmath>
@@ -29,7 +29,7 @@
std::cout.precision(5);
for(int r = 0; r < nRows; r++) {
double y = ((nRows - r) * double(m))/(nRows * samples);
- std::cout << boost::detail::setw(10) << y << " ";
+ std::cout << std::setw(10) << y << " ";
for(unsigned int col = 0; col < slots.size(); col++) {
char out = ' ';
if(slots[col]/double(samples) >= y)
@@ -38,10 +38,10 @@
}
std::cout << std::endl;
}
- std::cout << boost::detail::setw(12) << " "
- << boost::detail::setw(10) << from;
+ std::cout << std::setw(12) << " "
+ << std::setw(10) << from;
std::cout.setf(std::ios::right, std::ios::adjustfield);
- std::cout << boost::detail::setw(slots.size()-10) << to << std::endl;
+ std::cout << std::setw(slots.size()-10) << to << std::endl;
}
// I am not sure whether these two should be in the library as well
Modified: trunk/libs/random/test/statistic_tests.cpp
==============================================================================
--- trunk/libs/random/test/statistic_tests.cpp (original)
+++ trunk/libs/random/test/statistic_tests.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -11,7 +11,7 @@
*/
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <string>
#include <functional>
#include <vector>
Modified: trunk/libs/random/test/test_binomial.cpp
==============================================================================
--- trunk/libs/random/test/test_binomial.cpp (original)
+++ trunk/libs/random/test/test_binomial.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -49,9 +49,9 @@
bool result = chsqr < 0.99;
const char* err = result? "" : "*";
- std::cout << boost::detail::setprecision(17) << chsqr << err << std::endl;
+ std::cout << std::setprecision(17) << chsqr << err << std::endl;
- std::cout << boost::detail::setprecision(6);
+ std::cout << std::setprecision(6);
return result;
}
Modified: trunk/libs/random/test/test_chi_squared.cpp
==============================================================================
--- trunk/libs/random/test/test_chi_squared.cpp (original)
+++ trunk/libs/random/test/test_chi_squared.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -36,9 +36,9 @@
bool result = prob < 0.99;
const char* err = result? "" : "*";
- std::cout << boost::detail::setprecision(17) << prob << err << std::endl;
+ std::cout << std::setprecision(17) << prob << err << std::endl;
- std::cout << boost::detail::setprecision(6);
+ std::cout << std::setprecision(6);
return result;
}
Modified: trunk/libs/random/test/test_discrete.cpp
==============================================================================
--- trunk/libs/random/test/test_discrete.cpp (original)
+++ trunk/libs/random/test/test_discrete.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -51,9 +51,9 @@
bool result = chsqr < 0.99;
const char* err = result? "" : "*";
- std::cout << boost::detail::setprecision(17) << chsqr << err << std::endl;
+ std::cout << std::setprecision(17) << chsqr << err << std::endl;
- std::cout << boost::detail::setprecision(6);
+ std::cout << std::setprecision(6);
return result;
}
Modified: trunk/libs/random/test/test_extreme_value.cpp
==============================================================================
--- trunk/libs/random/test/test_extreme_value.cpp (original)
+++ trunk/libs/random/test/test_extreme_value.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -36,9 +36,9 @@
bool result = prob < 0.99;
const char* err = result? "" : "*";
- std::cout << boost::detail::setprecision(17) << prob << err << std::endl;
+ std::cout << std::setprecision(17) << prob << err << std::endl;
- std::cout << boost::detail::setprecision(6);
+ std::cout << std::setprecision(6);
return result;
}
Modified: trunk/libs/random/test/test_fisher_f.cpp
==============================================================================
--- trunk/libs/random/test/test_fisher_f.cpp (original)
+++ trunk/libs/random/test/test_fisher_f.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -35,9 +35,9 @@
bool result = prob < 0.99;
const char* err = result? "" : "*";
- std::cout << boost::detail::setprecision(17) << prob << err << std::endl;
+ std::cout << std::setprecision(17) << prob << err << std::endl;
- std::cout << boost::detail::setprecision(6);
+ std::cout << std::setprecision(6);
return result;
}
Modified: trunk/libs/random/test/test_gamma.cpp
==============================================================================
--- trunk/libs/random/test/test_gamma.cpp (original)
+++ trunk/libs/random/test/test_gamma.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -36,9 +36,9 @@
bool result = prob < 0.99;
const char* err = result? "" : "*";
- std::cout << boost::detail::setprecision(17) << prob << err << std::endl;
+ std::cout << std::setprecision(17) << prob << err << std::endl;
- std::cout << boost::detail::setprecision(6);
+ std::cout << std::setprecision(6);
return result;
}
Modified: trunk/libs/random/test/test_negative_binomial.cpp
==============================================================================
--- trunk/libs/random/test/test_negative_binomial.cpp (original)
+++ trunk/libs/random/test/test_negative_binomial.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -51,9 +51,9 @@
bool result = chsqr < 0.995;
const char* err = result? "" : "*";
- std::cout << boost::detail::setprecision(17) << chsqr << err << std::endl;
+ std::cout << std::setprecision(17) << chsqr << err << std::endl;
- std::cout << boost::detail::setprecision(6);
+ std::cout << std::setprecision(6);
return result;
}
Modified: trunk/libs/random/test/test_normal.cpp
==============================================================================
--- trunk/libs/random/test/test_normal.cpp (original)
+++ trunk/libs/random/test/test_normal.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -36,9 +36,9 @@
bool result = prob < 0.99;
const char* err = result? "" : "*";
- std::cout << boost::detail::setprecision(17) << prob << err << std::endl;
+ std::cout << std::setprecision(17) << prob << err << std::endl;
- std::cout << boost::detail::setprecision(6);
+ std::cout << std::setprecision(6);
return result;
}
Modified: trunk/libs/random/test/test_piecewise_constant.cpp
==============================================================================
--- trunk/libs/random/test/test_piecewise_constant.cpp (original)
+++ trunk/libs/random/test/test_piecewise_constant.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -55,9 +55,9 @@
bool result = chsqr < 0.99;
const char* err = result? "" : "*";
- std::cout << boost::detail::setprecision(17) << chsqr << err << std::endl;
+ std::cout << std::setprecision(17) << chsqr << err << std::endl;
- std::cout << boost::detail::setprecision(6);
+ std::cout << std::setprecision(6);
return result;
}
Modified: trunk/libs/random/test/test_piecewise_linear.cpp
==============================================================================
--- trunk/libs/random/test/test_piecewise_linear.cpp (original)
+++ trunk/libs/random/test/test_piecewise_linear.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -59,9 +59,9 @@
bool result = chsqr < 0.99;
const char* err = result? "" : "*";
- std::cout << boost::detail::setprecision(17) << chsqr << err << std::endl;
+ std::cout << std::setprecision(17) << chsqr << err << std::endl;
- std::cout << boost::detail::setprecision(6);
+ std::cout << std::setprecision(6);
return result;
}
Modified: trunk/libs/random/test/test_poisson.cpp
==============================================================================
--- trunk/libs/random/test/test_poisson.cpp (original)
+++ trunk/libs/random/test/test_poisson.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -50,9 +50,9 @@
bool result = chsqr < 0.99;
const char* err = result? "" : "*";
- std::cout << boost::detail::setprecision(17) << chsqr << err << std::endl;
+ std::cout << std::setprecision(17) << chsqr << err << std::endl;
- std::cout << boost::detail::setprecision(6);
+ std::cout << std::setprecision(6);
return result;
}
Modified: trunk/libs/random/test/test_student_t.cpp
==============================================================================
--- trunk/libs/random/test/test_student_t.cpp (original)
+++ trunk/libs/random/test/test_student_t.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -36,9 +36,9 @@
bool result = prob < 0.99;
const char* err = result? "" : "*";
- std::cout << boost::detail::setprecision(17) << prob << err << std::endl;
+ std::cout << std::setprecision(17) << prob << err << std::endl;
- std::cout << boost::detail::setprecision(6);
+ std::cout << std::setprecision(6);
return result;
}
Modified: trunk/libs/random/test/test_weibull.cpp
==============================================================================
--- trunk/libs/random/test/test_weibull.cpp (original)
+++ trunk/libs/random/test/test_weibull.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -36,9 +36,9 @@
bool result = prob < 0.99;
const char* err = result? "" : "*";
- std::cout << boost::detail::setprecision(17) << prob << err << std::endl;
+ std::cout << std::setprecision(17) << prob << err << std::endl;
- std::cout << boost::detail::setprecision(6);
+ std::cout << std::setprecision(6);
return result;
}
Modified: trunk/libs/regex/performance/command_line.cpp
==============================================================================
--- trunk/libs/regex/performance/command_line.cpp (original)
+++ trunk/libs/regex/performance/command_line.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -10,7 +10,7 @@
*/
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <fstream>
#include <deque>
#include <sstream>
@@ -232,12 +232,12 @@
if(highlight)
os << "<font color=\"#008000\">";
if(rel <= 1000)
- os << boost::detail::setprecision(3) << rel;
+ os << std::setprecision(3) << rel;
else
os << (int)rel;
os << "<BR>(";
if(time <= 1000)
- os << boost::detail::setprecision(3) << time;
+ os << std::setprecision(3) << time;
else
os << (int)time;
os << suffixes[suffix] << ")";
Modified: trunk/libs/serialization/example/demo.cpp
==============================================================================
--- trunk/libs/serialization/example/demo.cpp (original)
+++ trunk/libs/serialization/example/demo.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -8,7 +8,7 @@
#include <cstddef> // NULL
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <iostream>
#include <fstream>
#include <string>
Modified: trunk/libs/serialization/example/demo_gps.hpp
==============================================================================
--- trunk/libs/serialization/example/demo_gps.hpp (original)
+++ trunk/libs/serialization/example/demo_gps.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -10,7 +10,7 @@
// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <iostream>
#include <fstream>
Modified: trunk/libs/serialization/example/demo_shared_ptr.cpp
==============================================================================
--- trunk/libs/serialization/example/demo_shared_ptr.cpp (original)
+++ trunk/libs/serialization/example/demo_shared_ptr.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -9,7 +9,7 @@
//
// See http://www.boost.org for updates, documentation, and revision history.
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <iostream>
#include <cstddef> // NULL
#include <fstream>
Modified: trunk/libs/serialization/example/demo_xml.cpp
==============================================================================
--- trunk/libs/serialization/example/demo_xml.cpp (original)
+++ trunk/libs/serialization/example/demo_xml.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -7,7 +7,7 @@
// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <iostream>
#include <fstream>
#include <string>
Modified: trunk/libs/serialization/example/demo_xml.hpp
==============================================================================
--- trunk/libs/serialization/example/demo_xml.hpp (original)
+++ trunk/libs/serialization/example/demo_xml.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -12,7 +12,7 @@
#include <string>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <iostream>
#include <fstream>
Modified: trunk/libs/spirit/optimization/karma/format_performance.cpp
==============================================================================
--- trunk/libs/spirit/optimization/karma/format_performance.cpp (original)
+++ trunk/libs/spirit/optimization/karma/format_performance.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -143,12 +143,12 @@
for (int i = 0; i < NUMITERATIONS; ++i) {
strm.str("");
strm << '['
- << boost::detail::setiosflags(std::ios::fixed)
+ << std::setiosflags(std::ios::fixed)
<< std::left
- << boost::detail::setprecision(3)
- << boost::detail::setw(14)
+ << std::setprecision(3)
+ << std::setw(14)
<< 12345.12345
- << boost::detail::setw(14)
+ << std::setw(14)
<< 12345.12345
<< ']';
}
Modified: trunk/libs/spirit/optimization/karma/sequence_performance.cpp
==============================================================================
--- trunk/libs/spirit/optimization/karma/sequence_performance.cpp (original)
+++ trunk/libs/spirit/optimization/karma/sequence_performance.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -38,7 +38,7 @@
} \
\
std::cout << "karma::sequence(" << BOOST_PP_INC(N) << "):\t" \
- << boost::detail::setw(9) << t.elapsed() << "\t" \
+ << std::setw(9) << t.elapsed() << "\t" \
<< std::flush << std::endl; \
\
BOOST_ASSERT(std::string(buffer) == literal_sequences[N]); \
@@ -54,7 +54,7 @@
// \
// t.restart(); \
// \
-// << boost::detail::setw(9) << elapsed << " [s]" \
+// << std::setw(9) << elapsed << " [s]" \
///////////////////////////////////////////////////////////////////////////////
int main()
Modified: trunk/libs/spirit/test/karma/test.hpp
==============================================================================
--- trunk/libs/spirit/test/karma/test.hpp (original)
+++ trunk/libs/spirit/test/karma/test.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -10,7 +10,7 @@
#include <string>
#include <iterator>
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <typeinfo>
#include <boost/foreach.hpp>
@@ -70,7 +70,7 @@
{
std::cerr << "in " << func << ": generated \"";
BOOST_FOREACH(int c, generated)
- std::cerr << "\\x" << std::hex << boost::detail::setfill('0') << boost::detail::setw(2) << c;
+ std::cerr << "\\x" << std::hex << std::setfill('0') << std::setw(2) << c;
std::cerr << "\"" << std::endl;
}
}
Modified: trunk/libs/statechart/example/BitMachine/BitMachine.cpp
==============================================================================
--- trunk/libs/statechart/example/BitMachine/BitMachine.cpp (original)
+++ trunk/libs/statechart/example/BitMachine/BitMachine.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -67,7 +67,7 @@
#include <boost/intrusive_ptr.hpp>
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <cstddef> // size_t
#ifdef BOOST_INTEL
@@ -126,7 +126,7 @@
buffer[ bit ] = number & ( 1 << ( NO_OF_BITS - bit - 1 ) ) ? '1' : '0';
}
- std::cout << "Current state: " << boost::detail::setw( 4 ) <<
+ std::cout << "Current state: " << std::setw( 4 ) <<
number << " (" << buffer << ")" << std::endl;
}
Modified: trunk/libs/statechart/example/Handcrafted/Handcrafted.cpp
==============================================================================
--- trunk/libs/statechart/example/Handcrafted/Handcrafted.cpp (original)
+++ trunk/libs/statechart/example/Handcrafted/Handcrafted.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -17,7 +17,7 @@
#include <boost/config.hpp>
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <ctime>
#ifdef BOOST_NO_STDC_NAMESPACE
Modified: trunk/libs/statechart/example/Keyboard/Keyboard.cpp
==============================================================================
--- trunk/libs/statechart/example/Keyboard/Keyboard.cpp (original)
+++ trunk/libs/statechart/example/Keyboard/Keyboard.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -24,7 +24,7 @@
#include <boost/config.hpp>
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#ifdef BOOST_INTEL
# pragma warning( disable: 304 ) // access control not specified
@@ -125,9 +125,9 @@
}
#ifdef BOOST_STATECHART_USE_NATIVE_RTTI
- std::cout << boost::detail::setw( 15 ) << typeid( *pState ).name();
+ std::cout << std::setw( 15 ) << typeid( *pState ).name();
#else
- std::cout << boost::detail::setw( 15 ) <<
+ std::cout << std::setw( 15 ) <<
pState->custom_dynamic_type_ptr< char >();
#endif
pState = pState->outer_state_ptr();
Modified: trunk/libs/statechart/example/Performance/Performance.cpp
==============================================================================
--- trunk/libs/statechart/example/Performance/Performance.cpp (original)
+++ trunk/libs/statechart/example/Performance/Performance.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -61,7 +61,7 @@
#include <ctime>
#include <iostream>
#include <fstream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <ios>
#include <string>
#include <algorithm>
@@ -495,9 +495,9 @@
for ( PerfResultList::const_iterator pResult = results.begin();
pResult != results.end(); ++pResult )
{
- output << std::fixed << boost::detail::setprecision( 0 ) <<
- boost::detail::setw( 8 ) << pResult->inStateRatio_ * 100 << ',' <<
- boost::detail::setw( 8 ) << pResult->nanoSecondsPerReaction_ << "\n";
+ output << std::fixed << std::setprecision( 0 ) <<
+ std::setw( 8 ) << pResult->inStateRatio_ * 100 << ',' <<
+ std::setw( 8 ) << pResult->nanoSecondsPerReaction_ << "\n";
}
}
Modified: trunk/libs/test/build/Jamfile.v2
==============================================================================
--- trunk/libs/test/build/Jamfile.v2 (original)
+++ trunk/libs/test/build/Jamfile.v2 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -7,7 +7,6 @@
project boost/test
: source-location ../src
: requirements <link>shared:<define>BOOST_TEST_DYN_LINK=1
- <include>../../../
<toolset>msvc:<asynch-exceptions>on
<toolset>borland:<cxxflags>-w-8080
# Disable Warning about boost::noncopyable not being exported
@@ -108,4 +107,4 @@
boost-install boost_prg_exec_monitor
boost_test_exec_monitor
boost_unit_test_framework ;
-
+
\ No newline at end of file
Modified: trunk/libs/test/example/unit_test_example_10.cpp
==============================================================================
--- trunk/libs/test/example/unit_test_example_10.cpp (original)
+++ trunk/libs/test/example/unit_test_example_10.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -19,7 +19,7 @@
// STL
#include <functional>
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <memory>
#include <stdexcept>
Modified: trunk/libs/test/test/Jamfile.v2
==============================================================================
--- trunk/libs/test/test/Jamfile.v2 (original)
+++ trunk/libs/test/test/Jamfile.v2 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -17,7 +17,6 @@
# Activating -pedantic finds more gotchas
# Unfortunately, this warns about the use of "long long" in gcc's own stdlib
# So deactivate those warnings again
- <include>../../../
<toolset>gcc:<cxxflags>-pedantic
<toolset>gcc:<cxxflags>-Wno-long-long
<toolset>borland:<cxxflags>-w-8080
Modified: trunk/libs/test/test/basic_cstring_test.cpp
==============================================================================
--- trunk/libs/test/test/basic_cstring_test.cpp (original)
+++ trunk/libs/test/test/basic_cstring_test.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -38,7 +38,7 @@
// STL
#include <cctype>
#include <ctime>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <iostream>
#include <stdexcept>
@@ -391,13 +391,13 @@
tt::output_test_stream ostr;
- ostr << boost::detail::setw( 6 ) << bcs1;
+ ostr << std::setw( 6 ) << bcs1;
BOOST_CHECK( ostr.is_equal( " test" ) );
- ostr << boost::detail::setw( 3 ) << bcs1;
+ ostr << std::setw( 3 ) << bcs1;
BOOST_CHECK( ostr.is_equal( "test" ) );
- ostr << boost::detail::setw( 5 ) << boost::detail::setiosflags( std::ios::left ) << bcs1;
+ ostr << std::setw( 5 ) << std::setiosflags( std::ios::left ) << bcs1;
BOOST_CHECK( ostr.is_equal( "test " ) );
}
Modified: trunk/libs/test/test/output_test_stream_test.cpp
==============================================================================
--- trunk/libs/test/test/output_test_stream_test.cpp (original)
+++ trunk/libs/test/test/output_test_stream_test.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -19,7 +19,7 @@
using boost::test_tools::output_test_stream;
// STL
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
//____________________________________________________________________________//
@@ -122,7 +122,7 @@
output << '\0';
BOOST_CHECK( output.is_equal( boost::unit_test::const_string( "", 1 ) ) );
- output << boost::detail::setw( 10 ) << "qwerty" << '\n';
+ output << std::setw( 10 ) << "qwerty" << '\n';
BOOST_CHECK( output.is_equal( " qwerty\n" ) );
std::string s( "test string" );
Modified: trunk/libs/test/test/test_tools_test.cpp
==============================================================================
--- trunk/libs/test/test/test_tools_test.cpp (original)
+++ trunk/libs/test/test/test_tools_test.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -29,7 +29,7 @@
// STL
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#ifdef BOOST_MSVC
# pragma warning(push)
@@ -525,7 +525,7 @@
BOOST_TEST_MESSAGE( "0x14" );
#endif
- BOOST_TEST_MESSAGE( boost::detail::setw( 4 ) << 20 );
+ BOOST_TEST_MESSAGE( std::setw( 4 ) << 20 );
}
//____________________________________________________________________________//
Modified: trunk/libs/tuple/test/io_test.cpp
==============================================================================
--- trunk/libs/tuple/test/io_test.cpp (original)
+++ trunk/libs/tuple/test/io_test.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -20,7 +20,7 @@
#include <iterator>
#include <algorithm>
#include <string>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#if defined BOOST_NO_STRINGSTREAM
#include <strstream>
@@ -81,7 +81,7 @@
// check width
useThisOStringStream os4;
- os4 << boost::detail::setw(10) << make_tuple(1, 2, 3);
+ os4 << std::setw(10) << make_tuple(1, 2, 3);
BOOST_CHECK (os4.str() == std::string(" (1 2 3)") );
std::ofstream tmp("temp.tmp");
Modified: trunk/libs/units/example/measurement.hpp
==============================================================================
--- trunk/libs/units/example/measurement.hpp (original)
+++ trunk/libs/units/example/measurement.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -13,7 +13,7 @@
#include <cmath>
#include <cstdlib>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <iostream>
#include <boost/io/ios_state.hpp>
Modified: trunk/libs/units/example/performance.cpp
==============================================================================
--- trunk/libs/units/example/performance.cpp (original)
+++ trunk/libs/units/example/performance.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -35,7 +35,7 @@
#include <ctime>
#include <algorithm>
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <boost/config.hpp>
#include <boost/timer.hpp>
@@ -332,7 +332,7 @@
double diff =
std::abs(ublas_result(i,j) - cresult[i * max_value + j]);
if(diff > ublas_result(i,j) /1e14) {
- std::cout << boost::detail::setprecision(15) << "Uh Oh. ublas_result("
+ std::cout << std::setprecision(15) << "Uh Oh. ublas_result("
<< i << "," << j << ") = " << ublas_result(i,j)
<< std::endl
<< "cresult[" << i << " * " << max_value << " + "
@@ -355,7 +355,7 @@
double x = .1 * i;
double value = 1.0/4.0 * x - 3.0/16.0 + 19.0/16.0 * std::exp(4 * x);
if(std::abs(values[i] - value) > value / 1e9) {
- std::cout << boost::detail::setprecision(15) << "i = : " << i
+ std::cout << std::setprecision(15) << "i = : " << i
<< ", value = " << value << " approx = " << values[i]
<< std::endl;
return(EXIT_FAILURE);
@@ -383,7 +383,7 @@
quantity<si::length> value =
(1.0/4.0 * x - 3.0/16.0 + 19.0/16.0 * std::exp(4 * x)) * meters;
if(abs(values[i] - value) > value / 1e9) {
- std::cout << boost::detail::setprecision(15) << "i = : " << i
+ std::cout << std::setprecision(15) << "i = : " << i
<< ", value = " << value << " approx = "
<< values[i] << std::endl;
return(EXIT_FAILURE);
Modified: trunk/libs/units/example/temperature.cpp
==============================================================================
--- trunk/libs/units/example/temperature.cpp (original)
+++ trunk/libs/units/example/temperature.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -32,7 +32,7 @@
@endverbatim
**/
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <iostream>
#include <boost/units/absolute.hpp>
Modified: trunk/libs/utility/call_traits_test.cpp
==============================================================================
--- trunk/libs/utility/call_traits_test.cpp (original)
+++ trunk/libs/utility/call_traits_test.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -13,7 +13,7 @@
// Enabled extra tests for VC6.
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <algorithm>
#include <typeinfo>
#include <boost/call_traits.hpp>
Modified: trunk/libs/uuid/test/test_io.cpp
==============================================================================
--- trunk/libs/uuid/test/test_io.cpp (original)
+++ trunk/libs/uuid/test/test_io.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -16,7 +16,7 @@
#include <boost/lexical_cast.hpp>
#include <string>
#include <sstream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#ifndef BOOST_NO_STD_WSTRING
namespace std {
@@ -56,11 +56,11 @@
BOOST_TEST_EQ(ss4.str(), "12345678-90AB-CDEF-1234-567890ABCDEF");
std::stringstream ss5;
- ss5 << 'a' << std::right << boost::detail::setfill('*') << boost::detail::setw(40) << u1 << 'a';
+ ss5 << 'a' << std::right << std::setfill('*') << std::setw(40) << u1 << 'a';
BOOST_TEST_EQ(ss5.str(), "a****00000000-0000-0000-0000-000000000000a");
std::stringstream ss6;
- ss6 << std::left << boost::detail::setfill('*') << boost::detail::setw(45) << u1;
+ ss6 << std::left << std::setfill('*') << std::setw(45) << u1;
BOOST_TEST_EQ(ss6.str(), "00000000-0000-0000-0000-000000000000*********");
}
@@ -83,11 +83,11 @@
BOOST_TEST_EQ(ss4.str(), L"12345678-90AB-CDEF-1234-567890ABCDEF");
std::wstringstream ss5;
- ss5 << L'a' << std::right << boost::detail::setfill(L'*') << boost::detail::setw(40) << u1 << L'a';
+ ss5 << L'a' << std::right << std::setfill(L'*') << std::setw(40) << u1 << L'a';
BOOST_TEST_EQ(ss5.str(), L"a****00000000-0000-0000-0000-000000000000a");
std::wstringstream ss6;
- ss6 << std::left << boost::detail::setfill(L'*') << boost::detail::setw(45) << u1;
+ ss6 << std::left << std::setfill(L'*') << std::setw(45) << u1;
BOOST_TEST_EQ(ss6.str(), L"00000000-0000-0000-0000-000000000000*********");
}
#endif
Modified: trunk/libs/wave/samples/cpp_tokens/slex_token.hpp
==============================================================================
--- trunk/libs/wave/samples/cpp_tokens/slex_token.hpp (original)
+++ trunk/libs/wave/samples/cpp_tokens/slex_token.hpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -13,7 +13,7 @@
#if !defined(SLEX_TOKEN_HPP_53A13BD2_FBAA_444B_9B8B_FCB225C2BBA8_INCLUDED)
#define SLEX_TOKEN_HPP_53A13BD2_FBAA_444B_9B8B_FCB225C2BBA8_INCLUDED
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <ios>
#include <boost/wave/wave_config.hpp>
@@ -90,12 +90,12 @@
using namespace std;
using namespace boost::wave;
- stream << boost::detail::setw(16)
+ stream << std::setw(16)
<< std::left << boost::wave::get_token_name(id) << " ("
<< "#" << token_id(ID_FROM_TOKEN(*this))
<< ") at " << get_position().get_file() << " ("
- << boost::detail::setw(3) << std::right << get_position().get_line() << "/"
- << boost::detail::setw(2) << std::right << get_position().get_column()
+ << std::setw(3) << std::right << get_position().get_line() << "/"
+ << std::setw(2) << std::right << get_position().get_column()
<< "): >";
for (std::size_t i = 0; i < value.size(); ++i) {
Modified: trunk/libs/wave/samples/lexed_tokens/lexed_tokens.cpp
==============================================================================
--- trunk/libs/wave/samples/lexed_tokens/lexed_tokens.cpp (original)
+++ trunk/libs/wave/samples/lexed_tokens/lexed_tokens.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -8,9 +8,8 @@
LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/
-#include <ios>
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <fstream>
#include <string>
#include <vector>
@@ -40,9 +39,9 @@
using namespace boost::wave;
token_id id = token_id(t);
- stream << boost::detail::setw(16)
+ stream << setw(16)
<< left << boost::wave::get_token_name(id) << " ("
- << "#" << boost::detail::setw(3) << BASEID_FROM_TOKEN(id);
+ << "#" << setw(3) << BASEID_FROM_TOKEN(id);
if (ExtTokenTypeMask & id) {
// this is an extended token id
@@ -59,8 +58,8 @@
stream
<< ") at " << t.get_position().get_file() << " ("
- << boost::detail::setw(3) << right << t.get_position().get_line() << "/"
- << boost::detail::setw(2) << right << t.get_position().get_column()
+ << setw(3) << right << t.get_position().get_line() << "/"
+ << setw(2) << right << t.get_position().get_column()
<< "): >";
typedef typename boost::wave::cpplexer::lex_token<PositionT>::string_type
Modified: trunk/libs/wave/samples/real_positions/real_positions.cpp
==============================================================================
--- trunk/libs/wave/samples/real_positions/real_positions.cpp (original)
+++ trunk/libs/wave/samples/real_positions/real_positions.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -12,10 +12,9 @@
LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/
-#include <ios>
#include <iostream>
#include <fstream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <string>
#include <vector>
@@ -45,9 +44,9 @@
using namespace boost::wave;
token_id id = token_id(t);
- stream << boost::detail::setw(16)
+ stream << setw(16)
<< left << boost::wave::get_token_name(id) << " ("
- << "#" << boost::detail::setw(3) << BASEID_FROM_TOKEN(id);
+ << "#" << setw(3) << BASEID_FROM_TOKEN(id);
if (ExtTokenTypeMask & id) {
// this is an extended token id
@@ -79,12 +78,12 @@
}
stream << "<" << std::endl;
stream << " at: " << t.get_position().get_file() << " ("
- << boost::detail::setw(3) << right << t.get_position().get_line() << "/"
- << boost::detail::setw(2) << right << t.get_position().get_column()
+ << setw(3) << right << t.get_position().get_line() << "/"
+ << setw(2) << right << t.get_position().get_column()
<< ")" << std::endl;
stream << " and: " << t.get_corrected_position().get_file() << " ("
- << boost::detail::setw(3) << right << t.get_corrected_position().get_line() << "/"
- << boost::detail::setw(2) << right << t.get_corrected_position().get_column()
+ << setw(3) << right << t.get_corrected_position().get_line() << "/"
+ << setw(2) << right << t.get_corrected_position().get_column()
<< ")";
return stream;
Modified: trunk/libs/xpressive/example/main.cpp
==============================================================================
--- trunk/libs/xpressive/example/main.cpp (original)
+++ trunk/libs/xpressive/example/main.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -6,7 +6,7 @@
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <boost/xpressive/xpressive.hpp>
using namespace boost::xpressive;
Modified: trunk/libs/xpressive/perf/command_line.cpp
==============================================================================
--- trunk/libs/xpressive/perf/command_line.cpp (original)
+++ trunk/libs/xpressive/perf/command_line.cpp 2011-01-15 03:11:51 EST (Sat, 15 Jan 2011)
@@ -4,7 +4,7 @@
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#include <iostream>
-#include <boost/detail/iomanip.hpp>
+#include <iomanip>
#include <fstream>
#include <deque>
#include <sstream>
@@ -138,7 +138,7 @@
friend std::ostream & operator<<( std::ostream & out, xml_double const & xd )
{
std::ostringstream tmp;
- tmp << boost::detail::setprecision(out.precision()) << xd.d_;
+ tmp << std::setprecision(out.precision()) << xd.d_;
std::string str = tmp.str();
std::string::size_type i = str.find( '-' );
if( i != std::string::npos )
@@ -168,12 +168,12 @@
if(highlight)
os << "<phrase role=\"highlight\">";
if(rel <= 1000)
- os << boost::detail::setprecision(3) << xml_double(rel);
+ os << std::setprecision(3) << xml_double(rel);
else
os << (int)rel;
os << "<para/>(";
if(time <= 1000)
- os << boost::detail::setprecision(3) << xml_double(time);
+ os << std::setprecision(3) << xml_double(time);
else
os << (int)time;
os << suffixes[suffix] << ")";
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk