hopefully fix tex2lyx linking.

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

diff --git a/src/support/docstring.h b/src/support/docstring.h
index 1cff5109a0d22bb4bf5c1c71c7ca284f394b5a0c..629d77e21f9cba8a72d60b9dbbe83b22ebd3622c 100644 (file)
--- a/src/support/docstring.h
+++ b/src/support/docstring.h
@@ -37,8 +37,6 @@ 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 *);
 
@@ -64,15 +62,17 @@ lyx::docstring operator+(lyx::docstring const & l, char r);
 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 *);
+lyx::docstring & operator+=(lyx::docstring &, char const *);
 
 /// Append a single ASCII character to a docstring
-lyx::docstring operator+=(lyx::docstring & l, char r);
+lyx::docstring & operator+=(lyx::docstring & l, char r);
+
+} // namespace lyx
 
 
 #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)