don't copy if a reference is fine

[lyx.git] / src / stl_string_fwd.h

diff --git a/src/stl_string_fwd.h b/src/stl_string_fwd.h
index 5bc011b9beb568cdac5791369364711afa8b342f..c8152258cdfd26ca5bc6d2bb2703faee255656d4 100644 (file)
--- a/src/stl_string_fwd.h
+++ b/src/stl_string_fwd.h
@@ -5,29 +5,31 @@
  *           LyX, The Document Processor
  *      
  *         Copyright 1995 Matthias Ettrich
- *          Copyright 1995-1999 The LyX Team.
+ *          Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
 #ifndef LYX_STL_STRING_FWD_H
 #define LYX_STL_STRING_FWD_H
 
+/*
+ * This file exists to appease STLPort when using included lyxstring.
+ * It won't be around forever ...
+ */ 
 
-#if defined(HAVE_STL_STRING_FWD_H)
-#  ifndef USE_INCLUDED_STRING
+#ifndef USE_INCLUDED_STRING
 //   include the real stl_string_fwd.h
-#    include STL_STRING_FWD_H_LOCATION
-#  else
+#  include STL_STRING_FWD_H_LOCATION
+#else
 // Hide the forward declaration of string by SGI's STL > 3.13.
 // We have to provide the declaration of__get_c_string() ourselves
 // since SGI expects it to exist and we're blocking their string declarations
 // as best we can.
 // Note that a declaration for string is still required so we have to
 // provide one via LString.h.   ARRae.
-#    include "LString.h"
-#    define __SGI_STL_STRING_FWD_H
-     static char const * __get_c_string(string const &);
-#  endif // USE_INCLUDED_STRING
-#endif // HAVE_STL_STRING_FWD_H
+#  include "LString.h"
+#  define __SGI_STL_STRING_FWD_H
+   static char const * __get_c_string(string const &);
+#endif // USE_INCLUDED_STRING
 
 #endif // LYX_STL_STRING_FWD_H