test again

This commit is contained in:
Naios 2015-06-11 01:49:35 +02:00
parent d84517cd19
commit 247db6e78d
3 changed files with 8 additions and 6 deletions

View File

@ -11,7 +11,7 @@ CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
if(COMPILER_SUPPORTS_CXX14) if(COMPILER_SUPPORTS_CXX14)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
elseif(COMPILER_SUPPORTS_CXX11) elseif(COMPILER_SUPPORTS_CXX11)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
elseif(COMPILER_SUPPORTS_CXX0X) elseif(COMPILER_SUPPORTS_CXX0X)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
else() else()

View File

@ -52,7 +52,6 @@ namespace detail
template<typename _CTy> template<typename _CTy>
using unwrap_callback_t = do_unwrap_callback<::fu::function_type_of_t<_CTy>>; using unwrap_callback_t = do_unwrap_callback<::fu::function_type_of_t<_CTy>>;
/*
template<typename... Args> template<typename... Args>
struct WeakProxyFactory struct WeakProxyFactory
{ {
@ -70,7 +69,7 @@ namespace detail
return CreateProxyFromWeak(WeakCallback<Args...>(shared_callback)); return CreateProxyFromWeak(WeakCallback<Args...>(shared_callback));
} }
}; };
*/
} // detail } // detail
@ -91,7 +90,7 @@ inline shared_callback_of_t<_CTy>
(std::forward<callback_of_t<_CTy>>(callback)); (std::forward<callback_of_t<_CTy>>(callback));
}; };
/* Disabled due to clang errors /*
template<typename... Args> template<typename... Args>
inline auto make_weak_wrapped_callback(WeakCallback<Args...> const& weak_callback) inline auto make_weak_wrapped_callback(WeakCallback<Args...> const& weak_callback)
-> Callback<Args...> -> Callback<Args...>

View File

@ -29,8 +29,11 @@ Continuable<SpellCastResult> CastSpell(int id)
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
// typedef shared_callback_of_t<Callback<int>> sc1; shared_callback_of_t<Callback<int>> sc1;
// typedef weak_callback_of_t<Callback<bool>> sc2; weak_callback_of_t<Callback<bool>> sc2;
// make_weak_wrapped_callback(sc1);
// make_weak_wrapped_callback(sc2);
typedef Continuable<bool> cont123; typedef Continuable<bool> cont123;