fix one ambiguity, and comment out a un-implemented operator

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 7bd4461da0d1a2c7089b5c621d2b6d9b106d5e78..91d217dadf5749801ec14810834c726cbe070420 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2004-11-17  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+       * pariterator.h (operatir=): comment out un-implemented member
+       function. 
+
+       * paragraph.h: resolv ambiguity found by gcc 4.0 with the use of a
+       static cast.
+
 2004-11-17  Lars Gullik Bjonnes  <larsbj@gullik.net>
 
        * lyxfont.h: include LColor.h to satisfy concept checks.

diff --git a/src/paragraph.h b/src/paragraph.h
index 1508779b4754a5dc5d060af300e1d7bd2bd10e2f..82d0732fe32722e57480b4c5da5b0c6df75dba27 100644 (file)
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -328,7 +328,7 @@ public:
        ///
        bool isHfill(lyx::pos_type pos) const;
        /// hinted by profiler
-       bool isInset(lyx::pos_type pos) const { return getChar(pos) == META_INSET; }
+       bool isInset(lyx::pos_type pos) const { return getChar(pos) == static_cast<value_type>(META_INSET); }
        ///
        bool isNewline(lyx::pos_type pos) const;
        ///

diff --git a/src/pariterator.h b/src/pariterator.h
index 90e93f1842fc31b135dc2f9b678d13093b626f02..2fbb0abb1a68a702e218ab13f8d9f1b32a14bcdc 100644 (file)
--- a/src/pariterator.h
+++ b/src/pariterator.h
@@ -49,8 +49,8 @@ public:
        ///
        ParIterator(DocIterator const &);
 
-       ///
-       void operator=(ParIterator const &);
+       /// This really should be implemented...
+       //void operator=(ParIterator const &);
        ///
        ParIterator & operator++();
        ///