sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed conflict with MAX and MIN macro in Windows.

Browse source
This commit is contained in:
SNiLD 2020-10-30 11:03:51 +02:00
parent c6fc956a77
commit c510651524
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/mapnik/function_call.hpp
View file

@ -116,13 +116,13 @@ struct length_impl
// min // min
inline value_type min_impl(value_type const& arg1, value_type const& arg2) 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 // max
inline value_type max_impl(value_type const& arg1, value_type const& arg2) 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 // pow

2
include/mapnik/text/font_feature_settings.hpp
View file

@ -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; 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 #pragma GCC diagnostic push
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>