ChangeLogTag:Thu Apr 20 09:04:27 2000 Carlos O'Ryan <coryan@uci.edu>

2 files changed, 200 insertions, 193 deletions

diff --git a/apps/gperf/ChangeLog b/apps/gperf/ChangeLog
index 2f267533cbc..35693da8476 100644
--- a/apps/gperf/ChangeLog
+++ b/apps/gperf/ChangeLog
@@ -1,348 +1,355 @@
+Thu Apr 20 09:04:27 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/Makefile:
+          Just running 'make depend' on this file introduces an spurious
+          'c++' string in the middle of the dependencies.  Have no time to
+          figure out why.
+
 Wed Mar  8 17:26:22 2000  Ossama Othman  <ossama@uci.edu>
 
-	* src/Key_List.cpp (Key_List, ~Key_List, output_types):
+        * src/Key_List.cpp (Key_List, ~Key_List, output_types):
 
-	  Fixed memory leaks related to lack of deallocation of variables
-	  that were initialized with static strings, and then
-	  reinitialized with strings that were dynamically allocated.
-	  [Bug 334]
+          Fixed memory leaks related to lack of deallocation of variables
+          that were initialized with static strings, and then
+          reinitialized with strings that were dynamically allocated.
+          [Bug 334]
 
 Tue Feb 22 18:25:02 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-	* src/Key_List.cpp,
-	  src/Bool_Array.cpp,
-	  src/Gen_Perf.cpp,
-	  src/Hash_Table.cpp,
-	  src/Options.h,
-	  src/Options.cpp: Renamed the DEBUG enum to DEBUGGING enum
-	  to avoid problems with -DDEBUG is enabled.  Thanks to
-	  Tobin Bergen-Hill <tbhill@dctd.saic.com> for reporting this.
+        * src/Key_List.cpp,
+          src/Bool_Array.cpp,
+          src/Gen_Perf.cpp,
+          src/Hash_Table.cpp,
+          src/Options.h,
+          src/Options.cpp: Renamed the DEBUG enum to DEBUGGING enum
+          to avoid problems with -DDEBUG is enabled.  Thanks to
+          Tobin Bergen-Hill <tbhill@dctd.saic.com> for reporting this.
 
 Sat Nov 13 18:43:53 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-	* src/Key_List.cpp: The code for output_lookup_function() was
-	  not being called if option[GLOBAL] was set.  Thanks to Eugene
- 	  Surovegin <ebs@glasnet.ru> for reporting the bug and the fix.
+        * src/Key_List.cpp: The code for output_lookup_function() was
+          not being called if option[GLOBAL] was set.  Thanks to Eugene
+          Surovegin <ebs@glasnet.ru> for reporting the bug and the fix.
 
 Tue Aug 31 14:47:06 1999  Pradeep Gore  <pradeep@flamenco.cs.wustl.edu>
 
-	* Makefile:
-	  Fix for Bug#:250 - The Makefile now uses ACE's build commands.
-	  This also gets rid of the build warning on egcs when compiling
-	  with repo=1. Thanks to David, Ossama, Bala and Yamuna.
+        * Makefile:
+          Fix for Bug#:250 - The Makefile now uses ACE's build commands.
+          This also gets rid of the build warning on egcs when compiling
+          with repo=1. Thanks to David, Ossama, Bala and Yamuna.
 
 Thu Jul  1 09:31:32 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-	* Makefile:
-	  If we are cross compiling we shouldn't compile gperf, it is not
-	  going to help anyway, because we could not run it.
+        * Makefile:
+          If we are cross compiling we shouldn't compile gperf, it is not
+          going to help anyway, because we could not run it.
 
 Sun Jun 27 20:40:30 1999  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-	* src/Key_List.cpp: Added some initializers to keep EGCS from
- 	  complaining.
+        * src/Key_List.cpp: Added some initializers to keep EGCS from
+          complaining.
 
 Wed Jun 23 07:24:58 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-	* src/Key_List.cpp (output_hash_function): Use conditional
