From caf462a816221c153e1569602bdc2005d396d8ab Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Mon, 9 Jul 2012 19:50:17 +0000 Subject: [PATCH] Switch from deprecated macros to new shiny ones; no functionality change [SVN r79389] --- include/boost/random/discrete_distribution.hpp | 6 +++--- include/boost/random/piecewise_constant_distribution.hpp | 6 +++--- include/boost/random/piecewise_linear_distribution.hpp | 6 +++--- include/boost/random/seed_seq.hpp | 4 ++-- test/test_discrete_distribution.cpp | 4 ++-- test/test_piecewise_constant_distribution.cpp | 4 ++-- test/test_piecewise_linear_distribution.cpp | 4 ++-- test/test_seed_seq.cpp | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/boost/random/discrete_distribution.hpp b/include/boost/random/discrete_distribution.hpp index 30ba85c..e10ceb4 100644 --- a/include/boost/random/discrete_distribution.hpp +++ b/include/boost/random/discrete_distribution.hpp @@ -25,7 +25,7 @@ #include #include -#ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST +#ifndef BOOST_NO_CXX11_HDR_INITIALIZER_LIST #include #endif @@ -69,7 +69,7 @@ public: { normalize(); } -#ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST +#ifndef BOOST_NO_CXX11_HDR_INITIALIZER_LIST /** * If wl.size() == 0, equivalent to the default constructor. * Otherwise, the values of the @c initializer_list represent @@ -190,7 +190,7 @@ public: { init(first, last); } -#ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST +#ifndef BOOST_NO_CXX11_HDR_INITIALIZER_LIST /** * Constructs a @c discrete_distribution from a @c std::initializer_list. * If the @c initializer_list is empty, equivalent to the default diff --git a/include/boost/random/piecewise_constant_distribution.hpp b/include/boost/random/piecewise_constant_distribution.hpp index 9fdad07..697a374 100644 --- a/include/boost/random/piecewise_constant_distribution.hpp +++ b/include/boost/random/piecewise_constant_distribution.hpp @@ -22,7 +22,7 @@ #include #include -#ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST +#ifndef BOOST_NO_CXX11_HDR_INITIALIZER_LIST #include #endif @@ -84,7 +84,7 @@ public: } } } -#ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST +#ifndef BOOST_NO_CXX11_HDR_INITIALIZER_LIST /** * Constructs a @c param_type object from an * initializer_list containing the interval boundaries @@ -271,7 +271,7 @@ public: _bins.param(bins_param); } } -#ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST +#ifndef BOOST_NO_CXX11_HDR_INITIALIZER_LIST /** * Constructs a piecewise_constant_distribution from an * initializer_list containing the interval boundaries diff --git a/include/boost/random/piecewise_linear_distribution.hpp b/include/boost/random/piecewise_linear_distribution.hpp index b65aeaf..861cf42 100644 --- a/include/boost/random/piecewise_linear_distribution.hpp +++ b/include/boost/random/piecewise_linear_distribution.hpp @@ -24,7 +24,7 @@ #include #include -#ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST +#ifndef BOOST_NO_CXX11_HDR_INITIALIZER_LIST #include #endif @@ -89,7 +89,7 @@ public: } } } -#ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST +#ifndef BOOST_NO_CXX11_HDR_INITIALIZER_LIST /** * Constructs a @c param_type object from an initializer_list * containing the interval boundaries and a unary function @@ -278,7 +278,7 @@ public: init(); } } -#ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST +#ifndef BOOST_NO_CXX11_HDR_INITIALIZER_LIST /** * Constructs a piecewise_linear_distribution from an * initializer_list containing the interval boundaries diff --git a/include/boost/random/seed_seq.hpp b/include/boost/random/seed_seq.hpp index cffae2f..9579d5b 100644 --- a/include/boost/random/seed_seq.hpp +++ b/include/boost/random/seed_seq.hpp @@ -23,7 +23,7 @@ #include #include -#ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST +#ifndef BOOST_NO_CXX11_HDR_INITIALIZER_LIST #include #endif @@ -42,7 +42,7 @@ public: /** Initializes a seed_seq to hold an empty sequence. */ seed_seq() {} -#ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST +#ifndef BOOST_NO_CXX11_HDR_INITIALIZER_LIST /** Initializes the sequence from an initializer_list. */ template seed_seq(const std::initializer_list& il) : v(il.begin(), il.end()) {} diff --git a/test/test_discrete_distribution.cpp b/test/test_discrete_distribution.cpp index a0bebf7..e14bc64 100644 --- a/test/test_discrete_distribution.cpp +++ b/test/test_discrete_distribution.cpp @@ -49,7 +49,7 @@ BOOST_AUTO_TEST_CASE(test_constructors) { boost::random::discrete_distribution<> dist; CHECK_PROBABILITIES(dist.probabilities(), list_of(1.0)); -#ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST +#ifndef BOOST_NO_CXX11_HDR_INITIALIZER_LIST boost::random::discrete_distribution<> dist_il = { 1, 2, 1, 4 }; CHECK_PROBABILITIES(dist_il.probabilities(), list_of(.125)(.25)(.125)(.5)); #endif @@ -98,7 +98,7 @@ BOOST_AUTO_TEST_CASE(test_param) { BOOST_CHECK(param != param_default); BOOST_CHECK(!(param == param_default)); -#ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST +#ifndef BOOST_NO_CXX11_HDR_INITIALIZER_LIST boost::random::discrete_distribution<>::param_type parm_il = { 1, 2, 1, 4 }; CHECK_PROBABILITIES(parm_il.probabilities(), list_of(.125)(.25)(.125)(.5)); diff --git a/test/test_piecewise_constant_distribution.cpp b/test/test_piecewise_constant_distribution.cpp index 1a74b59..793c3e6 100644 --- a/test/test_piecewise_constant_distribution.cpp +++ b/test/test_piecewise_constant_distribution.cpp @@ -50,7 +50,7 @@ BOOST_AUTO_TEST_CASE(test_constructors) { CHECK_SEQUENCE(dist.densities(), list_of(1.0)); CHECK_SEQUENCE(dist.intervals(), list_of(0.0)(1.0)); -#ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST +#ifndef BOOST_NO_CXX11_HDR_INITIALIZER_LIST boost::random::piecewise_constant_distribution<> dist_il = { { 99, 103, 107, 111, 115 }, gen() @@ -139,7 +139,7 @@ BOOST_AUTO_TEST_CASE(test_param) { BOOST_CHECK(param != param_default); BOOST_CHECK(!(param == param_default)); -#ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST +#ifndef BOOST_NO_CXX11_HDR_INITIALIZER_LIST boost::random::piecewise_constant_distribution<>::param_type parm_il = { { 99, 103, 107, 111, 115 }, gen() diff --git a/test/test_piecewise_linear_distribution.cpp b/test/test_piecewise_linear_distribution.cpp index 6ebd484..9426de2 100644 --- a/test/test_piecewise_linear_distribution.cpp +++ b/test/test_piecewise_linear_distribution.cpp @@ -51,7 +51,7 @@ BOOST_AUTO_TEST_CASE(test_constructors) { CHECK_SEQUENCE(dist.intervals(), list_of(0.0)(1.0)); CHECK_SEQUENCE(dist.densities(), list_of(1.0)(1.0)); -#ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST +#ifndef BOOST_NO_CXX11_HDR_INITIALIZER_LIST boost::random::piecewise_linear_distribution<> dist_il = { { 99, 103, 107, 111, 115 }, gen() @@ -143,7 +143,7 @@ BOOST_AUTO_TEST_CASE(test_param) { BOOST_CHECK(param != param_default); BOOST_CHECK(!(param == param_default)); -#ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST +#ifndef BOOST_NO_CXX11_HDR_INITIALIZER_LIST boost::random::piecewise_linear_distribution<>::param_type parm_il = { { 99, 103, 107, 111, 115 }, gen() diff --git a/test/test_seed_seq.cpp b/test/test_seed_seq.cpp index 83c7b8e..95152ec 100644 --- a/test/test_seed_seq.cpp +++ b/test/test_seed_seq.cpp @@ -94,7 +94,7 @@ BOOST_AUTO_TEST_CASE(test_seed_seq) { BOOST_CHECK_EQUAL_COLLECTIONS( ¶m[0], ¶m[0] + 4, &expected_param[0], &expected_param[0] + 4); -#ifndef BOOST_NO_0X_HDR_INITIALIZER_LIST +#ifndef BOOST_NO_CXX11_HDR_INITIALIZER_LIST std::fill_n(&store32[0], 10, 0); std::fill_n(&store64[0], 10, 0); std::fill_n(¶m[0], 3, 0);