Fix build with GNU libstdc++ C++11 ABI

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

diff --git a/src/support/docstring.h b/src/support/docstring.h
index e84ba6f2d0c84a5e4443e249efd8375b67d6f248..096bc00322fdd27d66f0c82775b563c8ea770b88 100644 (file)
--- a/src/support/docstring.h
+++ b/src/support/docstring.h
@@ -19,9 +19,6 @@
 
 namespace lyx {
 
-/// String type for storing the main text in UCS4 encoding
-typedef std::basic_string<char_type> docstring;
-
 /// Creates a docstring from a C string of ASCII characters
 docstring const from_ascii(char const *);
 
@@ -53,6 +50,14 @@ docstring const from_filesystem8bit(std::string const & s);
 /// convert \p s from ucs4 to the encoding of the file system.
 std::string const to_filesystem8bit(docstring const & s);
 
+/// convert \p s from ucs4 to the \p encoding.
+std::string const to_iconv_encoding(docstring const & s,
+                                   std::string const & encoding);
+
+/// convert \p s from \p encoding to ucs4.
+docstring const from_iconv_encoding(std::string const & s,
+                                   std::string const & encoding);
+
 /// normalize \p s to precomposed form c
 docstring const normalize_c(docstring const & s);