comparison DEPENDENCIES/generic/include/boost/log/sources/exception_handler_feature.hpp @ 117:fdfd5e9f8a77 emscripten

Merge from default branch
author Chris Cannam
date Wed, 18 May 2016 15:55:14 +0100
parents c530137014c0
children
comparison
equal deleted inserted replaced
99:5f61994de79a 117:fdfd5e9f8a77
1 /* 1 /*
2 * Copyright Andrey Semashev 2007 - 2013. 2 * Copyright Andrey Semashev 2007 - 2015.
3 * Distributed under the Boost Software License, Version 1.0. 3 * Distributed under the Boost Software License, Version 1.0.
4 * (See accompanying file LICENSE_1_0.txt or copy at 4 * (See accompanying file LICENSE_1_0.txt or copy at
5 * http://www.boost.org/LICENSE_1_0.txt) 5 * http://www.boost.org/LICENSE_1_0.txt)
6 */ 6 */
7 /*! 7 /*!
20 #include <boost/move/utility.hpp> 20 #include <boost/move/utility.hpp>
21 #include <boost/type_traits/is_same.hpp> 21 #include <boost/type_traits/is_same.hpp>
22 #include <boost/log/detail/config.hpp> 22 #include <boost/log/detail/config.hpp>
23 #include <boost/log/detail/light_function.hpp> 23 #include <boost/log/detail/light_function.hpp>
24 #include <boost/log/detail/locks.hpp> 24 #include <boost/log/detail/locks.hpp>
25 #include <boost/log/core/record.hpp>
25 #include <boost/log/sources/threading_models.hpp> 26 #include <boost/log/sources/threading_models.hpp>
26 #include <boost/log/utility/strictest_lock.hpp> 27 #include <boost/log/utility/strictest_lock.hpp>
27 #if !defined(BOOST_LOG_NO_THREADS) 28 #if !defined(BOOST_LOG_NO_THREADS)
28 #include <boost/thread/exceptions.hpp> 29 #include <boost/thread/exceptions.hpp>
29 #endif 30 #endif