* include/experimental/numeric: New. Define gcd and lcm.
* include/Makefile.am: Add new header.
* include/Makefile.in: Regenerate.
* testsuite/experimental/numeric/gcd.cc: New.
* testsuite/experimental/numeric/lcm.cc: New.
* doc/xml/manual/status_cxx2017.xml: Update status.
* doc/html/manual/status.html: Regenerate.
From-SVN: r222724
+2015-05-02 Jonathan Wakely <jwakely@redhat.com>
+
+ * include/experimental/numeric: New. Define gcd and lcm.
+ * include/Makefile.am: Add new header.
+ * include/Makefile.in: Regenerate.
+ * testsuite/experimental/numeric/gcd.cc: New.
+ * testsuite/experimental/numeric/lcm.cc: New.
+ * doc/xml/manual/status_cxx2017.xml: Update status.
+ * doc/html/manual/status.html: Regenerate.
+
2015-05-02 Edward Smith-Rowland <3dw4rd@verizon.net>
Revert addition of feature macros from other headers per latest SD-6.
- * include/experimental/deque: Remove feature-test macro.
- * include/experimental/forward_list: Ditto.
- * include/experimental/list: Ditto.
- * include/experimental/map: Ditto.
- * include/experimental/set: Ditto.
- * include/experimental/string: Ditto.
- * include/experimental/unordered_map: Ditto.
- * include/experimental/unordered_set: Ditto.
+ * include/experimental/deque: Remove feature-test macro.
+ * include/experimental/forward_list: Ditto.
+ * include/experimental/list: Ditto.
+ * include/experimental/map: Ditto.
+ * include/experimental/set: Ditto.
+ * include/experimental/string: Ditto.
+ * include/experimental/unordered_map: Ditto.
+ * include/experimental/unordered_set: Ditto.
2015-05-02 Jonathan Wakely <jwakely@redhat.com>
<a class="link" href="http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2014/n4273.htm" target="_top">
N4273
</a>
- </td><td align="left">Uniform Container Erasure</td><td align="left">Y</td><td align="left">Library Fundamentals 2 TS</td></tr><tr bgcolor="#C8B0B0"><td align="left">
+ </td><td align="left">Uniform Container Erasure</td><td align="left">Y</td><td align="left">Library Fundamentals 2 TS</td></tr><tr><td align="left">
<a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4061.pdf" target="_top">
N4061
</a>
- </td><td align="left">Greatest Common Divisor and Least Common Multiple</td><td align="left">N</td><td align="left">Library Fundamentals 2 TS</td></tr><tr bgcolor="#C8B0B0"><td align="left">
+ </td><td align="left">Greatest Common Divisor and Least Common Multiple</td><td align="left">Y</td><td align="left">Library Fundamentals 2 TS</td></tr><tr bgcolor="#C8B0B0"><td align="left">
<a class="link" href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4257.html" target="_top">
N4257
</a>
</row>
<row>
- <?dbhtml bgcolor="#C8B0B0" ?>
<entry>
<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4061.pdf">
N4061
</link>
</entry>
<entry>Greatest Common Divisor and Least Common Multiple</entry>
- <entry>N</entry>
+ <entry>Y</entry>
<entry>Library Fundamentals 2 TS</entry>
</row>
${experimental_srcdir}/list \
${experimental_srcdir}/map \
${experimental_srcdir}/memory \
+ ${experimental_srcdir}/numeric \
${experimental_srcdir}/optional \
${experimental_srcdir}/ratio \
${experimental_srcdir}/set \
${experimental_srcdir}/list \
${experimental_srcdir}/map \
${experimental_srcdir}/memory \
+ ${experimental_srcdir}/numeric \
${experimental_srcdir}/optional \
${experimental_srcdir}/ratio \
${experimental_srcdir}/set \
--- /dev/null
+// <experimental/numeric> -*- C++ -*-
+
+// Copyright (C) 2015 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.
+
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+// <http://www.gnu.org/licenses/>.
+
+/** @file experimental/numeric
+ * This is a TS C++ Library header.
+ */
+
+//
+// N4336 Working Draft, C++ Extensions for Library Fundamentals, Version 2
+//
+
+#ifndef _GLIBCXX_EXPERIMENTAL_NUMERIC
+#define _GLIBCXX_EXPERIMENTAL_NUMERIC 1
+
+#pragma GCC system_header
+
+#if __cplusplus <= 201103L
+# include <bits/c++14_warning.h>
+#else
+
+#include <experimental/type_traits>
+#include <cmath>
+
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+namespace experimental
+{
+inline namespace fundamentals_v2
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
+#define __cpp_lib_experimental_gcd_lcm 201411
+
+ // Greatest common divisor
+ template<typename _Mn, typename _Nn>
+ 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");
+
+ return __m == 0 ? std::abs(__n)
+ : __n == 0 ? std::abs(__m)
+ : fundamentals_v2::gcd(__n, __m % __n);
+ }
+
+ // Least common multiple
+ template<typename _Mn, typename _Nn>
+ 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");
+
+ return (__m != 0 && __n != 0)
+ ? (std::abs(__m) / fundamentals_v2::gcd(__m, __n)) * std::abs(__n)
+ : 0;
+ }
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace fundamentals_v2
+} // namespace experimental
+} // namespace std
+
+#endif // __cplusplus <= 201103L
+
+#endif // _GLIBCXX_EXPERIMENTAL_NUMERIC
--- /dev/null
+// Copyright (C) 2015 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++14" }
+// { dg-do compile }
+
+#include <experimental/numeric>
+
+using std::experimental::fundamentals_v2::lcm;
+
+static_assert(lcm(21, 6) == 42, "");
+static_assert(lcm(41, 0) == 0, "LCD with zero is zero");
+static_assert(lcm(0, 7) == 0, "LCD with zero is zero");
+static_assert(lcm(0, 0) == 0, "no division by zero");
--- /dev/null
+// Copyright (C) 2015 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++14" }
+// { dg-do compile }
+
+#include <experimental/numeric>
+
+using std::experimental::fundamentals_v2::gcd;
+
+static_assert( gcd(1071, 462) == 21, "" );
+static_assert( gcd(2000, 20) == 20, "" );
+static_assert( gcd(2011, 17) == 1, "GCD of two primes is 1" );
+static_assert( gcd(200, 200) == 200, "GCD of equal numbers is that number" );
+static_assert( gcd(0, 13) == 13, "GCD of any number and 0 is that number" );
+static_assert( gcd(29, 0) == 29, "GCD of any number and 0 is that number" );
+static_assert( gcd(0, 0) == 0, "" );
+
git://gcc.gnu.org / gcc.git / commitdiff