removed CVS Id tokens as they cause never ending hassles when merging

in from branches
2004-10-04 18:55:40 +00:00
parent 4b8e2bcf2c
commit 302cde41b0
77 changed files with 15 additions and 85 deletions
--- a/src/ca/CASG.cpp
+++ b/src/ca/CASG.cpp
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
- *  $Id$
 *      Author: Jeffrey O. Hill
 *              hill@luke.lanl.gov
 *              (505) 665 1831
--- a/src/ca/access.cpp
+++ b/src/ca/access.cpp
@@ -9,7 +9,6 @@
 \*************************************************************************/

 /*
- *  $Id$
 *
 *                    L O S  A L A M O S
 *              Los Alamos National Laboratory
--- a/src/ca/autoPtrDestroy.h
+++ b/src/ca/autoPtrDestroy.h
@@ -9,7 +9,6 @@
 \*************************************************************************/

 /*  
- *  $Id$
 *
 *                              
 *                    L O S  A L A M O S
--- a/src/ca/autoPtrFreeList.h
+++ b/src/ca/autoPtrFreeList.h
@@ -9,7 +9,6 @@
 \*************************************************************************/

 /*  
- *  $Id$
 *
 *                              
 *                    L O S  A L A M O S
--- a/src/ca/autoPtrRecycle.h
+++ b/src/ca/autoPtrRecycle.h
@@ -9,7 +9,6 @@
 \*************************************************************************/

 /*  
- *  $Id$
 *
 *                              
 *                    L O S  A L A M O S
--- a/src/ca/baseNMIU.cpp
+++ b/src/ca/baseNMIU.cpp
@@ -8,7 +8,7 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/

-/*  $Id$
+/*  
 *
 *                    L O S  A L A M O S
 *              Los Alamos National Laboratory
--- a/src/ca/bhe.cpp
+++ b/src/ca/bhe.cpp
@@ -8,7 +8,7 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
    
-/*  $Id$
+/*  
 *
 *                    L O S  A L A M O S
 *              Los Alamos National Laboratory
--- a/src/ca/bhe.h
+++ b/src/ca/bhe.h
@@ -9,7 +9,6 @@
 \*************************************************************************/

 /*  
- * $Id$
 *
 *                    L O S  A L A M O S
 *              Los Alamos National Laboratory
--- a/src/ca/caProto.h
+++ b/src/ca/caProto.h
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
- *      $Id$
 *
 *      Author  Jeffrey O. Hill
 *              johill@lanl.gov
--- a/src/ca/caRepeater.cpp
+++ b/src/ca/caRepeater.cpp
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
- *  $Id$
 *
 *  CA UDP repeater standalone executable
 *
--- a/src/ca/caServerID.h
+++ b/src/ca/caServerID.h
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
- *  $Id$
 *
 *                    L O S  A L A M O S
 *              Los Alamos National Laboratory
--- a/src/ca/ca_client_context.cpp
+++ b/src/ca/ca_client_context.cpp
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*  
- *  $Id$
 *
 *                              
 *                    L O S  A L A M O S
--- a/src/ca/cac.cpp
+++ b/src/ca/cac.cpp
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*  
- *  $Id$
 *
 *                    L O S  A L A M O S
 *              Los Alamos National Laboratory
--- a/src/ca/cac.h
+++ b/src/ca/cac.h
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*  
- *  $Id$
 *
 *                              
 *                    L O S  A L A M O S
--- a/src/ca/cacChannel.cpp
+++ b/src/ca/cacChannel.cpp
@@ -9,7 +9,7 @@
 \*************************************************************************/


-/*  $Id$
+/*  
 *
 *                    L O S  A L A M O S
 *              Los Alamos National Laboratory
--- a/src/ca/cacChannelNotify.cpp
+++ b/src/ca/cacChannelNotify.cpp
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*  
- *  $Id$
 *
 *                              
 *                    L O S  A L A M O S
--- a/src/ca/cacContextNotify.cpp
+++ b/src/ca/cacContextNotify.cpp
@@ -8,7 +8,7 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/

-/*  $Id$
+/*  
 *
 *                    L O S  A L A M O S
 *              Los Alamos National Laboratory
--- a/src/ca/cacIO.h
+++ b/src/ca/cacIO.h
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*  
- *  $Id$
 *
 *                              
 *                    L O S  A L A M O S
--- a/src/ca/cacReadNotify.cpp
+++ b/src/ca/cacReadNotify.cpp
@@ -8,7 +8,7 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/

-/*  $Id$
+/*  
 *
 *                    L O S  A L A M O S
 *              Los Alamos National Laboratory
--- a/src/ca/cacStateNotify.cpp
+++ b/src/ca/cacStateNotify.cpp
@@ -8,7 +8,7 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/

-/*  $Id$
+/*  
 *
 *                    L O S  A L A M O S
 *              Los Alamos National Laboratory
--- a/src/ca/cacWriteNotify.cpp
+++ b/src/ca/cacWriteNotify.cpp
@@ -8,7 +8,7 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/

-/*  $Id$
+/*  
 *
 *                    L O S  A L A M O S
 *              Los Alamos National Laboratory
--- a/src/ca/cadef.h
+++ b/src/ca/cadef.h
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /* 
- *  $Id$
 *
 *                    L O S  A L A M O S
 *              Los Alamos National Laboratory
--- a/src/ca/caeventmask.h
+++ b/src/ca/caeventmask.h
@@ -7,14 +7,6 @@
 * and higher are distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
-/*
-    $Id$
-    caeventmask.h
-
-    Modification History
-    joh 04-16-90    Created
-
-*/

 #ifndef INCLcaeventmaskh
 #define INCLcaeventmaskh
