boost::format compilation fixes.

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

diff --git a/src/BoostFormat.h b/src/BoostFormat.h
index 7da2a5968f609513b3f110e74fbf2f5c3586d1fe..e96cb1d24695a99a3d9906439f8131ec9d890ba6 100644 (file)
--- 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 00fe0ab2ed0ebb1cba88f84cb7b152d7f25375aa..e0153ef6bdbab23d07e6bc8d72bb6b15375c9299 100644 (file)
--- 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 94561f85cb8b3e948d5047e6d1792e5f72368acd..64ca76e3c965e090b2051ddb84bb21c6a5e5eac3 100644 (file)
--- 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