diff --git a/CMakeLists.txt b/CMakeLists.txt index a0b0724..5348b66 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,9 +5,12 @@ include(CheckCXXCompilerFlag) include(CheckCXXSourceRuns) include(CheckIncludeFiles) +CHECK_CXX_COMPILER_FLAG("-std=c++14" COMPILER_SUPPORTS_CXX11) CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X) -if(COMPILER_SUPPORTS_CXX11) +if(COMPILER_SUPPORTS_CXX14) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") +elseif(COMPILER_SUPPORTS_CXX11) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") elseif(COMPILER_SUPPORTS_CXX0X) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") diff --git a/fluent++/Continuable.h b/fluent++/Continuable.h index ad972d4..f3f98e1 100644 --- a/fluent++/Continuable.h +++ b/fluent++/Continuable.h @@ -53,7 +53,7 @@ namespace detail -> Continuable<_ATy...> { return Continuable<_ATy...>( - typename Continuable<_ATy...>::ForwardFunction(std::forward<_FTy>(functional))); + typename Continuable<_ATy...>::ForwardFunction(std::forward<_FTy>(functional))); } };