2001-01-25 Phil Edwards <pme@sources.redhat.com>

	* include/bits/std_iterator.h:  Do not include stl_relops.h.
	* include/bits/std_numeric.h:  Ditto.
	* include/bits/stl_algobase.h:  Ditto.
	* include/bits/stl_relops.h:  Add comment warning about problems.

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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index cdd518c..9478830 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2001-01-25  Phil Edwards  <pme@sources.redhat.com>
+
+       * include/bits/std_iterator.h:  Do not include stl_relops.h.
+       * include/bits/std_numeric.h:  Ditto.
+       * include/bits/stl_algobase.h:  Ditto.
+       * include/bits/stl_relops.h:  Add comment warning about problems.
+
 2001-01-25  Gabriel Dos Reis  <gdr@codesourcery.com>
 
        * testsuite/27_io/*.cc: Remove explicit reference to 'testsuite/'

diff --git a/libstdc++-v3/include/bits/std_iterator.h b/libstdc++-v3/include/bits/std_iterator.h
index 643cff9..65eda06 100644 (file)
--- a/libstdc++-v3/include/bits/std_iterator.h
+++ b/libstdc++-v3/include/bits/std_iterator.h
@@ -28,7 +28,6 @@
 #define _CPP_ITERATOR 1
 
 #include <bits/stl_config.h>
-#include <bits/stl_relops.h>
 #include <bits/std_cstddef.h>
 #include <bits/std_iosfwd.h>
 #include <bits/stl_iterator_base.h>

diff --git a/libstdc++-v3/include/bits/std_numeric.h b/libstdc++-v3/include/bits/std_numeric.h
index 8b7c6fd..e9cd42d 100644 (file)
--- a/libstdc++-v3/include/bits/std_numeric.h
+++ b/libstdc++-v3/include/bits/std_numeric.h
@@ -28,7 +28,6 @@
 #define _CPP_NUMERIC 1
 
 #include <bits/stl_config.h>
-#include <bits/stl_relops.h>
 #include <bits/std_cstddef.h>
 #include <bits/std_iterator.h>
 #include <bits/stl_function.h>

diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h
index 5a8a576..a9ab37b 100644 (file)
--- a/libstdc++-v3/include/bits/stl_algobase.h
+++ b/libstdc++-v3/include/bits/stl_algobase.h
@@ -33,7 +33,6 @@
 #define __SGI_STL_INTERNAL_ALGOBASE_H
 
 #include <bits/stl_config.h>
-#include <bits/stl_relops.h>
 #ifndef __SGI_STL_INTERNAL_PAIR_H
 #include <bits/stl_pair.h>
 #endif

diff --git a/libstdc++-v3/include/bits/stl_relops.h b/libstdc++-v3/include/bits/stl_relops.h
index f0cabdf..338194b 100644 (file)
--- a/libstdc++-v3/include/bits/stl_relops.h
+++ b/libstdc++-v3/include/bits/stl_relops.h
@@ -28,6 +28,16 @@
  *   You should not attempt to use it directly.
  */
 
+/**** libstdc++-v3 note:  Inclusion of this file has been removed from
+ * all of the other STL headers for safety reasons, except std_utility.h.
+ * For more information, see the thread of about twenty messages starting
+ * with <URL:http://gcc.gnu.org/ml/libstdc++/2001-01/msg00223.html>, or the
+ * FAQ at <URL:http://gcc.gnu.org/onlinedocs/libstdc++/faq/index.html#4_4>.
+ *
+ * Short summary:  the rel_ops operators cannot be made to play nice.
+ * Don't use them.
+*/
+
 #ifndef _CPP_BITS_STL_RELOPS_H
 #define _CPP_BITS_STL_RELOPS_H 1