On Wednesday 12 June 2002 2:51 pm, John Levon wrote:
> On Wed, Jun 12, 2002 at 03:49:49PM +0200, Jean-Marc Lasgouttes wrote:
> > Angus> We don't use it and it's not standards compliant anyway. Can I
> > Angus> nuke it? Angus
> >
> > Yes, I think you should
>
> Last time I tried this I was told it's need for the STLPort or some
> such. Is this no longer supported/true ?
We don't #include it anywhere, so I can't see how it's a problem.
Anyway, here's the patch. If I don't here any complaints, I'll apply it.
Angus
Index: config/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/ChangeLog,v
retrieving revision 1.47
diff -u -p -r1.47 ChangeLog
--- config/ChangeLog 11 Jun 2002 23:33:26 -0000 1.47
+++ config/ChangeLog 12 Jun 2002 14:09:58 -0000
@@ -1,3 +1,7 @@
+2002-06-12 Angus Leeming <[EMAIL PROTECTED]>
+
+ * lyxinclude.m4 (LYX_STL_STRING_FWD): removed.
+
2002-06-12 John Levon <[EMAIL PROTECTED]>
* qt2.m4: Qt frontend is for Qt 2 OR Qt 3
Index: config/lyxinclude.m4
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/lyxinclude.m4,v
retrieving revision 1.65
diff -u -p -r1.65 lyxinclude.m4
--- config/lyxinclude.m4 10 Jun 2002 21:00:31 -0000 1.65
+++ config/lyxinclude.m4 12 Jun 2002 14:09:58 -0000
@@ -705,28 +705,6 @@ rm -f conftest*])
])
### end of LYX_PATH_HEADER
-### Check for stl_string_fwd.h existence and location if it exists
-AC_DEFUN(LYX_STL_STRING_FWD,
-[ AC_CHECK_HEADER(stl_string_fwd.h,[
- AC_CACHE_CHECK([path to stl_string_fwd.h],lyx_cv_path_stl_string_fwd_h,
- [ cat > conftest.$ac_ext <<EOF
-#line __oline__ "configure"
-#include "confdefs.h"
-
-#include <stl_string_fwd.h>
-EOF
-lyx_cv_path_stl_string_fwd_h=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \
- grep 'stl_string_fwd.h' 2>/dev/null | \
- sed -e 's/.*\(".*stl_string_fwd.h"\).*/\1/' -e "1q"`
-rm -f conftest*])
- AC_DEFINE_UNQUOTED(STL_STRING_FWD_H_LOCATION,$lyx_cv_path_stl_string_fwd_h,
-[define this to the location of stl_string_fwd.h to be used with #include,
- NOTE: Do not set it to <stl_string_fwd.h> as that will find the LyX
- supplied version of the header.
- e.g. <../include/stl_string_fwd.h> or better yet use an absolute path])])
-])
-
-
dnl AC_VALIDATE_CACHE_SYSTEM_TYPE[(cmd)]
dnl if the cache file is inconsistent with the current host,
dnl target and build system types, execute CMD or print a default
Index: src/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ChangeLog,v
retrieving revision 1.759
diff -u -p -r1.759 ChangeLog
--- src/ChangeLog 12 Jun 2002 11:34:11 -0000 1.759
+++ src/ChangeLog 12 Jun 2002 14:10:03 -0000
@@ -1,3 +1,7 @@
+2002-06-12 Angus Leeming <[EMAIL PROTECTED]>
+
+ * stl_string_fwd.h: unused and non-compliant anyway. Nuked.
+
2002-06-12 John Levon <[EMAIL PROTECTED]>
* lyxfunc.C:
Index: src/stl_string_fwd.h
===================================================================
RCS file: src/stl_string_fwd.h
diff -N src/stl_string_fwd.h
--- src/stl_string_fwd.h 21 Mar 2002 17:25:20 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,35 +0,0 @@
-// -*- C++ -*-
-/* This file is part of
- * ======================================================
- *
- * LyX, The Document Processor
- *
- * Copyright 1995 Matthias Ettrich
- * 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 ...
- */
-
-#ifndef USE_INCLUDED_STRING
-// include the real stl_string_fwd.h
-# 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 // LYX_STL_STRING_FWD_H
