From 72224034c31f9ebe9e6992cebbe44f7dd5acdcea Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Fri, 1 Jun 2001 12:47:25 +0000 Subject: [PATCH] hack to let boost know if limit exists or not git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2082 a592a061-630c-0410-9148-cb99ea01b6c8 --- boost/ChangeLog | 2 ++ boost/boost/config.hpp | 5 +++++ configure.in | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/boost/ChangeLog b/boost/ChangeLog index 0eb7c8cb27..3fce77cc9c 100644 --- a/boost/ChangeLog +++ b/boost/ChangeLog @@ -4,6 +4,8 @@ * boost/static_assert.hpp: update * boost/smart_ptr.hpp: update * boost/config.hpp: update + (BOOST_NO_LIMITS): add a hack so that we can continue to use + lyxstring. * boost/detail/limits.hpp: new file * boost/limits.hpp: new file diff --git a/boost/boost/config.hpp b/boost/boost/config.hpp index b05746e137..4b975aa268 100644 --- a/boost/boost/config.hpp +++ b/boost/boost/config.hpp @@ -265,6 +265,11 @@ # define BOOST_NO_SLIST # define BOOST_NO_HASH # endif +// LYX: begin +# ifndef HAVE_LIMITS +# define BOOST_NO_LIMITS +# endif +// LYX: end # endif // Intel on Linux --------------------------------------------------------- diff --git a/configure.in b/configure.in index 58601e916e..962f64d67a 100644 --- a/configure.in +++ b/configure.in @@ -93,7 +93,7 @@ LYX_CXX_GLOBAL_CSTD LYX_STD_COUNT dnl we disable rtti for now dnl LYX_CXX_RTTI -AC_CHECK_HEADERS(ostream istream sstream locale) +AC_CHECK_HEADERS(ostream istream sstream locale limits) LYX_CXX_STL_MODERN_STREAMS ### We need a regex implementation, so we provide our own if none is found. -- 2.39.2