aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2016-02-08 15:37:59 +0000
committerJonathan Wakely <redi@gcc.gnu.org>2016-02-08 15:37:59 +0000
commit2158532f314617f555389157fb46b86c5ef935b3 (patch)
tree1e897c7692f8c0dcdd29b47f285dee7f3171828d
parenta011cd929d0a2b08b0e523e23523a567061c8da7 (diff)
downloadgcc-2158532f314617f555389157fb46b86c5ef935b3.zip
gcc-2158532f314617f555389157fb46b86c5ef935b3.tar.gz
gcc-2158532f314617f555389157fb46b86c5ef935b3.tar.bz2
Remove accidentally added 'constexpr' in previous commit
* acinclude.m4 (GLIBCXX_CHECK_MATH11_PROTO): Remove accidentally added 'constexpr' in previous commit. * configure: Regenerate. From-SVN: r233219
-rw-r--r--libstdc++-v3/ChangeLog4
-rw-r--r--libstdc++-v3/acinclude.m44
-rwxr-xr-xlibstdc++-v3/configure4
3 files changed, 8 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1888702..04dfebf 100644
--- 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 e667ccc..95df24a 100644
--- 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 02bb312..acbc6a6 100755
--- 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);