Merge pull request #7618 from goldenx86/patch-4
Increase boost requirement to 1.78.0
This commit is contained in:
		@@ -229,7 +229,7 @@ elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR YUZU_USE_BUNDLED_BOOST)
 | 
			
		||||
    include_directories(SYSTEM "${Boost_INCLUDE_DIRS}")
 | 
			
		||||
else()
 | 
			
		||||
    message(STATUS "Boost 1.73.0 or newer not found, falling back to Conan")
 | 
			
		||||
    list(APPEND CONAN_REQUIRED_LIBS "boost/1.73.0")
 | 
			
		||||
    list(APPEND CONAN_REQUIRED_LIBS "boost/1.78.0")
 | 
			
		||||
endif()
 | 
			
		||||
 | 
			
		||||
# Attempt to locate any packages that are required and report the missing ones in CONAN_REQUIRED_LIBS
 | 
			
		||||
 
 | 
			
		||||
@@ -30,11 +30,20 @@ struct FuncTraits<ReturnType_ (*)(Args...)> {
 | 
			
		||||
    using ArgType = std::tuple_element_t<I, std::tuple<Args...>>;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
#ifdef _MSC_VER
 | 
			
		||||
#pragma warning(push)
 | 
			
		||||
#pragma warning(disable : 4702) // Ignore unreachable code warning
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
template <auto func, typename... Args>
 | 
			
		||||
void SetDefinition(EmitContext& ctx, IR::Inst* inst, Args... args) {
 | 
			
		||||
    inst->SetDefinition<Id>(func(ctx, std::forward<Args>(args)...));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#ifdef _MSC_VER
 | 
			
		||||
#pragma warning(pop)
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
template <typename ArgType>
 | 
			
		||||
ArgType Arg(EmitContext& ctx, const IR::Value& arg) {
 | 
			
		||||
    if constexpr (std::is_same_v<ArgType, Id>) {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user