-	  compilation rather than a runtime check to test if
- 	  ACE_STANDARD_CHARACTER_SET_SIZE == ACE_EBCDIC_SIZE.  This
- 	  suppresses a warning on DEC UNIX.  Thanks to David Levine for
- 	  reporting this.
+        * src/Key_List.cpp (output_hash_function): Use conditional
+          compilation rather than a runtime check to test if
+          ACE_STANDARD_CHARACTER_SET_SIZE == ACE_EBCDIC_SIZE.  This
+          suppresses a warning on DEC UNIX.  Thanks to David Levine for
+          reporting this.
 
 Fri Jun 18 16:54:43 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 
-	* apps/gperf/src/Key_List.cpp (output_lookup_array): Prefixed
-	  debug message with "GPERF".
+        * apps/gperf/src/Key_List.cpp (output_lookup_array): Prefixed
+          debug message with "GPERF".
 
 Thu Jun 17 18:04:30 1999  Douglas C. Schmidt  <schmidt@mambo.cs.wustl.edu>
 
-	* tests/test-[1-5].exp: Fixed all the tests to account for the new
- 	  EBCDIC output.
+        * tests/test-[1-5].exp: Fixed all the tests to account for the new
+          EBCDIC output.
 
 Thu Jun 17 17:25:00 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-	* src/Key_List.cpp (output_hash_function): Generate an asso_values
- 	  table that will have the appropriate values for both EBCDIC or
- 	  ASCII, depending on the platform.
+        * src/Key_List.cpp (output_hash_function): Generate an asso_values
+          table that will have the appropriate values for both EBCDIC or
+          ASCII, depending on the platform.
 
-	* src/Key_List.cpp (output_hash_function),
-	  src/Gen_Perf.cpp (Gen_Perf),
-	  src/Vectors.h: Replaced the use of ALPHA_SIZE with
-	  ACE_STANDARD_CHARACTER_SET_SIZE, which works correctly for
-	  EBCDIC platforms, as well as ASCII ones.  Thanks to
-	  Jim Rogers  <jrogers@viasoft.com> for this suggestion.
+        * src/Key_List.cpp (output_hash_function),
+          src/Gen_Perf.cpp (Gen_Perf),
+          src/Vectors.h: Replaced the use of ALPHA_SIZE with
+          ACE_STANDARD_CHARACTER_SET_SIZE, which works correctly for
+          EBCDIC platforms, as well as ASCII ones.  Thanks to
+          Jim Rogers  <jrogers@viasoft.com> for this suggestion.
 
 Wed Jun 16 19:08:01 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
-	* src/Key_List.cpp: Fixed the key_word table generation so that it
- 	  generates the "default fill" string for the null entries in the
- 	  table. Thanks to Irfan and Naga for helping in this.
+        * src/Key_List.cpp: Fixed the key_word table generation so that it
+          generates the "default fill" string for the null entries in the
+          table. Thanks to Irfan and Naga for helping in this.
 
 Sun Jun  6 15:47:23 1999  Douglas C. Schmidt  <schmidt@danzon.cs.wustl.edu>
 
-	* src/Key_List.cpp (output_switch): Make sure to generate "const
- 	  char *resword;" rather than "char *resword" since otherwise C++
- 	  compilers correctly complain.
+        * src/Key_List.cpp (output_switch): Make sure to generate "const
+          char *resword;" rather than "char *resword" since otherwise C++
+          compilers correctly complain.
 
-	* tests: Fixed a bunch of warnings related to misuses of "const
-	  char *".
+        * tests: Fixed a bunch of warnings related to misuses of "const
+          char *".
 
 Sun Jun  6 10:30:09 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-	* tests/test-4.exp: Fixed another use of "index".  Thanks to David
- 	  Levine for reporting this.
+        * tests/test-4.exp: Fixed another use of "index".  Thanks to David
+          Levine for reporting this.
 
 Sat Jun  5 23:17:39 1999  Douglas C. Schmidt  <schmidt@danzon.cs.wustl.edu>
 
-	* Replaced all uses of "index" with "slot" to avoid problems with
- 	  broken C++ compilers that define a macro called "index".
+        * Replaced all uses of "index" with "slot" to avoid problems with
+          broken C++ compilers that define a macro called "index".
 
 Tue May  4 14:24:27 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
-	* src/Options.cpp (parse_args): Removed %a flag from -v option and
-	  used ACE_OS::exit (0) instead.
+        * src/Options.cpp (parse_args): Removed %a flag from -v option and
+          used ACE_OS::exit (0) instead.
 
 Mon Apr 26 15:42:54 1999  Ossama Othman  <othman@cs.wustl.edu>
 
