diff options
| -rw-r--r-- | TAO/ChangeLog | 11 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp | 5 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.RTEvent | 1 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/RTEvent.bor | 1 |
5 files changed, 16 insertions, 9 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index a0176e853f1..2691e2bfe29 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,14 @@ +Mon Jun 23 22:28:49 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp: + * orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp: Removed the + usage of TAO_Event_CRC. Used ACE::crc32 () instead. Thanks to + Carlos for pointing it out. + + * orbsvcs/orbsvcs/Makefile.RTEvent: + * orbsvcs/orbsvcs/RTEvent.bor: Removed CRC.{h,cpp} from the + library. + Mon Jun 23 19:35:58 2003 Nanbor Wang <nanbor@cs.wustl.edu> * tao/ObjRefTemplate/ObjRefTemplate.mpc: Changed parent project diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp index de12845a655..ca5b532d0fc 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp @@ -2,9 +2,9 @@ #include "ECG_CDR_Message_Receiver.h" #include "ECG_CDR_Message_Sender.h" -#include "CRC.h" #include "tao/Exception.h" #include "ace/SOCK_Dgram.h" +#include "ace/ACE.h" #if !defined(__ACE_INLINE__) #include "ECG_CDR_Message_Receiver.i" @@ -286,9 +286,8 @@ TAO_ECG_CDR_Message_Receiver::handle_input ( { iov[0].iov_len -= 4; // don't include crc - crc = TAO_Event_CRC::compute_crc (iov, 2); - - } + crc = ACE::crc32 (iov, 2); + } // Check whether the message is a loopback message. if (this->ignore_from_.get () != 0 && this->ignore_from_->is_loopback (from)) diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp index 2c31d03d01e..002b5f888ff 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp @@ -1,11 +1,10 @@ // $Id$ #include "ECG_CDR_Message_Sender.h" -#include "CRC.h" - #include "tao/CDR.h" #include "ace/SOCK_Dgram.h" #include "ace/INET_Addr.h" +#include "ace/ACE.h" #if !defined(__ACE_INLINE__) #include "ECG_CDR_Message_Sender.i" @@ -227,7 +226,7 @@ TAO_ECG_CDR_Message_Sender::send_fragment (const ACE_INET_Addr &addr, unsigned char *crc_parts = (unsigned char *)(&crc); if (iovcnt > 1) { - crc = TAO_Event_CRC::compute_crc (iov, iovcnt); + crc = ACE::crc32 (iov, iovcnt); crc = htonl (crc); } for (int cnt=0; cnt<4; ++cnt) diff --git a/TAO/orbsvcs/orbsvcs/Makefile.RTEvent b/TAO/orbsvcs/orbsvcs/Makefile.RTEvent index a6a45d82342..e47a774c008 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.RTEvent +++ b/TAO/orbsvcs/orbsvcs/Makefile.RTEvent @@ -103,7 +103,6 @@ CPP_SRCS += \ Event/ECG_UDP_EH \ Event/ECG_Mcast_EH \ Event/ECG_UDP_Receiver \ - Event/CRC \ Event/ECG_CDR_Message_Sender IDL_SRC = \ diff --git a/TAO/orbsvcs/orbsvcs/RTEvent.bor b/TAO/orbsvcs/orbsvcs/RTEvent.bor index 206f8da231b..422f1d611ff 100644 --- a/TAO/orbsvcs/orbsvcs/RTEvent.bor +++ b/TAO/orbsvcs/orbsvcs/RTEvent.bor @@ -50,7 +50,6 @@ OBJFILES = \ $(OBJDIR)\ECG_Address_Server_Base.obj \ $(OBJDIR)\ECG_CDR_Message_Receiver.obj \ $(OBJDIR)\ECG_CDR_Message_Sender.obj \ - $(OBJDIR)\CRC.obj \ $(OBJDIR)\ECG_Complex_Address_Server.obj \ $(OBJDIR)\ECG_Mcast_Gateway.obj \ $(OBJDIR)\ECG_Simple_Address_Server.obj \ |