From: Lars Gullik Bjønnes <larsbj@gullik.org>
Date: Wed, 17 Nov 2004 00:54:18 +0000 (+0000)
Subject: fix one ambiguity, and comment out a un-implemented operator
X-Git-Tag: 1.6.10~14821
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=33e3c61a31aceb8774d19741a50895d09433f8b3;p=features.git

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 7bd4461da0..91d217dadf 100644
--- 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 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<value_type>(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++();
 	///