summaryrefslogtreecommitdiff
path: root/qpid/cpp/src
diff options
context:
space:
mode:
authorAndrew Stitcher <astitcher@apache.org>2015-09-03 20:45:52 +0000
committerAndrew Stitcher <astitcher@apache.org>2015-09-03 20:45:52 +0000
commit215baaf0af925fc020cc89a77092252f6061854d (patch)
tree8ebd572b93f0dc183d434f14c0ce58f0508f36f6 /qpid/cpp/src
parent14de0a97b80cc0f63208b61654dd0348fd3da8b1 (diff)
downloadqpid-python-215baaf0af925fc020cc89a77092252f6061854d.tar.gz
QPID-6718: Small fixes to compile on slightly older versions of G++ and Visual Studio
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1701130 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
-rw-r--r--qpid/cpp/src/qpid/broker/SelectorExpression.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/qpid/cpp/src/qpid/broker/SelectorExpression.cpp b/qpid/cpp/src/qpid/broker/SelectorExpression.cpp
index d882814443..497ec2f6f5 100644
--- a/qpid/cpp/src/qpid/broker/SelectorExpression.cpp
+++ b/qpid/cpp/src/qpid/broker/SelectorExpression.cpp
@@ -1003,9 +1003,10 @@ Expression* parseExactNumeric(const Token& token, bool negate)
base = 8;
}
errno = 0;
- uint64_t value = std::strtoull(s.c_str(), 0, base);
+ uint64_t value = strtoull(s.c_str(), 0, base);
if (!errno && (base || value<=INT64_MAX)) {
- return new Literal(static_cast<int64_t>(negate ? -value : value));
+ int64_t r = value;
+ return new Literal((negate ? -r : r));
}
if (negate && value==INT64_MAX+1ull) return new Literal(INT64_MIN);
error = "integer literal too big";