From fd9e17d2db79fc6a9b355269bd5d206a7aba9cf9 Mon Sep 17 00:00:00 2001 From: Kirk Shoop Date: Tue, 18 Jun 2013 09:39:34 -0700 Subject: pushing min/max macros don't need to wrap push_macro/pop_macro in ifdefs because gcc, clang and msvc support them. --- Ix/CPP/src/cpplinq/linq.hpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Ix/CPP/src/cpplinq/linq.hpp b/Ix/CPP/src/cpplinq/linq.hpp index 2d7c1e7..5f08588 100644 --- a/Ix/CPP/src/cpplinq/linq.hpp +++ b/Ix/CPP/src/cpplinq/linq.hpp @@ -129,6 +129,11 @@ #define CPPLINQ_LINQ_HPP #pragma once +#pragma push_macro("min") +#pragma push_macro("max") +#undef min +#undef max + #include #include #include @@ -542,5 +547,8 @@ linq_driver from_value(const TContainer& c) } +#pragma pop_macro("min") +#pragma pop_macro("max") + #endif // defined(CPPLINQ_LINQ_HPP) -- cgit v1.2.3