X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=boost%2Fboost%2Fformat.hpp;h=73464a819f8fe896da4adfd1b75540488b2841cd;hb=c48091f33a773732fa6c789927e5833e44108d9d;hp=f8cb0a7f3c842336ebac003c074a8bb76eac63e4;hpb=d201c74d5def0e29ba5bf66eeb8e07cb9941eac7;p=lyx.git

diff --git a/boost/boost/format.hpp b/boost/boost/format.hpp
index f8cb0a7f3c..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,45 +16,44 @@
 
 #include <vector>
 #include <string>
-#include <sstream>
-#include <ostream>
-
-#include "boost/config.hpp"
-#include "boost/format/format_config.hpp"
+#include <boost/detail/workaround.hpp>
+#include <boost/config.hpp>
 
-#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
-#define BOOST_OVERLOAD_FOR_NON_CONST
+#ifndef BOOST_NO_STD_LOCALE
+#include <locale>
 #endif
 
+// ***   Compatibility framework
+#include <boost/format/detail/compat_workarounds.hpp>
 
-// ****  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
+#ifdef BOOST_NO_LOCALE_ISIDIGIT
+#include <cctype>  // we'll use the non-locale  <cctype>'s std::isdigit(int)
+#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
 
 // ****  Auxiliary structs (stream_format_state<Ch,Tr> , and format_item<Ch,Tr> )
-#include "boost/format/internals.hpp"    
+#include <boost/format/internals.hpp>    
 
 // ****  Format  class  interface --------------------------------
-#include "boost/format/format_class.hpp"
+#include <boost/format/format_class.hpp>
 
 // **** Exceptions -----------------------------------------------
-#include "boost/format/exceptions.hpp"
+#include <boost/format/exceptions.hpp>
 
 // **** 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
+#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
 
 // **** Implementation of the free functions ----------------------
-#include "boost/format/free_funcs.hpp"
+#include <boost/format/free_funcs.hpp>
 
-#ifdef BOOST_OVERLOAD_FOR_NON_CONST
-#undef BOOST_OVERLOAD_FOR_NON_CONST
-#endif
 
+// *** Undefine 'local' macros :
+#include <boost/format/detail/unset_macros.hpp>
 
 #endif // BOOST_FORMAT_HPP