From 33e3c61a31aceb8774d19741a50895d09433f8b3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Wed, 17 Nov 2004 00:54:18 +0000 Subject: [PATCH] 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 --- src/ChangeLog | 8 ++++++++ src/paragraph.h | 2 +- src/pariterator.h | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 7bd4461da0..91d217dadf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2004-11-17 Lars Gullik Bjonnes + + * 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 * lyxfont.h: include LColor.h to satisfy concept checks. diff --git a/src/paragraph.h b/src/paragraph.h index 1508779b47..82d0732fe3 100644 --- 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(META_INSET); } /// bool isNewline(lyx::pos_type pos) const; /// diff --git a/src/pariterator.h b/src/pariterator.h index 90e93f1842..2fbb0abb1a 100644 --- 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++(); /// -- 2.39.2