correct format for unsigned long argument, remoteCloseLink is oneway void

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

diff --git a/src/support/strfwd.h b/src/support/strfwd.h
index 324560952fd4bb4cbb5e52b6ffa32f28d8041ad7..069357ff9cbdd5258e3b4b1927c5dbe77926e765 100644 (file)
--- a/src/support/strfwd.h
+++ b/src/support/strfwd.h
@@ -31,14 +31,15 @@ namespace lyx { typedef boost::uint32_t char_type; }
 
 namespace std {
 
+template<typename Alloc> class allocator;
+
 template<typename Char> struct char_traits;
 template<> struct char_traits<char>;
-template<> struct char_traits<lyx::char_type>;
-
-template<typename Alloc> class allocator;
+#ifdef USE_WCHAR_T
+template<> struct char_traits<wchar_t>;
+#endif
 
 template<typename Char, typename Traits, typename Alloc> class basic_string;
-
 typedef basic_string<char, char_traits<char>, allocator<char> > string;
 
 template<class Char, class Traits> class basic_istream;
@@ -47,22 +48,30 @@ template<class Char, class Traits> class basic_ostream;
 typedef basic_istream<char, char_traits<char> > istream;
 typedef basic_ostream<char, char_traits<char> > ostream;
 
-}
+} // namepace std
 
 
 namespace lyx {
 
+/// String type for storing the main text in UCS4 encoding
 typedef std::basic_string<char_type, std::char_traits<char_type>,
        std::allocator<char_type> > docstring;
 
 /// Base class for UCS4 input streams
-typedef std::basic_istream<char_type, std::char_traits<char_type> >
-       idocstream;
+typedef std::basic_istream<char_type, std::char_traits<char_type> > idocstream;
 
 /// Base class for UCS4 output streams
-typedef std::basic_ostream<char_type, std::char_traits<char_type> >
-       odocstream;
+typedef std::basic_ostream<char_type, std::char_traits<char_type> > odocstream;
+
+#if ! defined(USE_WCHAR_T)
+extern odocstream & operator<<(odocstream &, char);
+#endif
 
+// defined in lstrings.cpp
+docstring const & empty_docstring();
+std::string const & empty_string();
+// defined in docstring.cpp
+bool operator==(docstring const &, char const *);
 
 } // namespace lyx