tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request from Icinga/fix/build-fix-msvc 

Fix build problem with MSVC
This commit is contained in:
Michael Friedrich 2018-01-02 14:01:15 +01:00 committed by GitHub
parent 1a7e7be6a4 6737a0fa8f
commit f843f92ee3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions

9
lib/base/functionwrapper.hpp
View File

@ -38,11 +38,11 @@ template<typename FuncType>
typename std::enable_if<
std::is_class<FuncType>::value &&
std::is_same<typename boost::function_types::result_type<decltype(&FuncType::operator())>::type, Value>::value &&
std::is_same<typename boost::mpl::at_c<boost::function_types::parameter_types<decltype(&FuncType::operator())>, 1>::type, const std::vector<Value>&>::value &&
boost::function_types::function_arity<decltype(&FuncType::operator())>::value == 2,
boost::function_types::function_arity<decltype(&FuncType::operator())>::value == 2,
std::function<Value (const std::vector<Value>&)>>::type
WrapFunction(FuncType function)
{
static_assert(std::is_same<typename boost::mpl::at_c<typename boost::function_types::parameter_types<decltype(&FuncType::operator())>, 1>::type, const std::vector<Value>&>::value, "Argument type must be const std::vector<Value>");
return function;
}
@ -140,11 +140,12 @@ template<typename FuncType>
typename std::enable_if<
std::is_class<FuncType>::value &&
!(std::is_same<typename boost::function_types::result_type<decltype(&FuncType::operator())>::type, Value>::value &&
std::is_same<typename boost::mpl::at_c<boost::function_types::parameter_types<decltype(&FuncType::operator())>, 1>::type, const std::vector<Value>&>::value &&
boost::function_types::function_arity<decltype(&FuncType::operator())>::value == 2),
boost::function_types::function_arity<decltype(&FuncType::operator())>::value == 2),
std::function<Value (const std::vector<Value>&)>>::type
WrapFunction(FuncType function)
{
static_assert(!std::is_same<typename boost::mpl::at_c<typename boost::function_types::parameter_types<decltype(&FuncType::operator())>, 1>::type, const std::vector<Value>&>::value, "Argument type must be const std::vector<Value>");
using FuncTypeInvoker = decltype(&FuncType::operator());
return [function](const std::vector<Value>& arguments) {