From: Lars Gullik Bjønnes <larsbj@gullik.org>
Date: Mon, 30 Aug 2004 00:39:40 +0000 (+0000)
Subject: fix a couple of pch.h files because of a gcc pch bug
X-Git-Tag: 1.6.10~15032
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=c2df57815111ac59e64e0dc6980a6906456232ae;p=features.git

fix a couple of pch.h files because of a gcc pch bug


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

diff --git a/src/ChangeLog b/src/ChangeLog
index 7fe5477698..060df91447 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-30  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+	* pch.h: do not use include boost/format.hpp, multiple symbols
+		will result (gcc bug)
+
+
 2004-08-23  José Matos  <jamatos@lyx.org>
 
 	* bufferparams.C (readToken): fix reading of the author field.
@@ -57,7 +63,7 @@
 
 	* lyxlex.C (getString): fix comment, buffer::readBody is now
 	buffer:readDocument.
-	
+
 	* tex-strings.C (string_papersize): Default -> default,
 	Custom -> custom, for consistency with other options.
 
diff --git a/src/pch.h b/src/pch.h
index 00d4ca123e..25d2b49931 100644
--- a/src/pch.h
+++ b/src/pch.h
@@ -6,7 +6,7 @@
 #include <boost/crc.hpp>
 #include <boost/cregex.hpp>
 #include <boost/current_function.hpp>
-#include <boost/format.hpp>
+// #include <boost/format.hpp> // mult def symbols problem (_1, _2 etc)
 #include <boost/function/function0.hpp>
 #include <boost/function.hpp>
 #include <boost/iterator/indirect_iterator.hpp>
diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index b1a49fb0f5..743a38368a 100644
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-30  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+	* pch.h: do not use include boost/format.hpp, multiple symbols
+	will result (gcc bug)
+
 2004-08-15  Lars Gullik Bjonnes  <larsbj@gullik.net>
 
 	* pch.h: new file
diff --git a/src/support/pch.h b/src/support/pch.h
index e281bada26..1a5fc49bee 100644
--- a/src/support/pch.h
+++ b/src/support/pch.h
@@ -1,10 +1,10 @@
+// -*- C++ -*-
 #include <config.h>
 
 #include <boost/assert.hpp>
 #include <boost/crc.hpp>
-#include <boost/format.hpp>
+// #include <boost/format.hpp> // mult def symbols problem (_1,_2 etc)
 #include <boost/function/function0.hpp>
-#include <boost/iterator/indirect_iterator.hpp>
 #include <boost/regex.hpp>
 #include <boost/scoped_array.hpp>
 #include <boost/scoped_ptr.hpp>