From e1d4e035faf994e8d8a562ce8e6e3819aa32449d Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Mon, 18 Oct 2010 17:28:15 +0000 Subject: [PATCH] re PR libstdc++/45866 ([C++0x] std::ratio_add, ratio_sub, ratio_multiply, ratio_divide do not have num and den members.) 2010-10-18 Paolo Carlini PR libstdc++/45866 * include/std/ratio (ratio<>::type): Add. (ratio_add<>::num, ratio_add<>::den, ratio_subtract<>::num, ratio_subtract<>::den, ratio_multiply<>::num, ratio_multiply<>::den, ratio_divide<>::num, ratio_divide<>::den): Likewise. * testsuite/20_util/ratio/operations/45866.cc: New. From-SVN: r165649 --- libstdc++-v3/ChangeLog | 10 +++ libstdc++-v3/include/std/ratio | 38 +++++++++++ .../20_util/ratio/operations/45866.cc | 67 +++++++++++++++++++ 3 files changed, 115 insertions(+) create mode 100644 libstdc++-v3/testsuite/20_util/ratio/operations/45866.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 66bb84b17d6d..58ec1c9d48ab 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,13 @@ +2010-10-18 Paolo Carlini + + PR libstdc++/45866 + * include/std/ratio (ratio<>::type): Add. + (ratio_add<>::num, ratio_add<>::den, + ratio_subtract<>::num, ratio_subtract<>::den, + ratio_multiply<>::num, ratio_multiply<>::den, + ratio_divide<>::num, ratio_divide<>::den): Likewise. + * testsuite/20_util/ratio/operations/45866.cc: New. + 2010-10-17 Paolo Carlini * include/bits/forward_list.h (forward_list<>::erase_after): Return diff --git a/libstdc++-v3/include/std/ratio b/libstdc++-v3/include/std/ratio index 74806c41d5a5..b999e31a56fd 100644 --- a/libstdc++-v3/include/std/ratio +++ b/libstdc++-v3/include/std/ratio @@ -160,6 +160,8 @@ namespace std static const intmax_t den = __static_abs<_Den>::value / __static_gcd<_Num, _Den>::value; + + typedef ratio type; }; template @@ -182,8 +184,17 @@ namespace std __safe_multiply<_R1::num, (_R2::den / __gcd)>::value, __safe_multiply<_R2::num, (_R1::den / __gcd)>::value>::value, __safe_multiply<_R1::den, (_R2::den / __gcd)>::value> type; + + static const intmax_t num = type::num; + static const intmax_t den = type::den; }; + template + const intmax_t ratio_add<_R1, _R2>::num; + + template + const intmax_t ratio_add<_R1, _R2>::den; + /// ratio_subtract template struct ratio_subtract @@ -191,8 +202,17 @@ namespace std typedef typename ratio_add< _R1, ratio<-_R2::num, _R2::den>>::type type; + + static const intmax_t num = type::num; + static const intmax_t den = type::den; }; + template + const intmax_t ratio_subtract<_R1, _R2>::num; + + template + const intmax_t ratio_subtract<_R1, _R2>::den; + /// ratio_multiply template struct ratio_multiply @@ -209,8 +229,17 @@ namespace std (_R2::num / __gcd2)>::value, __safe_multiply<(_R1::den / __gcd2), (_R2::den / __gcd1)>::value> type; + + static const intmax_t num = type::num; + static const intmax_t den = type::den; }; + template + const intmax_t ratio_multiply<_R1, _R2>::num; + + template + const intmax_t ratio_multiply<_R1, _R2>::den; + /// ratio_divide template struct ratio_divide @@ -220,8 +249,17 @@ namespace std typedef typename ratio_multiply< _R1, ratio<_R2::den, _R2::num>>::type type; + + static const intmax_t num = type::num; + static const intmax_t den = type::den; }; + template + const intmax_t ratio_divide<_R1, _R2>::num; + + template + const intmax_t ratio_divide<_R1, _R2>::den; + /// ratio_equal template struct ratio_equal diff --git a/libstdc++-v3/testsuite/20_util/ratio/operations/45866.cc b/libstdc++-v3/testsuite/20_util/ratio/operations/45866.cc new file mode 100644 index 000000000000..19735fc3e136 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/ratio/operations/45866.cc @@ -0,0 +1,67 @@ +// { dg-options "-std=gnu++0x" } +// { dg-require-cstdint "" } + +// 2010-10-18 Paolo Carlini + +// Copyright (C) 2010 Free Software Foundation +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING3. If not see +// . + +#include +#include + +// libstdc++/45866 +void test01() +{ + bool test __attribute__((unused)) = true; + + typedef std::ratio<1, 4>::type r_type1; + typedef std::ratio<3, 2>::type r_type2; + + typedef std::ratio_add ra_type; + + VERIFY( ra_type::num == ra_type::type::num ); + VERIFY( ra_type::den == ra_type::type::den ); + VERIFY( ra_type::num == 7 ); + VERIFY( ra_type::den == 4 ); + + typedef std::ratio_subtract rs_type; + + VERIFY( rs_type::num == rs_type::type::num ); + VERIFY( rs_type::den == rs_type::type::den ); + VERIFY( rs_type::num == -5 ); + VERIFY( rs_type::den == 4 ); + + typedef std::ratio_multiply rm_type; + + VERIFY( rm_type::num == rm_type::type::num ); + VERIFY( rm_type::den == rm_type::type::den ); + VERIFY( rm_type::num == 3 ); + VERIFY( rm_type::den == 8 ); + + typedef std::ratio_divide rd_type; + + VERIFY( rd_type::num == rd_type::type::num ); + VERIFY( rd_type::den == rd_type::type::den ); + VERIFY( rd_type::num == 1 ); + VERIFY( rd_type::den == 6 ); +} + +int main() +{ + test01(); + return 0; +}