git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure "C++" language linkage for std::abs overloads 

PR libstdc++/77814
	* include/bits/std_abs.h: Use "C++" language linkage.
	* testsuite/17_intro/headers/c++2011/linkage.cc: Move <complex.h> to
	the end. Add <stdalign.h>.

From-SVN: r240710
This commit is contained in:
Jonathan Wakely 2016-10-03 12:50:46 +01:00 committed by Jonathan Wakely
parent 3fe2ddae4b
commit 6a0d23af49
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,10 @@
2016-10-03 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/77814
* include/bits/std_abs.h: Use "C++" language linkage.
* testsuite/17_intro/headers/c++2011/linkage.cc: Move <complex.h> to
the end. Add <stdalign.h>.
2016-10-03 Ville Voutilainen <ville.voutilainen@gmail.com>
PR libstdc++/77802

3
libstdc++-v3/include/bits/std_abs.h
View File

@ -43,6 +43,8 @@
#undef abs
extern "C++"
{
namespace std _GLIBCXX_VISIBILITY(default)
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
@ -103,5 +105,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace
}
#endif // _GLIBCXX_BITS_STD_ABS_H

13
libstdc++-v3/testsuite/17_intro/headers/c++2011/linkage.cc
View File

@ -25,9 +25,7 @@
extern "C"
{
#include <assert.h>
#ifdef _GLIBCXX_HAVE_COMPLEX_H
#include <complex.h>
#endif
// See below for <complex.h>
#include <ctype.h>
#include <errno.h>
#ifdef _GLIBCXX_HAVE_FENV_H
@ -43,6 +41,9 @@ extern "C"
#include <math.h>
#include <setjmp.h>
#include <signal.h>
#if _GLIBCXX_HAVE_STDALIGN_H
#include <stdalign.h>
#endif
#include <stdarg.h>
#ifdef _GLIBCXX_HAVE_STDBOOL_H
#include <stdbool.h>
@ -67,4 +68,10 @@ extern "C"
#ifdef _GLIBCXX_HAVE_WCTYPE_H
#include <wctype.h>
#endif
// Include this last, because it adds extern "C++" and so hides problems in
// other headers if included first (e.g. PR libstdc++/77814).
#ifdef _GLIBCXX_HAVE_COMPLEX_H
#include <complex.h>
#endif
}