From 4399c57ed52ef023537ef6e3ac5ca9f3cef6fd1b Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Thu, 13 Jun 2002 12:35:36 +0000 Subject: [PATCH] Nuke stl_string_fwd.h git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4392 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 4 ++++ config/ChangeLog | 4 ++++ config/lyxinclude.m4 | 22 ---------------------- configure.in | 4 ---- src/ChangeLog | 4 ++++ src/stl_string_fwd.h | 35 ----------------------------------- 6 files changed, 12 insertions(+), 61 deletions(-) delete mode 100644 src/stl_string_fwd.h diff --git a/ChangeLog b/ChangeLog index 1d760af512..b7eac7d21e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2002-06-12 Angus Leeming + + * configure.in: remove LYX_STL_STRING_FWD. + 2002-06-11 John Levon * INSTALL: diff --git a/config/ChangeLog b/config/ChangeLog index 4796de5e58..13b24142b3 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,7 @@ +2002-06-12 Angus Leeming + + * lyxinclude.m4 (LYX_STL_STRING_FWD): removed. + 2002-06-12 Jean-Marc Lasgouttes * xforms.m4 (LYX_USE_XFORMS_IMAGE_LOADER): fix and simplify the diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index cca5b39de7..33354afc8d 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -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 -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 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 diff --git a/configure.in b/configure.in index 71ef9e5ba8..b346dc7501 100644 --- a/configure.in +++ b/configure.in @@ -244,10 +244,6 @@ AC_HEADER_DIRENT AC_HEADER_MAJOR AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h locale.h) -# some annoying header files -#LYX_PATH_HEADER(stl_string_fwd.h) -LYX_STL_STRING_FWD - # some standard structures AC_HEADER_STAT AC_HEADER_TIME diff --git a/src/ChangeLog b/src/ChangeLog index 5ab5d9d756..b655813d35 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2002-06-12 Angus Leeming + + * stl_string_fwd.h: unused and non-compliant anyway. Nuked. + 2002-06-13 Angus Leeming * LaTeX.C: diff --git a/src/stl_string_fwd.h b/src/stl_string_fwd.h deleted file mode 100644 index 3606c8268a..0000000000 --- a/src/stl_string_fwd.h +++ /dev/null @@ -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 -- 2.39.5