.

5 files changed, 18 insertions, 9 deletions

diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index eb5d351f4a4..bfc21b786bf 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -1379,7 +1379,7 @@ be_interface::gen_perfect_hash_methods (void)
                                 " "
                                 "-m -M -J -c -C"
                                 " "
-                                "-D -E -T -f 0"
+                                "-D -E -T"
                                 " "
                                 "-a -o -t -p -K"
                                 " "
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index 387745fc9bd..7eca3df77f1 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -109,7 +109,7 @@
 // The default timeout receiving the location request to the TAO
 // Naming Service and Trading Service.
 #if !defined (TAO_DEFAULT_SERVICE_RESOLUTION_TIMEOUT)
-#define TAO_DEFAULT_SERVICE_RESOLUTION_TIMEOUT 3
+#define TAO_DEFAULT_SERVICE_RESOLUTION_TIMEOUT 1
 #endif /* TAO_DEFAULT_SERVICE_RESOLUTION_TIMEOUT */
 
 // The default starting port number for TAO servers.
diff --git a/apps/gperf/ChangeLog b/apps/gperf/ChangeLog
index dbb68f02c95..197696a21a7 100644
--- a/apps/gperf/ChangeLog
+++ b/apps/gperf/ChangeLog
@@ -1,3 +1,13 @@
+Tue Sep 22 02:12:53 1998  Douglas C. Schmidt  <schmidt@lambada.cs.wustl.edu>
+
+	* src/Key_List.cpp (output_lookup_array): Changed the assertion
+ 	  from assert (i != 0) to assert (i >= 0) since I think that's
+ 	  correct... (ah, so THAT's why comments are important thinks the
+ 	  '92 Doug... ;-)).
+
+	* src/Options: Improved the comments for the '-h' option to
+ 	  reflect current reality...
+
 Thu Sep 17 11:42:53 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
 	* src/Key_List.cpp (output_lookup_array): Put 'signed' keyword
diff --git a/apps/gperf/src/Key_List.cpp b/apps/gperf/src/Key_List.cpp
index 1f6aa1083be..b8d29e32932 100644
--- a/apps/gperf/src/Key_List.cpp
+++ b/apps/gperf/src/Key_List.cpp
@@ -944,8 +944,6 @@ Key_List::output_lookup_array (void)
       duplicate_entry duplicates[total_duplicates];
       int lookup_array[max_hash_value + 1];
 #else
-      // Note: we don't use new, because that invokes a custom
-      // operator new.
       duplicate_entry *duplicates = (duplicate_entry *)
 	malloc (total_duplicates * sizeof (duplicate_entry));
       int *lookup_array = (int *) malloc (sizeof (int) * (max_hash_value + 1));
@@ -1051,7 +1049,7 @@ Key_List::output_lookup_array (void)
                   }
 
               // We are in *big* trouble if this happens!
-              assert (i != 0);
+              assert (i >= 0);
             }
         }
 
diff --git a/apps/gperf/src/Options.cpp b/apps/gperf/src/Options.cpp
index 350ab289ecc..21eae0fe9ef 100644
--- a/apps/gperf/src/Options.cpp
+++ b/apps/gperf/src/Options.cpp
@@ -270,7 +270,8 @@ Options::operator() (int argc, char *argv[])
         case 'f':               
           {
             ACE_SET_BITS (option_word, FAST);
-            if ((iterations = atoi (getopt.optarg)) < 0)
+            iterations = atoi (getopt.optarg);
+            if (iterations < 0)
               {
                 ACE_ERROR ((LM_ERROR, "iterations value must not be negative, assuming 0\n"));
                 iterations = 0;
@@ -298,7 +299,7 @@ Options::operator() (int argc, char *argv[])
                              "-C\tMake the contents of generated lookup tables constant, i.e., readonly.\n"
                              "-d\tEnables the debugging option (produces verbose output to the standard error).\n"
                              "-D\tHandle keywords that hash to duplicate values.  This is useful\n"
-                             "\tfor certain highly redundant keyword sets.  It enables the -S option.\n"
+                             "\tfor certain highly redundant keyword sets.\n"
                              "-e\tAllow user to provide a string containing delimiters used to separate\n"
                              "\tkeywords from their attributes.  Default is \",\\n\"\n"
                              "-E\tDefine constant values using an enum local to the lookup function\n"
@@ -333,8 +334,8 @@ Options::operator() (int argc, char *argv[])
                              "-L\tGenerates code in the language specified by the option's argument.  Languages\n"
                              "\thandled are currently C++ and C.  The default is C.\n"
                              "-m\tAvoids the warning about identical hash values. This is valid\n"
-                             "\tonlyif the -D option is enabled.\n"
-                             "-MSkips class definition in the output. This is valid only in C++ mode.\n"
+                             "\tonly if the -D option is enabled.\n"
+                             "-M\tSkips class definition in the output. This is valid only in C++ mode.\n"
                              "-n\tDo not include the length of the keyword when computing the hash function\n"
                              "-N\tAllow user to specify name of generated lookup function.  Default\n"
                              "\tname is `in_word_set.'\n"