Merge branch 'master' into develop

This commit is contained in:
Robert Ramey
2015-09-28 15:05:31 -07:00
4 changed files with 4 additions and 4 deletions

View File

@@ -49,7 +49,7 @@ class codecvt_null;
template<>
class codecvt_null<char> : public std::codecvt<char, char, std::mbstate_t>
{
virtual bool do_always_noconv() const BOOST_NOEXCEPT_OR_NOTHROW {
virtual bool do_always_noconv() const throw() {
return true;
}
public:

View File

@@ -111,11 +111,10 @@ public:
transform_width(T start) :
super_t(Base(static_cast< T >(start))),
m_buffer_out_full(false),
m_buffer_out(),
// To disable GCC warning, but not truly necessary
//(m_buffer_in will be initialized later before being
//used because m_remaining_bits == 0)
m_buffer_in(),
m_buffer_in(0),
m_remaining_bits(0),
m_end_of_sequence(false)
{}

View File

@@ -70,7 +70,7 @@ class bad_weak_ptr: public std::exception
{
public:
virtual char const * what() const BOOST_NOEXCEPT_OR_NOTHROW
virtual char const * what() const throw()
{
return "boost::bad_weak_ptr";
}

View File

@@ -66,6 +66,7 @@ void save(
){
int which = v.which();
ar << BOOST_SERIALIZATION_NVP(which);
typedef typename boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)>::types types;
variant_save_visitor<Archive> visitor(ar);
v.apply_visitor(visitor);
}