From 7f3b99126a14b04f6968040e7e87c8ac2135b684 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Tue, 4 Jan 2000 14:11:01 +0000 Subject: [PATCH] Some unimportant things (what an informative log message!) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@399 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 6 ++++++ configure.in | 5 +++-- src/lyx_gui_misc.C | 2 ++ src/lyx_gui_misc.h | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5cfb172a30..9c019076d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2000-01-04 Jean-Marc Lasgouttes + + * src/lyx_gui_misc.C: add a 'using std::make_pair;' statement. + + * src/lyx_gui_misc.h: add a 'using std::pair;' statement. + 1999-12-30 Allan Rae * lib/templates/IEEEtran.lyx: minor change diff --git a/configure.in b/configure.in index 900929a5df..1a73c4124a 100644 --- a/configure.in +++ b/configure.in @@ -59,8 +59,7 @@ AC_DISABLE_SHARED AC_LIBTOOL_WIN32_DLL AM_PROG_LIBTOOL -### check the size of pointers and ints -# the defaults are given for cross compilation. +### Some checks on what the C++ compiler can(not) do LYX_CXX_MUTABLE LYX_CXX_PARTIAL LYX_CXX_EXPLICIT @@ -75,6 +74,8 @@ dnl we disable rtti for now dnl LYX_CXX_RTTI AC_CHECK_HEADERS(ostream istream) LYX_CXX_STL_MODERN_STREAMS + +### We need a regex implementation, so we provide our own if none is found. LYX_REGEX ### Library Files diff --git a/src/lyx_gui_misc.C b/src/lyx_gui_misc.C index 1bd09b6672..701dbce478 100644 --- a/src/lyx_gui_misc.C +++ b/src/lyx_gui_misc.C @@ -32,6 +32,8 @@ #include "insets/insetindex.h" #include "LyXView.h" +using std::make_pair; + extern BufferView * current_view; extern FD_form_paragraph * fd_form_paragraph; diff --git a/src/lyx_gui_misc.h b/src/lyx_gui_misc.h index e9f44c9077..fb50a6520d 100644 --- a/src/lyx_gui_misc.h +++ b/src/lyx_gui_misc.h @@ -17,6 +17,7 @@ #include FORMS_H_LOCATION #include "LString.h" #include /* needed for pair<> definition */ +using std::pair; /// Prevents LyX from being killed when the close box is pressed in a popup. extern "C" int CancelCloseBoxCB(FL_FORM *, void *); -- 2.39.5