summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2014-10-19 20:22:58 (GMT)
committerTobias Markmann <tm@ayena.de>2014-10-20 13:49:33 (GMT)
commit6b22dfcf59474dd016a0355a3102a1dd3692d92c (patch)
tree2b1fd33be433a91e81fee84fdc2bf1b52575d934 /3rdParty/Boost/src/boost/proto/detail
parent38b0cb785fea8eae5e48fae56440695fdfd10ee1 (diff)
downloadswift-contrib-6b22dfcf59474dd016a0355a3102a1dd3692d92c.zip
swift-contrib-6b22dfcf59474dd016a0355a3102a1dd3692d92c.tar.bz2
Update Boost in 3rdParty to version 1.56.0.
This updates Boost in our 3rdParty directory to version 1.56.0. Updated our update.sh script to stop on error. Changed error reporting in SwiftTools/CrashReporter.cpp to SWIFT_LOG due to missing include of <iostream> with newer Boost. Change-Id: I4b35c77de951333979a524097f35f5f83d325edc
Diffstat (limited to '3rdParty/Boost/src/boost/proto/detail')
-rw-r--r--3rdParty/Boost/src/boost/proto/detail/as_expr.hpp4
-rw-r--r--3rdParty/Boost/src/boost/proto/detail/as_lvalue.hpp4
-rw-r--r--3rdParty/Boost/src/boost/proto/detail/decltype.hpp6
-rw-r--r--3rdParty/Boost/src/boost/proto/detail/deduce_domain.hpp8
-rw-r--r--3rdParty/Boost/src/boost/proto/detail/expr.hpp10
-rw-r--r--3rdParty/Boost/src/boost/proto/detail/extends_funop.hpp2
-rw-r--r--3rdParty/Boost/src/boost/proto/detail/extends_funop_const.hpp2
-rw-r--r--3rdParty/Boost/src/boost/proto/detail/ignore_unused.hpp4
8 files changed, 20 insertions, 20 deletions
diff --git a/3rdParty/Boost/src/boost/proto/detail/as_expr.hpp b/3rdParty/Boost/src/boost/proto/detail/as_expr.hpp
index fb46576..b7e5c30 100644
--- a/3rdParty/Boost/src/boost/proto/detail/as_expr.hpp
+++ b/3rdParty/Boost/src/boost/proto/detail/as_expr.hpp
@@ -11,19 +11,19 @@
#ifndef BOOST_PROTO_DETAIL_AS_EXPR_HPP_EAN_06_09_2010
#define BOOST_PROTO_DETAIL_AS_EXPR_HPP_EAN_06_09_2010
#include <boost/config.hpp>
#include <boost/detail/workaround.hpp>
#include <boost/type_traits/remove_const.hpp>
#include <boost/proto/proto_fwd.hpp>
#include <boost/proto/args.hpp>
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#if defined(_MSC_VER)
# pragma warning(push)
# pragma warning(disable : 4714) // function 'xxx' marked as __forceinline not inlined
#endif
namespace boost { namespace proto { namespace detail
{
////////////////////////////////////////////////////////////////////////////////////////////////
template<typename Generator>
@@ -174,14 +174,14 @@ namespace boost { namespace proto { namespace detail
BOOST_FORCEINLINE
result_type operator()(T &t) const
{
return result_type::make(t);
}
};
}}}
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#if defined(_MSC_VER)
# pragma warning(pop)
#endif
#endif
diff --git a/3rdParty/Boost/src/boost/proto/detail/as_lvalue.hpp b/3rdParty/Boost/src/boost/proto/detail/as_lvalue.hpp
index 8ff9091..df4dacb 100644
--- a/3rdParty/Boost/src/boost/proto/detail/as_lvalue.hpp
+++ b/3rdParty/Boost/src/boost/proto/detail/as_lvalue.hpp
@@ -5,19 +5,19 @@
// Copyright 2008 Eric Niebler. 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 BOOST_PROTO_TRANSFORM_AS_LVALUE_HPP_EAN_12_27_2007
#define BOOST_PROTO_TRANSFORM_AS_LVALUE_HPP_EAN_12_27_2007
#include <boost/proto/proto_fwd.hpp>
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#if defined(_MSC_VER)
# pragma warning(push)
# pragma warning(disable : 4714) // function 'xxx' marked as __forceinline not inlined
#endif
namespace boost { namespace proto
{
namespace detail
{
template<typename T>
@@ -30,14 +30,14 @@ namespace boost { namespace proto
template<typename T>
BOOST_FORCEINLINE
T const &as_lvalue(T const &t)
{
return t;
}
}
}}
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#if defined(_MSC_VER)
# pragma warning(pop)
#endif
#endif
diff --git a/3rdParty/Boost/src/boost/proto/detail/decltype.hpp b/3rdParty/Boost/src/boost/proto/detail/decltype.hpp
index 629ef99..5882071 100644
--- a/3rdParty/Boost/src/boost/proto/detail/decltype.hpp
+++ b/3rdParty/Boost/src/boost/proto/detail/decltype.hpp
@@ -30,26 +30,26 @@
#include <boost/type_traits/add_const.hpp>
#include <boost/type_traits/add_reference.hpp>
#include <boost/typeof/typeof.hpp>
#include <boost/utility/addressof.hpp>
#include <boost/utility/result_of.hpp>
#include <boost/utility/enable_if.hpp>
#include <boost/proto/proto_fwd.hpp>
#include <boost/proto/detail/any.hpp>
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#if defined(_MSC_VER)
# pragma warning(push)
# pragma warning(disable : 4714) // function 'xxx' marked as __forceinline not inlined
#endif
// We're STILL using Boost.Typeof on MSVC even for msvc-11.0 because of this bug:
// https://connect.microsoft.com/VisualStudio/feedback/details/765392/decltype-of-a-pointer-to-member-operator-gets-ref-qualification-wrong
-#if !defined(BOOST_NO_DECLTYPE) && !BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1700))
+#if !defined(BOOST_NO_CXX11_DECLTYPE) && !BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1700))
# define BOOST_PROTO_DECLTYPE_(EXPR, TYPE) typedef decltype((EXPR)) TYPE;
#else
# define BOOST_PROTO_DECLTYPE_NESTED_TYPEDEF_TPL_(NESTED, EXPR) \
BOOST_TYPEOF_NESTED_TYPEDEF_TPL(BOOST_PP_CAT(nested_and_hidden_, NESTED), EXPR) \
static int const BOOST_PP_CAT(sz, NESTED) = sizeof(boost::proto::detail::check_reference(EXPR));\
struct NESTED \
: boost::mpl::if_c< \
1 == BOOST_PP_CAT(sz, NESTED) \
, typename BOOST_PP_CAT(nested_and_hidden_, NESTED)::type & \
@@ -440,14 +440,14 @@ namespace boost { namespace proto
private:
T obj;
pmf_type pmf;
};
} // namespace detail
}}
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#if defined(_MSC_VER)
# pragma warning(pop)
#endif
#endif
diff --git a/3rdParty/Boost/src/boost/proto/detail/deduce_domain.hpp b/3rdParty/Boost/src/boost/proto/detail/deduce_domain.hpp
index 630304f..0d4f3a5 100644
--- a/3rdParty/Boost/src/boost/proto/detail/deduce_domain.hpp
+++ b/3rdParty/Boost/src/boost/proto/detail/deduce_domain.hpp
@@ -38,33 +38,33 @@ namespace boost
{
namespace detail
{
template<typename Domain>
struct domain_
: domain_<typename Domain::proto_super_domain>
{
typedef Domain type;
typedef domain_<typename Domain::proto_super_domain> base;
- #ifdef BOOST_NO_DECLTYPE
+ #ifdef BOOST_NO_CXX11_DECLTYPE
using base::deduce98;
static int const index = base::index + 1;
static typename sized_type<index>::type deduce98(domain_<Domain>*);
#else
using base::deduce0x;
static Domain deduce0x(domain_<Domain>*);
#endif
};
template<>
struct domain_<not_a_domain>
{
typedef not_a_domain type;
- #ifdef BOOST_NO_DECLTYPE
+ #ifdef BOOST_NO_CXX11_DECLTYPE
static int const index = 1;
static sized_type<1>::type deduce98(void*);
#else
static not_a_domain deduce0x(void*);
#endif
};
template<>
struct domain_<default_domain>
@@ -80,19 +80,19 @@ namespace boost
sized_type<2>::type default_test(domain_<default_domain>*, void*);
sized_type<2>::type default_test(domain_<basic_default_domain>*, void*);
sized_type<3>::type default_test(void*, domain_<default_domain>*);
sized_type<3>::type default_test(void*, domain_<basic_default_domain>*);
sized_type<4>::type default_test(domain_<default_domain>*, domain_<default_domain>*);
sized_type<4>::type default_test(domain_<basic_default_domain>*, domain_<default_domain>*);
sized_type<4>::type default_test(domain_<default_domain>*, domain_<basic_default_domain>*);
sized_type<4>::type default_test(domain_<basic_default_domain>*, domain_<basic_default_domain>*);
- #ifdef BOOST_NO_DECLTYPE
+ #ifdef BOOST_NO_CXX11_DECLTYPE
template<int N, typename Domain>
struct nth_domain
: nth_domain<N - 1, typename Domain::base>
{};
template<typename Domain>
struct nth_domain<0, Domain>
: Domain
{};
@@ -110,19 +110,19 @@ namespace boost
{};
template<
typename D0
, typename D1
, int DefaultCase = sizeof(proto::detail::default_test((domain_<D0>*)0, (domain_<D1>*)0))
>
struct common_domain2
{
- #ifdef BOOST_NO_DECLTYPE
+ #ifdef BOOST_NO_CXX11_DECLTYPE
static int const index = domain_<D0>::index - sizeof(domain_<D0>::deduce98((domain_<D1>*)0));
typedef typename nth_domain<index, domain_<D0> >::type type;
#else
typedef decltype(domain_<D0>::deduce0x((domain_<D1>*)0)) type;
#endif
};
template<typename D0, typename D1>
struct common_domain2<D0, D1, 2>
diff --git a/3rdParty/Boost/src/boost/proto/detail/expr.hpp b/3rdParty/Boost/src/boost/proto/detail/expr.hpp
index 3f3291b..8ceedd8 100644
--- a/3rdParty/Boost/src/boost/proto/detail/expr.hpp
+++ b/3rdParty/Boost/src/boost/proto/detail/expr.hpp
@@ -1,12 +1,12 @@
#if !defined(BOOST_PROTO_DONT_USE_PREPROCESSED_FILES)
- #ifndef BOOST_NO_VARIADIC_TEMPLATES
+ #ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
#include <boost/proto/detail/preprocessed/expr_variadic.hpp>
#else
#include <boost/proto/detail/preprocessed/expr.hpp>
#endif
#elif !defined(BOOST_PP_IS_ITERATING)
/// INTERNAL ONLY
///
@@ -45,19 +45,19 @@
#include BOOST_PP_ITERATE()
#undef BOOST_PROTO_DEFINE_TERMINAL
#define BOOST_PP_ITERATION_PARAMS_1 \
(3, (1, BOOST_PROTO_MAX_ARITY, <boost/proto/detail/expr.hpp>))
#include BOOST_PP_ITERATE()
// Generate non-variadic versions of expr
#if defined(__WAVE__) && defined(BOOST_PROTO_CREATE_PREPROCESSED_FILES)
- #define BOOST_NO_VARIADIC_TEMPLATES
+ #define BOOST_NO_CXX11_VARIADIC_TEMPLATES
#pragma wave option(preserve: 2, line: 0, output: "preprocessed/expr.hpp")
///////////////////////////////////////////////////////////////////////////////
/// \file expr.hpp
/// Contains definition of expr\<\> class template.
//
// Copyright 2008 Eric Niebler. 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)
@@ -68,19 +68,19 @@
#define BOOST_PROTO_DEFINE_TERMINAL
#define BOOST_PP_ITERATION_PARAMS_1 (3, (0, 0, <boost/proto/detail/expr.hpp>))
#include BOOST_PP_ITERATE()
#undef BOOST_PROTO_DEFINE_TERMINAL
#define BOOST_PP_ITERATION_PARAMS_1 (3, (1, BOOST_PROTO_MAX_ARITY, <boost/proto/detail/expr.hpp>))
#include BOOST_PP_ITERATE()
#pragma wave option(output: null)
- #undef BOOST_NO_VARIADIC_TEMPLATES
+ #undef BOOST_NO_CXX11_VARIADIC_TEMPLATES
#endif
#undef BOOST_PROTO_CHILD
#undef BOOST_PROTO_VOID
#else
#define ARG_COUNT BOOST_PP_MAX(1, BOOST_PP_ITERATION())
@@ -392,19 +392,19 @@
/// Encodes the return type of \c expr\<\>::operator(), for use with \c boost::result_of\<\>
///
template<typename Sig>
struct result
{
typedef typename result_of::funop<Sig, expr, default_domain>::type const type;
};
- #ifndef BOOST_NO_VARIADIC_TEMPLATES
+ #ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
/// \overload
///
template<typename ...A>
BOOST_FORCEINLINE
typename result_of::funop<
expr const(A const &...)
, expr
, default_domain
>::type const
@@ -431,19 +431,19 @@
{
return result_of::funop<
expr(A const &...)
, expr
, default_domain
>::call(*this, a...);
}
#endif
- #else // BOOST_NO_VARIADIC_TEMPLATES
+ #else // BOOST_NO_CXX11_VARIADIC_TEMPLATES
/// Function call
///
/// \return A new \c expr\<\> node representing the function invocation of \c (*this)().
BOOST_FORCEINLINE
proto::expr<proto::tag::function, list1<expr const &>, 1> const
operator ()() const
{
proto::expr<proto::tag::function, list1<expr const &>, 1> that = {*this};
diff --git a/3rdParty/Boost/src/boost/proto/detail/extends_funop.hpp b/3rdParty/Boost/src/boost/proto/detail/extends_funop.hpp
index bb157c5..d722641 100644
--- a/3rdParty/Boost/src/boost/proto/detail/extends_funop.hpp
+++ b/3rdParty/Boost/src/boost/proto/detail/extends_funop.hpp
@@ -1,12 +1,12 @@
#if !defined(BOOST_PROTO_DONT_USE_PREPROCESSED_FILES)
- #ifndef BOOST_NO_VARIADIC_TEMPLATES
+ #ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
BOOST_PROTO_EXTENDS_FUNCTION_()
BOOST_PROTO_DEFINE_FUN_OP_VARIADIC_IMPL_(BOOST_PP_EMPTY)
BOOST_PROTO_DEFINE_FUN_OP_VARIADIC_IMPL_(BOOST_PROTO_CONST)
#else
#include <boost/proto/detail/preprocessed/extends_funop.hpp>
#endif
#else
diff --git a/3rdParty/Boost/src/boost/proto/detail/extends_funop_const.hpp b/3rdParty/Boost/src/boost/proto/detail/extends_funop_const.hpp
index 229a0f9..1791a1b 100644
--- a/3rdParty/Boost/src/boost/proto/detail/extends_funop_const.hpp
+++ b/3rdParty/Boost/src/boost/proto/detail/extends_funop_const.hpp
@@ -1,12 +1,12 @@
#if !defined(BOOST_PROTO_DONT_USE_PREPROCESSED_FILES)
- #ifndef BOOST_NO_VARIADIC_TEMPLATES
+ #ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
BOOST_PROTO_EXTENDS_FUNCTION_()
BOOST_PROTO_DEFINE_FUN_OP_VARIADIC_IMPL_(BOOST_PROTO_CONST)
#else
#include <boost/proto/detail/preprocessed/extends_funop_const.hpp>
#endif
#else
#define BOOST_PP_LOCAL_MACRO(N) \
diff --git a/3rdParty/Boost/src/boost/proto/detail/ignore_unused.hpp b/3rdParty/Boost/src/boost/proto/detail/ignore_unused.hpp
index 6004b83..7ca3446 100644
--- a/3rdParty/Boost/src/boost/proto/detail/ignore_unused.hpp
+++ b/3rdParty/Boost/src/boost/proto/detail/ignore_unused.hpp
@@ -6,29 +6,29 @@
// Copyright 2008 Eric Niebler. 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 BOOST_PROTO_DETAIL_IGNORE_UNUSED_HPP_EAN_03_03_2008
#define BOOST_PROTO_DETAIL_IGNORE_UNUSED_HPP_EAN_03_03_2008
#include <boost/config.hpp>
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#if defined(_MSC_VER)
# pragma warning(push)
# pragma warning(disable : 4714) // function 'xxx' marked as __forceinline not inlined
#endif
namespace boost { namespace proto
{
namespace detail
{
template<typename T>
BOOST_FORCEINLINE void ignore_unused(T const &)
{}
}
}}
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#if defined(_MSC_VER)
# pragma warning(pop)
#endif
#endif