start native C++ support for Octave, Maple and MathML

[lyx.git] / src / LString.h

diff --git a/src/LString.h b/src/LString.h
index f98bc7d9b5c9f85d9bf386fab2bcd76ce45a9bc1..cc9df47947332242c7603f6af14be18f4fb9598e 100644 (file)
--- a/src/LString.h
+++ b/src/LString.h
@@ -5,27 +5,28 @@
  *           LyX, The Document Processor
  *      
  *         Copyright 1995 Matthias Ettrich
- *          Copyright 1995-1999 The LyX Team.
+ *          Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
 #ifndef LSTRING_H
 #define LSTRING_H 
 
+#ifndef _CONFIG_H
+#error The <config.h> header should always be included before LString.h
+#endif
+
 #ifndef USE_INCLUDED_STRING
 #include <string>
 using std::string;
 #else
+#ifdef __STRING__
+#error The <string> header has been included before LString.h
+#else
+#define __STRING__
+#endif
 #include "support/lyxstring.h"
+// using lyx::string;
 typedef lyxstring string;
-#if defined(USING_EXCEPTIONS) && defined(HAVE_STL_STRING_FWD_H)
-// Hide the forward declaration of string by SGI's STL > 3.13. But only when
-// exceptions are in use.
-// Due to a clash with SGI's forward declaration of string we have to provide
-// __get_c_string() ourselves since SGI expects it to exist and block
-// their string declarations as best we can.  ARRae.
-# define __SGI_STL_STRING_FWD_H
-static char const * __get_c_string(string const &);
-#endif // HAVE_STL_STRING_FWD_H
 #endif
 #endif