From 365b73748f2653f85557357042fa32ddab9474aa Mon Sep 17 00:00:00 2001
From: Angus Leeming <leeming@lyx.org>
Date: Mon, 25 Nov 2002 19:44:44 +0000
Subject: [PATCH] boost::format compilation fixes.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5717 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/BoostFormat.h | 5 ++++-
 src/ChangeLog     | 6 ++++++
 src/lyx_main.C    | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/BoostFormat.h b/src/BoostFormat.h
index 7da2a5968f..e96cb1d246 100644
--- a/src/BoostFormat.h
+++ b/src/BoostFormat.h
@@ -8,7 +8,8 @@
 
 #include <boost/format.hpp>
 
-// Add explicit instantion
+// Add explicit instantion for g++ compilers
+#ifdef __GNUG__
 
 namespace boost
 {
@@ -53,6 +54,8 @@ feed<char, std::char_traits<char>,
 
 } // namespace boost
 
+#endif // __GNUG__
+
 #endif // USE_BOOST_FORMAT
 
 #endif // LYX_BOOST_FORMAT_H
diff --git a/src/ChangeLog b/src/ChangeLog
index 00fe0ab2ed..e0153ef6bd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-25  Angus Leeming  <leeming@lyx.org>
+
+	* BoostFormat.h: wrap code inside #ifdef __GNUG__ block.
+
+	* lyx_main.C (init): compile fix.
+
 2002-11-25  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
 	* lyx_cb.C (start): boost.formatify
diff --git a/src/lyx_main.C b/src/lyx_main.C
index 94561f85cb..64ca76e3c9 100644
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -364,7 +364,7 @@ void LyX::init(bool gui)
 #if USE_BOOST_FORMAT
 			lyxerr << boost::format(_("Using built-in default %1$s"
 						  " but expect problems."))
-				% LYX_DIR
+				% static_cast<char *>(LYX_DIR)
 			       << endl;
 #else
 			lyxerr << _("Using built-in default ") << LYX_DIR
-- 
2.39.5