diff options
| author | Kirk Shoop <kirk.shoop@microsoft.com> | 2013-06-18 09:39:34 -0700 |
|---|---|---|
| committer | Kirk Shoop <kirk.shoop@microsoft.com> | 2013-06-18 09:39:34 -0700 |
| commit | fd9e17d2db79fc6a9b355269bd5d206a7aba9cf9 (patch) | |
| tree | 7253dc1c2fb69eef19eef18c5c6d6e1650052fa3 | |
| parent | 27a38f93b45b4e5065c26fb630a3e9173d7caab2 (diff) | |
| download | RxCpp-fd9e17d2db79fc6a9b355269bd5d206a7aba9cf9.tar.gz | |
pushing min/max macros
don't need to wrap push_macro/pop_macro in ifdefs because gcc, clang
and msvc support them.
| -rw-r--r-- | Ix/CPP/src/cpplinq/linq.hpp | 8 |
1 files changed, 8 insertions, 0 deletions
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 <functional> #include <iterator> #include <algorithm> @@ -542,5 +547,8 @@ linq_driver<TContainer> from_value(const TContainer& c) } +#pragma pop_macro("min") +#pragma pop_macro("max") + #endif // defined(CPPLINQ_LINQ_HPP) |