Delete a coupld of unwanted files.

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

diff --git a/src/ChangeLog b/src/ChangeLog
index e801ed5b1c570e06ecfd8025c7d0d2d817702ce2..4f7aa40a40d9483f55ff88832f6ab89b9d6ef914 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2004-01-06  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+       * Chktex.C: include boost/format.hpp
+
 2004-01-05  Lars Gullik Bjonnes  <larsbj@gullik.net>
 
        * InsetList.C: replace functor MathcIt with adaptable functor

diff --git a/src/Chktex.C b/src/Chktex.C
index 4f2fc6c6ae8bc36f3ed3526a4e5ddeacfaf398a2..4ad44c2fca4447f674d3bed647f6f585718989f4 100644 (file)
--- a/src/Chktex.C
+++ b/src/Chktex.C
@@ -15,12 +15,13 @@
 
 #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>
 
 using lyx::support::atoi;

diff --git a/src/support/BoostFormat.h b/src/support/BoostFormat.h
deleted file mode 100644 (file)
index a888b8f..0000000
--- a/src/support/BoostFormat.h
+++ /dev/null
@@ -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

diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index 49d71a1316da522285a1a3e4049feadb19cebe32..229aea6f3afc51591a0c5b8b36fe0605be7f1d02 100644 (file)
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -1,3 +1,12 @@
+2004-01-06  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+       * Makefile.am (libsupport_la_SOURCES): remove BoostFormat.h and
+       boost-inst.C
+       * BoostFormat.h: delete file
+       * boost-inst.C: delete fil
+
+       * lstrings.C: include boost/format.hpp
+
 2004-01-05  Angus Leeming  <leeming@lyx.org>
 
        * globbing.[Ch]: new files containing some globbing utilities.

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 7098ba6a3a3784edb05dd27d3f233589e196634f..721e7b80b36c3d8a20ceeb35666bd920d60510ad 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -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 \

diff --git a/src/support/boost-inst.C b/src/support/boost-inst.C
deleted file mode 100644 (file)
index a5a290b..0000000
--- a/src/support/boost-inst.C
+++ /dev/null
@@ -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

diff --git a/src/support/lstrings.C b/src/support/lstrings.C
index ad3532426bfa3b57ecf4f2e2422db7dc694b5c74..6ca5e68f653a8e469f290055d83f1976744238dd 100644 (file)
--- a/src/support/lstrings.C
+++ b/src/support/lstrings.C
@@ -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>