Skip to content
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

Jump to bottom

Fixed to compile with Visual Studio 2017 Express #4184

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

Fixed to compile with Visual Studio 2017 Express #4184

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/mapnik/function_call.hpp
View file
Open in desktop
Expand Up @@ -116,13 +116,13 @@ struct length_impl
// min
inline value_type min_impl(value_type const& arg1, value_type const& arg2)
{
return std::min(arg1.to_double(), arg2.to_double());
return (std::min)(arg1.to_double(), arg2.to_double());
}

// max
inline value_type max_impl(value_type const& arg1, value_type const& arg2)
{
return std::max(arg1.to_double(), arg2.to_double());
return (std::max)(arg1.to_double(), arg2.to_double());
}

// pow
Expand Down
2 changes: 1 addition & 1 deletion include/mapnik/text/font_feature_settings.hpp
View file
Open in desktop
Expand Up @@ -87,7 +87,7 @@ inline bool operator==(font_feature_settings const& lhs, font_feature_settings c
}

constexpr unsigned int font_feature_range_global_start = 0u;
static const unsigned int font_feature_range_global_end = std::numeric_limits<unsigned int>::max();
static const unsigned int font_feature_range_global_end = (std::numeric_limits<unsigned int>::max)();

#pragma GCC diagnostic push
#include <mapnik/warning_ignore.hpp>
Expand Down