Mirrors_Framework/ODrive
1
0
Fork 0
mirror of https://github.com/odriverobotics/ODrive.git synced 2026-09-28 16:13:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #344 from madcowswe/sam_gcc9_fix

Browse Source 
fix compilation issue with GCC 9
This commit is contained in:
kingoflolz
2019-05-28 17:37:23 -04:00
committed by GitHub
parent f57b71825f 50e11294cd
commit 5c1fcfb232
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Firmware/fibre/cpp/include/fibre/protocol.hpp
+4 -4
View File
@@ -976,17 +976,17 @@ public:
output_properties_.register_endpoints(list, id + 1 + decltype(input_properties_)::endpoint_count, length);
}
template<typename> std::enable_if_t<sizeof...(TOutputs) == 0>
template<size_t i = sizeof...(TOutputs)> std::enable_if_t<i == 0>
handle_ex() {
invoke_function_with_tuple(*obj_, func_ptr_, in_args_);
}
template<typename> std::enable_if_t<sizeof...(TOutputs) == 1>
template<size_t i = sizeof...(TOutputs)> std::enable_if_t<i == 1>
handle_ex() {
std::get<0>(out_args_) = invoke_function_with_tuple(*obj_, func_ptr_, in_args_);
}
template<typename> std::enable_if_t<sizeof...(TOutputs) >= 2>
template<size_t i = sizeof...(TOutputs)> std::enable_if_t<i >= 2>
handle_ex() {
out_args_ = invoke_function_with_tuple(*obj_, func_ptr_, in_args_);
}
@@ -997,7 +997,7 @@ public:
(void) output;
LOG_FIBRE("tuple still at %x and of size %u\r\n", (uintptr_t)&in_args_, sizeof(in_args_));
LOG_FIBRE("invoke function using %d and %.3f\r\n", std::get<0>(in_args_), std::get<1>(in_args_));
handle_ex<void>();
handle_ex();
}
const char * name_;