Revert include ordering.

2003-01-23  Benjamin Kosnik  <bkoz@redhat.com>

	Revert include ordering.
	* config/locale/generic/c_locale.h: Add include guards.
	* config/locale/gnu/c_locale.h: Same.
	* include/bits/locale_classes.h: Remove cctype include.
	* include/std/std_iosfwd.h: Add c++locale.h, cctype includes.
	* include/std/std_fstream.h: Remove streambuf include.
	* include/std/std_sstream.h: Remove streambuf include.

From-SVN: r61664

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 5b5e8c7392d375d65ac54037c39404feebeb2042..ff2b1664c066323f9863445ea8cf8089af614b4b 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,13 @@
+2003-01-23  Benjamin Kosnik  <bkoz@redhat.com>
+
+       Revert include ordering.
+       * config/locale/generic/c_locale.h: Add include guards.
+       * config/locale/gnu/c_locale.h: Same.
+       * include/bits/locale_classes.h: Remove cctype include.
+       * include/std/std_iosfwd.h: Add c++locale.h, cctype includes.
+       * include/std/std_fstream.h: Remove streambuf include.
+       * include/std/std_sstream.h: Remove streambuf include.
+       
 2003-01-23  Benjamin Kosnik  <bkoz@redhat.com>
 
        * configure.in (libtool_VERSION): To 6:0:0.

diff --git a/libstdc++-v3/config/locale/generic/c_locale.h b/libstdc++-v3/config/locale/generic/c_locale.h
index 1947002ce2b8cacc1f0f86949ee54cf4683ed526..ccc1f2503e0376e710e5f187e2b4b1bd811f7fb3 100644 (file)
--- a/libstdc++-v3/config/locale/generic/c_locale.h
+++ b/libstdc++-v3/config/locale/generic/c_locale.h
@@ -33,6 +33,11 @@
 
 // Written by Benjamin Kosnik <bkoz@redhat.com>
 
+#ifndef _CPP_BITS_C_LOCALE_H
+#define _CPP_BITS_C_LOCALE_H 1
+
+#pragma GCC system_header
+
 #include <clocale>
 
 #define _GLIBCPP_NUM_CATEGORIES 0
@@ -73,3 +78,5 @@ namespace std
       return __ret;
     }
 }
+
+#endif

diff --git a/libstdc++-v3/config/locale/gnu/c_locale.h b/libstdc++-v3/config/locale/gnu/c_locale.h
index c7d8e6e281b8f10b7ce23a6362f9e099030c6f5c..37df3fa3a3af46a5cce223323713614238973ac1 100644 (file)
--- a/libstdc++-v3/config/locale/gnu/c_locale.h
+++ b/libstdc++-v3/config/locale/gnu/c_locale.h
@@ -33,6 +33,11 @@
 
 // Written by Benjamin Kosnik <bkoz@redhat.com>
 
+#ifndef _CPP_BITS_C_LOCALE_H
+#define _CPP_BITS_C_LOCALE_H 1
+
+#pragma GCC system_header
+
 #include <clocale>
 #include <langinfo.h>          // For codecvt
 #include <iconv.h>             // For codecvt using iconv, iconv_t
@@ -96,3 +101,5 @@ namespace std
       return __ret;
     }
 }
+
+#endif

diff --git a/libstdc++-v3/include/bits/locale_classes.h b/libstdc++-v3/include/bits/locale_classes.h
index fd4fc2d9f3711cffde586a606a5ee67303a32700..f36c8d4dea4953927217791517a058e35540621d 100644 (file)
--- a/libstdc++-v3/include/bits/locale_classes.h
+++ b/libstdc++-v3/include/bits/locale_classes.h
@@ -43,7 +43,6 @@
 #pragma GCC system_header
 
 #include <bits/localefwd.h>
-#include <cctype>              // For isspace, etc.
 #include <cstring>             // For strcmp.
 #include <string>
 #include <bits/atomicity.h>

diff --git a/libstdc++-v3/include/std/std_fstream.h b/libstdc++-v3/include/std/std_fstream.h
index 7731e49c8b28ecda37d8d1f9ae2de86898a0ff3d..6a5e3bc127b8c44cb8b234ab9108b9a7cce9122c 100644 (file)
--- a/libstdc++-v3/include/std/std_fstream.h
+++ b/libstdc++-v3/include/std/std_fstream.h
@@ -42,7 +42,6 @@
 
 #pragma GCC system_header
 
-#include <streambuf>
 #include <istream>
 #include <ostream>
 #include <locale>      // For codecvt

diff --git a/libstdc++-v3/include/std/std_iosfwd.h b/libstdc++-v3/include/std/std_iosfwd.h
index 4016047608f4cbe6f734d151d0510a0d15a48945..55b0e0b19fa7417fcca19934b7d134600146f2ac 100644 (file)
--- a/libstdc++-v3/include/std/std_iosfwd.h
+++ b/libstdc++-v3/include/std/std_iosfwd.h
@@ -43,6 +43,8 @@
 #pragma GCC system_header
 
 #include <bits/c++config.h>
+#include <bits/c++locale.h> 
+#include <cctype>              // For isspace, etc.
 #include <bits/stringfwd.h>    // For string forward declarations.
 #include <bits/fpos.h>
 #include <bits/functexcept.h>

diff --git a/libstdc++-v3/include/std/std_sstream.h b/libstdc++-v3/include/std/std_sstream.h
index a6dda0b5a225e38dd16d2f50b284a2acb88e7b6a..0ad52d023c8cbab1bddb149e2e4db7f476fd78f8 100644 (file)
--- a/libstdc++-v3/include/std/std_sstream.h
+++ b/libstdc++-v3/include/std/std_sstream.h
@@ -41,7 +41,6 @@
 
 #pragma GCC system_header
 
-#include <streambuf>
 #include <istream>
 #include <ostream>