Merge branch 'develop'

This commit is contained in:
Emil Dotchevski
2016-11-07 11:31:01 -08:00
11 changed files with 134 additions and 116 deletions

View File

@ -0,0 +1,17 @@
//Copyright (c) 2006-2008 Emil Dotchevski and Reverge Studios, Inc.
//Distributed under 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)
#ifndef UUID_837060E885AF11E68DA91D15E31AC075
#define UUID_837060E885AF11E68DA91D15E31AC075
#ifdef BOOST_EXCEPTION_MINI_BOOST
#include <memory>
namespace boost { namespace exception_detail { using std::shared_ptr; } }
#else
#include <boost/shared_ptr.hpp>
namespace boost { namespace exception_detail { using boost::shared_ptr; } }
#endif
#endif

View File

@ -6,7 +6,7 @@
#ifndef UUID_DDFBB4546C1211DEA4659E9055D89593
#define UUID_DDFBB4546C1211DEA4659E9055D89593
#include "boost/exception/error_info.hpp"
#include <boost/exception/error_info.hpp>
namespace
boost

View File

@ -13,7 +13,7 @@
#pragma warning(disable:4996)
#endif
#include "boost/exception/info.hpp"
#include <boost/exception/info.hpp>
#include <errno.h>
#include <string.h>

View File

@ -15,7 +15,8 @@
#include <boost/exception/exception.hpp>
#include <boost/exception/detail/error_info_impl.hpp>
#include <boost/exception/detail/type_info.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/exception/detail/shared_ptr.hpp>
#include <boost/assert.hpp>
namespace
boost

View File

@ -15,7 +15,7 @@
#include <boost/exception/exception.hpp>
#include <boost/exception/to_string_stub.hpp>
#include <boost/exception/detail/error_info_impl.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/exception/detail/shared_ptr.hpp>
#include <boost/config.hpp>
#include <map>
@ -203,9 +203,9 @@ boost
template <class E,class Tag,class T>
E const & set_info( E const &, error_info<Tag,T> && );
template <class T>
class set_info_rv;
struct set_info_rv;
template <class Tag,class T>
class
struct
set_info_rv<error_info<Tag,T> >
{
template <class E,class Tag1,class T1>
@ -225,7 +225,7 @@ boost
}
};
template <>
class
struct
set_info_rv<throw_function>
{
template <class E,class Tag1,class T1>
@ -240,7 +240,7 @@ boost
}
};
template <>
class
struct
set_info_rv<throw_file>
{
template <class E,class Tag1,class T1>
@ -255,7 +255,7 @@ boost
}
};
template <>
class
struct
set_info_rv<throw_line>
{
template <class E,class Tag1,class T1>

View File

@ -3,7 +3,7 @@
//Distributed under 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)
#include "boost/exception/info.hpp"
#include <boost/exception/info.hpp>
template <class E,class I>
E const &
add_info( E const & e, I const & i )

View File

@ -3,7 +3,7 @@
//Distributed under 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)
#include "boost/exception/info.hpp"
#include <boost/exception/info.hpp>
template <class E,class I>
E const &
add_info( E const & e, I i )

View File

@ -3,7 +3,7 @@
//Distributed under 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)
#include "boost/exception/info.hpp"
#include <boost/exception/info.hpp>
#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
int

View File

@ -3,7 +3,7 @@
//Distributed under 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)
#include "boost/exception/info.hpp"
#include <boost/exception/info.hpp>
#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
int