X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=boost%2Fboost%2Fformat.hpp;h=73464a819f8fe896da4adfd1b75540488b2841cd;hb=43c09d723435a5b203f2ac0c39e2086de836b386;hp=97c35c3a01518aefd1341e553fca44f0be91c3a4;hpb=e1644a68eb123c267a7ef2e651c66b788c38f03a;p=lyx.git

diff --git a/boost/boost/format.hpp b/boost/boost/format.hpp
index 97c35c3a01..73464a819f 100644
--- a/boost/boost/format.hpp
+++ b/boost/boost/format.hpp
@@ -1,19 +1,14 @@
-// -*- C++ -*-
-//  Boost general library 'format'   ---------------------------
-//  See http://www.boost.org for updates, documentation, and revision history.
+// ----------------------------------------------------------------------------
+// format.hpp :  primary header
+// ----------------------------------------------------------------------------
 
-//  (C) Samuel Krempp 2001
-//                  krempp@crans.ens-cachan.fr
-//  Permission to copy, use, modify, sell and
-//  distribute this software is granted provided this copyright notice appears
-//  in all copies. This software is provided "as is" without express or implied
-//  warranty, and with no claim as to its suitability for any purpose.
+//  Copyright Samuel Krempp 2003. Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+//  See http://www.boost.org/libs/format for library home page
 
-// ideas taken from Rüdiger Loos's format class
-// and Karl Nelson's ofstream
 
-// ----------------------------------------------------------------------------
-// format.hpp :  primary header
 // ----------------------------------------------------------------------------
 
 #ifndef BOOST_FORMAT_HPP
@@ -21,44 +16,23 @@
 
 #include <vector>
 #include <string>
-#include <sstream>
-#include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>
+#include <boost/config.hpp>
 
 #ifndef BOOST_NO_STD_LOCALE
 #include <locale>
 #endif
 
+// ***   Compatibility framework
+#include <boost/format/detail/compat_workarounds.hpp>
 
-// make sure our local macros wont override something :
-#if defined(BOOST_NO_LOCALE_ISDIGIT) || defined(BOOST_OVERLOAD_FOR_NON_CONST) \
-  || defined(BOOST_IO_STD) || defined( BOOST_IO_NEEDS_USING_DECLARATION )
-#error "a local macro would overwrite a previously defined macro"
-#endif
-
-
-#include <boost/format/macros_stlport.hpp>  // stlport workarounds
-#include <boost/format/macros_default.hpp> 
-
-#if defined(BOOST_NO_STD_LOCALE) || ( BOOST_WORKAROUND(__BORLANDC__, <= 0x561) \
- && BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT( 0x570 ) ) )
-#define BOOST_BAD_ISDIGIT
-#endif
-
-#ifdef BOOST_BAD_ISDIGIT
+#ifdef BOOST_NO_LOCALE_ISIDIGIT
 #include <cctype>  // we'll use the non-locale  <cctype>'s std::isdigit(int)
 #endif
 
-
-#if  BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x570) ) || BOOST_WORKAROUND( BOOST_MSVC, BOOST_TESTED_AT(1300))
-#define BOOST_NO_OVERLOAD_FOR_NON_CONST
-#endif
-
-
 // ****  Forward declarations ----------------------------------
-#include <boost/format/format_fwd.hpp>           // basic_format<Ch,Tr>, and other frontends
-#include <boost/format/internals_fwd.hpp>        // misc forward declarations for internal use
-
+#include <boost/format/format_fwd.hpp>     // basic_format<Ch,Tr>, and other frontends
+#include <boost/format/internals_fwd.hpp>  // misc forward declarations for internal use
 
 // ****  Auxiliary structs (stream_format_state<Ch,Tr> , and format_item<Ch,Tr> )
 #include <boost/format/internals.hpp>    
@@ -71,9 +45,7 @@
 
 // **** Implementation -------------------------------------------
 #include <boost/format/format_implementation.hpp>   // member functions
-
 #include <boost/format/group.hpp>                   // class for grouping arguments
-
 #include <boost/format/feed_args.hpp>               // argument-feeding functions
 #include <boost/format/parsing.hpp>                 // format-string parsing (member-)functions
 
@@ -82,17 +54,6 @@
 
 
 // *** Undefine 'local' macros :
-#ifdef BOOST_NO_OVERLOAD_FOR_NON_CONST
-#undef BOOST_NO_OVERLOAD_FOR_NON_CONST
-#endif
-#ifdef BOOST_BAD_ISDIGIT
-#undef BOOST_BAD_ISDIGIT
-#endif
-#ifdef BOOST_IO_STD
-#undef BOOST_IO_STD
-#endif
-#ifdef BOOST_IO_NEEDS_USING_DECLARATION
-#undef BOOST_IO_NEEDS_USING_DECLARATION
-#endif
+#include <boost/format/detail/unset_macros.hpp>
 
 #endif // BOOST_FORMAT_HPP