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 7fe5477698f5476a40dacd64fa4b233c570de780..060df91447072510ffd5ce63440b66b3dba43569 100644 (file)
--- 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 00d4ca123ea56849af2dd3185df0ce0b1a22c1cf..25d2b499311e79a211ee7362aa3b00ba06bd3a47 100644 (file)
--- 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 b1a49fb0f5435a99688dc4b8f747a061b896849b..743a38368a633ad3c520e10b45e1b51dd7d6b545 100644 (file)
--- 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 e281bada26221167fb2c73a005c7fa7bf9a9f71f..1a5fc49beeee5d9e06cfe1a6a011076494df3014 100644 (file)
--- 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>