summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '3rdParty/Boost/src/boost/lambda/detail')
-rw-r--r--3rdParty/Boost/src/boost/lambda/detail/lambda_functors.hpp33
-rw-r--r--3rdParty/Boost/src/boost/lambda/detail/ret.hpp2
2 files changed, 34 insertions, 1 deletions
diff --git a/3rdParty/Boost/src/boost/lambda/detail/lambda_functors.hpp b/3rdParty/Boost/src/boost/lambda/detail/lambda_functors.hpp
index 9b1b082..9ce29ad 100644
--- a/3rdParty/Boost/src/boost/lambda/detail/lambda_functors.hpp
+++ b/3rdParty/Boost/src/boost/lambda/detail/lambda_functors.hpp
@@ -15,6 +15,7 @@
#include <boost/config.hpp>
#include <boost/detail/workaround.hpp>
+#include <boost/utility/result_of.hpp>
#if BOOST_WORKAROUND(BOOST_MSVC, == 1310)
@@ -297,6 +298,38 @@ public:
} // namespace lambda
} // namespace boost
+namespace boost {
+
+#if !defined(BOOST_RESULT_OF_USE_DECLTYPE) || defined(BOOST_NO_DECLTYPE)
+
+template<class T>
+struct result_of<boost::lambda::lambda_functor<T>()>
+{
+ typedef typename boost::lambda::lambda_functor<T>::nullary_return_type type;
+};
+
+template<class T>
+struct result_of<const boost::lambda::lambda_functor<T>()>
+{
+ typedef typename boost::lambda::lambda_functor<T>::nullary_return_type type;
+};
+
+#endif
+
+template<class T>
+struct tr1_result_of<boost::lambda::lambda_functor<T>()>
+{
+ typedef typename boost::lambda::lambda_functor<T>::nullary_return_type type;
+};
+
+template<class T>
+struct tr1_result_of<const boost::lambda::lambda_functor<T>()>
+{
+ typedef typename boost::lambda::lambda_functor<T>::nullary_return_type type;
+};
+
+}
+
// is_placeholder
#include <boost/is_placeholder.hpp>
diff --git a/3rdParty/Boost/src/boost/lambda/detail/ret.hpp b/3rdParty/Boost/src/boost/lambda/detail/ret.hpp
index fbd8b3a..96f5fc1 100644
--- a/3rdParty/Boost/src/boost/lambda/detail/ret.hpp
+++ b/3rdParty/Boost/src/boost/lambda/detail/ret.hpp
@@ -284,7 +284,7 @@ inline const
lambda_functor<
lambda_functor_base<do_nothing_action, null_type>
>
-make_void(const Arg1& a1) {
+make_void(const Arg1&) {
return
lambda_functor_base<do_nothing_action, null_type>();
}