diff options
| author | glisse <glisse@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-11-13 15:47:04 +0000 |
|---|---|---|
| committer | glisse <glisse@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-11-13 15:47:04 +0000 |
| commit | e35a48458fc0c6bf3c5e1d777bebe30f7de22d5c (patch) | |
| tree | 5e62659f929b99d621d1ba3a7cd09b9d4a839682 | |
| parent | 2655c9a25d683c8ed19cae7de557dc387c45cb46 (diff) | |
| download | gcc-e35a48458fc0c6bf3c5e1d777bebe30f7de22d5c.tar.gz | |
2013-11-13 Marc Glisse <marc.glisse@inria.fr>
PR libstdc++/59087
* include/ext/pod_char_traits.h: Uglify V, I and S.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@204750 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/ext/pod_char_traits.h | 34 |
2 files changed, 23 insertions, 16 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 38c70c583e8..5abe56ec6f8 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2013-11-13 Marc Glisse <marc.glisse@inria.fr> + + PR libstdc++/59087 + * include/ext/pod_char_traits.h: Uglify V, I and S. + 2013-11-11 Jonathan Wakely <jwakely.gcc@gmail.com> PR libstdc++/54562 diff --git a/libstdc++-v3/include/ext/pod_char_traits.h b/libstdc++-v3/include/ext/pod_char_traits.h index dcd86ff9842..8e3ad9884d9 100644 --- a/libstdc++-v3/include/ext/pod_char_traits.h +++ b/libstdc++-v3/include/ext/pod_char_traits.h @@ -45,13 +45,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // int_type to properly hold the full range of char_type values as // well as EOF. /// @brief A POD class that serves as a character abstraction class. - template<typename V, typename I, typename S = std::mbstate_t> + template<typename _Value, typename _Int, typename _St = std::mbstate_t> struct character { - typedef V value_type; - typedef I int_type; - typedef S state_type; - typedef character<V, I, S> char_type; + typedef _Value value_type; + typedef _Int int_type; + typedef _St state_type; + typedef character<_Value, _Int, _St> char_type; value_type value; @@ -73,14 +73,16 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION }; - template<typename V, typename I, typename S> + template<typename _Value, typename _Int, typename _St> inline bool - operator==(const character<V, I, S>& lhs, const character<V, I, S>& rhs) + operator==(const character<_Value, _Int, _St>& lhs, + const character<_Value, _Int, _St>& rhs) { return lhs.value == rhs.value; } - template<typename V, typename I, typename S> + template<typename _Value, typename _Int, typename _St> inline bool - operator<(const character<V, I, S>& lhs, const character<V, I, S>& rhs) + operator<(const character<_Value, _Int, _St>& lhs, + const character<_Value, _Int, _St>& rhs) { return lhs.value < rhs.value; } _GLIBCXX_END_NAMESPACE_VERSION @@ -91,14 +93,14 @@ namespace std _GLIBCXX_VISIBILITY(default) _GLIBCXX_BEGIN_NAMESPACE_VERSION /// char_traits<__gnu_cxx::character> specialization. - template<typename V, typename I, typename S> - struct char_traits<__gnu_cxx::character<V, I, S> > + template<typename _Value, typename _Int, typename _St> + struct char_traits<__gnu_cxx::character<_Value, _Int, _St> > { - typedef __gnu_cxx::character<V, I, S> char_type; - typedef typename char_type::int_type int_type; - typedef typename char_type::state_type state_type; - typedef fpos<state_type> pos_type; - typedef streamoff off_type; + typedef __gnu_cxx::character<_Value, _Int, _St> char_type; + typedef typename char_type::int_type int_type; + typedef typename char_type::state_type state_type; + typedef fpos<state_type> pos_type; + typedef streamoff off_type; static void assign(char_type& __c1, const char_type& __c2) |