aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3/include
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2016-10-10 13:17:34 +0100
committerJonathan Wakely <redi@gcc.gnu.org>2016-10-10 13:17:34 +0100
commitf2e79496bf9107eae1130e0d74c80b02a5b86cab (patch)
treefc968dde050b4f8e7c93f354fd7cd301953f699c /libstdc++-v3/include
parentfee13acdd89f77a81a63711534f1d0737b965d1d (diff)
downloadgcc-f2e79496bf9107eae1130e0d74c80b02a5b86cab.zip
gcc-f2e79496bf9107eae1130e0d74c80b02a5b86cab.tar.gz
gcc-f2e79496bf9107eae1130e0d74c80b02a5b86cab.tar.bz2
LWG 2733, LWG 2759 reject bool in gcd and lcm
* include/experimental/numeric (gcd, lcm): Make bool arguments ill-formed. * include/std/numeric (gcd, lcm): Likewise. * testsuite/26_numerics/gcd/gcd_neg.cc: New test. * testsuite/26_numerics/lcm/lcm_neg.cc: New test. From-SVN: r240919
Diffstat (limited to 'libstdc++-v3/include')
-rw-r--r--libstdc++-v3/include/experimental/numeric12
-rw-r--r--libstdc++-v3/include/std/numeric14
2 files changed, 18 insertions, 8 deletions
diff --git a/libstdc++-v3/include/experimental/numeric b/libstdc++-v3/include/experimental/numeric
index 6d1dc21..0ce4bda 100644
--- a/libstdc++-v3/include/experimental/numeric
+++ b/libstdc++-v3/include/experimental/numeric
@@ -57,8 +57,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
constexpr common_type_t<_Mn, _Nn>
gcd(_Mn __m, _Nn __n)
{
- static_assert(is_integral<_Mn>::value, "arguments to gcd are integers");
- static_assert(is_integral<_Nn>::value, "arguments to gcd are integers");
+ static_assert(is_integral<_Mn>::value, "gcd arguments are integers");
+ static_assert(is_integral<_Nn>::value, "gcd arguments are integers");
+ static_assert(!is_same<_Mn, bool>::value, "gcd arguments are not bools");
+ static_assert(!is_same<_Nn, bool>::value, "gcd arguments are not bools");
return std::__detail::__gcd(__m, __n);
}
@@ -67,8 +69,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
constexpr common_type_t<_Mn, _Nn>
lcm(_Mn __m, _Nn __n)
{
- static_assert(is_integral<_Mn>::value, "arguments to lcm are integers");
- static_assert(is_integral<_Nn>::value, "arguments to lcm are integers");
+ static_assert(is_integral<_Mn>::value, "lcm arguments are integers");
+ static_assert(is_integral<_Nn>::value, "lcm arguments are integers");
+ static_assert(!is_same<_Mn, bool>::value, "lcm arguments are not bools");
+ static_assert(!is_same<_Nn, bool>::value, "lcm arguments are not bools");
return std::__detail::__lcm(__m, __n);
}
diff --git a/libstdc++-v3/include/std/numeric b/libstdc++-v3/include/std/numeric
index 7b1ab98..4414081 100644
--- a/libstdc++-v3/include/std/numeric
+++ b/libstdc++-v3/include/std/numeric
@@ -96,6 +96,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__abs_integral(_Tp __val)
{ return __val; }
+ void __abs_integral(bool) = delete;
+
template<typename _Mn, typename _Nn>
constexpr common_type_t<_Mn, _Nn>
__gcd(_Mn __m, _Nn __n)
@@ -129,8 +131,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
constexpr common_type_t<_Mn, _Nn>
gcd(_Mn __m, _Nn __n)
{
- static_assert(is_integral<_Mn>::value, "arguments to gcd are integers");
- static_assert(is_integral<_Nn>::value, "arguments to gcd are integers");
+ static_assert(is_integral<_Mn>::value, "gcd arguments are integers");
+ static_assert(is_integral<_Nn>::value, "gcd arguments are integers");
+ static_assert(!is_same<_Mn, bool>::value, "gcd arguments are not bools");
+ static_assert(!is_same<_Nn, bool>::value, "gcd arguments are not bools");
return __detail::__gcd(__m, __n);
}
@@ -140,8 +144,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
constexpr common_type_t<_Mn, _Nn>
lcm(_Mn __m, _Nn __n)
{
- static_assert(is_integral<_Mn>::value, "arguments to lcm are integers");
- static_assert(is_integral<_Nn>::value, "arguments to lcm are integers");
+ static_assert(is_integral<_Mn>::value, "lcm arguments are integers");
+ static_assert(is_integral<_Nn>::value, "lcm arguments are integers");
+ static_assert(!is_same<_Mn, bool>::value, "lcm arguments are not bools");
+ static_assert(!is_same<_Nn, bool>::value, "lcm arguments are not bools");
return __detail::__lcm(__m, __n);
}