Skip to content

Fix std::max build break under function-like min/max macros #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Mikusch wants to merge 1 commit into
base: polishing
Choose a base branch
from
Open

Fix std::max build break under function-like min/max macros #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions include/khook.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
*/
#pragma once

#include <algorithm>
#include <cstdint>
#include <type_traits>
#include <unordered_set>
Expand Down Expand Up @@ -95,10 +96,10 @@ class Hook : public __Hook {
#else
std::uint32_t return_size = 0;
if constexpr(!std::is_void_v<RETURN>) {
return_size = std::max(sizeof(void*), sizeof(RETURN));
return_size = (std::max)(sizeof(void*), sizeof(RETURN));
}

return return_size + (std::max(sizeof(void*), sizeof(ARGS)) + ... + 0);
return return_size + ((std::max)(sizeof(void*), sizeof(ARGS)) + ... + 0);
#endif
}
protected:
Expand Down