Zap more id

18 files changed, 4 insertions, 23 deletions

diff --git a/ACE/Kokyu/kokyu_config.h b/ACE/Kokyu/kokyu_config.h
index 4eab747376e..21e1a21419f 100644
--- a/ACE/Kokyu/kokyu_config.h
+++ b/ACE/Kokyu/kokyu_config.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 #ifndef KOKYU_CONFIG_H
 #define KOKYU_CONFIG_H
 
diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/acconfig.h b/ACE/apps/JAWS/clients/WebSTONE/src/acconfig.h
index 2183ecd4a7f..e29d411b37e 100644
--- a/ACE/apps/JAWS/clients/WebSTONE/src/acconfig.h
+++ b/ACE/apps/JAWS/clients/WebSTONE/src/acconfig.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* Special definitions for autoheader
         Copyright (C) 1995 Silicon Graphics, Inc.
 */
diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/bench.h b/ACE/apps/JAWS/clients/WebSTONE/src/bench.h
index 489b6596efc..cc196ef09ac 100644
--- a/ACE/apps/JAWS/clients/WebSTONE/src/bench.h
+++ b/ACE/apps/JAWS/clients/WebSTONE/src/bench.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 /**************************************************************************
  *                                                                        *
  *               Copyright (C) 1995 Silicon Graphics, Inc.                *
diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/config.h b/ACE/apps/JAWS/clients/WebSTONE/src/config.h
index 782ba57a71b..ae96e98e0a3 100644
--- a/ACE/apps/JAWS/clients/WebSTONE/src/config.h
+++ b/ACE/apps/JAWS/clients/WebSTONE/src/config.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* config.h.  Generated automatically by configure.  */
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
 
diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/debug.h b/ACE/apps/JAWS/clients/WebSTONE/src/debug.h
index 2322c287931..1c0d4af0a3b 100644
--- a/ACE/apps/JAWS/clients/WebSTONE/src/debug.h
+++ b/ACE/apps/JAWS/clients/WebSTONE/src/debug.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 /**************************************************************************
  *                                                                        *
  *               Copyright (C) 1995 Silicon Graphics, Inc.                *
diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/get.h b/ACE/apps/JAWS/clients/WebSTONE/src/get.h
index 57ac8707445..030c0d35f81 100644
--- a/ACE/apps/JAWS/clients/WebSTONE/src/get.h
+++ b/ACE/apps/JAWS/clients/WebSTONE/src/get.h
@@ -1,6 +1,5 @@
 #ifndef __GET_H__
 #define __GET_H__
-/* $Id$ */
 /**************************************************************************
  *                                                                        *
  *               Copyright (C) 1995 Silicon Graphics, Inc.                *
diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/parse_file_list.h b/ACE/apps/JAWS/clients/WebSTONE/src/parse_file_list.h
index 715686228db..30cf75e381a 100644
--- a/ACE/apps/JAWS/clients/WebSTONE/src/parse_file_list.h
+++ b/ACE/apps/JAWS/clients/WebSTONE/src/parse_file_list.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 /**************************************************************************
  *                                                                        *
  *               Copyright (C) 1995 Silicon Graphics, Inc.                *
diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/statistics.h b/ACE/apps/JAWS/clients/WebSTONE/src/statistics.h
index 9f4bea75229..b0420515ae5 100644
--- a/ACE/apps/JAWS/clients/WebSTONE/src/statistics.h
+++ b/ACE/apps/JAWS/clients/WebSTONE/src/statistics.h
@@ -1,7 +1,5 @@
 #ifndef _STATISTICS_H_
 #define _STATISTICS_H_
-/* $Id$ */
-
 extern double   mean(const double, const int);
 extern double   variance(const double, const double, const int);
 extern double   stddev(const double, const double, const int);
diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/sysdep.h b/ACE/apps/JAWS/clients/WebSTONE/src/sysdep.h
index 6dcb23e4a18..4749c2e7949 100644
--- a/ACE/apps/JAWS/clients/WebSTONE/src/sysdep.h
+++ b/ACE/apps/JAWS/clients/WebSTONE/src/sysdep.h
@@ -1,6 +1,5 @@
 #ifndef __SYSDEP_H__
 #define __SYSDEP_H__