-	* tests/test-{1,2,3,4,5}.exp: Forgot to update the expected test
- 	  output to reflect the version string update listed below.
+        * tests/test-{1,2,3,4,5}.exp: Forgot to update the expected test
+          output to reflect the version string update listed below.
 
 Mon Apr 26 10:42:08 1999  Ossama Othman  <othman@cs.wustl.edu>
 
-	* src/Version.cpp (version_string): Updated version string to "2.8
- 	  (ACE version)" since 2.7 is used by the old Cygnus maintained
- 	  gperf.
+        * src/Version.cpp (version_string): Updated version string to "2.8
+          (ACE version)" since 2.7 is used by the old Cygnus maintained
+          gperf.
 
-	* src/*.{h,cpp}: Updated copyright/distribution information to GPL
- 	  v2 style notice.
+        * src/*.{h,cpp}: Updated copyright/distribution information to GPL
+          v2 style notice.
 
 Sun Apr 25 16:16:12 1999  Ossama Othman  <othman@cs.wustl.edu>
 
-	* mdate-sh: Added this file to the CVS repository.  It will be
- 	  used once the auto{conf,make} integrations are in place.
+        * mdate-sh: Added this file to the CVS repository.  It will be
+          used once the auto{conf,make} integrations are in place.
 
 Sun Apr 25 16:13:40 1999  Ossama Othman  <othman@cs.wustl.edu>
 
-	* COPYING: Updated to GPL version 2.
+        * COPYING: Updated to GPL version 2.
 
 Sat Apr 24 18:18:35 1999  Ossama Othman  <othman@cs.wustl.edu>
 
-	* gperf.1:
-	* gperf.info:
-	* gperf.texi: Added missing quote, cosmetic fix, regenerated
- 	  gperf.info.
+        * gperf.1:
+        * gperf.info:
+        * gperf.texi: Added missing quote, cosmetic fix, regenerated
+          gperf.info.
 
-	* src/Key_List.cpp
-	* src/Options.h:
-	* src/Options.cpp: Merged Cygnus patch that allows the user to
- 	  specify a default fill expression/value in the keyword table.
-  	  Updated help message with new `-F' option.  Made some cosmetic
- 	  fixes to the help message, too.
+        * src/Key_List.cpp
+        * src/Options.h:
+        * src/Options.cpp: Merged Cygnus patch that allows the user to
+          specify a default fill expression/value in the keyword table.
+          Updated help message with new `-F' option.  Made some cosmetic
+          fixes to the help message, too.
 
-	* tests/test.cpp: Minor spelling correction in comment
+        * tests/test.cpp: Minor spelling correction in comment
 
-	* tests/test-6.exp: Updated with new expected gperf output.
+        * tests/test-6.exp: Updated with new expected gperf output.
 
 Mon Nov  9 23:37:09 1998  Vishal Kachroo <vishal@cs.wustl.edu>
 
-	* src/Key_List.cpp: Fixed the problem with Binary and Linear
- 	  Search code.
+        * src/Key_List.cpp: Fixed the problem with Binary and Linear
+          Search code.
 
 Sat Oct 10 18:40:56 1998  Vishal Kachroo  <vishal@merengue.cs.wustl.edu>
 
-	* tests/test-6.exp (Usage): copied the output of gperf -h option
- 	  into test-6.exp. This test was failing because it didn't have
- 	  the -b option previously. Thanks to David for reporting the
- 	  failure of tests.
+        * tests/test-6.exp (Usage): copied the output of gperf -h option
+          into test-6.exp. This test was failing because it didn't have
+          the -b option previously. Thanks to David for reporting the
+          failure of tests.
 
-	* src/Options.cpp : Changed the option case 'h' to include the
- 	  following line " -b/t Code for Linear Search".
+        * src/Options.cpp : Changed the option case 'h' to include the
+          following line " -b/t Code for Linear Search".
 
 Fri Oct  9 01:06:56 1998  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
-	* src/Options.cpp :
-	* src/Key_List.cpp (output_linear_search_function): Changed option
- 	  -z to -b for generating linear search. Removed <len> parameter
- 	  from the lookup code. We dont need <len> in the generated code
- 	  in the case of linear/binary search options.
+        * src/Options.cpp :
+        * src/Key_List.cpp (output_linear_search_function): Changed option
+          -z to -b for generating linear search. Removed <len> parameter
+          from the lookup code. We dont need <len> in the generated code
+          in the case of linear/binary search options.
 
 Thu Oct  8 17:40:19 1998  Vishal Kachroo  <vishal@merengue.cs.wustl.edu>
 
-	* src/Gen_Perf.cpp (run): added the linear search changes.
-	* src/Gen_Perf.h        : added the linear search changes.
-	* src/Options.cpp	: added the linear search changes.
-	* src/Options.h		: added the linear search changes.
-	* src/Key_List.cpp	: added the linear search changes.
-	* src/Key_List.h	: added the linear search changes.
+        * src/Gen_Perf.cpp (run): added the linear search changes.
+        * src/Gen_Perf.h        : added the linear search changes.
+        * src/Options.cpp       : added the linear search changes.
+        * src/Options.h         : added the linear search changes.
+        * src/Key_List.cpp      : added the linear search changes.
+        * src/Key_List.h        : added the linear search changes.
 
 
 Wed Oct  7 01:20:35 1998  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
-	* tests/test-6.exp:
-	  Updated thif file to the current help message. Thanks to Hans
-	  for reporting this.
+        * tests/test-6.exp:
+          Updated thif file to the current help message. Thanks to Hans
+          for reporting this.
 
 Tue Oct  6 11:51:47 1998  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
-	* src/Key_List.cpp (Key_List): Fixed g++ warnings.
+        * src/Key_List.cpp (Key_List): Fixed g++ warnings.
 
 Tue Oct  6 02:48:37 1998  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
-	Thanks to Vishal the following things have been done to get Binary
-	Search code generated from GPERF.
+        Thanks to Vishal the following things have been done to get Binary
+        Search code generated from GPERF.
 
-	* src/Options.cpp (parse_args): Added the -B option for the binary
-	  search.
+        * src/Options.cpp (parse_args): Added the -B option for the binary
+          search.
 
-	* src/Options.h (enum Option_Type): Added the BINARYSEARCH in the
-	  enumeration.
+        * src/Options.h (enum Option_Type): Added the BINARYSEARCH in the
+          enumeration.
 
-	* src/Key_List.cpp : Added the function
- 	  output_binary_search_function(void). Changed the output function
- 	  to include the Binary Search option.  Used option[BINARYSEARCH]
- 	  to distinguish the binary search case from the hashing case.
+        * src/Key_List.cpp : Added the function
+          output_binary_search_function(void). Changed the output function
+          to include the Binary Search option.  Used option[BINARYSEARCH]
+          to distinguish the binary search case from the hashing case.
 
-	* src/Key_List.h : Added the prototype for
- 	  output_binary_search_function.  Also added the key_sort variable
- 	  to enable sorting based on key values.
+        * src/Key_List.h : Added the prototype for
+          output_binary_search_function.  Also added the key_sort variable
+          to enable sorting based on key values.
 
 
 Mon Oct  5 18:24:15 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-	* src/Gen_Perf: Created a new function that allows us to split the
- 	  binary search and perfect hash logic apart.  Thanks to Vishal
- 	  and Alex for reporting this.
+        * src/Gen_Perf: Created a new function that allows us to split the
+          binary search and perfect hash logic apart.  Thanks to Vishal
+          and Alex for reporting this.
 
-	* src/Key_List.cpp (dump): Fixed the unsigned problems with line
- 	  1502 YET again...  Thanks to David/Darrell for reporting this.
+        * src/Key_List.cpp (dump): Fixed the unsigned problems with line
+          1502 YET again...  Thanks to David/Darrell for reporting this.
 
 Sun Oct  4 20:42:56 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-	* src: Fixed yet another problem with switching from array-based
- 	  lookups to switch-based lookups.  Thanks to Carlos for reporting
- 	  this.
+        * src: Fixed yet another problem with switching from array-based
+          lookups to switch-based lookups.  Thanks to Carlos for reporting
+          this.
 
 Sat Oct  3 19:36:52 1998  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
-	* src/Options.h:
-	* src/Options.cpp:
-	* src/Key_List.h:
-	* src/Key_List.cpp: Reverted all the changes done for Binary
- 	  Search.
+        * src/Options.h:
+        * src/Options.cpp:
+        * src/Key_List.h:
+        * src/Key_List.cpp: Reverted all the changes done for Binary
+          Search.
 
 Sat Oct  3 17:51:10 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-	* tests/test-6.exp: Added the new -B option.
+        * tests/test-6.exp: Added the new -B option.
 
 Sat Oct  3 13:47:40 1998  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
-	* src/Key_List.cpp (output_binary_search_function): Added a new
- 	  line after binary search code.
+        * src/Key_List.cpp (output_binary_search_function): Added a new
+          line after binary search code.
 
 Sat Oct  3 10:11:15 1998  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
-	* src/Options.cpp (parse_args): Changed the option for binary
- 	  search to '-B'
+        * src/Options.cpp (parse_args): Changed the option for binary
+          search to '-B'
 
 Fri Oct  2 21:38:54 1998  Vishal Kachroo  <vishal@merengue.cs.wustl.edu>
 
-	* src/Options.cpp (parse_args): Added the -b option for the binary
- 	  search.
+        * src/Options.cpp (parse_args): Added the -b option for the binary
+          search.
 
-	* src/Options.h (enum Option_Type): Added the BINARYSEARCH in the
- 	  enumeration.
+        * src/Options.h (enum Option_Type): Added the BINARYSEARCH in the
+          enumeration.
 
-	* src/Key_List.cpp : Added the function
- 	  output_binary_search_function (void). Changed the output
- 	  function to include the Binary Search option.  Used
- 	  option[BINARYSEARCH] to distinguish the binary search case from
- 	  the hashing case.
+        * src/Key_List.cpp : Added the function
+          output_binary_search_function (void). Changed the output
+          function to include the Binary Search option.  Used
+          option[BINARYSEARCH] to distinguish the binary search case from
+          the hashing case.
 
-	* src/Key_List.h : Added the prototype for
- 	  output_binary_search_function.  Also added the key_sort variable
- 	  to enable sorting based on key values.
+        * src/Key_List.h : Added the prototype for
+          output_binary_search_function.  Also added the key_sort variable
+          to enable sorting based on key values.
 
 Thu Oct  1 12:40:59 1998  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
-	* src/Options.cpp (parse_args): Comments for Vishal to incorporate
- 	  Binary Seach on to GPERF.
+        * src/Options.cpp (parse_args): Comments for Vishal to incorporate
+          Binary Seach on to GPERF.
 
 Wed Sep 30 16:55:53 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-	* tests/Makefile: Updated dependencies, added a realclean target
- 	  to remove the output from the tests.
+        * tests/Makefile: Updated dependencies, added a realclean target
+          to remove the output from the tests.
 
 Wed Sep 30 12:41:29 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-	* src/Key_List.cpp (dump): Fixed another signed/unsigned int
- 	  mismatch.  Thanks to David Levine for reporting this.
+        * src/Key_List.cpp (dump): Fixed another signed/unsigned int
+          mismatch.  Thanks to David Levine for reporting this.
 
 Mon Sep 28 13:18:05 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-	* tests: Updated all the test-*.exp files to reflect the latest
- 	  "unsigned" changes.
+        * tests: Updated all the test-*.exp files to reflect the latest
+          "unsigned" changes.
 
-	* src/Key_List.cpp (output_hash_function): Fixed another use of
- 	  int to be unsigned int.
+        * src/Key_List.cpp (output_hash_function): Fixed another use of
+          int to be unsigned int.
 
-	* tests/test.cpp: Fixed the signature of in_word_set() to be
- 	  consistent with the new gperf.  Thanks to David Levine and
- 	  Carlos O'Ryan for this fix.
+        * tests/test.cpp: Fixed the signature of in_word_set() to be
+          consistent with the new gperf.  Thanks to David Levine and
+          Carlos O'Ryan for this fix.
 
 Sun Sep 27 00:04:18 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-	* src/Key_List.cpp (dump): Reverted back to using int for
- 	  keyword_width to keep certain compilers happy.  Thanks to David
- 	  Levine for reporting this.
+        * src/Key_List.cpp (dump): Reverted back to using int for
+          keyword_width to keep certain compilers happy.  Thanks to David
+          Levine for reporting this.
 
-	* src/Key_List: MAke sure that we don't generate the lookup table
- 	  twice if we're forced to change to the switch format.
+        * src/Key_List: MAke sure that we don't generate the lookup table
+          twice if we're forced to change to the switch format.
 
-	* src/Key_List: Replaced the use of "int" with "unsigned int" for
- 	  parameters and hash values.
+        * src/Key_List: Replaced the use of "int" with "unsigned int" for
+          parameters and hash values.
 
-	* src/Key_List: Fixed the code so that if we change over to using
- 	  the switch statement then we use the already generated keyword
- 	  table appropriately.  This prevents unnecessary warnings from
- 	  some C++ compilers.  Thanks to David Levine for reporting this.
+        * src/Key_List: Fixed the code so that if we change over to using
+          the switch statement then we use the already generated keyword
+          table appropriately.  This prevents unnecessary warnings from
+          some C++ compilers.  Thanks to David Levine for reporting this.
 
-	* src/Key_List.cpp (output): If it's not possible to use the
- 	  lookup_array implementation of -D (e.g., because there aren't
- 	  enough empty slots in the lookup_array), then default to using
- 	  -S1 option...  This fixes a nasty bug that's been in gperf for
- 	  years....
+        * src/Key_List.cpp (output): If it's not possible to use the
+          lookup_array implementation of -D (e.g., because there aren't
+          enough empty slots in the lookup_array), then default to using
+          -S1 option...  This fixes a nasty bug that's been in gperf for
+          years....
 
-	* src/Key_List.cpp: (output_lookup_array): Added a "return 0" to
- 	  make the C++ compiler happy.  Thanks to David for noticing this.
+        * src/Key_List.cpp: (output_lookup_array): Added a "return 0" to
+          make the C++ compiler happy.  Thanks to David for noticing this.
 
-	* tests/c++-res.exp: Added a new test for C++ keywords.
+        * tests/c++-res.exp: Added a new test for C++ keywords.
 
-	* tests/corba.gperf: Added a proper test for CORBA keywords.
+        * tests/corba.gperf: Added a proper test for CORBA keywords.
 
 Sat Sep 26 15:32:56 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-	* src/Hash_Table.cpp (find): Fixed a bug in the increment
- 	  computation that arose if the -n option was given.
+        * src/Hash_Table.cpp (find): Fixed a bug in the increment
+          computation that arose if the -n option was given.
 
-	* src: Removed all set_ and get_ prefixes to be more consistent
- 	  with ACE programming guidelines.
+        * src: Removed all set_ and get_ prefixes to be more consistent
+          with ACE programming guidelines.
 
-	* src: GPERF now Purifies cleanly.
+        * src: GPERF now Purifies cleanly.
 
-	* src/Gen_Perf: Cleaned up the code so that if errors occur they
- 	  get handled properly.
+        * src/Gen_Perf: Cleaned up the code so that if errors occur they
+          get handled properly.
 
-	* src/List_Node: Added a destructor to remove the memory when
-	  we're done.
+        * src/List_Node: Added a destructor to remove the memory when
+          we're done.
 
-	* src: Continued to tidy up the source code so that it is better
- 	  designed and Purifies cleanly on shutdown.
+        * src: Continued to tidy up the source code so that it is better
+          designed and Purifies cleanly on shutdown.
 
-	* src/Makefile: Removed the need for libGperf.{a,so}.
+        * src/Makefile: Removed the need for libGperf.{a,so}.
 
-	* src/Key_List: Changed read_keys() to return a value so that we
- 	  can check for errors.
+        * src/Key_List: Changed read_keys() to return a value so that we
+          can check for errors.
 
 Fri Sep 25 08:54:41 1998  David L. Levine  <levine@cs.wustl.edu>
 
diff --git a/apps/gperf/tests/Makefile b/apps/gperf/tests/Makefile
index 31a9989f888..e775a4aadfa 100644
--- a/apps/gperf/tests/Makefile
+++ b/apps/gperf/tests/Makefile
@@ -240,7 +240,7 @@ realclean:
  $(ACE_ROOT)/ace/Log_Record.i
 
 .obj/cinset.o .obj/cinset.so .shobj/cinset.o .shobj/cinset.so: cinset.cpp
-c++
+
 .obj/inset.o .obj/inset.so .shobj/inset.o .shobj/inset.so: c++inset.cpp
 
 .obj/iinset.o .obj/iinset.so .shobj/iinset.o .shobj/iinset.so: iinset.cpp