X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fdocstring.cpp;h=496d4c0242202014e0d85f7d98cd6a5f47b1d2f0;hb=759769131a4e5bd021ddb5e8fc5995a2af537e05;hp=727e1f594c4e9fab34b8f0b79d7b66d4bdb8e125;hpb=d7e2705228d0580a16046a3f3c19f453a035b99d;p=lyx.git

diff --git a/src/support/docstring.cpp b/src/support/docstring.cpp
index 727e1f594c..496d4c0242 100644
--- 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
@@ -828,6 +820,6 @@ namespace {
 /// make sure that our facets get used
 static locale_initializer initializer;
 
-}
-}
+} // namespace
+} // namespace lyx
 #endif