change the std::string check

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@713 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 1644c8770facf1bc3b57591fd9c5e7189c2795a0..703d48b014110eaf393f98b8db1b79d6fbdb09fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-05-04  Lars Gullik Bjønnes  <larsbj@lyx.org>
+
+       * config/lyxinclude.m4 (LYX_CXX_STL_STRING): change the test not
+       to use clear, since we don't depend on this in the code. Add test
+       for string::compare
+
 2000-05-04  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
        * (various *.C files): add using std::foo directives to please dec

diff --git a/acinclude.m4 b/acinclude.m4
index 8035768cc987622cfd18d4a7eebf50fb2de77238..ad3c06fe087bcbc6b66ce536e148a44c16e47824 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -345,8 +345,10 @@ AC_DEFUN(LYX_CXX_STL_STRING,[
            using std::string;
        ],[
            string a("hello there");
-           a.clear();
+           a.erase();
            a = "hey";
+           char s[] = "y";
+           int t = a.compare(a.length() - 1, 1, s);
            a.erase();
        ],[
            with_included_string=no

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 59046710a118e9faab2898659d511f3843dd9bad..cbd9564ce77f4fc05b5a336e163c3c3bcd83eb29 100644 (file)
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -345,8 +345,10 @@ AC_DEFUN(LYX_CXX_STL_STRING,[
            using std::string;
        ],[
            string a("hello there");
-           a.clear();
+           a.erase();
            a = "hey";
+           char s[] = "y";
+           int t = a.compare(a.length() - 1, 1, s);
            a.erase();
        ],[
            with_included_string=no