Zapped c-style id tag with no space between // and $Id$

21 files changed, 5 insertions, 39 deletions

diff --git a/ACE/ACEXML/common/AttributesImpl.inl b/ACE/ACEXML/common/AttributesImpl.inl
index 75fc288950d..78f47317e25 100644
--- a/ACE/ACEXML/common/AttributesImpl.inl
+++ b/ACE/ACEXML/common/AttributesImpl.inl
@@ -1,7 +1,5 @@
 // -*- C++ -*-
 //
-//$Id$
-
 #include "ace/ACE.h"
 #include "ace/OS_NS_string.h"
 
diff --git a/ACE/ace/Abstract_Timer_Queue.cpp b/ACE/ace/Abstract_Timer_Queue.cpp
index 61843eda154..021c637fe6e 100644
--- a/ACE/ace/Abstract_Timer_Queue.cpp
+++ b/ACE/ace/Abstract_Timer_Queue.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef ACE_ABSTRACT_TIMER_QUEUE_CPP
 #define ACE_ABSTRACT_TIMER_QUEUE_CPP
 #include "ace/config-all.h"
diff --git a/ACE/ace/Abstract_Timer_Queue.h b/ACE/ace/Abstract_Timer_Queue.h
index 9ef249386c8..d8460d5bf56 100644
--- a/ACE/ace/Abstract_Timer_Queue.h
+++ b/ACE/ace/Abstract_Timer_Queue.h
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef ACE_ABSTRACT_TIMER_QUEUE_H
 #define ACE_ABSTRACT_TIMER_QUEUE_H
 
diff --git a/ACE/ace/Cache_Map_Manager_T.inl b/ACE/ace/Cache_Map_Manager_T.inl
index a4a94f7ee24..dc2a42ef0f5 100644
--- a/ACE/ace/Cache_Map_Manager_T.inl
+++ b/ACE/ace/Cache_Map_Manager_T.inl
@@ -1,7 +1,5 @@
 // -*- C++ -*-
 //
-//$Id$
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class KEY, class VALUE, class CMAP_TYPE, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE int
diff --git a/ACE/ace/Cached_Connect_Strategy_T.cpp b/ACE/ace/Cached_Connect_Strategy_T.cpp
index 2ccb2ac090b..7af66260693 100644
--- a/ACE/ace/Cached_Connect_Strategy_T.cpp
+++ b/ACE/ace/Cached_Connect_Strategy_T.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef ACE_CACHED_CONNECT_STRATEGY_T_CPP
 #define ACE_CACHED_CONNECT_STRATEGY_T_CPP
 
diff --git a/ACE/ace/Caching_Strategies_T.cpp b/ACE/ace/Caching_Strategies_T.cpp
index 8674548cb31..9db1902e735 100644
--- a/ACE/ace/Caching_Strategies_T.cpp
+++ b/ACE/ace/Caching_Strategies_T.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef ACE_CACHING_STRATEGIES_T_CPP
 #define ACE_CACHING_STRATEGIES_T_CPP
 
diff --git a/ACE/ace/Caching_Strategies_T.inl b/ACE/ace/Caching_Strategies_T.inl
index 5e25e387aa8..dd9c9851326 100644
--- a/ACE/ace/Caching_Strategies_T.inl
+++ b/ACE/ace/Caching_Strategies_T.inl
@@ -1,7 +1,5 @@
 // -*-C++-*-
 //
-//$Id$
-
 //////////////////////////////////////////////////////////////////////////////////
 
 #include "ace/OS_Memory.h"
diff --git a/ACE/ace/Cleanup_Strategies_T.cpp b/ACE/ace/Cleanup_Strategies_T.cpp
index 2bc7bd6fe53..53cf0b876ac 100644
--- a/ACE/ace/Cleanup_Strategies_T.cpp
+++ b/ACE/ace/Cleanup_Strategies_T.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef ACE_CLEANUP_STRATEGIES_T_CPP
 #define ACE_CLEANUP_STRATEGIES_T_CPP
 
diff --git a/ACE/ace/Event_Handler_Handle_Timeout_Upcall.h b/ACE/ace/Event_Handler_Handle_Timeout_Upcall.h
index 6b8681ffcdc..200e2e47248 100644
--- a/ACE/ace/Event_Handler_Handle_Timeout_Upcall.h
+++ b/ACE/ace/Event_Handler_Handle_Timeout_Upcall.h
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef ACE_EVENT_HANDLER_HANDLE_TIMEOUT_UPCALL_H
 #define ACE_EVENT_HANDLER_HANDLE_TIMEOUT_UPCALL_H
 
diff --git a/ACE/ace/Hashable.cpp b/ACE/ace/Hashable.cpp
index 60f4ae35bc9..547a3065f64 100644
--- a/ACE/ace/Hashable.cpp
+++ b/ACE/ace/Hashable.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "ace/Hashable.h"
 
 #if !defined (__ACE_INLINE__)
