# HG changeset patch
# User jwe
# Date 1028966647 0
# Node ID 92776b806c5569b3901e17ba1a193e2a1630ab7a
# Parent  6c40e6c7a1ae1024a7af7fb918a8c9d0f7710548
[project @ 2002-08-10 08:04:07 by jwe]

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-10  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* mk-opts.pl (emit_options_function): Emit newline at EOF.
+
 2002-08-01  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* Makeconf.in: Use $@-t instead of $@.tmp or $@.t.
diff --git a/mk-opts.pl b/mk-opts.pl
--- a/mk-opts.pl
+++ b/mk-opts.pl
@@ -758,7 +758,7 @@
     print_usage (\"$opt_fcn_name\");
 
   return retval;
-}";  
+}\n";  
 }
 
 sub emit_options_debug
diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2002-08-10  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* DLD-FUNCTIONS/dasrt.cc (DASRT_ABORT1, DASRT_ABORT2):
+	"##" pastes tokens, not strings.
+
+	* DLD-FUNCTIONS/odessa.cc: Add std:: qualifiers as needed.
+
 2002-08-09  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* variables.cc (Fisglobal): Rename from Fis_global.
diff --git a/src/DLD-FUNCTIONS/dasrt.cc b/src/DLD-FUNCTIONS/dasrt.cc
--- a/src/DLD-FUNCTIONS/dasrt.cc
+++ b/src/DLD-FUNCTIONS/dasrt.cc
@@ -221,7 +221,7 @@
 #define DASRT_ABORT1(msg) \
   do \
     { \
-      ::error ("dasrt: " ## msg); \
+      ::error ("dasrt: " msg); \
       DASRT_ABORT; \
     } \
   while (0)
@@ -229,7 +229,7 @@
 #define DASRT_ABORT2(fmt, arg) \
   do \
     { \
-      ::error ("dasrt: " ## fmt, arg); \
+      ::error ("dasrt: " fmt, arg); \
       DASRT_ABORT; \
     } \
   while (0)
diff --git a/src/DLD-FUNCTIONS/odessa.cc b/src/DLD-FUNCTIONS/odessa.cc
--- a/src/DLD-FUNCTIONS/odessa.cc
+++ b/src/DLD-FUNCTIONS/odessa.cc
@@ -300,7 +300,7 @@
       
       if (len > 2)
 	{
-	  string t = f_str_arg(2);
+	  std::string t = f_str_arg(2);
 
 	  if (t.length () > 0)
 	    {
@@ -314,7 +314,7 @@
 
       if (len > 1)
 	{
-	  string t = f_str_arg(1);
+	  std::string t = f_str_arg(1);
 	  
 	  if (t.length () > 0)
 	    {