typos

[lyx.git] / boost / boost / format / format_fwd.hpp

diff --git a/boost/boost/format/format_fwd.hpp b/boost/boost/format/format_fwd.hpp
index a5dbde6b04c9570772d019cea755f2fed8c6814c..be3228af3c74fcfc13228072da20821a51832b5e 100644 (file)
--- a/boost/boost/format/format_fwd.hpp
+++ b/boost/boost/format/format_fwd.hpp
@@ -1,19 +1,14 @@
-// -*- C++ -*-
-//  Boost general library 'format'   ---------------------------
-//  See http://www.boost.org for updates, documentation, and revision history.
+// ----------------------------------------------------------------------------
+//  format_fwd.hpp :  forward declarations
+// ----------------------------------------------------------------------------
 
-//  (C) Samuel Krempp 2001
-//  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)
 
-// ideas taken from Rüdiger Loos's format class
-// and Karl Nelson's ofstream (also took its parsing code as basis for printf parsing)
+//  See http://www.boost.org/libs/format for library home page
 
-// ------------------------------------------------------------------------------
-// format_fwd.hpp :  forward declarations, for primary header format.hpp
-// ------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 
 #ifndef BOOST_FORMAT_FWD_HPP
 #define BOOST_FORMAT_FWD_HPP
@@ -21,45 +16,33 @@
 #include <string>
 #include <iosfwd>
 
-#include <boost/format/detail/config_macros.hpp> 
+#include <boost/format/detail/compat_workarounds.hpp> 
 
 namespace boost {
 
     template <class Ch, 
-#if !( BOOST_WORKAROUND(__GNUC__, <3) &&  defined(__STL_CONFIG_H) )
-        class Tr = BOOST_IO_STD char_traits<Ch> > 
+#if !( BOOST_WORKAROUND(__GNUC__, <3) && !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION) )
+    // gcc-2.95's native  stdlid needs special treatment
+        class Tr = BOOST_IO_STD char_traits<Ch>, class Alloc = std::allocator<Ch> > 
 #else
-    class Tr = std::string_char_traits<Ch> > 
+        class Tr = std::string_char_traits<Ch>, class Alloc = std::alloc > 
 #endif
     class basic_format;
 
     typedef basic_format<char >     format;
 
-
 #if !defined(BOOST_NO_STD_WSTRING)  && !defined(BOOST_NO_STD_WSTREAMBUF) \
- && !defined(BOOST_NO_STRINGSTREAM) && !defined(BOOST_FORMAT_IGNORE_STRINGSTREAM)
-    //we use either sstream or strstream, and strstream doesnt support wchar
+    && !defined(BOOST_FORMAT_IGNORE_STRINGSTREAM)
     typedef basic_format<wchar_t >  wformat;
 #endif
 
-    template<class Ch, class Tr> 
-    std::basic_string<Ch, Tr>     str(const basic_format<Ch, Tr>& ) ;
-
-namespace io {
-    using ::boost::str; // it used to bed define in boost::io, keep compatibility 
-
-    enum format_error_bits { bad_format_string_bit = 1, 
-                             too_few_args_bit = 2, too_many_args_bit = 4,
-                             out_of_range_bit = 8,
-                             all_error_bits = 255, no_error_bits=0 };
+    namespace io {
+        enum format_error_bits { bad_format_string_bit = 1, 
+                                 too_few_args_bit = 2, too_many_args_bit = 4,
+                                 out_of_range_bit = 8,
+                                 all_error_bits = 255, no_error_bits=0 };
                   
-} // namespace io
-
-
-    template< class Ch, class Tr> 
-    BOOST_IO_STD basic_ostream<Ch, Tr>& 
-    operator<<( BOOST_IO_STD basic_ostream<Ch, Tr>&, const basic_format<Ch, Tr>&);
-
+    } // namespace io
 
 } // namespace boost