X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLString.h;h=1e135594b319e992bc4e2ab19cd3ba86af47d77e;hb=b99a5acc7f18c3f885856fa962c0f0a63a0ca5ad;hp=bdb5512c0165697dab580c4e564c7cfcf4dce8d5;hpb=457e414febf318290c0fa017a63ed4fc4926672b;p=lyx.git

diff --git a/src/LString.h b/src/LString.h
index bdb5512c01..1e135594b3 100644
--- a/src/LString.h
+++ b/src/LString.h
@@ -1,31 +1,39 @@
 // -*- C++ -*-
 /* This file is part of
  * ======================================================
- * 
+ *
  *           LyX, The Document Processor
- * 	 
- *	    Copyright (C) 1995 Matthias Ettrich
- *          Copyright (C) 1995-1999 The LyX Team.
+ *
+ *	    Copyright 1995 Matthias Ettrich
+ *          Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
 #ifndef LSTRING_H
-#define LSTRING_H 
+#define LSTRING_H
+
+#if 0
+#ifndef _CONFIG_H
+#error The <config.h> header should always be included before LString.h
+#endif
+#endif
 
 #ifndef USE_INCLUDED_STRING
+
 #include <string>
 using std::string;
+#define STRCONV(STR) STR
+#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 const char* __get_c_string(const string&);
-#endif // HAVE_STL_STRING_FWD_H
+#define STRCONV(STR) STR.c_str()
 #endif
+
 #endif