AIR/cpp-peglib
1
0
Fork 0
mirror of https://github.com/yhirose/cpp-peglib.git synced 2024-11-13 22:55:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3 from g40/Vs2013

Browse Source 
Fix for ancient min/max macros in windows.h
This commit is contained in:
yhirose 2015-11-23 15:42:07 -05:00
commit 10e619c2aa
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
peglib.h
View File

@ -23,6 +23,18 @@
#include <unordered_map>
#include <vector>
// guard for older versions of VC++
#ifdef _MSC_VER
// VS2013 has no constexpr
#if (_MSC_VER == 1800)
#define PEGLIB_NO_CONSTEXPR_SUPPORT
#elif (_MSC_VER >= 1800)
// good to go
#else (_MSC_VER < 1800)
#error "Requires C+11 support"
#endif
#endif
namespace peg {
extern void* enabler;
@ -2479,7 +2491,7 @@ public:
peg_token_iterator()
: s_(nullptr)
, l_(0)
, pos_(std::numeric_limits<size_t>::max()) {}
, pos_((std::numeric_limits<size_t>::max)()) {}
peg_token_iterator(const char* syntax, const char* s)
: peg_(syntax)
@ -2534,7 +2546,7 @@ private:
m_.matches.insert(m_.matches.begin(), match::Item{ s_ + mpos, mlen, 0 });
pos_ += mpos + mlen;
} else {
pos_ = std::numeric_limits<size_t>::max();
pos_ = (std::numeric_limits<size_t>::max)();
}
}