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

Don't redefine _GLIBCXX_ASSERTIONS if already defined 

* include/bits/c++config (_GLIBCXX_ASSERTIONS): Avoid redefinition.

From-SVN: r244151
This commit is contained in:
Jonathan Wakely 2017-01-06 12:34:11 +00:00 committed by Jonathan Wakely
parent 6807f08628
commit 8b790281d5
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libstdc++-v3/ChangeLog
View File

@ -1,5 +1,7 @@
2017-01-06 Jonathan Wakely <jwakely@redhat.com>
* include/bits/c++config (_GLIBCXX_ASSERTIONS): Avoid redefinition.
PR libstdc++/78991
* include/bits/predefined_ops.h (_Iter_comp_iter, _Iter_comp_val)
(_Val_comp_iter, _Iter_equals_val, _Iter_pred, _Iter_comp_to_val)

2
libstdc++-v3/include/bits/c++config
View File

@ -423,7 +423,7 @@ namespace std
#endif
// Debug Mode implies checking assertions.
#ifdef _GLIBCXX_DEBUG
#if defined(_GLIBCXX_DEBUG) && !defined(_GLIBCXX_ASSERTIONS)
# define _GLIBCXX_ASSERTIONS 1
#endif