From 9c798989d9793df1f2f73a53489bf902d3323eb7 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Fri, 10 Nov 2000 12:33:01 +0000 Subject: [PATCH] Patch from Yves to check whether C functions are defined in std:: namespace git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1209 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 14 ++++++++++++++ config/lyxinclude.m4 | 16 ++++++++++++++++ configure.in | 1 + lib/CREDITS | 3 +++ src/support/lstrings.C | 4 +--- 5 files changed, 35 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 18c071e2dd..2e3dde6966 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2000-11-10 Jean-Marc Lasgouttes + + * lib/CREDITS: add Yves Bastide + +2000-11-03 Yves Bastide + + * config/lyxinclude.m4 (LYX_CXX_GLOBAL_CSTD): new function to + check whether C library functions are in the global namespace. + + * configure.in: calls it. + + * src/support/lstrings.C: #ifndef CXX_GLOBAL_CSTD instead of + #ifndef __GLIBCPP__. + 2000-11-08 Dekel Tsur * src/frontends/xforms/FormParagraph.C (updateLanguage): Check diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index e5522afec8..5e20211554 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -519,6 +519,22 @@ if test $lyx_cv_cxx_cheaders = no ; then LYX_ADD_INC_DIR(lyx_cppflags,\$(top_srcdir)/src/cheaders) fi]) +dnl Usage: LYX_CXX_GLOBAL_CSTD: checks whether C library functions +dnl are already in the global namespace +AC_DEFUN(LYX_CXX_GLOBAL_CSTD,[ + AC_CACHE_CHECK(whether C library functions are already in the global namespace, + lyx_cv_cxx_global_cstd, + [AC_TRY_COMPILE([ + #include + using std::tolower; + ],[ + return 0; + ],[lyx_cv_cxx_global_cstd=no],[lyx_cv_cxx_global_cstd=yes])]) + if test x$lyx_cv_cxx_global_cstd = xyes; then + AC_DEFINE(CXX_GLOBAL_CSTD,1, + [Define if your C++ compiler puts C library functions in the global namespace]) + fi +]) dnl Usage LYX_PATH_XPM: Checks for xpm library and header AC_DEFUN(LYX_PATH_XPM,[ diff --git a/configure.in b/configure.in index 10410de357..5aeaf8a50c 100644 --- a/configure.in +++ b/configure.in @@ -91,6 +91,7 @@ LYX_CXX_STL_STRING LYX_CXX_GOOD_STD_STRING LYX_CXX_NAMESPACES LYX_CXX_CHEADERS +LYX_CXX_GLOBAL_CSTD LYX_STD_COUNT dnl we disable rtti for now dnl LYX_CXX_RTTI diff --git a/lib/CREDITS b/lib/CREDITS index 12061c5078..777e224b81 100644 --- a/lib/CREDITS +++ b/lib/CREDITS @@ -15,6 +15,9 @@ external style definition files, linuxdoc sgml support and more ftp-site ftp.lyx.org +@bYves Bastide +@iE-mail: stid@acm.org + Bug fixes @bHeinrich Bauer @iE-mail: heinrich.bauer@t-mobil.de Fixes for dvi output diff --git a/src/support/lstrings.C b/src/support/lstrings.C index 547d0790aa..5592d825b3 100644 --- a/src/support/lstrings.C +++ b/src/support/lstrings.C @@ -26,9 +26,7 @@ using std::count; using std::transform; -#ifndef __GLIBCPP__ -// The new glibstdc++-v3 has not worked out all the quirks regarding cctype -// yet. So currently it failes if the to using lines below are stated. +#ifndef CXX_GLOBAL_CSTD using std::tolower; using std::toupper; #endif -- 2.39.5