diff options
Diffstat (limited to 'ACE/protocols')
41 files changed, 51 insertions, 133 deletions
diff --git a/ACE/protocols/ace/HTBP/HTBP_ID_Requestor.cpp b/ACE/protocols/ace/HTBP/HTBP_ID_Requestor.cpp index ee29ed17ca2..509c2607512 100644 --- a/ACE/protocols/ace/HTBP/HTBP_ID_Requestor.cpp +++ b/ACE/protocols/ace/HTBP/HTBP_ID_Requestor.cpp @@ -101,7 +101,7 @@ ACE::HTBP::ID_Requestor::get_HTID () if (ACE::HTBP::ID_Requestor::htid_.length() != 0) return ACE::HTBP::ID_Requestor::htid_.rep(); - ACE_Guard<ACE_SYNCH_MUTEX> guard (ACE::HTBP::ID_Requestor::htid_lock_); + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, ACE::HTBP::ID_Requestor::htid_lock_, 0); if (ACE::HTBP::ID_Requestor::htid_.length() != 0) return ACE::HTBP::ID_Requestor::htid_.rep(); diff --git a/ACE/protocols/ace/HTBP/HTBP_Session.cpp b/ACE/protocols/ace/HTBP/HTBP_Session.cpp index ee5ce58d501..f02ba5c9ce3 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Session.cpp +++ b/ACE/protocols/ace/HTBP/HTBP_Session.cpp @@ -25,7 +25,7 @@ ACE_SYNCH_MUTEX ACE::HTBP::Session::session_id_lock_; ACE_UINT32 ACE::HTBP::Session::next_session_id () { - ACE_Guard<ACE_SYNCH_MUTEX> g(ACE::HTBP::Session::session_id_lock_); + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, g, ACE::HTBP::Session::session_id_lock_, 0); return ++last_session_id_; } diff --git a/ACE/protocols/ace/INet/FTP_Request.h b/ACE/protocols/ace/INet/FTP_Request.h index c73e955e4b5..d57bb4898de 100644 --- a/ACE/protocols/ace/INet/FTP_Request.h +++ b/ACE/protocols/ace/INet/FTP_Request.h @@ -11,7 +11,7 @@ #include /**/ "ace/pre.h" -#include "ace/Array.h" +#include "ace/Containers_T.h" #include "ace/INet/INet_Export.h" #include "ace/INet/Request.h" #include "ace/SString.h" diff --git a/ACE/protocols/ace/INet/FTP_Response.h b/ACE/protocols/ace/INet/FTP_Response.h index 06d632b0e16..022cd77e9d2 100644 --- a/ACE/protocols/ace/INet/FTP_Response.h +++ b/ACE/protocols/ace/INet/FTP_Response.h @@ -14,7 +14,7 @@ #include "ace/INet/INet_Export.h" #include "ace/INet/Response.h" #include "ace/SString.h" -#include "ace/Array.h" +#include "ace/Containers_T.h" #include <iostream> ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/protocols/ace/INet/HTTP_Request.h b/ACE/protocols/ace/INet/HTTP_Request.h index b549e403c59..b10a870f389 100644 --- a/ACE/protocols/ace/INet/HTTP_Request.h +++ b/ACE/protocols/ace/INet/HTTP_Request.h @@ -17,7 +17,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Array.h" +#include "ace/Containers_T.h" #include "ace/INet/INet_Export.h" #include "ace/INet/Request.h" #include "ace/INet/HTTP_Header.h" diff --git a/ACE/protocols/ace/INet/HTTP_Response.h b/ACE/protocols/ace/INet/HTTP_Response.h index 46c0fa4fa8e..fe6e3fbc813 100644 --- a/ACE/protocols/ace/INet/HTTP_Response.h +++ b/ACE/protocols/ace/INet/HTTP_Response.h @@ -17,7 +17,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Array.h" +#include "ace/Containers_T.h" #include "ace/INet/INet_Export.h" #include "ace/INet/Response.h" #include "ace/INet/HTTP_Header.h" diff --git a/ACE/protocols/ace/INet/HeaderBase.h b/ACE/protocols/ace/INet/HeaderBase.h index 67b10282192..5231ee24294 100644 --- a/ACE/protocols/ace/INet/HeaderBase.h +++ b/ACE/protocols/ace/INet/HeaderBase.h @@ -19,7 +19,7 @@ #include "ace/SString.h" #include "ace/Containers_T.h" -#include "ace/Array.h" +#include "ace/Containers_T.h" #include "ace/OS_NS_ctype.h" #include "ace/INet/INet_Export.h" #include <iostream> diff --git a/ACE/protocols/ace/RMCast/Acknowledge.cpp b/ACE/protocols/ace/RMCast/Acknowledge.cpp index 2423357e92a..09af788bd9a 100644 --- a/ACE/protocols/ace/RMCast/Acknowledge.cpp +++ b/ACE/protocols/ace/RMCast/Acknowledge.cpp @@ -1,6 +1,5 @@ -// file : ace/RMCast/Acknowledge.cpp // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ +// $Id$ #include "ace/Time_Value.h" // ACE_Time_Value #include "ace/OS_NS_unistd.h" @@ -9,12 +8,6 @@ #include "Acknowledge.h" -/* -#include <iostream> -using std::cerr; -using std::endl; -*/ - namespace ACE_RMCast { Acknowledge:: diff --git a/ACE/protocols/ace/RMCast/Acknowledge.h b/ACE/protocols/ace/RMCast/Acknowledge.h index 3d7654b1fec..799ff7e353b 100644 --- a/ACE/protocols/ace/RMCast/Acknowledge.h +++ b/ACE/protocols/ace/RMCast/Acknowledge.h @@ -1,6 +1,5 @@ -// file : ace/RMCast/Acknowledge.h +// $Id$ // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ #ifndef ACE_RMCAST_ACKNOWLEDGE_H #define ACE_RMCAST_ACKNOWLEDGE_H diff --git a/ACE/protocols/ace/RMCast/Bits.h b/ACE/protocols/ace/RMCast/Bits.h index 1b45580647b..79a0bde104e 100644 --- a/ACE/protocols/ace/RMCast/Bits.h +++ b/ACE/protocols/ace/RMCast/Bits.h @@ -1,6 +1,5 @@ -// file : ace/RMCast/Bits.h +// $Id$ // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ #ifndef ACE_RMCAST_BITS_H #define ACE_RMCAST_BITS_H @@ -13,13 +12,10 @@ namespace ACE_RMCast { typedef ACE_SYNCH_MUTEX Mutex; +// FUZZ: disable check_for_ACE_Guard typedef ACE_Guard<Mutex> Lock; typedef ACE_Condition<Mutex> Condition; - - // tmp - // - //using std::cerr; - //using std::endl; +// FUZZ: enable check_for_ACE_Guard } diff --git a/ACE/protocols/ace/RMCast/Flow.cpp b/ACE/protocols/ace/RMCast/Flow.cpp index c5d9f63a754..a0d75081075 100644 --- a/ACE/protocols/ace/RMCast/Flow.cpp +++ b/ACE/protocols/ace/RMCast/Flow.cpp @@ -1,6 +1,5 @@ -// file : ace/RMCast/Flow.cpp // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ +// $Id$ #include "Flow.h" @@ -9,12 +8,6 @@ #include "ace/os_include/os_math.h" // exp -/* -#include <iostream> -using std::cerr; -using std::endl; -*/ - namespace ACE_RMCast { Flow:: diff --git a/ACE/protocols/ace/RMCast/Flow.h b/ACE/protocols/ace/RMCast/Flow.h index e64d0d438a2..7c8848b8d3d 100644 --- a/ACE/protocols/ace/RMCast/Flow.h +++ b/ACE/protocols/ace/RMCast/Flow.h @@ -1,6 +1,5 @@ -// file : ace/RMCast/Flow.h +// $Id$ // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ #ifndef ACE_RMCAST_FLOW_H #define ACE_RMCAST_FLOW_H diff --git a/ACE/protocols/ace/RMCast/Fragment.cpp b/ACE/protocols/ace/RMCast/Fragment.cpp index 9a483e7cfbe..3bf08f24350 100644 --- a/ACE/protocols/ace/RMCast/Fragment.cpp +++ b/ACE/protocols/ace/RMCast/Fragment.cpp @@ -1,6 +1,5 @@ -// file : ace/RMCast/Fragment.cpp // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ +// $Id$ #include "Fragment.h" diff --git a/ACE/protocols/ace/RMCast/Fragment.h b/ACE/protocols/ace/RMCast/Fragment.h index bfaa3044c83..6362c51bfbb 100644 --- a/ACE/protocols/ace/RMCast/Fragment.h +++ b/ACE/protocols/ace/RMCast/Fragment.h @@ -1,6 +1,5 @@ -// file : ace/RMCast/Fragment.h +// $Id$ // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ #ifndef ACE_RMCAST_FRAGMENT_H #define ACE_RMCAST_FRAGMENT_H diff --git a/ACE/protocols/ace/RMCast/Link.cpp b/ACE/protocols/ace/RMCast/Link.cpp index 12e6003d456..a863addfec2 100644 --- a/ACE/protocols/ace/RMCast/Link.cpp +++ b/ACE/protocols/ace/RMCast/Link.cpp @@ -1,6 +1,5 @@ -// file : ace/RMCast/Link.cpp // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ +// $Id$ #include "ace/Time_Value.h" // ACE_Time_Value #include "ace/OS_NS_stdio.h" diff --git a/ACE/protocols/ace/RMCast/Link.h b/ACE/protocols/ace/RMCast/Link.h index 6397322556f..35ca7fb2f15 100644 --- a/ACE/protocols/ace/RMCast/Link.h +++ b/ACE/protocols/ace/RMCast/Link.h @@ -1,6 +1,5 @@ -// file : ace/RMCast/Link.h +// $Id$ // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ #ifndef ACE_RMCAST_LINK_H #define ACE_RMCAST_LINK_H diff --git a/ACE/protocols/ace/RMCast/Parameters.h b/ACE/protocols/ace/RMCast/Parameters.h index d254bd00fad..0137979fcf7 100644 --- a/ACE/protocols/ace/RMCast/Parameters.h +++ b/ACE/protocols/ace/RMCast/Parameters.h @@ -1,6 +1,5 @@ -// file : ace/RMCast/Parameters.h +// $Id$ // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ #ifndef ACE_RMCAST_PARAMETERS_H #define ACE_RMCAST_PARAMETERS_H diff --git a/ACE/protocols/ace/RMCast/Protocol.cpp b/ACE/protocols/ace/RMCast/Protocol.cpp index 755872371cb..9ae7804d010 100644 --- a/ACE/protocols/ace/RMCast/Protocol.cpp +++ b/ACE/protocols/ace/RMCast/Protocol.cpp @@ -1,6 +1,5 @@ -// file : ace/RMCast/Protocol.cpp // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ +// $Id$ #include "Protocol.h" diff --git a/ACE/protocols/ace/RMCast/Protocol.h b/ACE/protocols/ace/RMCast/Protocol.h index 50090523ad0..f86a1fa3afc 100644 --- a/ACE/protocols/ace/RMCast/Protocol.h +++ b/ACE/protocols/ace/RMCast/Protocol.h @@ -1,6 +1,5 @@ -// file : ace/RMCast/Protocol.h +// $Id$ // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ #ifndef ACE_RMCAST_PROTOCOL_H #define ACE_RMCAST_PROTOCOL_H @@ -22,10 +21,6 @@ #include "Bits.h" -/* -#include <iostream> -*/ - namespace ACE_RMCast { // Basic types. diff --git a/ACE/protocols/ace/RMCast/Reassemble.cpp b/ACE/protocols/ace/RMCast/Reassemble.cpp index e5aeab92519..2ffa5c2a7d0 100644 --- a/ACE/protocols/ace/RMCast/Reassemble.cpp +++ b/ACE/protocols/ace/RMCast/Reassemble.cpp @@ -1,16 +1,9 @@ -// file : ace/RMCast/Reassemble.cpp // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ +// $Id$ #include "Reassemble.h" #include "ace/OS_NS_stdlib.h" -/* -#include <iostream> -using std::cerr; -using std::endl; -*/ - namespace ACE_RMCast { Reassemble:: diff --git a/ACE/protocols/ace/RMCast/Reassemble.h b/ACE/protocols/ace/RMCast/Reassemble.h index cffa4fdc359..37a12cf8922 100644 --- a/ACE/protocols/ace/RMCast/Reassemble.h +++ b/ACE/protocols/ace/RMCast/Reassemble.h @@ -1,6 +1,5 @@ -// file : ace/RMCast/Reassemble.h +// $Id$ // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ #ifndef ACE_RMCAST_REASSEMBLE_H #define ACE_RMCAST_REASSEMBLE_H diff --git a/ACE/protocols/ace/RMCast/Retransmit.cpp b/ACE/protocols/ace/RMCast/Retransmit.cpp index 6611bb14b52..1a570f337fa 100644 --- a/ACE/protocols/ace/RMCast/Retransmit.cpp +++ b/ACE/protocols/ace/RMCast/Retransmit.cpp @@ -1,6 +1,5 @@ -// file : ace/RMCast/Retransmit.cpp // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ +// $Id$ #include "ace/Time_Value.h" // ACE_Time_Value #include "ace/OS_NS_stdlib.h" // abort @@ -8,12 +7,6 @@ #include "Retransmit.h" -/* -#include <iostream> -using std::cerr; -using std::endl; -*/ - namespace ACE_RMCast { Retransmit:: diff --git a/ACE/protocols/ace/RMCast/Retransmit.h b/ACE/protocols/ace/RMCast/Retransmit.h index 0a3a8f72bd7..977f61b4c42 100644 --- a/ACE/protocols/ace/RMCast/Retransmit.h +++ b/ACE/protocols/ace/RMCast/Retransmit.h @@ -1,6 +1,5 @@ -// file : ace/RMCast/Retransmit.h // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ +// $Id$ #ifndef ACE_RMCAST_RETRANSMIT_H #define ACE_RMCAST_RETRANSMIT_H diff --git a/ACE/protocols/ace/RMCast/Simulator.cpp b/ACE/protocols/ace/RMCast/Simulator.cpp index ec879c865ba..c449821aa95 100644 --- a/ACE/protocols/ace/RMCast/Simulator.cpp +++ b/ACE/protocols/ace/RMCast/Simulator.cpp @@ -1,6 +1,5 @@ -// file : ace/RMCast/Simulator.cpp // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ +// $Id$ #include "ace/OS_NS_time.h" #include "Simulator.h" diff --git a/ACE/protocols/ace/RMCast/Simulator.h b/ACE/protocols/ace/RMCast/Simulator.h index 27b227f488b..0548ae2fa93 100644 --- a/ACE/protocols/ace/RMCast/Simulator.h +++ b/ACE/protocols/ace/RMCast/Simulator.h @@ -1,6 +1,5 @@ -// file : ace/RMCast/Simulator.h +// $Id$ // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ #ifndef ACE_RMCAST_SIMULATOR_H #define ACE_RMCAST_SIMULATOR_H diff --git a/ACE/protocols/ace/RMCast/Socket.cpp b/ACE/protocols/ace/RMCast/Socket.cpp index 51e6d450173..b3bd0b2a01c 100644 --- a/ACE/protocols/ace/RMCast/Socket.cpp +++ b/ACE/protocols/ace/RMCast/Socket.cpp @@ -1,6 +1,5 @@ -// file : ace/RMCast/Socket.cpp // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ +// $Id$ #include "ace/OS_Memory.h" #include "ace/OS_NS_stdio.h" diff --git a/ACE/protocols/ace/RMCast/Socket.h b/ACE/protocols/ace/RMCast/Socket.h index 3468df15d4d..261808afe8c 100644 --- a/ACE/protocols/ace/RMCast/Socket.h +++ b/ACE/protocols/ace/RMCast/Socket.h @@ -1,6 +1,5 @@ -// file : ace/RMCast/Socket.h +// $Id$ // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ #ifndef ACE_RMCAST_SOCKET_H #define ACE_RMCAST_SOCKET_H diff --git a/ACE/protocols/ace/RMCast/Stack.cpp b/ACE/protocols/ace/RMCast/Stack.cpp index 19d592f5c21..68b0d31bcfe 100644 --- a/ACE/protocols/ace/RMCast/Stack.cpp +++ b/ACE/protocols/ace/RMCast/Stack.cpp @@ -1,6 +1,5 @@ -// file : ace/RMCast/Stack.cpp // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ +// $Id$ #include "Stack.h" diff --git a/ACE/protocols/ace/RMCast/Stack.h b/ACE/protocols/ace/RMCast/Stack.h index 322fe0dc501..1637d87a1d4 100644 --- a/ACE/protocols/ace/RMCast/Stack.h +++ b/ACE/protocols/ace/RMCast/Stack.h @@ -1,6 +1,5 @@ -// file : ace/RMCast/Stack.h +// $Id$ // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ #ifndef ACE_RMCAST_STACK_H #define ACE_RMCAST_STACK_H diff --git a/ACE/protocols/ace/TMCast/FaultDetector.hpp b/ACE/protocols/ace/TMCast/FaultDetector.hpp index d91540ba6f6..b629cf27078 100644 --- a/ACE/protocols/ace/TMCast/FaultDetector.hpp +++ b/ACE/protocols/ace/TMCast/FaultDetector.hpp @@ -1,6 +1,5 @@ -// file : ACE_TMCast/FaultDetector.hpp +// $Id$ // author : Boris Kolpackov <boris@dre.vanderbilt.edu> -// cvs-id : $Id$ #include "Protocol.hpp" diff --git a/ACE/protocols/ace/TMCast/Group.cpp b/ACE/protocols/ace/TMCast/Group.cpp index 1165aa34e98..edc73145dd1 100644 --- a/ACE/protocols/ace/TMCast/Group.cpp +++ b/ACE/protocols/ace/TMCast/Group.cpp @@ -1,6 +1,5 @@ -// file : ACE_TMCast/Group.cpp +// $Id$ // author : Boris Kolpackov <boris@dre.vanderbilt.edu> -// cvs-id : $Id$ #include "Group.hpp" @@ -298,7 +297,9 @@ namespace ACE_TMCast ACE_Thread_Mutex mutex_; ACE_Condition<ACE_Thread_Mutex> cond_; +// FUZZ: disable check_for_ACE_Guard typedef ACE_Guard<ACE_Thread_Mutex> AutoLock; +// FUZZ: enable check_for_ACE_Guard char id_[Protocol::MEMBER_ID_LENGTH]; @@ -463,7 +464,9 @@ namespace ACE_TMCast ACE_Condition<ACE_Thread_Mutex> send_cond_; ACE_Condition<ACE_Thread_Mutex> recv_cond_; + // FUZZ: disable check_for_ACE_Guard typedef ACE_Guard<ACE_Thread_Mutex> AutoLock; + // FUZZ: enable check_for_ACE_Guard bool failed_; diff --git a/ACE/protocols/ace/TMCast/Group.hpp b/ACE/protocols/ace/TMCast/Group.hpp index 1ec39ca4f22..55adb735a87 100644 --- a/ACE/protocols/ace/TMCast/Group.hpp +++ b/ACE/protocols/ace/TMCast/Group.hpp @@ -1,6 +1,5 @@ -// file : ACE_TMCast/Group.hpp +// $Id$ // author : Boris Kolpackov <boris@dre.vanderbilt.edu> -// cvs-id : $Id$ #ifndef TMCAST_GROUP_HPP #define TMCAST_GROUP_HPP diff --git a/ACE/protocols/ace/TMCast/GroupFwd.hpp b/ACE/protocols/ace/TMCast/GroupFwd.hpp index d224586545e..43da9eef0a6 100644 --- a/ACE/protocols/ace/TMCast/GroupFwd.hpp +++ b/ACE/protocols/ace/TMCast/GroupFwd.hpp @@ -1,6 +1,5 @@ -// file : ACE_TMCast/GroupFwd.hpp +// $Id$ // author : Boris Kolpackov <boris@dre.vanderbilt.edu> -// cvs-id : $Id$ #ifndef TMCAST_GROUP_FWD_HPP #define TMCAST_GROUP_FWD_HPP diff --git a/ACE/protocols/ace/TMCast/LinkListener.hpp b/ACE/protocols/ace/TMCast/LinkListener.hpp index 983f7828f3e..c432e2f54f2 100644 --- a/ACE/protocols/ace/TMCast/LinkListener.hpp +++ b/ACE/protocols/ace/TMCast/LinkListener.hpp @@ -1,6 +1,5 @@ -// file : ACE_TMCast/LinkListener.hpp +// $Id$ // author : Boris Kolpackov <boris@dre.vanderbilt.edu> -// cvs-id : $Id$ // OS primitives #include <ace/OS_NS_string.h> @@ -15,15 +14,8 @@ namespace ACE_TMCast { - // - // - // class LinkFailure : public virtual Message {}; - - // - // - // class LinkData : public virtual Message { public: @@ -64,9 +56,6 @@ namespace ACE_TMCast ACE_Refcounted_Auto_Ptr<LinkData, ACE_Null_Mutex> LinkDataPtr; - // - // - // class LinkListener { private: @@ -161,7 +150,9 @@ namespace ACE_TMCast } private: + // FUZZ: disable check_for_ACE_Guard typedef ACE_Guard<ACE_Thread_Mutex> AutoLock; + // FUZZ: enable check_for_ACE_Guard ACE_hthread_t thread_; ACE_SOCK_Dgram_Mcast& sock_; diff --git a/ACE/protocols/ace/TMCast/MTQueue.cpp b/ACE/protocols/ace/TMCast/MTQueue.cpp index 9f08db5843d..74eef90ae38 100644 --- a/ACE/protocols/ace/TMCast/MTQueue.cpp +++ b/ACE/protocols/ace/TMCast/MTQueue.cpp @@ -1,6 +1,5 @@ -// file : ACE_TMCast/MTQueue.cpp +// $Id$ // author : Steve Huston <shuston@riverace.com> -// cvs-id : $Id$ #include "LinkListener.hpp" #include "MTQueue.hpp" diff --git a/ACE/protocols/ace/TMCast/MTQueue.hpp b/ACE/protocols/ace/TMCast/MTQueue.hpp index 2eb128823fe..ac0c83b4c1f 100644 --- a/ACE/protocols/ace/TMCast/MTQueue.hpp +++ b/ACE/protocols/ace/TMCast/MTQueue.hpp @@ -1,6 +1,5 @@ -// file : ACE_TMCast/MTQueue.hpp +// $Id$ // author : Boris Kolpackov <boris@dre.vanderbilt.edu> -// cvs-id : $Id$ #ifndef TMCAST_MT_QUEUE_HPP #define TMCAST_MT_QUEUE_HPP diff --git a/ACE/protocols/ace/TMCast/Messaging.hpp b/ACE/protocols/ace/TMCast/Messaging.hpp index f17dd40b03c..a75191f23f0 100644 --- a/ACE/protocols/ace/TMCast/Messaging.hpp +++ b/ACE/protocols/ace/TMCast/Messaging.hpp @@ -1,6 +1,5 @@ -// file : ACE_TMCast/Messaging.hpp +// $Id$ // author : Boris Kolpackov <boris@dre.vanderbilt.edu> -// cvs-id : $Id$ #ifndef TMCAST_MESSAGING_HPP #define TMCAST_MESSAGING_HPP diff --git a/ACE/protocols/ace/TMCast/Protocol.cpp b/ACE/protocols/ace/TMCast/Protocol.cpp index ea4c6b39020..14991207edd 100644 --- a/ACE/protocols/ace/TMCast/Protocol.cpp +++ b/ACE/protocols/ace/TMCast/Protocol.cpp @@ -1,6 +1,5 @@ -// file : ACE_TMCast/Protocol.cpp +// $Id$ // author : Boris Kolpackov <boris@dre.vanderbilt.edu> -// cvs-id : $Id$ #include "Protocol.hpp" diff --git a/ACE/protocols/ace/TMCast/Protocol.hpp b/ACE/protocols/ace/TMCast/Protocol.hpp index 6cdf374f4f9..91ef5ab4dab 100644 --- a/ACE/protocols/ace/TMCast/Protocol.hpp +++ b/ACE/protocols/ace/TMCast/Protocol.hpp @@ -1,6 +1,5 @@ -// file : ACE_TMCast/Protocol.hpp +// $Id$ // author : Boris Kolpackov <boris@dre.vanderbilt.edu> -// cvs-id : $Id$ #ifndef TMCAST_PROTOCOL_HPP #define TMCAST_PROTOCOL_HPP @@ -9,9 +8,6 @@ namespace ACE_TMCast { namespace Protocol { - // - // - // unsigned long const MEMBER_ID_LENGTH = 38; struct MemberId @@ -23,13 +19,8 @@ namespace ACE_TMCast */ }; - // - // - // typedef unsigned short TransactionId; - - typedef unsigned char TransactionStatus; TransactionStatus const TS_BEGIN = 1; @@ -51,9 +42,6 @@ namespace ACE_TMCast // typedef Transaction TransactionList[TL_LENGTH]; - // - // - // struct MessageHeader { unsigned long length; @@ -67,11 +55,6 @@ namespace ACE_TMCast //TransactionList transaction_list; }; - - // - // - // - unsigned long const MAX_MESSAGE_SIZE = 768; unsigned long const diff --git a/ACE/protocols/ace/TMCast/TransactionController.hpp b/ACE/protocols/ace/TMCast/TransactionController.hpp index 0ed5002bdf1..2ac6f3bcf66 100644 --- a/ACE/protocols/ace/TMCast/TransactionController.hpp +++ b/ACE/protocols/ace/TMCast/TransactionController.hpp @@ -1,6 +1,5 @@ -// file : ACE_TMCast/TransactionController.hpp +// $Id$ // author : Boris Kolpackov <boris@dre.vanderbilt.edu> -// cvs-id : $Id$ #include "ace/OS_NS_string.h" #include "ace/OS_NS_stdlib.h" @@ -367,7 +366,9 @@ namespace ACE_TMCast } private: + // FUZZ: disable check_for_ACE_Guard typedef ACE_Guard<ACE_Thread_Mutex> AutoLock; + // FUZZ: enable check_for_ACE_Guard bool trace_; diff --git a/ACE/protocols/tests/INet/MT_Get/Main.cpp b/ACE/protocols/tests/INet/MT_Get/Main.cpp index a106c5e6fab..5b6732aee13 100644 --- a/ACE/protocols/tests/INet/MT_Get/Main.cpp +++ b/ACE/protocols/tests/INet/MT_Get/Main.cpp @@ -2,7 +2,7 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" -#include "ace/Array.h" +#include "ace/Containers_T.h" #include "ace/Reactor.h" #include "ace/INet/HTTP_URL.h" #include "ace/INet/HTTP_ClientRequestHandler.h" |