jasder
/
antlr
1
0
Fork 1
Code Issues Pull Requests Releases 1 Wiki Activity

Corrections for VS 2015.

This commit is contained in:
Mike Lischke 2017-06-04 14:26:55 +02:00
parent 19f584da05
commit cec714f745
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/Cpp/runtime/src/support/StringUtils.h
View File

@ -24,7 +24,7 @@ namespace antlrcpp {
// Don't make the converter static or we have to serialize access to it.
UTF32Converter converter;
#if _MSC_VER > 1900 && _MSC_VER < 2000
#if _MSC_VER >= 1900 && _MSC_VER < 2000
auto p = reinterpret_cast<const int32_t *>(data.data());
return converter.to_bytes(p, p + data.size());
#else
@ -36,7 +36,7 @@ namespace antlrcpp {
{
UTF32Converter converter;
#if _MSC_VER > 1900 && _MSC_VER < 2000
#if _MSC_VER >= 1900 && _MSC_VER < 2000
auto r = converter.from_bytes(first, last);
i32string s = reinterpret_cast<const int32_t *>(r.data());
#else

4
runtime/Cpp/runtime/src/tree/TerminalNodeImpl.cpp
View File

@ -20,8 +20,8 @@ Token* TerminalNodeImpl::getSymbol() {
return symbol;
}
void TerminalNodeImpl::setParent(RuleContext *parent) {
this->parent = parent;
void TerminalNodeImpl::setParent(RuleContext *parent_) {
this->parent = parent_;
}
misc::Interval TerminalNodeImpl::getSourceInterval() {