Index: boost/format/feed_args.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/format/feed_args.hpp,v retrieving revision 1.4 diff -u -p -r1.4 feed_args.hpp --- boost/format/feed_args.hpp 10 Oct 2002 11:17:18 -0000 1.4 +++ boost/format/feed_args.hpp 20 Nov 2002 13:22:45 -0000 @@ -25,6 +25,7 @@ #include "boost/format/group.hpp" #include "boost/format/msvc_disambiguater.hpp" +#include "boost/throw_exception.hpp" namespace boost { namespace io { @@ -221,7 +222,7 @@ void distribute(basic_format& sel if(self.cur_arg_ >= self.num_args_) { if( self.exceptions() & too_many_args_bit ) - throw too_many_args(); // too many variables have been supplied ! + boost::throw_exception(too_many_args()); // too many variables have been supplied ! else return; } for(unsigned long i=0; i < self.items_.size(); ++i) Index: boost/format/format_implementation.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/format/format_implementation.hpp,v retrieving revision 1.3 diff -u -p -r1.3 format_implementation.hpp --- boost/format/format_implementation.hpp 10 Oct 2002 11:17:18 -0000 1.3 +++ boost/format/format_implementation.hpp 20 Nov 2002 13:22:46 -0000 @@ -23,6 +23,7 @@ #include #include "boost/format/format_class.hpp" +#include "boost/throw_exception.hpp" namespace boost { @@ -151,7 +152,7 @@ basic_format& basic_format if(argN<1 || argN > num_args_ || bound_.size()==0 || !bound_[argN-1] ) { if( exceptions() & out_of_range_bit ) - throw out_of_range(); // arg not in range. + boost::throw_exception(out_of_range()); // arg not in range. else return *this; } bound_[argN-1]=false; @@ -169,7 +170,7 @@ std::basic_string basic_format& bind_arg_body( ba if(argN<1 || argN > self.num_args_) { if( self.exceptions() & out_of_range_bit ) - throw out_of_range(); // arg not in range. + boost::throw_exception(out_of_range()); // arg not in range. else return self; } if(self.bound_.size()==0) @@ -246,7 +247,7 @@ basic_format& modify_item_body( if(itemN<1 || itemN >= static_cast(self.items_.size() )) { if( self.exceptions() & out_of_range_bit ) - throw out_of_range(); // item not in range. + boost::throw_exception(out_of_range()); // item not in range. else return self; } self.items_[itemN-1].ref_state_.apply_manip( manipulator ); Index: boost/format/free_funcs.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/format/free_funcs.hpp,v retrieving revision 1.3 diff -u -p -r1.3 free_funcs.hpp --- boost/format/free_funcs.hpp 10 Oct 2002 11:17:18 -0000 1.3 +++ boost/format/free_funcs.hpp 20 Nov 2002 13:22:46 -0000 @@ -20,6 +20,7 @@ #define BOOST_FORMAT_FUNCS_HPP #include "boost/format/format_class.hpp" +#include "boost/throw_exception.hpp" namespace boost { @@ -44,7 +45,7 @@ operator<<( BOOST_IO_STD basic_ostream ::parse(co { if( i1+1 >= buf.size() ) { if(exceptions() & io::bad_format_string_bit) - throw io::bad_format_string(); // must not end in "bla bla %" + boost::throw_exception(io::bad_format_string()); // must not end in "bla bla %" else break; // stop there, ignore last '%' } if(buf[i1+1] == buf[i1] ) { i1+=2; continue; } // escaped "%%" / "##" @@ -421,7 +422,7 @@ void basic_format ::parse(co if(max_argN >= 0 ) // dont mix positional with non-positionnal directives { if(exceptions() & io::bad_format_string_bit) - throw io::bad_format_string(); + boost::throw_exception(io::bad_format_string()); // else do nothing. => positionnal arguments are processed as non-positionnal } // set things like it would have been with positional directives :