64-bit fix to boost::format.

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

diff --git a/boost/boost/format/free_funcs.hpp b/boost/boost/format/free_funcs.hpp
index 5a7e881e448cfefaff2a5ea11741a8b86b63a805..5a7771d9a62b5e51c7ba04169ac2963d186c1337 100644 (file)
--- a/boost/boost/format/free_funcs.hpp
+++ b/boost/boost/format/free_funcs.hpp
@@ -3,7 +3,6 @@
 //  See http://www.boost.org for updates, documentation, and revision history.
 
 //  (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
@@ -19,52 +18,46 @@
 #ifndef BOOST_FORMAT_FUNCS_HPP
 #define BOOST_FORMAT_FUNCS_HPP
 
-#include "boost/format/format_class.hpp"
-#include "boost/throw_exception.hpp"
+#include <boost/format/format_class.hpp>
+#include <boost/throw_exception.hpp>
 
 namespace boost {
 
-namespace io {
-  template<class Ch, class Tr> inline
-  std::basic_string<Ch, Tr> str(const basic_format<Ch, Tr>& f)
-    // adds up all pieces of strings and converted items, and return the formatted string
-  {
-    return f.str();
-  }
-}   // - namespace io
-
-template< class Ch, class Tr>
-BOOST_IO_STD basic_ostream<Ch, Tr>&
-operator<<( BOOST_IO_STD basic_ostream<Ch, Tr>& os,
-           const boost::basic_format<Ch, Tr>& f)
-  // effect: "return os << str(f);" but we can try to do it faster
-{
-  typedef boost::basic_format<Ch, Tr>   format_t;
-  if(f.items_.size()==0)
-    os << f.prefix_;
-  else {
-    if(f.cur_arg_ < f.num_args_)
-      if( f.exceptions() & io::too_few_args_bit )
-       boost::throw_exception(io::too_few_args()); // not enough variables have been supplied !
-    if(f.style_ & format_t::special_needs)
-       os << f.str();
-    else {
-    // else we dont have to count chars output, so we dump directly to os :
-      os << f.prefix_;
-      for(unsigned long i=0; i<f.items_.size(); ++i)
-       {
-         const typename format_t::format_item_t& item = f.items_[i];
-         os << item.res_;
-         os << item.appendix_;
-
-       }
+    template<class Ch, class Tr> inline 
+    std::basic_string<Ch, Tr> str(const basic_format<Ch, Tr>& f) {
+        // adds up all pieces of strings and converted items, and return the formatted string
+        return f.str();
     }
-  }
-  f.dumped_=true;
-  return os;
-}
 
 
+    template< class Ch, class Tr>
+    BOOST_IO_STD basic_ostream<Ch, Tr>& 
+    operator<<( BOOST_IO_STD basic_ostream<Ch, Tr>& os, 
+                const boost::basic_format<Ch, Tr>& f) 
+        // effect: "return os << str(f);" but we can try to do it faster
+    {
+        typedef boost::basic_format<Ch, Tr>   format_t;
+        if(f.items_.size()==0) 
+            os << f.prefix_;
+        else {
+            if(f.cur_arg_ < f.num_args_)
+                if( f.exceptions() & io::too_few_args_bit )
+                    boost::throw_exception(io::too_few_args()); // not enough variables supplied
+            if(f.style_ & format_t::special_needs) 
+                os << f.str();
+            else {
+                // else we dont have to count chars output, so we dump directly to os :
+                os << f.prefix_;
+                for(unsigned long i=0; i<f.items_.size(); ++i) {
+                    const typename format_t::format_item_t& item = f.items_[i];
+                    os << item.res_;
+                    os << item.appendix_;
+                }
+            }
+        }
+        f.dumped_=true;
+        return os;
+    }
 
 } // namespace boost