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

Merge pull request #2983 from felixn/travis-use-newer-versions-cpp 

travis: upgrade c++ build to focal & llvm 10
This commit is contained in:
Terence Parr 2020-12-03 10:38:14 -08:00 committed by GitHub
parent eafcc9369e 8f7faab0ee
commit c278c1df5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
.travis.yml
View File

@ -19,59 +19,56 @@ stages:
matrix:
include:
- os: linux
dist: trusty
dist: focal
compiler: clang
jdk: openjdk8
jdk: openjdk11
env:
- TARGET=cpp
- CXX=g++-5
- CXX=g++-10
- GROUP=LEXER
stage: main-test
addons:
apt:
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.7
- sourceline: 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-10 main'
packages:
- g++-5
- g++-10
- uuid-dev
- clang-3.7
- clang-10
- os: linux
dist: trusty
dist: focal
compiler: clang
jdk: openjdk8
jdk: openjdk11
env:
- TARGET=cpp
- CXX=g++-5
- CXX=g++-10
- GROUP=PARSER
stage: main-test
addons:
apt:
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.7
- sourceline: 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-10 main'
packages:
- g++-5
- g++-10
- uuid-dev
- clang-3.7
- clang-10
- os: linux
dist: trusty
dist: focal
compiler: clang
jdk: openjdk8
jdk: openjdk11
env:
- TARGET=cpp
- CXX=g++-5
- CXX=g++-10
- GROUP=RECURSION
stage: main-test
addons:
apt:
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.7
- sourceline: 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-10 main'
packages:
- g++-5
- g++-10
- uuid-dev
- clang-3.7
- clang-10
- os: osx
compiler: clang
osx_image: xcode10.2

2
runtime/Cpp/runtime/src/Vocabulary.h
View File

@ -22,7 +22,7 @@ namespace dfa {
/// except <seealso cref="Token#EOF"/>.</para>
static const Vocabulary EMPTY_VOCABULARY;
Vocabulary() = default;
Vocabulary() {}
Vocabulary(Vocabulary const&) = default;
virtual ~Vocabulary();