ChangeLogTag:Thu May 6 14:23:14 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

3 files changed, 47 insertions, 13 deletions

diff --git a/ChangeLog-99b b/ChangeLog-99b
index ade130a8ab8..9dd00d11406 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,3 +1,14 @@
+Thu May  6 14:23:14 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+	* ace/Synch_T.cpp:
+	  Removed ACE_ALLOC_HOOK_DEFINE macros for the Guard<> objects,
+	  they don't need them (because they are allocated on the stack)
+	  and the HOOK_DECLARE macros where not used in the header file.
+
+	* bin/count_lines:
+	  Several new file types, fixed computations when multiple modules 
+	  are used.
+
 Thu May 06 12:28:54 1999  David L. Levine  <levine@cs.wustl.edu>
 
         * docs/ACE-FMM.html: replaced a > with &gt; and added RCS Id string.
diff --git a/ace/Synch_T.cpp b/ace/Synch_T.cpp
index 8e1f347c6fa..4984d772f13 100644
--- a/ace/Synch_T.cpp
+++ b/ace/Synch_T.cpp
@@ -107,7 +107,8 @@ ACE_Atomic_Op<ACE_LOCK, TYPE>::ACE_Atomic_Op (const TYPE &c)
 // ACE_TRACE ("ACE_Atomic_Op<ACE_LOCK, TYPE>::ACE_Atomic_Op");
 }
 
-ACE_ALLOC_HOOK_DEFINE(ACE_Guard)
+// ****************************************************************
+// ACE_ALLOC_HOOK_DEFINE(ACE_Guard)
 
 template <class ACE_LOCK> void
 ACE_Guard<ACE_LOCK>::dump (void) const
@@ -120,7 +121,7 @@ ACE_Guard<ACE_LOCK>::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
 
-ACE_ALLOC_HOOK_DEFINE(ACE_Write_Guard)
+// ACE_ALLOC_HOOK_DEFINE(ACE_Write_Guard)
 
 template <class ACE_LOCK> void
 ACE_Write_Guard<ACE_LOCK>::dump (void) const
@@ -129,7 +130,7 @@ ACE_Write_Guard<ACE_LOCK>::dump (void) const
   ACE_Guard<ACE_LOCK>::dump ();
 }
 
-ACE_ALLOC_HOOK_DEFINE(ACE_Read_Guard)
+// ACE_ALLOC_HOOK_DEFINE(ACE_Read_Guard)
 
 template <class ACE_LOCK> void
 ACE_Read_Guard<ACE_LOCK>::dump (void) const
diff --git a/bin/count_lines b/bin/count_lines
index ed6f2d21375..49c541094df 100755
--- a/bin/count_lines
+++ b/bin/count_lines
@@ -32,10 +32,14 @@ foreach $module (@ARGV) {
     open(FIND, "find $module -type f|");
     @files = grep {if (!/build/
 		       && !/CVS/
+		       && !/rpc\+\+/
 		       && !/\.bpr$/
 		       && !/\.mdp$/
+		       && !/\.MDP$/
 		       && !/\.dsp$/
+		       && !/\.DSP$/
 		       && !/\.dsw$/
+		       && !/\.DSW$/
 		       && !/\.mak$/
 		       && !/\.MAK$/
 		       && !/\.o$/
@@ -46,6 +50,7 @@ foreach $module (@ARGV) {
     $totdirs = $#dirs;
     $totfiles = $#files;
     $totlines = 0;
+    %lines = ();
 
     foreach $file (@files) {
 	$n = 0;
@@ -136,30 +141,36 @@ sub initfiletypes {
     # twice, but it could be unproperly classified.
 
     local %filenames =
-	('Makefile'    => 'Makefile',
-	 'README'      => 'README files',
-	 'ChangeLog.*' => 'ChangeLog',
-	 'ChangeLog-*' => 'ChangeLog',
-	 '.cvsignore'  => 'Control CVS',
-	 'run_test.pl' => 'Test driver',
-	 'run_test'    => 'Test driver',
-	 'run_tests'   => 'Test driver',
-	 'run_test.sh' => 'Test driver');
+	('Makefile'     => 'Makefile',
+	 'README'       => 'README files',
+	 'COPYING'      => 'Licenses',
+	 'LICENSE.*'    => 'Licenses',
+	 'ChangeLog.*'  => 'ChangeLog',
+	 'ChangeLog-.*' => 'ChangeLog',
+	 '.cvsignore'   => 'Control CVS',
+	 'run_test.pl'  => 'Test driver',
+	 'run_test'     => 'Test driver',
+	 'run_tests'    => 'Test driver',
+	 'run_test.sh'  => 'Test driver');
     local %fileexts =
 	('cc'    => 'C++ sources',
 	 'cpp'   => 'C++ sources',
 	 'i'     => 'C++ sources',
 	 'h'     => 'Headers',
 	 'hh'    => 'Headers',
+	 'c'     => 'C/C++ sources',
 	 'idl'   => 'IDL sources',
 	 'IDL'   => 'IDL sources',
+	 'pidl'  => 'IDL sources',
 	 'y'     => 'yacc source',
 	 'yy'    => 'yacc source',
 	 'l'     => 'lex source',
 	 'll'    => 'lex source',
 	 'pl'    => 'perl script',
+	 'perl'  => 'perl script',
 	 'GNU'   => 'GNU make config',
 	 'tex'   => '(La)TeX',
+	 'txt'   => 'Text files',
 	 '1'     => 'man pages',
 	 '3'     => 'man pages',
 	 'html'  => 'HTML',
@@ -168,15 +179,26 @@ sub initfiletypes {
 	 'bld'   => 'VxWorks build file',
 	 'bpr'   => 'Borland project files',
 	 'dsp'   => 'DevStudio project files',
+	 'DSP'   => 'DevStudio project files',
 	 'mdp'   => 'MSVC project files',
+	 'MDP'   => 'MSVC project files',
 	 'dsw'   => 'MSVC workspaces',
+	 'DSW'   => 'MSVC workspaces',
 	 'mak'   => 'MSVC MAK files',
+	 'MAK'   => 'MSVC MAK files',
 	 'java'  => 'JAVA source',
 	 'class' => 'JAVA class',
 	 'cccc'  => 'codecount output',
 	 'gif'   => 'GIF images',
 	 'conf'  => 'Svc_Config files',
-	 'diff'  => 'patches'
+	 'diff'  => 'patches',
+	 'zip'   => 'Compressed files',
+	 'gz'    => 'Compressed files',
+	 'EXE'   => 'Win32 executable',
+	 'shar'  => 'Shar archive',
+	 'mib'   => 'MIB definition files',
+	 'gperf' => 'GPERF input',
+	 'phil.*'=> 'Test driver'
 	 );
     local %paths = ();