Don't redefine _GLIBCXX_ASSERTIONS if already defined

* include/bits/c++config (_GLIBCXX_ASSERTIONS): Avoid redefinition. From-SVN: r244151

Don't redefine _GLIBCXX_ASSERTIONS if already defined
* include/bits/c++config (_GLIBCXX_ASSERTIONS): Avoid redefinition. From-SVN: r244151
8b790281 · Jonathan Wakely · Jonathan Wakely · 6807f086 · 8b790281 · 8b790281
Commit 8b790281 authored 8 years ago by Jonathan Wakely Committed by Jonathan Wakely 8 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletions

libstdc++-v3/ChangeLog
+2 -0

libstdc++-v3/include/bits/c++config
+1 -1

No files found.
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
 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)

--- a/libstdc++-v3/include/bits/c++config
+++ b/libstdc++-v3/include/bits/c++config
@@ -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