Fix bug #4269

[lyx.git] / src / support / docstring.cpp

diff --git a/src/support/docstring.cpp b/src/support/docstring.cpp
index 5a4ddccd3605d4175f9426093abda475eefb75a4..496d4c0242202014e0d85f7d98cd6a5f47b1d2f0 100644 (file)
--- a/src/support/docstring.cpp
+++ b/src/support/docstring.cpp
@@ -69,14 +69,6 @@ string const to_ascii(docstring const & ucs4)
 }
 
 
-IconvProcessor & utf8ToUcs4()
-{
-       static IconvProcessor iconv(ucs4_codeset, "UTF-8");
-       return iconv;
-}
-
-
-
 void utf8_to_ucs4(string const & utf8, docstring & ucs4)
 {
        size_t n = utf8.size();
@@ -281,7 +273,7 @@ template<> char
 ctype<lyx::char_type>::do_narrow(const lyx::char_type, char) const { return 0; }
 template<> const lyx::char_type *
 ctype<lyx::char_type>::do_narrow(const lyx::char_type *, const lyx::char_type *, char, char *) const { return 0; }
-}
+} // namespace std
 
 
 namespace lyx {
@@ -522,7 +514,7 @@ protected:
                return do_put_helper(oit, b, fill, v);
        }
 
-#ifdef _GLIBCXX_USE_LONG_LONG
+#ifdef LYX_USE_LONG_LONG
        iter_type
        do_put(iter_type oit, ios_base & b, char_type fill, long long v) const
        {
@@ -683,7 +675,7 @@ protected:
                return do_get_integer(iit, eit, b, err, v);
        }
 
-#ifdef _GLIBCXX_USE_LONG_LONG
+#ifdef LYX_USE_LONG_LONG
        iter_type
        do_get(iter_type iit, iter_type eit, ios_base & b,
                ios_base::iostate & err, long long & v) const
@@ -771,7 +763,6 @@ private:
                // [+-]? [0-9]* .? [0-9]* ([eE] [+-]? [0-9]+)?
                string s;
                s.reserve(64);
-               char c;
                numpunct_facet p;
                char const dot = p.decimal_point();
                char const sep = p.thousands_sep();
@@ -829,6 +820,6 @@ namespace {
 /// make sure that our facets get used
 static locale_initializer initializer;
 
-}
-}
+} // namespace
+} // namespace lyx
 #endif