-/* $Id$ */
 /**************************************************************************
  *                                                                        *
  *               Copyright (C) 1995 Silicon Graphics, Inc.                *
diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/timefunc.h b/ACE/apps/JAWS/clients/WebSTONE/src/timefunc.h
index 884aeea82d9..14cfe2c7afa 100644
--- a/ACE/apps/JAWS/clients/WebSTONE/src/timefunc.h
+++ b/ACE/apps/JAWS/clients/WebSTONE/src/timefunc.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 /**************************************************************************
  *               Copyright (C) 1995 Silicon Graphics, Inc.                *
  *                                                                        *
diff --git a/ACE/apps/JAWS2/JAWS/Headers.cpp b/ACE/apps/JAWS2/JAWS/Headers.cpp
index 26f51a89970..ca36aa11f31 100644
--- a/ACE/apps/JAWS2/JAWS/Headers.cpp
+++ b/ACE/apps/JAWS2/JAWS/Headers.cpp
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 #include "JAWS/Headers.h"
 #include "ace/OS_NS_stdlib.h"
 #include "ace/OS_NS_strings.h"
diff --git a/ACE/bin/zap_svn_id.pl b/ACE/bin/zap_svn_id.pl
index 2f920fa3d17..59b313879a1 100755
--- a/ACE/bin/zap_svn_id.pl
+++ b/ACE/bin/zap_svn_id.pl
@@ -43,3 +43,7 @@ BEGIN{undef $/;} s/\/\/ -\*- C\+\+ -\*-  \$Id\$\n/\/\/ -\*- C\+\+ -\*-\n/smg;
 BEGIN{undef $/;} s/\/\/ -\*- C\+\+ -\*- \$Id\$\n/\/\/ -\*- C\+\+ -\*-\n/smg;
 # Replace a three line doxygen style Id tag with just line *
 BEGIN{undef $/;} s/\/\*\n \* \$Id\$\n \*\n/\/\*\n/smg;
+# Replace a one line c++-style id tag with an empty line below that with nothing
+BEGIN{undef $/;} s/\/\* \$Id\$ \*\/\n\n//smg;
+# Replace a one line c++-style id tag with an empty line below that with nothing
+BEGIN{undef $/;} s/\/\* \$Id\$ \*\/\n//smg;
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/edf_scheduler_config.h b/TAO/examples/Kokyu_dsrt_schedulers/edf_scheduler_config.h
index cccd8b004a0..b7f8b249af7 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/edf_scheduler_config.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/edf_scheduler_config.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 #ifndef EDF_SCHEDULER_CONFIG_H
 #define EDF_SCHEDULER_CONFIG_H
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/global.h b/TAO/orbsvcs/orbsvcs/AV/global.h
index bcc4d2fa15a..205cddd7b3e 100644
--- a/TAO/orbsvcs/orbsvcs/AV/global.h
+++ b/TAO/orbsvcs/orbsvcs/AV/global.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* GLOBAL.H - RSAREF types and constants
  */
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/md5.h b/TAO/orbsvcs/orbsvcs/AV/md5.h
index 4bcb01b04b4..a8d20ef60a7 100644
--- a/TAO/orbsvcs/orbsvcs/AV/md5.h
+++ b/TAO/orbsvcs/orbsvcs/AV/md5.h
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* MD5.H - header file for MD5C.C
  */
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/md5c.cpp b/TAO/orbsvcs/orbsvcs/AV/md5c.cpp
index aa4a99f8fb3..1926769e8dc 100644
--- a/TAO/orbsvcs/orbsvcs/AV/md5c.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/md5c.cpp
@@ -23,8 +23,6 @@ These notices must be retained in any copies of any part of this
 documentation and/or software.
  */
 
-/* $Id$ */
-
 #include "orbsvcs/AV/global.h"
 #include "orbsvcs/AV/md5.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h
index 350705ec2d0..87171891a77 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 #ifndef TAO_SSLIOP_PARAMS_DUP_H
 #define TAO_SSLIOP_PARAMS_DUP_H
 
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.cpp
index 33fd84ef56d..cbe8462a77f 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Timer.cpp
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 #include "Timer.h"
 #include "Task_Client.h"