We don't need this. It just makes the maintaince more cumbersome.
Index: Chktex.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/Chktex.C,v
retrieving revision 1.32
diff -u -p -r1.32 Chktex.C
--- Chktex.C 6 Oct 2003 15:42:01 -0000 1.32
+++ Chktex.C 6 Jan 2004 19:20:44 -0000
@@ -15,11 +15,12 @@
#include "LaTeX.h" // TeXErrors
-#include "support/BoostFormat.h"
#include "support/filetools.h"
#include "support/lstrings.h"
#include "support/lyxlib.h"
#include "support/systemcall.h"
+
+#include <boost/format.hpp>
#include <fstream>
Index: support/BoostFormat.h
===================================================================
RCS file: support/BoostFormat.h
diff -N support/BoostFormat.h
--- support/BoostFormat.h 23 Aug 2003 00:16:56 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,68 +0,0 @@
-// -*- C++ -*-
-/**
- * \file BoostFormat.h
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author Lars Gullik Bjønnes
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#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
-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
Index: support/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/Makefile.am,v
retrieving revision 1.72
diff -u -p -r1.72 Makefile.am
--- support/Makefile.am 5 Jan 2004 16:49:36 -0000 1.72
+++ support/Makefile.am 6 Jan 2004 19:20:44 -0000
@@ -15,14 +15,12 @@ endif
BUILT_SOURCES = path_defines.C
libsupport_la_SOURCES = \
- BoostFormat.h \
FileInfo.C \
FileInfo.h \
FileMonitor.h \
FileMonitor.C \
abort.C \
atoi.C \
- boost-inst.C \
chdir.C \
copy.C \
copied_ptr.h \
Index: support/boost-inst.C
===================================================================
RCS file: support/boost-inst.C
diff -N support/boost-inst.C
--- support/boost-inst.C 8 Sep 2003 00:33:40 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,59 +0,0 @@
-/**
- * \file boost-inst.C
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author Lars Gullik Bjønnes
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#include <config.h>
-
-#include "support/BoostFormat.h"
-
-#if USE_BOOST_FORMAT
-
-namespace boost
-{
-
-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
Index: support/lstrings.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/lstrings.C,v
retrieving revision 1.82
diff -u -p -r1.82 lstrings.C
--- support/lstrings.C 6 Oct 2003 15:43:18 -0000 1.82
+++ support/lstrings.C 6 Jan 2004 19:20:44 -0000
@@ -14,12 +14,12 @@
#include "lstrings.h"
#include "support/std_sstream.h"
#include "debug.h"
-#include "BoostFormat.h"
#include "lyxlib.h"
#include "tostr.h"
#include <boost/tokenizer.hpp>
#include <boost/assert.hpp>
+#include <boost/format.hpp>
#include <algorithm>
--
Lgb
