Remove accidentally added 'constexpr' in previous commit

	* acinclude.m4 (GLIBCXX_CHECK_MATH11_PROTO): Remove accidentally
	added 'constexpr' in previous commit.
	* configure: Regenerate.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@233219 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1888702d19944c395d25186c7b332b878934b2cd..04dfebf43ac96acb866b957b1eecd8c0c28881a5 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,9 @@
 2016-02-08  Jonathan Wakely  <jwakely@redhat.com>
 
+       * acinclude.m4 (GLIBCXX_CHECK_MATH11_PROTO): Remove accidentally
+       added 'constexpr' in previous commit.
+       * configure: Regenerate.
+
        PR libstdc++/48891
        * acinclude.m4 (GLIBCXX_CHECK_MATH11_PROTO): Enable isinf and isnan
        checks for all targets except *-*-solaris2.* and ensure we find the

diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index e667ccc741ba7257a3a4839eb5e9267a014b96ad..95df24a9062d853f8e416230535a7a2a91bafc77 100644 (file)
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -2228,8 +2228,8 @@ AC_DEFUN([GLIBCXX_CHECK_MATH11_PROTO], [
              #undef isinf
              namespace std {
                using ::isinf;
-               constexpr bool isinf(float);
-               constexpr bool isinf(long double);
+               bool isinf(float);
+               bool isinf(long double);
              }
              using std::isinf;
              bool b = isinf(0.0);

diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 02bb312be0dc134e631a5f114ecc10002250c0b4..acbc6a6bd6e962ec7c8b9d7f6db0184d67811587 100755 (executable)
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -18284,8 +18284,8 @@ else
              #undef isinf
              namespace std {
                using ::isinf;
-               constexpr bool isinf(float);
-               constexpr bool isinf(long double);
+               bool isinf(float);
+               bool isinf(long double);
              }
              using std::isinf;
              bool b = isinf(0.0);