Merge remote-tracking branch 'refs/remotes/DanMcLaughlin/master'

.travis.yml

@@ -26,16 +26,14 @@ env:
   - CXX=g++-5
 
 compiler:
-  - gcc
   - clang
 
 addons:
   apt:
     sources:
       - ubuntu-toolchain-r-test
-      - llvm-toolchain-precise-3.6
+      - llvm-toolchain-precise-3.7
     packages:
-      - gcc-5
       - g++-5
       - uuid-dev
-      - clang-3.6
+      - clang-3.7

runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/BaseCppTest.java

@@ -606,7 +606,7 @@ public abstract class BaseCppTest {
   static boolean runtimeBuiltOnce = false;
   
 	public String execModule(String fileName) {
-		String compilerPath = locateCompiler();
+		String compilerPath = "clang++"; //locateCompiler();
 		String runtimePath = locateRuntime();
 		String includePath = runtimePath + "/runtime/src";
 		String binPath = new File(new File(tmpdir), "a.out").getAbsolutePath();