hopefully fix tex2lyx linking.

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

diff --git a/src/support/docstring.h b/src/support/docstring.h
index a17d4832d6ef64a85053fb6697894210f1e7481f..629d77e21f9cba8a72d60b9dbbe83b22ebd3622c 100644 (file)
--- a/src/support/docstring.h
+++ b/src/support/docstring.h
@@ -13,13 +13,14 @@
 #ifndef LYX_DOCSTRING_H
 #define LYX_DOCSTRING_H
 
-#include <boost/cstdint.hpp>
+#include "support/types.h"
+
 #include <string>
 
 namespace lyx {
 
 /// String type for storing the main text in UCS4 encoding
-typedef std::basic_string<boost::uint32_t> docstring;
+typedef std::basic_string<char_type> docstring;
 
 /// Creates a docstring from a C string of ASCII characters
 docstring const from_ascii(char const *);
@@ -27,14 +28,15 @@ docstring const from_ascii(char const *);
 /// Creates a docstring from a std::string of ASCII characters
 docstring const from_ascii(std::string const &);
 
+/// Creates a std::string of ASCII characters from a docstring
+std::string const to_ascii(docstring const &);
+
 /// Creates a docstring from a UTF8 string. This should go eventually.
 docstring const from_utf8(std::string const &);
 
 /// Creates a UTF8 string from a docstring. This should go eventually.
 std::string const to_utf8(docstring const &);
 
-}
-
 /// Compare a docstring with a C string of ASCII characters
 bool operator==(lyx::docstring const &, char const *);
 
@@ -59,10 +61,18 @@ lyx::docstring operator+(lyx::docstring const & l, char r);
 /// Concatenate a single ASCII character and a docstring
 lyx::docstring operator+(char l, lyx::docstring const & r);
 
+/// Append a C string of ASCII characters to a docstring
+lyx::docstring & operator+=(lyx::docstring &, char const *);
+
+/// Append a single ASCII character to a docstring
+lyx::docstring & operator+=(lyx::docstring & l, char r);
+
+} // namespace lyx
+
 
-#if defined(__GNUC__) && defined(__GNUC_MINOR__) && __GNUC__ == 3 && __GNUC_MINOR__ < 4
+#if SIZEOF_WCHAR_T != 4 && defined(__GNUC__) && defined(__GNUC_MINOR__) && __GNUC__ == 3 && __GNUC_MINOR__ < 4
 // Missing char_traits methods in gcc 3.3 and older. Taken from gcc 4.2svn.
-namespace std {
+namespace std {$
 
 template<typename T> void
 char_traits<T>::assign(char_type & c1, char_type const & c2)