--- a/src/ca/casw.cpp
+++ b/src/ca/casw.cpp
@@ -8,7 +8,7 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/

-/* * $Id$
+/* 
 *
 *                    L O S  A L A M O S
 *              Los Alamos National Laboratory
--- a/src/ca/comBuf.cpp
+++ b/src/ca/comBuf.cpp
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*  
- *  $Id$
 *
 *                              
 *                    L O S  A L A M O S
--- a/src/ca/comBuf.h
+++ b/src/ca/comBuf.h
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
- *  $Id$
 *
 *
 *                    L O S  A L A M O S
--- a/src/ca/comQueRecv.cpp
+++ b/src/ca/comQueRecv.cpp
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*  
- *  $Id$
 *
 *
 *                    L O S  A L A M O S
--- a/src/ca/comQueRecv.h
+++ b/src/ca/comQueRecv.h
@@ -9,7 +9,6 @@
 \*************************************************************************/

 /*  
- *  $Id$
 *
 *                              
 *                    L O S  A L A M O S
--- a/src/ca/comQueSend.cpp
+++ b/src/ca/comQueSend.cpp
@@ -9,7 +9,6 @@
 \*************************************************************************/

 /*  
- *  $Id$
 *
 *                              
 *                    L O S  A L A M O S
--- a/src/ca/comQueSend.h
+++ b/src/ca/comQueSend.h
@@ -10,7 +10,6 @@


 /*  
- *  $Id$
 *
 *                              
 *                    L O S  A L A M O S
--- a/src/ca/db_access.h
+++ b/src/ca/db_access.h
@@ -8,8 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /* base/include/db_access.h */
-/* $Id$ */
-
 /*      Author:          Bob Dalesio
 *      Date:            4-4-88
 */
--- a/src/ca/disconnectGovernorTimer.cpp
+++ b/src/ca/disconnectGovernorTimer.cpp
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 // 
-// $Id$
 //
 //                    L O S  A L A M O S
 //              Los Alamos National Laboratory
--- a/src/ca/disconnectGovernorTimer.h
+++ b/src/ca/disconnectGovernorTimer.h
@@ -9,7 +9,6 @@
 \*************************************************************************/

 //  
-//  $Id$
 //
 //                              
 //                    L O S  A L A M O S
