diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2005-04-14 21:02:05 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2005-04-14 21:02:05 +0000 |
| commit | 8eb8bb408e226f1eb9fe3fbac739729931c49dea (patch) | |
| tree | 2201404b544cdf6fc2429d65b580651472a5911c /gnu | |
| parent | 8961b6d2bcfa838422b67f6facb27a1375abcd2f (diff) | |
temp scaffolding to switch on partial wchar_t support based on
_GLIBCPP_USE_TYPE_WCHAR_T
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/lib/libstdc++/libstdc++/include/bits/char_traits.h | 4 | ||||
| -rw-r--r-- | gnu/lib/libstdc++/libstdc++/include/bits/cpp_type_traits.h | 2 | ||||
| -rw-r--r-- | gnu/lib/libstdc++/libstdc++/include/bits/stringfwd.h | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/gnu/lib/libstdc++/libstdc++/include/bits/char_traits.h b/gnu/lib/libstdc++/libstdc++/include/bits/char_traits.h index 2b733cd94a0..1cb982b4856 100644 --- a/gnu/lib/libstdc++/libstdc++/include/bits/char_traits.h +++ b/gnu/lib/libstdc++/libstdc++/include/bits/char_traits.h @@ -181,7 +181,7 @@ namespace std }; -#ifdef _GLIBCPP_USE_WCHAR_T +#if defined(_GLIBCPP_USE_WCHAR_T) || defined(_GLIBCPP_USE_TYPE_WCHAR_T) /// 21.1.3.2 char_traits specializations template<> struct char_traits<wchar_t> @@ -189,7 +189,9 @@ namespace std typedef wchar_t char_type; typedef wint_t int_type; typedef streamoff off_type; +#ifdef _GLIBCPP_USE_WCHAR_T typedef wstreampos pos_type; +#endif typedef mbstate_t state_type; static void diff --git a/gnu/lib/libstdc++/libstdc++/include/bits/cpp_type_traits.h b/gnu/lib/libstdc++/libstdc++/include/bits/cpp_type_traits.h index d66fe763841..8a888e5e977 100644 --- a/gnu/lib/libstdc++/libstdc++/include/bits/cpp_type_traits.h +++ b/gnu/lib/libstdc++/libstdc++/include/bits/cpp_type_traits.h @@ -135,7 +135,7 @@ namespace std }; }; -# ifdef _GLIBCPP_USE_WCHAR_T +#if defined(_GLIBCPP_USE_WCHAR_T) || defined(_GLIBCPP_USE_TYPE_WCHAR_T) template<> struct __is_integer<wchar_t> { diff --git a/gnu/lib/libstdc++/libstdc++/include/bits/stringfwd.h b/gnu/lib/libstdc++/libstdc++/include/bits/stringfwd.h index db40befdab6..22b4520a7d1 100644 --- a/gnu/lib/libstdc++/libstdc++/include/bits/stringfwd.h +++ b/gnu/lib/libstdc++/libstdc++/include/bits/stringfwd.h @@ -59,9 +59,8 @@ namespace std typedef basic_string<char> string; -#ifdef _GLIBCPP_USE_WCHAR_T +#if defined(_GLIBCPP_USE_WCHAR_T) || defined(_GLIBCPP_USE_TYPE_WCHAR_T) template<> struct char_traits<wchar_t>; - typedef basic_string<wchar_t> wstring; #endif } // namespace std |