From 6fa4fda1e455bc0ddc38507041acbec28fbf89c3 Mon Sep 17 00:00:00 2001 From: Jacob Sologub Date: Wed, 17 Jan 2018 07:42:13 -0800 Subject: [PATCH] Fixing NumericString#check function name conflict with `check` macro on macosx10.12. (#2096) https://github.com/pocoproject/poco/issues/1451 https://github.com/pocoproject/poco/issues/1693 --- Foundation/include/Poco/NumericString.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Foundation/include/Poco/NumericString.h b/Foundation/include/Poco/NumericString.h index c52fddea7..5600432d2 100644 --- a/Foundation/include/Poco/NumericString.h +++ b/Foundation/include/Poco/NumericString.h @@ -195,39 +195,39 @@ namespace Impl { char*& operator ++ () // prefix { - check(_cur + 1); + checkBounds(_cur + 1); return ++_cur; } char* operator ++ (int) // postfix { - check(_cur + 1); + checkBounds(_cur + 1); char* tmp = _cur++; return tmp; } char*& operator -- () // prefix { - check(_cur - 1); + checkBounds(_cur - 1); return --_cur; } char* operator -- (int) // postfix { - check(_cur - 1); + checkBounds(_cur - 1); char* tmp = _cur--; return tmp; } char*& operator += (int incr) { - check(_cur + incr); + checkBounds(_cur + incr); return _cur += incr; } char*& operator -= (int decr) { - check(_cur - decr); + checkBounds(_cur - decr); return _cur -= decr; } @@ -242,7 +242,7 @@ namespace Impl { } private: - void check(char* ptr) + void checkBounds(char* ptr) { if (ptr > _end) throw RangeException(); }