From 4a39020df99e8a9766d86ff14de0b8bd81976c3c Mon Sep 17 00:00:00 2001 From: ThePhD Date: Fri, 17 Nov 2017 07:20:17 -0500 Subject: [PATCH] macro-proof the library --- single/sol/sol.hpp | 14 +++++++------- sol/stack_core.hpp | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/single/sol/sol.hpp b/single/sol/sol.hpp index b54ea32f..9d4688dc 100644 --- a/single/sol/sol.hpp +++ b/single/sol/sol.hpp @@ -20,8 +20,8 @@ // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // This file was generated with a script. -// Generated 2017-11-17 12:07:21.024261 UTC -// This header was generated with sol v2.18.6 (revision 6738cee) +// Generated 2017-11-17 12:20:03.514818 UTC +// This header was generated with sol v2.18.6 (revision fa912a5) // https://github.com/ThePhD/sol2 #ifndef SOL_SINGLE_INCLUDE_HPP @@ -6573,7 +6573,7 @@ namespace sol { inline std::size_t aligned_space_for(void* alignment = nullptr) { char* start = static_cast(alignment); auto specific_align = [&alignment](std::size_t a, std::size_t s) { - std::size_t space = std::numeric_limits::max(); + std::size_t space = (std::numeric_limits::max)(); alignment = align(a, s, alignment, space); alignment = static_cast(static_cast(alignment) + s); }; @@ -6593,7 +6593,7 @@ namespace sol { if (!use_align::value) { return ptr; } - std::size_t space = std::numeric_limits::max(); + std::size_t space = (std::numeric_limits::max)(); return align(std::alignment_of::value, sizeof(void*), ptr, space); } @@ -6611,7 +6611,7 @@ namespace sol { } ptr = align_usertype_pointer(ptr); ptr = static_cast(static_cast(ptr) + sizeof(void*)); - std::size_t space = std::numeric_limits::max(); + std::size_t space = (std::numeric_limits::max)(); return align(std::alignment_of::value, sizeof(unique_destructor), ptr, space); } @@ -6632,7 +6632,7 @@ namespace sol { if (!use_align::value) { return ptr; } - std::size_t space = std::numeric_limits::max(); + std::size_t space = (std::numeric_limits::max)(); return align(std::alignment_of::value, sizeof(T), ptr, space); } @@ -6649,7 +6649,7 @@ namespace sol { if (!use_align::value) { return ptr; } - std::size_t space = std::numeric_limits::max(); + std::size_t space = (std::numeric_limits::max)(); return align(std::alignment_of::value, sizeof(T), ptr, space); } diff --git a/sol/stack_core.hpp b/sol/stack_core.hpp index 9e8b3759..d77a1289 100644 --- a/sol/stack_core.hpp +++ b/sol/stack_core.hpp @@ -76,7 +76,7 @@ namespace sol { inline std::size_t aligned_space_for(void* alignment = nullptr) { char* start = static_cast(alignment); auto specific_align = [&alignment](std::size_t a, std::size_t s) { - std::size_t space = std::numeric_limits::max(); + std::size_t space = (std::numeric_limits::max)(); alignment = align(a, s, alignment, space); alignment = static_cast(static_cast(alignment) + s); }; @@ -96,7 +96,7 @@ namespace sol { if (!use_align::value) { return ptr; } - std::size_t space = std::numeric_limits::max(); + std::size_t space = (std::numeric_limits::max)(); return align(std::alignment_of::value, sizeof(void*), ptr, space); } @@ -114,7 +114,7 @@ namespace sol { } ptr = align_usertype_pointer(ptr); ptr = static_cast(static_cast(ptr) + sizeof(void*)); - std::size_t space = std::numeric_limits::max(); + std::size_t space = (std::numeric_limits::max)(); return align(std::alignment_of::value, sizeof(unique_destructor), ptr, space); } @@ -135,7 +135,7 @@ namespace sol { if (!use_align::value) { return ptr; } - std::size_t space = std::numeric_limits::max(); + std::size_t space = (std::numeric_limits::max)(); return align(std::alignment_of::value, sizeof(T), ptr, space); } @@ -152,7 +152,7 @@ namespace sol { if (!use_align::value) { return ptr; } - std::size_t space = std::numeric_limits::max(); + std::size_t space = (std::numeric_limits::max)(); return align(std::alignment_of::value, sizeof(T), ptr, space); }