--- a/src/ca/getCallback.cpp
+++ b/src/ca/getCallback.cpp
@@ -9,7 +9,6 @@
 \*************************************************************************/

 /*  
- *  $Id$
 *
 *                              
 *                    L O S  A L A M O S
--- a/src/ca/getCopy.cpp
+++ b/src/ca/getCopy.cpp
@@ -9,7 +9,6 @@
 \*************************************************************************/

 /*  
- *  $Id$
 *
 *                              
 *                    L O S  A L A M O S
--- a/src/ca/hostNameCache.cpp
+++ b/src/ca/hostNameCache.cpp
@@ -9,7 +9,6 @@
 \*************************************************************************/

 /*  
- *  $Id$
 *
 *                              
 *                    L O S  A L A M O S
--- a/src/ca/hostNameCache.h
+++ b/src/ca/hostNameCache.h
@@ -9,7 +9,6 @@
 \*************************************************************************/

 /*  
- *  $Id$
 *
 *                              
 *                    L O S  A L A M O S
--- a/src/ca/inetAddrID.h
+++ b/src/ca/inetAddrID.h
@@ -8,7 +8,7 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/

-/*  $Id$
+/*  
 *
 *                    L O S  A L A M O S
 *              Los Alamos National Laboratory
--- a/src/ca/iocinf.cpp
+++ b/src/ca/iocinf.cpp
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /* 
- * $Id$
 *
 *                    L O S  A L A M O S
 *              Los Alamos National Laboratory
--- a/src/ca/iocinf.h
+++ b/src/ca/iocinf.h
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*  
- *  $Id$
 *
 *                              
 *                    L O S  A L A M O S
--- a/src/ca/localHostName.cpp
+++ b/src/ca/localHostName.cpp
@@ -8,7 +8,7 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/

-/*  $Id$
+/*  
 *
 *                    L O S  A L A M O S
 *              Los Alamos National Laboratory
--- a/src/ca/localHostName.h
+++ b/src/ca/localHostName.h
@@ -8,7 +8,7 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/

-/*  $Id$
+/*  
 *
 *                    L O S  A L A M O S
 *              Los Alamos National Laboratory
--- a/src/ca/msgForMultiplyDefinedPV.cpp
+++ b/src/ca/msgForMultiplyDefinedPV.cpp
@@ -9,7 +9,6 @@
 \*************************************************************************/

 /*  
- *  $Id$
 *
 *                              
 *                    L O S  A L A M O S
--- a/src/ca/msgForMultiplyDefinedPV.h
+++ b/src/ca/msgForMultiplyDefinedPV.h
@@ -9,7 +9,6 @@
 \*************************************************************************/

 /*  
- *  $Id$
 *
 *                              
 *                    L O S  A L A M O S
--- a/src/ca/nciu.cpp
+++ b/src/ca/nciu.cpp
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
- *  $Id$
 *
 *                    L O S  A L A M O S
 *              Los Alamos National Laboratory
--- a/src/ca/nciu.h
+++ b/src/ca/nciu.h
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*  
- *  $Id$
 *
 *                              
 *                    L O S  A L A M O S
--- a/src/ca/netIO.h
+++ b/src/ca/netIO.h
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*  
- *  $Id$
 *
 *                              
 *                    L O S  A L A M O S
--- a/src/ca/netReadNotifyIO.cpp
+++ b/src/ca/netReadNotifyIO.cpp
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
- *  $Id$
 *
 *                    L O S  A L A M O S
 *              Los Alamos National Laboratory
--- a/src/ca/netWriteNotifyIO.cpp
+++ b/src/ca/netWriteNotifyIO.cpp
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
- *  $Id$
 *
 *                    L O S  A L A M O S
 *              Los Alamos National Laboratory
--- a/src/ca/net_convert.h
+++ b/src/ca/net_convert.h
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
- *	$Id$	
 *
 *	Author: J. Hill 
 *
--- a/src/ca/netiiu.cpp
+++ b/src/ca/netiiu.cpp
@@ -8,7 +8,7 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/

-/*  $Id$
+/*  
 *
 *                    L O S  A L A M O S
 *              Los Alamos National Laboratory
--- a/src/ca/netiiu.h
+++ b/src/ca/netiiu.h
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*  
- *  $Id$
 *
 *                              
 *                    L O S  A L A M O S
--- a/src/ca/noopiiu.h
+++ b/src/ca/noopiiu.h
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*  
- *  $Id$
 *
 *                              
 *                    L O S  A L A M O S
--- a/src/ca/oldChannelNotify.cpp
+++ b/src/ca/oldChannelNotify.cpp
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*  
- *  $Id$
 *
 *                              
 *                    L O S  A L A M O S
--- a/src/ca/oldSubscription.cpp
+++ b/src/ca/oldSubscription.cpp
@@ -8,7 +8,7 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/

-/*  $Id$
+/*  
 *
 *                    L O S  A L A M O S
 *              Los Alamos National Laboratory
--- a/src/ca/putCallback.cpp
+++ b/src/ca/putCallback.cpp
@@ -9,7 +9,6 @@
 \*************************************************************************/

 /*  
- *  $Id$
 *
 *                              
 *                    L O S  A L A M O S
--- a/src/ca/repeater.cpp
+++ b/src/ca/repeater.cpp
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
- * $Id$
 *
 * REPEATER.cpp
 *
--- a/src/ca/repeaterClient.h
+++ b/src/ca/repeaterClient.h
@@ -9,7 +9,6 @@
 \*************************************************************************/

 /*  
- *  $Id$
 *
 *                              
 *                    L O S  A L A M O S
--- a/src/ca/repeaterSubscribeTimer.cpp
+++ b/src/ca/repeaterSubscribeTimer.cpp
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
- *  $Id$
 *
 *                    L O S  A L A M O S
 *              Los Alamos National Laboratory
--- a/src/ca/repeaterSubscribeTimer.h
+++ b/src/ca/repeaterSubscribeTimer.h
@@ -9,7 +9,6 @@
 \*************************************************************************/

 /*  
- *  $Id$
 *
 *                              
 *                    L O S  A L A M O S
--- a/src/ca/searchTimer.cpp
+++ b/src/ca/searchTimer.cpp
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 // 
-// $Id$
 //
 //                    L O S  A L A M O S
 //              Los Alamos National Laboratory
--- a/src/ca/searchTimer.h
+++ b/src/ca/searchTimer.h
@@ -9,7 +9,6 @@
 \*************************************************************************/

 //  
