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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@117019 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index d40bee2..5c6ef93 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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 */