diff options
6 files changed, 33 insertions, 10 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 651b53e..f37e28a5 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,16 @@ +2009-05-15 David Billinghurst <billingd@gcc.gnu.org> + + * testsuite/26_numerics/random/discrete_distribution/cons/num_xbound_fun.cc: + Replace non-standard macro M_PI with constant pi. + * testsuite/26_numerics/random/piecewise_constant_distribution/cons/initlist_fun.cc: + Likewise + * testsuite/26_numerics/random/piecewise_constant_distribution/cons/num_xbound_fun.cc: + Likewise + * testsuite/26_numerics/random/piecewise_linear_distribution/cons/initlist_fun.cc: + Likewise + * testsuite/26_numerics/random/piecewise_linear_distribution/cons/num_xbound_fun.cc: + Likewise + 2009-05-14 Paolo Carlini <paolo.carlini@oracle.com> PR libstdc++/40123 diff --git a/libstdc++-v3/testsuite/26_numerics/random/discrete_distribution/cons/num_xbound_fun.cc b/libstdc++-v3/testsuite/26_numerics/random/discrete_distribution/cons/num_xbound_fun.cc index bab3609..49bb2b3 100644 --- a/libstdc++-v3/testsuite/26_numerics/random/discrete_distribution/cons/num_xbound_fun.cc +++ b/libstdc++-v3/testsuite/26_numerics/random/discrete_distribution/cons/num_xbound_fun.cc @@ -39,8 +39,10 @@ struct cosine_distribution return 0.0; else if (x - _M_x0 > _M_lambda / 4) return 0.0; - else - return std::cos(2 * M_PI * (x - _M_x0) / _M_lambda); + else { + const double pi = 3.1415926535897932384626433832795029L; + return std::cos(2 * pi * (x - _M_x0) / _M_lambda); + } } private: diff --git a/libstdc++-v3/testsuite/26_numerics/random/piecewise_constant_distribution/cons/initlist_fun.cc b/libstdc++-v3/testsuite/26_numerics/random/piecewise_constant_distribution/cons/initlist_fun.cc index 4c9a6e5..54fadb9 100644 --- a/libstdc++-v3/testsuite/26_numerics/random/piecewise_constant_distribution/cons/initlist_fun.cc +++ b/libstdc++-v3/testsuite/26_numerics/random/piecewise_constant_distribution/cons/initlist_fun.cc @@ -39,8 +39,10 @@ struct cosine_distribution return 0.0; else if (x - _M_x0 > _M_lambda / 4) return 0.0; - else - return std::cos(2 * M_PI * (x - _M_x0) / _M_lambda); + else { + const double pi = 3.1415926535897932384626433832795029L; + return std::cos(2 * pi * (x - _M_x0) / _M_lambda); + } } private: diff --git a/libstdc++-v3/testsuite/26_numerics/random/piecewise_constant_distribution/cons/num_xbound_fun.cc b/libstdc++-v3/testsuite/26_numerics/random/piecewise_constant_distribution/cons/num_xbound_fun.cc index 3234b08..30a733c 100644 --- a/libstdc++-v3/testsuite/26_numerics/random/piecewise_constant_distribution/cons/num_xbound_fun.cc +++ b/libstdc++-v3/testsuite/26_numerics/random/piecewise_constant_distribution/cons/num_xbound_fun.cc @@ -39,8 +39,10 @@ struct cosine_distribution return 0.0; else if (x - _M_x0 > _M_lambda / 4) return 0.0; - else - return std::cos(2 * M_PI * (x - _M_x0) / _M_lambda); + else { + const double pi = 3.1415926535897932384626433832795029L; + return std::cos(2 * pi * (x - _M_x0) / _M_lambda); + } } private: diff --git a/libstdc++-v3/testsuite/26_numerics/random/piecewise_linear_distribution/cons/initlist_fun.cc b/libstdc++-v3/testsuite/26_numerics/random/piecewise_linear_distribution/cons/initlist_fun.cc index 3f04989..f1b24ea 100644 --- a/libstdc++-v3/testsuite/26_numerics/random/piecewise_linear_distribution/cons/initlist_fun.cc +++ b/libstdc++-v3/testsuite/26_numerics/random/piecewise_linear_distribution/cons/initlist_fun.cc @@ -39,8 +39,10 @@ struct cosine_distribution return 0.0; else if (x - _M_x0 > _M_lambda / 4) return 0.0; - else - return std::cos(2 * M_PI * (x - _M_x0) / _M_lambda); + else { + const double pi = 3.1415926535897932384626433832795029L; + return std::cos(2 * pi * (x - _M_x0) / _M_lambda); + } } private: diff --git a/libstdc++-v3/testsuite/26_numerics/random/piecewise_linear_distribution/cons/num_xbound_fun.cc b/libstdc++-v3/testsuite/26_numerics/random/piecewise_linear_distribution/cons/num_xbound_fun.cc index b8b1a02..f22b26e 100644 --- a/libstdc++-v3/testsuite/26_numerics/random/piecewise_linear_distribution/cons/num_xbound_fun.cc +++ b/libstdc++-v3/testsuite/26_numerics/random/piecewise_linear_distribution/cons/num_xbound_fun.cc @@ -39,8 +39,10 @@ struct cosine_distribution return 0.0; else if (x - _M_x0 > _M_lambda / 4) return 0.0; - else - return std::cos(2 * M_PI * (x - _M_x0) / _M_lambda); + else { + const double pi = 3.1415926535897932384626433832795029L; + return std::cos(2 * pi * (x - _M_x0) / _M_lambda); + } } private: |