-//  $Id$
 //
 //                              
 //                    L O S  A L A M O S
--- a/src/ca/sgAutoPtr.h
+++ b/src/ca/sgAutoPtr.h
@@ -9,7 +9,6 @@
 \*************************************************************************/

 /*  
- *  $Id$
 *
 *                              
 *                    L O S  A L A M O S
--- a/src/ca/syncGroup.h
+++ b/src/ca/syncGroup.h
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*  
- *  $Id$
 *
 *                              
 *                    L O S  A L A M O S
--- a/src/ca/syncGroupNotify.cpp
+++ b/src/ca/syncGroupNotify.cpp
@@ -9,7 +9,6 @@
 \*************************************************************************/

 /*
- *  $Id$
 *      Author: Jeffrey O. Hill
 *              hill@luke.lanl.gov
 *              (505) 665 1831
--- a/src/ca/syncGroupReadNotify.cpp
+++ b/src/ca/syncGroupReadNotify.cpp
@@ -9,7 +9,6 @@
 \*************************************************************************/

 /*
- *  $Id$
 *      Author: Jeffrey O. Hill
 *              hill@luke.lanl.gov
 *              (505) 665 1831
--- a/src/ca/syncGroupWriteNotify.cpp
+++ b/src/ca/syncGroupWriteNotify.cpp
@@ -9,7 +9,6 @@
 \*************************************************************************/

 /*
- *  $Id$
 *      Author: Jeffrey O. Hill
 *              hill@luke.lanl.gov
 *              (505) 665 1831
--- a/src/ca/syncgrp.cpp
+++ b/src/ca/syncgrp.cpp
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
- *  $Id$
 *      Author: Jeffrey O. Hill
 *              hill@luke.lanl.gov
 *              (505) 665 1831
--- a/src/ca/tcpRecvWatchdog.cpp
+++ b/src/ca/tcpRecvWatchdog.cpp
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
- *  $Id$
 *
 *                    L O S  A L A M O S
 *              Los Alamos National Laboratory
--- a/src/ca/tcpRecvWatchdog.h
+++ b/src/ca/tcpRecvWatchdog.h
@@ -9,7 +9,6 @@
 \*************************************************************************/

 /*  
- *  $Id$
 *
 *                              
 *                    L O S  A L A M O S
--- a/src/ca/tcpSendWatchdog.cpp
+++ b/src/ca/tcpSendWatchdog.cpp
@@ -8,7 +8,7 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/

-/* * $Id$
+/* 
 *
 *                    L O S  A L A M O S
 *              Los Alamos National Laboratory
--- a/src/ca/tcpSendWatchdog.h
+++ b/src/ca/tcpSendWatchdog.h
@@ -9,7 +9,6 @@
 \*************************************************************************/

 /*  
- *  $Id$
 *
 *                              
 *                    L O S  A L A M O S
--- a/src/ca/tcpiiu.cpp
+++ b/src/ca/tcpiiu.cpp
@@ -9,7 +9,7 @@
 \*************************************************************************/


-/* * $Id$
+/* 
 *
 *                    L O S  A L A M O S
 *              Los Alamos National Laboratory
--- a/src/ca/templateInstances.cpp
+++ b/src/ca/templateInstances.cpp
@@ -9,7 +9,6 @@
 \*************************************************************************/

 /*  
- *  $Id$
 *
 *                              
 *                    L O S  A L A M O S
--- a/src/ca/udpiiu.cpp
+++ b/src/ca/udpiiu.cpp
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*
- *  $Id$
 *
 *                    L O S  A L A M O S
 *              Los Alamos National Laboratory
--- a/src/ca/udpiiu.h
+++ b/src/ca/udpiiu.h
@@ -9,7 +9,6 @@
 \*************************************************************************/

 /*  
- *  $Id$
 *
 *                              
 *                    L O S  A L A M O S
--- a/src/ca/virtualCircuit.h
+++ b/src/ca/virtualCircuit.h
@@ -8,7 +8,6 @@
 * in file LICENSE that is included with this distribution. 
 \*************************************************************************/
 /*  
- *  $Id$
 *
 *                              
 *                    L O S  A L A M O S