A few more tweaks which help on alpha stations.

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

diff --git a/ChangeLog b/ChangeLog
index f9d8153506e497368b946d678acbe0e9d29ff1f4..fcd777e2560808f33dcb670f2361a818781b0dc5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 1999-11-10  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
+       * src/support/LRegex.C: use regex_t instead of re_pattern_buffer.
+
+       * src/support/lyxstring.C (helper): fix bogus cast in assertion.
+
        * src/{mathed,insets}/Makefile.am (CXXLINK): add $(LDFLAGS) to the
        link line, so that Irix users (for example) can set it explicitely to
        "-n32".

diff --git a/src/support/LRegex.C b/src/support/LRegex.C
index 0db78a0a8e8ae86c4ecbdf812bfe6331fefb52b8..66225e91d1615f4cd59152e719031d544e97de1a 100644 (file)
--- a/src/support/LRegex.C
+++ b/src/support/LRegex.C
@@ -13,7 +13,7 @@ using std::make_pair;
 ///
 struct LRegex::Impl {
        ///
-       re_pattern_buffer * preg;
+       regex_t * preg;
        
        ///
        int error_code;
@@ -23,7 +23,7 @@ struct LRegex::Impl {
        
        ///
        Impl(string const & regex) 
-               : preg(new re_pattern_buffer), error_code(0)
+               : preg(new regex_t), error_code(0)
        {
                error_code = regcomp(preg, regex.c_str(), REG_EXTENDED);
        }

diff --git a/src/support/lyxstring.C b/src/support/lyxstring.C
index 10db7b232dca0f78a7dc4a826fe38a02a1a1f88e..21f77ae29d23b1111eedd6cd5b3ce0f0ed5a9a25 100644 (file)
--- a/src/support/lyxstring.C
+++ b/src/support/lyxstring.C
@@ -349,7 +349,7 @@ void lyxstringInvariant::helper() const
        Assert(object->rep->res);  // always some space allocated
        Assert(object->rep->sz <= object->rep->res);
        Assert(object->rep->ref >= 1);  // its in use so it must be referenced
-       Assert(object->rep->ref < static_cast<size_t>(1 << (8 * sizeof(object->rep->ref) - 1)));
+       Assert(object->rep->ref < static_cast<size_t>(1) << (8 * sizeof(object->rep->ref) - 1));
        // if it does ever == then we should be generating a new copy
        // and starting again.  (Is char always 8-bits?)
 }