OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Jonathan Wakely 2016-10-10 13:17:34 +01:00 committed by Jonathan Wakely
parent fee13acdd8
commit f2e79496bf
5 changed files with 102 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -1,5 +1,11 @@
2016-10-10 Jonathan Wakely <jwakely@redhat.com>
* 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.
* include/bits/shared_ptr.h (enable_shared_from_this::weak_from_this):
Add noexcept.
* include/bits/shared_ptr_base.h

12
libstdc++-v3/include/experimental/numeric
View File

@ -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);
}

14
libstdc++-v3/include/std/numeric
View File

@ -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);
}

39
libstdc++-v3/testsuite/26_numerics/gcd/gcd_neg.cc Normal file
View File

@ -0,0 +1,39 @@
// Copyright (C) 2016 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-options "-std=gnu++1z" }
// { dg-do compile { target c++1z } }
#include <numeric>
void
test01()
{
std::gcd(true, 1); // { dg-error "from here" }
std::gcd(1, true); // { dg-error "from here" }
std::gcd(true, true); // { dg-error "from here" }
std::gcd(0.1, 1); // { dg-error "from here" }
std::gcd(1, 0.1); // { dg-error "from here" }
std::gcd(0.1, 0.1); // { dg-error "from here" }
}
// { dg-error "integers" "" { target *-*-* } 134 }
// { dg-error "integers" "" { target *-*-* } 135 }
// { dg-error "not bools" "" { target *-*-* } 136 }
// { dg-error "not bools" "" { target *-*-* } 137 }
// { dg-prune-output "deleted function" }
// { dg-prune-output "invalid operands" }

39
libstdc++-v3/testsuite/26_numerics/lcm/lcm_neg.cc Normal file
View File

@ -0,0 +1,39 @@
// Copyright (C) 2016 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-options "-std=gnu++1z" }
// { dg-do compile { target c++1z } }
#include <numeric>
void
test01()
{
std::lcm(true, 1); // { dg-error "from here" }
std::lcm(1, true); // { dg-error "from here" }
std::lcm(true, true); // { dg-error "from here" }
std::lcm(0.1, 1); // { dg-error "from here" }
std::lcm(1, 0.1); // { dg-error "from here" }
std::lcm(0.1, 0.1); // { dg-error "from here" }
}
// { dg-error "integers" "" { target *-*-* } 147 }
// { dg-error "integers" "" { target *-*-* } 148 }
// { dg-error "not bools" "" { target *-*-* } 149 }
// { dg-error "not bools" "" { target *-*-* } 150 }
// { dg-prune-output "deleted function" }
// { dg-prune-output "invalid operands" }