namespace std {
// Implementation of numpunct<lyx::char_type> defined in numpunct_lyx_char_type.h
typedef basic_string<lyx::char_type> string_type;
-
+
string_type numpunct<lyx::char_type>::truename() const
-{
- return lyx::from_ascii(numpunct<char>::truename());
+{
+ return lyx::from_ascii(numpunct<char>::truename());
}
-
+
string_type numpunct<lyx::char_type>::falsename() const
-{
- return lyx::from_ascii(numpunct<char>::falsename());
+{
+ return lyx::from_ascii(numpunct<char>::falsename());
}
} // namespace std
// As a workaround, we append a nul char in order to force
// a switch to ASCII, and then remove it from output after
// the conversion.
- intern_type * from_new = 0;
+ intern_type * from_new = nullptr;
intern_type const * from_old = from;
size_t extra = 0;
if (*(from_end - 1) >= 0x80 && encoding_ == "ISO-2022-JP") {
fprintf(stderr, "\nStopped at: 0x%04x\n", c);
fputs("Unconverted input:", stderr);
for (intern_type const * i = from_next + 1; i < from_end; ++i) {
- unsigned int const c = *i;
- fprintf(stderr, " 0x%04x", c);
+ unsigned int const cc = *i;
+ fprintf(stderr, " 0x%04x", cc);
}
fputs("\nConverted output:", stderr);
for (extern_type const * i = to; i < to_next; ++i) {
// extern_type may be signed, avoid output of
// something like 0xffffffc2
- unsigned int const c =
+ unsigned int const cc =
*reinterpret_cast<unsigned char const *>(i);
- fprintf(stderr, " 0x%02x", c);
+ fprintf(stderr, " 0x%02x", cc);
}
fputc('\n', stderr);
fflush(stderr);
fprintf(stderr, "\nStopped at: 0x%02x\n", c);
fputs("Unconverted input:", stderr);
for (extern_type const * i = from_next + 1; i < from_end; ++i) {
- unsigned int const c =
+ unsigned int const cc =
*reinterpret_cast<unsigned char const *>(i);
- fprintf(stderr, " 0x%02x", c);
+ fprintf(stderr, " 0x%02x", cc);
}
fputs("\nConverted output:", stderr);
for (intern_type const * i = to; i < to_next; ++i) {
- unsigned int const c = *i;
- fprintf(stderr, " 0x%02x", c);
+ unsigned int const cc = *i;
+ fprintf(stderr, " 0x%02x", cc);
}
fputc('\n', stderr);
fflush(stderr);
inbytesleft, to, outbytesleft);
if (converted == (size_t)(-1)) {
switch(errno) {
- case 0:
+ case 0:
// As strange as it may seem, this
// does happen on windows when parsing
// comments with accented chars in
string encoding_;
};
-} // namespace anon
+} // namespace
namespace lyx {
template<class Ios>
void setEncoding(Ios & ios, string const & encoding, ios_base::openmode mode)
{
- // We must imbue the stream before openening the file
+ // We must imbue the stream before opening the file
locale global;
locale locale(global, new iconv_codecvt_facet(encoding, mode));
ios.imbue(locale);
}
#endif
-}
+} // namespace lyx
#if ! defined(USE_WCHAR_T) && defined(__GNUC__)
// We get undefined references to these virtual methods. This looks like
// a bug in gcc. The implementation here does not do anything useful, since
-// it is overriden in iconv_codecvt_facet.
+// it is overridden in iconv_codecvt_facet.
namespace std {
template<> codecvt<lyx::char_type, char, mbstate_t>::result