move BoostFormat and boost-inst

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

diff --git a/src/BoostFormat.h b/src/BoostFormat.h
deleted file mode 100644 (file)
index e96cb1d..0000000
--- a/src/BoostFormat.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// -*- C++ -*-
-#ifndef LYX_BOOST_FORMAT_H
-#define LYX_BOOST_FORMAT_H
-
-// Only include this if it is possible to use
-// Boost.Format at all.
-#if USE_BOOST_FORMAT
-
-#include <boost/format.hpp>
-
-// Add explicit instantion for g++ compilers
-#ifdef __GNUG__
-
-namespace boost
-{
-
-extern
-template basic_format<char>;
-
-extern template
-std::ostream &
-operator<< <char, std::char_traits<char> >(std::ostream &,
-                                          boost::basic_format<char> const &);
-
-namespace io
-{
-
-extern template
-std::string
-str<char, std::char_traits<char> >(boost::basic_format<char> const &);
-
-namespace detail
-{
-
-extern template
-bool parse_printf_directive<char, std::char_traits<char> >
-(std::string const &, std::string::size_type*,
- format_item<char, std::char_traits<char> >*,
- std::ios &, unsigned char);
-
-extern template
-void distribute<char, std::char_traits<char>, std::string const &>
-(boost::basic_format<char>&, std::string const &);
-
-extern template
-boost::basic_format<char> &
-feed<char, std::char_traits<char>,
-     std::string const &>(boost::basic_format<char> &,
-                         std::string const &);
-
-} // namespace detail
-
-} // namespace io
-
-} // namespace boost
-
-#endif // __GNUG__
-
-#endif // USE_BOOST_FORMAT
-
-#endif // LYX_BOOST_FORMAT_H

diff --git a/src/BufferView.C b/src/BufferView.C
index 280315d2a9583c15351e996a311d56d5d1589e41..63f08f73718c95a4a9285ae43426268ed3cc0c7f 100644 (file)
--- a/src/BufferView.C
+++ b/src/BufferView.C
@@ -43,7 +43,7 @@
 #include "support/lyxfunctional.h" // equal_1st_in_pair
 #include "support/types.h"
 #include "support/lyxalgo.h" // lyx_count
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 #include <fstream>
 

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index 95a63eb99da2f7362bf404874db3bf386827b024..24d47839f5f6113ca442f435654fbc82fad74183 100644 (file)
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -57,7 +57,7 @@
 
 #include <boost/bind.hpp>
 #include <boost/signals/connection.hpp>
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 #include <unistd.h>
 #include <sys/wait.h>

diff --git a/src/ChangeLog b/src/ChangeLog
index 2985de291575d9c67c71c731117e3f515a259575..de42324e0630fc30fc8893297ca0831d5fd2328d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2003-03-30  John Levon  <levon@movementarian.org>
+
+       * Makefile.am:
+       * BoostFormat.h:
+       * boost-inst.C: moved to support
+
+       * several files: changes as a result
+
 2003-03-30  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
        * text2.C (LyXText): adjust.

diff --git a/src/Chktex.C b/src/Chktex.C
index 1e7f62d2bc7724506ecaa9f364aff8fd13fcd51a..c58328746a7b800f7f7a035d871a4ba1aacb62cb 100644 (file)
--- a/src/Chktex.C
+++ b/src/Chktex.C
@@ -25,7 +25,7 @@
 #include "support/path.h"
 #include "support/lstrings.h"
 
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 #include <fstream>
 

diff --git a/src/CutAndPaste.C b/src/CutAndPaste.C
index c5c6a208249f79815e7123064aa705e494f6cb9f..18d131816c5b040d6c97b2af41b3083ec044a88f 100644 (file)
--- a/src/CutAndPaste.C
+++ b/src/CutAndPaste.C
@@ -25,7 +25,7 @@
 
 #include "insets/inseterror.h"
 
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 using std::endl;
 using std::pair;

