Skip to content

Work around Windows min/max bug. #21

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

Merged
clalancette merged 3 commits into from
Nov 19, 2020
+7 −0
Merged

Work around Windows min/max bug. #21

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ca8ee7
Work around Windows min/max bug.
clalancette Nov 17, 2020
22501db
Fixes from review.
clalancette Nov 18, 2020
d26cefd
Undefine max on Windows.
clalancette Nov 18, 2020
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
13 changes: 13 additions & 0 deletions urdf/src/model.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,15 @@
#include <utility>
#include <vector>

// Windows has preprocessor defines for "min" and "max", which conflict with
// several things (one of them being std::numeric_limits<T>::max()). Since
// we know we aren't going to use those macros, we save them off at the top of
// the file (with "pragma push_macro"), use whatever variants of "min" and "max"
// we need, and the restore the macros at the end of the file (with "pragma pop_macro")
#ifdef _WIN32
#pragma push_macro("max")
Comment thread
clalancette marked this conversation as resolved.
Outdated
#undef max
#endif

namespace urdf
{
Expand Down Expand Up @@ -160,3 +169,7 @@ bool Model::initString(const std::string & data)
return true;
}
} // namespace urdf

#ifdef _WIN32
#pragma pop_macro("max")
#endif