From: Paolo Carlini Date: Mon, 18 Sep 2006 09:19:36 +0000 (+0000) Subject: re PR libstdc++/29063 (valarray does not undefine all temp macros) X-Git-Tag: releases/gcc-4.2.0~1352 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bcc4a44f6b929d0640370f1dd6aafccba481527c;p=thirdparty%2Fgcc.git re PR libstdc++/29063 (valarray does not undefine all temp macros) 2006-09-18 Paolo Carlini PR libstdc++/29063 * include/bits/valarray_array.h: Fix typo, undefine _DEFINE_ARRAY_FUNCTION. * include/std/std_valarray.h: Undefine _DEFINE_BINARY_OPERATOR. From-SVN: r117019 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d40bee2a189e..5c6ef939a177 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2006-09-18 Paolo Carlini + + PR libstdc++/29063 + * include/bits/valarray_array.h: Fix typo, undefine + _DEFINE_ARRAY_FUNCTION. + * include/std/std_valarray.h: Undefine _DEFINE_BINARY_OPERATOR. + 2006-09-14 Benjamin Kosnik * include/bits/concurrence.h (__mutex::__mutex): Pass address of diff --git a/libstdc++-v3/include/bits/valarray_array.h b/libstdc++-v3/include/bits/valarray_array.h index 57d56cf253b7..f7600a5afb4f 100644 --- a/libstdc++-v3/include/bits/valarray_array.h +++ b/libstdc++-v3/include/bits/valarray_array.h @@ -693,7 +693,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _DEFINE_ARRAY_FUNCTION(<<, __shift_left) _DEFINE_ARRAY_FUNCTION(>>, __shift_right) -#undef _DEFINE_VALARRAY_FUNCTION +#undef _DEFINE_ARRAY_FUNCTION _GLIBCXX_END_NAMESPACE diff --git a/libstdc++-v3/include/std/std_valarray.h b/libstdc++-v3/include/std/std_valarray.h index 47b00a520bc4..d1f43b59268d 100644 --- a/libstdc++-v3/include/std/std_valarray.h +++ b/libstdc++-v3/include/std/std_valarray.h @@ -1019,6 +1019,8 @@ _DEFINE_BINARY_OPERATOR(>, __greater) _DEFINE_BINARY_OPERATOR(<=, __less_equal) _DEFINE_BINARY_OPERATOR(>=, __greater_equal) +#undef _DEFINE_BINARY_OPERATOR + _GLIBCXX_END_NAMESPACE #endif /* _GLIBCXX_VALARRAY */