diff --git a/src/LaTeX.C b/src/LaTeX.C
index 65f45b9458e0f9bba926dedea2ea739e2ba4a003..8a8ab8596a6ce407b96dceaf0eead1f31a3f3629 100644 (file)
--- a/src/LaTeX.C
+++ b/src/LaTeX.C
@@ -28,7 +28,7 @@
 #include "support/path.h"
 
 #include <boost/regex.hpp>
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 #include <fstream>
 #include <cstdio>  // sscanf

diff --git a/src/Makefile.am b/src/Makefile.am
index 1d71aadd1320437ccffa6cae0cc388cc1f831ff1..d211314c281f8bf06a02038afb51555870d4e2a5 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,7 +36,6 @@ localedir = $(datadir)/locale
 BUILT_SOURCES = version.C
 
 lyx_SOURCES = \
-       BoostFormat.h \
        BufferView.C \
        BufferView.h \
        BufferView_pimpl.C \
@@ -94,7 +93,6 @@ lyx_SOURCES = \
        author.C \
        author.h \
        boost.C \
-       boost-inst.C \
        box.h \
        box.C \
        broken_headers.h \

diff --git a/src/boost-inst.C b/src/boost-inst.C
deleted file mode 100644 (file)
index 4ee2fe4..0000000
--- a/src/boost-inst.C
+++ /dev/null
@@ -1,51 +0,0 @@
-#include <config.h>
-
-#include "BoostFormat.h"
-
-#if USE_BOOST_FORMAT
-
-namespace boost
-{
-
-using boost::io::out_of_range_bit;
-
-template class basic_format<char>;
-
-template
-std::ostream &
-operator<< <char, std::char_traits<char> >(std::ostream &,
-                                          boost::basic_format<char> const &);
-
-namespace io
-{
-
-template
-std::string
-str<char, std::char_traits<char> >(boost::basic_format<char> const &);
-
-namespace detail
-{
-
-template
-bool parse_printf_directive<char, std::char_traits<char> >
-(std::string const &, std::string::size_type*,
- format_item<char, std::char_traits<char> >*,
- std::ios &, unsigned char);
-
-template
-void distribute<char, std::char_traits<char>, std::string const &>
-(boost::basic_format<char> &, std::string const&);
-
-template
-boost::basic_format<char> &
-feed<char, std::char_traits<char>,
-     std::string const &>(boost::basic_format<char> &,
-                         std::string const &);
-
-} // namespace detail
-
-} // namespace io
-
-} // namespace boost
-
-#endif // USE_BOOST_FORMAT

diff --git a/src/buffer.C b/src/buffer.C
index 4f603d9b210c10ebff06e519e7ba3c4d95526053..3cc6dce3e1d6ac6f823f549e2a38f5e5f2d20d37 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -65,7 +65,7 @@
 
 #include <boost/bind.hpp>
 #include <boost/tuple/tuple.hpp>
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 #include <fstream>
 #include <iomanip>

diff --git a/src/bufferlist.C b/src/bufferlist.C
index ea7fd734912f551b9064b2319797d7edfc462184..9b76eafb63781da919cd33a87b910642865aba49 100644 (file)
--- a/src/bufferlist.C
+++ b/src/bufferlist.C
@@ -34,7 +34,7 @@
 #include "support/LAssert.h"
 
 #include <boost/bind.hpp>
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 #include <cassert>
 #include <algorithm>

diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C
index cc23921110ae3754a43f6f060daf6ebfe8b707bd..8d1a2df7466c98c74e8c64873782d4a46bdc9c68 100644 (file)
--- a/src/bufferview_funcs.C
+++ b/src/bufferview_funcs.C
@@ -35,7 +35,7 @@
 
 #include "insets/updatableinset.h"
 
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 namespace {
 LyXFont freefont(LyXFont::ALL_IGNORE);

diff --git a/src/converter.C b/src/converter.C
index 405020e2ffc79c762155f6bbdb31a9eaba9bf6b7..d0f1529c921291fbccc4cb8480b865af2d010d10 100644 (file)
--- a/src/converter.C
+++ b/src/converter.C
@@ -30,7 +30,7 @@
 #include "support/path.h"
 #include "support/systemcall.h"
 
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 #include <cctype>
 

diff --git a/src/debug.C b/src/debug.C
index 583640ec11ca69f7badd4658c32eb15d59b6f745..d3d672ea5f9eebf63cdf1e58432b9d99c716a06e 100644 (file)
--- a/src/debug.C
+++ b/src/debug.C
@@ -13,7 +13,7 @@
 #include "gettext.h"
 #include "support/lstrings.h"
 
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 #include <iomanip>
 

diff --git a/src/format.C b/src/format.C
index e3ad3f0503cd7cc7c61c4110e3a1a0cc4f9d24c1..b8df07ce3b803993d9ae100f0143f3944d8dcd03 100644 (file)
--- a/src/format.C
+++ b/src/format.C
@@ -15,7 +15,7 @@
 #include "lyx_cb.h" // for ShowMessage() ... to be removed?
 #include "gettext.h"
 #include "LString.h"
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 #include "frontends/Alert.h" //to be removed?
 

diff --git a/src/frontends/controllers/ControlDocument.C b/src/frontends/controllers/ControlDocument.C
index 78e2c0b51bad4dfe097e161aeb16587f1b1376ae..d730f2b7b96a5ca8d01c8aef6e8a43ccdc4c331c 100644 (file)
--- a/src/frontends/controllers/ControlDocument.C
+++ b/src/frontends/controllers/ControlDocument.C
@@ -33,7 +33,7 @@
 #include "support/lstrings.h"
 #include "support/filetools.h"
 
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 using std::endl;
 

diff --git a/src/frontends/controllers/ControlSpellchecker.C b/src/frontends/controllers/ControlSpellchecker.C
index 576c7b6c293ff7993332d3d079fbf5824a3eb156..4495b87375bf941a20955607992cacbead6779c3 100644 (file)
--- a/src/frontends/controllers/ControlSpellchecker.C
+++ b/src/frontends/controllers/ControlSpellchecker.C
@@ -32,7 +32,7 @@
 
 #include "frontends/Alert.h"
 
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 using std::endl;
 

diff --git a/src/frontends/controllers/biblio.C b/src/frontends/controllers/biblio.C
index 1c9013f23ec32792fe0153dfcaf710533b9a287b..6efab20385a0fb3b2f558d02c5441e2afabe3c7e 100644 (file)
--- a/src/frontends/controllers/biblio.C
+++ b/src/frontends/controllers/biblio.C
@@ -20,7 +20,7 @@
 #include "support/LAssert.h"
 
 #include <boost/regex.hpp>
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 #include <algorithm>
 

diff --git a/src/frontends/qt2/Alert_pimpl.C b/src/frontends/qt2/Alert_pimpl.C
index ad38db003fe5dd632b5c41899ca9319ffacca29a..3281e70b30c409fb64769e11a2552a31b722a075 100644 (file)
--- a/src/frontends/qt2/Alert_pimpl.C
+++ b/src/frontends/qt2/Alert_pimpl.C
@@ -23,7 +23,7 @@
 #include "Alert.h"
 #include "Alert_pimpl.h"
 
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 #include "gettext.h"
 
 using std::pair;

diff --git a/src/frontends/qt2/QVCLog.C b/src/frontends/qt2/QVCLog.C
index c28508453cfea31dc2b4793fde692c0d794be032..50507e3dae0f146e3e2cb2507554d6f8f86d8a3a 100644 (file)
--- a/src/frontends/qt2/QVCLog.C
+++ b/src/frontends/qt2/QVCLog.C
@@ -23,7 +23,7 @@
 #include <qtextview.h>
 #include <qpushbutton.h>
 
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 typedef QController<ControlVCLog, QView<QVCLogDialog> > base_class;
 

diff --git a/src/frontends/xforms/ColorHandler.C b/src/frontends/xforms/ColorHandler.C
index 101f369a9f4d3b0e52a4edf16a14f85a95ef8808..53915fef0152bab9d358a764741e396f64f7b086 100644 (file)
--- a/src/frontends/xforms/ColorHandler.C
+++ b/src/frontends/xforms/ColorHandler.C
@@ -17,7 +17,7 @@
 #include "debug.h"
 
 #include <boost/scoped_array.hpp>
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 #include <cmath>
 

diff --git a/src/frontends/xforms/FormBase.C b/src/frontends/xforms/FormBase.C
index 8613659c118474b3af5da72446852d8d5042b880..896785a4b5ae01efd86f12b636a016b3927958db 100644 (file)
--- a/src/frontends/xforms/FormBase.C
+++ b/src/frontends/xforms/FormBase.C
@@ -21,7 +21,7 @@
 #include "xforms_helpers.h" // formatted
 
 #include "gettext.h"        // _()
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 #include "support/LAssert.h"
 #include "support/filetools.h" //  LibFileSearch

diff --git a/src/frontends/xforms/FormDialogView.C b/src/frontends/xforms/FormDialogView.C
index 8a65a6c5e0cdd260a86fb2fece8a554c79ada6cb..c78e62409cf3978ad3034323e9497c7bd327f4d6 100644 (file)
--- a/src/frontends/xforms/FormDialogView.C
+++ b/src/frontends/xforms/FormDialogView.C
@@ -22,7 +22,7 @@
 
 #include "gettext.h"        // _()
 #include "lyxrc.h"
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 #include "support/LAssert.h"
 #include "support/filetools.h" //  LibFileSearch

diff --git a/src/frontends/xforms/FormGraphics.C b/src/frontends/xforms/FormGraphics.C
index 6c4ba4b1e6268136fa2fd7ff224e6b0d8ec3e489..32bd0e2011ec351a246e8f6c4c957d67505fd23e 100644 (file)
--- a/src/frontends/xforms/FormGraphics.C
+++ b/src/frontends/xforms/FormGraphics.C
@@ -36,7 +36,7 @@
 #include "support/lyxlib.h"  // for float_equal
 #include "support/filetools.h"  // for MakeAbsPath etc
 
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 #include FORMS_H_LOCATION
 

diff --git a/src/importer.C b/src/importer.C
index bc74a4b8d8f5cad813cee190f5b7c7ebb8e41c1f..d1ffa0537cd44a7e59f43acaa0ea2283a4204010 100644 (file)
--- a/src/importer.C
+++ b/src/importer.C
@@ -22,7 +22,7 @@
 #include "gettext.h"
 #include "BufferView.h"
 
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 #include <algorithm>
 

diff --git a/src/insets/insetcaption.C b/src/insets/insetcaption.C
index af5e9d8d6ef7044d55f5d4146cf56faf47a121e1..892c1e6132b29640da23d21f013f6e15e65a4440 100644 (file)
--- a/src/insets/insetcaption.C
+++ b/src/insets/insetcaption.C
@@ -22,7 +22,7 @@
 #include "gettext.h"
 #include "support/lstrings.h"
 
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 using std::ostream;
 using std::endl;

diff --git a/src/insets/insetfloatlist.C b/src/insets/insetfloatlist.C
index eea56091cc6e0819b53fb7c11546f263f9f68886..3df488deb3ada0c903675a2581c34040081b0d90 100644 (file)
--- a/src/insets/insetfloatlist.C
+++ b/src/insets/insetfloatlist.C
@@ -22,7 +22,7 @@
 #include "gettext.h"
 #include "debug.h"
 
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 using std::ostream;
 using std::endl;

diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C
index 63dc4584874ec6eb6894ceb40c66e39e8d1bb3be..1182ad0ef11cf69f0a5bb05f382a7b990801eaed 100644 (file)
--- a/src/insets/insetgraphics.C
+++ b/src/insets/insetgraphics.C
@@ -89,7 +89,7 @@ TODO
 #include <boost/weak_ptr.hpp>
 #include <boost/bind.hpp>
 #include <boost/signals/trackable.hpp>
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 #include <algorithm> // For the std::max
 

diff --git a/src/insets/insetparent.C b/src/insets/insetparent.C
index f0edc618fa5b4b72119c6bf13d34fbed9e9fccba..8c676ebee6ee4e63253687d5e1591c063acc3593 100644 (file)
--- a/src/insets/insetparent.C
+++ b/src/insets/insetparent.C
@@ -24,7 +24,7 @@
 #include "buffer.h"
 #include "gettext.h"
 
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 using std::ostream;
 

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 233395c4324bf235d83e939ebc5da146595f3996..ac98e2fcb5989dba3de0d433850fdaa759e1b3db 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -36,7 +36,7 @@
 #include "support/systemcall.h"
 #include "support/lstrings.h"
 
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 #include <fstream>
 #include <algorithm>

diff --git a/src/lyx_main.C b/src/lyx_main.C
index e55212f0388ea4df967ec2801a5dbec6e71988cb..25b984fd3b1de0d10fdec33306e18cd5fc12d814 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -39,7 +39,7 @@
 #include "frontends/Alert.h"
 #include "frontends/lyx_gui.h"
 
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 #include <boost/function.hpp>
 
 #include <cstdlib>

diff --git a/src/lyxfont.C b/src/lyxfont.C
index 22594630d3f3b1bac6c4b568ead5e4be5b6b4bd8..861f939f2969939d1c7009042a8ebc82357d0092 100644 (file)
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -21,7 +21,7 @@
 #include "support/lstrings.h"
 #include "bufferparams.h" // stateText
 
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 using std::ostream;
 using std::endl;

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index a695355657237bdb809bf83f9230bb738230d0ca..298e7b3cf1681afab5267ec8cdac1a32fb1e26e9 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -68,7 +68,7 @@
 #include "support/path.h"
 #include "support/lyxfunctional.h"
 
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 #include <ctime>
 #include <clocale>

diff --git a/src/lyxvc.C b/src/lyxvc.C
index b919bb1d4f14c587663d3314271607bc858c8ec2..3def73dfec3b30ee5ec01075000fb8b01f9ff09c 100644 (file)
--- a/src/lyxvc.C
+++ b/src/lyxvc.C
@@ -13,7 +13,7 @@
 
 #include "support/filetools.h"
 #include "support/lyxlib.h"
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 #include <unistd.h>
 

diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C
index f44a96aeb1530cf1f09aeb489828f0a33df1cf15..5cbf21b179ca26fb1c6979ff8e60e6ece72530da 100644 (file)
--- a/src/mathed/formulamacro.C
+++ b/src/mathed/formulamacro.C
@@ -37,7 +37,7 @@
 
 #include "Lsstream.h"
 
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 using std::ostream;
 

diff --git a/src/paragraph_funcs.C b/src/paragraph_funcs.C
index 36b4cc0337b66165ea4dd83e25a431ad52aeb08b..cd3937c8c408e317a9c092f3b4f3bfb7fe2d1a04 100644 (file)
--- a/src/paragraph_funcs.C
+++ b/src/paragraph_funcs.C
@@ -21,7 +21,7 @@
 #include "encoding.h"
 #include "lyxrc.h"
 #include "lyxlex.h"
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 #include "factory.h"
 #include "support/lstrings.h"
 #include "insets/insetoptarg.h"

diff --git a/src/support/BoostFormat.h b/src/support/BoostFormat.h
new file mode 100644 (file)
index 0000000..e96cb1d
--- /dev/null
+++ b/src/support/BoostFormat.h
@@ -0,0 +1,61 @@
+// -*- C++ -*-
+#ifndef LYX_BOOST_FORMAT_H
+#define LYX_BOOST_FORMAT_H
+
+// Only include this if it is possible to use
+// Boost.Format at all.
+#if USE_BOOST_FORMAT
+
+#include <boost/format.hpp>
+
+// Add explicit instantion for g++ compilers
+#ifdef __GNUG__
+
+namespace boost
+{
+
+extern
+template basic_format<char>;
+
+extern template
+std::ostream &
+operator<< <char, std::char_traits<char> >(std::ostream &,
+                                          boost::basic_format<char> const &);
+
+namespace io
+{
+
+extern template
+std::string
+str<char, std::char_traits<char> >(boost::basic_format<char> const &);
+
+namespace detail
+{
+
+extern template
+bool parse_printf_directive<char, std::char_traits<char> >
+(std::string const &, std::string::size_type*,
+ format_item<char, std::char_traits<char> >*,
+ std::ios &, unsigned char);
+
+extern template
+void distribute<char, std::char_traits<char>, std::string const &>
+(boost::basic_format<char>&, std::string const &);
+
+extern template
+boost::basic_format<char> &
+feed<char, std::char_traits<char>,
+     std::string const &>(boost::basic_format<char> &,
+                         std::string const &);
+
+} // namespace detail
+
+} // namespace io
+
+} // namespace boost
+
+#endif // __GNUG__
+
+#endif // USE_BOOST_FORMAT
+
+#endif // LYX_BOOST_FORMAT_H

diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index 8d847b017f3875b267afddabc6cf617da9119400..b5bb83aa88d1d4c7167d2dfcb24c26aa8a2479fd 100644 (file)
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-30  John Levon  <levon@movementarian.org>
+
+       * Makefile.am:
+       * BoostFormat.h:
+       * boost-inst.C: moved from src/
+
 2003-03-29  John Levon  <levon@movementarian.org>
 
        * filetools.h:

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 398e582870304ad87555f83671578a624103ddc9..344f49b2a672bfcc5fa19f1784d1c569b467898a 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -12,6 +12,7 @@ LYXSTRING = lyxstring.C lyxstring.h
 endif
 
 libsupport_la_SOURCES = \
+       BoostFormat.h \
        DebugStream.C \
        DebugStream.h \
        FileInfo.C \
@@ -26,6 +27,7 @@ libsupport_la_SOURCES = \
        os.h \
        abort.C \
        atoi.C \
+       boost-inst.C \
        chdir.C \
        copy.C \
        filetools.C \

diff --git a/src/support/boost-inst.C b/src/support/boost-inst.C
new file mode 100644 (file)
index 0000000..f16bc62
--- /dev/null
+++ b/src/support/boost-inst.C
@@ -0,0 +1,51 @@
+#include <config.h>
+
+#include "support/BoostFormat.h"
+
+#if USE_BOOST_FORMAT
+
+namespace boost
+{
+
+using boost::io::out_of_range_bit;
+
+template class basic_format<char>;
+
+template
+std::ostream &
+operator<< <char, std::char_traits<char> >(std::ostream &,
+                                          boost::basic_format<char> const &);
+
+namespace io
+{
+
+template
+std::string
+str<char, std::char_traits<char> >(boost::basic_format<char> const &);
+
+namespace detail
+{
+
+template
+bool parse_printf_directive<char, std::char_traits<char> >
+(std::string const &, std::string::size_type*,
+ format_item<char, std::char_traits<char> >*,
+ std::ios &, unsigned char);
+
+template
+void distribute<char, std::char_traits<char>, std::string const &>
+(boost::basic_format<char> &, std::string const&);
+
+template
+boost::basic_format<char> &
+feed<char, std::char_traits<char>,
+     std::string const &>(boost::basic_format<char> &,
+                         std::string const &);
+
+} // namespace detail
+
+} // namespace io
+
+} // namespace boost
+
+#endif // USE_BOOST_FORMAT

diff --git a/src/text2.C b/src/text2.C
index 4c55cab4d9ce549379141690b4ed4d21f0912644..c04dcb583aa3482b5363325472028e0927c572d4 100644 (file)
--- a/src/text2.C
+++ b/src/text2.C
@@ -41,7 +41,7 @@
 #include "support/textutils.h"
 #include "support/lstrings.h"
 
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 using std::vector;
 using std::copy;