aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Carlini <pcarlini@suse.de>2006-09-18 09:19:36 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2006-09-18 09:19:36 +0000
commitbcc4a44f6b929d0640370f1dd6aafccba481527c (patch)
treeb81e87daaf9d0079b2c9c7a94f7b6e336eb47330
parent80f2bb6e3af5a9ae2576f86258cdafa7fe1ff384 (diff)
downloadgcc-bcc4a44f6b929d0640370f1dd6aafccba481527c.zip
gcc-bcc4a44f6b929d0640370f1dd6aafccba481527c.tar.gz
gcc-bcc4a44f6b929d0640370f1dd6aafccba481527c.tar.bz2
re PR libstdc++/29063 (valarray does not undefine all temp macros)
2006-09-18 Paolo Carlini <pcarlini@suse.de> 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
-rw-r--r--libstdc++-v3/ChangeLog7
-rw-r--r--libstdc++-v3/include/bits/valarray_array.h2
-rw-r--r--libstdc++-v3/include/std/std_valarray.h2
3 files changed, 10 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index d40bee2..5c6ef93 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2006-09-18 Paolo Carlini <pcarlini@suse.de>
+
+ 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 <bkoz@redhat.com>
* 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 57d56cf..f7600a5 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 47b00a5..d1f43b5 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 */