summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog13
-rw-r--r--examples/APG/Naming/naming.mpc2
2 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5797c1d8cef..3831cba22fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Tue Sep 21 17:50:27 2004 Steve Huston <shuston@riverace.com>
+
+ * examples/APG/Naming/naming.mpc: Correct the exename for Nodelocal.
+ It was conflicting with that of Netlocal, which, when generated,
+ confused Visual Age C++ templates and automake.
+
+Tue Sep 21 12:16:39 2004 Steve Huston <shuston@riverace.com>
+
+ * ACEXML/parser/parser/Parser.cpp: parse_encoding_decl(), don't
+ crash if the input source doesn't declare an encoding.
+ reset(), if current_ is already 0 (the case if no parsing ever
+ really got started) don't dereference it.
+
Tue Sep 21 18:00:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/OS_NS_unistd.inl (readlink):
diff --git a/examples/APG/Naming/naming.mpc b/examples/APG/Naming/naming.mpc
index 37bd910919e..5c32cb1d641 100644
--- a/examples/APG/Naming/naming.mpc
+++ b/examples/APG/Naming/naming.mpc
@@ -19,7 +19,7 @@ project(Netlocal Reader) : aceexe {
}
project(Nodelocal) : aceexe {
- exename = Netlocal
+ exename = Nodelocal
Source_Files {
Nodelocal.cpp
Temperature_Monitor.cpp