Bootstrap and testsuite on x86_64-unknown-linux-gnu.
The main other issue in that PR will require a UDL specialist.
2013-11-13 Marc Glisse <marc.gli...@inria.fr>
PR libstdc++/59087
* include/ext/pod_char_traits.h: Uglify V, I and S.
--
Marc Glisse
Index: include/ext/pod_char_traits.h
===================================================================
--- include/ext/pod_char_traits.h (revision 204739)
+++ include/ext/pod_char_traits.h (working copy)
@@ -38,27 +38,27 @@
namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
// POD character abstraction.
// NB: The char_type parameter is a subset of int_type, as to allow
// 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;
template<typename V2>
static char_type
from(const V2& v)
{
char_type ret = { static_cast<value_type>(v) };
return ret;
}
@@ -66,46 +66,48 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename V2>
static V2
to(const char_type& c)
{
V2 ret = { static_cast<V2>(c.value) };
return ret;
}
};
- 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
} // namespace
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)
{ __c1 = __c2; }
static bool
eq(const char_type& __c1, const char_type& __c2)
{ return __c1 == __c2; }
static bool