From 8b790281d58c106e62033432f6352a1b40d4be2d Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 6 Jan 2017 12:34:11 +0000 Subject: [PATCH] Don't redefine _GLIBCXX_ASSERTIONS if already defined * include/bits/c++config (_GLIBCXX_ASSERTIONS): Avoid redefinition. From-SVN: r244151 --- libstdc++-v3/ChangeLog | 2 ++ libstdc++-v3/include/bits/c++config | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index bf4f415c15d..44830a6c972 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,7 @@ 2017-01-06 Jonathan Wakely + * 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) diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config index b2eea3ca36a..0cc1865294c 100644 --- 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 -- 2.30.2