aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2019-02-22 20:10:47 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2019-02-22 20:10:47 +0100
commitfcb141ac220aabc330dff94cb343a9a39da810c3 (patch)
tree26f56ee355ee1196d97b57adf87846a7cf937620
parent16a919a7162aa5dc92c0834ad4eef8b7f878a7ae (diff)
downloadgcc-fcb141ac220aabc330dff94cb343a9a39da810c3.zip
gcc-fcb141ac220aabc330dff94cb343a9a39da810c3.tar.gz
gcc-fcb141ac220aabc330dff94cb343a9a39da810c3.tar.bz2
re PR libstdc++/89402 (warning: ‘void _ZNKSt4hashIeEclEe()’ specifies less restrictive attribute than its target)
PR libstdc++/89402 * src/c++98/compatibility-ldbl.cc (_ZNKSt4hashIeEclEe): Change return type to std::size_t and argument to type to long double. From-SVN: r269130
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/src/c++98/compatibility-ldbl.cc2
2 files changed, 7 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f5f6fe5..c0ec289 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2019-02-22 Jakub Jelinek <jakub@redhat.com>
+
+ PR libstdc++/89402
+ * src/c++98/compatibility-ldbl.cc (_ZNKSt4hashIeEclEe): Change return
+ type to std::size_t and argument to type to long double.
+
2019-02-22 Eric Botcazou <ebotcazou@adacore.com>
* configure.host (abi_baseline_pair): Adjust for SPARC64/Linux.
diff --git a/libstdc++-v3/src/c++98/compatibility-ldbl.cc b/libstdc++-v3/src/c++98/compatibility-ldbl.cc
index e16b120..829d7ab 100644
--- a/libstdc++-v3/src/c++98/compatibility-ldbl.cc
+++ b/libstdc++-v3/src/c++98/compatibility-ldbl.cc
@@ -74,7 +74,7 @@ namespace std _GLIBCXX_VISIBILITY(default)
// std::tr1::hash<long double>::operator()
// and std::hash<long double>::operator()
// are the same, no need to duplicate them.
-extern "C" void _ZNKSt4hashIeEclEe (void)
+extern "C" std::size_t _ZNKSt4hashIeEclEe (long double)
_GLIBCXX_PURE __attribute__((alias ("_ZNKSt3tr14hashIeEclEe")));
#endif