Commit c094e9b9 by Benjamin Kosnik

numeric_members.cc: Correct type info.


2003-07-08  Benjamin Kosnik  <bkoz@redhat.com>

	* config/locale/generic/numeric_members.cc: Correct type info.
	* config/locale/gnu/numeric_members.cc: Same.
	* include/bits/locale_facets.h: Same.

	* include/bits/char_traits.h: Correct spacing.

	* src/locale.cc: Wrap to 80 col.

From-SVN: r69098
parent 51657442
2003-07-08 Benjamin Kosnik <bkoz@redhat.com>
* config/locale/generic/numeric_members.cc: Correct type info.
* config/locale/gnu/numeric_members.cc: Same.
* include/bits/locale_facets.h: Same.
* include/bits/char_traits.h: Correct spacing.
* src/locale.cc: Wrap to 80 col.
2003-07-07 Paolo Carlini <pcarlini@unitus.it> 2003-07-07 Paolo Carlini <pcarlini@unitus.it>
* include/std/std_complex.h: Partially revert last * include/std/std_complex.h: Partially revert last
...@@ -67,7 +77,9 @@ ...@@ -67,7 +77,9 @@
2003-07-05 Gawain Bolton <gp.bolton@computer.org> 2003-07-05 Gawain Bolton <gp.bolton@computer.org>
* include/bits/stl_list.h: Performance and memory usage * include/bits/stl_list.h: Performance and memory usage
improvements. improvements. In particular, the behaviour of the constructor and
destructor as the list header node is no longer dynamically
allocated/de-allocated.
* include/bits/list.tcc: Likewise. * include/bits/list.tcc: Likewise.
2003-07-05 Paolo Carlini <pcarlini@unitus.it> 2003-07-05 Paolo Carlini <pcarlini@unitus.it>
......
...@@ -53,11 +53,11 @@ namespace std ...@@ -53,11 +53,11 @@ namespace std
for (size_t i = 0; i < __num_base::_S_oend; ++i) for (size_t i = 0; i < __num_base::_S_oend; ++i)
_M_data->_M_atoms_out[i] = __num_base::_S_atoms_out[i]; _M_data->_M_atoms_out[i] = __num_base::_S_atoms_out[i];
_M_data->_M_atoms_out[__num_base::_S_oend] = wchar_t(); _M_data->_M_atoms_out[__num_base::_S_oend] = char();
for (size_t i = 0; i < __num_base::_S_iend; ++i) for (size_t i = 0; i < __num_base::_S_iend; ++i)
_M_data->_M_atoms_in[i] = __num_base::_S_atoms_in[i]; _M_data->_M_atoms_in[i] = __num_base::_S_atoms_in[i];
_M_data->_M_atoms_in[__num_base::_S_iend] = wchar_t(); _M_data->_M_atoms_in[__num_base::_S_iend] = char();
_M_data->_M_truename = "true"; _M_data->_M_truename = "true";
_M_data->_M_falsename = "false"; _M_data->_M_falsename = "false";
......
...@@ -56,11 +56,11 @@ namespace std ...@@ -56,11 +56,11 @@ namespace std
for (size_t i = 0; i < __num_base::_S_oend; ++i) for (size_t i = 0; i < __num_base::_S_oend; ++i)
_M_data->_M_atoms_out[i] = __num_base::_S_atoms_out[i]; _M_data->_M_atoms_out[i] = __num_base::_S_atoms_out[i];
_M_data->_M_atoms_out[__num_base::_S_oend] = wchar_t(); _M_data->_M_atoms_out[__num_base::_S_oend] = char();
for (size_t i = 0; i < __num_base::_S_iend; ++i) for (size_t i = 0; i < __num_base::_S_iend; ++i)
_M_data->_M_atoms_in[i] = __num_base::_S_atoms_in[i]; _M_data->_M_atoms_in[i] = __num_base::_S_atoms_in[i];
_M_data->_M_atoms_in[__num_base::_S_iend] = wchar_t(); _M_data->_M_atoms_in[__num_base::_S_iend] = char();
} }
else else
{ {
......
...@@ -152,7 +152,7 @@ namespace std ...@@ -152,7 +152,7 @@ namespace std
static char_type* static char_type*
copy(char_type* __s1, const char_type* __s2, size_t __n) copy(char_type* __s1, const char_type* __s2, size_t __n)
{ return static_cast<char_type*>(memcpy(__s1, __s2, __n)); } { return static_cast<char_type*>(memcpy(__s1, __s2, __n)); }
static char_type* static char_type*
assign(char_type* __s, size_t __n, char_type __a) assign(char_type* __s, size_t __n, char_type __a)
......
...@@ -591,13 +591,13 @@ namespace std ...@@ -591,13 +591,13 @@ namespace std
// "C" locale, this is "-+xX0123456789abcdef0123456789ABCDEF". // "C" locale, this is "-+xX0123456789abcdef0123456789ABCDEF".
// This array contains the chars after having been passed // This array contains the chars after having been passed
// through the current locale's ctype<_CharT>.widen(). // through the current locale's ctype<_CharT>.widen().
_CharT _M_atoms_out[__num_base::_S_oend + 1]; char_type _M_atoms_out[__num_base::_S_oend + 1];
// A list of valid numeric literals for output: in the standard // A list of valid numeric literals for output: in the standard
// "C" locale, this is "0123456789eEabcdfABCDF" // "C" locale, this is "0123456789eEabcdfABCDF"
// This array contains the chars after having been passed // This array contains the chars after having been passed
// through the current locale's ctype<_CharT>.widen(). // through the current locale's ctype<_CharT>.widen().
_CharT _M_atoms_in[__num_base::_S_iend + 1]; char_type _M_atoms_in[__num_base::_S_iend + 1];
bool _M_allocated; bool _M_allocated;
...@@ -621,7 +621,7 @@ namespace std ...@@ -621,7 +621,7 @@ namespace std
string __grouping = __np.grouping(); string __grouping = __np.grouping();
char* __group = new char[__grouping.length() + 1]; char* __group = new char[__grouping.length() + 1];
__grouping.copy(__group, __grouping.length()); __grouping.copy(__group, __grouping.length());
__group[__grouping.length()] = _CharT(); __group[__grouping.length()] = char();
_M_grouping = __group; _M_grouping = __group;
_M_use_grouping = __grouping.length() != 0 && __grouping.data()[0] != 0; _M_use_grouping = __grouping.length() != 0 && __grouping.data()[0] != 0;
......
...@@ -187,7 +187,8 @@ namespace std ...@@ -187,7 +187,8 @@ namespace std
// If LC_ALL is set we are done. // If LC_ALL is set we are done.
if (__env && std::strcmp(__env, "") != 0) if (__env && std::strcmp(__env, "") != 0)
{ {
if (std::strcmp(__env, "C") == 0 || std::strcmp(__env, "POSIX") == 0) if (std::strcmp(__env, "C") == 0
|| std::strcmp(__env, "POSIX") == 0)
(_M_impl = _S_classic)->_M_add_reference(); (_M_impl = _S_classic)->_M_add_reference();
else else
_M_impl = new _Impl(__env, 1); _M_impl = new _Impl(__env, 1);
...@@ -197,7 +198,8 @@ namespace std ...@@ -197,7 +198,8 @@ namespace std
char* __res; char* __res;
// LANG may set a default different from "C". // LANG may set a default different from "C".
char* __env = getenv("LANG"); char* __env = getenv("LANG");
if (!__env || std::strcmp(__env, "") == 0 || std::strcmp(__env, "C") == 0 if (!__env || std::strcmp(__env, "") == 0
|| std::strcmp(__env, "C") == 0
|| std::strcmp(__env, "POSIX") == 0) || std::strcmp(__env, "POSIX") == 0)
__res = strdup("C"); __res = strdup("C");
else else
...@@ -481,7 +483,7 @@ namespace std ...@@ -481,7 +483,7 @@ namespace std
} }
#endif #endif
// Definitions for static const data members of time_base // Definitions for static const data members of time_base.
template<> template<>
const char* const char*
__timepunct<char>::_S_timezones[14] = __timepunct<char>::_S_timezones[14] =
...@@ -500,7 +502,7 @@ namespace std ...@@ -500,7 +502,7 @@ namespace std
}; };
#endif #endif
// Definitions for static const data members of money_base // Definitions for static const data members of money_base.
const money_base::pattern const money_base::pattern
money_base::_S_default_pattern = { {symbol, sign, none, value} }; money_base::_S_default_pattern = { {symbol, sign, none, value} };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment