diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 8 | ||||
| -rw-r--r-- | libstdc++-v3/include/decimal/decimal | 21 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/decimal/pr58815.cc | 35 |
3 files changed, 58 insertions, 6 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index b287bf1..4824393 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2013-10-23 Paolo Carlini <paolo.carlini@oracle.com> + + PR libstdc++/58815 + * include/decimal/decimal (decimal32::operator long long(), + decimal64::operator long long(), decimal128::operator long long()): + Add in c++11 mode per n3407. + * testsuite/decimal/pr58815.cc: New. + 2013-10-22 Edward Smith-Rowland <3dw4rd@verizon.net> * include/bits/basic_string.h (operator""s): Remove space between quotes diff --git a/libstdc++-v3/include/decimal/decimal b/libstdc++-v3/include/decimal/decimal index a880537..c160118 100644 --- a/libstdc++-v3/include/decimal/decimal +++ b/libstdc++-v3/include/decimal/decimal @@ -250,8 +250,11 @@ namespace decimal /// Conforming extension: Conversion from scalar decimal type. decimal32(__decfloat32 __z) : __val(__z) {} - // 3.2.2.5 Conversion to integral type. (DISABLED) - //operator long long() const { return (long long)__val; } +#if __cplusplus >= 201103L + // 3.2.2.5 Conversion to integral type. + // Note: explicit per n3407. + explicit operator long long() const { return (long long)__val; } +#endif // 3.2.2.6 Increment and decrement operators. decimal32& operator++() @@ -333,8 +336,11 @@ namespace decimal /// Conforming extension: Conversion from scalar decimal type. decimal64(__decfloat64 __z) : __val(__z) {} - // 3.2.3.5 Conversion to integral type. (DISABLED) - //operator long long() const { return (long long)__val; } +#if __cplusplus >= 201103L + // 3.2.3.5 Conversion to integral type. + // Note: explicit per n3407. + explicit operator long long() const { return (long long)__val; } +#endif // 3.2.3.6 Increment and decrement operators. decimal64& operator++() @@ -417,8 +423,11 @@ namespace decimal /// Conforming extension: Conversion from scalar decimal type. decimal128(__decfloat128 __z) : __val(__z) {} - // 3.2.4.5 Conversion to integral type. (DISABLED) - //operator long long() const { return (long long)__val; } +#if __cplusplus >= 201103L + // 3.2.4.5 Conversion to integral type. + // Note: explicit per n3407. + explicit operator long long() const { return (long long)__val; } +#endif // 3.2.4.6 Increment and decrement operators. decimal128& operator++() diff --git a/libstdc++-v3/testsuite/decimal/pr58815.cc b/libstdc++-v3/testsuite/decimal/pr58815.cc new file mode 100644 index 0000000..b805d75 --- /dev/null +++ b/libstdc++-v3/testsuite/decimal/pr58815.cc @@ -0,0 +1,35 @@ +// { dg-options "-std=gnu++11" } +// +// Copyright (C) 2013 Free Software Foundation, Inc. +// +// 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 +// <http://www.gnu.org/licenses/>. + +// { dg-do compile } +// { dg-require-effective-target dfp } + +#include <decimal/decimal> + +void +test01 () +{ + std::decimal::decimal32 d32; + std::decimal::decimal64 d64; + std::decimal::decimal128 d128; + + static_cast<long long>(d32); + static_cast<long long>(d64); + static_cast<long long>(d128); +} |