diff options
author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-02-08 15:37:59 +0000 |
---|---|---|
committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-02-08 15:37:59 +0000 |
commit | 6c1b4080c3cd651e3559bbbf155d1f09236c68ee (patch) | |
tree | 1e897c7692f8c0dcdd29b47f285dee7f3171828d /libstdc++-v3 | |
parent | 600695e0a5ce8bae8a3f79b41bcc17ea497527a7 (diff) | |
download | gcc-6c1b4080c3cd651e3559bbbf155d1f09236c68ee.tar.gz |
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
Diffstat (limited to 'libstdc++-v3')
-rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
-rw-r--r-- | libstdc++-v3/acinclude.m4 | 4 | ||||
-rwxr-xr-x | libstdc++-v3/configure | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 1888702d199..04dfebf43ac 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 e667ccc741b..95df24a9062 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 02bb312be0d..acbc6a6bd6e 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); |