diff --git a/ACE/ace/Notification_Strategy.inl b/ACE/ace/Notification_Strategy.inl
index 47479030ab6..f1c1598d0b4 100644
--- a/ACE/ace/Notification_Strategy.inl
+++ b/ACE/ace/Notification_Strategy.inl
@@ -1,7 +1,5 @@
 // -*- C++ -*-
 //
-//$Id$
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE ACE_Event_Handler *
diff --git a/ACE/ace/QtReactor/QtReactor.cpp b/ACE/ace/QtReactor/QtReactor.cpp
index 4202bc4cf56..ce602960591 100644
--- a/ACE/ace/QtReactor/QtReactor.cpp
+++ b/ACE/ace/QtReactor/QtReactor.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "ace/QtReactor/QtReactor.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Recyclable.cpp b/ACE/ace/Recyclable.cpp
index 70cb3d95c9d..d42aea8a4f4 100644
--- a/ACE/ace/Recyclable.cpp
+++ b/ACE/ace/Recyclable.cpp
@@ -1,4 +1,3 @@
-//$Id$
 #include "ace/Recyclable.h"
 
 
diff --git a/ACE/ace/Recyclable.inl b/ACE/ace/Recyclable.inl
index ef096ff62be..7a7e3fda268 100644
--- a/ACE/ace/Recyclable.inl
+++ b/ACE/ace/Recyclable.inl
@@ -1,7 +1,5 @@
 // -*- C++ -*-
 //
-//$Id$
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE ACE_Recyclable_State
diff --git a/ACE/ace/Refcountable_T.inl b/ACE/ace/Refcountable_T.inl
index fe0d39bfecf..7a901476d9a 100644
--- a/ACE/ace/Refcountable_T.inl
+++ b/ACE/ace/Refcountable_T.inl
@@ -1,7 +1,5 @@
 // -*- C++ -*-
 //
-//$Id$
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class ACE_LOCK>
diff --git a/ACE/ace/Timer_Queue_Iterator.cpp b/ACE/ace/Timer_Queue_Iterator.cpp
index b50e7452ba5..29a8547ae96 100644
--- a/ACE/ace/Timer_Queue_Iterator.cpp
+++ b/ACE/ace/Timer_Queue_Iterator.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef ACE_TIMER_QUEUE_ITERATOR_CPP
 #define ACE_TIMER_QUEUE_ITERATOR_CPP
 
diff --git a/ACE/ace/Timer_Queue_Iterator.h b/ACE/ace/Timer_Queue_Iterator.h
index b852df5f06e..14f5676d0e5 100644
--- a/ACE/ace/Timer_Queue_Iterator.h
+++ b/ACE/ace/Timer_Queue_Iterator.h
@@ -1,5 +1,3 @@
-//$Id$
-
 #ifndef ACE_TIMER_QUEUE_ITERATOR_H
 #define ACE_TIMER_QUEUE_ITERATOR_H
 
diff --git a/ACE/ace/UUID.cpp b/ACE/ace/UUID.cpp
index 1c3811e5fc2..b8206531e03 100644
--- a/ACE/ace/UUID.cpp
+++ b/ACE/ace/UUID.cpp
@@ -1,5 +1,3 @@
-//$Id$
-
 #include "ace/UUID.h"
 #include "ace/Guard_T.h"
 
diff --git a/ACE/ace/UUID.inl b/ACE/ace/UUID.inl
index d4167a74642..a497da64667 100644
--- a/ACE/ace/UUID.inl
+++ b/ACE/ace/UUID.inl
@@ -1,7 +1,5 @@
 // -*- C++ -*-
 //
-//$Id$
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace ACE_Utils
diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h
index fde4674fa79..316dcb26333 100644
--- a/ACE/ace/config-win32-borland.h
+++ b/ACE/ace/config-win32-borland.h
@@ -1,6 +1,4 @@
 //-*- C++ -*-
-//$Id$
-
 // The following configuration file contains defines for Borland compilers.
 
 #ifndef ACE_CONFIG_WIN32_BORLAND_H
diff --git a/ACE/bin/zap_svn_id.pl b/ACE/bin/zap_svn_id.pl
index ab9bfc60431..e78fadaa262 100755
--- a/ACE/bin/zap_svn_id.pl
+++ b/ACE/bin/zap_svn_id.pl
@@ -30,4 +30,9 @@ BEGIN{undef $/;} s/\/\/\n\/\/ \$Id\$\n//smg;
 BEGIN{undef $/;} s/\/\/ \$Id\$\n\n//smg;
 # Replace a one line c-style id tag with nothing
 BEGIN{undef $/;} s/\/\/ \$Id\$\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 nothing
+BEGIN{undef $/;} s/\/\/\$Id\$\n//smg;
+