From f6515e5aaf6640fc8fb8a0c0a4611236ccbc8970 Mon Sep 17 00:00:00 2001
From: Mike Lischke <mike@lischke-online.de>
Date: Tue, 21 Jun 2016 17:10:25 +0200
Subject: [PATCH] A few adjustments in doc + runtime tests for the changed
 library name + input stream handling.

---
 doc/cpp-target.md                                      |  4 ++--
 .../org/antlr/v4/test/runtime/cpp/BaseCppTest.java     | 10 +++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/doc/cpp-target.md b/doc/cpp-target.md
index 66b6acfa7..01fdf776e 100644
--- a/doc/cpp-target.md
+++ b/doc/cpp-target.md
@@ -54,9 +54,9 @@ public:
 
 
 int main(int argc, const char* argv[]) {
-  std::wifstream stream;
+  std::ifstream stream;
   stream.open(argv[1]);
-  ANTLRInputStream input("ae");
+  ANTLRInputStream input(stream);
   MyGrammarLexer lexer(&input);
   CommonTokenStream tokens(&lexer);
   MyGrammarParser parser(&tokens);
diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/BaseCppTest.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/BaseCppTest.java
index 2b6471b33..2e2ea9089 100644
--- a/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/BaseCppTest.java
+++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/BaseCppTest.java
@@ -557,7 +557,7 @@ public abstract class BaseCppTest {
 			args.add(runtimePath);
 			args.add("-L");
 			args.add(runtimePath);
-			args.add("-lantlrcpp_static");
+			args.add("-lantlr4-runtime");
 			args.addAll(allCppFiles(tmpdir));
 			ProcessBuilder builder = new ProcessBuilder(args.toArray(new String[0]));
 			builder.directory(new File(tmpdir));
@@ -912,9 +912,7 @@ public abstract class BaseCppTest {
 						+ "\n"
 						+ "\n"
 						+ "int main(int argc, const char* argv[]) {\n"
-						+ "  std::wifstream stream;\n"
-						+ "  stream.open(argv[1]);\n"
-						+ "  ANTLRInputStream input(stream);\n"
+						+ "  ANTLRFileStream input(argv[1]);\n"
 						+ "  <lexerName> lexer(&input);\n"
 						+ "  CommonTokenStream tokens(&lexer);\n"
 						+ "<createParser>"
@@ -956,9 +954,7 @@ public abstract class BaseCppTest {
 					+ "using namespace antlr4;\n"
 					+ "\n"
 					+ "int main(int argc, const char* argv[]) {\n"
-					+ "  std::wifstream stream;\n"
-					+ "  stream.open(argv[1]);\n"
-					+ "  ANTLRInputStream input(stream);\n"
+					+ "  ANTLRFileStream input(argv[1]);\n"
 					+ "  <lexerName> lexer(&input);\n"
 					+ "  CommonTokenStream tokens(&lexer);\n"
 					+ "  tokens.fill();\n"