X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fdocstream.cpp;h=f8964cae6022a032b86b92f47ce0f03e1bb3b491;hb=557c2f2bf0b22fb72b3af385571ea7b33ff377fd;hp=6642e09d5f78ee94bd27ba54a8980d4d436cf99f;hpb=75bfed55079cab6b73fbea6ce4ae3f10d1af3b91;p=lyx.git diff --git a/src/support/docstream.cpp b/src/support/docstream.cpp index 6642e09d5f..f8964cae60 100644 --- a/src/support/docstream.cpp +++ b/src/support/docstream.cpp @@ -168,16 +168,16 @@ protected: 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(i); - fprintf(stderr, " 0x%02x", c); + fprintf(stderr, " 0x%02x", cc); } fputc('\n', stderr); fflush(stderr); @@ -222,14 +222,14 @@ protected: 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(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); @@ -307,7 +307,7 @@ private: string encoding_; }; -} // namespace anon +} // namespace namespace lyx { @@ -447,7 +447,7 @@ odocstream & operator<<(odocstream & os, char c) } #endif -} +} // namespace lyx #if ! defined(USE_WCHAR_T) && defined(__GNUC__)