diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 10 | ||||
| -rw-r--r-- | libstdc++-v3/config/locale/generic/c_locale.h | 7 | ||||
| -rw-r--r-- | libstdc++-v3/config/locale/gnu/c_locale.h | 7 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/locale_classes.h | 1 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/std_fstream.h | 1 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/std_iosfwd.h | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/std_sstream.h | 1 |
7 files changed, 26 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 5b5e8c7..ff2b166 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,15 @@ 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. * configure: Regenerated. * config/linker-map.gnu: Clean. diff --git a/libstdc++-v3/config/locale/generic/c_locale.h b/libstdc++-v3/config/locale/generic/c_locale.h index 1947002..ccc1f25 100644 --- 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 c7d8e6e..37df3fa 100644 --- 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 fd4fc2d..f36c8d4 100644 --- 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 7731e49c..6a5e3bc 100644 --- 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 4016047..55b0e0b 100644 --- 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 a6dda0b..0ad52d0 100644 --- 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> |