diff options
| author | Knut Petter Svendsen <knut@altuma.no> | 2022-09-10 12:19:28 +0200 |
|---|---|---|
| committer | Knut Petter Svendsen <knut@altuma.no> | 2022-09-10 12:19:28 +0200 |
| commit | 60987b4ba42ff6e4e6a4f4457d902a18c0c6b0a0 (patch) | |
| tree | 175e6d1a044c3603940b52ac8d085fc25548382f | |
| parent | ab436d45dc956c1eaec31bff0c43ca3a0cb0cb66 (diff) | |
| download | ATCD-60987b4ba42ff6e4e6a4f4457d902a18c0c6b0a0.tar.gz | |
Remove leading blank lines after opening {
1155 files changed, 0 insertions, 1735 deletions
diff --git a/ACE/ACEXML/common/Attributes_Def_Builder.cpp b/ACE/ACEXML/common/Attributes_Def_Builder.cpp index 11f853cb738..78e9117bea3 100644 --- a/ACE/ACEXML/common/Attributes_Def_Builder.cpp +++ b/ACE/ACEXML/common/Attributes_Def_Builder.cpp @@ -2,11 +2,9 @@ ACEXML_Attribute_Def_Builder::~ACEXML_Attribute_Def_Builder () { - } ACEXML_Attributes_Def_Builder::~ACEXML_Attributes_Def_Builder () { - } diff --git a/ACE/ACEXML/common/DTD_Manager.cpp b/ACE/ACEXML/common/DTD_Manager.cpp index af346645668..ed9bc4685f1 100644 --- a/ACE/ACEXML/common/DTD_Manager.cpp +++ b/ACE/ACEXML/common/DTD_Manager.cpp @@ -2,5 +2,4 @@ ACEXML_DTD_Manager::~ACEXML_DTD_Manager () { - } diff --git a/ACE/ACEXML/common/Element_Def_Builder.cpp b/ACE/ACEXML/common/Element_Def_Builder.cpp index 75f1bc7ff42..84f549c402d 100644 --- a/ACE/ACEXML/common/Element_Def_Builder.cpp +++ b/ACE/ACEXML/common/Element_Def_Builder.cpp @@ -2,6 +2,5 @@ ACEXML_Element_Def_Builder::~ACEXML_Element_Def_Builder () { - } diff --git a/ACE/ACEXML/common/Mem_Map_Stream.cpp b/ACE/ACEXML/common/Mem_Map_Stream.cpp index 2c188106ca2..42a3cdb9881 100644 --- a/ACE/ACEXML/common/Mem_Map_Stream.cpp +++ b/ACE/ACEXML/common/Mem_Map_Stream.cpp @@ -154,7 +154,6 @@ ACEXML_Mem_Map_Stream::open (Connector *connector, if (connector->connect (svc_handler_, addr) == -1) { - ACE_ERROR_RETURN ((LM_ERROR, "%p %s %d\n", "Connect failed", diff --git a/ACE/ACEXML/common/StrCharStream.cpp b/ACE/ACEXML/common/StrCharStream.cpp index 66974199a47..c64740d77e1 100644 --- a/ACE/ACEXML/common/StrCharStream.cpp +++ b/ACE/ACEXML/common/StrCharStream.cpp @@ -18,7 +18,6 @@ ACEXML_StrCharStream::~ACEXML_StrCharStream (void) int ACEXML_StrCharStream::open (const ACEXML_Char *str, const ACEXML_Char* name) { - if (str != 0 && name != 0) { delete [] this->start_; diff --git a/ACE/ACEXML/common/Validator.cpp b/ACE/ACEXML/common/Validator.cpp index 158e1bad9d5..1349ed6cba8 100644 --- a/ACE/ACEXML/common/Validator.cpp +++ b/ACE/ACEXML/common/Validator.cpp @@ -2,5 +2,4 @@ ACEXML_Validator::~ACEXML_Validator () { - } diff --git a/ACE/ACEXML/common/XML_Codecs.h b/ACE/ACEXML/common/XML_Codecs.h index 3a241d88ccc..b20076aa28e 100644 --- a/ACE/ACEXML/common/XML_Codecs.h +++ b/ACE/ACEXML/common/XML_Codecs.h @@ -36,7 +36,6 @@ class ACEXML_Export ACEXML_Base64 : public ACE_Base64 { public: //@{ - /** * Encodes a stream of octets to Base64 data * diff --git a/ACE/ACEXML/common/ZipCharStream.cpp b/ACE/ACEXML/common/ZipCharStream.cpp index c4399ae72d2..4b54cf73e31 100644 --- a/ACE/ACEXML/common/ZipCharStream.cpp +++ b/ACE/ACEXML/common/ZipCharStream.cpp @@ -228,7 +228,6 @@ ACEXML_ZipCharStream::get_i (ACEXML_Char& ch) int ACEXML_ZipCharStream::peek_i (void) { - // If we are reading a UTF-8 encoded file, just use the plain unget. if (ACE_OS::strcmp (this->encoding_, ACE_TEXT ("UTF-8")) == 0) return this->peekchar_i(); diff --git a/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp b/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp index ed9c4b6d6b7..371f404427c 100644 --- a/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp +++ b/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp @@ -31,8 +31,6 @@ ACEXML_SAXPrint_Handler::characters (const ACEXML_Char *cdata, void ACEXML_SAXPrint_Handler::endDocument (void) { - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); } @@ -41,8 +39,6 @@ ACEXML_SAXPrint_Handler::endElement (const ACEXML_Char *, const ACEXML_Char *, const ACEXML_Char *qName) { - - this->dec_indent (); this->print_indent (); ACE_DEBUG ((LM_DEBUG, @@ -74,8 +70,6 @@ void ACEXML_SAXPrint_Handler::processingInstruction (const ACEXML_Char *target, const ACEXML_Char *data) { - - this->print_indent (); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("<?%s %s>\n"), @@ -85,7 +79,6 @@ ACEXML_SAXPrint_Handler::processingInstruction (const ACEXML_Char *target, void ACEXML_SAXPrint_Handler::setDocumentLocator (ACEXML_Locator * locator) { - this->locator_ = locator; //ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("* Event setDocumentLocator () ***************\n"))); } @@ -93,8 +86,6 @@ ACEXML_SAXPrint_Handler::setDocumentLocator (ACEXML_Locator * locator) void ACEXML_SAXPrint_Handler::skippedEntity (const ACEXML_Char *name) { - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("* Event skippedEntity (%s) ***************\n"), name)); @@ -103,8 +94,6 @@ ACEXML_SAXPrint_Handler::skippedEntity (const ACEXML_Char *name) void ACEXML_SAXPrint_Handler::startDocument (void) { - - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("* Event startDocument () ***************\n"))); } @@ -115,8 +104,6 @@ ACEXML_SAXPrint_Handler::startElement (const ACEXML_Char *, const ACEXML_Char *qName, ACEXML_Attributes *alist) { - - this->print_indent (); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("<%s"), diff --git a/ACE/ACEXML/examples/SAXPrint/main.cpp b/ACE/ACEXML/examples/SAXPrint/main.cpp index 6a5cdee2504..e704d40c9bd 100644 --- a/ACE/ACEXML/examples/SAXPrint/main.cpp +++ b/ACE/ACEXML/examples/SAXPrint/main.cpp @@ -115,7 +115,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } else if (url != 0) { - ACE_NEW_RETURN (ustm, ACEXML_HttpCharStream (), -1); if (ustm->open (url) != 0) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/ACE/ACEXML/parser/debug_validator/Debug_DTD_Manager.cpp b/ACE/ACEXML/parser/debug_validator/Debug_DTD_Manager.cpp index 05b9fe637de..cff827cb67e 100644 --- a/ACE/ACEXML/parser/debug_validator/Debug_DTD_Manager.cpp +++ b/ACE/ACEXML/parser/debug_validator/Debug_DTD_Manager.cpp @@ -7,12 +7,10 @@ ACEXML_Debug_DTD_Manager::ACEXML_Debug_DTD_Manager () { - } ACEXML_Debug_DTD_Manager::~ACEXML_Debug_DTD_Manager () { - } ACEXML_Element_Def_Builder * diff --git a/ACE/ACEXML/parser/parser/Entity_Manager.cpp b/ACE/ACEXML/parser/parser/Entity_Manager.cpp index 586a816f24a..b9efe5a89d8 100644 --- a/ACE/ACEXML/parser/parser/Entity_Manager.cpp +++ b/ACE/ACEXML/parser/parser/Entity_Manager.cpp @@ -8,7 +8,6 @@ ACEXML_Entity_Manager::ACEXML_Entity_Manager (void) : entities_ (0) { - } ACEXML_Entity_Manager::~ACEXML_Entity_Manager (void) diff --git a/ACE/ACEXML/parser/parser/Parser.cpp b/ACE/ACEXML/parser/parser/Parser.cpp index 16346dbc19d..a722a7cfe7b 100644 --- a/ACE/ACEXML/parser/parser/Parser.cpp +++ b/ACE/ACEXML/parser/parser/Parser.cpp @@ -53,7 +53,6 @@ ACEXML_Parser::ACEXML_Parser (void) ACEXML_Parser::~ACEXML_Parser (void) { - } int diff --git a/ACE/ACEXML/parser/parser/ParserInternals.h b/ACE/ACEXML/parser/parser/ParserInternals.h index 39bf2ccccc7..1cadcfc01c4 100644 --- a/ACE/ACEXML/parser/parser/ParserInternals.h +++ b/ACE/ACEXML/parser/parser/ParserInternals.h @@ -28,7 +28,6 @@ */ class ACEXML_PARSER_Export ACEXML_ParserInt { - public: #if defined (ACE_USES_WCHAR) diff --git a/ACE/ASNMP/asnmp/address.cpp b/ACE/ASNMP/asnmp/address.cpp index 326ca987cee..94aaecbf95b 100644 --- a/ACE/ASNMP/asnmp/address.cpp +++ b/ACE/ASNMP/asnmp/address.cpp @@ -248,7 +248,6 @@ IpAddress::IpAddress( const char *inaddr): Address() smival.value.string.ptr = address_buffer; if (ACE_OS::strlen(inaddr) == 0) { - valid_flag = 0; iv_friendly_name_[0] = 0; iv_friendly_name_status_ = 0; @@ -504,7 +503,6 @@ int IpAddress::parse_address( const char *inaddr) // is this a dotted IP notation string or // a friendly name if ( parse_dotted_ipstring( inaddr)) { - // since this is a valid dotted string // don't do any DNS (Performance!) return 1; @@ -512,7 +510,6 @@ int IpAddress::parse_address( const char *inaddr) else { int rc; if ((rc = resolve_to_address(inaddr, ipAddr)) == 0) { - // now lets check out the dotted string ACE_OS::strncpy( ds, ACE_OS::inet_ntoa(ipAddr), MAXHOSTNAMELEN); @@ -569,7 +566,6 @@ int IpAddress::resolve_to_hostname(const in_addr& quad_addr, char *hostname) // reverse lookup (requires in-addr.arpa to be setup in DNS if (ACE_OS::gethostbyaddr_r((const char *)&quad_addr.s_addr, IPV4LEN, AF_INET, &lookupResult, buffer, &loc_errno)) { - // verify right type of record if (lookupResult.h_addrtype == AF_INET && lookupResult.h_length == IPV4LEN) { diff --git a/ACE/ASNMP/asnmp/address.h b/ACE/ASNMP/asnmp/address.h index 9c6013a42d0..d6a5cae8736 100644 --- a/ACE/ASNMP/asnmp/address.h +++ b/ACE/ASNMP/asnmp/address.h @@ -101,7 +101,6 @@ class SIPAddress; // aka ipv6 */ class ASNMP_Export Address: public SnmpSyntax { - public: /// allow destruction of derived classes virtual ~Address(); diff --git a/ACE/ASNMP/asnmp/asn1.cpp b/ACE/ASNMP/asnmp/asn1.cpp index 6b045e9e2db..053e6dd63a4 100644 --- a/ACE/ASNMP/asnmp/asn1.cpp +++ b/ACE/ASNMP/asnmp/asn1.cpp @@ -1313,7 +1313,6 @@ int cmu_snmp::build( struct snmp_pdu *pdu, u_char *packet, length = *out_length; if (pdu->command != TRP_REQ_MSG) { - // request id cp = asn1::build_int( packet, &length, diff --git a/ACE/ASNMP/asnmp/gauge.cpp b/ACE/ASNMP/asnmp/gauge.cpp index 9d8e1ed4324..485d002a22f 100644 --- a/ACE/ASNMP/asnmp/gauge.cpp +++ b/ACE/ASNMP/asnmp/gauge.cpp @@ -70,7 +70,6 @@ Gauge32& Gauge32::operator=( const unsigned long int i) // TODO: this is broken if not inherited from UInt32 (see UInt32 code). SnmpSyntax& Gauge32::operator=( SnmpSyntax &in_val) { - if ( this == &in_val ) // handle assignement from itself return *this; diff --git a/ACE/ASNMP/asnmp/octet.cpp b/ACE/ASNMP/asnmp/octet.cpp index e5803dcf4fe..6a3da66f41d 100644 --- a/ACE/ASNMP/asnmp/octet.cpp +++ b/ACE/ASNMP/asnmp/octet.cpp @@ -75,7 +75,6 @@ int copy_octet_smi(SmiVALUE& smi, int size, const char *src, int& valid_flag) OctetStr::OctetStr( const char * string, long size): output_buffer(0), validity(0) { - init_octet_smi(smival); // check for null string diff --git a/ACE/ASNMP/asnmp/oid.cpp b/ACE/ASNMP/asnmp/oid.cpp index c5d07161253..156bd8f9472 100644 --- a/ACE/ASNMP/asnmp/oid.cpp +++ b/ACE/ASNMP/asnmp/oid.cpp @@ -732,7 +732,6 @@ int Oid::OidToStr( SmiLPOID srcOid, unsigned long size, // loop through and build up a string for (index=0; index < srcOid->len; index++) { - // convert data element to a string if (ACE_OS::sprintf( szNumber,"%lu", srcOid->ptr[index]) == -1) return -1; diff --git a/ACE/ASNMP/asnmp/pdu.cpp b/ACE/ASNMP/asnmp/pdu.cpp index 6d4601124e8..44740ee54aa 100644 --- a/ACE/ASNMP/asnmp/pdu.cpp +++ b/ACE/ASNMP/asnmp/pdu.cpp @@ -129,7 +129,6 @@ Pdu& Pdu::operator=( const Pdu &pdu) // append operator, appends a string Pdu& Pdu::operator+=( Vb &vb) { - // do we have room? if ( vb_count_ + 1 > MAX_VBS) return *this; @@ -195,7 +194,6 @@ int Pdu::get_vblist( Vb* pvbs, const int pvb_count) //=====================[ deposit Vbs ]=================================== int Pdu::set_vblist( Vb* pvbs, const int pvb_count) { - // if invalid then don't destroy if ((!pvbs) || ( pvb_count < 0) || ( pvb_count > MAX_VBS)) return 0; diff --git a/ACE/ASNMP/asnmp/transaction.cpp b/ACE/ASNMP/asnmp/transaction.cpp index 48de210c1a2..9081593e4d8 100644 --- a/ACE/ASNMP/asnmp/transaction.cpp +++ b/ACE/ASNMP/asnmp/transaction.cpp @@ -63,7 +63,6 @@ int transaction::run() // register a time handler and a socket with this while (!done) { - if ((rc = this->send()) < 0) // send pkt to agent return rc; else { diff --git a/ACE/ASNMP/asnmp/wpdu.cpp b/ACE/ASNMP/asnmp/wpdu.cpp index aa4ac0e544f..dc42fe35529 100644 --- a/ACE/ASNMP/asnmp/wpdu.cpp +++ b/ACE/ASNMP/asnmp/wpdu.cpp @@ -261,7 +261,6 @@ int wpdu::convert_vb_to_smival( Vb &tempvb, SmiVALUE *smival ) smival->syntax = tempvb.get_syntax(); switch ( smival->syntax ) { - case sNMP_SYNTAX_NULL: break; @@ -411,7 +410,6 @@ int wpdu::restore_vbs(Pdu& pdu, const snmp_pdu *raw_pdu) const struct variable_list *vp; for(vp = raw_pdu->variables; vp; vp = vp->next_variable) { - // extract the oid portion tempoid.set_data( (unsigned long *)vp->name, ( unsigned int) vp->name_length); @@ -419,7 +417,6 @@ int wpdu::restore_vbs(Pdu& pdu, const snmp_pdu *raw_pdu) const // extract the value portion switch(vp->type) { - // octet string case sNMP_SYNTAX_OCTETS: case sNMP_SYNTAX_OPAQUE: diff --git a/ACE/ASNMP/examples/get/get.cpp b/ACE/ASNMP/examples/get/get.cpp index 31a82061732..cd4015e8ff0 100644 --- a/ACE/ASNMP/examples/get/get.cpp +++ b/ACE/ASNMP/examples/get/get.cpp @@ -140,7 +140,6 @@ void getapp::usage() int getapp::run() { - //----------[ create a ASNMP session ]----------------------------------- if ( snmp_.valid() != SNMP_CLASS_SUCCESS) { cout << "\nASNMP:ERROR:Create session failed: "<< diff --git a/ACE/ASNMP/examples/get/get_async.cpp b/ACE/ASNMP/examples/get/get_async.cpp index 0734bfddb6c..ac843df2192 100644 --- a/ACE/ASNMP/examples/get/get_async.cpp +++ b/ACE/ASNMP/examples/get/get_async.cpp @@ -140,7 +140,6 @@ void getapp::usage() int getapp::run() { - //----------[ create a ASNMP session ]----------------------------------- if ( snmp_.valid() != SNMP_CLASS_SUCCESS) { cout << "\nASNMP:ERROR:Create session failed: "<< diff --git a/ACE/ASNMP/examples/next/next.cpp b/ACE/ASNMP/examples/next/next.cpp index cfff517c43e..8c773548229 100644 --- a/ACE/ASNMP/examples/next/next.cpp +++ b/ACE/ASNMP/examples/next/next.cpp @@ -140,7 +140,6 @@ void nextapp::usage() int nextapp::run() { - //----------[ create a ASNMP session ]----------------------------------- if ( snmp_.valid() != SNMP_CLASS_SUCCESS) { cout << "\nASNMP:ERROR:Create session failed: "<< diff --git a/ACE/ASNMP/examples/set/set.cpp b/ACE/ASNMP/examples/set/set.cpp index f5191b2b807..a2a83387fc9 100644 --- a/ACE/ASNMP/examples/set/set.cpp +++ b/ACE/ASNMP/examples/set/set.cpp @@ -210,7 +210,6 @@ void set::usage() int set::run() { - //----------[ create a ASNMP session ]----------------------------------- if ( snmp_.valid() != SNMP_CLASS_SUCCESS) { cout << "\nASNMP:ERROR:Create session failed: "<< diff --git a/ACE/ASNMP/examples/walk/walk.cpp b/ACE/ASNMP/examples/walk/walk.cpp index f634f364ba8..555340358f6 100644 --- a/ACE/ASNMP/examples/walk/walk.cpp +++ b/ACE/ASNMP/examples/walk/walk.cpp @@ -209,7 +209,6 @@ int MibIter::next(Vb& vb, char *& reason) int walkapp::run() { - //----------[ create a ASNMP session ]----------------------------------- if ( snmp_.valid() != SNMP_CLASS_SUCCESS) { cout << "\nASNMP:ERROR:Create session failed: "<< diff --git a/ACE/ASNMP/tests/Address_Test.cpp b/ACE/ASNMP/tests/Address_Test.cpp index 0f8ad264001..ec796f58b63 100644 --- a/ACE/ASNMP/tests/Address_Test.cpp +++ b/ACE/ASNMP/tests/Address_Test.cpp @@ -385,7 +385,6 @@ static void TestIpxAddress() static void TestMacAddress() { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) MacAddress: Tests\n")); MacAddress ma1; diff --git a/ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.cpp b/ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.cpp index f993ec3f688..3df3f2d77c8 100644 --- a/ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.cpp +++ b/ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.cpp @@ -9,7 +9,6 @@ namespace Kokyu { - /* //@@VS: This is somehow not being recognized by MSVC, which results //in a link error. For now, the definition has been moved to the .h @@ -55,7 +54,6 @@ template <class DSRT_Scheduler_Traits> int DSRT_CV_Dispatcher_Impl<DSRT_Scheduler_Traits>:: schedule_i (Guid_t id, const DSRT_QoSDescriptor& qos) { - #ifdef KOKYU_DSRT_LOGGING ACE_DEBUG ((LM_DEBUG, "(%t|%T):schedule_i enter\n")); diff --git a/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.cpp b/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.cpp index 196f1ad0f82..30bea05196a 100644 --- a/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.cpp +++ b/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.cpp @@ -9,7 +9,6 @@ namespace Kokyu { - /* //@@VS: This is somehow not being recognized by MSVC, which results //in a link error. For now, the definition has been moved to the .h diff --git a/ACE/Kokyu/DSRT_Dispatch_Item_T.cpp b/ACE/Kokyu/DSRT_Dispatch_Item_T.cpp index 95833d1af54..c3cb5716042 100644 --- a/ACE/Kokyu/DSRT_Dispatch_Item_T.cpp +++ b/ACE/Kokyu/DSRT_Dispatch_Item_T.cpp @@ -9,7 +9,6 @@ namespace Kokyu { - template <class DSRT_Scheduler_Traits> DSRT_Dispatch_Item_var<DSRT_Scheduler_Traits>:: DSRT_Dispatch_Item_var (DSRT_Dispatch_Item<DSRT_Scheduler_Traits> *p) diff --git a/ACE/Kokyu/DSRT_Dispatcher_Impl_T.cpp b/ACE/Kokyu/DSRT_Dispatcher_Impl_T.cpp index ea1f496b48a..4f48809e72c 100644 --- a/ACE/Kokyu/DSRT_Dispatcher_Impl_T.cpp +++ b/ACE/Kokyu/DSRT_Dispatcher_Impl_T.cpp @@ -9,7 +9,6 @@ namespace Kokyu { - template <class DSRT_Scheduler_Traits> DSRT_Dispatcher_Impl<DSRT_Scheduler_Traits>:: DSRT_Dispatcher_Impl (ACE_Sched_Params::Policy sched_policy, diff --git a/ACE/Kokyu/DSRT_Sched_Queue_T.h b/ACE/Kokyu/DSRT_Sched_Queue_T.h index dcf5ced34ce..8953b2a8f38 100644 --- a/ACE/Kokyu/DSRT_Sched_Queue_T.h +++ b/ACE/Kokyu/DSRT_Sched_Queue_T.h @@ -22,7 +22,6 @@ namespace Kokyu { - /** * @class Sched_Ready_Queue * diff --git a/ACE/Kokyu/Default_Dispatcher_Impl.cpp b/ACE/Kokyu/Default_Dispatcher_Impl.cpp index 7780e2df68e..b82e96ecb31 100644 --- a/ACE/Kokyu/Default_Dispatcher_Impl.cpp +++ b/ACE/Kokyu/Default_Dispatcher_Impl.cpp @@ -10,7 +10,6 @@ namespace Kokyu { - Default_Dispatcher_Impl::Default_Dispatcher_Impl () : activated_ (0) { diff --git a/ACE/Kokyu/Dispatcher_Impl.cpp b/ACE/Kokyu/Dispatcher_Impl.cpp index a9992953000..efc244e5b38 100644 --- a/ACE/Kokyu/Dispatcher_Impl.cpp +++ b/ACE/Kokyu/Dispatcher_Impl.cpp @@ -6,7 +6,6 @@ namespace Kokyu { - //virtual - so don't inline Dispatcher_Impl::~Dispatcher_Impl() { diff --git a/ACE/Kokyu/Dispatcher_Task.cpp b/ACE/Kokyu/Dispatcher_Task.cpp index b128dcab6bf..31e1ba85044 100644 --- a/ACE/Kokyu/Dispatcher_Task.cpp +++ b/ACE/Kokyu/Dispatcher_Task.cpp @@ -15,7 +15,6 @@ namespace namespace Kokyu { - typedef ACE_Cached_Allocator<Dispatch_Queue_Item, ACE_SYNCH_MUTEX> Dispatch_Queue_Item_Allocator; diff --git a/ACE/Kokyu/Dispatcher_Task.h b/ACE/Kokyu/Dispatcher_Task.h index 6ead2c7d69a..55e5cb73e61 100644 --- a/ACE/Kokyu/Dispatcher_Task.h +++ b/ACE/Kokyu/Dispatcher_Task.h @@ -22,7 +22,6 @@ namespace Kokyu { - class Dispatch_Queue_Item : public ACE_Message_Block { public: diff --git a/ACE/Kokyu/Kokyu.cpp b/ACE/Kokyu/Kokyu.cpp index ac396f9dea6..32e14995804 100644 --- a/ACE/Kokyu/Kokyu.cpp +++ b/ACE/Kokyu/Kokyu.cpp @@ -10,7 +10,6 @@ namespace Kokyu { - int Dispatcher::dispatch (const Dispatch_Command* cmd, const QoSDescriptor& qos) { return dispatcher_impl_->dispatch (cmd, qos); diff --git a/ACE/Kokyu/Kokyu_dsrt.cpp b/ACE/Kokyu/Kokyu_dsrt.cpp index 5832b22dd03..65db3c55248 100644 --- a/ACE/Kokyu/Kokyu_dsrt.cpp +++ b/ACE/Kokyu/Kokyu_dsrt.cpp @@ -10,7 +10,6 @@ namespace Kokyu { - template <class DSRT_Scheduler_Traits> void DSRT_Dispatcher<DSRT_Scheduler_Traits>::implementation (DSRT_Dispatcher_Impl<DSRT_Scheduler_Traits>* impl) diff --git a/ACE/Kokyu/Kokyu_dsrt.h b/ACE/Kokyu/Kokyu_dsrt.h index eb5de72b987..baef1c871b3 100644 --- a/ACE/Kokyu/Kokyu_dsrt.h +++ b/ACE/Kokyu/Kokyu_dsrt.h @@ -16,7 +16,6 @@ namespace Kokyu { - template <class DSRT_Scheduler_Traits> class DSRT_Dispatcher_Impl; /** diff --git a/ACE/ace/ACE.cpp b/ACE/ace/ACE.cpp index 565b36876f0..231a7a2dc72 100644 --- a/ACE/ace/ACE.cpp +++ b/ACE/ace/ACE.cpp @@ -3367,7 +3367,6 @@ ACE::strnew (const wchar_t *s) // helper functions for ACE::wild_match() namespace { - inline bool equal_char (char a, char b, bool case_sensitive) { if (case_sensitive) diff --git a/ACE/ace/Atomic_Op.cpp b/ACE/ace/Atomic_Op.cpp index 07490f3a425..6edc7020aae 100644 --- a/ACE/ace/Atomic_Op.cpp +++ b/ACE/ace/Atomic_Op.cpp @@ -12,7 +12,6 @@ #endif /* ACE_INCLUDE_ATOMIC_OP_SPARC */ namespace { - #if defined (_MSC_VER) // Disable "no return value" warning, as we will be putting // the return values directly into the EAX register. diff --git a/ACE/ace/CDR_Stream.cpp b/ACE/ace/CDR_Stream.cpp index 06bc14ad2dc..1ac9dee887c 100644 --- a/ACE/ace/CDR_Stream.cpp +++ b/ACE/ace/CDR_Stream.cpp @@ -1628,7 +1628,6 @@ ACE_InputCDR::read_wstring (ACE_CDR::WChar*& x) if (this->read_wchar_array (x, len)) { - //Null character used by applications to find the end of //the wstring //Is this okay with the GIOP 1.2 spec?? diff --git a/ACE/ace/Cache_Map_Manager_T.cpp b/ACE/ace/Cache_Map_Manager_T.cpp index f314b0f20be..17e5f489f0e 100644 --- a/ACE/ace/Cache_Map_Manager_T.cpp +++ b/ACE/ace/Cache_Map_Manager_T.cpp @@ -67,13 +67,11 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP if (bind_result != -1) { - int result = this->caching_strategy_.notify_bind (bind_result, cache_value.second); if (result == -1) { - this->map_.unbind (key); // Unless the notification goes thru the bind operation is @@ -100,13 +98,11 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP if (rebind_result != -1) { - int result = this->caching_strategy_.notify_rebind (rebind_result, cache_value.second ()); if (result == -1) { - // Make sure the unbind operation is done only when the // notification fails after a bind which is denoted by // rebind_result = 0 @@ -142,13 +138,11 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP if (rebind_result != -1) { - int result = this->caching_strategy_.notify_rebind (rebind_result, cache_value.second ()); if (result == -1) { - // Make sure the unbind operation is done only when the // notification fails after a bind which is denoted by // rebind_result = 0 @@ -162,7 +156,6 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP } else { - old_value = old_cache_value.first (); } @@ -191,13 +184,11 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP if (rebind_result != -1) { - int result = this->caching_strategy_.notify_rebind (rebind_result, cache_value.second ()); if (result == -1) { - // Make sure the unbind operation is done only when the // notification fails after a bind which is denoted by // rebind_result = 0 @@ -211,7 +202,6 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP } else { - old_value = old_cache_value.first (); } @@ -233,13 +223,11 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP if (trybind_result != -1) { - int result = this->caching_strategy_.notify_trybind (trybind_result, cache_value.second ()); if (result == -1) { - // If the entry has got inserted into the map, it is removed // due to failure. if (trybind_result == 0) @@ -250,7 +238,6 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP } else { - // If an attempt is made to bind an existing entry the value // is overwritten with the value from the map. if (trybind_result == 1) @@ -275,7 +262,6 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP if (find_result != -1) { - int result = this->caching_strategy_.notify_find (find_result, cache_value.second); @@ -285,7 +271,6 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP find_result = -1; else { - // Since the <cache_value> has now changed after the // notification, we need to bind to the map again. int rebind_result = this->map_.rebind (key, @@ -313,7 +298,6 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP if (find_result != -1) { - int result = this->caching_strategy_.notify_find (find_result, cache_value.second); @@ -323,7 +307,6 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP find_result = -1; else { - // Since the <cache_value> has now changed after the // notification, we need to bind to the map again. int rebind_result = this->map_.rebind (key, @@ -351,7 +334,6 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP if (unbind_result != -1) { - int result = this->caching_strategy_.notify_unbind (unbind_result, cache_value.second); @@ -375,7 +357,6 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP if (unbind_result != -1) { - int result = this->caching_strategy_.notify_unbind (unbind_result, cache_value.second ()); diff --git a/ACE/ace/Cached_Connect_Strategy_T.cpp b/ACE/ace/Cached_Connect_Strategy_T.cpp index b3238885c60..2fa0f6bfa83 100644 --- a/ACE/ace/Cached_Connect_Strategy_T.cpp +++ b/ACE/ace/Cached_Connect_Strategy_T.cpp @@ -164,7 +164,6 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE if (state_result == 1) { - if (sh->close () == -1) return -1; @@ -587,7 +586,6 @@ ACE_Bounded_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_S std::pair<SVC_HANDLER *, ATTRIBUTES> > *&entry, int &found) { - REFCOUNTED_HASH_RECYCLABLE_ADDRESS search_addr (remote_addr); // Try to find the address in the cache. Only if we don't find it diff --git a/ACE/ace/Codecs.h b/ACE/ace/Codecs.h index 4809f4a0fa8..48a3a48eabd 100644 --- a/ACE/ace/Codecs.h +++ b/ACE/ace/Codecs.h @@ -42,7 +42,6 @@ class ACE_Export ACE_Base64 { public: //@{ - /** * Encodes a stream of bytes to Base64 data * diff --git a/ACE/ace/Compression/rle/RLECompressor.cpp b/ACE/ace/Compression/rle/RLECompressor.cpp index 0c852ad9784..73f85298663 100644 --- a/ACE/ace/Compression/rle/RLECompressor.cpp +++ b/ACE/ace/Compression/rle/RLECompressor.cpp @@ -25,9 +25,7 @@ ACE_RLECompressor::compress(const void *in_ptr, bool run_code = false; if (in_p && out_p && in_len) { - while (in_len-- > 0) { - ACE_Byte cur_byte = *in_p++; switch (out_index ? run_count : 128U) { // BootStrap to 128 @@ -46,7 +44,6 @@ ACE_RLECompressor::compress(const void *in_ptr, // Fix problem where input exhaused but maybe compressing if (in_len ? cur_byte == *in_p : run_code) { - if (run_code) { // In Compression? out_p[out_base] = ACE_Byte(run_count++ | 0x80); continue; // Stay in Compression @@ -99,7 +96,6 @@ ACE_RLECompressor::decompress(const void *in_ptr, ACE_Byte *out_p = static_cast<ACE_Byte *>(out_ptr); if (in_p && out_p) while(in_len-- > 0) { - ACE_Byte cur_byte = *in_p++; ACE_UINT32 cpy_len = ACE_UINT32((cur_byte & ACE_CHAR_MAX) + 1); diff --git a/ACE/ace/Configuration.cpp b/ACE/ace/Configuration.cpp index 43bd04c84f2..aec7e47706e 100644 --- a/ACE/ace/Configuration.cpp +++ b/ACE/ace/Configuration.cpp @@ -1158,7 +1158,6 @@ ACE_Configuration_Section_IntId::ACE_Configuration_Section_IntId (const ACE_Conf : value_hash_map_ (rhs.value_hash_map_), section_hash_map_ (rhs.section_hash_map_) { - } ACE_Configuration_Section_IntId::~ACE_Configuration_Section_IntId () diff --git a/ACE/ace/Containers_T.h b/ACE/ace/Containers_T.h index 28a4846c80c..b4739ea6c34 100644 --- a/ACE/ace/Containers_T.h +++ b/ACE/ace/Containers_T.h @@ -1030,7 +1030,6 @@ public: * @name Queue-like insert and delete methods */ //@{ - /** * Insert pointer for a new item at the tail of the list. * diff --git a/ACE/ace/Default_Constants.h b/ACE/ace/Default_Constants.h index dc1f2e6de40..26405b2bc2c 100644 --- a/ACE/ace/Default_Constants.h +++ b/ACE/ace/Default_Constants.h @@ -397,7 +397,6 @@ * @name Default values to control CDR classes memory allocation strategies */ //@{ - /// Control the initial size of all CDR buffers, application /// developers may want to optimize this value to fit their request /// size diff --git a/ACE/ace/Dev_Poll_Reactor.cpp b/ACE/ace/Dev_Poll_Reactor.cpp index 46c8ae9cc03..f1e3e03342e 100644 --- a/ACE/ace/Dev_Poll_Reactor.cpp +++ b/ACE/ace/Dev_Poll_Reactor.cpp @@ -1115,7 +1115,6 @@ ACE_Dev_Poll_Reactor::dispatch_notification_handlers ( int ACE_Dev_Poll_Reactor::dispatch_io_event (Token_Guard &guard) { - // Dispatch a ready event. // Define bits to check for while dispatching. @@ -2336,7 +2335,6 @@ ACE_Dev_Poll_Reactor::mask_ops_i (ACE_HANDLE handle, // cleared, we can un-control the fd now. if (!info->suspended || (info->controlled && new_mask == 0)) { - short const events = this->reactor_mask_to_poll_event (new_mask); #if defined (sun) diff --git a/ACE/ace/Dev_Poll_Reactor.h b/ACE/ace/Dev_Poll_Reactor.h index 6d55957053b..8d024131da1 100644 --- a/ACE/ace/Dev_Poll_Reactor.h +++ b/ACE/ace/Dev_Poll_Reactor.h @@ -251,7 +251,6 @@ typedef ACE_Reactor_Token_T<ACE_DEV_POLL_TOKEN> ACE_Dev_Poll_Reactor_Token; class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl { - /** * @struct Event_Tuple * @@ -331,7 +330,6 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl * Methods used to search and modify the handler repository. */ //@{ - /// Return a pointer to the Event_Tuple associated with @a handle. /// If there is none associated, returns 0 and sets errno. Event_Tuple *find (ACE_HANDLE handle); @@ -359,7 +357,6 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl * underlying handler array. */ //@{ - // Check the @a handle to make sure it's a valid @c ACE_HANDLE that // within the range of legal handles (i.e., greater than or equal to // zero and less than @c max_size_). @@ -864,7 +861,6 @@ public: * manipulated with these methods. */ //@{ - /// GET/SET/ADD/CLR the dispatch mask "bit" bound with the /// event_handler and mask. /** @@ -891,7 +887,6 @@ public: * These methods are unimplemented. */ //@{ - /// GET/SET/ADD/CLR the ready "bit" bound with the event_handler /// and mask. virtual int ready_ops (ACE_Event_Handler *event_handler, diff --git a/ACE/ace/ETCL/ETCL_y.cpp b/ACE/ace/ETCL/ETCL_y.cpp index e16d1f56a4f..3f27b8a8670 100644 --- a/ACE/ace/ETCL/ETCL_y.cpp +++ b/ACE/ace/ETCL/ETCL_y.cpp @@ -835,7 +835,6 @@ yyreduce: switch (yyn) { - case 3: //#line 97 "ETCL/ETCL.yy" { yyval.constraint = new ETCL_Preference (ETCL_MIN, yyvsp[0].constraint); ; diff --git a/ACE/ace/FIFO_Recv.h b/ACE/ace/FIFO_Recv.h index 163b5e372d0..796aadeca0d 100644 --- a/ACE/ace/FIFO_Recv.h +++ b/ACE/ace/FIFO_Recv.h @@ -44,7 +44,6 @@ public: /// reading." This ensures that the fifo never gets EOF, even if there /// aren't any writers at the moment! //@{ - /// Default constructor. ACE_FIFO_Recv (void); diff --git a/ACE/ace/FlReactor/FlReactor.h b/ACE/ace/FlReactor/FlReactor.h index f1b5767f557..e5dbee8af10 100644 --- a/ACE/ace/FlReactor/FlReactor.h +++ b/ACE/ace/FlReactor/FlReactor.h @@ -43,7 +43,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL */ class ACE_FlReactor_Export ACE_FlReactor : public ACE_Select_Reactor { - public: ACE_FlReactor (size_t size = DEFAULT_SIZE, bool restart = false, diff --git a/ACE/ace/Handle_Set.cpp b/ACE/ace/Handle_Set.cpp index 1ca26071fd3..98d9ca5e9fa 100644 --- a/ACE/ace/Handle_Set.cpp +++ b/ACE/ace/Handle_Set.cpp @@ -117,7 +117,6 @@ ACE_Handle_Set::ACE_Handle_Set (const fd_set &fd_mask) int ACE_Handle_Set::count_bits (u_long n) { - ACE_TRACE ("ACE_Handle_Set::count_bits"); #if defined (ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT) int rval = 0; diff --git a/ACE/ace/Hash_Cache_Map_Manager_T.cpp b/ACE/ace/Hash_Cache_Map_Manager_T.cpp index a828ecd1599..2c178581cdb 100644 --- a/ACE/ace/Hash_Cache_Map_Manager_T.cpp +++ b/ACE/ace/Hash_Cache_Map_Manager_T.cpp @@ -42,13 +42,11 @@ ACE_Hash_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY if (bind_result != -1) { - int result = this->caching_strategy_.notify_bind (bind_result, cache_value.second); if (result == -1) { - this->map_.unbind (key); // Unless the notification goes thru the bind operation is @@ -75,13 +73,11 @@ ACE_Hash_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY if (rebind_result != -1) { - int result = this->caching_strategy_.notify_rebind (rebind_result, cache_value.second ()); if (result == -1) { - // Make sure the unbind operation is done only when the // notification fails after a bind which is denoted by // rebind_result = 0 @@ -118,7 +114,6 @@ ACE_Hash_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY if (result == -1) { - // If the entry has got inserted into the map, it is removed // due to failure. if (trybind_result == 0) @@ -129,7 +124,6 @@ ACE_Hash_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY } else { - // If an attempt is made to bind an existing entry the value // is overwritten with the value from the map. if (trybind_result == 1) @@ -152,7 +146,6 @@ ACE_Hash_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY if (find_result != -1) { - int result = this->caching_strategy_.notify_find (find_result, entry->int_id_.second); @@ -202,7 +195,6 @@ ACE_Hash_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY if (unbind_result != -1) { - int result = this->caching_strategy_.notify_unbind (unbind_result, entry->int_id_.second); diff --git a/ACE/ace/ICMP_Socket.h b/ACE/ace/ICMP_Socket.h index 79dbcb72c92..c4495fa226d 100644 --- a/ACE/ace/ICMP_Socket.h +++ b/ACE/ace/ICMP_Socket.h @@ -43,7 +43,6 @@ public: * Data transfer routines. */ //@{ - /// Send an @a n byte @a buf to the datagram socket (uses /// @c sendto(3) ). ssize_t send (void const * buf, diff --git a/ACE/ace/Local_Name_Space_T.cpp b/ACE/ace/Local_Name_Space_T.cpp index c15a2fa1f26..6b568ab0798 100644 --- a/ACE/ace/Local_Name_Space_T.cpp +++ b/ACE/ace/Local_Name_Space_T.cpp @@ -139,7 +139,6 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::shared_bind_i ( const char *type, int rebind) { - ACE_TRACE ("ACE_Local_Name_Space::shared_bind_i"); const size_t name_len = (name.length () + 1) * sizeof (ACE_WCHAR_T); const size_t value_len = (value.length () + 1) * sizeof (ACE_WCHAR_T); diff --git a/ACE/ace/Log_Msg.h b/ACE/ace/Log_Msg.h index e3d1e462bce..e72659bf0ea 100644 --- a/ACE/ace/Log_Msg.h +++ b/ACE/ace/Log_Msg.h @@ -318,7 +318,6 @@ public: * lock atomically over a number of calls to ACE_Log_Msg. */ //@{ - /// Acquire the internal lock. int acquire (); diff --git a/ACE/ace/MQX_Filesystem.cpp b/ACE/ace/MQX_Filesystem.cpp index f04303d8675..862e0dafd36 100644 --- a/ACE/ace/MQX_Filesystem.cpp +++ b/ACE/ace/MQX_Filesystem.cpp @@ -520,7 +520,6 @@ MQX_Filesystem::fstat (int fd, ACE_stat *statbuf) */ extern "C" { - int __open (const char *filename, int mode) { return MQX_Filesystem::inst ().open (filename, mode); diff --git a/ACE/ace/Map_Manager.cpp b/ACE/ace/Map_Manager.cpp index fb7d6046cf6..c2222bb4279 100644 --- a/ACE/ace/Map_Manager.cpp +++ b/ACE/ace/Map_Manager.cpp @@ -450,7 +450,6 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::unbind_and_return_index (const EXT_ID template <class EXT_ID, class INT_ID, class ACE_LOCK> void ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::unbind_slot (ACE_UINT32 slot) { - #if defined (ACE_HAS_LAZY_MAP_MANAGER) // diff --git a/ACE/ace/Message_Queue_T.cpp b/ACE/ace/Message_Queue_T.cpp index d16e5cc485d..76ff7aa38fa 100644 --- a/ACE/ace/Message_Queue_T.cpp +++ b/ACE/ace/Message_Queue_T.cpp @@ -347,7 +347,6 @@ ACE_Message_Queue_Ex_Iterator<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>:: ACE_Message_Queue_Ex_Iterator (ACE_Message_Queue_Ex <ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY> & queue) : iter_ (queue.queue_) { - } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> int @@ -388,7 +387,6 @@ ACE_Message_Queue_Ex_Reverse_Iterator<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLI ACE_Message_Queue_Ex_Reverse_Iterator (ACE_Message_Queue_Ex <ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY> & queue) : iter_ (queue.queue_) { - } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> int diff --git a/ACE/ace/Message_Queue_T.h b/ACE/ace/Message_Queue_T.h index 854203832dc..8e14a684f11 100644 --- a/ACE/ace/Message_Queue_T.h +++ b/ACE/ace/Message_Queue_T.h @@ -353,7 +353,6 @@ public: /** @name Queue statistics methods */ //@{ - /// True if queue is full, else false. virtual bool is_full (); /// True if queue is empty, else false. @@ -395,7 +394,6 @@ public: /** @name Water mark (flow control) methods */ //@{ - /** * Get high watermark. */ @@ -424,7 +422,6 @@ public: * enqueueing and dequeueing operations. */ //@{ - /** * Deactivate the queue and wakeup all threads waiting on the queue * so they can continue. No messages are removed from the queue, @@ -462,7 +459,6 @@ public: /** @name Notification strategy methods */ //@{ - /** * This hook is automatically invoked by <enqueue_head>, * <enqueue_tail>, and <enqueue_prio> when a new item is inserted @@ -1252,7 +1248,6 @@ public: /** @name Queue statistics methods */ //@{ - /// True if queue is full, else false. virtual bool is_full (); @@ -1292,7 +1287,6 @@ public: /** @name Water mark (flow control) methods */ //@{ - /** * Get high watermark. */ @@ -1321,7 +1315,6 @@ public: * enqueueing and dequeueing operations. */ //@{ - /** * Deactivate the queue and wakeup all threads waiting on the queue * so they can continue. No messages are removed from the queue, @@ -1359,7 +1352,6 @@ public: /** @name Notification strategy methods */ //@{ - /** * This hook is automatically invoked by <enqueue_head>, * <enqueue_tail>, and <enqueue_prio> when a new item is inserted diff --git a/ACE/ace/Multihomed_INET_Addr.cpp b/ACE/ace/Multihomed_INET_Addr.cpp index 08de42a0ea3..4589fbf22fe 100644 --- a/ACE/ace/Multihomed_INET_Addr.cpp +++ b/ACE/ace/Multihomed_INET_Addr.cpp @@ -31,7 +31,6 @@ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number, int address_family, const char *(secondary_host_names[]), size_t size){ - // Initialize the primary INET addr ACE_INET_Addr::set(port_number, host_name, encode, address_family); @@ -67,7 +66,6 @@ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number, int address_family, const wchar_t *(secondary_host_names[]), size_t size){ - // Initialize the primary INET addr ACE_INET_Addr::set(port_number, host_name, encode, address_family); @@ -102,7 +100,6 @@ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number, int encode, const ACE_UINT32 *secondary_ip_addrs, size_t size){ - // Initialize the primary INET addr ACE_INET_Addr::set(port_number, primary_ip_addr, encode); @@ -143,7 +140,6 @@ ACE_Multihomed_INET_Addr::set (u_short port_number, this->secondaries_.size(size); for (size_t i = 0; i < size; ++i) { - int const ret = this->secondaries_[i].set(port_number, secondary_host_names[i], encode, @@ -171,7 +167,6 @@ ACE_Multihomed_INET_Addr::set (u_short port_number, this->secondaries_.size(size); for (size_t i = 0; i < size; ++i) { - int ret = this->secondaries_[i].set(port_number, secondary_host_names[i], encode, @@ -195,7 +190,6 @@ ACE_Multihomed_INET_Addr::set (u_short port_number, this->secondaries_.size(size); for (size_t i = 0; i < size; ++i) { - int ret = this->secondaries_[i].set(port_number, secondary_ip_addrs[i], encode); @@ -228,7 +222,6 @@ ACE_Multihomed_INET_Addr::get_secondary_addresses(ACE_INET_Addr *secondary_addrs for (size_t i = 0; i < top; ++i) { - int ret = secondary_addrs[i].set (this->secondaries_[i]); @@ -325,7 +318,6 @@ ACE_Multihomed_INET_Addr::get_addresses(sockaddr_in6 *addrs, ACE_Multihomed_INET_Addr::~ACE_Multihomed_INET_Addr () { - } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp index 817d9f74e87..54e2cad9e72 100644 --- a/ACE/ace/OS_NS_Thread.cpp +++ b/ACE/ace/OS_NS_Thread.cpp @@ -3357,7 +3357,6 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params, } else if (sched_params.scope () == ACE_SCOPE_PROCESS) { - # if defined (ACE_HAS_PHARLAP_RT) ACE_NOTSUP_RETURN (-1); # else @@ -3880,7 +3879,6 @@ ACE_OS::thr_create (ACE_THR_FUNC func, { if (ACE_ADAPT_RETVAL(::pthread_attr_setcreatesuspend_np(&attr), result) != 0) { - ::pthread_attr_destroy (&attr); return -1; } diff --git a/ACE/ace/OS_NS_arpa_inet.h b/ACE/ace/OS_NS_arpa_inet.h index b279b15523d..4c6a44e8e9d 100644 --- a/ACE/ace/OS_NS_arpa_inet.h +++ b/ACE/ace/OS_NS_arpa_inet.h @@ -32,7 +32,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - ACE_NAMESPACE_INLINE_FUNCTION unsigned long inet_addr (const char *name); diff --git a/ACE/ace/OS_NS_ctype.h b/ACE/ace/OS_NS_ctype.h index 2bff7a3c3ad..acc38a308a4 100644 --- a/ACE/ace/OS_NS_ctype.h +++ b/ACE/ace/OS_NS_ctype.h @@ -36,7 +36,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - // these are non-standard names... /** @name Functions from <cctype> @@ -48,7 +47,6 @@ namespace ACE_OS { * here. Instead, we change by prepending "ace_". */ //@{ - /// Returns true if the character is an alphanumeric character. ACE_NAMESPACE_INLINE_FUNCTION int ace_isalnum (ACE_TCHAR c); diff --git a/ACE/ace/OS_NS_devctl.h b/ACE/ace/OS_NS_devctl.h index 1859762d038..982dee5db42 100644 --- a/ACE/ace/OS_NS_devctl.h +++ b/ACE/ace/OS_NS_devctl.h @@ -19,7 +19,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - ACE_NAMESPACE_INLINE_FUNCTION int posix_devctl (int filedes, int dcmd, void *dev_data_ptr, size_t nbyte, diff --git a/ACE/ace/OS_NS_dirent.h b/ACE/ace/OS_NS_dirent.h index d426e8a61a2..a8a95b2e1d7 100644 --- a/ACE/ace/OS_NS_dirent.h +++ b/ACE/ace/OS_NS_dirent.h @@ -74,7 +74,6 @@ inline void ace_rewinddir_helper (ACE_DIR *dir) ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - ACE_NAMESPACE_INLINE_FUNCTION void closedir (ACE_DIR *); diff --git a/ACE/ace/OS_NS_dlfcn.h b/ACE/ace/OS_NS_dlfcn.h index 733d8f7f2b4..7157cba9c40 100644 --- a/ACE/ace/OS_NS_dlfcn.h +++ b/ACE/ace/OS_NS_dlfcn.h @@ -32,7 +32,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - //@{ @name A set of wrappers for explicit dynamic linking. ACE_NAMESPACE_INLINE_FUNCTION int dlclose (ACE_SHLIB_HANDLE handle); diff --git a/ACE/ace/OS_NS_errno.h b/ACE/ace/OS_NS_errno.h index 3c26f5fe726..d953d61552a 100644 --- a/ACE/ace/OS_NS_errno.h +++ b/ACE/ace/OS_NS_errno.h @@ -32,7 +32,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - ACE_NAMESPACE_INLINE_FUNCTION int last_error (); diff --git a/ACE/ace/OS_NS_fcntl.h b/ACE/ace/OS_NS_fcntl.h index e95b50aa213..17c7c7d43de 100644 --- a/ACE/ace/OS_NS_fcntl.h +++ b/ACE/ace/OS_NS_fcntl.h @@ -34,7 +34,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - ACE_NAMESPACE_INLINE_FUNCTION int fcntl (ACE_HANDLE handle, int cmd, diff --git a/ACE/ace/OS_NS_netdb.h b/ACE/ace/OS_NS_netdb.h index d08d2711d30..3cc5720173e 100644 --- a/ACE/ace/OS_NS_netdb.h +++ b/ACE/ace/OS_NS_netdb.h @@ -34,7 +34,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - ACE_NAMESPACE_INLINE_FUNCTION struct hostent *gethostbyaddr (const char *addr, int length, diff --git a/ACE/ace/OS_NS_poll.h b/ACE/ace/OS_NS_poll.h index 53f77e403b2..75291a0e155 100644 --- a/ACE/ace/OS_NS_poll.h +++ b/ACE/ace/OS_NS_poll.h @@ -35,7 +35,6 @@ class ACE_Time_Value; namespace ACE_OS { - ACE_NAMESPACE_INLINE_FUNCTION int poll (struct pollfd *pollfds, unsigned long len, diff --git a/ACE/ace/OS_NS_regex.h b/ACE/ace/OS_NS_regex.h index cffd6c94361..57e6fe0cf61 100644 --- a/ACE/ace/OS_NS_regex.h +++ b/ACE/ace/OS_NS_regex.h @@ -32,7 +32,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - // non=standard.. //@{ @name A set of wrappers for regular expressions. ACE_NAMESPACE_INLINE_FUNCTION diff --git a/ACE/ace/OS_NS_signal.h b/ACE/ace/OS_NS_signal.h index 1fb6ca3b114..809920dfa3c 100644 --- a/ACE/ace/OS_NS_signal.h +++ b/ACE/ace/OS_NS_signal.h @@ -141,7 +141,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL typedef struct sigaction ACE_SIGACTION; namespace ACE_OS { - //@{ @name A set of wrappers for Signals. ACE_NAMESPACE_INLINE_FUNCTION diff --git a/ACE/ace/OS_NS_stdio.cpp b/ACE/ace/OS_NS_stdio.cpp index 0eba78f34c6..1b271b703fc 100644 --- a/ACE/ace/OS_NS_stdio.cpp +++ b/ACE/ace/OS_NS_stdio.cpp @@ -51,7 +51,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - void ace_flock_t::dump () const { diff --git a/ACE/ace/OS_NS_stdio.h b/ACE/ace/OS_NS_stdio.h index 03366458315..68c06a014ef 100644 --- a/ACE/ace/OS_NS_stdio.h +++ b/ACE/ace/OS_NS_stdio.h @@ -155,7 +155,6 @@ struct flock ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - /** * @class ace_flock_t * diff --git a/ACE/ace/OS_NS_stdlib.h b/ACE/ace/OS_NS_stdlib.h index 673d8425d4a..bfa3ecb58f2 100644 --- a/ACE/ace/OS_NS_stdlib.h +++ b/ACE/ace/OS_NS_stdlib.h @@ -91,7 +91,6 @@ inline int ace_rand_r_helper (unsigned *seed) ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - /** @name Non-standard functions * * These functions aren't in the standard. diff --git a/ACE/ace/OS_NS_string.h b/ACE/ace/OS_NS_string.h index a57539ace14..0e7e3a66220 100644 --- a/ACE/ace/OS_NS_string.h +++ b/ACE/ace/OS_NS_string.h @@ -33,7 +33,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - /** @name Functions from <cstring> * * Included are the functions defined in <cstring> and their <cwchar> @@ -42,7 +41,6 @@ namespace ACE_OS { * @todo To be complete, we should add strcoll, and strxfrm. */ //@{ - /// Finds characters in a buffer (const void version). ACE_NAMESPACE_INLINE_FUNCTION const void *memchr (const void *s, int c, size_t len); diff --git a/ACE/ace/OS_NS_strings.h b/ACE/ace/OS_NS_strings.h index 5da352220ba..c57ca0573ea 100644 --- a/ACE/ace/OS_NS_strings.h +++ b/ACE/ace/OS_NS_strings.h @@ -35,7 +35,6 @@ class ACE_Time_Value; namespace ACE_OS { - /// Compares two strings (case insensitive const char version). ACE_NAMESPACE_INLINE_FUNCTION int strcasecmp (const char *s, const char *t); diff --git a/ACE/ace/OS_NS_stropts.h b/ACE/ace/OS_NS_stropts.h index a53520b06c2..dfcd6a9b30f 100644 --- a/ACE/ace/OS_NS_stropts.h +++ b/ACE/ace/OS_NS_stropts.h @@ -81,7 +81,6 @@ public: class ACE_QoS; namespace ACE_OS { - ACE_NAMESPACE_INLINE_FUNCTION int getmsg (ACE_HANDLE handle, struct strbuf *ctl, diff --git a/ACE/ace/OS_NS_sys_mman.h b/ACE/ace/OS_NS_sys_mman.h index 19fd68a0cb3..fd155fa2b2b 100644 --- a/ACE/ace/OS_NS_sys_mman.h +++ b/ACE/ace/OS_NS_sys_mman.h @@ -35,7 +35,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - //@{ @name A set of wrappers for memory mapped files. ACE_NAMESPACE_INLINE_FUNCTION int madvise (caddr_t addr, diff --git a/ACE/ace/OS_NS_sys_msg.h b/ACE/ace/OS_NS_sys_msg.h index aabf25768c2..69a8d834617 100644 --- a/ACE/ace/OS_NS_sys_msg.h +++ b/ACE/ace/OS_NS_sys_msg.h @@ -32,7 +32,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - //@{ @name A set of wrappers for System V message queues. ACE_NAMESPACE_INLINE_FUNCTION int msgctl (int msqid, diff --git a/ACE/ace/OS_NS_sys_resource.h b/ACE/ace/OS_NS_sys_resource.h index 2017b9f46c9..8344b03dc53 100644 --- a/ACE/ace/OS_NS_sys_resource.h +++ b/ACE/ace/OS_NS_sys_resource.h @@ -33,7 +33,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - ACE_NAMESPACE_INLINE_FUNCTION int getrlimit (int resource, struct rlimit *rl); diff --git a/ACE/ace/OS_NS_sys_socket.h b/ACE/ace/OS_NS_sys_socket.h index 11228cab53c..17ef39ac530 100644 --- a/ACE/ace/OS_NS_sys_socket.h +++ b/ACE/ace/OS_NS_sys_socket.h @@ -75,7 +75,6 @@ class ACE_QoS_Params; namespace ACE_OS { - # if defined (ACE_WIN32) /// Keeps track of whether we've already initialized WinSock... extern ACE_Export int socket_initialized_; diff --git a/ACE/ace/OS_NS_sys_stat.h b/ACE/ace/OS_NS_sys_stat.h index 8a7a22bec63..77296ab106b 100644 --- a/ACE/ace/OS_NS_sys_stat.h +++ b/ACE/ace/OS_NS_sys_stat.h @@ -65,7 +65,6 @@ typedef struct stat ACE_stat; namespace ACE_OS { - ACE_NAMESPACE_INLINE_FUNCTION ACE_HANDLE creat (const ACE_TCHAR *filename, mode_t mode); diff --git a/ACE/ace/OS_NS_sys_uio.h b/ACE/ace/OS_NS_sys_uio.h index ece317202be..2487d71c288 100644 --- a/ACE/ace/OS_NS_sys_uio.h +++ b/ACE/ace/OS_NS_sys_uio.h @@ -33,7 +33,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - ACE_NAMESPACE_INLINE_FUNCTION ssize_t readv (ACE_HANDLE handle, const iovec *iov, diff --git a/ACE/ace/OS_NS_sys_utsname.h b/ACE/ace/OS_NS_sys_utsname.h index 5fa6bb12a98..249f4d7eebf 100644 --- a/ACE/ace/OS_NS_sys_utsname.h +++ b/ACE/ace/OS_NS_sys_utsname.h @@ -55,7 +55,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - extern ACE_Export int uname (ACE_utsname *name); } /* namespace ACE_OS */ diff --git a/ACE/ace/OS_NS_sys_wait.h b/ACE/ace/OS_NS_sys_wait.h index be38a711e42..4d14145cc40 100644 --- a/ACE/ace/OS_NS_sys_wait.h +++ b/ACE/ace/OS_NS_sys_wait.h @@ -33,7 +33,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - /// Calls OS @c ::wait function, so it's only portable to UNIX/POSIX /// platforms. ACE_NAMESPACE_INLINE_FUNCTION diff --git a/ACE/ace/OS_NS_unistd.h b/ACE/ace/OS_NS_unistd.h index 991e721f173..a8a8fc3b979 100644 --- a/ACE/ace/OS_NS_unistd.h +++ b/ACE/ace/OS_NS_unistd.h @@ -36,7 +36,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - ACE_NAMESPACE_INLINE_FUNCTION int access (const char *path, int amode); diff --git a/ACE/ace/OS_NS_wchar.cpp b/ACE/ace/OS_NS_wchar.cpp index aa914be249b..5d8e684be38 100644 --- a/ACE/ace/OS_NS_wchar.cpp +++ b/ACE/ace/OS_NS_wchar.cpp @@ -107,7 +107,6 @@ ACE_OS::wcscspn_emulation (const wchar_t *s, const wchar_t *reject) for (scan = s; *scan; scan++) { - for (rej_scan = reject; *rej_scan; rej_scan++) if (*scan == *rej_scan) return count; diff --git a/ACE/ace/OS_NS_wchar.h b/ACE/ace/OS_NS_wchar.h index 6fa8c15197e..5f5f0eb8379 100644 --- a/ACE/ace/OS_NS_wchar.h +++ b/ACE/ace/OS_NS_wchar.h @@ -37,7 +37,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - typedef ACE_WCHAR_T WChar; #if defined (ACE_HAS_WCHAR) diff --git a/ACE/ace/OS_NS_wctype.h b/ACE/ace/OS_NS_wctype.h index f20f2043489..20d7dc3a88a 100644 --- a/ACE/ace/OS_NS_wctype.h +++ b/ACE/ace/OS_NS_wctype.h @@ -34,7 +34,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - // these are non-standard names... /** @name Functions from <cctype> diff --git a/ACE/ace/Object_Manager.h b/ACE/ace/Object_Manager.h index f4a7a48845b..27ac68717d7 100644 --- a/ACE/ace/Object_Manager.h +++ b/ACE/ace/Object_Manager.h @@ -195,7 +195,6 @@ template <class T> class ACE_Cleanup_Adapter; */ class ACE_Export ACE_Object_Manager : public ACE_Object_Manager_Base { - public: ACE_ALLOC_HOOK_DECLARE; diff --git a/ACE/ace/POSIX_Asynch_IO.h b/ACE/ace/POSIX_Asynch_IO.h index cff69024c2c..bb43facfda3 100644 --- a/ACE/ace/POSIX_Asynch_IO.h +++ b/ACE/ace/POSIX_Asynch_IO.h @@ -222,7 +222,6 @@ protected: class ACE_Export ACE_POSIX_Asynch_Read_Stream_Result : public virtual ACE_Asynch_Read_Stream_Result_Impl, public ACE_POSIX_Asynch_Result { - /// Factory classes will have special permissions. friend class ACE_POSIX_Asynch_Read_Stream; @@ -444,7 +443,6 @@ protected: class ACE_Export ACE_POSIX_Asynch_Read_File : public virtual ACE_Asynch_Read_File_Impl, public ACE_POSIX_Asynch_Read_Stream { - public: /// Constructor. ACE_POSIX_Asynch_Read_File (ACE_POSIX_Proactor *posix_proactor); @@ -1211,7 +1209,6 @@ protected: class ACE_Export ACE_POSIX_Asynch_Read_Dgram_Result : public virtual ACE_Asynch_Read_Dgram_Result_Impl, public virtual ACE_POSIX_Asynch_Result { - /// Factory classes will have special permissions. friend class ACE_POSIX_Asynch_Read_Dgram; diff --git a/ACE/ace/POSIX_CB_Proactor.cpp b/ACE/ace/POSIX_CB_Proactor.cpp index ef58e76d5ae..44fd9d4a41c 100644 --- a/ACE/ace/POSIX_CB_Proactor.cpp +++ b/ACE/ace/POSIX_CB_Proactor.cpp @@ -97,7 +97,6 @@ ACE_POSIX_CB_Proactor::allocate_aio_slot (ACE_POSIX_Asynch_Result *result) int ACE_POSIX_CB_Proactor::handle_events_i (u_long milli_seconds) { - int result_wait=0; // Wait for the signals. diff --git a/ACE/ace/POSIX_Proactor.cpp b/ACE/ace/POSIX_Proactor.cpp index 0e58f3ed50a..3c1727f2336 100644 --- a/ACE/ace/POSIX_Proactor.cpp +++ b/ACE/ace/POSIX_Proactor.cpp @@ -1993,7 +1993,6 @@ ACE_POSIX_Wakeup_Completion::complete (size_t /* bytes_transferred */, const void * /* completion_key */, u_long /* error */) { - ACE_Handler *handler = this->handler_proxy_.get ()->handler (); if (handler != 0) handler->handle_wakeup (); diff --git a/ACE/ace/POSIX_Proactor.h b/ACE/ace/POSIX_Proactor.h index 0d43159725f..75a43c409f9 100644 --- a/ACE/ace/POSIX_Proactor.h +++ b/ACE/ace/POSIX_Proactor.h @@ -323,7 +323,6 @@ class ACE_AIOCB_Notify_Pipe_Manager; */ class ACE_Export ACE_POSIX_AIOCB_Proactor : public ACE_POSIX_Proactor { - /// Handler needs to call application specific code. friend class ACE_AIOCB_Notify_Pipe_Manager; @@ -503,7 +502,6 @@ protected: */ class ACE_Export ACE_POSIX_SIG_Proactor : public ACE_POSIX_AIOCB_Proactor { - /** * This class does the registering of Asynch Operations with the * Proactor which is necessary in the SIG strategy, because we need diff --git a/ACE/ace/Priority_Reactor.cpp b/ACE/ace/Priority_Reactor.cpp index 64ef7d45cf7..4036aaed213 100644 --- a/ACE/ace/Priority_Reactor.cpp +++ b/ACE/ace/Priority_Reactor.cpp @@ -147,7 +147,6 @@ ACE_Priority_Reactor::dispatch_io_set (int number_of_active_handles, while (!bucket_[i]->is_empty () && number_dispatched < number_of_active_handles) { - ACE_Event_Tuple et; bucket_[i]->dequeue_head (et); diff --git a/ACE/ace/QoS/QoS_Decorator.h b/ACE/ace/QoS/QoS_Decorator.h index 73f37b4f9f2..a15d3654bdc 100644 --- a/ACE/ace/QoS/QoS_Decorator.h +++ b/ACE/ace/QoS/QoS_Decorator.h @@ -40,7 +40,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL */ class ACE_QoS_Export ACE_QoS_Decorator_Base : public ACE_Event_Handler { - public: // Initialization and termination methods. /// Constructor. @@ -78,7 +77,6 @@ private: */ class ACE_QoS_Export ACE_QoS_Event_Handler : public ACE_Event_Handler { - /// Destructor. ~ACE_QoS_Event_Handler (void); @@ -119,7 +117,6 @@ private: */ class ACE_QoS_Export ACE_QoS_Decorator : public ACE_QoS_Decorator_Base { - public: // Initialization and termination methods. /// Constructor. diff --git a/ACE/ace/QoS/QoS_Manager.h b/ACE/ace/QoS/QoS_Manager.h index ffb7fbeb3ed..81f331b4ae2 100644 --- a/ACE/ace/QoS/QoS_Manager.h +++ b/ACE/ace/QoS/QoS_Manager.h @@ -40,7 +40,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL */ class ACE_QoS_Export ACE_QoS_Manager { - public: /// Default constructor. ACE_QoS_Manager (void); diff --git a/ACE/ace/QoS/QoS_Session.h b/ACE/ace/QoS/QoS_Session.h index b1410b10219..f045e96f718 100644 --- a/ACE/ace/QoS/QoS_Session.h +++ b/ACE/ace/QoS/QoS_Session.h @@ -41,7 +41,6 @@ typedef int ACE_Protocol_ID; */ class ACE_QoS_Export ACE_QoS_Session { - public: enum RSVP_Event_Type { diff --git a/ACE/ace/QoS/QoS_Session_Factory.cpp b/ACE/ace/QoS/QoS_Session_Factory.cpp index 1c815b6af2a..a726a5fefb2 100644 --- a/ACE/ace/QoS/QoS_Session_Factory.cpp +++ b/ACE/ace/QoS/QoS_Session_Factory.cpp @@ -31,7 +31,6 @@ ACE_QoS_Session_Factory::~ACE_QoS_Session_Factory (void) ACE_QoS_Session * ACE_QoS_Session_Factory::create_session (ACE_QoS_Session_Type qos_session_type) { - ACE_QoS_Session * qos_session = 0; #if defined (ACE_HAS_RAPI) @@ -61,7 +60,6 @@ ACE_QoS_Session_Factory::create_session (ACE_QoS_Session_Type qos_session_type) int ACE_QoS_Session_Factory::destroy_session (ACE_QoS_Session *qos_session) { - if ((qos_session != 0) && (this->remove_session (qos_session) == -1)) ACELIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Error in destroying session\n")), diff --git a/ACE/ace/QoS/QoS_Session_Impl.cpp b/ACE/ace/QoS/QoS_Session_Impl.cpp index 28d42bc0b82..3af829ee295 100644 --- a/ACE/ace/QoS/QoS_Session_Impl.cpp +++ b/ACE/ace/QoS/QoS_Session_Impl.cpp @@ -305,7 +305,6 @@ ACE_RAPI_Session::qos (ACE_SOCK * /* socket */, ACE_QoS_Manager * /* qos_manager */, const ACE_QoS &ace_qos) { - // If sender : call sending_qos () // If receiver : call receiving_qos () // If both : call sending_qos () and receiving_qos () @@ -425,7 +424,6 @@ ACE_RAPI_Session::sending_qos (const ACE_QoS &ace_qos) int ACE_RAPI_Session::receiving_qos (const ACE_QoS &ace_qos) { - ACE_Flow_Spec *receiving_flowspec = ace_qos.receiving_flowspec (); if (receiving_flowspec == 0) { @@ -659,7 +657,6 @@ ACE_GQoS_Session::qos (ACE_SOCK *socket, ACE_QoS_Manager *qos_manager, const ACE_QoS &ace_qos) { - // Confirm if the current session is one of the QoS sessions // subscribed to by the given socket. diff --git a/ACE/ace/QtReactor/QtReactor.cpp b/ACE/ace/QtReactor/QtReactor.cpp index 99066b8c599..ae856cd0cd6 100644 --- a/ACE/ace/QtReactor/QtReactor.cpp +++ b/ACE/ace/QtReactor/QtReactor.cpp @@ -396,7 +396,6 @@ ACE_QtReactor::create_notifiers_for_handle (ACE_HANDLE handle) if ((this->exception_notifier_.find (handle, qsock_notifier) == -1)) { - ACE_NEW (qsock_notifier, QSocketNotifier (ACE_QT_HANDLE_TYPE(handle), QSocketNotifier::Exception, this)); diff --git a/ACE/ace/RB_Tree.h b/ACE/ace/RB_Tree.h index c4f0851b7d1..83404fe0e3d 100644 --- a/ACE/ace/RB_Tree.h +++ b/ACE/ace/RB_Tree.h @@ -179,7 +179,6 @@ protected: template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> class ACE_RB_Tree : public ACE_RB_Tree_Base { - public: friend class ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>; friend class ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>; @@ -585,7 +584,6 @@ private: template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> class ACE_RB_Tree_Iterator_Base { - public: /// Copy constructor. ACE_RB_Tree_Iterator_Base (const ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &iter); diff --git a/ACE/ace/SUN_Proactor.cpp b/ACE/ace/SUN_Proactor.cpp index 7988c6454da..e257cc22e70 100644 --- a/ACE/ace/SUN_Proactor.cpp +++ b/ACE/ace/SUN_Proactor.cpp @@ -142,7 +142,6 @@ ACE_SUN_Proactor::get_result_status (ACE_POSIX_Asynch_Result* asynch_result, int &error_status, size_t &transfer_count) { - // Get the error status of the aio_ operation. error_status = asynch_result->aio_resultp.aio_errno; ssize_t op_return = asynch_result->aio_resultp.aio_return; diff --git a/ACE/ace/Select_Reactor_T.cpp b/ACE/ace/Select_Reactor_T.cpp index d3f1e4e3384..d8bce72fa15 100644 --- a/ACE/ace/Select_Reactor_T.cpp +++ b/ACE/ace/Select_Reactor_T.cpp @@ -1215,7 +1215,6 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dispatch_io_set if (this->state_changed_) { - handle_iter.reset_state (); this->state_changed_ = false; } @@ -1499,7 +1498,6 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::check_handles (void) ACE_Handle_Set_Iterator check_iter (check_set); while ((h = check_iter ()) != ACE_INVALID_HANDLE) { - #if defined (ACE_WIN32) || defined (__MVS__) || defined (ACE_VXWORKS) // Win32 needs to do the check this way because fstat won't work on // a socket handle. MVS Open Edition needs to do it this way because, diff --git a/ACE/ace/Service_Config.cpp b/ACE/ace/Service_Config.cpp index a28f7b2ad4b..9e2ca555af4 100644 --- a/ACE/ace/Service_Config.cpp +++ b/ACE/ace/Service_Config.cpp @@ -428,7 +428,6 @@ ACE_Service_Config::current () { void* temp = ACE_Service_Config::singleton()->threadkey_.get (); if (temp == 0) { - // The most likely reason is that the current thread was spawned // by some native primitive, like pthreads or Windows API - not // from ACE. This is perfectly legal for callers who are not, or diff --git a/ACE/ace/Service_Gestalt.cpp b/ACE/ace/Service_Gestalt.cpp index 35fdf7bb599..63ed91f71a9 100644 --- a/ACE/ace/Service_Gestalt.cpp +++ b/ACE/ace/Service_Gestalt.cpp @@ -173,7 +173,6 @@ ACE_Service_Gestalt::intrusive_remove_ref (ACE_Service_Gestalt* g) ACE_Service_Gestalt::~ACE_Service_Gestalt () { - if (this->svc_repo_is_owned_) delete this->repo_; @@ -348,7 +347,6 @@ void ACE_Service_Gestalt::add_processed_static_svc (const ACE_Static_Svc_Descriptor *assd) { - /// When process_directive(Static_Svc_Descriptor&) is called, it /// associates a service object with the Gestalt and makes the /// resource (a Service Object) local to the repository. This is but diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp index e5492f6d15e..498c1a9a7ea 100644 --- a/ACE/ace/Sock_Connect.cpp +++ b/ACE/ace/Sock_Connect.cpp @@ -1470,7 +1470,6 @@ ip_check (int &ipvn_enabled, int pf) if (ipvn_enabled == -1) { - #if defined (ACE_WIN32) static bool recursing = false; if (recursing) return 1; diff --git a/ACE/ace/Svc_Conf_y.cpp b/ACE/ace/Svc_Conf_y.cpp index d2bc20b0882..bd9a781b839 100644 --- a/ACE/ace/Svc_Conf_y.cpp +++ b/ACE/ace/Svc_Conf_y.cpp @@ -1117,7 +1117,6 @@ ace_yydestruct (ace_yymsg, ace_yytype, ace_yyvaluep) switch (ace_yytype) { - default: break; } diff --git a/ACE/ace/TP_Reactor.cpp b/ACE/ace/TP_Reactor.cpp index 724094bb23a..4811e28289e 100644 --- a/ACE/ace/TP_Reactor.cpp +++ b/ACE/ace/TP_Reactor.cpp @@ -366,7 +366,6 @@ int ACE_TP_Reactor::handle_socket_events (int &event_count, ACE_TP_Token_Guard &guard) { - // We got the lock, lets handle some I/O events. ACE_EH_Dispatch_Info dispatch_info; diff --git a/ACE/ace/Thread_Manager.h b/ACE/ace/Thread_Manager.h index 228b27711eb..88a89867580 100644 --- a/ACE/ace/Thread_Manager.h +++ b/ACE/ace/Thread_Manager.h @@ -164,7 +164,6 @@ protected: */ class ACE_Export ACE_Thread_Descriptor_Base : public ACE_OS_Thread_Descriptor { - friend class ACE_Thread_Manager; friend class ACE_Double_Linked_List<ACE_Thread_Descriptor_Base>; friend class ACE_Double_Linked_List_Iterator_Base<ACE_Thread_Descriptor_Base>; @@ -782,7 +781,6 @@ public: * does not support these functions. */ //@{ - /// Suspend all threads int suspend_all (); diff --git a/ACE/ace/Timer_Wheel_T.cpp b/ACE/ace/Timer_Wheel_T.cpp index 5347b6570fd..f35692e77af 100644 --- a/ACE/ace/Timer_Wheel_T.cpp +++ b/ACE/ace/Timer_Wheel_T.cpp @@ -300,7 +300,6 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::calculate_spoke template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> long ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::generate_timer_id (u_int spoke) { - int cnt_bits = sizeof (long) * 8 - this->spoke_bits_; long max_cnt = ((long)1 << cnt_bits) - 1; if (spoke == this->spoke_count_) diff --git a/ACE/ace/Token_Manager.h b/ACE/ace/Token_Manager.h index 39d57366f8e..6ce6e0913d8 100644 --- a/ACE/ace/Token_Manager.h +++ b/ACE/ace/Token_Manager.h @@ -43,7 +43,6 @@ class ACE_Mutex_Token; */ class ACE_Export ACE_Token_Manager : public ACE_Cleanup { - // To add a new type of token (e.g. semaphore), do the following // steps: 1. Create a new derivation of ACE_Token. This class // defines the semantics of the new Token. 2. Create a diff --git a/ACE/ace/WIN32_Asynch_IO.cpp b/ACE/ace/WIN32_Asynch_IO.cpp index 9866721da19..838f2196186 100644 --- a/ACE/ace/WIN32_Asynch_IO.cpp +++ b/ACE/ace/WIN32_Asynch_IO.cpp @@ -2386,7 +2386,6 @@ ACE_WIN32_Asynch_Connect::proactor () const ACE_HANDLE ACE_WIN32_Asynch_Connect::get_handle () const { - ACE_ASSERT (0); return ACE_INVALID_HANDLE; } diff --git a/ACE/ace/WIN32_Asynch_IO.h b/ACE/ace/WIN32_Asynch_IO.h index e6d4b5e6add..29871120ab0 100644 --- a/ACE/ace/WIN32_Asynch_IO.h +++ b/ACE/ace/WIN32_Asynch_IO.h @@ -314,7 +314,6 @@ protected: class ACE_Export ACE_WIN32_Asynch_Read_Stream : public virtual ACE_Asynch_Read_Stream_Impl, public ACE_WIN32_Asynch_Operation { - public: /// Constructor. ACE_WIN32_Asynch_Read_Stream (ACE_WIN32_Proactor *win32_proactor); @@ -660,7 +659,6 @@ protected: class ACE_Export ACE_WIN32_Asynch_Read_File : public virtual ACE_Asynch_Read_File_Impl, public ACE_WIN32_Asynch_Read_Stream { - public: /// Constructor. ACE_WIN32_Asynch_Read_File (ACE_WIN32_Proactor *win32_proactor); diff --git a/ACE/ace/WIN32_Proactor.cpp b/ACE/ace/WIN32_Proactor.cpp index d23e5d3033d..bee6b0d3a8a 100644 --- a/ACE/ace/WIN32_Proactor.cpp +++ b/ACE/ace/WIN32_Proactor.cpp @@ -21,7 +21,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL */ class ACE_WIN32_Wakeup_Completion : public ACE_WIN32_Asynch_Result { - public: /// Constructor. ACE_WIN32_Wakeup_Completion (ACE_Handler::Proxy_Ptr &handler_proxy, diff --git a/ACE/ace/XML_Utils/XercesString.cpp b/ACE/ace/XML_Utils/XercesString.cpp index 5a85dfb43c4..0aedaab1273 100644 --- a/ACE/ace/XML_Utils/XercesString.cpp +++ b/ACE/ace/XML_Utils/XercesString.cpp @@ -23,7 +23,6 @@ namespace XML XStr::XStr (XMLCh *wstr) : _wstr(wstr) { - } XStr::XStr (const XMLCh* wstr) diff --git a/ACE/apps/JAWS/clients/Blobby/Blob.cpp b/ACE/apps/JAWS/clients/Blobby/Blob.cpp index ee8a4aaa9d8..3ae6c6d4ed6 100644 --- a/ACE/apps/JAWS/clients/Blobby/Blob.cpp +++ b/ACE/apps/JAWS/clients/Blobby/Blob.cpp @@ -26,7 +26,6 @@ ACE_Blob::open (const ACE_TCHAR *filename, const ACE_TCHAR *hostname , u_short p int ACE_Blob::read (ACE_Message_Block *mb, size_t length, size_t offset) { - // Create a Blob Reader ACE_Blob_Reader blob_reader (mb, length, offset, filename_); ACE_Blob_Handler *brp = &blob_reader; @@ -43,7 +42,6 @@ ACE_Blob::read (ACE_Message_Block *mb, size_t length, size_t offset) int ACE_Blob::write (ACE_Message_Block *mb, size_t length, size_t offset) { - // Create a Blob Writer ACE_Blob_Writer blob_writer (mb, length, offset, filename_); ACE_Blob_Handler *bwp = &blob_writer; @@ -60,7 +58,6 @@ ACE_Blob::write (ACE_Message_Block *mb, size_t length, size_t offset) int ACE_Blob::close (void) { - if (filename_) { ACE_OS::free ((void *) filename_); diff --git a/ACE/apps/JAWS/clients/Blobby/Options.cpp b/ACE/apps/JAWS/clients/Blobby/Options.cpp index b086bcf3329..67c8523312b 100644 --- a/ACE/apps/JAWS/clients/Blobby/Options.cpp +++ b/ACE/apps/JAWS/clients/Blobby/Options.cpp @@ -9,7 +9,6 @@ Options *Options::instance_ = 0; Options * Options::instance (void) { - if (Options::instance_ == 0) Options::instance_ = new Options; diff --git a/ACE/apps/JAWS/server/HTTP_Helpers.cpp b/ACE/apps/JAWS/server/HTTP_Helpers.cpp index e952c85bf5f..a747e9da829 100644 --- a/ACE/apps/JAWS/server/HTTP_Helpers.cpp +++ b/ACE/apps/JAWS/server/HTTP_Helpers.cpp @@ -97,7 +97,6 @@ HTTP_Helper::HTTP_mktime (const char *httpdate) // mktime is a Standard C function. { - #if !defined (ACE_HAS_REENTRANT_LIBC) ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, g, HTTP_Helper::mutex_, -1)); #endif /* NOT ACE_HAS_REENTRANT_LIBC */ diff --git a/ACE/apps/JAWS/server/HTTP_Request.cpp b/ACE/apps/JAWS/server/HTTP_Request.cpp index 9c789bdd463..8752095dd1c 100644 --- a/ACE/apps/JAWS/server/HTTP_Request.cpp +++ b/ACE/apps/JAWS/server/HTTP_Request.cpp @@ -50,7 +50,6 @@ HTTP_Request::HTTP_Request (void) header_strings_ (HTTP_Request::static_header_strings_), method_strings_ (HTTP_Request::static_method_strings_) { - for (size_t i = 0; i < HTTP_Request::NUM_HEADER_STRINGS; i++) diff --git a/ACE/apps/JAWS/stress_testing/connection.h b/ACE/apps/JAWS/stress_testing/connection.h index faa10f7a53f..324ced456d7 100644 --- a/ACE/apps/JAWS/stress_testing/connection.h +++ b/ACE/apps/JAWS/stress_testing/connection.h @@ -3,7 +3,6 @@ #ifndef _D_connection #define _D_connection class connection { - public: int connect(char *hostname_opt_port, int tcp_nodelay, int sockbufsiz); int read(void *buffer, size_t maxlen, unsigned int timeout_seconds = 60); diff --git a/ACE/apps/JAWS/stress_testing/cp.cpp b/ACE/apps/JAWS/stress_testing/cp.cpp index c60507319d0..d78e95ce476 100644 --- a/ACE/apps/JAWS/stress_testing/cp.cpp +++ b/ACE/apps/JAWS/stress_testing/cp.cpp @@ -1,6 +1,5 @@ #include "cp.h" Client_Parameters::Client_Parameters(int i) { - id = i; } diff --git a/ACE/apps/JAWS/stress_testing/http_tester.cpp b/ACE/apps/JAWS/stress_testing/http_tester.cpp index da5f08a741c..dc41907a37e 100644 --- a/ACE/apps/JAWS/stress_testing/http_tester.cpp +++ b/ACE/apps/JAWS/stress_testing/http_tester.cpp @@ -62,7 +62,6 @@ client_thread(void *data) } int driver(char *id, int total_num, float requests_sec, char *url1, float p1, char *url2, float p2, char *url3, float p3, int tcp_nodelay, int sockbufsiz) { - // construct the client parameters packet Client_Parameters::tcp_nodelay = tcp_nodelay; diff --git a/ACE/apps/JAWS/stress_testing/stats.cpp b/ACE/apps/JAWS/stress_testing/stats.cpp index 5bf0866d2d6..beb1c0014ab 100644 --- a/ACE/apps/JAWS/stress_testing/stats.cpp +++ b/ACE/apps/JAWS/stress_testing/stats.cpp @@ -16,7 +16,6 @@ void Stats::log(int id, float throughput, float latency) { // Unused for now. void Stats::print(char *message) { - ACE_UNUSED_ARG (message); // char time_buf[64]; @@ -34,7 +33,6 @@ void Stats::print(char *message) { int comp(const void *a, const void *b) { - Init_Fini_t *A = (Init_Fini_t *)a; Init_Fini_t *B = (Init_Fini_t *)b; @@ -67,13 +65,11 @@ void Stats::output() { void Stats::i_have_started(int id) { - init_fini_[2*id].type = THREAD_START; init_fini_[2*id].timestamp = ACE_OS::gettimeofday(); } void Stats::i_am_done(int id) { - init_fini_[(2*id)+1].type = THREAD_END; init_fini_[(2*id)+1].timestamp = ACE_OS::gettimeofday(); diff --git a/ACE/apps/JAWS/stress_testing/util.cpp b/ACE/apps/JAWS/stress_testing/util.cpp index 6f1c0eff1c5..6079b6e0429 100644 --- a/ACE/apps/JAWS/stress_testing/util.cpp +++ b/ACE/apps/JAWS/stress_testing/util.cpp @@ -1,7 +1,6 @@ #include "util.h" URL::URL(char *input_buf) { - char *buffer = new char[BUFSIZ]; ACE_OS::strcpy(buffer,input_buf); diff --git a/ACE/apps/JAWS/stress_testing/util.h b/ACE/apps/JAWS/stress_testing/util.h index 40bb089589b..c9e509baae7 100644 --- a/ACE/apps/JAWS/stress_testing/util.h +++ b/ACE/apps/JAWS/stress_testing/util.h @@ -3,7 +3,6 @@ #ifndef _D_URL #define _D_URL class URL { - public: URL(char *buffer); diff --git a/ACE/apps/JAWS2/JAWS/Assoc_Array.h b/ACE/apps/JAWS2/JAWS/Assoc_Array.h index 0f0270a8dea..7c6b22a94e7 100644 --- a/ACE/apps/JAWS2/JAWS/Assoc_Array.h +++ b/ACE/apps/JAWS2/JAWS/Assoc_Array.h @@ -7,7 +7,6 @@ template <class KEY, class DATA> class JAWS_Assoc_Array_Iterator; template <class KEY, class DATA> class JAWS_Assoc_Array { - friend class JAWS_Assoc_Array_Iterator<KEY, DATA>; public: diff --git a/ACE/apps/JAWS2/JAWS/Cache_Hash_T.cpp b/ACE/apps/JAWS2/JAWS/Cache_Hash_T.cpp index 5b18a3fdba9..f7634c1e6bd 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Hash_T.cpp +++ b/ACE/apps/JAWS2/JAWS/Cache_Hash_T.cpp @@ -83,7 +83,6 @@ JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::~JAWS_Cache_Hash (void) { if (this->hashtable_[i]) { - ACE_DES_FREE_TEMPLATE3(this->hashtable_[i], this->allocator_->free, JAWS_Hash_Bucket_Manager, diff --git a/ACE/apps/JAWS2/JAWS/Cache_Heap_T.h b/ACE/apps/JAWS2/JAWS/Cache_Heap_T.h index 358dd9b3ff7..12308b42c23 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Heap_T.h +++ b/ACE/apps/JAWS2/JAWS/Cache_Heap_T.h @@ -73,7 +73,6 @@ private: template <class EXT_ID, class FACT, class H_FN, class E_FN> class JAWS_Cache_Heap_Item { - friend class JAWS_Cache_Heap<EXT_ID, FACT, H_FN, E_FN>; public: diff --git a/ACE/apps/JAWS2/JAWS/Cache_List_T.h b/ACE/apps/JAWS2/JAWS/Cache_List_T.h index 32455d2e594..4b147775b83 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_List_T.h +++ b/ACE/apps/JAWS2/JAWS/Cache_List_T.h @@ -79,7 +79,6 @@ private: template <class EXT_ID, class FACT, class H_FN, class E_FN> class JAWS_Cache_List_Item { - friend class JAWS_Cache_List<EXT_ID, FACT, H_FN, E_FN>; public: diff --git a/ACE/apps/JAWS2/JAWS/Cache_Manager_T.cpp b/ACE/apps/JAWS2/JAWS/Cache_Manager_T.cpp index 9c19dfd97d6..9aebb67a912 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Manager_T.cpp +++ b/ACE/apps/JAWS2/JAWS/Cache_Manager_T.cpp @@ -173,7 +173,6 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>::close (void) if (this->hash_) { - ACE_DES_FREE_TEMPLATE3(this->hash_, this->allocator_->free, JAWS_Cache_Hash, KEY, HASH_FUNC, EQ_FUNC); @@ -184,7 +183,6 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>::close (void) if (this->heap_) { - ACE_DES_FREE_TEMPLATE4(this->heap_, this->allocator_->free, JAWS_Cache_List, KEY, FACTORY, HASH_FUNC, EQ_FUNC); diff --git a/ACE/apps/JAWS2/JAWS/Cache_Manager_T.h b/ACE/apps/JAWS2/JAWS/Cache_Manager_T.h index 894ee71a8cd..2d2c87385ef 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Manager_T.h +++ b/ACE/apps/JAWS2/JAWS/Cache_Manager_T.h @@ -16,7 +16,6 @@ class JAWS_Cache_List; template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> class JAWS_Cache_Manager { - friend class JAWS_Cache_Hash<KEY, HASH_FUNC, EQ_FUNC>; friend class JAWS_Cache_Heap<KEY, FACTORY, HASH_FUNC, EQ_FUNC>; friend class JAWS_Cache_List<KEY, FACTORY, HASH_FUNC, EQ_FUNC>; diff --git a/ACE/apps/JAWS3/jaws3/Protocol_Handler.h b/ACE/apps/JAWS3/jaws3/Protocol_Handler.h index 0fdeb31f2a4..92a534d3392 100644 --- a/ACE/apps/JAWS3/jaws3/Protocol_Handler.h +++ b/ACE/apps/JAWS3/jaws3/Protocol_Handler.h @@ -9,7 +9,6 @@ class JAWS_Export JAWS_Protocol_State { - friend class JAWS_Protocol_Handler; public: @@ -29,7 +28,6 @@ class JAWS_Export JAWS_Protocol_Handler // = TITLE // Abstraction that interacts with concurrency dispatching. { - friend class JAWS_TPOOL_Concurrency; friend class JAWS_TPR_Concurrency; friend class JAWS_THYBRID_Concurrency; diff --git a/ACE/apps/JAWS3/jaws3/Reactive_IO.cpp b/ACE/apps/JAWS3/jaws3/Reactive_IO.cpp index b7834e18a71..d26eb4f290b 100644 --- a/ACE/apps/JAWS3/jaws3/Reactive_IO.cpp +++ b/ACE/apps/JAWS3/jaws3/Reactive_IO.cpp @@ -68,7 +68,6 @@ JAWS_Reactive_IO::recv ( ACE_HANDLE handle , void *act ) { - JAWS_IO_Reactive_Recv *rr; rr = JAWS_IO_Reactive_Recv::make (handle, mb, completer, tv, act); diff --git a/ACE/apps/JAWS3/jaws3/Reactive_IO_Helpers.h b/ACE/apps/JAWS3/jaws3/Reactive_IO_Helpers.h index a2a89153f75..aff12038559 100644 --- a/ACE/apps/JAWS3/jaws3/Reactive_IO_Helpers.h +++ b/ACE/apps/JAWS3/jaws3/Reactive_IO_Helpers.h @@ -16,7 +16,6 @@ class JAWS_Reactive_IO; class JAWS_IO_Reactive_Handler : public ACE_Event_Handler { - friend class JAWS_IO_Reactive_Send; friend class JAWS_IO_Reactive_Recv; friend class JAWS_IO_Reactive_Transmit; @@ -84,7 +83,6 @@ private: class JAWS_IO_Reactive_Send : public JAWS_IO_Reactive_Handler { - friend class JAWS_Reactive_IO; public: @@ -141,7 +139,6 @@ private: class JAWS_IO_Reactive_Recv : public JAWS_IO_Reactive_Handler { - friend class JAWS_Reactive_IO; public: @@ -198,7 +195,6 @@ private: class JAWS_IO_Reactive_Transmit : public JAWS_IO_Reactive_Handler { - friend class JAWS_Reactive_IO; public: diff --git a/ACE/apps/drwho/HT_Server.h b/ACE/apps/drwho/HT_Server.h index 0b6ea255b21..40fb514a691 100644 --- a/ACE/apps/drwho/HT_Server.h +++ b/ACE/apps/drwho/HT_Server.h @@ -21,7 +21,6 @@ */ class HT_Server : public Hash_Table { - public: virtual Protocol_Record *insert (const char *key_name, int max_len = MAXUSERIDNAMELEN); diff --git a/ACE/apps/drwho/PMC_All.h b/ACE/apps/drwho/PMC_All.h index 7a0c9df3221..15b9c92e19f 100644 --- a/ACE/apps/drwho/PMC_All.h +++ b/ACE/apps/drwho/PMC_All.h @@ -21,7 +21,6 @@ */ class PMC_All : public PM_Client { - protected: virtual Protocol_Record *insert_protocol_info (Protocol_Record &protocol_record); virtual int encode (char *packet, int &total_bytes); diff --git a/ACE/apps/drwho/PMC_Flo.h b/ACE/apps/drwho/PMC_Flo.h index 2a4097ab18c..84cbbcd1ffa 100644 --- a/ACE/apps/drwho/PMC_Flo.h +++ b/ACE/apps/drwho/PMC_Flo.h @@ -21,7 +21,6 @@ */ class PMC_Flo : public PM_Client { - public: PMC_Flo (void); virtual void process (void); diff --git a/ACE/apps/drwho/PMC_Ruser.h b/ACE/apps/drwho/PMC_Ruser.h index bf61e0800c3..e5773c849da 100644 --- a/ACE/apps/drwho/PMC_Ruser.h +++ b/ACE/apps/drwho/PMC_Ruser.h @@ -21,7 +21,6 @@ */ class PMC_Ruser : public PM_Client { - public: PMC_Ruser (void); virtual void process (void); diff --git a/ACE/apps/drwho/PMS_Flo.h b/ACE/apps/drwho/PMS_Flo.h index 43c26821949..eac5aab5752 100644 --- a/ACE/apps/drwho/PMS_Flo.h +++ b/ACE/apps/drwho/PMS_Flo.h @@ -21,7 +21,6 @@ */ class PMS_Flo : public PM_Server { - public: PMS_Flo (void); diff --git a/ACE/apps/drwho/PMS_Ruser.h b/ACE/apps/drwho/PMS_Ruser.h index 1d25e65cba6..d3010b8ce38 100644 --- a/ACE/apps/drwho/PMS_Ruser.h +++ b/ACE/apps/drwho/PMS_Ruser.h @@ -21,7 +21,6 @@ */ class PMS_Ruser : public PM_Server { - public: PMS_Ruser (void); diff --git a/ACE/apps/drwho/PMS_Usr.h b/ACE/apps/drwho/PMS_Usr.h index f0bb069aebd..93d0a642fe6 100644 --- a/ACE/apps/drwho/PMS_Usr.h +++ b/ACE/apps/drwho/PMS_Usr.h @@ -21,7 +21,6 @@ */ class PMS_Usr : public PM_Server { - public: PMS_Usr (void); diff --git a/ACE/apps/drwho/PM_Server.cpp b/ACE/apps/drwho/PM_Server.cpp index 8dd7249fb99..f82fb3d383f 100644 --- a/ACE/apps/drwho/PM_Server.cpp +++ b/ACE/apps/drwho/PM_Server.cpp @@ -59,7 +59,6 @@ char * PM_Server::handle_protocol_entries (char *buf_ptr, Drwho_Node *np) { - for (; np != 0; np = np->next_) { ACE_OS::sprintf (buf_ptr, diff --git a/ACE/apps/drwho/PM_Server.h b/ACE/apps/drwho/PM_Server.h index 913c383ce86..3ced1b326a1 100644 --- a/ACE/apps/drwho/PM_Server.h +++ b/ACE/apps/drwho/PM_Server.h @@ -21,7 +21,6 @@ */ class PM_Server : public Protocol_Manager { - public: PM_Server (void); virtual ~PM_Server (void); diff --git a/ACE/apps/drwho/Protocol_Record.h b/ACE/apps/drwho/Protocol_Record.h index d54ce4918c0..7ea6da05d74 100644 --- a/ACE/apps/drwho/Protocol_Record.h +++ b/ACE/apps/drwho/Protocol_Record.h @@ -21,7 +21,6 @@ */ class Protocol_Record { - public: Protocol_Record (void); Protocol_Record (int use_dummy); diff --git a/ACE/apps/drwho/Rwho_DB_Manager.h b/ACE/apps/drwho/Rwho_DB_Manager.h index 840b59f7964..3672fd02a30 100644 --- a/ACE/apps/drwho/Rwho_DB_Manager.h +++ b/ACE/apps/drwho/Rwho_DB_Manager.h @@ -30,7 +30,6 @@ */ class RWho_DB_Manager { - public: RWho_DB_Manager (void); ~RWho_DB_Manager (void); diff --git a/ACE/apps/drwho/SL_Client.h b/ACE/apps/drwho/SL_Client.h index 5ab9ac2aee8..53db17ba17b 100644 --- a/ACE/apps/drwho/SL_Client.h +++ b/ACE/apps/drwho/SL_Client.h @@ -21,7 +21,6 @@ */ class SL_Client : public Single_Lookup { - public: SL_Client (const char *key_name); virtual Protocol_Record *insert (const char *key_name, diff --git a/ACE/apps/drwho/SL_Server.h b/ACE/apps/drwho/SL_Server.h index 5adc67d7e99..69be906c54d 100644 --- a/ACE/apps/drwho/SL_Server.h +++ b/ACE/apps/drwho/SL_Server.h @@ -21,7 +21,6 @@ */ class SL_Server : public Single_Lookup { - public: SL_Server (const char *packet); virtual Protocol_Record *insert (const char *key_name, diff --git a/ACE/apps/drwho/server.cpp b/ACE/apps/drwho/server.cpp index 833ecffd7b8..b497b1fcf2c 100644 --- a/ACE/apps/drwho/server.cpp +++ b/ACE/apps/drwho/server.cpp @@ -100,7 +100,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) do_drwho (smr_server); else { - for (;;) do_drwho (smr_server); diff --git a/ACE/apps/gperf/src/Iterator.cpp b/ACE/apps/gperf/src/Iterator.cpp index 597971d0d0c..38ed9511270 100644 --- a/ACE/apps/gperf/src/Iterator.cpp +++ b/ACE/apps/gperf/src/Iterator.cpp @@ -75,7 +75,6 @@ Iterator::operator() (void) if (*str == '-') { - for (size = 1, upper_bound = 0; ACE_OS::ace_isdigit (*++str); upper_bound = upper_bound * 10 + *str - '0') diff --git a/ACE/apps/gperf/src/Key_List.cpp b/ACE/apps/gperf/src/Key_List.cpp index a40d30aea06..93ee544af97 100644 --- a/ACE/apps/gperf/src/Key_List.cpp +++ b/ACE/apps/gperf/src/Key_List.cpp @@ -37,7 +37,6 @@ const char *const Key_List::default_return_type = "char *"; namespace { - char * dup_string (const char *const str) { @@ -486,7 +485,6 @@ Key_List::reorder (void) for (; run_ptr; run_ptr = trail_ptr->next) { - if (already_determined (run_ptr)) { trail_ptr->next = run_ptr->next; @@ -687,7 +685,6 @@ Key_List::output_switch (int use_keyword_table) // list by increasing hash values. if (temp->next && temp->hash_value == temp->next->hash_value) { - for ( ; temp->next && temp->hash_value == temp->next->hash_value; temp = temp->next) { @@ -792,7 +789,6 @@ Key_List::output_keylength_table (void) for (temp = head; temp; temp = temp->next, slot++) { - if (slot < temp->hash_value) for ( ; slot < temp->hash_value; slot++) ACE_OS::printf ("%3d,%s", 0, ++column % (max_column - 1) ? "" : "\n "); @@ -1247,7 +1243,6 @@ Key_List::output_hash_function (void) do { - while (--count > key_pos) ACE_OS::printf (" case %d:\n", count); @@ -1812,7 +1807,6 @@ Key_List::sort (void) void Key_List::string_sort (void) { - // Flatten the equivalence class list to a linear list. List_Node *ptr; diff --git a/ACE/apps/soreduce/Library.cpp b/ACE/apps/soreduce/Library.cpp index 26a42421dcd..f6142e0e46a 100644 --- a/ACE/apps/soreduce/Library.cpp +++ b/ACE/apps/soreduce/Library.cpp @@ -222,7 +222,6 @@ Library::has_modules () const } extern "C" { - static int selector (const dirent *d) { diff --git a/ACE/examples/APG/Config/Get_Opt.cpp b/ACE/examples/APG/Config/Get_Opt.cpp index 26dc5dd6fb5..1e92a33a8c3 100644 --- a/ACE/examples/APG/Config/Get_Opt.cpp +++ b/ACE/examples/APG/Config/Get_Opt.cpp @@ -10,7 +10,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - // Example for a long option without a corresponding short option. // Just put some context here so the following compiles and runs. static const ACE_TCHAR options[] = ACE_TEXT (":f:"); diff --git a/ACE/examples/APG/Config/Get_Opt_Long.cpp b/ACE/examples/APG/Config/Get_Opt_Long.cpp index 4f869149714..0b5a70b618b 100644 --- a/ACE/examples/APG/Config/Get_Opt_Long.cpp +++ b/ACE/examples/APG/Config/Get_Opt_Long.cpp @@ -10,7 +10,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - static const ACE_TCHAR options[] = ACE_TEXT (":f:"); ACE_Get_Opt cmd_opts (argc, argv, options, 1, 0, ACE_Get_Opt::PERMUTE_ARGS, 1); diff --git a/ACE/examples/APG/Config/HA_Status.cpp b/ACE/examples/APG/Config/HA_Status.cpp index 0d8579dedcf..4f1f8e7f1d0 100644 --- a/ACE/examples/APG/Config/HA_Status.cpp +++ b/ACE/examples/APG/Config/HA_Status.cpp @@ -24,7 +24,6 @@ private: int HA_Status::init (int argc, ACE_TCHAR *argv[]) { - // Do ACE_Get_Opt and get conf file name, read out the sections // and print the names. diff --git a/ACE/examples/APG/Signals/SigGuard.cpp b/ACE/examples/APG/Signals/SigGuard.cpp index ea2bc6d3c6e..dbecbd10d96 100644 --- a/ACE/examples/APG/Signals/SigGuard.cpp +++ b/ACE/examples/APG/Signals/SigGuard.cpp @@ -16,7 +16,6 @@ class MySignalHandler : public ACE_Event_Handler int ACE_TMAIN (int, ACE_TCHAR *[]) { - MySignalHandler sighandler; ACE_Sig_Handler sh; sh.register_handler (SIGUSR1, &sighandler); diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp index 23ec0d71774..7e8797e5102 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp +++ b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp @@ -139,7 +139,6 @@ Peer_Handler<ROUTER, KEY>::open (void *a) template <class ROUTER, class KEY> int Peer_Handler<ROUTER, KEY>::handle_input (ACE_HANDLE h) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) input arrived on sd %d\n"), h)); // ACE_Reactor::instance ()->remove_handler(h, // ACE_Event_Handler::ALL_EVENTS_MASK diff --git a/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp b/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp index 77537780806..d6250357ecd 100644 --- a/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp +++ b/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp @@ -68,7 +68,6 @@ Text_Input_Device_Wrapper::modify_device_settings (void *logging) ACE_Message_Block * Text_Input_Device_Wrapper::create_input_message (void) { - // Construct a new message block to send. ACE_Message_Block *mb = 0; ACE_NEW_RETURN (mb, diff --git a/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp b/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp index 51db63ad062..5ccdc05599b 100644 --- a/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp +++ b/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp @@ -221,7 +221,6 @@ AIO_Input_Handler * AIO_CLD_Acceptor::make_handler (void) { int AIO_CLD_Connector::validate_connection (const ACE_Asynch_Connect::Result& result, const ACE_INET_Addr &remote, const ACE_INET_Addr&) { - remote_addr_ = remote; if (!result.success ()) { ACE_Time_Value delay (retry_delay_); @@ -344,7 +343,6 @@ public: }; int AIO_Client_Logging_Daemon::init (int, ACE_TCHAR *[]) { - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("This service requires AIO support\n")), -1); } diff --git a/ACE/examples/C++NPv2/Configurable_Logging_Server.cpp b/ACE/examples/C++NPv2/Configurable_Logging_Server.cpp index 5f6b43691da..dc5fc4580aa 100644 --- a/ACE/examples/C++NPv2/Configurable_Logging_Server.cpp +++ b/ACE/examples/C++NPv2/Configurable_Logging_Server.cpp @@ -7,7 +7,6 @@ #include "ace/Reactor.h" int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - ACE_STATIC_SVC_REGISTER (Reporter_Descriptor); ACE_Service_Config::open diff --git a/ACE/examples/C++NPv2/Logging_Event_Handler.cpp b/ACE/examples/C++NPv2/Logging_Event_Handler.cpp index 9465f1a0119..5a4238b1e6c 100644 --- a/ACE/examples/C++NPv2/Logging_Event_Handler.cpp +++ b/ACE/examples/C++NPv2/Logging_Event_Handler.cpp @@ -9,7 +9,6 @@ #include "ace/os_include/os_netdb.h" int Logging_Event_Handler::open () { - static const char LOGFILE_SUFFIX[] = ".log"; char filename[MAXHOSTNAMELEN + sizeof (LOGFILE_SUFFIX)]; ACE_INET_Addr logging_peer_addr; diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp index 95634d813bc..42d5698fc2f 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp @@ -47,7 +47,6 @@ typedef ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX> OPTIONS; int Options::init (void) { - ACE_DEBUG((LM_DEBUG,"Options::init, len = %d\n",this->message_len_)); // Check for default case. diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp index df347901013..1e1a552154d 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp @@ -586,7 +586,6 @@ Handler_Factory::handle_events (void) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - ACE_SSL_Context *context = ACE_SSL_Context::instance (); context->certificate ("./dummy.pem", SSL_FILETYPE_PEM); diff --git a/ACE/examples/Log_Msg/Log_Msg_MFC/MFC_Log.cpp b/ACE/examples/Log_Msg/Log_Msg_MFC/MFC_Log.cpp index a7f5c56b3fa..e72b8ca6e63 100644 --- a/ACE/examples/Log_Msg/Log_Msg_MFC/MFC_Log.cpp +++ b/ACE/examples/Log_Msg/Log_Msg_MFC/MFC_Log.cpp @@ -18,7 +18,6 @@ MFC_Log::MFC_Log () { - } void @@ -40,5 +39,4 @@ MFC_Log::log (ACE_Log_Record& log_record) MFC_Log::~MFC_Log () { - } diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.h b/ACE/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.h index b4d1a231f19..30097a33960 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.h +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.h @@ -28,7 +28,6 @@ */ class Fill_ACE_QoS { - public: typedef ACE_Hash_Map_Manager <ACE_CString, ACE_Flow_Spec *, ACE_Null_Mutex> FLOW_SPEC_HASH_MAP; diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h index 8181d6e3a97..b3dccdb02e6 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h @@ -23,7 +23,6 @@ */ class QoS_Util { - public: // constructor. QoS_Util (int argc, ACE_TCHAR *argv[]); diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/receiver.cpp b/ACE/examples/QOS/Change_Receiver_FlowSpec/receiver.cpp index 90610291337..db6cb5986cb 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/receiver.cpp +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/receiver.cpp @@ -52,7 +52,6 @@ FillQoSParams (ACE_QoS_Params &qos_params, int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { - QoS_Util qos_util(argc, argv); if (qos_util.parse_args () == -1) diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/sender.cpp b/ACE/examples/QOS/Change_Receiver_FlowSpec/sender.cpp index aa4b6f7806a..67e6ea972cf 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/sender.cpp +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/sender.cpp @@ -49,7 +49,6 @@ FillQoSParams (ACE_QoS_Params &qos_params, int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { - ACE_DEBUG ((LM_DEBUG, "Sender\n")); diff --git a/ACE/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.h b/ACE/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.h index 17169cae9f9..090eb11d9b7 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.h +++ b/ACE/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.h @@ -27,7 +27,6 @@ */ class Fill_ACE_QoS { - public: typedef ACE_Hash_Map_Manager <ACE_CString, ACE_Flow_Spec *, ACE_Null_Mutex> FLOW_SPEC_HASH_MAP; diff --git a/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.h b/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.h index 8181d6e3a97..b3dccdb02e6 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.h +++ b/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.h @@ -23,7 +23,6 @@ */ class QoS_Util { - public: // constructor. QoS_Util (int argc, ACE_TCHAR *argv[]); diff --git a/ACE/examples/QOS/Change_Sender_TSpec/receiver.cpp b/ACE/examples/QOS/Change_Sender_TSpec/receiver.cpp index 57e1a80cbba..ae29ab77056 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/receiver.cpp +++ b/ACE/examples/QOS/Change_Sender_TSpec/receiver.cpp @@ -52,7 +52,6 @@ FillQoSParams (ACE_QoS_Params &qos_params, int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { - QoS_Util qos_util(argc, argv); if (qos_util.parse_args () == -1) diff --git a/ACE/examples/QOS/Change_Sender_TSpec/sender.cpp b/ACE/examples/QOS/Change_Sender_TSpec/sender.cpp index 15c7f01af6a..2654e16535a 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/sender.cpp +++ b/ACE/examples/QOS/Change_Sender_TSpec/sender.cpp @@ -49,7 +49,6 @@ FillQoSParams (ACE_QoS_Params &qos_params, int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { - ACE_DEBUG ((LM_DEBUG, "Sender\n")); diff --git a/ACE/examples/QOS/Diffserv/diffserv_test.cpp b/ACE/examples/QOS/Diffserv/diffserv_test.cpp index 595a384a1fb..83c4e8eaa40 100644 --- a/ACE/examples/QOS/Diffserv/diffserv_test.cpp +++ b/ACE/examples/QOS/Diffserv/diffserv_test.cpp @@ -95,7 +95,6 @@ const char *dscp_char[]= int ACE_TMAIN (int argc , ACE_TCHAR *argv[]) { - if(argc != 3) { ACE_DEBUG((LM_DEBUG, "Usage:\n %s [destination host] [destination port]\n\n", argv[0])); diff --git a/ACE/examples/QOS/Simple/Fill_ACE_QoS.h b/ACE/examples/QOS/Simple/Fill_ACE_QoS.h index afd56998442..f52309cf9c1 100644 --- a/ACE/examples/QOS/Simple/Fill_ACE_QoS.h +++ b/ACE/examples/QOS/Simple/Fill_ACE_QoS.h @@ -27,7 +27,6 @@ */ class Fill_ACE_QoS { - public: typedef ACE_Hash_Map_Manager <ACE_CString, ACE_Flow_Spec *, ACE_Null_Mutex> FLOW_SPEC_HASH_MAP; diff --git a/ACE/examples/QOS/Simple/QoS_Signal_Handler.cpp b/ACE/examples/QOS/Simple/QoS_Signal_Handler.cpp index 07607532a59..40201e0e091 100644 --- a/ACE/examples/QOS/Simple/QoS_Signal_Handler.cpp +++ b/ACE/examples/QOS/Simple/QoS_Signal_Handler.cpp @@ -13,7 +13,6 @@ QoS_Signal_Handler::QoS_Signal_Handler (ACE_QoS_Session *qos_session) int QoS_Signal_Handler::handle_signal (int signum, siginfo_t *, ucontext_t*) { - ACE_DEBUG ((LM_DEBUG, "QoS_Signal_Handler::handle_signal\n")); diff --git a/ACE/examples/QOS/Simple/QoS_Util.h b/ACE/examples/QOS/Simple/QoS_Util.h index 8181d6e3a97..b3dccdb02e6 100644 --- a/ACE/examples/QOS/Simple/QoS_Util.h +++ b/ACE/examples/QOS/Simple/QoS_Util.h @@ -23,7 +23,6 @@ */ class QoS_Util { - public: // constructor. QoS_Util (int argc, ACE_TCHAR *argv[]); diff --git a/ACE/examples/QOS/Simple/receiver.cpp b/ACE/examples/QOS/Simple/receiver.cpp index aea5c18033e..47623ba50e2 100644 --- a/ACE/examples/QOS/Simple/receiver.cpp +++ b/ACE/examples/QOS/Simple/receiver.cpp @@ -52,7 +52,6 @@ FillQoSParams (ACE_QoS_Params &qos_params, int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { - QoS_Util qos_util(argc, argv); if (qos_util.parse_args () == -1) diff --git a/ACE/examples/QOS/Simple/sender.cpp b/ACE/examples/QOS/Simple/sender.cpp index b2d7550bd76..8a3fa9f114c 100644 --- a/ACE/examples/QOS/Simple/sender.cpp +++ b/ACE/examples/QOS/Simple/sender.cpp @@ -49,7 +49,6 @@ FillQoSParams (ACE_QoS_Params &qos_params, int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { - ACE_DEBUG ((LM_DEBUG, "Sender\n")); diff --git a/ACE/examples/Reactor/Proactor/post_completions.cpp b/ACE/examples/Reactor/Proactor/post_completions.cpp index 0f0c39e2b69..4b0f49ac0b8 100644 --- a/ACE/examples/Reactor/Proactor/post_completions.cpp +++ b/ACE/examples/Reactor/Proactor/post_completions.cpp @@ -54,7 +54,6 @@ static ACE_Atomic_Op <ACE_SYNCH_MUTEX, size_t> Completions_To_Go; */ class My_Result : public RESULT_CLASS { - public: My_Result (ACE_Handler &handler, const void *act, @@ -117,7 +116,6 @@ private: */ class My_Handler : public ACE_Handler { - public: /// Constructor. My_Handler (void) {} diff --git a/ACE/examples/Reactor/Proactor/simple_test_proactor.cpp b/ACE/examples/Reactor/Proactor/simple_test_proactor.cpp index e2235b7403a..08d0e2c996c 100644 --- a/ACE/examples/Reactor/Proactor/simple_test_proactor.cpp +++ b/ACE/examples/Reactor/Proactor/simple_test_proactor.cpp @@ -36,7 +36,6 @@ static ACE_TCHAR *dump_file = ACE_TEXT("simple_output"); */ class Simple_Tester : public ACE_Handler { - public: /// Constructor. Simple_Tester (void); diff --git a/ACE/examples/Reactor/Proactor/test_aiocb_ace.cpp b/ACE/examples/Reactor/Proactor/test_aiocb_ace.cpp index 5ae92a52e9a..13a6c0ab11b 100644 --- a/ACE/examples/Reactor/Proactor/test_aiocb_ace.cpp +++ b/ACE/examples/Reactor/Proactor/test_aiocb_ace.cpp @@ -227,7 +227,6 @@ Test_Aio::do_aio (void) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - ACE_UNUSED_ARG (argc); ACE_UNUSED_ARG (argv); diff --git a/ACE/examples/Reactor/Proactor/test_multiple_loops.cpp b/ACE/examples/Reactor/Proactor/test_multiple_loops.cpp index 3645317848f..54a459d613c 100644 --- a/ACE/examples/Reactor/Proactor/test_multiple_loops.cpp +++ b/ACE/examples/Reactor/Proactor/test_multiple_loops.cpp @@ -28,7 +28,6 @@ */ class Timeout_Handler : public ACE_Handler, public ACE_Event_Handler { - public: Timeout_Handler (void) { diff --git a/ACE/examples/Reactor/Proactor/test_proactor2.cpp b/ACE/examples/Reactor/Proactor/test_proactor2.cpp index c44c3519ea8..a2dc0ccfe18 100644 --- a/ACE/examples/Reactor/Proactor/test_proactor2.cpp +++ b/ACE/examples/Reactor/Proactor/test_proactor2.cpp @@ -81,7 +81,6 @@ static int initial_read_size = BUFSIZ; //-------------------------------------------------------------------------- class MyTask: public ACE_Task<ACE_MT_SYNCH> { - public: int svc (void) ; }; @@ -736,7 +735,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) //-------------------------------------------------------------------- int DisableSignal ( int SigNum ) { - #ifndef ACE_WIN32 sigset_t signal_set; if ( ACE_OS::sigemptyset (&signal_set) == - 1 ) diff --git a/ACE/examples/Reactor/Proactor/test_timeout_st.cpp b/ACE/examples/Reactor/Proactor/test_timeout_st.cpp index 164c8a9faad..3dffa7bb76f 100644 --- a/ACE/examples/Reactor/Proactor/test_timeout_st.cpp +++ b/ACE/examples/Reactor/Proactor/test_timeout_st.cpp @@ -27,7 +27,6 @@ */ class Timeout_Handler : public ACE_Handler { - public: Timeout_Handler (void) : count_ (0), diff --git a/ACE/examples/Reactor/TP_Reactor/AcceptHandler.h b/ACE/examples/Reactor/TP_Reactor/AcceptHandler.h index 711affd3d24..9116f1280ab 100644 --- a/ACE/examples/Reactor/TP_Reactor/AcceptHandler.h +++ b/ACE/examples/Reactor/TP_Reactor/AcceptHandler.h @@ -15,7 +15,6 @@ * This accept handler is based on the provided solution from the ACE course. */ class AcceptHandler : public ACE_Event_Handler { - private: /** * The reactor to which the accept handler belongs. @@ -49,7 +48,6 @@ class AcceptHandler : public ACE_Event_Handler { * @name Overridden methods from the ACE_Event_Handler */ // @{ - /** * Provides the handle of mAcceptor. */ diff --git a/ACE/examples/Reactor/TP_Reactor/ReadHandler.cpp b/ACE/examples/Reactor/TP_Reactor/ReadHandler.cpp index b5116b0e2ce..198796067e2 100644 --- a/ACE/examples/Reactor/TP_Reactor/ReadHandler.cpp +++ b/ACE/examples/Reactor/TP_Reactor/ReadHandler.cpp @@ -63,7 +63,6 @@ int ReadHandler::handle_input(ACE_HANDLE) { char response = 0; if (mCallCounter == 0) { - /* * This is the first request from the client. */ @@ -110,7 +109,6 @@ int ReadHandler::handle_input(ACE_HANDLE) { INVOCATION_RETURN(-1); // the client will not send data if response != 'K' } else if (mCallCounter == 1) { - /* * This is the second request from the client. */ diff --git a/ACE/examples/Reactor/TP_Reactor/ReadHandler.h b/ACE/examples/Reactor/TP_Reactor/ReadHandler.h index d9891f71e31..4c5100b46ea 100644 --- a/ACE/examples/Reactor/TP_Reactor/ReadHandler.h +++ b/ACE/examples/Reactor/TP_Reactor/ReadHandler.h @@ -17,7 +17,6 @@ * data sent in the second call. */ class ReadHandler : public ACE_Event_Handler { - private: /** * The stream socket used for data exchange. @@ -65,7 +64,6 @@ class ReadHandler : public ACE_Event_Handler { * @name Overridden methods from the ACE_Event_Handler */ // @{ - /** * Provides the handle of mStream; */ diff --git a/ACE/examples/Reactor/TP_Reactor/client.cpp b/ACE/examples/Reactor/TP_Reactor/client.cpp index eb6deecf8ee..ef6bc7d1a39 100644 --- a/ACE/examples/Reactor/TP_Reactor/client.cpp +++ b/ACE/examples/Reactor/TP_Reactor/client.cpp @@ -30,7 +30,6 @@ int printUsage(ACE_TCHAR *arg) { } int ACE_TMAIN(int argc, ACE_TCHAR **argv) { - // size and count for transmissions int size = 0, count = -1; @@ -67,7 +66,6 @@ int ACE_TMAIN(int argc, ACE_TCHAR **argv) { // -1 is running indefinitely while ((count == -1) || (count-- != 0)) { - // some output, that we know something is happening //ACE_DEBUG((LM_DEBUG, ACE_TEXT("%N:%l: Passes left: %i\n"), count)); ACE_DEBUG((LM_DEBUG, ACE_TEXT("."))); @@ -81,7 +79,6 @@ int ACE_TMAIN(int argc, ACE_TCHAR **argv) { } try { - // send the request to the server (number of MiB in the next call) // Note: only use the sizeof and pointer to int on compatible // platforms (i.e. little-endian/big-endian, data type size) @@ -100,7 +97,6 @@ int ACE_TMAIN(int argc, ACE_TCHAR **argv) { // server answer, 'K" indicates a positive answer if (answer == 'K') { - // send a huge message to the server if (stream.send_n(someData, size, &connTimeout) != size) { ACE_ERROR((LM_ERROR, ACE_TEXT("%N:%l: Failed to send ") diff --git a/ACE/examples/Reactor/TP_Reactor/server.cpp b/ACE/examples/Reactor/TP_Reactor/server.cpp index 7f78287ed7d..c7f49245745 100644 --- a/ACE/examples/Reactor/TP_Reactor/server.cpp +++ b/ACE/examples/Reactor/TP_Reactor/server.cpp @@ -33,7 +33,6 @@ ACE_THR_FUNC_RETURN threadFunc(void *arg) { * the solution to exercise 4c of the ACE course. */ int ACE_TMAIN(int, ACE_TCHAR **) { - // create a reactor from a TP reactor ACE_TP_Reactor tpReactor; ACE_Reactor reactor(&tpReactor); diff --git a/ACE/examples/Timer_Queue/Custom_Handler.h b/ACE/examples/Timer_Queue/Custom_Handler.h index 56eaa0d958f..e1454379314 100644 --- a/ACE/examples/Timer_Queue/Custom_Handler.h +++ b/ACE/examples/Timer_Queue/Custom_Handler.h @@ -28,7 +28,6 @@ */ class Custom_Handler { - public: Custom_Handler (const ACE_Time_Value &expiration_time); diff --git a/ACE/examples/Web_Crawler/Command_Processor.cpp b/ACE/examples/Web_Crawler/Command_Processor.cpp index 2b827cde0d7..e2f59ebd460 100644 --- a/ACE/examples/Web_Crawler/Command_Processor.cpp +++ b/ACE/examples/Web_Crawler/Command_Processor.cpp @@ -18,7 +18,6 @@ URL_Command::URL_Command (URL *url) int URL_Command::execute (void) { - ACE_CString check_string (ACE_TEXT_ALWAYS_CHAR (this->url_->url_addr ().get_path_name ())); if (check_string.find ("news:") != ACE_CString::npos) diff --git a/ACE/examples/Web_Crawler/Iterators.cpp b/ACE/examples/Web_Crawler/Iterators.cpp index a99a0e7af67..67485251b98 100644 --- a/ACE/examples/Web_Crawler/Iterators.cpp +++ b/ACE/examples/Web_Crawler/Iterators.cpp @@ -31,7 +31,6 @@ HTML_Body_Iterator::next (ACE_CString &url) buf != 0; buf = this->url_.stream ().recv (len)) { - buffer.set (buf, BUFSIZ, 1); href_index = ACE_Utils::truncate_cast<int> (buffer.find ("HREF")); diff --git a/ACE/examples/Web_Crawler/Mem_Map_Stream.cpp b/ACE/examples/Web_Crawler/Mem_Map_Stream.cpp index fa7fd63c195..1f5b68164ea 100644 --- a/ACE/examples/Web_Crawler/Mem_Map_Stream.cpp +++ b/ACE/examples/Web_Crawler/Mem_Map_Stream.cpp @@ -144,7 +144,6 @@ Mem_Map_Stream::open (STRAT_CONNECTOR *connector, if (connector->connect (svc_handler_, addr) == -1) { - ACE_ERROR_RETURN ((LM_ERROR, "%p %s %d\n", "Connect failed", diff --git a/ACE/examples/Web_Crawler/Mem_Map_Stream.h b/ACE/examples/Web_Crawler/Mem_Map_Stream.h index b1f787fee65..2089256f3d8 100644 --- a/ACE/examples/Web_Crawler/Mem_Map_Stream.h +++ b/ACE/examples/Web_Crawler/Mem_Map_Stream.h @@ -50,7 +50,6 @@ */ class Mem_Map_Stream { - public: typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> Svc_Handler; diff --git a/ACE/examples/Web_Crawler/URL_Visitor.cpp b/ACE/examples/Web_Crawler/URL_Visitor.cpp index 1900ed70237..ed5976e1a74 100644 --- a/ACE/examples/Web_Crawler/URL_Visitor.cpp +++ b/ACE/examples/Web_Crawler/URL_Visitor.cpp @@ -87,7 +87,6 @@ HTTP_Header_Processing_Strategy::execute (void) } else { - if (line.find ("text/html") != ACE_CString::npos) { ACE_CString url_content_type("text/html"); @@ -321,7 +320,6 @@ URL_Validation_Visitor::make_visitation_strategy_factory (URL &url) // HTTP URL. else { - URL_Visitation_Strategy_Factory *vs; ACE_NEW_RETURN (vs, URL_Validation_Visitation_Strategy_Factory (&url, diff --git a/ACE/netsvcs/lib/Base_Optimizer.h b/ACE/netsvcs/lib/Base_Optimizer.h index ec7c4dd7edf..82e6d97810c 100644 --- a/ACE/netsvcs/lib/Base_Optimizer.h +++ b/ACE/netsvcs/lib/Base_Optimizer.h @@ -26,7 +26,6 @@ template<class Base, class Member> class Base_Optimizer : public Base { - public: Base_Optimizer (void); Base_Optimizer (const Base &base); diff --git a/ACE/netsvcs/lib/Log_Message_Receiver.h b/ACE/netsvcs/lib/Log_Message_Receiver.h index d9891a84e16..b4b26b31240 100644 --- a/ACE/netsvcs/lib/Log_Message_Receiver.h +++ b/ACE/netsvcs/lib/Log_Message_Receiver.h @@ -95,7 +95,6 @@ template<ACE_SYNCH_DECL> class Static_Log_Message_Receiver { - public: /// Prints the log_record to stderr using record.print (hostname, 0, stderr). /// Serializes the output by using a ACE_SYNCH_MUTEX. diff --git a/ACE/netsvcs/lib/Server_Logging_Handler_T.h b/ACE/netsvcs/lib/Server_Logging_Handler_T.h index ccc4bb2b685..1a86b75c824 100644 --- a/ACE/netsvcs/lib/Server_Logging_Handler_T.h +++ b/ACE/netsvcs/lib/Server_Logging_Handler_T.h @@ -162,7 +162,6 @@ private: template<class LOG_MESSAGE_RECEIVER> class ACE_Server_Logging_Handler : public ACE_Server_Logging_Handler_T<LOGGING_PEER_STREAM, u_long, ACE_NULL_SYNCH, LOG_MESSAGE_RECEIVER> { - public: ACE_Server_Logging_Handler (ACE_Thread_Manager * = 0); ACE_Server_Logging_Handler (ACE_Thread_Manager *, @@ -192,7 +191,6 @@ typedef u_long ACE_LOGGER_COUNTER; template<class LOG_MESSAGE_RECEIVER> class ACE_Thr_Server_Logging_Handler : public ACE_Server_Logging_Handler_T<LOGGING_PEER_STREAM, ACE_LOGGER_COUNTER, ACE_LOGGER_SYNCH, LOG_MESSAGE_RECEIVER> { - public: ACE_Thr_Server_Logging_Handler (ACE_Thread_Manager * = 0); ACE_Thr_Server_Logging_Handler (ACE_Thread_Manager *, diff --git a/ACE/netsvcs/lib/TS_Clerk_Handler.h b/ACE/netsvcs/lib/TS_Clerk_Handler.h index 75ed73303ee..3cf26f5d241 100644 --- a/ACE/netsvcs/lib/TS_Clerk_Handler.h +++ b/ACE/netsvcs/lib/TS_Clerk_Handler.h @@ -34,7 +34,6 @@ */ class ACE_Time_Info { - public: time_t delta_time_; diff --git a/ACE/netsvcs/lib/TS_Server_Handler.h b/ACE/netsvcs/lib/TS_Server_Handler.h index 14bd8d59e06..a4eb7fd8551 100644 --- a/ACE/netsvcs/lib/TS_Server_Handler.h +++ b/ACE/netsvcs/lib/TS_Server_Handler.h @@ -94,7 +94,6 @@ private: */ class ACE_TS_Server_Acceptor : public ACE_Strategy_Acceptor<ACE_TS_Server_Handler, ACE_SOCK_ACCEPTOR> { - public: /// Dynamic linking hook. virtual int init (int argc, ACE_TCHAR *argv[]); diff --git a/ACE/netsvcs/lib/Token_Handler.h b/ACE/netsvcs/lib/Token_Handler.h index 7d9f1a8eaa2..ea737191e1b 100644 --- a/ACE/netsvcs/lib/Token_Handler.h +++ b/ACE/netsvcs/lib/Token_Handler.h @@ -43,7 +43,6 @@ */ class ACE_Svc_Export ACE_Token_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> { - public: /// Default constructor. ACE_Token_Handler (ACE_Thread_Manager * = 0); @@ -154,7 +153,6 @@ private: */ class ACE_TS_Mutex : public ACE_Local_Mutex { - public: /// Creation. ACE_TS_Mutex (const ACE_TCHAR *name, diff --git a/ACE/netsvcs/servers/main.cpp b/ACE/netsvcs/servers/main.cpp index d102eeba99d..0cc853b3630 100644 --- a/ACE/netsvcs/servers/main.cpp +++ b/ACE/netsvcs/servers/main.cpp @@ -11,7 +11,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - // Try to link in the svc.conf entries dynamically, enabling the // "ignore_debug_flag" as the last parameter so that we can override // the default ACE_Log_Priority settings in the svc.conf file. diff --git a/ACE/performance-tests/SCTP/Options_Manager.cpp b/ACE/performance-tests/SCTP/Options_Manager.cpp index acba6c08253..e8b774fb973 100644 --- a/ACE/performance-tests/SCTP/Options_Manager.cpp +++ b/ACE/performance-tests/SCTP/Options_Manager.cpp @@ -149,7 +149,6 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c client_port = ACE_OS::atoi(get_opt->opt_arg ()); break; case 'i':{ - // The argument to this option is a comma-separated list // of dotted-decimal ipv4 addresses. @@ -177,7 +176,6 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c // If this representation was not obtained, terminate with // an error. if (!aton_retval) { - ACE_TCHAR error_message[Options_Manager::string_len + 100]; ACE_OS::strcpy (error_message, @@ -214,7 +212,6 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c while (next_secondary_addr && num_secondary_connect_addrs < max_num_secondary_connect_addrs) { - // Get a pointer to the next comma in the list. ACE_TCHAR *next_next_secondary_addr = ACE_OS::strchr(next_secondary_addr, ','); @@ -240,7 +237,6 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c secondary_connect_addrs[num_secondary_connect_addrs++] = ntohl(foo.s_addr); } else { - ACE_TCHAR error_message[Options_Manager::string_len + 100]; ACE_OS::strcpy (error_message, @@ -266,7 +262,6 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c server_port = ACE_OS::atoi(get_opt->opt_arg ()); break; case 'a':{ - // The argument to this option is a comma-separated list // of dotted-decimal ipv4 addresses. @@ -294,7 +289,6 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c // If this representation was not obtained, terminate with // an error. if (!aton_retval) { - ACE_TCHAR error_message[Options_Manager::string_len + 100]; ACE_OS::strcpy (error_message, @@ -331,7 +325,6 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c while (next_secondary_addr && num_secondary_accept_addrs < max_num_secondary_accept_addrs) { - // Get a pointer to the next comma in the list. ACE_TCHAR *next_next_secondary_addr = ACE_OS::strchr(next_secondary_addr, ','); @@ -357,7 +350,6 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c secondary_accept_addrs[num_secondary_accept_addrs++] = ntohl(foo.s_addr); } else { - ACE_TCHAR error_message[Options_Manager::string_len + 100]; ACE_OS::strcpy (error_message, diff --git a/ACE/performance-tests/SCTP/SOCK_SEQPACK_Association_Test.cpp b/ACE/performance-tests/SCTP/SOCK_SEQPACK_Association_Test.cpp index 3fdfa90ed9c..62323a4ed9d 100644 --- a/ACE/performance-tests/SCTP/SOCK_SEQPACK_Association_Test.cpp +++ b/ACE/performance-tests/SCTP/SOCK_SEQPACK_Association_Test.cpp @@ -37,27 +37,23 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_INET_Addr serverAddr; if (argc < 2) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Usage: SOCK_SEQPACK_Association_Test hostname:port\n"))); status = 1; } else if (serverAddr.set(argv[1])) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_INET_Addr::set"))); status = 1; } else if (connector.connect (dataStream, serverAddr)) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SOCK_SEQPACK_Connector::connect"))); status = 1; } else { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Connected to server at %s\n"), argv[1])); @@ -84,7 +80,6 @@ void dump_names(const ACE_SOCK_SEQPACK_Association& assoc) // Get local addresses of the association if (assoc.get_local_addrs(in_out, in_out_size)) { - ACE_ERROR((LM_ERROR, "%p\n", "get_local_addrs")); @@ -95,9 +90,7 @@ void dump_names(const ACE_SOCK_SEQPACK_Association& assoc) // Print individual results of get_local_addrs for (i = 0; i < in_out_size; ++i) { - if (in_out[i].addr_to_string(outbuf, outbuf_size)) { - ACE_ERROR((LM_ERROR, "%p\n", "addr_to_string")); @@ -115,7 +108,6 @@ void dump_names(const ACE_SOCK_SEQPACK_Association& assoc) // Get remote addresses of the association if (assoc.get_remote_addrs(in_out, in_out_size)) { - ACE_ERROR((LM_ERROR, "%p\n", "get_remote_addrs")); @@ -126,9 +118,7 @@ void dump_names(const ACE_SOCK_SEQPACK_Association& assoc) // Print individual results of get_remote_addrs for (i = 0; i < in_out_size; ++i) { - if (in_out[i].addr_to_string(outbuf, outbuf_size)) { - ACE_ERROR((LM_ERROR, "%p\n", "addr_to_string")); diff --git a/ACE/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp b/ACE/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp index 52a99c27ada..dfeff21fbac 100644 --- a/ACE/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp +++ b/ACE/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp @@ -42,7 +42,6 @@ ACE_High_Res_Timer::global_scale_factor_type const microsec_clock_scale_factor ACE_SCTP::HIST runTest(ACE_SOCK_SEQPACK_Association &); int ACE_TMAIN (int argc, ACE_TCHAR **argv){ - // Initialize the options manager Options_Manager optsMgr(argc, argv, ACE_TEXT ("client-opts")); @@ -135,7 +134,6 @@ ACE_SCTP::HIST createHistogram(ACE_CDR::ULong messageSize){ // send the test header (only contains number of iterations) int sendHeader(ACE_SOCK_SEQPACK_Association & stream) { - // create an ACE CDR output stream and place the header information // into it ACE_OutputCDR hdrCDR; @@ -155,7 +153,6 @@ int sendHeader(ACE_SOCK_SEQPACK_Association & stream) { // conduct the UnMarshalled Octet performance test using separate // send_n calls with Nagle's algorithm disabled ACE_SCTP::HIST runUnmarshalledOctetTest(ACE_CDR::Octet *buf, size_t seqLen, ACE_SOCK_SEQPACK_Association & stream){ - ACE_CDR::ULong const testIterations = Options_Manager::test_iterations; size_t bt; @@ -181,7 +178,6 @@ ACE_SCTP::HIST runUnmarshalledOctetTest(ACE_CDR::Octet *buf, size_t seqLen, ACE_ // prime the client and server before starting the test for(cnt=0;cnt<primerIterations;++cnt){ - // send message size // TODO : The message length should be CDR encoded ACE_CDR::ULong msgLenExpressed = ACE_HTONL(msgLen); @@ -219,7 +215,6 @@ ACE_SCTP::HIST runUnmarshalledOctetTest(ACE_CDR::Octet *buf, size_t seqLen, ACE_ iovec iov[2]; // PERFORMANCE TEST LOOP for (cnt = 0; cnt < testIterations; ++cnt){ - // get the start time startTime = ACE_OS::gethrtime(); if (!startTime) diff --git a/ACE/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp b/ACE/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp index f2d91c0082c..39d85149848 100644 --- a/ACE/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp +++ b/ACE/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp @@ -42,7 +42,6 @@ struct ArgStruct { // thread function that serves the client for the UnMarshalled Octet // test static ACE_THR_FUNC_RETURN unmarshalledOctetServer (void *arg){ - // unbundle the arguments ArgStruct * args = reinterpret_cast<ArgStruct *> (arg); ACE_SOCK_SEQPACK_Association * dataModeStream = args->stream; @@ -51,7 +50,6 @@ static ACE_THR_FUNC_RETURN unmarshalledOctetServer (void *arg){ // serve the client for numIterations synchronous invocations do { - // READ A MESSAGE FROM THE CLIENT size_t bt; @@ -216,7 +214,6 @@ static void run_server (ACE_HANDLE handle) int ACE_TMAIN (int argc, ACE_TCHAR **argv){ - Options_Manager optsMgr(argc, argv, ACE_TEXT ("server-opts")); // show usage is requested @@ -306,7 +303,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){ handle_set.set_bit(acceptor_socket.get_handle()); for (;;){ - ACE_Time_Value timeout(ACE_DEFAULT_TIMEOUT); ACE_Handle_Set temp = handle_set; diff --git a/ACE/performance-tests/SCTP/SOCK_STREAM_clt.cpp b/ACE/performance-tests/SCTP/SOCK_STREAM_clt.cpp index 967a7838a8d..858ba407a7d 100644 --- a/ACE/performance-tests/SCTP/SOCK_STREAM_clt.cpp +++ b/ACE/performance-tests/SCTP/SOCK_STREAM_clt.cpp @@ -43,7 +43,6 @@ ACE_High_Res_Timer::global_scale_factor_type const microsec_clock_scale_factor = ACE_SCTP::HIST runTest(ACE_SOCK_Stream &); int ACE_TMAIN (int argc, ACE_TCHAR **argv){ - // Initialize the options manager Options_Manager optsMgr(argc, argv, ACE_TEXT ("client-opts")); @@ -110,7 +109,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){ // create a histogram to store test results ACE_SCTP::HIST createHistogram(ACE_CDR::ULong messageSize){ - // The histogram created below lives beyond the scope of this // function. So the memory allocated here cannot be cleaned up when // this function goes out of scope. Unfortunately the histogram @@ -135,7 +133,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){ // send the test header (only contains number of iterations) int sendHeader(ACE_SOCK_Stream & stream) { - // create an ACE CDR output stream and place the header information // into it ACE_OutputCDR hdrCDR; @@ -155,7 +152,6 @@ int sendHeader(ACE_SOCK_Stream & stream) { // conduct the UnMarshalled Octet performance test using separate // send_n calls with Nagle's algorithm disabled ACE_SCTP::HIST runUnmarshalledOctetTest(ACE_CDR::Octet *buf, size_t seqLen, ACE_SOCK_Stream & stream){ - ACE_CDR::ULong const testIterations = Options_Manager::test_iterations; size_t bt; @@ -191,7 +187,6 @@ ACE_SCTP::HIST runUnmarshalledOctetTest(ACE_CDR::Octet *buf, size_t seqLen, ACE_ // prime the client and server before starting the test for(cnt=0;cnt<primerIterations;++cnt){ - // send message size // TODO : The message length should be CDR encoded ACE_CDR::ULong msgLenExpressed = ACE_HTONL(msgLen); @@ -229,7 +224,6 @@ ACE_SCTP::HIST runUnmarshalledOctetTest(ACE_CDR::Octet *buf, size_t seqLen, ACE_ iovec iov[2]; // PERFORMANCE TEST LOOP for (cnt = 0; cnt < testIterations; ++cnt){ - // get the start time startTime = ACE_OS::gethrtime(); if (!startTime) @@ -294,7 +288,6 @@ ACE_SCTP::HIST runUnmarshalledOctetTest(ACE_CDR::Octet *buf, size_t seqLen, ACE_ // function. ACE_SCTP::HIST runTest(ACE_SOCK_Stream & stream) { - size_t msgLen = 1; for (int i=1; i <= Options_Manager::payload_size_power_of_2; i++) msgLen *= 2; diff --git a/ACE/performance-tests/SCTP/SOCK_STREAM_srv.cpp b/ACE/performance-tests/SCTP/SOCK_STREAM_srv.cpp index 72a23b6cce9..dfffbfa51b1 100644 --- a/ACE/performance-tests/SCTP/SOCK_STREAM_srv.cpp +++ b/ACE/performance-tests/SCTP/SOCK_STREAM_srv.cpp @@ -40,7 +40,6 @@ struct ArgStruct { // thread function that serves the client for the UnMarshalled Octet // test static ACE_THR_FUNC_RETURN unmarshalledOctetServer (void *arg){ - // unbundle the arguments ArgStruct * args = reinterpret_cast<ArgStruct *> (arg); ACE_SOCK_Stream * dataModeStream = args->stream; @@ -49,7 +48,6 @@ static ACE_THR_FUNC_RETURN unmarshalledOctetServer (void *arg){ // serve the client for numIterations synchronous invocations do { - // READ A MESSAGE FROM THE CLIENT size_t bt; @@ -221,7 +219,6 @@ static void run_server (ACE_HANDLE handle) } int ACE_TMAIN (int argc, ACE_TCHAR **argv){ - Options_Manager optsMgr(argc, argv, ACE_TEXT ("server-opts")); // show usage is requested @@ -301,7 +298,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){ handle_set.set_bit(acceptor_socket.get_handle()); for (;;){ - ACE_Time_Value timeout(ACE_DEFAULT_TIMEOUT); ACE_Handle_Set temp = handle_set; diff --git a/ACE/performance-tests/SCTP/hist.cpp b/ACE/performance-tests/SCTP/hist.cpp index 7dff4e8b0b7..bcda96c0029 100644 --- a/ACE/performance-tests/SCTP/hist.cpp +++ b/ACE/performance-tests/SCTP/hist.cpp @@ -31,7 +31,6 @@ #include "hist.h" namespace ACE_SCTP { - hist_t *head_hist, *tail_hist; hist_t *histogram(char *name, unsigned int num_bins, double first, @@ -299,7 +298,6 @@ void add_histogram(HIST dest, HIST source) { } double histfloor (double x) { - #ifdef WIN32 return ACE_OS::floor(x); #else diff --git a/ACE/performance-tests/SCTP/hist.h b/ACE/performance-tests/SCTP/hist.h index 2e3844ec5af..4aae40379c9 100644 --- a/ACE/performance-tests/SCTP/hist.h +++ b/ACE/performance-tests/SCTP/hist.h @@ -4,7 +4,6 @@ namespace ACE_SCTP { - struct optheader { char *key; char *value; diff --git a/ACE/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp b/ACE/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp index a841f5fdb92..4274659d253 100644 --- a/ACE/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp +++ b/ACE/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp @@ -65,7 +65,6 @@ Synchronisers::start_synchronization (void) if (ready_threads == number_of_threads) { - // Reset the ready_threads so that we can wait at the end of // runs ready_threads = 0; @@ -107,7 +106,6 @@ Synchronisers::end_synchronization (void) if (ready_threads == number_of_threads) { - // Reset the ready_threads so that we can wait at the end of // runs ready_threads = 0; diff --git a/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.cpp b/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.cpp index ff537684317..f7e77a834d7 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.cpp +++ b/ACE/performance-tests/Synch-Benchmarks/Synch_Lib/Benchmark_Base.cpp @@ -53,7 +53,6 @@ Benchmark_Method_Base::exec (ACE_Service_Repository_Iterator *sri) if (this->valid_test_object (bp)) { - ACE_DEBUG ((LM_DEBUG, "\nstarting up %s\n", sr->name ())); int notused = this->pre_run_test (bp) == 0 && this->run_test () == 0 && diff --git a/ACE/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp b/ACE/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp index e06e86cd021..3189225a48b 100644 --- a/ACE/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp +++ b/ACE/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp @@ -851,7 +851,6 @@ prusage (register struct rusage *r0, struct rusage *r1, static void tvadd (struct timeval *tsum, struct timeval *t0, struct timeval *t1) { - tsum->tv_sec = t0->tv_sec + t1->tv_sec; tsum->tv_usec = t0->tv_usec + t1->tv_usec; if (tsum->tv_usec > 1000000) @@ -861,7 +860,6 @@ tvadd (struct timeval *tsum, struct timeval *t0, struct timeval *t1) static void tvsub (struct timeval *tdiff, struct timeval *t1, struct timeval *t0) { - tdiff->tv_sec = t1->tv_sec - t0->tv_sec; tdiff->tv_usec = t1->tv_usec - t0->tv_usec; if (tdiff->tv_usec < 0) diff --git a/ACE/performance-tests/TTCP/C/new-ttcp.cpp b/ACE/performance-tests/TTCP/C/new-ttcp.cpp index bd5038ceaa8..cafde7cb170 100644 --- a/ACE/performance-tests/TTCP/C/new-ttcp.cpp +++ b/ACE/performance-tests/TTCP/C/new-ttcp.cpp @@ -871,7 +871,6 @@ prusage (register struct rusage *r0, struct rusage *r1, static void tvadd (struct timeval *tsum, struct timeval *t0, struct timeval *t1) { - tsum->tv_sec = t0->tv_sec + t1->tv_sec; tsum->tv_usec = t0->tv_usec + t1->tv_usec; if (tsum->tv_usec > 1000000) @@ -881,7 +880,6 @@ tvadd (struct timeval *tsum, struct timeval *t0, struct timeval *t1) static void tvsub (struct timeval *tdiff, struct timeval *t1, struct timeval *t0) { - tdiff->tv_sec = t1->tv_sec - t0->tv_sec; tdiff->tv_usec = t1->tv_usec - t0->tv_usec; if (tdiff->tv_usec < 0) diff --git a/ACE/protocols/ace/HTBP/HTBP_Addr.h b/ACE/protocols/ace/HTBP/HTBP_Addr.h index 1b99b1f417b..0e03aea5e94 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Addr.h +++ b/ACE/protocols/ace/HTBP/HTBP_Addr.h @@ -28,7 +28,6 @@ namespace ACE { namespace HTBP { - /** * @class Addr * diff --git a/ACE/protocols/ace/HTBP/HTBP_Environment.h b/ACE/protocols/ace/HTBP/HTBP_Environment.h index 84641dc8de4..f70a29148a6 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Environment.h +++ b/ACE/protocols/ace/HTBP/HTBP_Environment.h @@ -19,7 +19,6 @@ namespace ACE { namespace HTBP { - /** * @class Environment * diff --git a/ACE/protocols/ace/HTBP/HTBP_Filter.h b/ACE/protocols/ace/HTBP/HTBP_Filter.h index 456f0984fc3..add5595942f 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Filter.h +++ b/ACE/protocols/ace/HTBP/HTBP_Filter.h @@ -26,7 +26,6 @@ namespace ACE { namespace HTBP { - // Forward declarations. class Channel; diff --git a/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp b/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp index ee6fc0dd45b..826fa3f7163 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp +++ b/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp @@ -199,7 +199,6 @@ ACE::HTBP::Inside_Squid_Filter::send_ack (ACE::HTBP::Channel *ch) int ACE::HTBP::Inside_Squid_Filter::recv_ack (ACE::HTBP::Channel *ch) { - char *header_end = this->header_complete(ch); if (header_end == 0) { diff --git a/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h b/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h index 9746ad0ede1..7d5e55836dd 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h +++ b/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h @@ -25,7 +25,6 @@ namespace ACE { namespace HTBP { - /** * @class Inside_Squid_Filter * diff --git a/ACE/protocols/ace/HTBP/HTBP_Session.h b/ACE/protocols/ace/HTBP/HTBP_Session.h index f9edc5eb650..0632dd74483 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Session.h +++ b/ACE/protocols/ace/HTBP/HTBP_Session.h @@ -37,7 +37,6 @@ namespace ACE { namespace HTBP { - class Session_Id_t { public: diff --git a/ACE/protocols/ace/INet/BidirStreamBuffer.cpp b/ACE/protocols/ace/INet/BidirStreamBuffer.cpp index 7a0a81145ac..fe6850aedb7 100644 --- a/ACE/protocols/ace/INet/BidirStreamBuffer.cpp +++ b/ACE/protocols/ace/INet/BidirStreamBuffer.cpp @@ -11,7 +11,6 @@ namespace ACE { namespace IOS { - template <class ACE_CHAR_T, class STREAM_HANDLER, class TR> BasicBidirStreamBuffer<ACE_CHAR_T, STREAM_HANDLER, TR>::BasicBidirStreamBuffer ( STREAM_HANDLER* sh, diff --git a/ACE/protocols/ace/INet/BufferedStreamBuffer.cpp b/ACE/protocols/ace/INet/BufferedStreamBuffer.cpp index 514de700ebc..d8056039835 100644 --- a/ACE/protocols/ace/INet/BufferedStreamBuffer.cpp +++ b/ACE/protocols/ace/INet/BufferedStreamBuffer.cpp @@ -11,7 +11,6 @@ namespace ACE { namespace IOS { - template <class ACE_CHAR_T, class TR> BasicBufferedStreamBuffer<ACE_CHAR_T, TR>::BasicBufferedStreamBuffer ( std::streamsize bufsz, diff --git a/ACE/protocols/ace/INet/ClientRequestHandler.cpp b/ACE/protocols/ace/INet/ClientRequestHandler.cpp index be7f1018e55..8b17d981330 100644 --- a/ACE/protocols/ace/INet/ClientRequestHandler.cpp +++ b/ACE/protocols/ace/INet/ClientRequestHandler.cpp @@ -12,7 +12,6 @@ namespace ACE { namespace INet { - ClientRequestHandler::ClientRequestHandler () {} ClientRequestHandler::~ClientRequestHandler () {} diff --git a/ACE/protocols/ace/INet/ConnectionCache.cpp b/ACE/protocols/ace/INet/ConnectionCache.cpp index ee9900fd3cd..703b06be77e 100644 --- a/ACE/protocols/ace/INet/ConnectionCache.cpp +++ b/ACE/protocols/ace/INet/ConnectionCache.cpp @@ -13,7 +13,6 @@ namespace ACE { namespace INet { - ConnectionKey::ConnectionKey () {} diff --git a/ACE/protocols/ace/INet/ConnectionCache.h b/ACE/protocols/ace/INet/ConnectionCache.h index 2cac139da5b..d6a0df2b2e8 100644 --- a/ACE/protocols/ace/INet/ConnectionCache.h +++ b/ACE/protocols/ace/INet/ConnectionCache.h @@ -22,7 +22,6 @@ namespace ACE { namespace INet { - /** * @class ACE_INet_ConnectionKey * diff --git a/ACE/protocols/ace/INet/FTP_ClientRequestHandler.cpp b/ACE/protocols/ace/INet/FTP_ClientRequestHandler.cpp index 2214dbe6e15..dda84653107 100644 --- a/ACE/protocols/ace/INet/FTP_ClientRequestHandler.cpp +++ b/ACE/protocols/ace/INet/FTP_ClientRequestHandler.cpp @@ -19,7 +19,6 @@ namespace ACE { namespace FTP { - ClientRequestHandler::SessionHolder::SessionHolder () : session_ () { diff --git a/ACE/protocols/ace/INet/FTP_IOStream.cpp b/ACE/protocols/ace/INet/FTP_IOStream.cpp index 7466e13d496..b58eb0135e5 100644 --- a/ACE/protocols/ace/INet/FTP_IOStream.cpp +++ b/ACE/protocols/ace/INet/FTP_IOStream.cpp @@ -14,7 +14,6 @@ namespace ACE { namespace FTP { - StreamBuffer::StreamBuffer (std::iostream * stream) : ACE::IOS::BufferedStreamBuffer (BUFFER_SIZE, std::ios::in | std::ios::out), diff --git a/ACE/protocols/ace/INet/FTP_IOStream.h b/ACE/protocols/ace/INet/FTP_IOStream.h index 387591e3db0..e5d334bafdb 100644 --- a/ACE/protocols/ace/INet/FTP_IOStream.h +++ b/ACE/protocols/ace/INet/FTP_IOStream.h @@ -26,7 +26,6 @@ namespace ACE { namespace FTP { - /** * @class ACE_FTP_StreamBuffer * diff --git a/ACE/protocols/ace/INet/FTP_Request.cpp b/ACE/protocols/ace/INet/FTP_Request.cpp index e7e12d00d6e..edddd1ef555 100644 --- a/ACE/protocols/ace/INet/FTP_Request.cpp +++ b/ACE/protocols/ace/INet/FTP_Request.cpp @@ -16,7 +16,6 @@ namespace ACE { namespace FTP { - const ACE_CString Request::FTP_USER = "USER"; const ACE_CString Request::FTP_PASS = "PASS"; const ACE_CString Request::FTP_QUIT = "QUIT"; diff --git a/ACE/protocols/ace/INet/FTP_Request.h b/ACE/protocols/ace/INet/FTP_Request.h index bc03d34c6e4..bfbd2596cc4 100644 --- a/ACE/protocols/ace/INet/FTP_Request.h +++ b/ACE/protocols/ace/INet/FTP_Request.h @@ -20,7 +20,6 @@ namespace ACE { namespace FTP { - /** * @class ACE_FTP_Request * diff --git a/ACE/protocols/ace/INet/FTP_Response.h b/ACE/protocols/ace/INet/FTP_Response.h index 72d3545e857..6e3def510a1 100644 --- a/ACE/protocols/ace/INet/FTP_Response.h +++ b/ACE/protocols/ace/INet/FTP_Response.h @@ -21,7 +21,6 @@ namespace ACE { namespace FTP { - /** * @class ACE_FTP_Response * diff --git a/ACE/protocols/ace/INet/FTP_Session.cpp b/ACE/protocols/ace/INet/FTP_Session.cpp index d834e784814..69532057609 100644 --- a/ACE/protocols/ace/INet/FTP_Session.cpp +++ b/ACE/protocols/ace/INet/FTP_Session.cpp @@ -19,7 +19,6 @@ namespace ACE { namespace FTP { - template <ACE_SYNCH_DECL> Session_T<ACE_SYNCH_USE>::Session_T () : port_ (FTP_PORT), diff --git a/ACE/protocols/ace/INet/HTTPS_Context.cpp b/ACE/protocols/ace/INet/HTTPS_Context.cpp index fd6cdf30c3c..9bdb5286432 100644 --- a/ACE/protocols/ace/INet/HTTPS_Context.cpp +++ b/ACE/protocols/ace/INet/HTTPS_Context.cpp @@ -15,7 +15,6 @@ namespace ACE { namespace HTTPS { - int Context::ssl_mode_ = ACE_SSL_Context::SSLv23; bool Context::ssl_strict_ = false; bool Context::ssl_once_ = true; diff --git a/ACE/protocols/ace/INet/HTTPS_Session.cpp b/ACE/protocols/ace/INet/HTTPS_Session.cpp index 94ba1f6f735..a92d4a054cb 100644 --- a/ACE/protocols/ace/INet/HTTPS_Session.cpp +++ b/ACE/protocols/ace/INet/HTTPS_Session.cpp @@ -22,7 +22,6 @@ namespace ACE { namespace HTTPS { - template <ACE_SYNCH_DECL> Session_T<ACE_SYNCH_USE>::Session_T (bool keep_alive #if defined (SSL_HAS_SSL_set_SSL_CTX) && (SSL_HAS_SSL_set_SSL_CTX == 1) diff --git a/ACE/protocols/ace/INet/HTTPS_SessionFactory.cpp b/ACE/protocols/ace/INet/HTTPS_SessionFactory.cpp index 17818a92b5b..ef54eb8262b 100644 --- a/ACE/protocols/ace/INet/HTTPS_SessionFactory.cpp +++ b/ACE/protocols/ace/INet/HTTPS_SessionFactory.cpp @@ -8,7 +8,6 @@ namespace ACE { namespace HTTPS { - SessionFactory_Impl::SessionHolder_Impl::SessionHolder_Impl () : session_ (true) { diff --git a/ACE/protocols/ace/INet/HTTP_BasicAuthentication.cpp b/ACE/protocols/ace/INet/HTTP_BasicAuthentication.cpp index 2954096f8d7..1454898d3eb 100644 --- a/ACE/protocols/ace/INet/HTTP_BasicAuthentication.cpp +++ b/ACE/protocols/ace/INet/HTTP_BasicAuthentication.cpp @@ -13,7 +13,6 @@ namespace ACE { namespace HTTP { - const char* BasicAuthentication::SCHEME = "Basic"; BasicAuthentication::BasicAuthentication() diff --git a/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.cpp b/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.cpp index 3e7afb48bae..5f510650abb 100644 --- a/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.cpp +++ b/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.cpp @@ -14,7 +14,6 @@ namespace ACE { namespace HTTP { - SessionFactoryRegistry::SessionFactoryRegistry () { } diff --git a/ACE/protocols/ace/INet/HTTP_Header.cpp b/ACE/protocols/ace/INet/HTTP_Header.cpp index a22321df095..ceb296554a9 100644 --- a/ACE/protocols/ace/INet/HTTP_Header.cpp +++ b/ACE/protocols/ace/INet/HTTP_Header.cpp @@ -13,7 +13,6 @@ namespace ACE { namespace HTTP { - const ACE_CString Header::HTTP_1_0 = "HTTP/1.0"; const ACE_CString Header::HTTP_1_1 = "HTTP/1.1"; const ACE_CString Header::CHUNKED_TRANSFER_ENCODING = "chunked"; diff --git a/ACE/protocols/ace/INet/HTTP_IOStream.cpp b/ACE/protocols/ace/INet/HTTP_IOStream.cpp index 2a310356a8d..c7dabea92c6 100644 --- a/ACE/protocols/ace/INet/HTTP_IOStream.cpp +++ b/ACE/protocols/ace/INet/HTTP_IOStream.cpp @@ -14,7 +14,6 @@ namespace ACE { namespace HTTP { - StreamBuffer::StreamBuffer (std::iostream& stream, StreamBuffer::policy_type* policy) : ACE::IOS::BufferedStreamBuffer (BUFFER_SIZE, std::ios::in | std::ios::out), diff --git a/ACE/protocols/ace/INet/HTTP_IOStream.h b/ACE/protocols/ace/INet/HTTP_IOStream.h index 8983fec9c33..d502fdad6f2 100644 --- a/ACE/protocols/ace/INet/HTTP_IOStream.h +++ b/ACE/protocols/ace/INet/HTTP_IOStream.h @@ -27,7 +27,6 @@ namespace ACE { namespace HTTP { - /** * @class ACE_HTTP_StreamBuffer * diff --git a/ACE/protocols/ace/INet/HTTP_Request.cpp b/ACE/protocols/ace/INet/HTTP_Request.cpp index 94d5054f472..1511672f91e 100644 --- a/ACE/protocols/ace/INet/HTTP_Request.cpp +++ b/ACE/protocols/ace/INet/HTTP_Request.cpp @@ -15,7 +15,6 @@ namespace ACE { namespace HTTP { - const ACE_CString Request::HTTP_GET = "GET"; const ACE_CString Request::HTTP_HEAD = "HEAD"; const ACE_CString Request::HTTP_PUT = "PUT"; diff --git a/ACE/protocols/ace/INet/HTTP_Response.cpp b/ACE/protocols/ace/INet/HTTP_Response.cpp index daa49935e42..a3f5d1309d6 100644 --- a/ACE/protocols/ace/INet/HTTP_Response.cpp +++ b/ACE/protocols/ace/INet/HTTP_Response.cpp @@ -16,7 +16,6 @@ namespace ACE { namespace HTTP { - const ACE_CString Response::COOKIE = "Set-Cookie"; Response::Response() diff --git a/ACE/protocols/ace/INet/HTTP_Session.cpp b/ACE/protocols/ace/INet/HTTP_Session.cpp index 77854ca1397..80ce9fa5106 100644 --- a/ACE/protocols/ace/INet/HTTP_Session.cpp +++ b/ACE/protocols/ace/INet/HTTP_Session.cpp @@ -18,7 +18,6 @@ namespace ACE { namespace HTTP { - template <ACE_SYNCH_DECL> Session_T<ACE_SYNCH_USE>::Session_T (bool keep_alive) : SessionBase (URL::HTTP_PORT, keep_alive), diff --git a/ACE/protocols/ace/INet/HTTP_SessionBase.cpp b/ACE/protocols/ace/INet/HTTP_SessionBase.cpp index 4040828c984..0248382bb0d 100644 --- a/ACE/protocols/ace/INet/HTTP_SessionBase.cpp +++ b/ACE/protocols/ace/INet/HTTP_SessionBase.cpp @@ -20,7 +20,6 @@ namespace ACE { namespace HTTP { - SessionBase::SessionBase (u_short port, bool keep_alive) : port_ (port), reactive_ (false), diff --git a/ACE/protocols/ace/INet/HTTP_Status.cpp b/ACE/protocols/ace/INet/HTTP_Status.cpp index 3f886797693..d7927115e7b 100644 --- a/ACE/protocols/ace/INet/HTTP_Status.cpp +++ b/ACE/protocols/ace/INet/HTTP_Status.cpp @@ -13,7 +13,6 @@ namespace ACE { namespace HTTP { - const ACE_CString Status::HTTP_REASON_CONTINUE = "Continue"; const ACE_CString Status::HTTP_REASON_SWITCHING_PROTOCOLS = "Switching Protocols"; const ACE_CString Status::HTTP_REASON_OK = "OK"; diff --git a/ACE/protocols/ace/INet/HeaderBase.cpp b/ACE/protocols/ace/INet/HeaderBase.cpp index 884f1803ca8..bbff0b8b17e 100644 --- a/ACE/protocols/ace/INet/HeaderBase.cpp +++ b/ACE/protocols/ace/INet/HeaderBase.cpp @@ -14,7 +14,6 @@ namespace ACE { namespace INet { - const int HeaderBase::UNKNOWN_CONTENT_LENGTH = -1; const ACE_CString HeaderBase::UNKNOWN_CONTENT_TYPE; const ACE_CString HeaderBase::CONTENT_LENGTH = "Content-Length"; @@ -61,7 +60,6 @@ namespace ACE bool HeaderBase::read(std::istream& str) { - ACE_CString name (64, '\0'); ACE_CString value (128, '\0'); int ch = str.peek (); diff --git a/ACE/protocols/ace/INet/Request.cpp b/ACE/protocols/ace/INet/Request.cpp index b5835b0c79d..d59763ed197 100644 --- a/ACE/protocols/ace/INet/Request.cpp +++ b/ACE/protocols/ace/INet/Request.cpp @@ -7,7 +7,6 @@ namespace ACE { namespace INet { - Request::Request () {} Request::~Request () {} diff --git a/ACE/protocols/ace/INet/Request.h b/ACE/protocols/ace/INet/Request.h index 05a193438b1..32afdb23ad8 100644 --- a/ACE/protocols/ace/INet/Request.h +++ b/ACE/protocols/ace/INet/Request.h @@ -17,7 +17,6 @@ namespace ACE { namespace INet { - /** * @class ACE_INet_Request * diff --git a/ACE/protocols/ace/INet/RequestHandler.cpp b/ACE/protocols/ace/INet/RequestHandler.cpp index 85057605364..bce353071ee 100644 --- a/ACE/protocols/ace/INet/RequestHandler.cpp +++ b/ACE/protocols/ace/INet/RequestHandler.cpp @@ -7,7 +7,6 @@ namespace ACE { namespace INet { - RequestHandler::RequestHandler () {} RequestHandler::~RequestHandler () {} diff --git a/ACE/protocols/ace/INet/RequestHandler.h b/ACE/protocols/ace/INet/RequestHandler.h index 06f029222f3..d24379dba66 100644 --- a/ACE/protocols/ace/INet/RequestHandler.h +++ b/ACE/protocols/ace/INet/RequestHandler.h @@ -19,7 +19,6 @@ namespace ACE { namespace INet { - /** * @class ACE_INet_RequestHandler * diff --git a/ACE/protocols/ace/INet/Response.cpp b/ACE/protocols/ace/INet/Response.cpp index 0c9984b4e0c..65cbc49c7ff 100644 --- a/ACE/protocols/ace/INet/Response.cpp +++ b/ACE/protocols/ace/INet/Response.cpp @@ -7,7 +7,6 @@ namespace ACE { namespace INet { - Response::Response () {} Response::~Response () {} diff --git a/ACE/protocols/ace/INet/Response.h b/ACE/protocols/ace/INet/Response.h index 8d7b4c063ff..8d07d155c3f 100644 --- a/ACE/protocols/ace/INet/Response.h +++ b/ACE/protocols/ace/INet/Response.h @@ -17,7 +17,6 @@ namespace ACE { namespace INet { - /** * @class ACE_INet_Response * diff --git a/ACE/protocols/ace/INet/SSLSock_IOStream.cpp b/ACE/protocols/ace/INet/SSLSock_IOStream.cpp index 5651f4802f5..5b39ad2e8cc 100644 --- a/ACE/protocols/ace/INet/SSLSock_IOStream.cpp +++ b/ACE/protocols/ace/INet/SSLSock_IOStream.cpp @@ -10,7 +10,6 @@ namespace ACE { namespace IOS { - template <ACE_SYNCH_DECL> SSLSock_StreamBufferBase<ACE_SYNCH_USE>::SSLSock_StreamBufferBase (stream_type* stream) : BidirStreamBuffer<StreamHandler<ACE_SSL_SOCK_Stream, ACE_SYNCH_USE> > ( diff --git a/ACE/protocols/ace/INet/SSL_CallbackManager.cpp b/ACE/protocols/ace/INet/SSL_CallbackManager.cpp index 330b8e55352..f78dab0db4b 100644 --- a/ACE/protocols/ace/INet/SSL_CallbackManager.cpp +++ b/ACE/protocols/ace/INet/SSL_CallbackManager.cpp @@ -16,7 +16,6 @@ namespace ACE { namespace INet { - int SSL_CallbackManager::ssl_ctx_mngr_index_ = (-2); SSL_CallbackManager::SSL_CallbackManager () diff --git a/ACE/protocols/ace/INet/SSL_CertificateCallback.cpp b/ACE/protocols/ace/INet/SSL_CertificateCallback.cpp index 36d6625ca8c..929be0e85db 100644 --- a/ACE/protocols/ace/INet/SSL_CertificateCallback.cpp +++ b/ACE/protocols/ace/INet/SSL_CertificateCallback.cpp @@ -13,7 +13,6 @@ namespace ACE { namespace INet { - SSL_CertificateCallbackArg::SSL_CertificateCallbackArg (const ACE_SSL_Context* ssl_ctx, ::X509_STORE_CTX* cert_ctx) : ssl_ctx_ (ssl_ctx), diff --git a/ACE/protocols/ace/INet/SSL_PasswordCallback.cpp b/ACE/protocols/ace/INet/SSL_PasswordCallback.cpp index d94a502c57f..e918c9ed408 100644 --- a/ACE/protocols/ace/INet/SSL_PasswordCallback.cpp +++ b/ACE/protocols/ace/INet/SSL_PasswordCallback.cpp @@ -6,7 +6,6 @@ namespace ACE { namespace INet { - SSL_PasswordCallback::SSL_PasswordCallback () { } diff --git a/ACE/protocols/ace/INet/SSL_Proxy_Connector.cpp b/ACE/protocols/ace/INet/SSL_Proxy_Connector.cpp index 0c17a4317ce..91e42445763 100644 --- a/ACE/protocols/ace/INet/SSL_Proxy_Connector.cpp +++ b/ACE/protocols/ace/INet/SSL_Proxy_Connector.cpp @@ -15,7 +15,6 @@ namespace ACE { namespace INet { - SSL_Proxy_Connector::SSL_Proxy_Connector () {} SSL_Proxy_Connector::~SSL_Proxy_Connector () {} diff --git a/ACE/protocols/ace/INet/Sock_IOStream.cpp b/ACE/protocols/ace/INet/Sock_IOStream.cpp index 06979f90942..9b09310fe44 100644 --- a/ACE/protocols/ace/INet/Sock_IOStream.cpp +++ b/ACE/protocols/ace/INet/Sock_IOStream.cpp @@ -10,7 +10,6 @@ namespace ACE { namespace IOS { - template <ACE_SYNCH_DECL> Sock_StreamBufferBase<ACE_SYNCH_USE>::Sock_StreamBufferBase (stream_type* stream) : BidirStreamBuffer<StreamHandler<ACE_SOCK_STREAM, ACE_SYNCH_USE> > ( diff --git a/ACE/protocols/ace/INet/StreamInterceptor.cpp b/ACE/protocols/ace/INet/StreamInterceptor.cpp index 205f0b5a016..80580ad9282 100644 --- a/ACE/protocols/ace/INet/StreamInterceptor.cpp +++ b/ACE/protocols/ace/INet/StreamInterceptor.cpp @@ -9,7 +9,6 @@ namespace ACE { namespace IOS { - template <class ACE_CHAR_T, class TR> StreamInterceptorBase<ACE_CHAR_T, TR>::StreamInterceptorBase () { diff --git a/ACE/protocols/ace/INet/String_IOStream.cpp b/ACE/protocols/ace/INet/String_IOStream.cpp index 630eb4ffe42..5dde4c4f098 100644 --- a/ACE/protocols/ace/INet/String_IOStream.cpp +++ b/ACE/protocols/ace/INet/String_IOStream.cpp @@ -11,7 +11,6 @@ namespace ACE { namespace IOS { - template <class ACE_CHAR_T, class TR> String_StreamBufferBase<ACE_CHAR_T, TR>::String_StreamBufferBase (openmode mode) : BasicBufferedStreamBuffer<ACE_CHAR_T, TR> (BUFFER_SIZE, mode), @@ -40,7 +39,6 @@ namespace ACE seekdir way, openmode which) { - if (which != this->get_mode () || which == std::ios::out) return pos_type (-1); diff --git a/ACE/protocols/ace/INet/URLBase.cpp b/ACE/protocols/ace/INet/URLBase.cpp index 84244bf4b1e..8814eb94dad 100644 --- a/ACE/protocols/ace/INet/URLBase.cpp +++ b/ACE/protocols/ace/INet/URLBase.cpp @@ -16,7 +16,6 @@ namespace ACE { namespace INet { - URLStream::URLStream (const URLStream& url_stream) : request_handler_ref_ (url_stream.request_handler_ref_), request_handler_ (url_stream.request_handler_) diff --git a/ACE/protocols/ace/INet/URLBase.h b/ACE/protocols/ace/INet/URLBase.h index cf02ca18b11..c9a5ccdd85e 100644 --- a/ACE/protocols/ace/INet/URLBase.h +++ b/ACE/protocols/ace/INet/URLBase.h @@ -26,7 +26,6 @@ namespace ACE { namespace INet { - /** * @class ACE_INet_URLStream * diff --git a/ACE/protocols/ace/TMCast/Group.cpp b/ACE/protocols/ace/TMCast/Group.cpp index 1fa028e8362..844a78219d6 100644 --- a/ACE/protocols/ace/TMCast/Group.cpp +++ b/ACE/protocols/ace/TMCast/Group.cpp @@ -181,7 +181,6 @@ namespace ACE_TMCast } else if ((data = dynamic_cast<LinkData*> (m.get ()))) { - // INSYNC, TL, CT // Filter out loopback. diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/client.cpp b/ACE/protocols/tests/HTBP/Reactor_Tests/client.cpp index 4716ef081c4..ade9454a8e5 100644 --- a/ACE/protocols/tests/HTBP/Reactor_Tests/client.cpp +++ b/ACE/protocols/tests/HTBP/Reactor_Tests/client.cpp @@ -52,7 +52,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - ACE_OS::socket_init (ACE_WSOCK_VERSION); if (parse_args(argc, argv) != 0) diff --git a/ACE/tests/Bug_2540_Regression_Test.cpp b/ACE/tests/Bug_2540_Regression_Test.cpp index 6d624def926..98129661703 100644 --- a/ACE/tests/Bug_2540_Regression_Test.cpp +++ b/ACE/tests/Bug_2540_Regression_Test.cpp @@ -178,7 +178,6 @@ ACE_HANDLE Handler::get_handle() const int Handler::handle_input(ACE_HANDLE /* h */) { - ++handle_input_count_; // ACE_DEBUG((LM_DEBUG, "Handler::handle_input called for %d\n", h)); diff --git a/ACE/tests/Bug_2980_Regression_Dll.cpp b/ACE/tests/Bug_2980_Regression_Dll.cpp index ecab20be41b..2e65a687374 100644 --- a/ACE/tests/Bug_2980_Regression_Dll.cpp +++ b/ACE/tests/Bug_2980_Regression_Dll.cpp @@ -4,7 +4,6 @@ extern "C" { - ACE_Proper_Export_Flag int capi_init(void) { int ret = ACE::init(); diff --git a/ACE/tests/Bug_3943_Regression_Test.cpp b/ACE/tests/Bug_3943_Regression_Test.cpp index 8fdf4a0f98b..d4eca5c1b59 100644 --- a/ACE/tests/Bug_3943_Regression_Test.cpp +++ b/ACE/tests/Bug_3943_Regression_Test.cpp @@ -67,7 +67,6 @@ #define REFCOUNTED_HASH_RECYCLABLE_ADDR ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> namespace { - const char FINISHED_CHAR = '%'; const char RESTART_CHAR = '&'; const char START_CHAR = '0'; diff --git a/ACE/tests/CDR_File_Test.cpp b/ACE/tests/CDR_File_Test.cpp index 62be7259803..aee71f3aa1f 100644 --- a/ACE/tests/CDR_File_Test.cpp +++ b/ACE/tests/CDR_File_Test.cpp @@ -33,7 +33,6 @@ */ class CDR_Test { - /// Output the state of a <CDR_Test> object to the <ostream>. friend ostream& operator << (ostream &os, const CDR_Test &t); diff --git a/ACE/tests/Cached_Allocator_Test.cpp b/ACE/tests/Cached_Allocator_Test.cpp index 4222e7144df..0012f88c57f 100644 --- a/ACE/tests/Cached_Allocator_Test.cpp +++ b/ACE/tests/Cached_Allocator_Test.cpp @@ -75,7 +75,6 @@ using STATIC_ALLOCATOR = ACE_Cached_Allocator<MEMBLOCK, ACE_MT_SYNCH::NULL_MUTEX static int stdspeed_test (ACE_UINT32 loops) { - double tt = 0.0, ut = 0.0, utus = 0.0, diff --git a/ACE/tests/Compiler_Features_10_Test.cpp b/ACE/tests/Compiler_Features_10_Test.cpp index 327c1c8468b..4621bc62f5e 100644 --- a/ACE/tests/Compiler_Features_10_Test.cpp +++ b/ACE/tests/Compiler_Features_10_Test.cpp @@ -200,7 +200,6 @@ run_main (int, ACE_TCHAR *[]) namespace { - void check_constructor_count(int expected, char const * filename, diff --git a/ACE/tests/Dev_Poll_Reactor_Test.cpp b/ACE/tests/Dev_Poll_Reactor_Test.cpp index ff766fcdf7e..8dffa050bf3 100644 --- a/ACE/tests/Dev_Poll_Reactor_Test.cpp +++ b/ACE/tests/Dev_Poll_Reactor_Test.cpp @@ -224,7 +224,6 @@ Server::handle_input (ACE_HANDLE /* handle */) { if (errno == EWOULDBLOCK) { - // ACE_HEX_DUMP ((LM_DEBUG, // buf, // 80, diff --git a/ACE/tests/Dirent_Test.cpp b/ACE/tests/Dirent_Test.cpp index 118675e3730..f38fd33beae 100644 --- a/ACE/tests/Dirent_Test.cpp +++ b/ACE/tests/Dirent_Test.cpp @@ -39,7 +39,6 @@ static const int RECURSION_INDENT = 3; static int entrycount = 0; extern "C" { - static int selector (const ACE_DIRENT *d) { diff --git a/ACE/tests/Log_Thread_Inheritance_Test.cpp b/ACE/tests/Log_Thread_Inheritance_Test.cpp index 7f35886b04c..e27fa012b65 100644 --- a/ACE/tests/Log_Thread_Inheritance_Test.cpp +++ b/ACE/tests/Log_Thread_Inheritance_Test.cpp @@ -60,7 +60,6 @@ bool test_inherited_attributes () struct MyThread : ACE_Task_Base { - enum { THREAD_DEFAULTS = THR_NEW_LWP|THR_JOINABLE|THR_INHERIT_SCHED }; explicit MyThread (bool openfile = false) diff --git a/ACE/tests/MT_Reactor_Timer_Test.cpp b/ACE/tests/MT_Reactor_Timer_Test.cpp index 1959cfe674d..6b952c9d5d0 100644 --- a/ACE/tests/MT_Reactor_Timer_Test.cpp +++ b/ACE/tests/MT_Reactor_Timer_Test.cpp @@ -146,7 +146,6 @@ Time_Handler::handle_timeout (const ACE_Time_Value &tv, Dispatch_Count_Handler::Dispatch_Count_Handler () { - ACE_Reactor *r = ACE_Reactor::instance (); this->input_seen_ = this->notify_seen_ = 0; diff --git a/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp b/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp index fe3ad6fffb5..42b22901170 100644 --- a/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp +++ b/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp @@ -1264,7 +1264,6 @@ test<REACTOR_IMPL>::test (int ignore_nested_upcalls, (nested_upcalls == -1 || nested_upcalls == test_configs[i][4])) { - #if 0 /* defined (ACE_LINUX) */ // @@ I am not sure why but when <make_invocations> is 0 and diff --git a/ACE/tests/Malloc_Test.cpp b/ACE/tests/Malloc_Test.cpp index 037e5744ddb..d2bc5852106 100644 --- a/ACE/tests/Malloc_Test.cpp +++ b/ACE/tests/Malloc_Test.cpp @@ -91,7 +91,6 @@ myallocator (const void *base_addr = 0) if (static_allocator.get () == 0) { - #if defined (ACE_HAS_WINCE) || defined (ACE_OPENVMS) // WinCE cannot do fixed base, ever. ACE_UNUSED_ARG (base_addr); diff --git a/ACE/tests/Max_Default_Port_Test.cpp b/ACE/tests/Max_Default_Port_Test.cpp index 41af8dffb7a..8a2b2e45bab 100644 --- a/ACE/tests/Max_Default_Port_Test.cpp +++ b/ACE/tests/Max_Default_Port_Test.cpp @@ -51,7 +51,6 @@ My_Accept_Handler::~My_Accept_Handler () int My_Accept_Handler::open (ACE_INET_Addr &addr) { - if (this->peer_acceptor_.open (addr, 1) == -1) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), @@ -71,7 +70,6 @@ My_Accept_Handler::get_handle () const int My_Accept_Handler::handle_input (ACE_HANDLE) { - if (this->peer_acceptor_.accept(this->stream_, 0) == -1) { ACE_ERROR((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("peer_acceptor.accept"))); @@ -163,7 +161,6 @@ client (void *arg) int run_main (int argc, ACE_TCHAR *argv[]) { - ACE_START_TEST (ACE_TEXT ("Max_Default_Port_Test")); ACE_UNUSED_ARG (argc); diff --git a/ACE/tests/Max_Default_Port_Test.h b/ACE/tests/Max_Default_Port_Test.h index 039d5f454d0..10439aaeedc 100644 --- a/ACE/tests/Max_Default_Port_Test.h +++ b/ACE/tests/Max_Default_Port_Test.h @@ -24,7 +24,6 @@ */ class My_Accept_Handler : public ACE_Event_Handler { - public: My_Accept_Handler (ACE_INET_Addr &addr); ~My_Accept_Handler (); diff --git a/ACE/tests/Max_Default_Port_Test_IPV6.cpp b/ACE/tests/Max_Default_Port_Test_IPV6.cpp index 1b6db1cfe7e..3f1f0c74c41 100644 --- a/ACE/tests/Max_Default_Port_Test_IPV6.cpp +++ b/ACE/tests/Max_Default_Port_Test_IPV6.cpp @@ -43,7 +43,6 @@ My_Accept_Handler::~My_Accept_Handler () int My_Accept_Handler::open (ACE_INET_Addr &addr) { - if (this->peer_acceptor_.open (addr, 1) == -1) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), @@ -63,7 +62,6 @@ My_Accept_Handler::get_handle () const int My_Accept_Handler::handle_input (ACE_HANDLE) { - if (this->peer_acceptor_.accept(this->stream_, 0) == -1) { ACE_ERROR((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("peer_acceptor.accept"))); diff --git a/ACE/tests/Message_Block_Large_Copy_Test.cpp b/ACE/tests/Message_Block_Large_Copy_Test.cpp index 44fb9bf15f6..3107b3ea079 100644 --- a/ACE/tests/Message_Block_Large_Copy_Test.cpp +++ b/ACE/tests/Message_Block_Large_Copy_Test.cpp @@ -99,12 +99,10 @@ run_clone_test (const size_t msg_block_count, int run_main (int , ACE_TCHAR *[]) { - int rc = 0; ACE_START_TEST (ACE_TEXT ("Message_Block_Large_Copy_Test")); { - // Message_Block size() and Length() of 24,000,000 const size_t MSG_BLOCK_COUNT = 8000; const size_t MSG_BLOCK_SIZE = 3000; diff --git a/ACE/tests/Message_Queue_Test.cpp b/ACE/tests/Message_Queue_Test.cpp index 957e58dec0d..ce5163e5be4 100644 --- a/ACE/tests/Message_Queue_Test.cpp +++ b/ACE/tests/Message_Queue_Test.cpp @@ -408,7 +408,6 @@ iterator_test () static int chained_block_test () { - QUEUE q; const char * s = "123456789"; // Will be length 10 when copied to block const size_t slen = 10; diff --git a/ACE/tests/Multicast_Test.cpp b/ACE/tests/Multicast_Test.cpp index 72d45ce6a5b..c00aaa347b0 100644 --- a/ACE/tests/Multicast_Test.cpp +++ b/ACE/tests/Multicast_Test.cpp @@ -758,7 +758,6 @@ MCT_Task::svc () int send_dgram (ACE_SOCK_Dgram &socket, ACE_INET_Addr addr, int done = 0) { - // Send each message twice, once to the right port, and once to the "wrong" // port. This helps generate noise and lets us see if port filtering is // working properly. diff --git a/ACE/tests/Multicast_Test_IPV6.cpp b/ACE/tests/Multicast_Test_IPV6.cpp index ead5a51961b..f8d8d9a8238 100644 --- a/ACE/tests/Multicast_Test_IPV6.cpp +++ b/ACE/tests/Multicast_Test_IPV6.cpp @@ -754,7 +754,6 @@ MCT_Task::svc () int send_dgram (ACE_SOCK_Dgram &socket, ACE_INET_Addr addr, int done = 0) { - // Send each message twice, once to the right port, and once to the "wrong" // port. This helps generate noise and lets us see if port filtering is // working properly. diff --git a/ACE/tests/Multihomed_INET_Addr_Test.cpp b/ACE/tests/Multihomed_INET_Addr_Test.cpp index bf8d53308c2..c9a7d3d8762 100644 --- a/ACE/tests/Multihomed_INET_Addr_Test.cpp +++ b/ACE/tests/Multihomed_INET_Addr_Test.cpp @@ -92,8 +92,6 @@ int run_main (int, ACE_TCHAR *[]) // Run the test with a varying number of secondary addresses for (i = 0; i <= num_secondaries; ++i) { - - /****** Clear the in_out array and test subject ******/ @@ -135,7 +133,6 @@ int run_main (int, ACE_TCHAR *[]) // secondary addresses. size_t returned_num_secondaries = addr.get_num_secondary_addresses(); if (returned_num_secondaries == num_secondaries) { - // Set a stay_out element to the state that we expect to see // from every in_out element after the in_out array is passed to // the accessor of the test subject. @@ -146,9 +143,7 @@ int run_main (int, ACE_TCHAR *[]) // Check that the in_out array matches stay_out element for (j = 0; j < num_secondaries; ++j) { - if (in_out[j] != stay_out[0]) { - ACE_TCHAR in_out_string[100]; ACE_TCHAR stay_out_string[100]; @@ -172,9 +167,7 @@ int run_main (int, ACE_TCHAR *[]) for (j = 0, pointer = in_out_sockaddr; j < num_secondaries + 1; ++j, ++pointer) { - if (ACE_OS::memcmp(pointer, stay_out[0].get_addr(), sizeof(sockaddr))) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Failed get_addresses check\n"))); @@ -183,7 +176,6 @@ int run_main (int, ACE_TCHAR *[]) } } else { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Failed get_num_secondary_addresses check\n") ACE_TEXT ("%d != %d\n"), @@ -230,7 +222,6 @@ int run_main (int, ACE_TCHAR *[]) // secondary addresses. returned_num_secondaries = addr.get_num_secondary_addresses(); if (returned_num_secondaries == i) { - // Initialize the stay_out array with the secondary addresses for (j = 0; j < i; ++j) { stay_out[j].set(port, secondary_dotted_decimals[j]); @@ -241,9 +232,7 @@ int run_main (int, ACE_TCHAR *[]) // Check that the in_out array matches stay_out array for (j = 0; j < i; ++j) { - if (in_out[j] != stay_out[j]) { - ACE_TCHAR in_out_string[100]; ACE_TCHAR stay_out_string[100]; @@ -266,7 +255,6 @@ int run_main (int, ACE_TCHAR *[]) // Check that the primary address in the in_out_sockaddr array // matches the primary address reported by the superclass if (ACE_OS::memcmp(in_out_sockaddr, addr.get_addr(), sizeof(sockaddr))) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Failed second get_addresses check ") ACE_TEXT ("(for primary address)\n"))); @@ -280,9 +268,7 @@ int run_main (int, ACE_TCHAR *[]) for (j = 1, pointer = &in_out_sockaddr[1]; j < i + 1; ++j, ++pointer) { - if (ACE_OS::memcmp(pointer, stay_out[j-1].get_addr(), sizeof(sockaddr))) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Failed second get_addresses check ") ACE_TEXT ("(for secondary addresses)\n"))); @@ -292,7 +278,6 @@ int run_main (int, ACE_TCHAR *[]) } } else { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Failed second get_num_secondary_addresses check\n") ACE_TEXT ("%d != %d\n"), @@ -339,7 +324,6 @@ int run_main (int, ACE_TCHAR *[]) // secondary addresses. returned_num_secondaries = addr.get_num_secondary_addresses(); if (returned_num_secondaries == num_secondaries) { - // Set a stay_out element to the state that we expect to see // from every in_out element after the in_out array is passed to // the accessor of the test subject. @@ -350,9 +334,7 @@ int run_main (int, ACE_TCHAR *[]) // Check that the in_out array matches stay_out array for (j = 0; j < num_secondaries; ++j) { - if (in_out[j] != stay_out[0]) { - ACE_TCHAR in_out_string[100]; ACE_TCHAR stay_out_string[100]; @@ -370,7 +352,6 @@ int run_main (int, ACE_TCHAR *[]) } } else { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Failed third get_num_secondary_addresses check\n") ACE_TEXT ("%d != %d\n"), @@ -415,7 +396,6 @@ int run_main (int, ACE_TCHAR *[]) // secondary addresses. returned_num_secondaries = addr.get_num_secondary_addresses(); if (returned_num_secondaries == i) { - // Initialize the stay_out array with the secondary addresses for (j = 0; j < i; ++j) { stay_out[j].set(port, secondary_addr32[j]); @@ -426,9 +406,7 @@ int run_main (int, ACE_TCHAR *[]) // Check that the in_out array matches stay_out array for (j = 0; j < i; ++j) { - if (in_out[j] != stay_out[j]) { - ACE_TCHAR in_out_string[100]; ACE_TCHAR stay_out_string[100]; @@ -446,7 +424,6 @@ int run_main (int, ACE_TCHAR *[]) } } else { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Failed forth get_num_secondary_addresses check\n") ACE_TEXT ("%d != %d\n"), diff --git a/ACE/tests/Multihomed_INET_Addr_Test_IPV6.cpp b/ACE/tests/Multihomed_INET_Addr_Test_IPV6.cpp index 2ce26889746..74c7f9d1b5d 100644 --- a/ACE/tests/Multihomed_INET_Addr_Test_IPV6.cpp +++ b/ACE/tests/Multihomed_INET_Addr_Test_IPV6.cpp @@ -63,8 +63,6 @@ int run_main (int argc, ACE_TCHAR *argv[]) sockaddr_in6 in_out_sockaddr6[num_sockaddrs]; for (i = 0; i <= num_secondaries; ++i) { - - /**** Test set (u_short, const char[], int, int, const char *([]), size_t) ****/ @@ -101,7 +99,6 @@ int run_main (int argc, ACE_TCHAR *argv[]) // secondary addresses. size_t returned_num_secondaries = addr.get_num_secondary_addresses(); if (returned_num_secondaries == i) { - // Initialize the stay_out array with the secondary addresses for (j = 0; j < i; ++j) { stay_out[j].set(port, secondary_ipv6[j]); @@ -112,9 +109,7 @@ int run_main (int argc, ACE_TCHAR *argv[]) // Check that the in_out array matches stay_out array for (j = 0; j < i; ++j) { - if (in_out[j] != stay_out[j]) { - ACE_TCHAR in_out_string[100]; ACE_TCHAR stay_out_string[100]; @@ -138,7 +133,6 @@ int run_main (int argc, ACE_TCHAR *argv[]) // matches the primary address reported by the superclass if (ACE_OS::memcmp(in_out_sockaddr6, addr.get_addr(), sizeof(sockaddr_in6))) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Failed second get_addresses check ") ACE_TEXT ("(for primary address)\n"))); @@ -152,10 +146,8 @@ int run_main (int argc, ACE_TCHAR *argv[]) for (j = 1, pointer6 = &in_out_sockaddr6[1]; j < i + 1; ++j, ++pointer6) { - if (ACE_OS::memcmp(pointer6, stay_out[j-1].get_addr(), sizeof(sockaddr_in6))) { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Failed get_addresses check ") ACE_TEXT ("(for secondary addresses)\n"))); @@ -164,7 +156,6 @@ int run_main (int argc, ACE_TCHAR *argv[]) } } } else { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("Failed get_num_secondary_addresses check\n") ACE_TEXT ("%d != %d\n"), diff --git a/ACE/tests/Network_Adapters_Test.cpp b/ACE/tests/Network_Adapters_Test.cpp index e42fc226182..8072d76ba62 100644 --- a/ACE/tests/Network_Adapters_Test.cpp +++ b/ACE/tests/Network_Adapters_Test.cpp @@ -615,7 +615,6 @@ Stop_Handler::handle_input (ACE_HANDLE handle) // protect from deleted pointer try { - this->reactor ()->cancel_timer (this->handlers_to_stop_[i]); this->reactor ()->remove_handler (this->handlers_to_stop_[i], diff --git a/ACE/tests/Process_Manager_Test.cpp b/ACE/tests/Process_Manager_Test.cpp index 02d89c320c4..d5bd07b5536 100644 --- a/ACE/tests/Process_Manager_Test.cpp +++ b/ACE/tests/Process_Manager_Test.cpp @@ -75,7 +75,6 @@ spawn_child (const ACE_TCHAR *argv0, int sleep_time, int my_process_id) { - #if defined (ACE_HAS_WINCE) const ACE_TCHAR *cmdline_format = ACE_TEXT("%s %d"); #elif defined (ACE_WIN32) diff --git a/ACE/tests/QtReactor_Test.cpp b/ACE/tests/QtReactor_Test.cpp index cbc994d4300..f21e9f880c3 100644 --- a/ACE/tests/QtReactor_Test.cpp +++ b/ACE/tests/QtReactor_Test.cpp @@ -900,7 +900,6 @@ void testQtReactor (int argc, ACE_TCHAR *argv[]) 0 <= handlersRegister.registerDgramHandlers () && 0 <= handlersRegister.registerTCPHandlers ()) { - app.exec (TotalTestTime); if (0 != handlersRegister.analyze ()) diff --git a/ACE/tests/RB_Tree_Test.h b/ACE/tests/RB_Tree_Test.h index dcf9dba40d7..911ca6c37c0 100644 --- a/ACE/tests/RB_Tree_Test.h +++ b/ACE/tests/RB_Tree_Test.h @@ -23,7 +23,6 @@ template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> class ACE_RB_Tree_Test { - // To run the test class on a particular type instantiation of the // RB_Tree, simply instantiate the test class template with the // same type parameters, and invoke the run_test method. diff --git a/ACE/tests/Reactor_Fairness_Test.cpp b/ACE/tests/Reactor_Fairness_Test.cpp index 426adc3e269..3a01da60f23 100644 --- a/ACE/tests/Reactor_Fairness_Test.cpp +++ b/ACE/tests/Reactor_Fairness_Test.cpp @@ -31,7 +31,6 @@ #if defined (ACE_HAS_THREADS) namespace { - const char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz"; // Number of connections to run diff --git a/ACE/tests/Reactor_Notification_Queue_Test.cpp b/ACE/tests/Reactor_Notification_Queue_Test.cpp index 47bdfe3c429..8b643af240f 100644 --- a/ACE/tests/Reactor_Notification_Queue_Test.cpp +++ b/ACE/tests/Reactor_Notification_Queue_Test.cpp @@ -180,7 +180,6 @@ Event_Handler::handle_exception (ACE_HANDLE) { if(notifications_curr_ >= max_notifications_) { - return 0; } send_notifications(); diff --git a/ACE/tests/Reactor_Notify_Test.cpp b/ACE/tests/Reactor_Notify_Test.cpp index 08874f291c3..89afd26e4fc 100644 --- a/ACE/tests/Reactor_Notify_Test.cpp +++ b/ACE/tests/Reactor_Notify_Test.cpp @@ -446,7 +446,6 @@ run_test (int disable_notify_pipe, */ class Purged_Notify : public ACE_Event_Handler { - int handle_exception (ACE_HANDLE = ACE_INVALID_HANDLE) override { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/ACE/tests/SOCK_Connector_Test.cpp b/ACE/tests/SOCK_Connector_Test.cpp index 4ed5c65560a..20292064aa8 100644 --- a/ACE/tests/SOCK_Connector_Test.cpp +++ b/ACE/tests/SOCK_Connector_Test.cpp @@ -72,7 +72,6 @@ find_another_host (ACE_TCHAR other_host[]) if (cached_other_host[0] == '\0') { - ACE_OS::strcpy (other_host, ACE_DEFAULT_SERVER_HOST); // If all else fails diff --git a/ACE/tests/SString_Test.cpp b/ACE/tests/SString_Test.cpp index bd8bf74851b..75d47ad8b84 100644 --- a/ACE/tests/SString_Test.cpp +++ b/ACE/tests/SString_Test.cpp @@ -160,7 +160,6 @@ run_main (int, ACE_TCHAR *[]) ACE_START_TEST (ACE_TEXT ("SString_Test")); { - /* Set #1 */ ACE_CString s0 ("hello"); ACE_CString s1 ("hello"); diff --git a/ACE/tests/STL_algorithm_Test_T.cpp b/ACE/tests/STL_algorithm_Test_T.cpp index 5c9b99cfe68..12cd2766165 100644 --- a/ACE/tests/STL_algorithm_Test_T.cpp +++ b/ACE/tests/STL_algorithm_Test_T.cpp @@ -12,7 +12,6 @@ public: Element_Counter (void) : count_ (0) { - } void operator () (typename T::value_type & item) diff --git a/ACE/tests/TP_Reactor_Test.cpp b/ACE/tests/TP_Reactor_Test.cpp index 5f24c2fbebf..de78091aecd 100644 --- a/ACE/tests/TP_Reactor_Test.cpp +++ b/ACE/tests/TP_Reactor_Test.cpp @@ -697,7 +697,6 @@ Connector::on_delete_sender (Sender & sndr) int Connector::start (const ACE_INET_Addr & addr, int num) { - if (ACE_Connector<Sender,ACE_SOCK_CONNECTOR>::open (ACE_Reactor::instance (), ACE_NONBLOCK) < 0) ACE_ERROR_RETURN diff --git a/ACE/tests/Thread_Attrs_Test.cpp b/ACE/tests/Thread_Attrs_Test.cpp index 3f70624918c..a8edb0327b8 100644 --- a/ACE/tests/Thread_Attrs_Test.cpp +++ b/ACE/tests/Thread_Attrs_Test.cpp @@ -125,7 +125,6 @@ Cancel_Check::open (void *) */ class Stack_Size_Check : public ACE_Task<ACE_MT_SYNCH> { - public: /// Create the thread with specified stack size Stack_Size_Check (size_t stack_size); diff --git a/ACE/tests/Thread_Manager_Test.cpp b/ACE/tests/Thread_Manager_Test.cpp index 5a991655193..878f83d23e9 100644 --- a/ACE/tests/Thread_Manager_Test.cpp +++ b/ACE/tests/Thread_Manager_Test.cpp @@ -192,7 +192,6 @@ ThrMgr_Task::svc () static int test_task_record_keeping (ACE_Thread_Manager *mgr) { - int status = 0; ThrMgr_Task t1 (mgr), t2 (mgr); diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/client.cpp b/TAO/DevGuideExamples/BiDirectionalGIOP/client.cpp index 5b1167b9622..4f484c3f6c4 100644 --- a/TAO/DevGuideExamples/BiDirectionalGIOP/client.cpp +++ b/TAO/DevGuideExamples/BiDirectionalGIOP/client.cpp @@ -35,7 +35,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/server.cpp b/TAO/DevGuideExamples/BiDirectionalGIOP/server.cpp index ad4b3224ab9..529d1feff1e 100644 --- a/TAO/DevGuideExamples/BiDirectionalGIOP/server.cpp +++ b/TAO/DevGuideExamples/BiDirectionalGIOP/server.cpp @@ -84,7 +84,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // Our own special orb->run() that knows how to callback clients while (true) { - // returns 1 as soon as it has successfully called back. if (svt->call_client()) { break; diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp b/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp index 373d2d387e0..32aafb0e039 100644 --- a/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp +++ b/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp @@ -39,11 +39,9 @@ int Simple_i::call_client() { if (ready_for_callback_) { - ready_for_callback_ = 0; for (int times = 0; times < callback_count_; ++times) { - callback_->callback_method(); if (orb_->orb_core()->lane_resources().transport_cache().current_size() > 1) diff --git a/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.cpp b/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.cpp index a3bb99603c0..4e0d4f301ff 100644 --- a/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.cpp +++ b/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.cpp @@ -42,7 +42,6 @@ Messenger_Locator_i::postinvoke (const PortableServer::ObjectId &, void * cookie, PortableServer::Servant servant) { - std::cout << "postinvoke called..." << std::endl; // Delete the servant as it is no longer needed. diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp index 0bb8b9d3a8d..400e8f94199 100644 --- a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp +++ b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp @@ -43,7 +43,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv []) { try { - // Initialize orb CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); diff --git a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerClient.cpp b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerClient.cpp index a47d0443e66..66361fec627 100644 --- a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerClient.cpp +++ b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/MessengerClient.cpp @@ -39,7 +39,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR * argv[]) { try { - CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); if (parse_args (argc, argv) != 0) diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.cpp index 12fe3748671..006e75da92e 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInitializer.cpp @@ -14,7 +14,6 @@ ClientInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr) void ClientInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) { - // Create and register the request interceptors. PortableInterceptor::ClientRequestInterceptor_ptr ci = PortableInterceptor::ClientRequestInterceptor::_nil (); diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h index 9d41e48ebdf..74397da414d 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h +++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h @@ -9,7 +9,6 @@ class ClientInterceptor : public virtual PortableInterceptor::ClientRequestInterceptor, public virtual ::CORBA::LocalObject { - public: ClientInterceptor (void); diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.cpp index 056363d73fe..25de9b5b8ad 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.cpp @@ -17,7 +17,6 @@ void ServerInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) { - // Create and register the request interceptors. PortableInterceptor::ServerRequestInterceptor_ptr si = PortableInterceptor::ServerRequestInterceptor::_nil (); diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.h index fb5cb926455..6c711ac4024 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.h +++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.h @@ -10,7 +10,6 @@ class ClientInterceptor: public virtual PortableInterceptor::ClientRequestInterceptor, public virtual ::CORBA::LocalObject { - public: ClientInterceptor (IOP::CodecFactory_var) ; diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.h index f3ec546e4b4..17440a354b4 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.h +++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.h @@ -11,7 +11,6 @@ class ClientInterceptor: public virtual PortableInterceptor::ClientRequestInterceptor, public virtual ::CORBA::LocalObject { - public: ClientInterceptor (Messenger_var theMessage, PortableInterceptor::Current_ptr thePic, diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.h index fb5cb926455..6c711ac4024 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.h +++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.h @@ -10,7 +10,6 @@ class ClientInterceptor: public virtual PortableInterceptor::ClientRequestInterceptor, public virtual ::CORBA::LocalObject { - public: ClientInterceptor (IOP::CodecFactory_var) ; diff --git a/TAO/DevGuideExamples/RTCORBA/MessengerClient.cpp b/TAO/DevGuideExamples/RTCORBA/MessengerClient.cpp index 7d22f0a9bca..fe22d886baf 100644 --- a/TAO/DevGuideExamples/RTCORBA/MessengerClient.cpp +++ b/TAO/DevGuideExamples/RTCORBA/MessengerClient.cpp @@ -96,7 +96,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) static const CORBA::Short increment = get_increment(); for(CORBA::ULong i = 0; i < get_total_lanes(); i++) { - // Set the priority to one that matches one of the lanes CORBA::Short priority = i * increment; current->the_priority(priority); diff --git a/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.cpp b/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.cpp index 35a37beb085..f0e3d7c8312 100644 --- a/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.cpp +++ b/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.cpp @@ -26,7 +26,6 @@ Messenger_ptr Smart_Messenger_Proxy_Factory::create_proxy ( Messenger_ptr proxy) { - Messenger_ptr smart_proxy = 0; if (CORBA::is_nil(proxy) == 0) smart_proxy = new Smart_Messenger_Proxy(proxy, logger_.in()); diff --git a/TAO/DevGuideExamples/ValueTypes/Bank/client.cpp b/TAO/DevGuideExamples/ValueTypes/Bank/client.cpp index aaa387072a7..cb78ad7347e 100644 --- a/TAO/DevGuideExamples/ValueTypes/Bank/client.cpp +++ b/TAO/DevGuideExamples/ValueTypes/Bank/client.cpp @@ -70,9 +70,7 @@ private: }; int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { - try { - CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); if (parse_args (argc, argv) != 0) diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerClient.cpp b/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerClient.cpp index 1c310744b18..a08e417f31b 100644 --- a/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerClient.cpp +++ b/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerClient.cpp @@ -33,7 +33,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { try { - CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); if (parse_args (argc, argv) != 0) @@ -50,7 +49,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { Message_var msg = new MessageImpl("Son", "Mom", "Dinner's Ready.", "Hurry home."); if (tst->send_message(msg)) { - std::cout << "Message sent successfully.\n"; msg->print(); std::cout << std::endl; diff --git a/TAO/TAO_IDL/ast/ast_valuebox.cpp b/TAO/TAO_IDL/ast/ast_valuebox.cpp index f0e70503289..15c3a059435 100644 --- a/TAO/TAO_IDL/ast/ast_valuebox.cpp +++ b/TAO/TAO_IDL/ast/ast_valuebox.cpp @@ -30,7 +30,6 @@ AST_ValueBox::boxed_type () const void AST_ValueBox::dump (ACE_OSTREAM_TYPE &o) { - this->dump_i (o, "valuetype "); this->local_name ()->dump (o); diff --git a/TAO/TAO_IDL/be/be_generator.cpp b/TAO/TAO_IDL/be/be_generator.cpp index 541792d3e0c..3fcadb0a14c 100644 --- a/TAO/TAO_IDL/be/be_generator.cpp +++ b/TAO/TAO_IDL/be/be_generator.cpp @@ -485,7 +485,6 @@ be_generator::create_structure (UTL_ScopedName *n, AST_StructureFwd * be_generator::create_structure_fwd (UTL_ScopedName *n) { - AST_Structure *full_defn = this->create_structure (n, false, false); diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index e079b989e51..2e79519140c 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -615,7 +615,6 @@ be_interface::gen_def_ctors_helper (be_interface* node, be_interface* base, TAO_OutStream *os) { - static int first = 0; if (node != base) diff --git a/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp index 2b0c7d847eb..fd1e322a30c 100644 --- a/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp +++ b/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp @@ -1487,7 +1487,6 @@ be_visitor_ccm_pre_proc::lookup_one_exception (const char *name, int be_visitor_ccm_pre_proc::create_event_consumer (be_eventtype *node) { - UTL_Scope *s = node->defined_in (); UTL_ScopedName *consumer_name = diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_exs.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_exs.cpp index b890516c0a1..71278e46fc7 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_exs.cpp @@ -29,7 +29,6 @@ be_visitor_component_exs::~be_visitor_component_exs () int be_visitor_component_exs::visit_component (be_component *node) { - if (node->imported ()) { return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp b/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp index 3b1355474cb..087e87f11c9 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp @@ -96,7 +96,6 @@ be_visitor_context_svts::visit_connector (be_connector *node) int be_visitor_context_svts::visit_uses (be_uses *node) { - ACE_CString prefix (this->ctx_->port_prefix ()); prefix += node->local_name ()->get_string (); const char *port_name = prefix.c_str (); diff --git a/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp b/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp index 412debc236a..40f2d026a1e 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp @@ -338,7 +338,6 @@ Exec_Attr_Decl_Generator::emit ( TAO_OutStream * /*os*/, be_interface * base_interface) { - // Even though this call seems unaware of CCM types, the // visitor must inherit from be_visitor_component_scope so // it will pick up attributes via porttypes. diff --git a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp index 4d14ced3194..c923902c738 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp @@ -79,7 +79,6 @@ be_visitor_facet_ami_exh::visit_provides (be_provides *node) int be_visitor_facet_ami_exh::visit_attribute (be_attribute *node) { - be_operation get_op (node->field_type (), AST_Operation::OP_noflags, node->name (), diff --git a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp index 176da224463..8ff909c9856 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp @@ -41,7 +41,6 @@ be_visitor_facet_ami_exs::visit_component (be_component *node) int be_visitor_facet_ami_exs::visit_provides (be_provides *node) { - this->iface_ = dynamic_cast<be_interface*> (node->provides_type ()); @@ -70,7 +69,6 @@ be_visitor_facet_ami_exs::visit_provides (be_provides *node) int be_visitor_facet_ami_exs::visit_attribute (be_attribute *node) { - be_operation get_op (node->field_type (), AST_Operation::OP_noflags, node->name (), @@ -327,7 +325,6 @@ be_visitor_facet_ami_exs::gen_reply_handler_class () int be_visitor_facet_ami_exs::gen_facet_executor_class () { - this->for_reply_handler_ = false; const char *suffix = "_exec_i"; @@ -451,7 +448,6 @@ be_visitor_facet_ami_exs::gen_facet_executor_class () int be_visitor_facet_ami_exs::gen_reply_hander_op (be_operation *node) { - os_ << be_nl_2 << "void" << be_nl << this->iface_->local_name () << "_reply_handler::" @@ -537,7 +533,6 @@ be_visitor_facet_ami_exs::gen_reply_hander_op (be_operation *node) int be_visitor_facet_ami_exs::gen_facet_executor_op (be_operation *node) { - // do not handle not sendc operations. if (ACE_OS::strstr (node->local_name()->get_string (), "sendc_")== nullptr) return 0; @@ -647,7 +642,6 @@ be_visitor_facet_ami_exs::gen_facet_executor_op (be_operation *node) int be_visitor_facet_ami_exs::gen_facet_executor_sync_op (be_operation *node) { - if (node->is_sendc_ami()) return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/facet_svth.cpp b/TAO/TAO_IDL/be/be_visitor_interface/facet_svth.cpp index 21130dd0ba5..3dca9ccc316 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/facet_svth.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/facet_svth.cpp @@ -24,7 +24,6 @@ be_visitor_facet_svth::~be_visitor_facet_svth () int be_visitor_facet_svth::visit_interface (be_interface *node) { - if (node->imported () || node->svnt_src_facet_gen () || idl_global->ami_connector_seen_ || diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp index 720356509f2..b875331c9f5 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp @@ -407,7 +407,6 @@ be_visitor_interface_ch::gen_abstract_ops_helper (be_interface *node, if (d->node_type () == AST_Decl::NT_op) { - be_operation *op = dynamic_cast<be_operation*> (d); op->set_local (node->is_local ()); ctx.state (TAO_CodeGen::TAO_OPERATION_CH); diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp index 4104945ae59..9ba14e43e27 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp @@ -381,7 +381,6 @@ be_visitor_interface_cs::visit_interface (be_interface *node) if (be_global->tc_support ()) { - be_visitor_context ctx = *this->ctx_; TAO::be_visitor_objref_typecode tc_visitor (&ctx); diff --git a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp index 2379e9acf52..c9445b0a620 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp @@ -24,7 +24,6 @@ be_visitor_interface_smart_proxy_cs::~be_visitor_interface_smart_proxy_cs () int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) { - if (be_global->gen_smart_proxies ()) { TAO_OutStream *os = this->ctx_->stream (); diff --git a/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_ch.cpp b/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_ch.cpp index 3a4522ffbbf..90d8bbf6583 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_ch.cpp @@ -28,7 +28,6 @@ be_visitor_operation_smart_proxy_ch::~be_visitor_operation_smart_proxy_ch () int be_visitor_operation_smart_proxy_ch::visit_operation (be_operation *node) { - if (be_global->gen_smart_proxies ()) { TAO_OutStream *os = this->ctx_->stream (); diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp index c03b411a649..1a5d03955c1 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp @@ -931,7 +931,6 @@ be_visitor_valuetype::obv_need_ref_counter (be_valuetype* node) bool be_visitor_valuetype::obv_have_ref_counter (be_valuetype* node) { - // Just try to find a VT with concrete factory in inheritance tree. if (node == nullptr) { diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp index 12810c3aa2c..c7b398a90e4 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp @@ -498,7 +498,6 @@ be_visitor_valuetype_ch::gen_supported_ops (be_interface *, be_interface *base, TAO_OutStream *os) { - AST_Decl *d = nullptr; be_visitor_context ctx; ctx.stream (os); diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp index 49fd7f6bf74..6fae372e6ea 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp @@ -170,7 +170,6 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) // Nothing to marshal if abstract valuetype. if (!node->is_abstract () && !is_an_amh_exception_holder) { - this->marshal_unmarshal_v (node); *os << "::CORBA::Boolean" << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp index 0059bc116e6..8b6572555cf 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp @@ -135,7 +135,6 @@ be_visitor_valuetype_init_ch::visit_eventtype (be_eventtype *node) int be_visitor_valuetype_init_ch::visit_factory (be_factory *node) { - TAO_OutStream& os = *(this->ctx_->stream ()); be_valuetype *vt = diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ch.h index 642e0cb8b80..2760a45df0f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ch.h @@ -24,7 +24,6 @@ */ class be_visitor_array_cdr_op_ch : public be_visitor_decl { - public: /// constructor be_visitor_array_cdr_op_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ci.h b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ci.h index b0b1a64adfa..2c2565bc19b 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ci.h @@ -24,7 +24,6 @@ */ class be_visitor_array_cdr_op_ci : public be_visitor_decl { - public: /// constructor be_visitor_array_cdr_op_ci (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component.h b/TAO/TAO_IDL/be_include/be_visitor_component/component.h index 5e3975cb5ac..a84e1631b05 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/component.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/component.h @@ -24,7 +24,6 @@ */ class be_visitor_component : public be_visitor_interface { - public: be_visitor_component (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component_fwd/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_component_fwd/any_op_ch.h index 7aa27cfb24a..b4c3d0a8e79 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component_fwd/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component_fwd/any_op_ch.h @@ -24,7 +24,6 @@ */ class be_visitor_component_fwd_any_op_ch : public be_visitor_decl { - public: /// constructor be_visitor_component_fwd_any_op_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component_fwd/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_component_fwd/cdr_op_ch.h index 69b53aaefe0..bcd805d6ff2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component_fwd/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component_fwd/cdr_op_ch.h @@ -26,7 +26,6 @@ */ class be_visitor_component_fwd_cdr_op_ch : public be_visitor_decl { - public: /// constructor be_visitor_component_fwd_cdr_op_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_cs.h index 4fd3d8f6e4b..5bd3cf696f4 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_cs.h @@ -24,7 +24,6 @@ */ class be_visitor_enum_any_op_cs : public be_visitor_scope { - public: /// constructor be_visitor_enum_any_op_cs (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_ch.h index 07e4f1b9609..1911a2d922d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_ch.h @@ -24,7 +24,6 @@ */ class be_visitor_enum_cdr_op_ch : public be_visitor_decl { - public: /// constructor be_visitor_enum_cdr_op_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_cs.h index c3e37f0ef92..695718f6f93 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_cs.h @@ -23,7 +23,6 @@ */ class be_visitor_enum_cdr_op_cs : public be_visitor_decl { - public: /// constructor be_visitor_enum_cdr_op_cs (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_ch.h index e49da61f6f9..be74bd2ddfa 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_ch.h @@ -24,7 +24,6 @@ */ class be_visitor_exception_any_op_ch : public be_visitor_scope { - public: be_visitor_exception_any_op_ch (be_visitor_context *ctx); ~be_visitor_exception_any_op_ch (); diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_cs.h index 4a252adef3d..6a76beee988 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_cs.h @@ -24,7 +24,6 @@ */ class be_visitor_exception_any_op_cs : public be_visitor_scope { - public: be_visitor_exception_any_op_cs (be_visitor_context *ctx); ~be_visitor_exception_any_op_cs (); diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_ch.h index 462beb7214b..c87c3491f59 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_ch.h @@ -25,7 +25,6 @@ */ class be_visitor_exception_cdr_op_ch : public be_visitor_exception { - public: be_visitor_exception_cdr_op_ch (be_visitor_context *ctx); ~be_visitor_exception_cdr_op_ch (); diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_cs.h index ed86886f347..fcada545e8a 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_cs.h @@ -25,7 +25,6 @@ */ class be_visitor_exception_cdr_op_cs : public be_visitor_exception { - public: be_visitor_exception_cdr_op_cs (be_visitor_context *ctx); ~be_visitor_exception_cdr_op_cs (); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_ch.h index 14423fd2e60..202a3b90b48 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_ch.h @@ -23,7 +23,6 @@ */ class be_visitor_interface_any_op_ch : public be_visitor_interface { - public: be_visitor_interface_any_op_ch (be_visitor_context *ctx); ~be_visitor_interface_any_op_ch (); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_cs.h index 47ba221489f..b26768c60fb 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_cs.h @@ -23,7 +23,6 @@ */ class be_visitor_interface_any_op_cs : public be_visitor_interface { - public: be_visitor_interface_any_op_cs (be_visitor_context *ctx); ~be_visitor_interface_any_op_cs (); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_ch.h index 478b6d191f9..7c042a49dae 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_ch.h @@ -25,7 +25,6 @@ */ class be_visitor_interface_cdr_op_ch : public be_visitor_interface { - public: be_visitor_interface_cdr_op_ch (be_visitor_context *ctx); ~be_visitor_interface_cdr_op_ch (); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_cs.h index 79f212abee7..5328907432a 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_cs.h @@ -25,7 +25,6 @@ */ class be_visitor_interface_cdr_op_cs : public be_visitor_interface { - public: be_visitor_interface_cdr_op_cs (be_visitor_context *ctx); ~be_visitor_interface_cdr_op_cs (); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_sh.h b/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_sh.h index 1b10d9ab9d4..65a97639919 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_sh.h @@ -22,7 +22,6 @@ */ class be_visitor_interface_direct_proxy_impl_sh : public be_visitor_interface { - public: // -- Ctor/Dtor Decl. -- be_visitor_interface_direct_proxy_impl_sh (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_ss.h index cf818e8a44b..b0abe123b18 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_ss.h @@ -21,7 +21,6 @@ */ class be_visitor_interface_direct_proxy_impl_ss : public be_visitor_interface { - public: // -- Ctor/Dtor Decl. -- be_visitor_interface_direct_proxy_impl_ss (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_ch.h index dd15ff9eb80..dd620947a1e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_ch.h @@ -22,7 +22,6 @@ */ class be_visitor_interface_smart_proxy_ch : public be_visitor_interface { - public: /// constructor be_visitor_interface_smart_proxy_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_cs.h b/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_cs.h index d407b35f477..3c8ade204f3 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_cs.h @@ -21,7 +21,6 @@ */ class be_visitor_interface_smart_proxy_cs : public be_visitor_interface { - public: /// constructor be_visitor_interface_smart_proxy_cs (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/any_op_ch.h index 65986f49535..6360fa8aa6f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/any_op_ch.h @@ -24,7 +24,6 @@ */ class be_visitor_interface_fwd_any_op_ch : public be_visitor_decl { - public: /// constructor be_visitor_interface_fwd_any_op_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/cdr_op_ch.h index 950f3d6914e..60ea369f911 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/cdr_op_ch.h @@ -26,7 +26,6 @@ */ class be_visitor_interface_fwd_cdr_op_ch : public be_visitor_decl { - public: /// constructor be_visitor_interface_fwd_cdr_op_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/any_op.h b/TAO/TAO_IDL/be_include/be_visitor_module/any_op.h index e18ae92a0f8..1675ce7f91c 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_module/any_op.h +++ b/TAO/TAO_IDL/be_include/be_visitor_module/any_op.h @@ -26,7 +26,6 @@ */ class be_visitor_module_any_op : public be_visitor_module { - public: /// constructor be_visitor_module_any_op (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/cdr_op.h b/TAO/TAO_IDL/be_include/be_visitor_module/cdr_op.h index c78e389a3b2..e3c25249dac 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_module/cdr_op.h +++ b/TAO/TAO_IDL/be_include/be_visitor_module/cdr_op.h @@ -26,7 +26,6 @@ */ class be_visitor_module_cdr_op : public be_visitor_module { - public: /// constructor be_visitor_module_cdr_op (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/module.h b/TAO/TAO_IDL/be_include/be_visitor_module/module.h index 64c12a08c6d..13673dc6aae 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_module/module.h +++ b/TAO/TAO_IDL/be_include/be_visitor_module/module.h @@ -24,7 +24,6 @@ */ class be_visitor_module : public be_visitor_scope { - public: be_visitor_module (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root.h b/TAO/TAO_IDL/be_include/be_visitor_root/root.h index 3322d73e1e3..a80082fac0c 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root.h @@ -23,7 +23,6 @@ */ class be_visitor_root : public be_visitor_module { - public: be_visitor_root (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_ch.h index c1df47e39d3..63027ce26d2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_ch.h @@ -26,7 +26,6 @@ */ class be_visitor_sequence_any_op_ch : public be_visitor_decl { - public: /// constructor be_visitor_sequence_any_op_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_cs.h index 916eaea173b..5c1850579fa 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_cs.h @@ -26,7 +26,6 @@ */ class be_visitor_sequence_any_op_cs : public be_visitor_decl { - public: /// constructor be_visitor_sequence_any_op_cs (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_ch.h index 7d6ee5e5b29..0b5ef311fe3 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_ch.h @@ -26,7 +26,6 @@ */ class be_visitor_sequence_cdr_op_ch : public be_visitor_decl { - public: /// constructor be_visitor_sequence_cdr_op_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_cs.h index f307404d16a..17300ece38c 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_cs.h @@ -26,7 +26,6 @@ */ class be_visitor_structure_cdr_op_cs : public be_visitor_structure { - public: /// constructor be_visitor_structure_cdr_op_cs (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/alias_typecode.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/alias_typecode.h index 82bc34bf59e..26072d18399 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typecode/alias_typecode.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/alias_typecode.h @@ -15,7 +15,6 @@ namespace TAO { - /** * @class be_visitor_alias_typecode * diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/enum_typecode.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/enum_typecode.h index 4edc0dff0c1..d31418ef47b 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typecode/enum_typecode.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/enum_typecode.h @@ -17,7 +17,6 @@ namespace TAO { - /** * @class be_visitor_enum_typecode * diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/struct_typecode.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/struct_typecode.h index dea1c75c420..c11210fbca4 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typecode/struct_typecode.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/struct_typecode.h @@ -15,7 +15,6 @@ namespace TAO { - /** * @class be_visitor_struct_typecode * diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/union_typecode.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/union_typecode.h index 96103906ece..ca7aee82983 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typecode/union_typecode.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/union_typecode.h @@ -15,7 +15,6 @@ namespace TAO { - /** * @class be_visitor_union_typecode * diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/value_typecode.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/value_typecode.h index 79697e1106e..7870d9ab8ac 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typecode/value_typecode.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/value_typecode.h @@ -15,7 +15,6 @@ namespace TAO { - /** * @class be_visitor_value_typecode * diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_ch.h index 36cccab3bf9..7507c9272d3 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_ch.h @@ -27,7 +27,6 @@ */ class be_visitor_typedef_any_op_ch : public be_visitor_typedef { - public: /// constructor be_visitor_typedef_any_op_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_cs.h index 6dced979290..1fd008578ab 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_cs.h @@ -27,7 +27,6 @@ */ class be_visitor_typedef_any_op_cs : public be_visitor_typedef { - public: /// constructor be_visitor_typedef_any_op_cs (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_ch.h index 087b3da6db2..9a57a7a736e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_ch.h @@ -26,7 +26,6 @@ */ class be_visitor_typedef_cdr_op_ch : public be_visitor_typedef { - public: /// constructor be_visitor_typedef_cdr_op_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_cs.h index 10fc1214464..f78c72ae258 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_cs.h @@ -26,7 +26,6 @@ */ class be_visitor_typedef_cdr_op_cs : public be_visitor_typedef { - public: /// constructor be_visitor_typedef_cdr_op_cs (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h index d287c2a4061..bf544c41446 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h @@ -24,7 +24,6 @@ */ class be_visitor_typedef : public be_visitor_decl { - public: /// constructor be_visitor_typedef (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union/any_op_ch.h index 3426539cbde..263bbdd53e2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/any_op_ch.h @@ -26,7 +26,6 @@ */ class be_visitor_union_any_op_ch : public be_visitor_union { - public: be_visitor_union_any_op_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union/any_op_cs.h index c8983f61874..99334d4b0be 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/any_op_cs.h @@ -26,7 +26,6 @@ */ class be_visitor_union_any_op_cs : public be_visitor_union { - public: be_visitor_union_any_op_cs (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_ch.h index 8d95c57c93e..557847e8b9d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_ch.h @@ -26,7 +26,6 @@ */ class be_visitor_union_cdr_op_ch : public be_visitor_union { - public: /// constructor be_visitor_union_cdr_op_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h index ecfbe0ef1a7..3990644f8ea 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h @@ -26,7 +26,6 @@ */ class be_visitor_union_cdr_op_cs : public be_visitor_union { - public: /// constructor be_visitor_union_cdr_op_cs (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_ch.h index 080cc5ae17b..9798cec81e2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_ch.h @@ -24,7 +24,6 @@ */ class be_visitor_valuebox_any_op_ch : public be_visitor_valuebox { - public: /// constructor be_visitor_valuebox_any_op_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_cs.h index cd90d608340..24e554a25c4 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_cs.h @@ -24,7 +24,6 @@ */ class be_visitor_valuebox_any_op_cs : public be_visitor_valuebox { - public: /// constructor be_visitor_valuebox_any_op_cs (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_ch.h index 8b0036312bb..d520652c7c3 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_ch.h @@ -25,7 +25,6 @@ */ class be_visitor_valuebox_cdr_op_ch : public be_visitor_valuebox { - public: /// constructor be_visitor_valuebox_cdr_op_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_cs.h index 09bee25a87c..0186d84e1f4 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_cs.h @@ -25,7 +25,6 @@ */ class be_visitor_valuebox_cdr_op_cs : public be_visitor_valuebox { - public: /// constructor be_visitor_valuebox_cdr_op_cs (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_ch.h index 8e3bb6945de..858f46771c4 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_ch.h @@ -24,7 +24,6 @@ */ class be_visitor_valuetype_any_op_ch : public be_visitor_valuetype { - public: /// constructor be_visitor_valuetype_any_op_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_cs.h index 59592143bf3..a1fe7037f1e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_cs.h @@ -24,7 +24,6 @@ */ class be_visitor_valuetype_any_op_cs : public be_visitor_valuetype { - public: /// constructor be_visitor_valuetype_any_op_cs (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h index 524ff9818ce..8b16523072e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h @@ -25,7 +25,6 @@ */ class be_visitor_valuetype_cdr_op_ch : public be_visitor_valuetype { - public: /// constructor be_visitor_valuetype_cdr_op_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ci.h index a3e0a812808..996d29b3c75 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ci.h @@ -25,7 +25,6 @@ */ class be_visitor_valuetype_cdr_op_ci : public be_visitor_valuetype { - public: /// constructor be_visitor_valuetype_cdr_op_ci (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h index 8edf6514674..c88acdbc123 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h @@ -25,7 +25,6 @@ */ class be_visitor_valuetype_cdr_op_cs : public be_visitor_valuetype { - public: /// constructor be_visitor_valuetype_cdr_op_cs (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h index 4363664d7db..e422fd64e29 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h @@ -25,7 +25,6 @@ */ class be_visitor_valuetype_marshal_ch : public be_visitor_scope { - public: /// constructor be_visitor_valuetype_marshal_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init.h index 18630d66460..9d8005fe94b 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init.h @@ -24,7 +24,6 @@ */ class be_visitor_valuetype_init : public be_visitor_valuetype { - public: /// constructor be_visitor_valuetype_init (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/any_op_ch.h index 1bb2b44360f..436e47f68a8 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/any_op_ch.h @@ -24,7 +24,6 @@ */ class be_visitor_valuetype_fwd_any_op_ch : public be_visitor_decl { - public: /// constructor be_visitor_valuetype_fwd_any_op_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ch.h index 0a3761bf5f2..1fdb704a7bb 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ch.h @@ -27,7 +27,6 @@ */ class be_visitor_valuetype_fwd_cdr_op_ch : public be_visitor_decl { - public: /// constructor be_visitor_valuetype_fwd_cdr_op_ch (be_visitor_context *ctx); diff --git a/TAO/TAO_IDL/fe/idl.tab.cpp b/TAO/TAO_IDL/fe/idl.tab.cpp index efbd52752b5..66dff08f611 100644 --- a/TAO/TAO_IDL/fe/idl.tab.cpp +++ b/TAO/TAO_IDL/fe/idl.tab.cpp @@ -10119,7 +10119,6 @@ yyreduce: case 566: /* formal_parameter: formal_parameter_type IDENTIFIER */ #line 6685 "fe/idl.ypp" { - ACE_NEW_RETURN ((yyval.pival), FE_Utils::T_Param_Info, 1); diff --git a/TAO/TAO_IDL/fe/idl.yy.cpp b/TAO/TAO_IDL/fe/idl.yy.cpp index b4759822f45..7f54d146483 100644 --- a/TAO/TAO_IDL/fe/idl.yy.cpp +++ b/TAO/TAO_IDL/fe/idl.yy.cpp @@ -2995,7 +2995,6 @@ static int yy_get_next_buffer (void) */ void yyrestart (FILE * input_file ) { - if ( ! YY_CURRENT_BUFFER ){ yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = @@ -3012,7 +3011,6 @@ static int yy_get_next_buffer (void) */ void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ) { - /* TODO. We should be able to replace this entire function body * with * yypop_buffer_state(); @@ -3085,7 +3083,6 @@ static void yy_load_buffer_state (void) */ void yy_delete_buffer (YY_BUFFER_STATE b ) { - if ( ! b ) return; @@ -3213,7 +3210,6 @@ static void yyensure_buffer_stack (void) yy_size_t num_to_alloc; if (!(yy_buffer_stack)) { - /* First allocation is just for 2 elements, since we don't know if this * scanner will even need a stack. We use 2 instead of 1 to avoid an * immediate realloc on the next call. @@ -3233,7 +3229,6 @@ static void yyensure_buffer_stack (void) } if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ - /* Increase the buffer to prepare for a possible push. */ yy_size_t grow_size = 8 /* arbitrary grow size */; @@ -3296,7 +3291,6 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) */ YY_BUFFER_STATE yy_scan_string (const char * yystr ) { - return yy_scan_bytes( yystr, (int) strlen(yystr) ); } @@ -3371,7 +3365,6 @@ static void yynoreturn yy_fatal_error (const char* msg ) */ int yyget_lineno (void) { - return yylineno; } @@ -3414,7 +3407,6 @@ char *yyget_text (void) */ void yyset_lineno (int _line_number ) { - yylineno = _line_number; } @@ -3480,7 +3472,6 @@ static int yy_init_globals (void) /* yylex_destroy is for both reentrant and non-reentrant scanners. */ int yylex_destroy (void) { - /* Pop the buffer stack, destroying each element. */ while(YY_CURRENT_BUFFER){ yy_delete_buffer( YY_CURRENT_BUFFER ); @@ -3509,7 +3500,6 @@ int yylex_destroy (void) #ifndef yytext_ptr static void yy_flex_strncpy (char* s1, const char * s2, int n ) { - int i; for ( i = 0; i < n; ++i ) s1[i] = s2[i]; @@ -3534,7 +3524,6 @@ void *yyalloc (yy_size_t size ) void *yyrealloc (void * ptr, yy_size_t size ) { - /* The cast to (char *) in the following accommodates both * implementations that use char* generic pointers, and those * that use void* generic pointers. It works with the latter diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp index 5319478805d..823553c7262 100644 --- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp +++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp @@ -13,10 +13,8 @@ Quoter_Stock_Factory_Locator_i::preinvoke (const PortableServer::ObjectId &oid, const char *, void * & cookie) { - // Check to see if the object ID is valid try { - // Get the ObjectID in string format CORBA::String_var oid_str = PortableServer::ObjectId_to_string (oid); @@ -46,7 +44,6 @@ Quoter_Stock_Factory_Locator_i::postinvoke (const PortableServer::ObjectId &, void * cookie, PortableServer::Servant servant) { - // Delete the servant as it is no longer needed. PortableServer::Servant my_servant = (PortableServer::Servant) cookie; if (servant == my_servant) diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp index 590e83f26a5..731c72a293c 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp +++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp @@ -18,7 +18,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { try { - // Initialze the ORB. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/server.cpp b/TAO/docs/tutorials/Quoter/Simple/Persistent/server.cpp index 84f390bf6a5..5bfc5d4e5a4 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Persistent/server.cpp +++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/server.cpp @@ -17,7 +17,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try { - // Initialze the ORB. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); diff --git a/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp b/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp index 33e6ccb54ab..ef942c56540 100644 --- a/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp +++ b/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp @@ -34,7 +34,6 @@ MT_AMH_Server::usage (const char *message) int MT_AMH_Server::parse_args (void) { - // Let the base server parse it's argumrents first if (Base_Server::parse_args () != 1) { diff --git a/TAO/examples/Advanced/ch_12/server.cpp b/TAO/examples/Advanced/ch_12/server.cpp index eb1414201b5..e47116181f8 100644 --- a/TAO/examples/Advanced/ch_12/server.cpp +++ b/TAO/examples/Advanced/ch_12/server.cpp @@ -470,7 +470,6 @@ find (CCS::Controller::SearchSeq & slist) CORBA::ULong listlen = slist.length (); for (CORBA::ULong i = 0; i < listlen; i++) { - AssetMap::iterator where; // Iterator for asset set int num_found = 0; // Num matched per iteration diff --git a/TAO/examples/Advanced/ch_18/server.cpp b/TAO/examples/Advanced/ch_18/server.cpp index 6f3408411ba..78903c6cff0 100644 --- a/TAO/examples/Advanced/ch_18/server.cpp +++ b/TAO/examples/Advanced/ch_18/server.cpp @@ -259,7 +259,6 @@ Thermostat_impl::set_nominal_temp (CCS::TempType new_temp) // Now set the nominal temperature to the new value. if (ICP_set (m_anum, "nominal_temp", &new_temp) != 0) { - // If ICP_set () failed, read this thermostat's minimum // and maximum so we can initialize the BadTemp exception. CCS::Thermostat::BtData btd; @@ -423,7 +422,6 @@ create_thermostat ( assert (ICP_set (anum, "location", loc) == 0); // Set the nominal temperature. if (ICP_set (anum, "nominal_temp", &temp) != 0) { - // If ICP_set () failed, read this thermostat's minimum // and maximum so we can initialize the BadTemp exception. CCS::Thermostat::BtData btd; @@ -518,7 +516,6 @@ Controller_impl::find (CCS::Controller::SearchSeq & slist) // Loop over input list and lookup each device. CORBA::ULong listlen = slist.length (); for (CORBA::ULong i = 0; i < listlen; i++) { - AssetMap::iterator where; // Iterator for asset set int num_found = 0; // Num matched per iteration diff --git a/TAO/examples/Advanced/ch_21/server.cpp b/TAO/examples/Advanced/ch_21/server.cpp index 4ffc422b94a..2c7b2208f84 100644 --- a/TAO/examples/Advanced/ch_21/server.cpp +++ b/TAO/examples/Advanced/ch_21/server.cpp @@ -237,7 +237,6 @@ Thermostat_impl::set_nominal_temp (CCS::TempType new_temp) // Now set the nominal temperature to the new value. if (ICP_set (m_anum, "nominal_temp", &new_temp) != 0) { - // If ICP_set () failed, read this thermostat's minimum // and maximum so we can initialize the BadTemp exception. CCS::Thermostat::BtData btd; @@ -406,7 +405,6 @@ create_thermostat ( assert (ICP_set (anum, "location", loc) == 0); // Set the nominal temperature. if (ICP_set (anum, "nominal_temp", &temp) != 0) { - // If ICP_set () failed, read this thermostat's minimum // and maximum so we can initialize the BadTemp exception. CCS::Thermostat::BtData btd; @@ -510,7 +508,6 @@ find (CCS::Controller::SearchSeq & slist) // Loop over input list and lookup each device. CORBA::ULong listlen = slist.length (); for (CORBA::ULong i = 0; i < listlen; i++) { - AssetSet::iterator where; // Iterator for asset set int num_found = 0; // Num matched per iteration diff --git a/TAO/examples/Advanced/ch_8_and_10/server.cpp b/TAO/examples/Advanced/ch_8_and_10/server.cpp index eb7563d3760..8847fab5345 100644 --- a/TAO/examples/Advanced/ch_8_and_10/server.cpp +++ b/TAO/examples/Advanced/ch_8_and_10/server.cpp @@ -190,7 +190,6 @@ set_nominal_temp (CCS::TempType new_temp) // Now set the nominal temperature to the new value. if (ICP_set (m_anum, "nominal_temp", &new_temp) != 0) { - // If ICP_set () failed, read this thermostat's minimum // and maximum so we can initialize the BadTemp exception. CCS::Thermostat::BtData btd; @@ -336,7 +335,6 @@ find (CCS::Controller::SearchSeq & slist) // Loop over input list and look up each device. CORBA::ULong listlen = slist.length (); for (CORBA::ULong i = 0; i < listlen; i++) { - AssetMap::iterator where; // Iterator for asset map int num_found = 0; // Num matched per iteration diff --git a/TAO/examples/Buffered_AMI/client.cpp b/TAO/examples/Buffered_AMI/client.cpp index f9142375bae..099e0c9c51d 100644 --- a/TAO/examples/Buffered_AMI/client.cpp +++ b/TAO/examples/Buffered_AMI/client.cpp @@ -229,7 +229,6 @@ setup_buffering_constraints (CORBA::ORB_ptr orb) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try { // Initialize the ORB. diff --git a/TAO/examples/Buffered_Oneways/client.cpp b/TAO/examples/Buffered_Oneways/client.cpp index 35495e04ba8..394ca3f9b12 100644 --- a/TAO/examples/Buffered_Oneways/client.cpp +++ b/TAO/examples/Buffered_Oneways/client.cpp @@ -112,7 +112,6 @@ parse_args (int argc, ACE_TCHAR **argv) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try { // Initialize the ORB. diff --git a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp index b35acf60602..e754759c4f9 100644 --- a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp +++ b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp @@ -185,7 +185,6 @@ Consumer_Handler::via_naming_service () int Consumer_Handler::init (int argc, ACE_TCHAR **argv) { - this->argc_ = argc; this->argv_ = argv; @@ -247,7 +246,6 @@ Consumer_Handler::init (int argc, ACE_TCHAR **argv) } else { - if (this->ior_ == 0) ACE_ERROR_RETURN ((LM_ERROR, "%s: no ior specified\n", @@ -306,7 +304,6 @@ Consumer_Handler::run () if (this->interactive_ == 0) { - // Register with the server. this->server_->register_callback (this->stock_name_.c_str (), this->threshold_value_, diff --git a/TAO/examples/Callback_Quoter/Supplier_i.cpp b/TAO/examples/Callback_Quoter/Supplier_i.cpp index 6234826cd83..97b4b7ae79f 100644 --- a/TAO/examples/Callback_Quoter/Supplier_i.cpp +++ b/TAO/examples/Callback_Quoter/Supplier_i.cpp @@ -142,7 +142,6 @@ Supplier::send_market_status (const char *stock_name, long value) { try { - // Make the RMI. this->notifier_->market_status (stock_name, value); diff --git a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp index 83f06289214..a7959b0db0a 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp +++ b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp @@ -112,7 +112,6 @@ Content_Iterator_i::next_chunk (CORBA::ULongLong offset, void Content_Iterator_i::destroy (void) { - (void) this->file_io_.close (); // Get the POA used when activating the Content_Iterator object. diff --git a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h index 0b256e2a234..ef8c33db108 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h +++ b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h @@ -38,7 +38,6 @@ class Content_Iterator_i; */ class Iterator_Factory_i : virtual public POA_Web_Server::Iterator_Factory { - public: /** * This factory method returns a <Content_Iterator> that can be used diff --git a/TAO/examples/Event_Comm/supplier.cpp b/TAO/examples/Event_Comm/supplier.cpp index 79caf80f1db..43afde34e07 100644 --- a/TAO/examples/Event_Comm/supplier.cpp +++ b/TAO/examples/Event_Comm/supplier.cpp @@ -60,7 +60,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) try { - if (supplier.init (argc, argv) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp index 5347c00ac99..9f4fb10550e 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp @@ -33,7 +33,6 @@ EDF_Scheduler::EDF_Scheduler (CORBA::ORB_ptr orb, ace_sched_policy_ (ace_sched_policy), ace_sched_scope_ (ace_sched_scope) { - Kokyu::DSRT_ConfigInfo config; config.impl_type_ = this->disp_impl_type_; @@ -198,7 +197,6 @@ void EDF_Scheduler::end_scheduling_segment (const RTScheduling::Current::IdType &guid, const char *) { - int int_guid; ACE_OS::memcpy (&int_guid, guid.get_buffer (), @@ -332,7 +330,6 @@ EDF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri, CORBA::Policy_out sched_param_out, CORBA::Policy_out /*implicit_sched_param_out*/) { - Kokyu::Svc_Ctxt_DSRT_QoS* sc_qos_ptr; RTScheduling::Current::IdType guid; int int_guid; @@ -664,7 +661,6 @@ EDF_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) void EDF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri) { - DSUI_EVENT_LOG (EDF_SCHED_FAM, RECEIVE_OTHER, 0, 0, 0); //Otherwise Segmentation fault when oneway call happens. diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp index a78ae87523a..16c4ddb6595 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp @@ -64,7 +64,6 @@ Fixed_Priority_Scheduler::Fixed_Priority_Scheduler ( ace_sched_policy_ (ace_sched_policy), ace_sched_scope_ (ace_sched_scope) { - Kokyu::DSRT_ConfigInfo config; config.impl_type_ = this->disp_impl_type_; @@ -233,7 +232,6 @@ Fixed_Priority_Scheduler::end_nested_scheduling_segment (const RTScheduling::Cur const char *, CORBA::Policy_ptr) { - } diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp index e46604a305c..c08e2b92487 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp @@ -64,7 +64,6 @@ MIF_Scheduler::MIF_Scheduler (CORBA::ORB_ptr orb, ace_sched_policy_ (ace_sched_policy), ace_sched_scope_ (ace_sched_scope) { - Kokyu::DSRT_ConfigInfo config; config.impl_type_ = this->disp_impl_type_; @@ -229,7 +228,6 @@ MIF_Scheduler::end_nested_scheduling_segment ( const char *, CORBA::Policy_ptr) { - } diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp index 2972bb05325..25c94ab6f75 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp @@ -64,7 +64,6 @@ MUF_Scheduler::MUF_Scheduler (CORBA::ORB_ptr orb, ace_sched_policy_ (ace_sched_policy), ace_sched_scope_ (ace_sched_scope) { - Kokyu::DSRT_ConfigInfo config; config.impl_type_ = this->disp_impl_type_; @@ -439,7 +438,6 @@ MUF_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr) void MUF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) { - Kokyu::Svc_Ctxt_DSRT_QoS sc_qos; CORBA::String_var operation = ri->operation (); diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp index 68b6743e709..1ad9edc7dd8 100644 --- a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp +++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp @@ -101,8 +101,6 @@ Identity_Server::init (int argc, int Identity_Server::register_groups (void) { - - // Contact the <Object_Group_Factory> to create 2 // <Object_Group>s, one random and one rr. CORBA::ORB_var orb = orb_manager_.orb (); diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp index 8e8590ea7f5..b52f5cb5d6e 100644 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp @@ -47,7 +47,6 @@ Object_Group_Factory_i::_default_POA (void) Load_Balancer::Object_Group_ptr Object_Group_Factory_i::make_round_robin (const char * id) { - void *tmp_rr (0); if (this->mem_pool_->find (rr_name_bind, @@ -305,8 +304,6 @@ Object_Group_Factory_i::make_group (int random, Load_Balancer::Object_Group_ptr Object_Group_Factory_i::resolve (const char * id) { - - #if defined (DOORS_MEASURE_STATS) // Time the calls // Record the entry time. @@ -558,7 +555,6 @@ Object_Group_i::Object_Group_i (const char * id, id_ (id), allocator_ (0) { - if (!this->allocator_) { ACE_MMAP_Memory_Pool::OPTIONS options (ACE_DEFAULT_BASE_ADDR); @@ -601,7 +597,6 @@ Object_Group_i::id (void) void Object_Group_i::bind (const Load_Balancer::Member & member) { - if (this->members_ == 0) { ACE_CString id = this->id (); @@ -878,7 +873,6 @@ Random_Object_Group::Random_Object_Group (const char *id, char * Random_Object_Group::resolve (void) { - this->read_from_memory (); size_t group_size = this->members_->current_size (); @@ -946,7 +940,6 @@ RR_Object_Group::resolve (void) void RR_Object_Group::unbind (const char *id) { - if (this->members_ == 0) { ACE_CString id = this->id (); diff --git a/TAO/examples/OBV/Simple_util.cpp b/TAO/examples/OBV/Simple_util.cpp index 35a70e74c07..25fc433539f 100644 --- a/TAO/examples/OBV/Simple_util.cpp +++ b/TAO/examples/OBV/Simple_util.cpp @@ -275,7 +275,6 @@ Client<InterfaceObj, Var>::init (const char *name, template <class InterfaceObj, class Var> int Client<InterfaceObj, Var>::obtain_initial_references (void) { - return 0; } diff --git a/TAO/examples/Quoter/Factory_Finder.h b/TAO/examples/Quoter/Factory_Finder.h index d8cedd7aae5..1ca45ac5e93 100644 --- a/TAO/examples/Quoter/Factory_Finder.h +++ b/TAO/examples/Quoter/Factory_Finder.h @@ -29,7 +29,6 @@ */ class Quoter_Factory_Finder_Server { - public: /// Default constructor Quoter_Factory_Finder_Server (void); diff --git a/TAO/examples/Quoter/Factory_Finder_i.h b/TAO/examples/Quoter/Factory_Finder_i.h index 85c2fd52e49..aa6409d0e7f 100644 --- a/TAO/examples/Quoter/Factory_Finder_i.h +++ b/TAO/examples/Quoter/Factory_Finder_i.h @@ -23,7 +23,6 @@ */ class Quoter_Factory_Finder_i : public POA_Stock::Quoter_Factory_Finder { - public: Quoter_Factory_Finder_i (int debug_level = 1); ~Quoter_Factory_Finder_i (void); diff --git a/TAO/examples/Quoter/Generic_Factory.h b/TAO/examples/Quoter/Generic_Factory.h index 9d25e76053e..8f4f86191ac 100644 --- a/TAO/examples/Quoter/Generic_Factory.h +++ b/TAO/examples/Quoter/Generic_Factory.h @@ -29,7 +29,6 @@ */ class Quoter_Generic_Factory_Server { - public: /// Default constructor Quoter_Generic_Factory_Server (void); diff --git a/TAO/examples/Quoter/Generic_Factory_i.h b/TAO/examples/Quoter/Generic_Factory_i.h index c94997f1c88..cb6d51e9179 100644 --- a/TAO/examples/Quoter/Generic_Factory_i.h +++ b/TAO/examples/Quoter/Generic_Factory_i.h @@ -24,7 +24,6 @@ */ class Quoter_Generic_Factory_i : public POA_Stock::Quoter_Generic_Factory { - public: Quoter_Generic_Factory_i (int debug_level = 1); ~Quoter_Generic_Factory_i (void); diff --git a/TAO/examples/RTCORBA/Activity/POA_Holder.cpp b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp index b880c30d6f7..0c745663858 100644 --- a/TAO/examples/RTCORBA/Activity/POA_Holder.cpp +++ b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp @@ -109,7 +109,6 @@ POA_Holder::init (ACE_Arg_Shifter& arg_shifter) void POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa) { - /* lanes bands priomodel diff --git a/TAO/examples/RTCORBA/Activity/Thread_Task.cpp b/TAO/examples/RTCORBA/Activity/Thread_Task.cpp index 10003b60260..a9afbc7e28a 100644 --- a/TAO/examples/RTCORBA/Activity/Thread_Task.cpp +++ b/TAO/examples/RTCORBA/Activity/Thread_Task.cpp @@ -58,7 +58,6 @@ Thread_Task::svc (void) // if debugging, dump the priority that we're actually at. if (TAO_debug_level > 0) { - // Get the priority of the current thread. RTCORBA::Priority prio = ACTIVITY::instance()->current ()->the_priority (); diff --git a/TAO/examples/RTScheduling/DT_Creator.cpp b/TAO/examples/RTScheduling/DT_Creator.cpp index d5a4439020f..5174907299d 100644 --- a/TAO/examples/RTScheduling/DT_Creator.cpp +++ b/TAO/examples/RTScheduling/DT_Creator.cpp @@ -278,7 +278,6 @@ DT_Creator::activate_poa_list (void) void DT_Creator::activate_job_list (void) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "DT_Creator::activate_job_list\n")); diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp index ab1c5e2697e..3873dcaa59a 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp @@ -128,7 +128,6 @@ Fixed_Priority_Scheduler::end_nested_scheduling_segment (const RTScheduling::Cur void Fixed_Priority_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_info) { - int priority; ACE_hthread_t current; ACE_Thread::self (current); diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp index 92b8bcd4242..3de953d95fc 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp @@ -214,7 +214,6 @@ DT_Test::scheduler (void) int DT_Test::activate_task (void) { - ACE_DEBUG ((LM_DEBUG, "Test Activate Task\n")); diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp index 884f1fb2f42..9c51a32ba92 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp +++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp @@ -49,7 +49,6 @@ MIF_DT_Creator::yield (time_t suspend_time, ACE_Time_Value now (ACE_OS::gettimeofday ()); while (((now - *base_time_) < sus_time_value) || (suspend_time == 1)) { - ACE_OS::sleep (1); CORBA::Policy_var sched_param; sched_param = this->sched_param (100); diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp index ef5323ad388..10af4fdab2f 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp +++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp @@ -380,7 +380,6 @@ MIF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr reque CORBA::Policy_out sched_param_out, CORBA::Policy_out /*implicit_sched_param*/) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "MIF_Scheduler::receive_request\n")); @@ -450,7 +449,6 @@ MIF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr reque void MIF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr) { - RTScheduling::Current::IdType_var guid = current_->id (); size_t count; diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp index 56b515abfc5..02f408591ba 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp +++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp @@ -48,7 +48,6 @@ MIF_Task::activate_task (RTScheduling::Current_ptr current, long flags, ACE_Time_Value* base_time) { - if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "MIF_Task::activate %d\n", @@ -84,7 +83,6 @@ MIF_Task::perform_task (void) { try { - ACE_TCHAR msg [BUFSIZ]; ACE_OS::sprintf (msg, ACE_TEXT("MIF_Task::perform_task ") @@ -135,7 +133,6 @@ MIF_Task::perform_task (void) while (count_down_time > ACE_Time_Value::zero) { - ACE::is_prime (prime_number, 2, prime_number / 2); diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp index 612fc46bb0f..104718e2af0 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp +++ b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp @@ -126,7 +126,6 @@ DT_Test::scheduler (void) int DT_Test::activate_task (void) { - long flags; flags = THR_NEW_LWP | THR_JOINABLE; flags |= diff --git a/TAO/examples/Simple/bank/Bank_Client_i.cpp b/TAO/examples/Simple/bank/Bank_Client_i.cpp index 11d6d825e94..b8a5a874fc4 100644 --- a/TAO/examples/Simple/bank/Bank_Client_i.cpp +++ b/TAO/examples/Simple/bank/Bank_Client_i.cpp @@ -71,7 +71,6 @@ Bank_Client_i::check_accounts (void) void Bank_Client_i::test_for_same_name (void) { - const char *name = "Name"; CORBA::Float initial_bal = 0.00; diff --git a/TAO/examples/Simple/chat/Server_i.h b/TAO/examples/Simple/chat/Server_i.h index 232234e6726..e61ba6b9092 100644 --- a/TAO/examples/Simple/chat/Server_i.h +++ b/TAO/examples/Simple/chat/Server_i.h @@ -26,7 +26,6 @@ */ class Server_i { - public: /// Constructor. Server_i (void); diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp index 8b3f456d39c..cbfb0d7dc0a 100644 --- a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp @@ -132,7 +132,6 @@ Demo_Consumer::disconnect_push_consumer (void) void Demo_Consumer::push (const RtecEventComm::EventSet &events) { - if (events.length () == 0) { ACE_DEBUG ((LM_DEBUG, "no events\n")); diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp index 00b3d45ed12..718cb4cdf30 100644 --- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp @@ -78,7 +78,6 @@ Event_Supplier::start_generating_events (void) do { - // Insert the event data this->insert_event_data (any, schedule_iter); diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp index 4286b337b02..b461d88cc97 100644 --- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp @@ -91,7 +91,6 @@ Logging_Supplier::start_generating_events (void) do { - // Insert the event data this->insert_event_data (any, schedule_iter); diff --git a/TAO/examples/ior_corbaloc/corbaname_client.cpp b/TAO/examples/ior_corbaloc/corbaname_client.cpp index 276db75fa4a..27a05cdf666 100644 --- a/TAO/examples/ior_corbaloc/corbaname_client.cpp +++ b/TAO/examples/ior_corbaloc/corbaname_client.cpp @@ -14,7 +14,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv []) { - try { // First initialize the ORB, that will remove some arguments... diff --git a/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.cpp b/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.cpp index 76222292423..eb0f51c36d8 100644 --- a/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.cpp +++ b/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.cpp @@ -28,7 +28,6 @@ IOR_corbaloc_Client_i::~IOR_corbaloc_Client_i (void) int IOR_corbaloc_Client_i::run (void) { - try { CosNaming::Name name (1); diff --git a/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.h b/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.h index 383cb71e21e..7fe58cc2df9 100644 --- a/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.h +++ b/TAO/examples/ior_corbaloc/ior_corbaloc_client_i.h @@ -28,7 +28,6 @@ */ class IOR_corbaloc_Client_i { - public: // = Constructor and destructor. IOR_corbaloc_Client_i (void); diff --git a/TAO/interop-tests/AnyTypeCode/tao/Client.cpp b/TAO/interop-tests/AnyTypeCode/tao/Client.cpp index c6ff430c4fb..903fee8cbe5 100644 --- a/TAO/interop-tests/AnyTypeCode/tao/Client.cpp +++ b/TAO/interop-tests/AnyTypeCode/tao/Client.cpp @@ -156,7 +156,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // struct tests try { - Demo::BaseStruct foo1; foo1.str = CORBA::string_dup("BaseStruct 1"); diff --git a/TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.cpp b/TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.cpp index 1f166b93d43..d65ed78aa37 100644 --- a/TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.cpp +++ b/TAO/interop-tests/CdrOutArg/tao/Client_ORBInitializer.cpp @@ -17,7 +17,6 @@ void Client_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) { - CORBA::String_var orb_id = info->orb_id (); diff --git a/TAO/interop-tests/CdrOutArg/tao/client_interceptor.cpp b/TAO/interop-tests/CdrOutArg/tao/client_interceptor.cpp index c07475d2a01..6b5c5afe283 100644 --- a/TAO/interop-tests/CdrOutArg/tao/client_interceptor.cpp +++ b/TAO/interop-tests/CdrOutArg/tao/client_interceptor.cpp @@ -39,7 +39,6 @@ void Echo_Client_Request_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri) { - if (CORBA::is_nil (this->orb_.in ())) { int argc = 0; diff --git a/TAO/interop-tests/CdrOutArg/tao/server_interceptor.cpp b/TAO/interop-tests/CdrOutArg/tao/server_interceptor.cpp index 1761e2b4f04..6e620abfe29 100644 --- a/TAO/interop-tests/CdrOutArg/tao/server_interceptor.cpp +++ b/TAO/interop-tests/CdrOutArg/tao/server_interceptor.cpp @@ -32,7 +32,6 @@ void Echo_Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri) { - CORBA::String_var operation = ri->operation (); ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/interop-tests/CdrOutArg/tao/test_i.h b/TAO/interop-tests/CdrOutArg/tao/test_i.h index 37b18a487a7..6a2721a9f6e 100644 --- a/TAO/interop-tests/CdrOutArg/tao/test_i.h +++ b/TAO/interop-tests/CdrOutArg/tao/test_i.h @@ -21,7 +21,6 @@ */ class CDR_Out_Arg_i : public POA_Interop::CDR_Out_Arg { - public: CDR_Out_Arg_i (CORBA::ORB_ptr orb); diff --git a/TAO/interop-tests/wchar/server.cpp b/TAO/interop-tests/wchar/server.cpp index 6b94ed9fd35..f855f940610 100644 --- a/TAO/interop-tests/wchar/server.cpp +++ b/TAO/interop-tests/wchar/server.cpp @@ -23,7 +23,6 @@ int verbose = 0; int parse_args (int argc, ACE_TCHAR* argv[]) { - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:v")); int c; diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp index 33d2946cabe..0c2e1f49dd9 100644 --- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp +++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplierMain.cpp @@ -140,13 +140,11 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) std::cout << "Supplier starting sending of events.\n"; while (1) { - consumer->push (event); ACE_Time_Value tv(0, 1000 * EVENT_DELAY_MS); orb->run(tv); if ((remote_ecname != 0) && (!gateway_initialized)) { - try { // Get the remote event channel object CORBA::Object_var obj = root_context->resolve_str (ACE_TEXT_ALWAYS_CHAR (remote_ecname)); diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplierMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplierMain.cpp index bc04b0e8996..1f892b0062b 100644 --- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplierMain.cpp +++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplierMain.cpp @@ -91,7 +91,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) std::cout << "Supplier starting sending events.\n"; while (1) { - event[0].header.type++; if (event[0].header.type > MY_EVENT_END) { event[0].header.type = MY_EVENT_START; diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp index 45ddebdb3a4..af651e069a4 100644 --- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp @@ -14,7 +14,6 @@ EchoEventSupplier_i::EchoEventSupplier_i(CORBA::ORB_ptr orb) // Override the disconnect_push_Supplier() operation. void EchoEventSupplier_i::disconnect_push_supplier() { - // Deactivate this object. CORBA::Object_var obj = orb_->resolve_initial_references("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow(obj.in()); diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp index b86312d4220..7fc342c949b 100644 --- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/IORTable/MessengerServer.cpp @@ -37,7 +37,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) PortableServer::POA_ptr createPersistentPOA(PortableServer::POA_ptr root_poa, const char* poa_name) { - PortableServer::LifespanPolicy_var life = root_poa->create_lifespan_policy(PortableServer::PERSISTENT); diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerServer.cpp index 9436c6ad8e6..e474955373f 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/MessengerServer.cpp @@ -46,7 +46,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try { // Initialize orb CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.cpp index 9a758e812a6..57bbf13048a 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/MessengerTask.cpp @@ -19,7 +19,6 @@ void MessengerTask::end() int MessengerTask::svc() { - try { // Get reference to Root POA CORBA::Object_var obj = orb_->resolve_initial_references("RootPOA"); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp index b6e3c7877e1..7a21c088df0 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp @@ -12,7 +12,6 @@ EventSequenceConsumer_i::push_structured_events ( const CosNotification::EventBatch& events ) { - std::cout << "events received " << std::endl; const char* value = 0; @@ -28,7 +27,6 @@ EventSequenceConsumer_i::push_structured_events ( void EventSequenceConsumer_i::disconnect_sequence_push_consumer () { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp index e15da52477c..697d711ff81 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp @@ -9,7 +9,6 @@ EventSequenceSupplier_i::EventSequenceSupplier_i(CORBA::ORB_ptr orb) void EventSequenceSupplier_i::disconnect_sequence_push_supplier () { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp index fc0488c9107..d457dc3f4b1 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp @@ -11,7 +11,6 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) , supplier_(new EventSequenceSupplier_i(orb)) { - CORBA::Object_var naming_obj = orb_->resolve_initial_references ("NameService"); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp index 10a9e283676..9281d04ca16 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp @@ -112,14 +112,12 @@ CORBA::Boolean Messenger_i::send_message ( char *& message ) { - std::cout << "Message from: " << user_name << std::endl; std::cout << "Subject: " << subject << std::endl; std::cout << "Message: " << message << std::endl; try { - // Event Definition CosNotification::StructuredEvent event; diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp index 69b8b1bc3b1..73572e2fd88 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp @@ -12,7 +12,6 @@ StructuredEventConsumer_i::push_structured_event( const CosNotification::StructuredEvent &event ) { - const char *value; for (unsigned int i=0; i<event.filterable_data.length(); i++) { @@ -27,7 +26,6 @@ void StructuredEventConsumer_i::disconnect_structured_push_consumer( ) { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp index ab5ad740764..932640f7adf 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp @@ -9,7 +9,6 @@ StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb) void StructuredEventSupplier_i::disconnect_structured_push_supplier () { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp index bdbdc2eb77a..87fc10aa190 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp @@ -10,7 +10,6 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { - CORBA::Object_var naming_obj = orb_->resolve_initial_references ("NameService"); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp index d9fb63f56d8..a8a88595673 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp @@ -115,7 +115,6 @@ CORBA::Boolean Messenger_i::send_message ( const char * subject, char *& message) { - std::cout << "Message from: " << user_name << std::endl; std::cout << "Subject: " << subject << std::endl; std::cout << "Message: " << message << std::endl; diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp index 81b6de4c263..0ec2cb4cc1e 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp @@ -12,7 +12,6 @@ StructuredEventConsumer_i::push_structured_event( const CosNotification::StructuredEvent &event ) { - const char *value; for (unsigned int i=0; i<event.filterable_data.length(); i++) { @@ -26,7 +25,6 @@ void StructuredEventConsumer_i::disconnect_structured_push_consumer( ) { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp index 30701f30fbd..f7e401db29f 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp @@ -9,7 +9,6 @@ StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb) void StructuredEventSupplier_i::disconnect_structured_push_supplier () { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp index f053d4af659..5c46a1cf215 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp @@ -97,7 +97,6 @@ CORBA::Boolean Messenger_i::send_message ( const char * subject, char *& message) { - std::cout << "Message from: " << user_name << std::endl; std::cout << "Subject: " << subject << std::endl; std::cout << "Message: " << message << std::endl; diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp index 24dd322ed0d..f242d528c43 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp @@ -12,7 +12,6 @@ StructuredEventConsumer_i::push_structured_event( const CosNotification::StructuredEvent &event ) { - std::cout << "event received " << std::endl; const char *value; @@ -27,7 +26,6 @@ StructuredEventConsumer_i::push_structured_event( void StructuredEventConsumer_i::disconnect_structured_push_consumer() { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp index 03dbefa4624..75ebbf9449a 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp @@ -9,7 +9,6 @@ StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb) void StructuredEventSupplier_i::disconnect_structured_push_supplier () { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp index 24dd322ed0d..f242d528c43 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp @@ -12,7 +12,6 @@ StructuredEventConsumer_i::push_structured_event( const CosNotification::StructuredEvent &event ) { - std::cout << "event received " << std::endl; const char *value; @@ -27,7 +26,6 @@ StructuredEventConsumer_i::push_structured_event( void StructuredEventConsumer_i::disconnect_structured_push_consumer() { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp index 159d860a26d..4f5d0f097ea 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp @@ -9,7 +9,6 @@ StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb) void StructuredEventSupplier_i::disconnect_structured_push_supplier () { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp index ea1a56d9e66..6ce7ae7e307 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp @@ -127,7 +127,6 @@ CORBA::Boolean Messenger_i::send_message (const char * user_name, try { - // Event Definition CosNotification::StructuredEvent event; diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp index 9858d2f7ba8..1218fb6a243 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp @@ -11,7 +11,6 @@ void StructuredEventConsumer_i::push_structured_event( const CosNotification::StructuredEvent &event) { - const char *value; for (unsigned int i=0; i<event.filterable_data.length(); i++) { @@ -25,7 +24,6 @@ StructuredEventConsumer_i::push_structured_event( void StructuredEventConsumer_i::disconnect_structured_push_consumer() { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp index a4f57a40858..e75774d4483 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp @@ -9,7 +9,6 @@ StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb) void StructuredEventSupplier_i::disconnect_structured_push_supplier () { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h index f3ec546e4b4..17440a354b4 100644 --- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h +++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h @@ -11,7 +11,6 @@ class ClientInterceptor: public virtual PortableInterceptor::ClientRequestInterceptor, public virtual ::CORBA::LocalObject { - public: ClientInterceptor (Messenger_var theMessage, PortableInterceptor::Current_ptr thePic, diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerClient.cpp index a7e2813c2d2..a0046a31b21 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerClient.cpp +++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerClient.cpp @@ -66,7 +66,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try { - CORBA::ORB_var orb = CORBA::ORB_init( argc, argv ); diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp index 4358936462e..762ab74551e 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp @@ -37,7 +37,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try { - CORBA::ORB_var orb = CORBA::ORB_init( argc, argv ); if (parse_args (argc, argv) != 0) diff --git a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp index c3a3b8d849d..540925e5f4d 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp +++ b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp @@ -120,7 +120,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try { - CORBA::ORB_var orb = CORBA::ORB_init( argc, argv ); diff --git a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp index 6c9b04a9836..ca97ea5c3bb 100644 --- a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp @@ -155,7 +155,6 @@ public: }; int ACE_TMAIN (int ac, ACE_TCHAR* av[]) { - int num_events = 0; try { diff --git a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp index a0c3b4f94aa..00414059517 100644 --- a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp +++ b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp @@ -185,12 +185,10 @@ public: }; int ACE_TMAIN (int ac, ACE_TCHAR* av[]) { - int num_events = 0; int pay_size = 1; try { - CORBA::ORB_var orb = CORBA::ORB_init(ac, av); if (parse_args (ac, av) != 0) diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp index aeb2d6bfb1c..eaad5ff3dc1 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp @@ -21,13 +21,11 @@ CORBA::Object_ptr EventChannelFactory_i::create_object ( PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id ) { - ORBSVCS_DEBUG((LM_DEBUG,"EventChannelFactory_i::create_object\n")); FILE* file = 0; char *id_str=0, *prog=0; try{ - file = ACE_OS::fopen(conf_file, "r"); if (file == 0) throw PortableGroup::NoFactory(); diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp index 0b56d2aede3..654199c17e3 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp @@ -50,7 +50,6 @@ int parse_args(int argc, ACE_TCHAR* argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try{ CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h index 901816581ff..75c6833693b 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h @@ -30,7 +30,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - /** * Default fault analyzer. * @@ -38,7 +37,6 @@ namespace TAO class TAO_ReplicationManagerLib_Export FT_DefaultFaultAnalyzer : public ::TAO::FT_FaultAnalyzer { - public: /** * Default constructor. diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h index b4aa54eb188..882af564e02 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h @@ -33,7 +33,6 @@ namespace TAO */ class TAO_ReplicationManagerLib_Export FT_FaultAnalyzer { - public: /** * Default constructor. diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp index f01bf130997..2f7b9c0cfd5 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp @@ -54,7 +54,6 @@ int TAO::FT_FaultConsumer::init ( FT::FaultNotifier_ptr fault_notifier, TAO::FT_FaultAnalyzer * fault_analyzer) { - if (TAO_debug_level > 1) { ORBSVCS_DEBUG ((LM_DEBUG, @@ -116,7 +115,6 @@ int TAO::FT_FaultConsumer::init ( */ int TAO::FT_FaultConsumer::fini (void) { - if (TAO_debug_level > 1) { ORBSVCS_DEBUG ((LM_DEBUG, @@ -130,7 +128,6 @@ int TAO::FT_FaultConsumer::fini (void) { if (!CORBA::is_nil (this->fault_notifier_.in())) { - if (TAO_debug_level > 1) { ORBSVCS_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h index 749409d43ab..f593e804845 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h @@ -28,7 +28,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - /////////////////////// // Forward declarations class FT_FaultAnalyzer; @@ -40,7 +39,6 @@ namespace TAO class TAO_ReplicationManagerLib_Export FT_FaultConsumer : public virtual POA_CosNotifyComm::StructuredPushConsumer { - ////////////////////// // non-CORBA interface @@ -97,7 +95,6 @@ namespace TAO * interface. */ //@{ - //////////////// // CORBA methods virtual void push_structured_event ( diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp index 270584224fd..4743da70d72 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp @@ -487,7 +487,6 @@ void TAO::FT_ReplicationManager::set_default_properties ( const PortableGroup::Properties & props) { - this->properties_support_.set_default_properties (props); //@@ validate properties? } @@ -543,7 +542,6 @@ TAO::FT_ReplicationManager::set_properties_dynamically ( PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Properties & overrides) { - TAO::PG_Object_Group * group = 0; if (this->group_factory_.find_group (object_group, group)) { @@ -591,7 +589,6 @@ TAO::FT_ReplicationManager::set_primary_member ( TAO::PG_Object_Group * group = 0; if (this->group_factory_.find_group (object_group, group)) { - PortableGroup::TagGroupTaggedComponent tag_component; TAO_FT_IOGR_Property prop (tag_component); @@ -894,7 +891,6 @@ void TAO::FT_ReplicationManager::delete_object ( const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id) { - PortableGroup::ObjectGroupId group_id = 0; if (factory_creation_id >>= group_id) { diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h index da4c8d6809f..1f4b4fdbff4 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h @@ -148,7 +148,6 @@ namespace TAO * Methods required by the POA_FT::ReplicationManager interface. */ //@{ - /// Registers the Fault Notifier with the Replication Manager. virtual void register_fault_notifier ( FT::FaultNotifier_ptr fault_notifier); @@ -171,7 +170,6 @@ namespace TAO * Methods required by the PortableGroup::PropertyManager interface. */ //@{ - /// Set the default properties to be used by all object groups. virtual void set_default_properties ( const PortableGroup::Properties & props); @@ -233,7 +231,6 @@ namespace TAO * interface. */ //@{ - /// Create a member in an object group. virtual PortableGroup::ObjectGroup_ptr create_member ( PortableGroup::ObjectGroup_ptr object_group, @@ -311,7 +308,6 @@ namespace TAO * Methods required by the PortableGroup::GenericFactory interface. */ //@{ - /** * Create an object of the specified type that adheres to the * restrictions defined by the provided Criteria. The out diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp index a5ae04091f5..4c8faf71294 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp @@ -366,7 +366,6 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member ( const PortableGroup::Location & location, int & object_is_primary) { - // To determine if this was a primary that faulted: // Get the TagFTGroupTaggedComponent from the IOGR and search // for the primary, using the TAO_FT_IOGR_Property helper class. @@ -669,7 +668,6 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure ( if ((result == 0) && (fault_event_desc.membership_style == FT::MEMB_INF_CTRL)) { - PortableGroup::ObjectGroup_var new_object_group; result = this->remove_failed_member ( the_object_group.in(), diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h index a7cfd9b7997..b2a1b75c6b6 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h @@ -34,7 +34,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - /////////////////////// // Forward declarations class FT_ReplicationManager; diff --git a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp index 5afca4f3aac..40c9d52d71c 100644 --- a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp +++ b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp @@ -165,7 +165,6 @@ void TAO::Fault_Detector_i::notify() this->notifier_->push_structured_fault(vEvent.in()); if (TAO_debug_level > 5) { - ORBSVCS_ERROR ((LM_ERROR, "return from Fault Detector push Structured Event.\n" )); diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp index d9cf14c4a7d..b38e41accbc 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp @@ -29,7 +29,6 @@ static const ACE_Time_Value DEFAULT_SHUTDOWN_TIMEOUT (0, 5000 * 1000); static PortableServer::POA_ptr createPersistentPOA (PortableServer::POA_ptr root_poa, const char* poa_name) { - PortableServer::LifespanPolicy_var life = root_poa->create_lifespan_policy (PortableServer::PERSISTENT); diff --git a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp index a9684eabc99..5bfa60ae725 100644 --- a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp @@ -245,7 +245,6 @@ LiveEntry::update_listeners (void) !i.done(); i.advance ()) { - if ((*i)->status_changed (this->liveliness_)) { remove.insert (*i); diff --git a/TAO/orbsvcs/ImplRepo_Service/Replicator.cpp b/TAO/orbsvcs/ImplRepo_Service/Replicator.cpp index aeb716fbab3..cb0a2e31c20 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Replicator.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Replicator.cpp @@ -325,7 +325,6 @@ Replicator::send_entity (ImplementationRepository::UpdateInfo &info) int Replicator::send_registration (char *&imr_ior) { - if (this->debug_ > 1) { ORBSVCS_DEBUG((LM_INFO, diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h index d85b29f5249..ad41e40c92f 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h @@ -29,7 +29,6 @@ */ class Life_Cycle_Service_Server { - public: /// Default constructor Life_Cycle_Service_Server (void); diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h index a7c32e168d5..17cdc9b4c9b 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h @@ -24,7 +24,6 @@ */ class Life_Cycle_Service_i : public POA_LifeCycleService::Life_Cycle_Service { - public: Life_Cycle_Service_i (int debug_level = 1); ~Life_Cycle_Service_i (void); diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h index 77e74bcbc34..2cf49e00aba 100644 --- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h +++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h @@ -80,7 +80,6 @@ private: */ class AutoFinalizer { - public: AutoFinalizer (TAO_NT_Naming_Service &service); ~AutoFinalizer (); diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.cpp b/TAO/orbsvcs/Time_Service/Clerk_i.cpp index f40c0085859..aeb6267622d 100644 --- a/TAO/orbsvcs/Time_Service/Clerk_i.cpp +++ b/TAO/orbsvcs/Time_Service/Clerk_i.cpp @@ -248,7 +248,6 @@ Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter, { while (iter->next_one (binding.out ())) { - ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("Getting IOR of the server: %C\n\n"), binding->binding_name[0].id.in ())); @@ -295,7 +294,6 @@ Clerk_i::create_clerk (void) { try { - // Create a new clerk object. Pass it the timer value, the set // of server IORs and the no. of servers. ACE_NEW_RETURN (this->time_service_clerk_impl_, diff --git a/TAO/orbsvcs/Time_Service/Server_i.cpp b/TAO/orbsvcs/Time_Service/Server_i.cpp index ef6c3b7aa7e..c3763c78649 100644 --- a/TAO/orbsvcs/Time_Service/Server_i.cpp +++ b/TAO/orbsvcs/Time_Service/Server_i.cpp @@ -76,7 +76,6 @@ Server_i::create_server (void) { try { - // Create a new server object. ACE_NEW_RETURN (this->time_service_server_impl_, TAO_Time_Service_Server, diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h index 44a3c05f4a4..e26d81af275 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h @@ -29,7 +29,6 @@ */ class Consumer : public POA_CosEventComm::PushConsumer { - public: /// This method connects the consumer to the EC. void open (CosEventChannelAdmin::EventChannel_ptr event_channel, diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h index 3d35dbae5e8..ce68de17b99 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h @@ -30,7 +30,6 @@ */ class Consumer : public POA_CosEventComm::PushConsumer, public Multiple { - public: // = Initializatiopn and termination methods. /// Constructor. diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp index d7d41e6a634..355a325c1b0 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp @@ -35,7 +35,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { // ORB initialization... diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp index 644331151de..ef01d16308b 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp @@ -6,7 +6,6 @@ int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { // ORB initialization boiler plate... diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp index f2fbc5e6f7f..23e67a7741a 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp @@ -492,7 +492,6 @@ void ReplicaController::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr) { - } void diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp index 995ef08cb47..eb12fd2ab21 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp @@ -37,7 +37,6 @@ public: int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try { - ACE_Service_Config config; config.open (argc, argv); diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp index 048c040e03b..896a0253cf1 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp @@ -67,7 +67,6 @@ int DynServer_Loader::init (int argc, ACE_TCHAR* argv[]) { try { - orb_ = ORB_init(argc, argv, "DynServer"); Object_var obj = orb_->resolve_initial_references("RootPOA"); @@ -122,7 +121,6 @@ DynServer_Loader::fini (void) { ACE_ASSERT(runner_.get() != 0); try { - ACE_DEBUG((LM_DEBUG, "dynserver: shutting down.\n")); runner_->end(); diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp index 985e5be1557..6fe2b8a3ed5 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp @@ -23,7 +23,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { - ORB_var orb = ORB_init (argc, argv); Object_var obj = orb->resolve_initial_references ("Test"); diff --git a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp index fcbfaa73162..69cbb3cfe31 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp +++ b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp @@ -22,7 +22,6 @@ void ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) { - ACE_NEW_THROW_EX (this->interceptor_, ServerRequestInterceptor, CORBA::NO_MEMORY ( diff --git a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h index 267baa0f961..e24f5c1f2f3 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h +++ b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h @@ -42,7 +42,6 @@ public: * Methods required by the CosLoadBalancing::LoadMonitor interface. */ //@{ - /// Return the location at which the LoadMonitor resides. /** * The returned "Location" is a sequence of length 1. diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp index 431cbd63b0a..9bce68a2b19 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp @@ -90,7 +90,6 @@ Consumer::run (int argc, ACE_TCHAR* argv[]) void Consumer::push (const CORBA::Any &) { - this->event_count_ ++; ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp index ab758ee1852..ff931d1f773 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp @@ -28,7 +28,6 @@ Supplier::Supplier (void) Supplier::~Supplier () { - } int diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.h b/TAO/orbsvcs/examples/Notify/Filter/Filter.h index 35637d29aa8..c1b6f85e28c 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/Filter.h +++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.h @@ -31,7 +31,6 @@ class Filter_StructuredPushSupplier; */ class FilterClient { - public: /// Constructor FilterClient (void); diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp index 50bb40a03a0..4b34d977cb2 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp @@ -10,7 +10,6 @@ static int authorize_2 = 1; CORBA::Boolean SLevel1_Server_i::authorize_level1 (void) { - /// Get a reference to the SecurityCurrent object. CORBA::Object_var obj = orb->resolve_initial_references ("SecurityCurrent"); diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index 6824b4bacf5..777b90ae46e 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -1005,7 +1005,6 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, FlowEndPoint_Map_Entry *a_feps_entry, *b_feps_entry; try { - for (;a_feps_iterator.next (a_feps_entry) != 0; a_feps_iterator.advance ()) { @@ -1392,7 +1391,6 @@ TAO_MCastConfigIf::set_dev_params (const char * flowName, Peer_Info *info; try { - for (this->peer_list_iterator_.first (); (info = this->peer_list_iterator_.next ()) != 0; this->peer_list_iterator_.advance ()) @@ -1479,7 +1477,6 @@ TAO_Base_StreamEndPoint::handle_preconnect (AVStreams::flowSpec &) CORBA::Boolean TAO_Base_StreamEndPoint::handle_postconnect (AVStreams::flowSpec &) { - while (!this->is_protocol_object_set ()) TAO_AV_CORE::instance ()->orb ()->perform_work (); return 1; @@ -1762,7 +1759,6 @@ TAO_StreamEndPoint::stop (const AVStreams::flowSpec &flow_spec) if (flow_spec.length () > 0) { - for (u_int i=0;i<flow_spec.length ();i++) { TAO_AV_FlowSpecSetItor end = this->forward_flow_spec_set.end (); @@ -2535,7 +2531,6 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos, } else { - switch (forward_entry->direction ()) { case TAO_FlowSpec_Entry::TAO_AV_DIR_IN: @@ -2606,7 +2601,6 @@ TAO_StreamEndPoint_A::disconnect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep const AVStreams::flowSpec & /* theSpec */) { - throw AVStreams::notSupported (); } @@ -3300,7 +3294,6 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj) CORBA::Object_ptr TAO_MMDevice::get_fdev (const char *flow_name) { - ACE_CString fdev_name_key (flow_name); AVStreams::FDev_var fdev_entry; if (this->fdev_map_.find (fdev_name_key, fdev_entry) == 0) @@ -3569,7 +3562,6 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer, { try { - AVStreams::FlowProducer_ptr flow_producer = AVStreams::FlowProducer::_duplicate (producer); AVStreams::FlowConsumer_ptr flow_consumer = @@ -3919,7 +3911,6 @@ TAO_FlowEndPoint::destroy () AVStreams::StreamEndPoint_ptr TAO_FlowEndPoint::related_sep () { - return AVStreams::StreamEndPoint::_duplicate (this->related_sep_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h index b2daa2809f4..ecd767ce52a 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h @@ -70,7 +70,6 @@ class TAO_AV_Export TAO_Basic_StreamCtrl : public virtual POA_AVStreams::Basic_StreamCtrl, public virtual TAO_PropertySet { - public: /// Default Constructor TAO_Basic_StreamCtrl (void); @@ -188,7 +187,6 @@ class TAO_AV_Export TAO_StreamCtrl : public virtual POA_AVStreams::StreamCtrl, public virtual TAO_Basic_StreamCtrl { - public: /// Default Constructor TAO_StreamCtrl (void); @@ -373,7 +371,6 @@ class TAO_AV_Flow_Handler; class TAO_AV_Export TAO_Base_StreamEndPoint :public virtual TAO_PropertySet { - // @@Naga: Rename this class to TAO_Base_EndPoint since both stream and flowendpoints derive from it. public: TAO_Base_StreamEndPoint (void); @@ -445,7 +442,6 @@ class TAO_AV_Export TAO_StreamEndPoint : public virtual POA_AVStreams::StreamEndPoint, public virtual TAO_Base_StreamEndPoint { - public: /// Constructor TAO_StreamEndPoint (void); @@ -571,7 +567,6 @@ class TAO_AV_Export TAO_StreamEndPoint_A : public virtual POA_AVStreams::StreamEndPoint_A, public virtual TAO_StreamEndPoint { - public: /// Constructor TAO_StreamEndPoint_A (void); @@ -628,7 +623,6 @@ class TAO_AV_Export TAO_VDev :public virtual TAO_PropertySet, public virtual POA_AVStreams::VDev { - public: /// Default Constructor TAO_VDev (void); @@ -786,7 +780,6 @@ class TAO_AV_Export TAO_FlowConnection : public virtual POA_AVStreams::FlowConnection, public virtual TAO_PropertySet { - public: /// default constructor. TAO_FlowConnection (void); diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp index 0c5f67b7260..e8150293080 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp @@ -530,7 +530,6 @@ TAO_AV_Core::init_reverse_flows (TAO_Base_StreamEndPoint *endpoint, int result = -1; switch (direction) { - case TAO_AV_Core::TAO_AV_ENDPOINT_A: { result = this->connector_registry_->open (endpoint, @@ -565,10 +564,8 @@ TAO_AV_Core::get_flow_spec_entry (TAO_AV_FlowSpecSet &flow_spec_set, TAO_AV_Acceptor* TAO_AV_Core::get_acceptor (const char *flowname) { - try { - TAO_AV_AcceptorSetItor acceptor = this->acceptor_registry_->begin (); TAO_AV_AcceptorSetItor end = @@ -590,10 +587,8 @@ TAO_AV_Core::get_acceptor (const char *flowname) int TAO_AV_Core::remove_acceptor (const char *flowname) { - try { - TAO_AV_AcceptorSetItor acceptor = this->acceptor_registry_->begin (); TAO_AV_AcceptorSetItor end = diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp index 633df6b7cf2..3040e0034e4 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp @@ -84,7 +84,6 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> char * TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa (PortableServer::Servant servant) { - PortableServer::ObjectId_var id = this->poa_->activate_object (servant); @@ -248,7 +247,6 @@ TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::act { try { - // Use the bridge method if (this->make_stream_endpoint (this->stream_endpoint_a_servant_) == -1) return -1; @@ -396,7 +394,6 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> char * TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa (PortableServer::Servant servant) { - PortableServer::ObjectId_var id = this->poa_->activate_object (servant); diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.h b/TAO/orbsvcs/orbsvcs/AV/MCast.h index 0639f3cb4cb..900b15724a5 100644 --- a/TAO/orbsvcs/orbsvcs/AV/MCast.h +++ b/TAO/orbsvcs/orbsvcs/AV/MCast.h @@ -30,7 +30,6 @@ class TAO_AV_UDP_MCast_Flow_Handler; class TAO_AV_UDP_MCast_Transport :public TAO_AV_Transport { - public: TAO_AV_UDP_MCast_Transport (void); diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp index 9d3baefcc29..35090bd20e3 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp @@ -39,7 +39,6 @@ FillQoSParams (ACE_QoS_Params &qos_params, TAO_AV_UDP_QoS_Session_Helper::TAO_AV_UDP_QoS_Session_Helper (void) { - } TAO_AV_UDP_QoS_Session_Helper::~TAO_AV_UDP_QoS_Session_Helper (void) @@ -318,7 +317,6 @@ TAO_AV_UDP_QoS_Flow_Handler::translate (ACE_Flow_Spec *ace_flow_spec, int TAO_AV_UDP_QoS_Flow_Handler::handle_qos (ACE_HANDLE /*fd*/) { - if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::handle_qos\n")); @@ -486,7 +484,6 @@ TAO_AV_UDP_QoS_Flow_Handler::handle_timeout (const ACE_Time_Value &tv, int TAO_AV_UDP_QoS_Flow_Handler::set_remote_address (ACE_Addr *address) { - if (TAO_debug_level > 0) { ACE_TCHAR buf [BUFSIZ]; @@ -509,7 +506,6 @@ TAO_AV_UDP_QoS_Flow_Handler::set_remote_address (ACE_Addr *address) if (this->entry_->role () == TAO_FlowSpec_Entry::TAO_AV_PRODUCER) { - TAO_AV_UDP_QoS_Session_Helper helper; this->qos_session_ = helper.open_qos_session (this, @@ -919,7 +915,6 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr) if (this->entry_->role () == TAO_FlowSpec_Entry::TAO_AV_CONSUMER) { - TAO_AV_UDP_QoS_Session_Helper helper; int result = handler->get_socket ()->open (*inet_addr, @@ -982,7 +977,6 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr) if (qos_available == 0) { - ACE_Flow_Spec *ace_flow_spec = 0; ACE_NEW_RETURN (ace_flow_spec, ACE_Flow_Spec, @@ -1001,7 +995,6 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr) } else { - int result = handler->get_socket ()->open (*inet_addr, qos_params, AF_INET, @@ -1283,7 +1276,6 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry, qos); if (qos_available == 0) { - ACE_Flow_Spec* ace_flow_spec; ACE_NEW_RETURN (ace_flow_spec, ACE_Flow_Spec, diff --git a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp index d70ef01bb09..a002ac2f47b 100644 --- a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp @@ -621,7 +621,6 @@ TAO_AV_SCTP_SEQ_Factory::make_connector (void) int TAO_AV_SCTP_SEQ_Factory::init (int, ACE_TCHAR *[]) { - return 0; } @@ -727,7 +726,6 @@ TAO_AV_SCTP_SEQ_Flow_Handler::change_qos (AVStreams::QoS qos) int dscp_flag=0; for(i=0; i < qos.QoSParams.length(); i++) { - if( ACE_OS::strcmp( qos.QoSParams[i].property_name.in(), "Diffserv_Codepoint") == 0) { qos.QoSParams[i].property_value >>= dscp; diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp index 8e0291e108d..b555f2e0a09 100644 --- a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp @@ -642,7 +642,6 @@ TAO_AV_TCP_Flow_Handler::transport () int TAO_AV_TCP_Flow_Handler::open (void * /*arg*/) { - #if defined (TCP_NODELAY) int nodelay = 1; diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp index 462361e5aa3..d057a1a3f14 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp @@ -56,7 +56,6 @@ TAO_AV_Connector_Registry::open (TAO_Base_StreamEndPoint *endpoint, TAO_AV_Core* av_core, TAO_AV_FlowSpecSet &flow_spec_set) { - TAO_AV_FlowSpecSetItor last_flowspec = flow_spec_set.end (); for (TAO_AV_FlowSpecSetItor flow_spec = flow_spec_set.begin (); @@ -386,7 +385,6 @@ TAO_AV_Acceptor_Registry::open_default (TAO_Base_StreamEndPoint *endpoint, if (control_flow_factory_name != 0) { - TAO_AV_Flow_Protocol_Factory *control_flow_factory = av_core->get_flow_protocol_factory (control_flow_factory_name); diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp index ee9d4f7a4b6..2f19adac8bc 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp @@ -94,7 +94,6 @@ TAO_AV_UDP_Flow_Handler::change_qos(AVStreams::QoS qos) int dscp_flag=0; for(i=0; i < qos.QoSParams.length(); i++) { - if( ACE_OS::strcmp( qos.QoSParams[i].property_name.in(), "Diffserv_Codepoint") == 0) { qos.QoSParams[i].property_value >>= dscp; @@ -677,7 +676,6 @@ TAO_AV_UDP_Connector::connect (TAO_FlowSpec_Entry *entry, control_inet_addr = dynamic_cast<ACE_INET_Addr*> (entry->control_address ()) ; else { - if (local_addr != 0) { ACE_TCHAR buf [BUFSIZ]; diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.h b/TAO/orbsvcs/orbsvcs/AV/UDP.h index ec50ec8485c..638160e8d52 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.h +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.h @@ -46,7 +46,6 @@ class TAO_AV_UDP_Flow_Handler; class TAO_AV_Export TAO_AV_UDP_Transport :public TAO_AV_Transport { - public: TAO_AV_UDP_Transport (void); diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp index 28dc0972ce7..ddba84bfa49 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp @@ -1092,7 +1092,6 @@ TAO_SFP_Object::set_policies (const TAO_AV_PolicyList& policies) policy = policies[i]; switch (policies[i]->type ()) { - case TAO_AV_SFP_CREDIT_POLICY: { TAO_AV_SFP_Credit_Policy *credit_policy = @@ -1269,7 +1268,6 @@ TAO_AV_SFP_Factory::make_protocol_object (TAO_FlowSpec_Entry *entry, break; case TAO_FlowSpec_Entry::TAO_AV_CONSUMER: { - ACE_NEW_RETURN (object, TAO_SFP_Consumer_Object (callback, transport, diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp index cc2cd295b79..cc226f585c0 100644 --- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp @@ -18,7 +18,6 @@ ACE_PushConsumer_Adapter<TARGET>::push (const RtecEventComm::EventSet& events) template<class TARGET> void ACE_PushConsumer_Adapter<TARGET>::disconnect_push_consumer () { - target_->disconnect_push_consumer (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp index 0e5bc198acb..acedc060966 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp @@ -232,7 +232,6 @@ TAO_CEC_ProxyPushSupplier::invoke (const TAO_CEC_TypedEvent& typed_event) this->typed_event_channel_, this); { - ACE_GUARD (ACE_Lock, ace_mon, *this->lock_); if (!this->is_connected_i ()) @@ -329,7 +328,6 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer ( throw CORBA::BAD_PARAM (); { - #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) // Check if we have a typed event channel if (this->is_typed_ec () ) @@ -405,7 +403,6 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer ( } { - ACE_GUARD_THROW_EX ( ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ()); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp index ab8852c1d3c..13bd60f92eb 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp @@ -161,7 +161,6 @@ void TAO_CEC_Reactive_ConsumerControl::successful_transmission ( PortableServer::ServantBase* proxy) { - #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) if (this->typed_event_channel_) { diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp index b7b171e9427..d282d632f19 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp @@ -502,7 +502,6 @@ TAO_CEC_TypedEventChannel::create_operation_list (TAO_CEC_Operation_Params *oper for (CORBA::ULong param=0; param<oper_params->num_params_; param++) { - CORBA::Any any_1; any_1._tao_set_typecode(oper_params->parameters_[param].type_.in ()); diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h index 366a51a6b84..0a0abc3db9c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h @@ -105,7 +105,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Receiver : public: /// Initialization and termination methods. //@{ - /// Create a new TAO_ECG_UDP_Receiver object. /// (Constructor access is restricted to insure that all /// TAO_ECG_UDP_Receiver objects are heap-allocated.) diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h index e5aff6c4027..63d5482588f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h @@ -102,7 +102,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Sender : public: /// Initialization and termination methods. //@{ - /// Create a new TAO_ECG_UDP_Sender object. /// (Constructor access is restricted to insure that all /// TAO_ECG_UDP_Sender objects are heap-allocated.) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp index df321abb0ab..168d5f1c7f5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp @@ -174,7 +174,6 @@ TAO_EC_Kokyu_Push_Command::~TAO_EC_Kokyu_Push_Command() int TAO_EC_Kokyu_Push_Command::execute () { - try { //ORBSVCS_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp index 697bfb25d95..1c03d5c3e2b 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp @@ -10,7 +10,6 @@ TAO_FT_ClientPolicyFactory::create_policy ( CORBA::PolicyType type, const CORBA::Any &val) { - if (type == FT::REQUEST_DURATION_POLICY) return TAO_FT_Request_Duration_Policy::create (val); else if (type == FT::HEARTBEAT_POLICY) diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h index 5ae34829868..51a506575ff 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h @@ -39,7 +39,6 @@ class TAO_Service_Callbacks; */ class TAO_FT_ClientORB_Export TAO_FT_ClientService_Activate : public TAO_Services_Activate { - public: /// Constructor TAO_FT_ClientService_Activate (void); diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp index e1b6e9e36fd..2875d17ab83 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp @@ -82,7 +82,6 @@ CORBA::Object_ptr TAO_FT_IOGR_Property::get_primary ( CORBA::Object_ptr ior) { - TAO_Profile *pfile = this->get_primary_profile (ior); @@ -273,7 +272,6 @@ TAO_FT_IOGR_Property::encode_properties ( i != 0; i = i->cont ()) { - ACE_OS::memcpy (buf, i->rd_ptr (), i->length ()); buf += i->length (); } @@ -337,7 +335,6 @@ TAO_FT_IOGR_Property::get_tagged_component ( i < mprofile.profile_count (); i++) { - // Get the Tagged Components const TAO_Tagged_Components &pfile_tagged = mprofile.get_profile (i)->tagged_components (); diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h index eef04520324..f3b00de2f72 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h @@ -44,7 +44,6 @@ class TAO_Profile; class TAO_FT_ClientORB_Export TAO_FT_Invocation_Endpoint_Selector : public TAO_Default_Endpoint_Selector { - public: /// Constructor. TAO_FT_Invocation_Endpoint_Selector (void); diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp index 39bfddf8c53..599125a5802 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp @@ -11,7 +11,6 @@ TAO_FT_ServerPolicyFactory::create_policy ( CORBA::PolicyType type, const CORBA::Any &val) { - if (type == FT::HEARTBEAT_ENABLED_POLICY) return TAO_FT_Heart_Beat_Enabled_Policy::create (val); diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h index 9d9630318fd..0878f6c3292 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h @@ -37,7 +37,6 @@ class TAO_Service_Callbacks; class TAO_FT_ServerORB_Export TAO_FT_ServerService_Activate : public ACE_Service_Object { - public: /// Constructor TAO_FT_ServerService_Activate (void); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h index b3b7c97a97a..2592c533001 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h @@ -29,7 +29,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_ORB_Core; namespace TAO_FTRT { - class TAO_FTRT_Export FTRT_ClientORB_Loader : public ACE_Service_Object { public: diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp index cf79e91b2a7..87e91459919 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp @@ -7,7 +7,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <ACE_PEER_STREAM_1> int ConnectionAcceptHandler<ACE_PEER_STREAM_2>::open (void * acceptor) { - ACE_TRACE("ConnectionAcceptHandler::open\n"); ACE_INET_Addr addr; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp index 932beb8d789..c599f29c02b 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp @@ -209,7 +209,6 @@ TAO_FTEC_Event_Channel_Impl::activate_object ( const FtRtecEventComm::ObjectId& supplier_admin_oid, const FtRtecEventComm::ObjectId& consumer_admin_oid) { - iogr_maker_.init(orb.in()); TAO_EC_Event_Channel_Base::activate(); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp index 7d74d1cd4fc..f7ea13c4b68 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp @@ -16,7 +16,6 @@ void FTEC_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) { - Request_Context_Repository().allocate_slots(info); PortableInterceptor::ClientRequestInterceptor_var client_interceptor; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp index c962ed0542a..9f10f46185c 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp @@ -26,7 +26,6 @@ void TAO_FTEC_ProxyPushSupplier::activate ( RtecEventChannelAdmin::ProxyPushSupplier_ptr &result) { - result = RtecEventChannelAdmin::ProxyPushSupplier::_nil(); try{ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp index bcdc0daaf3d..9cb1ef8e12c 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp @@ -225,7 +225,6 @@ FtEventServiceInterceptor::receive_request (PortableInterceptor::ServerRequestIn Request_Context_Repository().set_ft_request_service_context(ri, service_context); try{ - FTRT::TransactionDepth transaction_depth = get_transaction_depth_context(ri); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp index f3cc27ee85e..865b4021f06 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp @@ -164,7 +164,6 @@ IOGR_Maker::copy_ft_group_component(CORBA::Object_ptr ior) if (pfile_tagged.get_component (tagged_components) == 1) { - // Grab the object group version // @@ NOTE: This involves an allocation and a dellocation. This is // really bad. diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp index b1ea8b8744e..cf10ef2f7c5 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp @@ -6,7 +6,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace FTRTEC { - namespace { Identification_Service* service; const char oid[] = "\xF8\xB3\xB1\xFE\xAC\xC6\x07\x11\x02\x0C\x02\x50\xEB\x05\x77\xD0"; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp index 56f1375fc9b..96234bbe088 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp @@ -10,7 +10,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_FTRTEC { - unsigned int Log::log_level_; #ifndef NDEBUG diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h index 9c88345705f..44a5b6a5803 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h @@ -18,7 +18,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_FTRTEC { - /** * A utility class for logging messages. */ diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp index 8e717c86814..a34987a965d 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp @@ -11,7 +11,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_FtRt { - static union { struct diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h index 2dc5c7fea9f..5b0db8fcf91 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h @@ -48,7 +48,6 @@ namespace TAO { namespace HTIOP { - // TAO HTIOP_Acceptor concrete call definition /** diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h index 057d7ebe609..2a57d9cd233 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h @@ -34,7 +34,6 @@ namespace TAO { namespace HTIOP { - /** * @class Completion_Handler * @@ -52,7 +51,6 @@ namespace TAO class HTIOP_Export Completion_Handler : public COMPLETION_BASE { - public: Completion_Handler (ACE_Thread_Manager* t = 0); /// Constructor. diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp index de51d760b7e..6fd2aad59b2 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp @@ -94,7 +94,6 @@ TAO::HTIOP::Connection_Handler::open (void*) if (local_addr.is_ip_equal (remote_addr) && local_addr.get_port_number () == remote_addr.get_port_number ()) { - if (TAO_debug_level > 0) { ACE_TCHAR remote_as_string[MAXHOSTNAMELEN + 16]; diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h index 55cc6925d4c..799dc586f49 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h @@ -33,7 +33,6 @@ namespace TAO { namespace HTIOP { - /** * @class HTIOP_Connection_Handler * diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp index 1c437dd30ae..653d2051a81 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp @@ -115,7 +115,6 @@ TAO::HTIOP::Connector::make_connection (TAO::Profile_Transport_Resolver *, TAO_Transport_Descriptor_Interface &desc, ACE_Time_Value *timeout) { - /** * \par * Connector is used only in the processes inside the firewall diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp index 110885ef92e..ad085c87184 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp @@ -15,7 +15,6 @@ Connect_Creation_Strategy (ACE_Thread_Manager* t, orb_core_ (orb_core), arg_ (arg) { - } template <class SVC_HANDLER> int diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h index 7369d51747d..f1fcfa313db 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h @@ -33,7 +33,6 @@ namespace TAO { namespace HTIOP { - /** * @class HTIOP_Connect_Creation_Strategy * diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h index 215746fba61..8094f89ca66 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h @@ -32,7 +32,6 @@ namespace TAO { namespace HTIOP { - class Connection_Handler; /** diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h index 473fded9872..d7d854ea193 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.h @@ -38,7 +38,6 @@ namespace TAO { namespace HTIOP { - class HTIOP_Export Protocol_Factory : public TAO_Protocol_Factory { public: diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp index 5392f3e6427..a70b23bbf4b 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp @@ -85,7 +85,6 @@ TAO::HTIOP::Profile::~Profile () int TAO::HTIOP::Profile::decode_profile (TAO_InputCDR& cdr) { - // Decode host and port into the <endpoint_>. if (cdr.read_string (this->endpoint_.host_.out ()) == 0 || cdr.read_ushort (this->endpoint_.port_) == 0 diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h index c68c9479aea..096f7769733 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h @@ -35,7 +35,6 @@ namespace TAO { namespace HTIOP { - // TAO HTIOP_Profile concrete Profile definitions /** * @class HTIOP_Profile diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp index 296db0bad23..b70102efeff 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp @@ -76,7 +76,6 @@ TAO::HTIOP::Transport::recv (char *buf, TAO_debug_level > 4 && errno != ETIME) { - ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO::HTIOP::Transport[%d]::recv_i, ") ACE_TEXT ("read failure - %m"), @@ -304,7 +303,6 @@ TAO::HTIOP::Transport::get_listen_point (::HTIOP::ListenPointList &lp_list, if (local_addr.get_port_number() != 0) { - // Note: Looks like there is no point in sending the list of // endpoints on interfaces on which this connection has not // been established. If this is wrong, please correct me. diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h index 0ea55cdec43..887a15d272b 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h @@ -73,7 +73,6 @@ namespace TAO * details. */ //@{ - virtual ACE_Event_Handler * event_handler_i (void); virtual TAO_Connection_Handler * invalidate_event_handler_i (void); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h index bee15bad26d..bf350e62991 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h @@ -55,7 +55,6 @@ public: * Methods required by the CosLoadBalancing::LoadMonitor interface. */ //@{ - /// Return the location at which the LoadMonitor resides. /** * The returned "Location" is a sequence of length 1. diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h index 176389a57a4..e0c97f22a96 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h @@ -52,7 +52,6 @@ public: * Methods required by the CosLoadBalancing::LoadMonitor interface. */ //@{ - /// Return the location at which the LoadMonitor resides. /** * The returned "Location" is a sequence of length 1. diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h index 7a56c08464e..a1c56aaee6e 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h @@ -157,7 +157,6 @@ private: * Cached LeastLoaded load balancing strategy property values. */ //@{ - /// The critical load threshold. /** * Load rebalancing/shedding will occur if loads at a given location diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h index 79b55cfb605..6d0dcad26d8 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h @@ -37,7 +37,6 @@ public: * Methods required by the CosLoadBalancing::LoadAlert interface. */ //@{ - /// Forward requests back to the load manager via the object group /// reference. virtual void enable_alert (void); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h index f132a1161e7..1013d609f8d 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h @@ -134,7 +134,6 @@ private: * Cached LoadAverage load balancing strategy property values. */ //@{ - /// CORBA::Float tolerance_; diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp index b5fb4e0a12f..cd167477d94 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp @@ -1062,7 +1062,6 @@ TAO_LB_LoadManager::make_strategy (const CosLoadBalancing::StrategyInfo * info) } else if (ACE_OS::strcmp (info->name.in (), "LoadMinimum") == 0) { - if (info->props.length () == 0) { { @@ -1104,7 +1103,6 @@ TAO_LB_LoadManager::make_strategy (const CosLoadBalancing::StrategyInfo * info) } else if (ACE_OS::strcmp (info->name.in (), "LoadAverage") == 0) { - if (info->props.length () == 0) { { diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h index e2f2a817730..fd862cb98c7 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h @@ -54,7 +54,6 @@ public: * Methods required by the CosLoadBalancing::LoadManager interface. */ //@{ - /// For the PUSH load monitoring style. virtual void push_loads (const PortableGroup::Location & the_location, const CosLoadBalancing::LoadList & loads); @@ -107,7 +106,6 @@ public: * Methods required by the PortableGroup::PropertyManager interface. */ //@{ - /// Set the default properties to be used by all object groups. virtual void set_default_properties ( const PortableGroup::Properties & props); @@ -167,7 +165,6 @@ public: * interface. */ //@{ - /// Create a member using the load balancer ObjectGroupManager, and /// add the created object to the ObjectGroup. virtual PortableGroup::ObjectGroup_ptr create_member ( @@ -227,7 +224,6 @@ public: * Methods required by the PortableGroup::GenericFactory interface. */ //@{ - /** * Create an object of the specified type that adheres to the * restrictions defined by the provided Criteria. The out diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp index 3f09e937742..4534ce83ddb 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp @@ -311,7 +311,6 @@ TAO_LB_LoadMinimum::analyze_loads ( } else { - CORBA::Float percent_diff = (tmp[j].value / min_load) - 1; @@ -408,7 +407,6 @@ TAO_LB_LoadMinimum::get_location ( */ if (load.value < min_load) { - if (i > 0 && !ACE::is_equal (load.value, 0.0f)) { /* diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h index a95028fa71e..ab40cf82301 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h @@ -158,7 +158,6 @@ private: * Cached LoadMinimum load balancing strategy property values. */ //@{ - /// CORBA::Float tolerance_; diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h index aa84e671c77..fe2a5bb6bbd 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h @@ -51,7 +51,6 @@ public: * interface. */ //@{ - /// Clients requests are forwarded via the /// PortableServer::ForwardRequest exception thrown in this method. virtual PortableServer::Servant preinvoke ( diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp index 1929ea3e2be..1f386f9b1c5 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp @@ -17,7 +17,6 @@ TAO_EventLog_i::TAO_EventLog_i (CORBA::ORB_ptr orb, poa_(PortableServer::POA::_duplicate(poa)), log_poa_(PortableServer::POA::_duplicate(log_poa)) { - // Create an instance of the event channel. TAO_CEC_EventChannel_Attributes attr (this->poa_.in(), this->poa_.in()); diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp index 44054f36974..463f267f3ee 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp @@ -17,7 +17,6 @@ TAO_LogNotification::~TAO_LogNotification () void TAO_LogNotification::object_creation (DsLogAdmin::LogId id) { - CORBA::Any any; DsLogNotification::ObjectCreation event; diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h index 496c437b278..819a27257f6 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h @@ -37,7 +37,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL */ class TAO_Log_Serv_Export TAO_LogNotification { - public: /// Constructor. TAO_LogNotification (void); diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp index c5485ab1291..1f1475a2f9f 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp @@ -694,7 +694,6 @@ int TAO_Log_Constraint_Visitor::visit_binary_expr ( ETCL_Binary_Expr *binary_expr) { - // Evaluate the constraint int bin_op_type = binary_expr->type (); diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.h b/TAO/orbsvcs/orbsvcs/Log/Log_i.h index 5069493ac29..5ae33dc3a19 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.h @@ -46,7 +46,6 @@ class TAO_LogMgr_i; */ class TAO_Log_Serv_Export TAO_Log_i : public virtual POA_DsLogAdmin::Log { - public: /// Constructor. TAO_Log_i (CORBA::ORB_ptr orb, diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp index 1c6ac6b1f17..cdf78e7637e 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp @@ -12,7 +12,6 @@ TAO_NotifyLogFactory_i::TAO_NotifyLogFactory_i () TAO_NotifyLogFactory_i::TAO_NotifyLogFactory_i (CosNotifyChannelAdmin::EventChannelFactory_ptr ecf) : notify_factory_ (ecf) { - CosNotifyChannelAdmin::ChannelID id; CosNotifyChannelAdmin::AdminID adminID = 0; CosNotification::QoSProperties initial_qos; diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp index 725c4952af7..1aead3245ab 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp @@ -10,7 +10,6 @@ TAO_NotifyLogNotification::TAO_NotifyLogNotification ( : TAO_LogNotification (), event_channel_ (CosNotifyChannelAdmin::EventChannel::_duplicate (ec)) { - CosNotifyComm::PushSupplier_var objref = this->_this (); ACE_ASSERT (!CORBA::is_nil (objref.in ())); diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp index 3cf48ab0234..6a508441855 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp @@ -15,7 +15,6 @@ TAO_NotifyLog_i::TAO_NotifyLog_i (CORBA::ORB_ptr orb, notify_factory_ (CosNotifyChannelAdmin::EventChannelFactory::_duplicate (ecf)), poa_ (PortableServer::POA::_duplicate (poa)) { - CosNotifyChannelAdmin::ChannelID channel_id; CosNotification::QoSProperties initial_qos; @@ -92,7 +91,6 @@ TAO_NotifyLog_i::destroy () void TAO_NotifyLog_i::activate () { - CosNotifyChannelAdmin::AdminID adminid = 0; CosNotifyChannelAdmin::InterFilterGroupOperator ifgop = CosNotifyChannelAdmin::OR_OP; diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp index bbcc5c060af..4aab236323b 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp @@ -25,7 +25,6 @@ TAO_RTEventLogNotification::TAO_RTEventLogNotification ( : TAO_LogNotification (), event_channel_ (RtecEventChannelAdmin::EventChannel::_duplicate (ec)) { - obtainProxyConsumer (); } diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp index c63d99d4e41..661eed9e4f8 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp @@ -29,7 +29,6 @@ TAO_RTEventLog_i::TAO_RTEventLog_i (CORBA::ORB_ptr orb, poa_ (PortableServer::POA::_duplicate (poa)), log_poa_ (PortableServer::POA::_duplicate (log_poa)) { - TAO_EC_Event_Channel_Attributes attr (poa_.in(), poa_.in()); ACE_NEW_THROW_EX (this->event_channel_, diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp index 4a3c0bafc58..05b715bb4ef 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp @@ -314,7 +314,6 @@ void TAO_FT_Naming_Manager::set_default_properties ( const PortableGroup::Properties & props) { - this->properties_support_.set_default_properties (props); //@@ validate properties? } @@ -364,7 +363,6 @@ TAO_FT_Naming_Manager::set_properties_dynamically ( PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Properties & overrides) { - TAO::PG_Object_Group * group = 0; if (this->group_factory_.find_group (object_group, group)) { @@ -451,7 +449,6 @@ TAO_FT_Naming_Manager::add_member ( if (this->group_factory_.find_group (object_group, group)) { try { - group->add_member (the_location, member); } @@ -567,7 +564,6 @@ PortableGroup::ObjectGroupId TAO_FT_Naming_Manager::get_object_group_id ( PortableGroup::ObjectGroup_ptr object_group) { - if (CORBA::is_nil (object_group)) { ORBSVCS_DEBUG ((LM_DEBUG, @@ -661,7 +657,6 @@ TAO_FT_Naming_Manager::get_member_ref ( PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Location & the_location) { - if (CORBA::is_nil (object_group)) { ORBSVCS_DEBUG ((LM_DEBUG, @@ -743,7 +738,6 @@ TAO_FT_Naming_Manager::delete_object ( const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id) { - PortableGroup::ObjectGroupId group_id = 0; if (factory_creation_id >>= group_id) { diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h index b57c6786a03..5dac7989663 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h @@ -107,7 +107,6 @@ public: * Methods required by the PortableGroup::PropertyManager interface. */ //@{ - /// Set the default properties to be used by all object groups. virtual void set_default_properties ( const PortableGroup::Properties & props); @@ -167,7 +166,6 @@ public: * interface. */ //@{ - /// Create a member using the load balancer ObjectGroupManager, and /// add the created object to the ObjectGroup. virtual PortableGroup::ObjectGroup_ptr create_member ( @@ -230,7 +228,6 @@ public: * Methods required by the PortableGroup::GenericFactory interface. */ //@{ - /** * Create an object of the specified type that adheres to the * restrictions defined by the provided Criteria. The out @@ -321,7 +318,6 @@ private: * and Random are supported. */ //@{ - /// The "RoundRobin" load balancing strategy. TAO_FT_Round_Robin round_robin_; /// The "Random" load balancing strategy. diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp index ae18aa384f8..82966a97945 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp @@ -163,7 +163,6 @@ TAO_FT_Naming_Replication_Manager::svc () } try { - this->orb_->run (); } catch (const CORBA::SystemException &ex) @@ -349,7 +348,6 @@ TAO_FT_Naming_Replication_Manager::send_context_update (const ACE_CString & name void TAO_FT_Naming_Replication_Manager::send_registration (bool use_combo_refs) { - if (TAO_debug_level > 1) { ORBSVCS_DEBUG((LM_INFO, diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp index b9bd3c43792..2a6da089e86 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp @@ -126,7 +126,6 @@ TAO_FT_Naming_Server::update_info_i () void TAO_FT_Naming_Server::update_info (FT_Naming::UpdateInfoSeq &infos) { - CORBA::ULong count = infos.length(); FT_Naming::UpdateInfo* guts = infos.get_buffer(true); FT_Naming::UpdateInfoSeq_var block = 0; @@ -412,7 +411,6 @@ TAO_FT_Naming_Server::init_replication_pairing () void TAO_FT_Naming_Server::no_replica () { - if (this->server_role_ == BACKUP) { this->recover_iors (); @@ -931,7 +929,6 @@ TAO_FT_Naming_Server::combine_iors (FT_Naming::EntityKind kind, CORBA::Object_pt } else { - this->assign (combo, false, iorm->add_profiles (peer, this->iors_[local].ref_.in ())); } diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp index d9637040909..b1fbdc028a0 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp @@ -50,7 +50,6 @@ TAO_FT_Persistent_Naming_Context::resolve (const CosNaming::Name& n) // Get the locations of the object group members and we will use them to // do the load balancing try { - // Make sure object is an object group. // We will return the object reference all the way back out to the client // if not diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp index 93023f53754..a7e0034a1f9 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp @@ -54,7 +54,6 @@ TAO_FT_Storable_Naming_Context::resolve (const CosNaming::Name& n) CORBA::Object_var resolved_ref = TAO_Storable_Naming_Context::resolve(n); try { - // Make sure object is an object group. // We will return the object reference as is all the way back // out to the client if not diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp index 3bd9059c4ca..0787924201c 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp @@ -40,7 +40,6 @@ NS_group_svc::determine_policy_string (const ACE_TCHAR *policy, int NS_group_svc::set_orb( CORBA::ORB_ptr orb) { - this->orb_ = CORBA::ORB::_duplicate (orb); if (CORBA::is_nil (this->orb_.in ())) @@ -59,7 +58,6 @@ NS_group_svc::set_orb( CORBA::ORB_ptr orb) int NS_group_svc::set_naming_manager (FT_Naming::NamingManager_ptr nm) { - this->naming_manager_ = FT_Naming::NamingManager::_duplicate (nm); if (CORBA::is_nil (this->naming_manager_.in ())) @@ -77,7 +75,6 @@ NS_group_svc::set_naming_manager (FT_Naming::NamingManager_ptr nm) int NS_group_svc::set_name_context( CosNaming::NamingContextExt_ptr nc) { - this->name_service_ = CosNaming::NamingContextExt::_duplicate (nc); if (CORBA::is_nil (this->name_service_.in ())) @@ -235,7 +232,6 @@ NS_group_svc::group_bind (const ACE_TCHAR* group_name, try { - PortableGroup::ObjectGroup_var group_var = this->naming_manager_->get_object_group_ref_from_name (ACE_TEXT_ALWAYS_CHAR(group_name)); @@ -370,7 +366,6 @@ NS_group_svc::group_unbind (const ACE_TCHAR* path) } catch (const CORBA::Exception& ) { - if (TAO_debug_level > 2) { ORBSVCS_ERROR ((LM_ERROR, @@ -390,7 +385,6 @@ NS_group_svc::group_unbind (const ACE_TCHAR* path) int NS_group_svc::group_list () { - // KCS: The group list is independent of locations. I created a new operation in the // naming manager IDL to support requesting the group list - which is a list of names @@ -435,7 +429,6 @@ NS_group_svc::display_load_policy_group(FT_Naming::LoadBalancingStrategyValue st display_label)); if ( list->length () > 0 ) { - for (unsigned int i = 0; i < list->length (); ++i) { CORBA::String_var s = CORBA::string_dup (list[i]); @@ -841,7 +834,6 @@ NS_group_svc::member_show (const ACE_TCHAR* group_name, } catch (const PortableGroup::ObjectGroupNotFound&) { - if (TAO_debug_level > 2) { ORBSVCS_ERROR ((LM_ERROR, diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h index 31a12fe6b78..ca66d6f9fd6 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h @@ -48,7 +48,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL */ class TAO_Naming_Serv_Export TAO_Bindings_Map { - public: /// Destructor. virtual ~TAO_Bindings_Map (void); diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp index 11858f0ece8..2d0f3187ff1 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp @@ -166,7 +166,6 @@ TAO_Naming_Context::to_string (const CosNaming::Name &n) // Stringify the name for (i=0; i < n.length (); ++i) { - // Stringify Id // const char *id = n[i].id.in (); diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp index 31cf92cecab..38c54893402 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp @@ -79,7 +79,6 @@ TAO_Naming_Loader::create_object (CORBA::ORB_ptr orb, int argc, ACE_TCHAR *argv[]) { - if (this->naming_server_ == 0) { ORBSVCS_ERROR ((LM_ERROR, diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp index d1448c979aa..c7fda38a709 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp @@ -572,7 +572,6 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, // Initialize Persistent Naming Service. // { - // Create Naming Context Implementation Factory to be used for the creation of // naming contexts by the TAO_Persistent_Context_Index TAO_Persistent_Naming_Context_Factory *naming_context_factory = diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp index 896f31bc96f..91dea26ee15 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp @@ -144,7 +144,6 @@ TAO_Persistent_Context_Index::init (size_t context_size) // CASE 1:there are no Naming Contexts registered. We need to create // one. { - this->root_context_ = TAO_Persistent_Naming_Context::make_new_context (poa_.in (), TAO_ROOT_NAMING_CONTEXT, diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp index 771c2bed9c2..bbb96410dba 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp @@ -6,7 +6,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// Constructor. TAO_Persistent_Naming_Context_Factory::TAO_Persistent_Naming_Context_Factory () { - } /// Destructor. Does not deallocate the hash map: if an instance of diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp index 9b113af9710..abb5b1edd81 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp @@ -307,7 +307,6 @@ bool TAO_Storable_Naming_Context:: File_Open_Lock_and_Check::object_obsolete () { - // Query the underlying context if it is obsolete with respect // to the provided file last-changed time return (context_->is_obsolete (fl_->last_changed ())); diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp index f4f20070e81..b98b23b428c 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp @@ -40,7 +40,6 @@ TAO_Storable_Naming_Context_Activator::incarnate ( const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa) { - // Make sure complete initialization has been done ACE_ASSERT (persistence_factory_ != 0); diff --git a/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h b/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h index 92043029904..11b9c28a74e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h +++ b/TAO/orbsvcs/orbsvcs/Notify/AllocTracker.h @@ -11,7 +11,6 @@ //#define DEBUG_MEMORY_USE #if defined(_MSC_VER) && defined (_DEBUG) && defined (DEBUG_MEMORY_USE) namespace CRT{ - /// \brief dump heap allocation stats /// /// This works only on microsoft/windows compilers diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp index 31456ab5d13..f4fc3f72dee 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp @@ -16,7 +16,6 @@ TAO_Notify_CosEC_ProxyPushSupplier::~TAO_Notify_CosEC_ProxyPushSupplier () void TAO_Notify_CosEC_ProxyPushSupplier::release () { - delete this; //@@ inform factory } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp index 34098fab019..0d1ff9bd3a7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp @@ -4,7 +4,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_Notify { - Bit_Vector::Bit_Vector() : size_(0) , first_set_bit_(0) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h index 0f5218fee01..e23a1fd7713 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h @@ -29,7 +29,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_Notify { - /// \brief Simple bit vector. /// /// Written to support block allocation from persistent storage. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h index 5f200fb4200..0c07aa666a3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h @@ -40,7 +40,6 @@ class TAO_Notify_Serv_Export TAO_Notify_Consumer : public TAO_Notify_Peer , public ACE_Event_Handler // to support timer { - public: /// Status returned from dispatch attempts enum DispatchStatus { diff --git a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp index 3bec07b367b..94592d57ea7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp @@ -21,7 +21,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_Notify { - /////////////////// // Delivery_Request Delivery_Request::Delivery_Request (const Routing_Slip_Ptr & routing_slip, size_t request_id) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h index ec73cc7a992..aa677a67791 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h @@ -20,7 +20,6 @@ class TAO_Notify_ProxySupplier; namespace TAO_Notify { - // Forward declarations of TAO_Notify classes/pointers/collections declared // in this header class Delivery_Request; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp index 09478a46c01..1c86bd16611 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp @@ -17,7 +17,6 @@ template <class PROXY, class ACE_LOCK> TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::TAO_Notify_Event_Map_T (void) :proxy_count_ (0) { - } template <class PROXY, class ACE_LOCK> diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h index 8a9a026f93d..beb1e84ed5a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h @@ -32,7 +32,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <class PROXY, class ACE_LOCK> class TAO_Notify_Event_Map_T { - public: typedef TAO_Notify_Event_Map_Entry_T<PROXY> ENTRY; diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h index 9ab170a5295..e218316dff5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h @@ -36,7 +36,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Notify_Serv_Export TAO_Notify_FilterAdmin : public TAO_Notify::Topology_Object { - public: /// Constructor TAO_Notify_FilterAdmin (void); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp index 72564775ee2..f319745bcf6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp @@ -13,7 +13,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_Notify { - Persistent_Callback::~Persistent_Callback() { } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h index 3ac466ff73c..0f8454dc222 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h @@ -32,7 +32,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_Notify { - /// \brief An interface to allow callbacks on completion of persistent storage /// requests. class TAO_Notify_Serv_Export Persistent_Callback diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp index b22c6be82d5..2c0d25b1576 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp @@ -34,7 +34,6 @@ TAO_Notify_PropertyBase_T<TYPE>::TAO_Notify_PropertyBase_T ( value_ (rhs.value_), valid_ (rhs.valid_) { - } template <class TYPE> diff --git a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp index b1e3488ab5e..3e775ab64b3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp @@ -15,7 +15,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_Notify { - Random_File::Random_File() : block_size_(512) { diff --git a/TAO/orbsvcs/orbsvcs/Notify/Random_File.h b/TAO/orbsvcs/orbsvcs/Notify/Random_File.h index 7270b9264a0..0ffb9e321c2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Random_File.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Random_File.h @@ -31,7 +31,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_Notify { - /** * \brief A random file class. * diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h index 9fe228cb5a1..23a16a12306 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h @@ -36,7 +36,6 @@ class TAO_Notify_Method_Request_Queueable; namespace TAO_Notify { - class Routing_Slip_Persistence_Manager; // Forward declarations of TAO_Notify classes/pointers/collections diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp index 7d76533d46b..6ae29fe6bb9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp @@ -8,7 +8,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_Notify { - Routing_Slip_Persistence_Manager::Routing_Slip_Persistence_Manager( Standard_Event_Persistence_Factory* factory) : removed_(false) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp index a9834a5c602..877339272d2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp @@ -10,7 +10,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_Notify { - Standard_Event_Persistence::Standard_Event_Persistence () : filename_ (ACE_TEXT ("__PERSISTENT_EVENT__.DB")) , block_size_ (512) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h index 71e6af692ff..3a32f0c6411 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h @@ -32,7 +32,6 @@ namespace CORBA namespace TAO_Notify { - /// A forward declaration. class Topology_Object; diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h index de945ca731a..e7083c5dd3d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h @@ -24,7 +24,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_Notify { - /** * \brief Save Notification Service Topology to an XML file. */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp index 56258982147..ebc331319c6 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp @@ -69,7 +69,6 @@ namespace namespace TAO_PG { - Fragments_Cleanup_Strategy::~Fragments_Cleanup_Strategy () { } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h index d8bd18cf11c..aae684c4044 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h @@ -29,7 +29,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_PG { - /** * @class Fragments_Cleanup_Strategy * diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h index afea09a6227..08026413a2a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h @@ -23,7 +23,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - class TAO_PortableGroup_Export MIOP_Loader { public: diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp index 5364b87d4ea..4f46abd4cfc 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp @@ -504,7 +504,6 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location ( PortableGroup::FactoryInfo & info = infos[nInfo]; if (info.the_location == location) { - ORBSVCS_ERROR((LM_INFO, "%s: Unregister_factory_by_location: Removing: [%d] %s@%s\n", this->identity_.c_str(), diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp index 78225419532..5a38b231d4b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp @@ -26,7 +26,6 @@ TAO_PG_GenericFactory::TAO_PG_GenericFactory ( TAO_PG_GenericFactory::~TAO_PG_GenericFactory () { - TAO_PG_Factory_Map::iterator end = this->factory_map_.end (); for (TAO_PG_Factory_Map::iterator i = this->factory_map_.begin (); i != end; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h index ade780d23dc..1eaf3e2409c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h @@ -60,7 +60,6 @@ public: * @name TAO_LoadBalancer::GenericFactory methods */ //@{ - /** * Create an object of the specified type that adheres to the * restrictions defined by the provided Criteria. The out diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h index d3f449d878a..85da0670930 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h @@ -33,7 +33,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL */ class TAO_PortableGroup_Export TAO_PG_Location_Hash { - public: /// Creates a hash based on all of elements of the given Location CORBA::ULong operator() (const PortableGroup::Location &) const; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h index fea5fe206ce..6848d53a3e1 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h @@ -59,7 +59,6 @@ public: * interface. */ //@{ - /// Create a member and add it to the given object group. virtual PortableGroup::ObjectGroup_ptr create_member ( PortableGroup::ObjectGroup_ptr object_group, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h index 20d0fa6446d..5bc3b5acfce 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h @@ -55,7 +55,6 @@ namespace TAO */ class TAO_PortableGroup_Export PG_Object_Group { - protected: // Information about an object group member struct MemberInfo diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h index 621ef2a2d6b..c71ccf1fdad 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h @@ -28,7 +28,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - /** * @class TAO::PG_Object_Group_Manipulator * diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp index 9e357254945..bdd7d020f7a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp @@ -37,7 +37,6 @@ namespace namespace TAO { - class Object_Group_File_Guard : public TAO::Storable_File_Guard { public: diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h index 4b513028273..b6b7bc593b1 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h @@ -59,7 +59,6 @@ public: * interface. */ //@{ - /// Set the default properties to be used by all object groups. virtual void set_default_properties ( const PortableGroup::Properties & props); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h index b2cab12269d..2491568dc71 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h @@ -31,7 +31,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - class PG_Property_Set; typedef ACE_Refcounted_Auto_Ptr<PG_Property_Set, TAO_SYNCH_MUTEX> PG_Property_Set_var; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp index 4d365eb44e1..698b3ae661f 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp @@ -52,7 +52,6 @@ namespace TAO i != 0; i = i->cont ()) { - ACE_OS::memcpy (buf, i->rd_ptr (), i->length ()); buf += i->length (); } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h index d4bacec1300..20b45315b43 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h @@ -50,7 +50,6 @@ class TAO_PortableGroup_Export TAO_UIPMC_Connection_Handler : public TAO_UIPMC_SVC_HANDLER, public TAO_Connection_Handler { - public: TAO_UIPMC_Connection_Handler (ACE_Thread_Manager* t = 0); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h index b2481923238..7f2e48da9de 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h @@ -52,7 +52,6 @@ protected: * These are implementations of template methods declared by TAO_Transport. */ //@{ - virtual ACE_Event_Handler *event_handler_i (void); virtual TAO_Connection_Handler *connection_handler_i (void); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp index c0d9b19aa45..b6a253e0096 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp @@ -8,7 +8,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_PG { - UIPMC_Recv_Packet_Cleanup_Guard::UIPMC_Recv_Packet_Cleanup_Guard ( TAO_UIPMC_Mcast_Transport *transport ) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h index 8d29cc82746..2bf20d34d9d 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h @@ -26,7 +26,6 @@ class TAO_UIPMC_Mcast_Transport; namespace TAO_PG { - /** * @class UIPMC_Recv_Packet_Cleanup_Guard * diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h index 8d5624add13..93d8c76ca9e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h @@ -31,7 +31,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL */ class TAO_PortableGroup_Export TAO_UIPMC_Wait_Never : public TAO_Wait_Strategy { - public: /// Constructor. TAO_UIPMC_Wait_Never (TAO_Transport *transport); diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp index 38693b09cef..44597e3f600 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp @@ -490,7 +490,6 @@ TAO_PropertySet::define_property (const char *property_name, CORBA::Boolean TAO_PropertySet::is_type_allowed (CORBA::TypeCode_ptr type) { - // If the sequence is empty, no constraints. if (this->allowed_property_types_.length () == 0) return 1; diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h index 548efc4572d..8c9ce8859b5 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h @@ -29,7 +29,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - /** * @class IIOP_SSL_Connection_Handler * diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h index 996dc779302..baaa1dd427b 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h @@ -34,7 +34,6 @@ namespace TAO { namespace SSLIOP { - /** * @class Accept_Strategy * diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp index 56aab64b0a1..00d8d4610b6 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp @@ -518,7 +518,6 @@ TAO::SSLIOP::Connector::ssliop_connect ( } else { - bool make_new_connection = (found == TAO::Transport_Cache_Manager::CACHE_FOUND_NONE) || (found == TAO::Transport_Cache_Manager::CACHE_FOUND_BUSY @@ -526,7 +525,6 @@ TAO::SSLIOP::Connector::ssliop_connect ( if (make_new_connection) { - if (TAO_debug_level > 4) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - SSLIOP_Connector::ssliop_connect, ") diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp index 13a3d95679a..4d6ccfd6e50 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp @@ -718,7 +718,6 @@ TAO::SSLIOP::Protocol_Factory::init (int argc, ACE_TCHAR* argv[]) { if (ssl_ctx->private_key (private_key_path.in(), private_key_type) != 0) { - ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - Unable to set ") ACE_TEXT ("SSL private key ") diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h index 653b29e9786..502ba128b68 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h @@ -40,7 +40,6 @@ namespace TAO { namespace SSLIOP { - /** * @class Protocol_Factory * diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h index 92e01b78220..3c98dcb63ac 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h @@ -32,7 +32,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // { // namespace SSLIOP // { - /** * @class Profile * diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp index 0bb52ccb898..debf6832652 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp @@ -160,7 +160,6 @@ void ACE_Config_Scheduler::priority (RtecScheduler::handle_t handle, RtecScheduler::Preemption_Subpriority_t& p_subpriority, RtecScheduler::Preemption_Priority_t& p_priority) { - if (impl->priority (handle, priority, p_subpriority, p_priority) == -1) { ORBSVCS_ERROR ((LM_ERROR, @@ -184,7 +183,6 @@ void ACE_Config_Scheduler::add_dependency (RtecScheduler::handle_t handle, RtecScheduler::Dependency_Type_t dependency_type) { - RtecScheduler::RT_Info* rt_info = 0; switch (impl->lookup_rt_info (handle, rt_info)) { @@ -219,7 +217,6 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority, RtecScheduler::Config_Info_Set_out configs, RtecScheduler::Scheduling_Anomaly_Set_out anomalies) { - // Initialize the scheduler implementation. impl->init (minimum_priority, maximum_priority); @@ -424,7 +421,6 @@ void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Pri RtecScheduler::OS_Priority& priority, RtecScheduler::Dispatching_Type_t & d_type) { - if (impl->dispatch_configuration (p_priority, priority, d_type) == -1) { ORBSVCS_ERROR ((LM_ERROR, @@ -439,7 +435,6 @@ void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Pri RtecScheduler::Preemption_Priority_t ACE_Config_Scheduler::last_scheduled_priority () { - RtecScheduler::Preemption_Priority_t priority = impl->minimum_priority_queue (); if (priority < 0) diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp index ed94b74ec40..4a0521bc6f6 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp @@ -1408,7 +1408,6 @@ ACE_DynScheduler::relate_task_entries () ACE_DynScheduler::status_t ACE_DynScheduler::relate_task_entries_recurse (long &time, Task_Entry &entry) { - // may have entered at a non-root node previously, so this does // not necessarily indicate a cycle in the dependency graph if (entry.dfs_status () != Task_Entry::NOT_VISITED) @@ -1823,7 +1822,6 @@ ACE_DynScheduler::create_timeline () Dispatch_Entry *rescheduled_entry; while (reschedule_queue.is_empty () == 0) { - if (reschedule_queue.dequeue_head (rescheduled_entry) < 0) { status = ST_BAD_INTERNAL_POINTER; @@ -1939,7 +1937,6 @@ ACE_DynScheduler::output_dispatch_priorities (const char *filename) ACE_DynScheduler::status_t ACE_DynScheduler::output_dispatch_priorities (FILE *file) { - u_long dispatch_count = 0; u_long i = 0; for (i = 0; i < dispatch_entry_count_; ++i) diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp index c9e1b13d171..4f36228d52f 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp @@ -1158,7 +1158,6 @@ recompute_scheduling (CORBA::Long /* minimum_priority */, // If everything is already up to date, we're done. if (SCHED_ALL_STABLE == stability_flags_) { - // Must always provide a value for an out parameter ACE_NEW_THROW_EX (anomalies, RtecScheduler::Scheduling_Anomaly_Set (0), @@ -1172,7 +1171,6 @@ recompute_scheduling (CORBA::Long /* minimum_priority */, if ((this->stability_flags_ & SCHED_PROPAGATION_NOT_STABLE) || (this->stability_flags_ & SCHED_UTILIZATION_NOT_STABLE)) { - #if defined (SCHEDULER_LOGGING) ACE_Scheduler_Factory::log_scheduling_entries(entry_ptr_array_, this->rt_info_count_, diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp index 2d4d423f49e..a6d18f5246e 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp @@ -521,7 +521,6 @@ int ACE_Scheduler_Factory::dump_schedule void ACE_Scheduler_Factory::log_scheduling_entry(TAO_Reconfig_Scheduler_Entry * entry, FILE* file) { - if( entry == 0 ) { ACE_OS::fprintf (file, "Entry is NULL"); @@ -630,7 +629,6 @@ void ACE_Scheduler_Factory::log_tuple_subset(TUPLE_SET & tuple_subset, } else { - ACE_OS::fprintf (file, subset_tuple_format, (*tuple_ptr_ptr)->handle, diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h index 40d9a483ae0..18abc0ccae3 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h @@ -67,7 +67,6 @@ public: */ struct POD_RT_Info { - const char *entry_point; RtecScheduler::handle_t handle; RtecScheduler::Time worst_case_execution_time; diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h index 28692798286..d7e3016e365 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h @@ -30,7 +30,6 @@ namespace TAO { namespace Security { - /** * @class EstablishTrustPolicy * diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h index cafcc2f1856..554c5f83fd3 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h @@ -30,7 +30,6 @@ namespace TAO { namespace SL3 { - /** * @class CredentialsAcquirerFactory * diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h index 73dff6188f9..1024d153449 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h @@ -33,7 +33,6 @@ namespace TAO { namespace SL3 { - /** * @class olicyFactory * @@ -55,7 +54,6 @@ namespace TAO * sub-classes. */ //@{ - /// Construct a Test::Policy object as a test. virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any & value); diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h index 46b7cd4404f..45a40e92e4f 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h @@ -36,7 +36,6 @@ namespace TAO { namespace Security { - /** * @class PolicyFactory * diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp index aeb74e75716..85761774632 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp @@ -109,7 +109,6 @@ TAO_TIO::spans (CosTime::UTO_ptr uto, } else if (up2 < lb1) { - ACE_NEW_RETURN (tio, TAO_TIO (0, 0), CosTime::OTNoOverlap); diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp index 2dfdaaf37df..b5757753635 100644 --- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp @@ -18,7 +18,6 @@ Timer_Helper::Timer_Helper () Timer_Helper::Timer_Helper (TAO_Time_Service_Clerk *clerk) : clerk_ (clerk) { - } Timer_Helper::~Timer_Helper () diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp index 189fccdf3a8..d59f6a4d0d2 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp @@ -873,8 +873,6 @@ YY_DECL } { - - while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { yy_cp = (yy_c_buf_p); @@ -1560,7 +1558,6 @@ static int yy_get_next_buffer () */ void yyrestart (FILE * input_file ) { - if ( ! YY_CURRENT_BUFFER ){ yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = @@ -1578,7 +1575,6 @@ static int yy_get_next_buffer () */ void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ) { - /* TODO. We should be able to replace this entire function body * with * yypop_buffer_state(); @@ -1653,7 +1649,6 @@ static void yy_load_buffer_state () */ void yy_delete_buffer (YY_BUFFER_STATE b ) { - if ( ! b ) return; @@ -1786,7 +1781,6 @@ static void yyensure_buffer_stack () yy_size_t num_to_alloc; if (!(yy_buffer_stack)) { - /* First allocation is just for 2 elements, since we don't know if this * scanner will even need a stack. We use 2 instead of 1 to avoid an * immediate realloc on the next call. @@ -1807,7 +1801,6 @@ static void yyensure_buffer_stack () } if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ - /* Increase the buffer to prepare for a possible push. */ yy_size_t grow_size = 8 /* arbitrary grow size */; @@ -1875,7 +1868,6 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) */ YY_BUFFER_STATE yy_scan_string (const char * yystr ) { - return yy_scan_bytes( yystr, (int) strlen(yystr) ); } @@ -1961,8 +1953,6 @@ static void yynoreturn yy_fatal_error (const char* msg ) */ int yyget_lineno () { - - return yylineno; } @@ -2013,8 +2003,6 @@ char *yyget_text () */ void yyset_lineno (int _line_number ) { - - yylineno = _line_number; } @@ -2090,7 +2078,6 @@ static int yy_init_globals () /* yylex_destroy is for both reentrant and non-reentrant scanners. */ int yylex_destroy () { - /* Pop the buffer stack, destroying each element. */ while(YY_CURRENT_BUFFER){ yy_delete_buffer( YY_CURRENT_BUFFER ); @@ -2121,7 +2108,6 @@ int yylex_destroy () #ifndef yytext_ptr static void yy_flex_strncpy (char* s1, const char * s2, int n ) { - int i; for ( i = 0; i < n; ++i ) s1[i] = s2[i]; @@ -2149,7 +2135,6 @@ void *yyalloc (yy_size_t size ) void *yyrealloc (void * ptr, yy_size_t size ) { - /* The cast to (char *) in the following accommodates both * implementations that use char* generic pointers, and those * that use void* generic pointers. It works with the latter diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp index 676c18a8c9f..7215d070a95 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp @@ -304,7 +304,6 @@ static const YYINT yyctable[] = { -1, #define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? YYUNDFTOKEN : (a)) #if YYDEBUG static const char *const yyname[] = { - "$end",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -769,7 +768,6 @@ yyloop: } else { - /* Unresolved conflict - start/continue trial parse */ YYParseState *save; #if YYDEBUG diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp index e79269ae7b3..6f581a9456c 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp @@ -62,7 +62,6 @@ TAO_Query_Only_Offer_Iterator::next_n (CORBA::ULong n, // populate the sequence. for (CORBA::ULong i = 0; i < offers_in_sequence; i++) { - CosTrading::Offer *source = 0; this->offers_.dequeue_head (source); this->pfilter_.filter_offer (source, offers[i]); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp index 28c928f070a..2dbad344b80 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp @@ -29,7 +29,6 @@ visit_property (TAO_Property_Constraint* literal) if (this->props_.find (prop_name, prop_index) == 0) { - CORBA::Any *value = 0; // Retrieve the value of the property from the Property_Evaluator try diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp index 2c613786e29..b8fcb9539dd 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp @@ -10,7 +10,6 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>:: TAO_Trader (TAO_Trader_Base::Trader_Components components) { - // @@ Seth, we need a way to propagate the exception out. This will // not work on platforms using environment variable. for (int i = LOOKUP_IF; i <= LINK_IF; i++) diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp index 1a3227e308a..a78f31a531c 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp @@ -67,7 +67,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp index 3a219db610d..22454390add 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp @@ -212,7 +212,6 @@ join_object_group (CORBA::ORB_ptr orb, int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h index 1834abd43b5..484d20cc47c 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h @@ -41,7 +41,6 @@ public: * Methods required by the CosLoadBalancing::LoadMonitor interface. */ //@{ - /// Return the location at which the LoadMonitor resides. /** * The returned "Location" is a sequence of length 1. diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp index 09d65fc4c2d..5e27f49fbfa 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp @@ -12,7 +12,6 @@ Test::Timestamp Roundtrip::test_method (Test::Timestamp send_time, Test::number cl_number) { - if (cl_number % 2 == 0) { for (int i = 1; i < 10000; i++) diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h index 95fadc92423..7e7bdc750a6 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h @@ -25,7 +25,6 @@ */ class Signal_Handler : public ACE_Event_Handler { - public: Signal_Handler (void); @@ -80,7 +79,6 @@ private: */ class Distributer_Sender_Callback : public TAO_AV_Callback { - public: //// Called when the sender has finished reading the file and wants //// to close down the connection. diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp index aa0dcd94807..b09446f5468 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp @@ -145,7 +145,6 @@ Receiver::Receiver (void) Receiver::~Receiver (void) { - } ACE_CString diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h index 2244aedb8a0..87407f68ad3 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h @@ -25,7 +25,6 @@ */ class Signal_Handler : public ACE_Event_Handler { - public: Signal_Handler (void); diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp index b7b47d1a487..4b9f16c1999 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp @@ -296,7 +296,6 @@ Sender::pace_data (void) /// Continue to send data till the file is read to the end. while (1) { - if (g_shutdown == 1) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h index 9e3aa82ec9f..624cf488220 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h @@ -25,7 +25,6 @@ */ class Signal_Handler : public ACE_Event_Handler { - public: Signal_Handler (void); @@ -44,7 +43,6 @@ public: */ class Sender_Callback : public TAO_AV_Callback { - public: /** * Called when the sender has finished reading the file and wants diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp index 505e18eb11c..5038555626a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp @@ -216,7 +216,6 @@ Client::init (int argc, ACE_TCHAR *argv[]) CORBA::String_var ior; try { - PortableServer::POAManager_var mgr = TAO_AV_CORE::instance ()->poa ()->the_POAManager (); diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp index 9911cbb775a..e6e8cb44664 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp @@ -303,7 +303,6 @@ Ping_Send_Callback::get_timeout (ACE_Time_Value *&tv, int Ping_Send_Callback::handle_timeout (void *) { - this->count_++; ACE_DEBUG ((LM_DEBUG, "Ping timeout frame %d\n", this->count_)); diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h index 8cf9a9605bd..e7e42a437dd 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h @@ -45,7 +45,6 @@ private: // = AVStreams calls this class during connection setup. class Receiver_StreamEndPoint : public TAO_Server_StreamEndPoint { - public: /// Create a receiver application callback. int get_callback (const char *flowname, diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp index 8f559e80797..b72278736b9 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp @@ -239,8 +239,6 @@ Sender::init (int argc, int Sender::pace_data (void) { - - // The time between two consecutive frames. inter_frame_time.set (1 / (double) this->frame_rate_); diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp index ecfa3b10ac3..37a8dfefa2f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp @@ -15,7 +15,6 @@ FTP_Client_Callback::handle_end_stream (void) FTP_Client_StreamEndPoint::FTP_Client_StreamEndPoint (void) : callback_ (0) { - } void @@ -182,7 +181,6 @@ Client::Client (void) int Client::bind_to_server (const char *name) { - try { // Initialize the naming services @@ -212,7 +210,6 @@ Client::bind_to_server (const char *name) int Client::init (int argc, ACE_TCHAR *argv[]) { - PortableServer::POAManager_var mgr = TAO_AV_CORE::instance ()->poa ()->the_POAManager (); diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp index 707c54a2bc7..d5efa17a616 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp @@ -66,7 +66,6 @@ Server::init (int argc, { try { - PortableServer::POAManager_var mgr = TAO_AV_CORE::instance ()->poa ()->the_POAManager (); @@ -121,7 +120,6 @@ Server::run (void) CORBA::ORB_ptr orb = TAO_AV_CORE::instance ()->orb(); try { - while( !done ) { CORBA::Boolean wp = orb->work_pending (); diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp index 4767b8cb342..e05923885f4 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp @@ -280,7 +280,6 @@ Client::init (int argc, int Client::pace_data (void) { - // Rate at which frames of data need to be sent. this->frame_rate_ = CLIENT::instance ()->frame_rate (); @@ -303,7 +302,6 @@ Client::pace_data (void) try { - // Continue to send data till the file is read to the end. while (1) { diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h index 9c39b387c14..b3075bfe36a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h @@ -50,7 +50,6 @@ public: */ class FTP_Client_StreamEndPoint : public TAO_Client_StreamEndPoint { - public: /// Constructor FTP_Client_StreamEndPoint (void); diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h index b1960af2242..c0d90d7c4a5 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h @@ -26,7 +26,6 @@ */ class FTP_Server_Callback : public TAO_AV_Callback { - public: // Method that is called when there is data to be received from the ftp client. int receive_frame (ACE_Message_Block *frame, diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp index 6e993b1c39e..090fbf54245 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp @@ -88,7 +88,6 @@ TimeStamp_Protocol_Object::handle_input (void) // } // else // { - // ACE_DEBUG ((LM_DEBUG, // "(%N|%l) Frame Size %d\n", // n)); diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp index 0c9d41de402..c2eabbc1e9f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp @@ -342,8 +342,6 @@ Sender::init (int argc, int Sender::pace_data (void) { - - // The time between two consecutive frames. inter_frame_time.set (1.0 / this->frame_rate_); diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp index 37148f5d58f..a8a0be20826 100644 --- a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp +++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp @@ -19,7 +19,6 @@ public: TimeModule::TimeOfDay Time_impl::get_gmt (void) { - time_t time_now = ACE_OS::time(0); struct tm *time_p = ACE_OS::gmtime(&time_now); @@ -41,7 +40,6 @@ Time_impl::Shutdown (void) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try { // Initialize orb diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp index e5be4e90c2f..77444fc3533 100644 --- a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp @@ -52,7 +52,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { CORBA::ORB_var orb = diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp index ee0007dd5bc..04240e20fac 100644 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp @@ -79,7 +79,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - Manager manager; try diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp index 0795ed687ce..bbf5b376e30 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp @@ -38,7 +38,6 @@ Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr // ) { - } void diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp index b029a16325a..8db5270df68 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp @@ -47,8 +47,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - - try { Server_ORBInitializer *temp_initializer = 0; diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp index 03d34cf3108..34d392ea77e 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp @@ -9,7 +9,6 @@ void Server_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) { - } void diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp index b23cba1c322..1d41831d853 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp @@ -9,7 +9,6 @@ void Server_ORBInitializer2::pre_init ( PortableInterceptor::ORBInitInfo_ptr) { - } void diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp index df9db17965f..17f53a73de3 100644 --- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp +++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.cpp @@ -9,7 +9,6 @@ void Server_ORBInitializer2::pre_init ( PortableInterceptor::ORBInitInfo_ptr) { - } void diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp index 444ace92c12..6a3ba02a1d6 100644 --- a/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp +++ b/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp @@ -61,7 +61,6 @@ TestTask::parse_args (int argc, ACE_TCHAR **argv) int TestTask::svc() { - try { // Start the Naming Service tasks namingServiceA_.activate(); diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp index a0dc4495e41..57073f3c85a 100644 --- a/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp @@ -54,7 +54,6 @@ TestTask::parse_args (int argc, ACE_TCHAR **argv) int TestTask::svc() { - try { // Get reference to Root POA CORBA::Object_var obj = orb_->resolve_initial_references("RootPOA"); diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp index f9ea2ede22a..63623414149 100644 --- a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp +++ b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp @@ -10,7 +10,6 @@ Server_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr ) { - } void diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp index 4b49e5f9559..164895340fb 100644 --- a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp +++ b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp @@ -10,7 +10,6 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { - CORBA::Object_var naming_obj = orb_->resolve_initial_references ("NameService"); @@ -85,7 +84,6 @@ CORBA::Boolean Messenger_i::send_message ( const char * subject, char *& message) { - ACE_OS::printf("Message from: %s\nSubject: %s\nMessage: %s\n", user_name, subject, message); //cout << "Message from: " << user_name << endl; diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp index 03dbefa4624..75ebbf9449a 100644 --- a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp @@ -9,7 +9,6 @@ StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb) void StructuredEventSupplier_i::disconnect_structured_push_supplier () { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp index 444ace92c12..6a3ba02a1d6 100644 --- a/TAO/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp +++ b/TAO/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp @@ -61,7 +61,6 @@ TestTask::parse_args (int argc, ACE_TCHAR **argv) int TestTask::svc() { - try { // Start the Naming Service tasks namingServiceA_.activate(); diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/server.cpp index a0dc4495e41..57073f3c85a 100644 --- a/TAO/orbsvcs/tests/Bug_3673_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_3673_Regression/server.cpp @@ -54,7 +54,6 @@ TestTask::parse_args (int argc, ACE_TCHAR **argv) int TestTask::svc() { - try { // Get reference to Root POA CORBA::Object_var obj = orb_->resolve_initial_references("RootPOA"); diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp index 696c94c1fd1..9ca80305f9e 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp @@ -737,7 +737,6 @@ ace_cc_yyreduce: switch (ace_cc_yyn) { - case 2: { cmdlist->add(new CC_Sleep_Cmd(0)); /* dummy to check exeption in the last command */ diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp index 464cd574c18..876f00d0c1b 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp @@ -26,7 +26,6 @@ static const int data_items = 60000; void * run_orb_within_thread (void *) { - while (! terminate_threads) { try diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp index a21e9be6afa..f98e7edcaee 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp @@ -86,7 +86,6 @@ ECM_Driver::run (int argc, ACE_TCHAR* argv[]) j < this->local_federations_[i]->supplier_types (); ++j) { - ACE_DEBUG ((LM_DEBUG, " name = <%s>\n" " ipadd = <%x>\n", diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp index 39213e5582f..731a92e2cca 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp @@ -904,7 +904,6 @@ void Test_ECG::shutdown_supplier (void* /* supplier_cookie */, RtecEventComm::PushConsumer_ptr consumer) { - this->running_suppliers_--; if (this->running_suppliers_ != 0) return; diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp index a1877edb197..f18548a703e 100644 --- a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp @@ -204,7 +204,6 @@ EC_Supplier_Task::EC_Supplier_Task (EC_Supplier* supplier, int EC_Supplier_Task::svc (void) { - // Initialize a time value to pace the test ACE_Time_Value tv (0, this->burst_pause_); diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp index f9b3a8f6f46..67ad778a036 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp @@ -149,7 +149,6 @@ void FT_TestReplica_i::suicide(const char * note) //static const char * FT_TestReplica_i::repository_id() { - const char * id = FT_TEST::_tc_TestReplica->id(); diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp index e6d482c0814..be9bed2e5fd 100644 --- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp +++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp @@ -262,7 +262,6 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_group ( ::PortableGroup::GenericFactory::FactoryCreationId_var creation_id; if (this->have_replication_manager_) { - ////////////////////////////////////////////////////// // note infrastructure controlled because we want the // ReplicationManager to manage the object after it's created. diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp index d01246bfada..41fa104ce9d 100644 --- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp @@ -303,7 +303,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } switch(test_type) { - case TT_FAILOVER: if( RC_SUCCESS != do_failover_name_test ( @@ -342,7 +341,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) case TT_PERSISTENCE: switch(test_phase){ - case TT_CREATE: if (RC_SUCCESS != do_persistence_name_test ( orb.in (), @@ -493,7 +491,6 @@ do_failover_name_test ( int i; try { - CORBA::ORB_var orb = CORBA::ORB::_duplicate(theOrb); if (CORBA::is_nil (orb.in ())) @@ -581,7 +578,6 @@ do_failover_name_test ( // Try again... try { - CORBA::Object_var obj1_on_replica = root_context_1->resolve (level1); @@ -1018,7 +1014,6 @@ do_failover_objectgroup_test ( FT_Naming::NamingManager_var naming_manager_1; try { - CORBA::ORB_var orb = CORBA::ORB::_duplicate(theOrb); if (CORBA::is_nil (orb.in ())) { @@ -1123,7 +1118,6 @@ do_persistence_name_test ( int i; try { - CORBA::ORB_var orb = CORBA::ORB::_duplicate(theOrb); if (CORBA::is_nil (orb.in () )) @@ -1280,7 +1274,6 @@ do_persistence_name_test ( } try { - // Check if the new context is available in the repository CORBA::Object_var obj1_on_replica = root_context_1->resolve (wide); @@ -1346,7 +1339,6 @@ do_persistence_objectgroup_test ( FT_Naming::NamingManager_var naming_manager_1; try { - CORBA::ORB_var orb = CORBA::ORB::_duplicate(theOrb); if (CORBA::is_nil (orb.in ())) @@ -1427,14 +1419,12 @@ do_persistence_objectgroup_test ( { const PortableGroup::Location & loc = locations[i]; if (loc.length() > 0) { - ACE_DEBUG (( LM_DEBUG, ACE_TEXT ("INFO: validating group member %C\n"), loc[0].id.in())); try { - PortableGroup::Location location_name (1); location_name.length (1); location_name[0].id = CORBA::string_dup(loc[0].id.in()); @@ -1463,7 +1453,6 @@ do_persistence_objectgroup_test ( the_string.in ())); if ( ACE_OS::strcmp (the_string.in (), loc[0].id.in()) != 0 ) { - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ERROR: object group member at %C reports %C\n\n"), loc[0].id.in(), @@ -1665,7 +1654,6 @@ do_equivalence_name_test ( int i; try { - CORBA::ORB_var orb = CORBA::ORB::_duplicate(theOrb); if (CORBA::is_nil (orb.in ())) @@ -1883,7 +1871,6 @@ do_equivalence_name_test ( // Try again to see if it just was a race condition try { - CORBA::Object_var obj1_on_replica = root_context_2->resolve (wide); @@ -2245,7 +2232,6 @@ do_equivalence_objectgroup_test ( FT_Naming::NamingManager_var naming_manager_2; try { - CORBA::ORB_var orb = CORBA::ORB::_duplicate(theOrb); if (CORBA::is_nil (orb.in ())) { diff --git a/TAO/orbsvcs/tests/FT_Naming/Federation/server.cpp b/TAO/orbsvcs/tests/FT_Naming/Federation/server.cpp index eb1707d6755..145b8648b46 100644 --- a/TAO/orbsvcs/tests/FT_Naming/Federation/server.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/Federation/server.cpp @@ -54,7 +54,6 @@ TestTask::parse_args (int argc, ACE_TCHAR **argv) int TestTask::svc() { - try { // Get reference to Root POA CORBA::Object_var obj = orb_->resolve_initial_references ("RootPOA"); diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp index 370be8a05a1..717df80dbae 100644 --- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp @@ -47,7 +47,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) TAO_Naming_Client name_svc; try { - ACE_Time_Value timeout (10); // Wait up to 10 seconds for the naming service if (name_svc.init (orb.in (), &timeout) != 0) ACE_ERROR_RETURN ((LM_DEBUG, @@ -74,7 +73,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) for (int i = 0; i < 15; i++) { try { - // Each time we invoke resolve, we get a different member tmp = name_svc->resolve (name); @@ -133,7 +131,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } try { - basic->shutdown (); ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp b/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp index 522b3cf5cc9..56e05df6664 100644 --- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp @@ -105,7 +105,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) TAO_Naming_Client name_svc; try { - ACE_Time_Value timeout (10); // Wait up to 10 seconds for the naming service if (name_svc.init (orb.in (), &timeout) != 0) ACE_ERROR_RETURN ((LM_DEBUG, @@ -144,7 +143,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } try { - // Each time we invoke resolve, we get a different member tmp = name_svc->resolve (name); @@ -205,7 +203,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) hammer.wait (); try { - basic->shutdown (); ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp index 90958d5b065..a042e02b820 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp @@ -57,7 +57,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - Manager manager; try diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp index ca44b8bc7eb..4e66d38fddf 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp @@ -32,8 +32,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - - try { CORBA::ORB_var orb = diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp index 643b5112299..8803f71bfa9 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp @@ -17,7 +17,6 @@ int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - ACE_DEBUG ((LM_DEBUG, "---------------------------------------------\n")); ACE_DEBUG ((LM_DEBUG, "Running the IOGRManipulation Tests.\n")); diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp index 0d49d05f636..0bcf5bc7894 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp @@ -38,7 +38,6 @@ PushSupplier_impl::~PushSupplier_impl() int PushSupplier_impl::init(RtecEventChannelAdmin::EventChannel_ptr channel) { - ACE_DEBUG((LM_DEBUG, "for_suppliers\n")); RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = channel->for_suppliers(); @@ -80,7 +79,6 @@ int PushSupplier_impl::init(RtecEventChannelAdmin::EventChannel_ptr channel) void PushSupplier_impl::disconnect_push_supplier ( ) { - reactor_task_.reactor_->end_reactor_event_loop(); PortableServer::Current_var current = diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp index e2984787fe3..c824b918e68 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp @@ -109,7 +109,6 @@ public: void foo_excep (::Messaging::ExceptionHolder * excep_holder) { - ACE_DEBUG ((LM_DEBUG, "Callback method <foo_excep> called:\n")); try diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp index 9e6bfdb4d0f..1f516996caa 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp @@ -85,7 +85,6 @@ public: void foo_excep (::Messaging::ExceptionHolder * excep_holder) { - ACE_DEBUG ((LM_DEBUG, "Callback method <foo_excep> called:\n" "Testing proper exception handling ...\n")); diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp index d3a610e2e6c..420120eb148 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp @@ -36,7 +36,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); diff --git a/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.cpp index 197bb9e42d3..f6d64472876 100644 --- a/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.cpp @@ -36,7 +36,6 @@ Server_i::Server_i (void) Server_i::~Server_i() { - this->root_poa_->destroy(1, 1); this->orb_->destroy(); } diff --git a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp index b031edd1531..3d997aea380 100644 --- a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp @@ -101,7 +101,6 @@ public: virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) { - if (CORBA::is_nil (this->pic_.in())) { ACE_GUARD (TAO_SYNCH_MUTEX, g, this->lock_); diff --git a/TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp b/TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp index 4b9fb0827fd..7269ac7ff9a 100644 --- a/TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp @@ -70,7 +70,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } try { - if (parse_args (argc, argv) != 0) return 1; diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp index 7f093b9d1ef..66f9c2f6b73 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp @@ -9,7 +9,6 @@ using namespace CORBA; int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try { - ORB_var orb = ORB_init(argc, argv); Object_var obj = orb->resolve_initial_references("Test"); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp index a3c15776a31..1be39a461dd 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp @@ -39,7 +39,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try { - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp index 169226cdfe2..fb5f5bee9f9 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp @@ -69,7 +69,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } else { - CORBA::String_var the_string = goodday->get_string (); diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp index 4cb54504f8b..ccf070a7291 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp @@ -19,7 +19,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) try { - NContextExt_Client_i client; if (client.init (argc, argv) != 0) diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp index 0afb62d3c28..adc5d7eab45 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp +++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp @@ -36,7 +36,6 @@ NContextExt_Client_i::~NContextExt_Client_i (void) int NContextExt_Client_i::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("dvs")); int c; @@ -71,7 +70,6 @@ NContextExt_Client_i::parse_args (void) char * NContextExt_Client_i::get_name () { - // USe time (NULL) to produce the seed: ACE_OS::srand (static_cast<u_int> (ACE_OS::time (0))); @@ -82,7 +80,6 @@ NContextExt_Client_i::get_name () for (int i = 0; i < len; ++i) { - int rand_value = ACE_OS::rand () % 10; switch (rand_value) @@ -143,7 +140,6 @@ NContextExt_Client_i::get_name () int NContextExt_Client_i::run (void) { - try { CosNaming::Name name; @@ -290,7 +286,6 @@ NContextExt_Client_i::print_values (CosNaming::Name name, CORBA::String_var obj_name, CORBA::String_var url_string) { - ACE_DEBUG((LM_DEBUG, ACE_TEXT ("The first component id is %C,") ACE_TEXT ("The first component kind is %C,") ACE_TEXT ("The second component id is %C,") diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h index ebf8f240a05..02f2196c4a5 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h +++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h @@ -26,7 +26,6 @@ */ class NContextExt_Client_i { - public: // = COnstructor and destructor. NContextExt_Client_i (void); diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.h index 6808fa640d1..382eed19e12 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory_Struct.h @@ -19,7 +19,6 @@ struct Factory_Node { - /// FactoryCreationId assigned to the member. PortableGroup::GenericFactory::FactoryCreationId_var factory_creation_id; }; diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.h index 6808fa640d1..382eed19e12 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory_Struct.h @@ -19,7 +19,6 @@ struct Factory_Node { - /// FactoryCreationId assigned to the member. PortableGroup::GenericFactory::FactoryCreationId_var factory_creation_id; }; diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp index 370cffe3c23..466a680e1df 100644 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp @@ -60,7 +60,6 @@ BasicLog_Test::init (int argc, ACE_TCHAR *argv[]) int BasicLog_Test::init_factory (void) { - // Assumpting INS for finding LogServie //CORBA::Object_var logging_obj = orb_->resolve_initial_references ("BasicLogFactory", @@ -113,7 +112,6 @@ BasicLog_Test::init_factory (void) int BasicLog_Test::test_CreateLog (CORBA::ULongLong maxSize) { - try { DsLogAdmin::LogId id; @@ -319,7 +317,6 @@ int BasicLog_Test::write_records (CORBA::ULongLong numberOfRecords) int BasicLog_Test::test_adminState() { - basicLog_->set_administrative_state(DsLogAdmin::locked); try { @@ -358,7 +355,6 @@ BasicLog_Test::test_adminState() int BasicLog_Test::test_logSize (void) { - try { basicLog_->set_max_size (1); @@ -401,7 +397,6 @@ BasicLog_Test::test_logSize (void) int BasicLog_Test::test_logCompaction(CORBA::ULong lifeExpectancy) { - CORBA::ULongLong old_n_records = basicLog_->get_n_records (); if (old_n_records <= 0) { @@ -555,7 +550,6 @@ BasicLog_Test::destroy_log() int BasicLog_Test::test_log_destroy (void) { - ACE_DEBUG ((LM_ERROR, "Testing destroy log\n")); this->basicLog_->destroy (); @@ -648,7 +642,6 @@ return 0; int BasicLog_Test::test_capacity_alarm_threshold (void) { - //basicLog_->set_log_full_action(DsLogAdmin::halt); DsLogAdmin::CapacityAlarmThresholdList list; diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h index 3914607b1bf..576b48e80ba 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h +++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h @@ -47,7 +47,6 @@ protected: */ class AdminProperties_Task : public ACE_Task_Base { - public: /// Constructor. AdminProperties_Task (void); @@ -83,7 +82,6 @@ private: */ class AdminProperties : public Notify_Test_Client { - friend class AdminProperties_StructuredPushConsumer; friend class AdminProperties_Task; diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp index 35d06b5d5f9..f772230f01b 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp @@ -62,7 +62,6 @@ MultiTypes::MultiTypes (void) seq_event_count_ (0), disconnect_on_last_event_ (0) { - } MultiTypes::~MultiTypes () diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp index 27ef659b602..9ae43cd8654 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp @@ -50,7 +50,6 @@ get_event_channel(CORBA::ORB_ptr orb) if( channelIdSeq->length() == 0 ) { - try { ec = factory->create_channel( init_qos, init_admin, id); diff --git a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp index e48a65eba34..6a7051d8fe1 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp @@ -85,7 +85,6 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[]) while ((c = get_opts ()) != -1) switch (c) { - case 'o': ior_output_file = get_opts.optarg; break; diff --git a/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp b/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp index 827a2a95461..2224260849d 100644 --- a/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp +++ b/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp @@ -279,7 +279,6 @@ MonitorTestInterface_i::stat_dump (const char * statName) } catch (const CORBA::Exception& ex) { - ex._tao_print_exception (statName); } } diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp index e67251706c4..b6583729658 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp @@ -1678,7 +1678,6 @@ Consumer_Main::init_any_proxy_supplier (void) int Consumer_Main::fini (void) { - this->reconnection_callback_.fini (); if (this->disconnect_on_exit_) diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp index ea591edbf60..c94aaef6509 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp @@ -366,7 +366,6 @@ int Supplier_Main::init (int argc, ACE_TCHAR *argv[]) } case MODE_ANY: { - init_any_proxy_consumer (); break; } diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp index c80efafa937..d687432802d 100644 --- a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp +++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp @@ -296,7 +296,6 @@ int ACE_TMAIN (int ac, ACE_TCHAR *av[]) if (pass2) { - // Create a new ecf, which should load itself from loadtest.xml CosNotifyChannelAdmin::EventChannelFactory_var cosecf = TAO_Notify_EventChannelFactory_i::create(persistentPOA.in ()); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h index 7579b33c5c1..1fcdeaa6a64 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h @@ -66,7 +66,6 @@ private: */ class RedGreen_Test { - public: // = Initialization RedGreen_Test (void); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp index 5fbc76eb76d..53fa04b748d 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp @@ -440,7 +440,6 @@ else void Notify_Throughput::run_test (void) { - ACE_DEBUG ((LM_DEBUG, "collocated_ec_ %d ," "burst_count_ %d, " "burst_pause_ %d, " diff --git a/TAO/orbsvcs/tests/Property/client.cpp b/TAO/orbsvcs/tests/Property/client.cpp index a4431f432f1..9641e4f164f 100644 --- a/TAO/orbsvcs/tests/Property/client.cpp +++ b/TAO/orbsvcs/tests/Property/client.cpp @@ -650,7 +650,6 @@ Client::test_get_property_value (void) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { Client client; diff --git a/TAO/orbsvcs/tests/Property/server.cpp b/TAO/orbsvcs/tests/Property/server.cpp index 02fb01d1f4e..7b73e2d140b 100644 --- a/TAO/orbsvcs/tests/Property/server.cpp +++ b/TAO/orbsvcs/tests/Property/server.cpp @@ -18,7 +18,6 @@ int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp index cc3033c6037..f79a12c7ecf 100644 --- a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp +++ b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp @@ -44,7 +44,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { ACE_CString env ("SSL_CERT_FILE="); @@ -117,7 +116,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (call_shutdown) { - // Let other clients to finish their task if any ACE_OS::sleep (wait_time); diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp index 2bc01f9b689..e8c9238936c 100644 --- a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp +++ b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp @@ -35,7 +35,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { ACE_CString env ("SSL_CERT_FILE="); diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp index a44b4fe03df..6f2713ef5f3 100644 --- a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp +++ b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp @@ -7,7 +7,6 @@ void Simple_Server_i::send_line (const char *) { - /* static unsigned long count = 0; diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp index 58430f8754a..d3840afb384 100644 --- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp +++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp @@ -35,7 +35,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { CORBA::ORB_var orb = diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp index fcc3766bfbf..d44c009f95d 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp @@ -34,7 +34,6 @@ Client_Worker::validate_connection (void) int Client_Worker::svc (void) { - try { // Validate connections befire doing any actual work.. diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h index cb0856a959a..011ef349b52 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h @@ -30,7 +30,6 @@ */ class Client_Worker : public ACE_Task_Base { - public: /// ctor Client_Worker (Simple_Server_ptr server, int niterations); diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp index d274c19202e..07bf6504936 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp @@ -16,7 +16,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) while ((c = get_opts ()) != -1) switch (c) { - case 'k': ior = get_opts.opt_arg (); break; diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp index 3f01c998b92..8dc48e6da45 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp @@ -36,7 +36,6 @@ Client_Worker::validate_connection (void) int Client_Worker::svc (void) { - try { // Validate connections befire doing any actual work.. diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h index af5644efc9e..58dae974023 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h @@ -30,7 +30,6 @@ */ class Client_Worker : public ACE_Task_Base { - public: /// ctor Client_Worker (Simple_Server_ptr server, diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp index a20b3a72666..553c898e047 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp @@ -18,7 +18,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) while ((c = get_opts ()) != -1) switch (c) { - case 'k': ior = get_opts.opt_arg (); break; diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h index 8af167272d3..46cdc01bc6c 100644 --- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h +++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h @@ -30,7 +30,6 @@ */ class Naming_Test { - public: /// Execute the test code. <root_context> is the context to assume /// as the root for all tests operations. diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.h b/TAO/orbsvcs/tests/Simple_Naming/client.h index dc8cba68341..e3c0c431e8c 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/client.h +++ b/TAO/orbsvcs/tests/Simple_Naming/client.h @@ -30,7 +30,6 @@ */ class Naming_Test { - public: /// Execute the test code. <root_context> is the context to assume /// as the root for all tests operations. diff --git a/TAO/orbsvcs/tests/Time/Client_i.cpp b/TAO/orbsvcs/tests/Time/Client_i.cpp index 2f26da216b9..da30b07966e 100644 --- a/TAO/orbsvcs/tests/Time/Client_i.cpp +++ b/TAO/orbsvcs/tests/Time/Client_i.cpp @@ -290,7 +290,6 @@ Client_i::~Client_i (void) int Client_i::obtain_initial_references (void) { - try { // Initialize the naming services. diff --git a/TAO/orbsvcs/tests/ior_corbaname/client.cpp b/TAO/orbsvcs/tests/ior_corbaname/client.cpp index 759242b978f..cf1be253d99 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/client.cpp +++ b/TAO/orbsvcs/tests/ior_corbaname/client.cpp @@ -15,7 +15,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try { IOR_corbaname_Client_i client; diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp index 17faa76b29d..0518dd80ef6 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp +++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp @@ -30,7 +30,6 @@ IOR_corbaname_Client_i::~IOR_corbaname_Client_i (void) int IOR_corbaname_Client_i::run (void) { - try { CosNaming::Name name (1); diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h index cc1c1da03bf..6cbfc28dc7d 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h +++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h @@ -26,7 +26,6 @@ */ class IOR_corbaname_Client_i { - public: // = Constructor and destructor. IOR_corbaname_Client_i (void); diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp b/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp index 423ad03312a..6e4d03dd842 100644 --- a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp +++ b/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp @@ -386,7 +386,6 @@ ServerApp::create_poa(CORBA::ORB_ptr orb, bool ServerApp::check_results() { - this->stats_.init(this->num_remote_clients_ + this->num_collocated_clients_, this->num_loops_); diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h b/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h index 09e3f8e1b16..816486a8d6c 100644 --- a/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h +++ b/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h @@ -68,7 +68,6 @@ struct RefHelper struct CSD_PT_TestInf_Export AppHelper { - static void ref_to_file(CORBA::ORB_ptr orb, CORBA::Object_ptr obj, const ACE_TCHAR* filename); diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h index cf92ee54115..1bb88cacb2f 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h @@ -173,7 +173,6 @@ typedef ACE_Singleton<Globals,ACE_Null_Mutex> GLOBALS; */ class MT_Priority { - public: /// constructor. MT_Priority (void); diff --git a/TAO/performance-tests/POA/Demux/client.cpp b/TAO/performance-tests/POA/Demux/client.cpp index af93d374f5f..b9279fe1b51 100644 --- a/TAO/performance-tests/POA/Demux/client.cpp +++ b/TAO/performance-tests/POA/Demux/client.cpp @@ -14,7 +14,6 @@ int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - // Set TAO_debug_level to 0 to ensure silent running unless // debugging is explicitly invoked TAO_debug_level = 0; diff --git a/TAO/performance-tests/POA/Demux/demux_stats.cpp b/TAO/performance-tests/POA/Demux/demux_stats.cpp index 25cf7d5079a..cf9e8bbdebc 100644 --- a/TAO/performance-tests/POA/Demux/demux_stats.cpp +++ b/TAO/performance-tests/POA/Demux/demux_stats.cpp @@ -14,7 +14,6 @@ class Demux_Stats { - public: /// Calculates the average latency and Standard deviation. /// Expects the input data in my_results.dat. @@ -38,7 +37,6 @@ private : int Demux_Stats::parse_args (int argc_, char * argv_ []) { - ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("i:")); int c; @@ -58,7 +56,6 @@ Demux_Stats::parse_args (int argc_, char * argv_ []) int Demux_Stats::calculate_avg_latency () { - CORBA::ULong i, time; char str1[50], str2[50], str3[50]; @@ -97,7 +94,6 @@ Demux_Stats::calculate_avg_latency () while (fscanf (this->result_fp_, "%s %s %s %ld %ld", &str1, &str2, &str3, &i, &time) != EOF) { - if(ACE_OS::strcmp (str1,"POA::locate_poa_i")==0 && (ACE_OS::strcmp (str3,"end") == 0)) { if (items < 1) { items = items + 1; counter++; } @@ -316,7 +312,6 @@ Demux_Stats::calculate_avg_latency () if (iterations == 0) { - ACE_OS::printf("Average response times = POA = %lf SERVANT = %lf DISPATCH = %lf PERFECT = %lf DYNAMIC = %lf BINARY = %lf LINEAR = %lf PARSE = %lf microsec\n", mean_poa, mean_servant, mean_dispatch, mean_perfect, diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.cpp b/TAO/performance-tests/POA/Demux/demux_test_client.cpp index 6a1d8bc2e49..9eea75d6280 100644 --- a/TAO/performance-tests/POA/Demux/demux_test_client.cpp +++ b/TAO/performance-tests/POA/Demux/demux_test_client.cpp @@ -124,7 +124,6 @@ Demux_Test_Client::init (int argc, ACE_TCHAR *argv []) int Demux_Test_Client::parse_args (void) { - ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("df:m:n:o:p:i:s:")); int c; diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.cpp b/TAO/performance-tests/POA/Demux/demux_test_server.cpp index 57c870b65a7..4b922389878 100644 --- a/TAO/performance-tests/POA/Demux/demux_test_server.cpp +++ b/TAO/performance-tests/POA/Demux/demux_test_server.cpp @@ -84,7 +84,6 @@ Demux_Test_Server::init (int argc, ACE_TCHAR *argv []) // grab the POA Manager try { - this->poa_mgr_ = this->root_poa_->the_POAManager (); } @@ -326,7 +325,6 @@ Demux_Test_Server::init (int argc, ACE_TCHAR *argv []) int Demux_Test_Server::parse_args (void) { - ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("df:o:p:ut")); int c; diff --git a/TAO/performance-tests/POA/Demux/write_names.cpp b/TAO/performance-tests/POA/Demux/write_names.cpp index 73002c74770..dd00816e9f8 100644 --- a/TAO/performance-tests/POA/Demux/write_names.cpp +++ b/TAO/performance-tests/POA/Demux/write_names.cpp @@ -3,7 +3,6 @@ int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - for(int i=0; i<1000; i++) ACE_OS::printf ("%09d\n",i); } diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp index b59b62d15c8..882a0fdb550 100644 --- a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp +++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp @@ -327,7 +327,6 @@ child_poa_testing (PortableServer::POA_ptr root_poa) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try { // Initialize the ORB first. diff --git a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp index 4cf2427b933..7149a2ddb4c 100644 --- a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp +++ b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp @@ -166,7 +166,6 @@ PP_Test_Client::parse_args (void) void PP_Test_Client::send_oneway (void) { - try { ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SEND_ONEWAY_START); @@ -186,7 +185,6 @@ PP_Test_Client::send_oneway (void) void PP_Test_Client::send_void (void) { - try { ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SEND_VOID_START); @@ -250,7 +248,6 @@ PP_Test_Client::run () int PP_Test_Client::shutdown_server (int do_shutdown) { - try { if (do_shutdown) @@ -277,7 +274,6 @@ PP_Test_Client::shutdown_server (int do_shutdown) int PP_Test_Client::run_oneway (void) { - try { CORBA::ULong i; @@ -316,7 +312,6 @@ PP_Test_Client::run_oneway (void) int PP_Test_Client::run_void (void) { - try { CORBA::ULong i; diff --git a/TAO/performance-tests/Protocols/distributor.cpp b/TAO/performance-tests/Protocols/distributor.cpp index a6b2caf5a2b..68ba54d71a4 100644 --- a/TAO/performance-tests/Protocols/distributor.cpp +++ b/TAO/performance-tests/Protocols/distributor.cpp @@ -171,7 +171,6 @@ test_i::start_test (CORBA::Long session_id, // for a few times before giving up. for (int j = 0;;) { - test_protocol_setup: try @@ -209,7 +208,6 @@ test_i::start_test (CORBA::Long session_id, // for a few times before giving up. for (int k = 0;;) { - base_protocol_setup: try diff --git a/TAO/performance-tests/Protocols/sender.cpp b/TAO/performance-tests/Protocols/sender.cpp index 5cf98cdd2a9..50a81ae6430 100644 --- a/TAO/performance-tests/Protocols/sender.cpp +++ b/TAO/performance-tests/Protocols/sender.cpp @@ -464,7 +464,6 @@ Worker::setup (void) // for a few times before giving up. for (int j = 0;;) { - test_protocol_setup: try @@ -502,7 +501,6 @@ Worker::setup (void) // for a few times before giving up. for (int k = 0;;) { - base_protocol_setup: try diff --git a/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp b/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp index 1163c7866f3..315be6911f8 100644 --- a/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp +++ b/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp @@ -187,7 +187,6 @@ void big_time_test (CORBA::ULong num_list_loops, int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - if (argc > 1 && ACE_OS::strcasecmp (argv[1],ACE_TEXT("-csv")) == 0) use_csv = true; diff --git a/TAO/tao/AnyTypeCode/Any.cpp b/TAO/tao/AnyTypeCode/Any.cpp index ae96a7eb211..2af5807cb64 100644 --- a/TAO/tao/AnyTypeCode/Any.cpp +++ b/TAO/tao/AnyTypeCode/Any.cpp @@ -359,7 +359,6 @@ CORBA::Any::operator<<= (CORBA::Any::from_wstring ws) namespace CORBA { - void operator<<= (CORBA::Any &any, CORBA::Short s) { diff --git a/TAO/tao/AnyTypeCode/Any.h b/TAO/tao/AnyTypeCode/Any.h index ad8d1cf2e0c..769132bf0a5 100644 --- a/TAO/tao/AnyTypeCode/Any.h +++ b/TAO/tao/AnyTypeCode/Any.h @@ -282,7 +282,6 @@ operator<< (std::ostream &, const CORBA::Any &); namespace CORBA { - /// Typesafe insertion. TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::Short); @@ -356,7 +355,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace CORBA { - /// Copying versions of insertion operators for basic types /// must also be defined for CORBA::Any_var. diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h index ba194eff926..76c3e03cdb2 100644 --- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h @@ -27,7 +27,6 @@ namespace TAO { namespace TypeCode { - /** * @class Empty_Param * diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.h b/TAO/tao/AnyTypeCode/Enum_TypeCode.h index 3b56204d1fc..0914df3a7e7 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.h @@ -96,7 +96,6 @@ namespace TAO * increase cache hits by improving spatial locality. */ //@{ - /// Base attributes containing repository ID and name of /// structure type. Base_Attributes<StringType> base_attributes_; diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h index 14b6130d4dc..883a328a030 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h @@ -102,7 +102,6 @@ namespace TAO * increase cache hits by improving spatial locality. */ //@{ - /// Base attributes containing repository ID and name of /// structure type. Base_Attributes<char const *> base_attributes_; diff --git a/TAO/tao/AnyTypeCode/ExceptionA.cpp b/TAO/tao/AnyTypeCode/ExceptionA.cpp index 7201cce9be4..280f70e4bea 100644 --- a/TAO/tao/AnyTypeCode/ExceptionA.cpp +++ b/TAO/tao/AnyTypeCode/ExceptionA.cpp @@ -79,7 +79,6 @@ namespace TAO namespace CORBA { - // Insertion of CORBA::Exception - copying. void operator<<= (CORBA::Any &any, const CORBA::Exception &exception) diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h index b81c0702ba2..f655c3353b5 100644 --- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h @@ -27,7 +27,6 @@ namespace TAO { namespace TypeCode { - /** * @class Fixed * diff --git a/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h b/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h index 9f5a40a9c00..7f6f51c1be7 100644 --- a/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h @@ -30,7 +30,6 @@ namespace TAO { namespace TypeCode { - /** * @class Indirected_Type * @@ -120,7 +119,6 @@ namespace TAO private: //@{ - /// Typecode id CORBA::String_var id_; diff --git a/TAO/tao/AnyTypeCode/NVList.cpp b/TAO/tao/AnyTypeCode/NVList.cpp index 7c0571e618f..557b80f1582 100644 --- a/TAO/tao/AnyTypeCode/NVList.cpp +++ b/TAO/tao/AnyTypeCode/NVList.cpp @@ -145,7 +145,6 @@ CORBA::NVList::add_value (const char *name, CORBA::NamedValue_ptr CORBA::NVList::add_item_consume (char *name, CORBA::Flags flags) { - // call the helper to allocate a NamedValue element CORBA::NamedValue_ptr nv = this->add_element (flags); diff --git a/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h b/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h index f75b9528642..6955c7cd1db 100644 --- a/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h +++ b/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h @@ -28,7 +28,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - /** * @class Null_RefCount_Policy * diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h index c28969137c4..23d3f429429 100644 --- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h @@ -27,7 +27,6 @@ namespace TAO { namespace TypeCode { - /** * @class Recursive_Type * diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h index 824695ca043..8f0172be861 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h @@ -28,7 +28,6 @@ namespace TAO { namespace TypeCode { - /** * @class Sequence * diff --git a/TAO/tao/AnyTypeCode/String_TypeCode.h b/TAO/tao/AnyTypeCode/String_TypeCode.h index 0ad31aa2b3c..4f7385135da 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode.h +++ b/TAO/tao/AnyTypeCode/String_TypeCode.h @@ -28,7 +28,6 @@ namespace TAO { namespace TypeCode { - /** * @class String * diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.h b/TAO/tao/AnyTypeCode/Struct_TypeCode.h index e214e3e8766..2103872c83a 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.h @@ -110,7 +110,6 @@ namespace TAO * increase cache hits by improving spatial locality. */ //@{ - /// Base attributes containing repository ID and name of /// structure type. Base_Attributes<StringType> base_attributes_; diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h index e07b1e54e43..4d87a18a9de 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h @@ -112,7 +112,6 @@ namespace TAO * increase cache hits by improving spatial locality. */ //@{ - /// Base attributes containing repository ID and name of /// structure type. Base_Attributes<char const *> const base_attributes_; diff --git a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h index 4011da52a0f..3ff1801cffd 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h @@ -27,7 +27,6 @@ namespace TAO { namespace TypeCode { - /** * @class Base_Attributes * diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h index 58d084a3147..a5ce4e5cc91 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h @@ -30,7 +30,6 @@ namespace TAO { namespace TypeCode { - /** * @class Case * diff --git a/TAO/tao/AnyTypeCode/TypeCode_Traits.h b/TAO/tao/AnyTypeCode/TypeCode_Traits.h index 803fbc1e472..241a0f0f45d 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Traits.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Traits.h @@ -29,7 +29,6 @@ namespace TAO namespace TypeCode { - // enum Storage { STATIC_TYPECODE, DYNAMIC_TYPECODE }; // template<Storage S> struct Traits; diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.h b/TAO/tao/AnyTypeCode/Union_TypeCode.h index 93a292f8bcf..71edaa36fa5 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Union_TypeCode.h @@ -116,7 +116,6 @@ namespace TAO * increase cache hits by improving spatial locality. */ //@{ - /// Base attributes containing repository ID and name of /// union type. Base_Attributes<StringType> base_attributes_; diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h index a5883c10a17..8aa80cbc216 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h @@ -117,7 +117,6 @@ namespace TAO * increase cache hits by improving spatial locality. */ //@{ - /// Base attributes containing repository ID and name of /// union type. Base_Attributes<char const *> const base_attributes_; diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.h b/TAO/tao/AnyTypeCode/Value_TypeCode.h index 3b956865379..6d7a8bb7f38 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Value_TypeCode.h @@ -120,7 +120,6 @@ namespace TAO * increase cache hits by improving spatial locality. */ //@{ - /// Base attributes containing repository ID and name of /// @c valuetype. Base_Attributes<StringType> base_attributes_; diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h index cfdc4e3a6dc..46f3d498818 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h @@ -117,7 +117,6 @@ namespace TAO * increase cache hits by improving spatial locality. */ //@{ - /// Base attributes containing repository ID and name of /// @c valuetype. Base_Attributes<char const *> const base_attributes_; diff --git a/TAO/tao/AnyTypeCode/WrongTransactionA.cpp b/TAO/tao/AnyTypeCode/WrongTransactionA.cpp index 18b2591053e..ffe6064f675 100644 --- a/TAO/tao/AnyTypeCode/WrongTransactionA.cpp +++ b/TAO/tao/AnyTypeCode/WrongTransactionA.cpp @@ -88,7 +88,6 @@ namespace TAO namespace CORBA { - // Copying insertion. void operator<<= ( CORBA::Any &_tao_any, diff --git a/TAO/tao/AnyTypeCode/WrongTransactionA.h b/TAO/tao/AnyTypeCode/WrongTransactionA.h index 700eaa9228f..1bd6a30371f 100644 --- a/TAO/tao/AnyTypeCode/WrongTransactionA.h +++ b/TAO/tao/AnyTypeCode/WrongTransactionA.h @@ -53,7 +53,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace CORBA { - // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 @@ -77,7 +76,6 @@ namespace TAO namespace CORBA { - TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, const CORBA::WrongTransaction &); // copying version TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::WrongTransaction*); // noncopying version TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::WrongTransaction *&); // deprecated diff --git a/TAO/tao/Array_Traits_T.h b/TAO/tao/Array_Traits_T.h index 0548ea6b6c0..ba30cd90856 100644 --- a/TAO/tao/Array_Traits_T.h +++ b/TAO/tao/Array_Traits_T.h @@ -18,7 +18,6 @@ namespace TAO { namespace details { - template <typename T_forany> struct array_traits { diff --git a/TAO/tao/Bounded_Array_Allocation_Traits_T.h b/TAO/tao/Bounded_Array_Allocation_Traits_T.h index 0af577b1c05..55ee5250321 100644 --- a/TAO/tao/Bounded_Array_Allocation_Traits_T.h +++ b/TAO/tao/Bounded_Array_Allocation_Traits_T.h @@ -17,7 +17,6 @@ namespace TAO { namespace details { - template<typename T, CORBA::ULong MAX, bool dummy> struct bounded_array_allocation_traits { diff --git a/TAO/tao/Bounded_Array_Sequence_T.h b/TAO/tao/Bounded_Array_Sequence_T.h index 8a9b6230a04..d52a4db56cc 100644 --- a/TAO/tao/Bounded_Array_Sequence_T.h +++ b/TAO/tao/Bounded_Array_Sequence_T.h @@ -15,7 +15,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - template<typename T_array, typename T_slice, typename T_tag, CORBA::ULong MAX> class bounded_array_sequence { diff --git a/TAO/tao/Bounded_Object_Reference_Sequence_T.h b/TAO/tao/Bounded_Object_Reference_Sequence_T.h index 73194873d13..d86427db8b2 100644 --- a/TAO/tao/Bounded_Object_Reference_Sequence_T.h +++ b/TAO/tao/Bounded_Object_Reference_Sequence_T.h @@ -17,7 +17,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - template<typename object_t, typename object_t_var, CORBA::ULong MAX> class bounded_object_reference_sequence { diff --git a/TAO/tao/Bounded_Reference_Allocation_Traits_T.h b/TAO/tao/Bounded_Reference_Allocation_Traits_T.h index 39bfe8d1e20..4306e009ee1 100644 --- a/TAO/tao/Bounded_Reference_Allocation_Traits_T.h +++ b/TAO/tao/Bounded_Reference_Allocation_Traits_T.h @@ -17,7 +17,6 @@ namespace TAO { namespace details { - template<typename T, class ref_traits, CORBA::ULong MAX, bool dummy> struct bounded_reference_allocation_traits { diff --git a/TAO/tao/Bounded_Value_Allocation_Traits_T.h b/TAO/tao/Bounded_Value_Allocation_Traits_T.h index 06cfd2a7102..cb2e8168bdd 100644 --- a/TAO/tao/Bounded_Value_Allocation_Traits_T.h +++ b/TAO/tao/Bounded_Value_Allocation_Traits_T.h @@ -17,7 +17,6 @@ namespace TAO { namespace details { - template<typename T, CORBA::ULong MAX, bool dummy> struct bounded_value_allocation_traits { diff --git a/TAO/tao/Bounded_Value_Sequence_T.h b/TAO/tao/Bounded_Value_Sequence_T.h index e5498456b2e..3579c6cd2b3 100644 --- a/TAO/tao/Bounded_Value_Sequence_T.h +++ b/TAO/tao/Bounded_Value_Sequence_T.h @@ -17,7 +17,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - template<class T, CORBA::ULong MAX, class Tag=int> class bounded_value_sequence { diff --git a/TAO/tao/CORBANAME_Parser.cpp b/TAO/tao/CORBANAME_Parser.cpp index 2b934e81b41..db7a72d3511 100644 --- a/TAO/tao/CORBANAME_Parser.cpp +++ b/TAO/tao/CORBANAME_Parser.cpp @@ -55,7 +55,6 @@ parse_string_dynamic_request_helper (CORBA::Object_ptr naming_context, CORBA::Object_ptr TAO_CORBANAME_Parser::parse_string (const char *ior, CORBA::ORB_ptr orb) { - // Skip the prefix, we know it is there because this method in only // called if <match_prefix> returns 1. const char *corbaname = @@ -112,7 +111,6 @@ TAO_CORBANAME_Parser::parse_string (const char *ior, CORBA::ORB_ptr orb) if (key_string.length () != 0) { - // Make a dynamic request for resolve_str in this naming context obj = this->parse_string_dynamic_request_helper (name_context.in (), key_string); diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h index e3dba140e20..7e3e73166ca 100644 --- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h +++ b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h @@ -29,7 +29,6 @@ namespace TAO { namespace CSD { - /** * @class FW_Server_Request_Wrapper * diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp b/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp index 79a36821536..b94de8c38e7 100644 --- a/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp +++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp @@ -10,7 +10,6 @@ TAO_CSD_Object_Adapter::TAO_CSD_Object_Adapter ( TAO_ORB_Core &orb_core) : TAO_Object_Adapter (creation_parameters, orb_core) { - } TAO_CSD_Object_Adapter::~TAO_CSD_Object_Adapter () diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp b/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp index 556c4504762..d45afff0876 100644 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp +++ b/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp @@ -18,7 +18,6 @@ TAO_CSD_Strategy_Repository::~TAO_CSD_Strategy_Repository() int TAO_CSD_Strategy_Repository::init(int, ACE_TCHAR **) { - static int initialized = 0; // Only allow initialization once. @@ -33,7 +32,6 @@ TAO_CSD_Strategy_Repository::init(int, ACE_TCHAR **) CSD_Framework::Strategy_ptr TAO_CSD_Strategy_Repository::find (const ACE_CString& name) { - if (this->strategy_list_head_ != 0) { Strategy_Node *node = this->strategy_list_head_->find(name); diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h index 3acc7476b5e..fd0004f2e3e 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h @@ -27,7 +27,6 @@ namespace TAO { namespace CSD { - class TP_Collocated_Asynch_Request; typedef TAO_Intrusive_Ref_Count_Handle<TP_Collocated_Asynch_Request> TP_Collocated_Asynch_Request_Handle; diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h index 3d46dd0318f..86c7dd93023 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h @@ -29,7 +29,6 @@ namespace TAO { namespace CSD { - class TP_Collocated_Synch_Request; typedef TAO_Intrusive_Ref_Count_Handle<TP_Collocated_Synch_Request> TP_Collocated_Synch_Request_Handle; diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h index 2965387f17d..934d46e3242 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h @@ -28,7 +28,6 @@ namespace TAO { namespace CSD { - class TP_Collocated_Synch_With_Server_Request; typedef TAO_Intrusive_Ref_Count_Handle <TP_Collocated_Synch_With_Server_Request> diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h index c1aad50dfd4..72910b181eb 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h @@ -31,7 +31,6 @@ namespace TAO { namespace CSD { - class TP_Corba_Request; typedef TAO_Intrusive_Ref_Count_Handle<TP_Corba_Request> TP_Corba_Request_Handle; diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h index b0ef729fe2b..dd63621c7f4 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h @@ -27,7 +27,6 @@ namespace TAO { namespace CSD { - class TP_Custom_Asynch_Request; typedef TAO_Intrusive_Ref_Count_Handle<TP_Custom_Asynch_Request> TP_Custom_Asynch_Request_Handle; diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h index beaf7decfa3..09b0d8e4eb7 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h @@ -29,7 +29,6 @@ namespace TAO { namespace CSD { - class TP_Custom_Request; typedef TAO_Intrusive_Ref_Count_Handle<TP_Custom_Request> TP_Custom_Request_Handle; diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h index cca06cc8494..15f925831bc 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h @@ -30,7 +30,6 @@ namespace TAO { namespace CSD { - class TP_Custom_Request_Operation; typedef TAO_Intrusive_Ref_Count_Handle<TP_Custom_Request_Operation> TP_Custom_Request_Operation_Handle; diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h index f6bffc898eb..a68cb9804d1 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h @@ -28,7 +28,6 @@ namespace TAO { namespace CSD { - class TP_Custom_Synch_Request; typedef TAO_Intrusive_Ref_Count_Handle<TP_Custom_Synch_Request> TP_Custom_Synch_Request_Handle; diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h index 76a6b97669a..8a4b3a48667 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h @@ -28,7 +28,6 @@ namespace TAO { namespace CSD { - /** * @class TP_Dispatchable_Visitor * diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.h index 9066d0a0d77..b4b72e6635a 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.h @@ -28,7 +28,6 @@ namespace TAO { namespace CSD { - class TP_Request; class TP_Queue_Visitor; diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h index 27019971165..d8d07c5bdf3 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h @@ -27,7 +27,6 @@ namespace TAO { namespace CSD { - class TP_Request; diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.h index ee275c8dfd4..38407bcf8cd 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.h @@ -27,7 +27,6 @@ namespace TAO { namespace CSD { - class TP_Remote_Request; typedef TAO_Intrusive_Ref_Count_Handle<TP_Remote_Request> TP_Remote_Request_Handle; diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h index eeeede080a8..c6801b7272c 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h @@ -30,7 +30,6 @@ namespace TAO { namespace CSD { - class TP_Request; typedef TAO_Intrusive_Ref_Count_Handle<TP_Request> TP_Request_Handle; diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h index 0b16cea7c4c..da68cdf8f81 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h @@ -30,7 +30,6 @@ namespace TAO { namespace CSD { - /** * @class TP_Servant_State * diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h index d78e196d0db..932e66b5182 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h @@ -30,7 +30,6 @@ namespace TAO { namespace CSD { - /** * @class TP_Servant_State_Map * diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h index a511525711a..285b74b0f74 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h @@ -32,7 +32,6 @@ namespace TAO { namespace CSD { - class TP_Strategy; typedef TAO_Intrusive_Ref_Count_Handle<TP_Strategy> TP_Strategy_Handle; diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.h index 2a3b7860d22..10a1144cb76 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.h @@ -29,7 +29,6 @@ namespace TAO { namespace CSD { - /** * @class TP_Strategy_Factory * diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h index d4664257a1c..78e65828367 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h @@ -28,7 +28,6 @@ namespace TAO { namespace CSD { - /** * @class TP_Synch_Helper * diff --git a/TAO/tao/CodecFactory/CodecFactory_impl.cpp b/TAO/tao/CodecFactory/CodecFactory_impl.cpp index 70af066d3d2..7e2bb105151 100644 --- a/TAO/tao/CodecFactory/CodecFactory_impl.cpp +++ b/TAO/tao/CodecFactory/CodecFactory_impl.cpp @@ -85,7 +85,6 @@ TAO_CodecFactory::create_codec_i (CORBA::Octet major, switch (encoding_format) { - // @@ MSVC 6 gets confused and thinks that // IOP::ENCODING_CDR_ENCAPS is not a constant, so its actual // value (0) is used instead. diff --git a/TAO/tao/Codeset_Translator_Base.cpp b/TAO/tao/Codeset_Translator_Base.cpp index d5b69e09f35..7d059efcb6a 100644 --- a/TAO/tao/Codeset_Translator_Base.cpp +++ b/TAO/tao/Codeset_Translator_Base.cpp @@ -18,7 +18,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Codeset_Translator_Base::~TAO_Codeset_Translator_Base () { - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Compression/Base_Compressor.cpp b/TAO/tao/Compression/Base_Compressor.cpp index 92abdd8937d..41c9224e922 100644 --- a/TAO/tao/Compression/Base_Compressor.cpp +++ b/TAO/tao/Compression/Base_Compressor.cpp @@ -57,7 +57,6 @@ namespace TAO ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0); if (this->uncompressed_bytes_ > 0) { - return_value = static_cast< ::Compression::CompressionRatio> ((::Compression::CompressionRatio) this->compressed_bytes_ / this->uncompressed_bytes_); diff --git a/TAO/tao/Compression/bzip2/Bzip2Compressor_Factory.cpp b/TAO/tao/Compression/bzip2/Bzip2Compressor_Factory.cpp index 34a1947c942..241de9ed7c2 100644 --- a/TAO/tao/Compression/bzip2/Bzip2Compressor_Factory.cpp +++ b/TAO/tao/Compression/bzip2/Bzip2Compressor_Factory.cpp @@ -5,7 +5,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - Bzip2_CompressorFactory::Bzip2_CompressorFactory (void) : ::TAO::CompressorFactory (::Compression::COMPRESSORID_BZIP2), compressor_ (::Compression::Compressor::_nil ()) diff --git a/TAO/tao/Compression/lzo/LzoCompressor_Factory.cpp b/TAO/tao/Compression/lzo/LzoCompressor_Factory.cpp index ca73864c783..2f03fb2554c 100644 --- a/TAO/tao/Compression/lzo/LzoCompressor_Factory.cpp +++ b/TAO/tao/Compression/lzo/LzoCompressor_Factory.cpp @@ -6,7 +6,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - Lzo_CompressorFactory::Lzo_CompressorFactory (void) : ::TAO::CompressorFactory (::Compression::COMPRESSORID_LZO), compressor_ (::Compression::Compressor::_nil ()) diff --git a/TAO/tao/Compression/rle/RLECompressor.cpp b/TAO/tao/Compression/rle/RLECompressor.cpp index 81ad5367df7..b15368c778e 100644 --- a/TAO/tao/Compression/rle/RLECompressor.cpp +++ b/TAO/tao/Compression/rle/RLECompressor.cpp @@ -32,7 +32,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - RLECompressor::RLECompressor(::Compression::CompressorFactory_ptr compressor_factory) : BaseCompressor (compressor_factory, 0) { diff --git a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp index 213f37cb44e..c475e9917ec 100644 --- a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp +++ b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp @@ -7,7 +7,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - Zlib_CompressorFactory::Zlib_CompressorFactory (void) : ::TAO::CompressorFactory (::Compression::COMPRESSORID_ZLIB) { diff --git a/TAO/tao/Connector_Impl.cpp b/TAO/tao/Connector_Impl.cpp index c44c9a988ab..bb07f837513 100644 --- a/TAO/tao/Connector_Impl.cpp +++ b/TAO/tao/Connector_Impl.cpp @@ -18,7 +18,6 @@ TAO_Connect_Creation_Strategy<SVC_HANDLER>:: : ACE_Creation_Strategy <SVC_HANDLER> (t, orb_core->reactor ()), orb_core_ (orb_core) { - } template <class SVC_HANDLER> int diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.h b/TAO/tao/Default_Thread_Lane_Resources_Manager.h index d94c3f29a92..3ef57863ba0 100644 --- a/TAO/tao/Default_Thread_Lane_Resources_Manager.h +++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.h @@ -58,7 +58,6 @@ public: /// @name Accessors // @{ - TAO_Thread_Lane_Resources &lane_resources (void); TAO_Thread_Lane_Resources &default_lane_resources (void); diff --git a/TAO/tao/Dynamic_TP/DTP_ORBInitializer.cpp b/TAO/tao/Dynamic_TP/DTP_ORBInitializer.cpp index e43a483fcd6..e2c8a061d7d 100644 --- a/TAO/tao/Dynamic_TP/DTP_ORBInitializer.cpp +++ b/TAO/tao/Dynamic_TP/DTP_ORBInitializer.cpp @@ -19,7 +19,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_DTP_ORBInitializer::TAO_DTP_ORBInitializer (/*const ACE_CString &tplist*/) { - } void diff --git a/TAO/tao/Dynamic_TP/DTP_POA_Loader.cpp b/TAO/tao/Dynamic_TP/DTP_POA_Loader.cpp index 96d7391e483..4f06c6d112c 100644 --- a/TAO/tao/Dynamic_TP/DTP_POA_Loader.cpp +++ b/TAO/tao/Dynamic_TP/DTP_POA_Loader.cpp @@ -68,7 +68,6 @@ TAO_DTP_POA_Loader::init (int argc, ACE_TCHAR* argv[]) for (int curarg = 0; curarg < argc; curarg++) { - if (TAO_debug_level > 0) { TAOLIB_DEBUG((LM_DEBUG, @@ -93,7 +92,6 @@ TAO_DTP_POA_Loader::init (int argc, ACE_TCHAR* argv[]) } else { - /* If we get here then we have another map set to process and add to the map registry. @@ -119,7 +117,6 @@ int TAO_DTP_POA_Loader::load_poa_map (ACE_TCHAR *map, TAO_CSD_Strategy_Repository *repo) { - ACE_CString poa_name; ACE_CString config_name; TAO_DTP_POA_Strategy * strategy_container = 0; diff --git a/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp index 459a8cdb076..ab7e89fb297 100644 --- a/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp +++ b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp @@ -48,7 +48,6 @@ TAO_DTP_POA_Strategy::CustomRequestOutcome TAO_DTP_POA_Strategy::custom_asynch_request ( TAO::CSD::TP_Custom_Request_Operation* op) { - TAO::CSD::TP_Servant_State::HandleType servant_state = this->get_servant_state (op->servant ()); @@ -66,7 +65,6 @@ TAO_DTP_POA_Strategy::custom_asynch_request ( bool TAO_DTP_POA_Strategy::poa_activated_event_i (TAO_ORB_Core& orb_core) { - this->dtp_task_.thr_mgr (orb_core.thr_mgr ()); // Activates the worker threads, and waits until all have been started. @@ -179,8 +177,6 @@ TAO_DTP_POA_Strategy::dispatch_collocated_request_i const char* operation, PortableServer::Servant servant) { - - TAO::CSD::TP_Servant_State::HandleType servant_state = this->get_servant_state (servant); @@ -216,7 +212,6 @@ TAO_DTP_POA_Strategy::dispatch_collocated_request_i } else if (is_synchronous) { - TAO::CSD::TP_Collocated_Synch_Request *req_ptr; ACE_NEW_RETURN (req_ptr, TAO::CSD::TP_Collocated_Synch_Request ( diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.h b/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.h index 57f8ec56bf3..a0558483913 100644 --- a/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.h +++ b/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.h @@ -64,7 +64,6 @@ public: /// @name Accessors // @{ - TAO_Thread_Lane_Resources &lane_resources (void); TAO_Thread_Lane_Resources &default_lane_resources (void); diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp index 9be23601da7..d60b328af5b 100644 --- a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp +++ b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp @@ -63,7 +63,6 @@ TAO_DTP_Thread_Pool_Threads::TAO_DTP_Thread_Pool_Threads (TAO_DTP_Thread_Pool &p int TAO_DTP_Thread_Pool_Threads::svc (void) { - if (TAO_debug_level > 7) { TAOLIB_DEBUG ((LM_DEBUG, diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h index dd5e071fa64..fc7d32d2ff0 100644 --- a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h +++ b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h @@ -160,7 +160,6 @@ public: /// @name Accessors // @{ - bool use_timeouts () const; const ACE_Time_Value& dynamic_thread_time () const; @@ -241,7 +240,6 @@ public: private: /// @name Helpers // @{ - CORBA::ULong create_threadpool_i (TAO_DTP_Definition &def); diff --git a/TAO/tao/Exclusive_TMS.h b/TAO/tao/Exclusive_TMS.h index 9c94f223358..16a0056b1f6 100644 --- a/TAO/tao/Exclusive_TMS.h +++ b/TAO/tao/Exclusive_TMS.h @@ -37,7 +37,6 @@ class TAO_Reply_Dispatcher; */ class TAO_Export TAO_Exclusive_TMS : public TAO_Transport_Mux_Strategy { - public: /// Constructor. TAO_Exclusive_TMS (TAO_Transport *transport); diff --git a/TAO/tao/Fault_Tolerance_Service.h b/TAO/tao/Fault_Tolerance_Service.h index f18963b3ae1..f5db64e3153 100644 --- a/TAO/tao/Fault_Tolerance_Service.h +++ b/TAO/tao/Fault_Tolerance_Service.h @@ -38,7 +38,6 @@ class TAO_ORB_Core; */ class TAO_Export TAO_Fault_Tolerance_Service { - public: /// Ctor TAO_Fault_Tolerance_Service () = default; diff --git a/TAO/tao/FlResource/FlResource_Loader.h b/TAO/tao/FlResource/FlResource_Loader.h index 7d4a8dc47ee..fa7e0b1fa8e 100644 --- a/TAO/tao/FlResource/FlResource_Loader.h +++ b/TAO/tao/FlResource/FlResource_Loader.h @@ -25,7 +25,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - /** * @class FlResource_Loader * @@ -42,7 +41,6 @@ namespace TAO */ class TAO_FlResource_Export FlResource_Loader { - public: FlResource_Loader (void); diff --git a/TAO/tao/FoxResource/FoxResource_Factory.cpp b/TAO/tao/FoxResource/FoxResource_Factory.cpp index c3549b3d95f..33f9dd63540 100644 --- a/TAO/tao/FoxResource/FoxResource_Factory.cpp +++ b/TAO/tao/FoxResource/FoxResource_Factory.cpp @@ -6,7 +6,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - FoxResource_Factory::FoxResource_Factory (FXApp *app) : reactor_impl_ (0) , fxapp_ (app) diff --git a/TAO/tao/FoxResource/FoxResource_Factory.h b/TAO/tao/FoxResource/FoxResource_Factory.h index e9c8c6e82ac..270c87171e2 100644 --- a/TAO/tao/FoxResource/FoxResource_Factory.h +++ b/TAO/tao/FoxResource/FoxResource_Factory.h @@ -23,7 +23,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - /** * @class FoxResource_Factory * diff --git a/TAO/tao/Generic_Sequence_T.h b/TAO/tao/Generic_Sequence_T.h index 07a46d0d6f4..46e48aa5189 100644 --- a/TAO/tao/Generic_Sequence_T.h +++ b/TAO/tao/Generic_Sequence_T.h @@ -65,7 +65,6 @@ namespace TAO { namespace details { - template<typename T, class ALLOCATION_TRAITS, class ELEMENT_TRAITS> diff --git a/TAO/tao/IIOP_Transport.h b/TAO/tao/IIOP_Transport.h index 63d3496d6b4..8e5999bb3e9 100644 --- a/TAO/tao/IIOP_Transport.h +++ b/TAO/tao/IIOP_Transport.h @@ -68,7 +68,6 @@ protected: * details. */ //@{ - virtual ACE_Event_Handler * event_handler_i (void); virtual ssize_t send (iovec *iov, int iovcnt, diff --git a/TAO/tao/IORInterceptor/IORInfo.h b/TAO/tao/IORInterceptor/IORInfo.h index add90ed5270..6e86563beef 100644 --- a/TAO/tao/IORInterceptor/IORInfo.h +++ b/TAO/tao/IORInterceptor/IORInfo.h @@ -54,7 +54,6 @@ public: * Methods exposed by the PortableInterceptor::IORInfo interface. */ //@{ - /// Return the policy matching the given policy type that is in /// effect for the object whose IOR is being created. virtual CORBA::Policy_ptr get_effective_policy (CORBA::PolicyType type); diff --git a/TAO/tao/Invocation_Adapter.h b/TAO/tao/Invocation_Adapter.h index b46e6032395..244383701e6 100644 --- a/TAO/tao/Invocation_Adapter.h +++ b/TAO/tao/Invocation_Adapter.h @@ -158,7 +158,6 @@ namespace TAO * methods to get the right behavior at their level. */ //@{ - /// Helper method that prepares the necessary stuff for a remote /// invocation. diff --git a/TAO/tao/Invocation_Retry_State.cpp b/TAO/tao/Invocation_Retry_State.cpp index 4c62c4e9d80..f950d69bb67 100644 --- a/TAO/tao/Invocation_Retry_State.cpp +++ b/TAO/tao/Invocation_Retry_State.cpp @@ -31,7 +31,6 @@ namespace TAO::Invocation_Retry_Params &client_factory_params, TAO::Invocation_Retry_Params &result) { - // Retry delay if (command_line_params.init_retry_delay_ != result.init_retry_delay_) diff --git a/TAO/tao/Messaging/Asynch_Invocation.cpp b/TAO/tao/Messaging/Asynch_Invocation.cpp index af7ebc612a5..5a94b7bf591 100644 --- a/TAO/tao/Messaging/Asynch_Invocation.cpp +++ b/TAO/tao/Messaging/Asynch_Invocation.cpp @@ -153,7 +153,6 @@ namespace TAO } catch ( ::CORBA::Exception& ex) { - PortableInterceptor::ReplyStatus const status = this->handle_any_exception (&ex); diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h index 02a182a3a54..53ef3556a4a 100644 --- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h +++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h @@ -44,7 +44,6 @@ class TAO_ConnectionTimeoutPolicy : public TAO::ConnectionTimeoutPolicy, public ::CORBA::LocalObject { - public: /// Constructor. TAO_ConnectionTimeoutPolicy (const TimeBase::TimeT& relative_expiry); diff --git a/TAO/tao/Messaging/Messaging_ORBInitializer.h b/TAO/tao/Messaging/Messaging_ORBInitializer.h index 41a5f878f0f..0e549725264 100644 --- a/TAO/tao/Messaging/Messaging_ORBInitializer.h +++ b/TAO/tao/Messaging/Messaging_ORBInitializer.h @@ -45,7 +45,6 @@ public: * PortableInterceptor::ORBInitializer interface. */ //@{ - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index f5dde223670..ca14b4dc6c7 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -1084,7 +1084,6 @@ namespace TAO const ACE_TCHAR* orb_opt, ACE_TString& opt_arg) { - if (opt_arg.length () > 0) return false; diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index c95ad9cdb57..563beba019f 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -1727,7 +1727,6 @@ TAO_ORB_Core::collocation_resolver () TAO::PolicyFactory_Registry_Adapter * TAO_ORB_Core::policy_factory_registry_i () { - TAO_PolicyFactory_Registry_Factory *loader = ACE_Dynamic_Service<TAO_PolicyFactory_Registry_Factory>::instance (this->configuration (), @@ -2991,7 +2990,6 @@ TAO_ORB_Core::input_cdr_msgblock_allocator () ACE_Allocator* TAO_ORB_Core::output_cdr_dblock_allocator () { - return this->lane_resources ().output_cdr_dblock_allocator (); } @@ -3019,7 +3017,6 @@ TAO_ORB_Core::transport_message_buffer_allocator () ACE_Data_Block* TAO_ORB_Core::create_input_cdr_data_block (size_t size) { - ACE_Allocator *dblock_allocator = nullptr; ACE_Allocator *buffer_allocator = nullptr; @@ -3096,7 +3093,6 @@ TAO_ORB_Core::implrepo_service () if (CORBA::is_nil (this->implrepo_service_)) { - try { CORBA::Object_var temp = diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index 0824ac96c6a..84f2af9e925 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -1112,7 +1112,6 @@ protected: * @name Service Level Hooks */ //@{ - /// Fault Tolerant service hook. TAO_Fault_Tolerance_Service ft_service_; diff --git a/TAO/tao/ORB_Time_Policy.h b/TAO/tao/ORB_Time_Policy.h index 4ecf73e2b12..0c2ca82c860 100644 --- a/TAO/tao/ORB_Time_Policy.h +++ b/TAO/tao/ORB_Time_Policy.h @@ -28,7 +28,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - /** * @class ORB_Time_Policy * diff --git a/TAO/tao/ObjectKey_Table.cpp b/TAO/tao/ObjectKey_Table.cpp index b6c5474b37f..9d00c62275c 100644 --- a/TAO/tao/ObjectKey_Table.cpp +++ b/TAO/tao/ObjectKey_Table.cpp @@ -34,7 +34,6 @@ TAO::Less_Than_ObjectKey::operator () (const TAO::ObjectKey &lhs, TAO::ObjectKey_Table::ObjectKey_Table () : table_ () { - } TAO::ObjectKey_Table::~ObjectKey_Table () diff --git a/TAO/tao/ObjectKey_Table.h b/TAO/tao/ObjectKey_Table.h index cda65442d17..2928beea0e4 100644 --- a/TAO/tao/ObjectKey_Table.h +++ b/TAO/tao/ObjectKey_Table.h @@ -30,7 +30,6 @@ class TAO_ORB_Core; namespace TAO { - // Forward declarations within the namespace.. class Refcounted_ObjectKey; class ObjectKey; diff --git a/TAO/tao/Object_KeyC.h b/TAO/tao/Object_KeyC.h index 3ad8a251c09..f7654d0916d 100644 --- a/TAO/tao/Object_KeyC.h +++ b/TAO/tao/Object_KeyC.h @@ -56,7 +56,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 diff --git a/TAO/tao/Object_Reference_Const_Sequence_Element_T.h b/TAO/tao/Object_Reference_Const_Sequence_Element_T.h index c1ee3742cab..8b9b5b4c9eb 100644 --- a/TAO/tao/Object_Reference_Const_Sequence_Element_T.h +++ b/TAO/tao/Object_Reference_Const_Sequence_Element_T.h @@ -16,7 +16,6 @@ namespace TAO { namespace details { - template<typename obj_ref_traits> class object_reference_const_sequence_element { diff --git a/TAO/tao/Object_Reference_Sequence_Element_T.h b/TAO/tao/Object_Reference_Sequence_Element_T.h index 0a5d309ae01..5f1830bd955 100644 --- a/TAO/tao/Object_Reference_Sequence_Element_T.h +++ b/TAO/tao/Object_Reference_Sequence_Element_T.h @@ -18,7 +18,6 @@ namespace TAO { namespace details { - template<typename obj_ref_traits> class object_reference_sequence_element { diff --git a/TAO/tao/Object_Reference_Traits_Base_T.h b/TAO/tao/Object_Reference_Traits_Base_T.h index 6cd26d29ed5..22be2aea432 100644 --- a/TAO/tao/Object_Reference_Traits_Base_T.h +++ b/TAO/tao/Object_Reference_Traits_Base_T.h @@ -16,7 +16,6 @@ namespace TAO { namespace details { - template<typename object_t, typename object_t_var> struct object_reference_traits_base { diff --git a/TAO/tao/Object_Reference_Traits_T.h b/TAO/tao/Object_Reference_Traits_T.h index 6188ac697d7..7f5d85519aa 100644 --- a/TAO/tao/Object_Reference_Traits_T.h +++ b/TAO/tao/Object_Reference_Traits_T.h @@ -20,7 +20,6 @@ namespace TAO { namespace details { - template<class object_t, class object_t_var, class derived> struct object_reference_traits_decorator { diff --git a/TAO/tao/PI/DLL_Resident_ORB_Initializer.h b/TAO/tao/PI/DLL_Resident_ORB_Initializer.h index c1bec77d2f4..b6ede5251ec 100644 --- a/TAO/tao/PI/DLL_Resident_ORB_Initializer.h +++ b/TAO/tao/PI/DLL_Resident_ORB_Initializer.h @@ -34,7 +34,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace PortableInterceptor { - /** * @class DLL_Resident_ORB_Initializer * diff --git a/TAO/tao/PI/PolicyFactoryA.h b/TAO/tao/PI/PolicyFactoryA.h index 861f812f98d..e957c8ba187 100644 --- a/TAO/tao/PI/PolicyFactoryA.h +++ b/TAO/tao/PI/PolicyFactoryA.h @@ -41,7 +41,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace PortableInterceptor { - // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 diff --git a/TAO/tao/PI/PolicyFactoryC.h b/TAO/tao/PI/PolicyFactoryC.h index db4338c0fb0..4c6b401933f 100644 --- a/TAO/tao/PI/PolicyFactoryC.h +++ b/TAO/tao/PI/PolicyFactoryC.h @@ -54,7 +54,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace PortableInterceptor { - // TAO_IDL - Generated from // be\be_interface.cpp:646 @@ -165,7 +164,6 @@ namespace PortableInterceptor // Traits specializations. namespace TAO { - #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_) #define _PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_ diff --git a/TAO/tao/PI_Server/ServerRequestInfo.h b/TAO/tao/PI_Server/ServerRequestInfo.h index 7ef14aae70b..47b36ca9678 100644 --- a/TAO/tao/PI_Server/ServerRequestInfo.h +++ b/TAO/tao/PI_Server/ServerRequestInfo.h @@ -188,7 +188,6 @@ namespace TAO * @name Helper methods specific to TAO. */ //@{ - /// Extract the forward object reference from the /// @c PortableInterceptor::ForwardRequest exception, and set the /// reply status flag accordingly. diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorA.h b/TAO/tao/PI_Server/ServerRequestInterceptorA.h index c9e7ad47ee1..49505bfa846 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptorA.h +++ b/TAO/tao/PI_Server/ServerRequestInterceptorA.h @@ -44,7 +44,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace PortableInterceptor { - // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorC.h b/TAO/tao/PI_Server/ServerRequestInterceptorC.h index b1b298e9fe5..46e13639fe3 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptorC.h +++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.h @@ -56,7 +56,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace PortableInterceptor { - // TAO_IDL - Generated from // be\be_interface.cpp:646 @@ -231,7 +230,6 @@ namespace PortableInterceptor // Traits specializations. namespace TAO { - #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_) #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_ diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp index c67e751dd84..420560c0019 100644 --- a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp +++ b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp @@ -164,7 +164,6 @@ namespace TAO void Active_Policy_Strategies::cleanup (void) { - if (this->lifespan_strategy_ != 0) { this->lifespan_strategy_factory_->destroy (lifespan_strategy_); diff --git a/TAO/tao/PortableServer/Collocated_Arguments_Converter.cpp b/TAO/tao/PortableServer/Collocated_Arguments_Converter.cpp index c0624954643..c33fc01d4f9 100644 --- a/TAO/tao/PortableServer/Collocated_Arguments_Converter.cpp +++ b/TAO/tao/PortableServer/Collocated_Arguments_Converter.cpp @@ -5,7 +5,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - Collocated_Arguments_Converter::~Collocated_Arguments_Converter (void) { } diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.cpp b/TAO/tao/PortableServer/POA_Cached_Policies.cpp index 4b3ac88f9c4..04c49144bb8 100644 --- a/TAO/tao/PortableServer/POA_Cached_Policies.cpp +++ b/TAO/tao/PortableServer/POA_Cached_Policies.cpp @@ -53,7 +53,6 @@ namespace TAO void Cached_Policies::update_policy (const CORBA::Policy_ptr policy) { - #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) ::PortableServer::ThreadPolicy_var thread = ::PortableServer::ThreadPolicy::_narrow (policy); diff --git a/TAO/tao/PortableServer/PS_ForwardA.h b/TAO/tao/PortableServer/PS_ForwardA.h index 6da547b0892..07b10640902 100644 --- a/TAO/tao/PortableServer/PS_ForwardA.h +++ b/TAO/tao/PortableServer/PS_ForwardA.h @@ -42,7 +42,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace PortableServer { - // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp index 674325ce40e..89123a4c71d 100644 --- a/TAO/tao/PortableServer/Root_POA.cpp +++ b/TAO/tao/PortableServer/Root_POA.cpp @@ -1499,7 +1499,6 @@ TAO_Root_POA::cleanup_servant ( PortableServer::Servant TAO_Root_POA::id_to_servant_i (const PortableServer::ObjectId &id) { - PortableServer::Servant servant = this->active_policy_strategies_.request_processing_strategy()-> id_to_servant (id); diff --git a/TAO/tao/Profile_Transport_Resolver.cpp b/TAO/tao/Profile_Transport_Resolver.cpp index 860a3283295..98fd6be0558 100644 --- a/TAO/tao/Profile_Transport_Resolver.cpp +++ b/TAO/tao/Profile_Transport_Resolver.cpp @@ -27,7 +27,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - Profile_Transport_Resolver::~Profile_Transport_Resolver () { if (this->profile_) diff --git a/TAO/tao/Queued_Message.h b/TAO/tao/Queued_Message.h index 2decc9345f5..7a934b81b81 100644 --- a/TAO/tao/Queued_Message.h +++ b/TAO/tao/Queued_Message.h @@ -127,7 +127,6 @@ public: /** @name Template Methods */ //@{ - /// Return the length of the message /** * If the message has been partially sent it returns the number of diff --git a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp index 18856e3bcaa..02e60c76f7b 100644 --- a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp +++ b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp @@ -79,7 +79,6 @@ CORBA::Boolean TAO_Continuous_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority, RTCORBA::Priority &corba_priority) { - #if defined (ACE_WIN32) int current_native_priority = this->min_; diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h index b904e3dfaa0..1f8add11c64 100644 --- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h +++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h @@ -45,7 +45,6 @@ namespace RTCORBA class TAO_RTCORBA_Export TAO_Network_Priority_Mapping_Manager : public virtual ::CORBA::LocalObject { - public: /// Constructor. TAO_Network_Priority_Mapping_Manager (RTCORBA::NetworkPriorityMapping * mapping); diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h index 5ce01aa483c..74c6cf04d38 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h +++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h @@ -42,7 +42,6 @@ typedef TAO_Priority_Mapping_Manager *TAO_Priority_Mapping_Manager_ptr; class TAO_RTCORBA_Export TAO_Priority_Mapping_Manager : public virtual ::CORBA::LocalObject { - public: /// Constructor. TAO_Priority_Mapping_Manager (RTCORBA::PriorityMapping * mapping); diff --git a/TAO/tao/RTCORBA/RT_Current.cpp b/TAO/tao/RTCORBA/RT_Current.cpp index 3a639f5b55c..5c6afe6f9f6 100644 --- a/TAO/tao/RTCORBA/RT_Current.cpp +++ b/TAO/tao/RTCORBA/RT_Current.cpp @@ -47,7 +47,6 @@ TAO_RT_Current::the_priority (void) void TAO_RT_Current::the_priority (RTCORBA::Priority the_priority) { - TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks (); if (tph->set_thread_CORBA_priority (the_priority) == -1) diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp index ece8bd20950..9db98ee6a33 100644 --- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp +++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp @@ -124,7 +124,6 @@ TAO_RT_Invocation_Endpoint_Selector::select_endpoint_based_on_client_protocol_po CORBA::PolicyList *p = r.inconsistent_policies (); if (p) { - p->length (1); (*p)[0u] = CORBA::Policy::_duplicate (client_protocol_policy); } @@ -176,7 +175,6 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile ( CORBA::PolicyList *p = r.inconsistent_policies (); if (p) { - p->length (1); (*p)[0u] = CORBA::Policy::_duplicate (bands_policy.in ()); } @@ -234,7 +232,6 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile ( // If there are no bands. if (bands_policy.ptr () == 0) { - // Match the priority of the client thread with the // endpoint. match_priority = true; diff --git a/TAO/tao/RTCORBA/RT_ORB.h b/TAO/tao/RTCORBA/RT_ORB.h index d70bd745590..d0d4f4832fb 100644 --- a/TAO/tao/RTCORBA/RT_ORB.h +++ b/TAO/tao/RTCORBA/RT_ORB.h @@ -46,7 +46,6 @@ class TAO_Thread_Pool_Manager; */ class TAO_RTCORBA_Export TAO_Named_RT_Mutex_Manager { - public: /// Constructor. TAO_Named_RT_Mutex_Manager (void); diff --git a/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.cpp b/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.cpp index b1315fc4b69..bbb61423afd 100644 --- a/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.cpp +++ b/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.cpp @@ -86,7 +86,6 @@ namespace TAO namespace CORBA { - /// Copying insertion. void operator<<= ( diff --git a/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.h b/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.h index 698f884583d..cbe34fe82c0 100644 --- a/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.h +++ b/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.h @@ -44,7 +44,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace RTCORBA { - // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 diff --git a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h index 62e45e792f9..c18fa08a7de 100644 --- a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h +++ b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h @@ -53,7 +53,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace RTCORBA { - // TAO_IDL - Generated from // be\be_interface.cpp:638 @@ -148,7 +147,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Traits specializations. namespace TAO { - #if !defined (_RTCORBA_PROTOCOLPROPERTIES__TRAITS_) #define _RTCORBA_PROTOCOLPROPERTIES__TRAITS_ diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h index 8f14615e171..913a5e11ae7 100644 --- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h +++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h @@ -64,7 +64,6 @@ public: /// @name Accessors // @{ - TAO_Thread_Lane_Resources &lane_resources (void); TAO_Thread_Lane_Resources &default_lane_resources (void); diff --git a/TAO/tao/RTCORBA/Thread_Pool.h b/TAO/tao/RTCORBA/Thread_Pool.h index 35fb64f6d14..55058e5c6ae 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.h +++ b/TAO/tao/RTCORBA/Thread_Pool.h @@ -306,7 +306,6 @@ public: /// @name Accessors // @{ - TAO_Thread_Pool_Manager &manager () const; CORBA::ULong id () const; @@ -406,7 +405,6 @@ public: private: /// @name Helpers // @{ - RTCORBA::ThreadpoolId create_threadpool_i (CORBA::ULong stacksize, CORBA::ULong static_threads, diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp index c2723bf3462..f141bfa18eb 100644 --- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp +++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp @@ -154,7 +154,6 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request ( { if (TAO_debug_level > 0) { - // If we are in a multi-threaded configuration, print out the current // thread priority. #if defined (ACE_HAS_THREADS) diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp index 2c23be762b7..930fa49f2db 100644 --- a/TAO/tao/RTScheduling/Current.cpp +++ b/TAO/tao/RTScheduling/Current.cpp @@ -167,7 +167,6 @@ TAO_RTScheduler_Current::id (void) CORBA::Policy_ptr TAO_RTScheduler_Current::scheduling_parameter (void) { - TAO_RTScheduler_Current_i *impl = this->implementation (); if (impl == 0) @@ -427,7 +426,6 @@ TAO_RTScheduler_Current_i::end_scheduling_segment (const char * name) // A Nested segment. } else { - // Inform scheduler of end of nested // scheduling segment. this->scheduler_->end_nested_scheduling_segment (this->guid_, @@ -575,7 +573,6 @@ DTTask::svc () { try { - TAO_TSS_Resources *tss = TAO_TSS_Resources::instance (); @@ -602,7 +599,6 @@ DTTask::svc () RTScheduling::Current::IdType * TAO_RTScheduler_Current_i::id () { - RTScheduling::Current::IdType_var guid = this->guid_; return guid._retn (); } diff --git a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp index a431e8c4be4..81e1b7ae75a 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp +++ b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp @@ -114,7 +114,6 @@ TAO_RTScheduler_ORB_Initializer::pre_init ( void TAO_RTScheduler_ORB_Initializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) { - // @@ This is busted. TAO_ORBInitInfo should do proper reference // counting. // Narrow to a TAO_ORBInitInfo object to get access to the diff --git a/TAO/tao/Range_Checking_T.h b/TAO/tao/Range_Checking_T.h index 747602686b8..513d80a1d61 100644 --- a/TAO/tao/Range_Checking_T.h +++ b/TAO/tao/Range_Checking_T.h @@ -22,7 +22,6 @@ namespace TAO { namespace details { - /** * @struct range_checking * diff --git a/TAO/tao/Reply_Dispatcher.h b/TAO/tao/Reply_Dispatcher.h index 0b6c39a311d..6b8e940de51 100644 --- a/TAO/tao/Reply_Dispatcher.h +++ b/TAO/tao/Reply_Dispatcher.h @@ -54,7 +54,6 @@ class TAO_Pluggable_Reply_Params; */ class TAO_Export TAO_Reply_Dispatcher { - public: /// Constructor. TAO_Reply_Dispatcher (ACE_Allocator *allocator = 0); diff --git a/TAO/tao/Resume_Handle.h b/TAO/tao/Resume_Handle.h index c8815b230ed..2353f0c6047 100644 --- a/TAO/tao/Resume_Handle.h +++ b/TAO/tao/Resume_Handle.h @@ -44,7 +44,6 @@ class TAO_ORB_Core; */ class TAO_Export TAO_Resume_Handle { - public: /// Constructor. TAO_Resume_Handle (TAO_ORB_Core *orb_core = 0, diff --git a/TAO/tao/Storable_File_Guard.cpp b/TAO/tao/Storable_File_Guard.cpp index 8f595d7de08..583dbbb34e9 100644 --- a/TAO/tao/Storable_File_Guard.cpp +++ b/TAO/tao/Storable_File_Guard.cpp @@ -32,7 +32,6 @@ TAO::Storable_File_Guard:: void TAO::Storable_File_Guard::init_no_load(Method_Type method_type) { - ACE_CString mode; this->rwflags_ = 0; switch (method_type) @@ -230,7 +229,6 @@ TAO::Storable_File_Guard::load () // result of 0 means OK. We should now have a good primary file. if (!result) { - TAOLIB_ERROR ((LM_INFO, ACE_TEXT ("TAO: (%P|%t) Attempting to restore ") ACE_TEXT ("from backup\n"))); diff --git a/TAO/tao/Storable_File_Guard.h b/TAO/tao/Storable_File_Guard.h index 7f33ba7c681..3b61d85966d 100644 --- a/TAO/tao/Storable_File_Guard.h +++ b/TAO/tao/Storable_File_Guard.h @@ -52,7 +52,6 @@ namespace TAO /// the persistent store. enum Method_Type { - /// Construction with persistent file already existing CREATE_WITH_FILE, diff --git a/TAO/tao/Strategies/COIOP_Transport.h b/TAO/tao/Strategies/COIOP_Transport.h index 6a92e67aa80..98a42fc419e 100644 --- a/TAO/tao/Strategies/COIOP_Transport.h +++ b/TAO/tao/Strategies/COIOP_Transport.h @@ -63,7 +63,6 @@ protected: * These are implementations of template methods declared by TAO_Transport. */ //@{ - virtual ACE_Event_Handler * event_handler_i (void); virtual TAO_Connection_Handler *connection_handler_i (void); diff --git a/TAO/tao/Strategies/DIOP_Transport.h b/TAO/tao/Strategies/DIOP_Transport.h index 6f1f2ffb8c0..2b8563a6f09 100644 --- a/TAO/tao/Strategies/DIOP_Transport.h +++ b/TAO/tao/Strategies/DIOP_Transport.h @@ -67,7 +67,6 @@ protected: * These are implementations of template methods declared by TAO_Transport. */ //@{ - virtual ACE_Event_Handler * event_handler_i (void); virtual TAO_Connection_Handler *connection_handler_i (void); diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.cpp b/TAO/tao/Strategies/SCIOP_Acceptor.cpp index c5264f5d01e..73b72faa964 100644 --- a/TAO/tao/Strategies/SCIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/SCIOP_Acceptor.cpp @@ -215,7 +215,6 @@ TAO_SCIOP_Acceptor::open (TAO_ORB_Core *orb_core, const char *address, const char *options) { - this->orb_core_ = orb_core; if (this->hosts_ != 0) @@ -274,7 +273,6 @@ TAO_SCIOP_Acceptor::open (TAO_ORB_Core *orb_core, size_t hostname_length = 0; if (port_separator_loc != 0) { - // Port separator was found. Check that the next character is // not the terminator. const char *port_loc = port_separator_loc; @@ -299,7 +297,6 @@ TAO_SCIOP_Acceptor::open (TAO_ORB_Core *orb_core, hostname_length = port_separator_loc - address; } else { - // Port separator was not found. We allow port_number to retain // the value of 0, which will cause the port to be chosen for us // in open_i. @@ -359,7 +356,6 @@ TAO_SCIOP_Acceptor::open (TAO_ORB_Core *orb_core, size_t i = 0; ACE_INET_Addr temp_addr; while (i < num_secondary_ip_addrs) { - // Obtain a char* for a single secondary hostname. ACE_CString & hostname_obj = hostnames[i + 1]; ACE_Auto_Basic_Array_Ptr<char> hostname_auto(hostname_obj.rep()); @@ -408,7 +404,6 @@ TAO_SCIOP_Acceptor::open (TAO_ORB_Core *orb_core, // Set cached hostnames. i = 0; while (i < hostnames.size()) { - // The hostname_in_ior_ field may override the FIRST hostname only. if (this->hostname_in_ior_ != 0 && i == 0) { @@ -806,7 +801,6 @@ int TAO_SCIOP_Acceptor::parse_multiple_hostnames (const char *hostnames, ACE_Array<ACE_CString> &hostnames_out) { - // Make a copy of hostnames string int const hostnames_string_length = std::strlen(hostnames) + 1; char* hostnames_copy = 0; @@ -828,7 +822,6 @@ TAO_SCIOP_Acceptor::parse_multiple_hostnames (const char *hostnames, // Set the size of the array to the number of hostnames if (hostnames_out.size(num_hostnames) == -1) { - TAOLIB_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Could not allocate storage ") ACE_TEXT ("for %d hostnames in SCIOP endpoint\n"), diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.h b/TAO/tao/Strategies/SCIOP_Connection_Handler.h index d9bc38dddb7..0871585888b 100644 --- a/TAO/tao/Strategies/SCIOP_Connection_Handler.h +++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.h @@ -57,7 +57,6 @@ class TAO_Strategies_Export TAO_SCIOP_Connection_Handler : public TAO_SCIOP_SVC_HANDLER, public TAO_Connection_Handler { - public: TAO_SCIOP_Connection_Handler (ACE_Thread_Manager* t = 0); diff --git a/TAO/tao/Strategies/SCIOP_Transport.h b/TAO/tao/Strategies/SCIOP_Transport.h index 5d5fb2ed7ea..29258a9b221 100644 --- a/TAO/tao/Strategies/SCIOP_Transport.h +++ b/TAO/tao/Strategies/SCIOP_Transport.h @@ -64,7 +64,6 @@ protected: * details. */ //@{ - virtual ACE_Event_Handler * event_handler_i (void); virtual ssize_t send (iovec *iov, int iovcnt, diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h index 360e37d2015..fd87499568d 100644 --- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h +++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h @@ -43,7 +43,6 @@ class TAO_Strategies_Export TAO_SHMIOP_Connection_Handler : public TAO_SHMIOP_SVC_HANDLER, public TAO_Connection_Handler { - public: /// Constructor. TAO_SHMIOP_Connection_Handler (ACE_Thread_Manager* t = 0); diff --git a/TAO/tao/Strategies/UIOP_Transport.h b/TAO/tao/Strategies/UIOP_Transport.h index aa3f7b9a2a8..8441cb44d95 100644 --- a/TAO/tao/Strategies/UIOP_Transport.h +++ b/TAO/tao/Strategies/UIOP_Transport.h @@ -61,7 +61,6 @@ protected: * These are implementations of template methods declared by TAO_Transport. */ //@{ - virtual ACE_Event_Handler * event_handler_i (void); virtual TAO_Connection_Handler *connection_handler_i (void); diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp index 385dc65ea31..b3529e2ea53 100644 --- a/TAO/tao/Strategies/advanced_resource.cpp +++ b/TAO/tao/Strategies/advanced_resource.cpp @@ -43,7 +43,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Resource_Factory_Changer::TAO_Resource_Factory_Changer (void) { - TAO_ORB_Core::set_resource_factory ("Advanced_Resource_Factory"); ACE_Service_Config::process_directive (ace_svc_desc_TAO_Advanced_Resource_Factory); diff --git a/TAO/tao/String_Const_Sequence_Element_T.h b/TAO/tao/String_Const_Sequence_Element_T.h index 792431d82ce..c3a158adc66 100644 --- a/TAO/tao/String_Const_Sequence_Element_T.h +++ b/TAO/tao/String_Const_Sequence_Element_T.h @@ -17,7 +17,6 @@ namespace TAO { namespace details { - template<typename traits> class string_const_sequence_element { diff --git a/TAO/tao/String_Sequence_Element_T.h b/TAO/tao/String_Sequence_Element_T.h index b749ae10434..0e296d904a9 100644 --- a/TAO/tao/String_Sequence_Element_T.h +++ b/TAO/tao/String_Sequence_Element_T.h @@ -19,7 +19,6 @@ namespace TAO { namespace details { - template<typename traits> class string_sequence_element { @@ -105,7 +104,6 @@ public: } inline string_out out () const { - if (release()) { traits::release(*element_); diff --git a/TAO/tao/String_Traits_Base_T.h b/TAO/tao/String_Traits_Base_T.h index fde366464c3..d750ddd1f7e 100644 --- a/TAO/tao/String_Traits_Base_T.h +++ b/TAO/tao/String_Traits_Base_T.h @@ -27,7 +27,6 @@ class String_out; namespace details { - template<typename charT> struct string_traits_base { diff --git a/TAO/tao/String_Traits_T.h b/TAO/tao/String_Traits_T.h index ca45b9ef367..3140ce3edca 100644 --- a/TAO/tao/String_Traits_T.h +++ b/TAO/tao/String_Traits_T.h @@ -20,7 +20,6 @@ namespace TAO { namespace details { - template<typename char_type, class derived> struct string_traits_decorator { diff --git a/TAO/tao/Synch_Reply_Dispatcher.h b/TAO/tao/Synch_Reply_Dispatcher.h index 78b73221a11..492ee780dc7 100644 --- a/TAO/tao/Synch_Reply_Dispatcher.h +++ b/TAO/tao/Synch_Reply_Dispatcher.h @@ -42,7 +42,6 @@ class TAO_Export TAO_Synch_Reply_Dispatcher : public TAO_Reply_Dispatcher , public TAO_LF_Invocation_Event { - public: /// Constructor. TAO_Synch_Reply_Dispatcher (TAO_ORB_Core *orb_core, diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp index 2bdb10bdcbe..23668c5a517 100644 --- a/TAO/tao/TAO_Internal.cpp +++ b/TAO/tao/TAO_Internal.cpp @@ -572,7 +572,6 @@ namespace bool skip_service_config_open, bool ignore_default_svc_conf_file) { - if (skip_service_config_open) { return 0; diff --git a/TAO/tao/TAO_Singleton.h b/TAO/tao/TAO_Singleton.h index a4563cb3c81..4a55e38443e 100644 --- a/TAO/tao/TAO_Singleton.h +++ b/TAO/tao/TAO_Singleton.h @@ -44,7 +44,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <class TYPE, class ACE_LOCK> class TAO_Singleton : public ACE_Cleanup { - public: /// Global access point to the Singleton. static TYPE *instance (); diff --git a/TAO/tao/Thread_Lane_Resources.h b/TAO/tao/Thread_Lane_Resources.h index f1b7869006b..86a789e535b 100644 --- a/TAO/tao/Thread_Lane_Resources.h +++ b/TAO/tao/Thread_Lane_Resources.h @@ -76,7 +76,6 @@ public: /// @name Accessors //@{ - TAO_Acceptor_Registry &acceptor_registry (); /** diff --git a/TAO/tao/TkResource/TkResource_Factory.cpp b/TAO/tao/TkResource/TkResource_Factory.cpp index 7fec8956aa6..efb04c92090 100644 --- a/TAO/tao/TkResource/TkResource_Factory.cpp +++ b/TAO/tao/TkResource/TkResource_Factory.cpp @@ -6,7 +6,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - TkResource_Factory::TkResource_Factory (void) : reactor_impl_ (0) { diff --git a/TAO/tao/TkResource/TkResource_Factory.h b/TAO/tao/TkResource/TkResource_Factory.h index 77146a4a393..4702f825b3a 100644 --- a/TAO/tao/TkResource/TkResource_Factory.h +++ b/TAO/tao/TkResource/TkResource_Factory.h @@ -23,7 +23,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - /** * @class TkResource_Factory * diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp index 8fbeea0093d..21984df8da6 100644 --- a/TAO/tao/Transport.cpp +++ b/TAO/tao/Transport.cpp @@ -2109,7 +2109,6 @@ TAO_Transport::handle_input_parse_data (TAO_Resume_Handle &rh, message_block.copy (this->partial_message_->rd_ptr (), this->partial_message_->length ()) == 0) { - recv_size -= this->partial_message_->length (); // reset is done later to avoid problem in case of EWOULDBLOCK // or EAGAIN errno diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h index fce15a1dcf8..4268a276746 100644 --- a/TAO/tao/Transport.h +++ b/TAO/tao/Transport.h @@ -550,7 +550,6 @@ public: * strategies implement them correctly. */ //@{ - /// Request has been just sent, but the reply is not received. Idle /// the transport now. bool idle_after_send (); @@ -615,7 +614,6 @@ public: * following methods with the semantics documented below. */ //@{ - /// Return the event handler used to receive notifications from the /// Reactor. /** diff --git a/TAO/tao/TransportCurrent/Current_Impl.cpp b/TAO/tao/TransportCurrent/Current_Impl.cpp index 3ccc5a27601..3dc2406b05a 100644 --- a/TAO/tao/TransportCurrent/Current_Impl.cpp +++ b/TAO/tao/TransportCurrent/Current_Impl.cpp @@ -20,7 +20,6 @@ namespace TAO { namespace Transport { - /// ctor Current_Impl::Current_Impl (TAO_ORB_Core* core, size_t tss_slot_id) : core_ (core) diff --git a/TAO/tao/TransportCurrent/Current_Impl.h b/TAO/tao/TransportCurrent/Current_Impl.h index cbc30649131..7b2c1e4db15 100644 --- a/TAO/tao/TransportCurrent/Current_Impl.h +++ b/TAO/tao/TransportCurrent/Current_Impl.h @@ -20,7 +20,6 @@ namespace TAO { namespace Transport { - // Forward decl class Stats; diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp b/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp index 668f40aa9f4..491a57c65a6 100644 --- a/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp +++ b/TAO/tao/TransportCurrent/Current_ORBInitializer.cpp @@ -14,7 +14,6 @@ namespace TAO { namespace Transport { - template <typename Impl> Current_ORBInitializer<Impl>::Current_ORBInitializer(const ACE_TCHAR* id) : Current_ORBInitializer_Base (id) diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer.h b/TAO/tao/TransportCurrent/Current_ORBInitializer.h index 4e6c3cfa13f..4e31955cdf2 100644 --- a/TAO/tao/TransportCurrent/Current_ORBInitializer.h +++ b/TAO/tao/TransportCurrent/Current_ORBInitializer.h @@ -26,7 +26,6 @@ namespace TAO { namespace Transport { - template <typename Impl> class Current_ORBInitializer : public Current_ORBInitializer_Base diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp index 62960016660..ca77b2e33af 100644 --- a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp +++ b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp @@ -8,7 +8,6 @@ namespace TAO { namespace Transport { - Current_ORBInitializer_Base::Current_ORBInitializer_Base(const ACE_TCHAR* id) : id_ (id) { diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp b/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp index 1885d524586..722f7d83bbb 100644 --- a/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp +++ b/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp @@ -16,8 +16,6 @@ namespace TAO { namespace Transport { - - /// Obtains the IIOP_Connection_Handler associated with the /// Transport. Will throw NoContext if the (selected) transport /// () == 0, or if transport->connection_handler () == 0. Will diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Impl.h b/TAO/tao/TransportCurrent/IIOP_Current_Impl.h index 3e94c9d88b9..a4d89175c27 100644 --- a/TAO/tao/TransportCurrent/IIOP_Current_Impl.h +++ b/TAO/tao/TransportCurrent/IIOP_Current_Impl.h @@ -31,7 +31,6 @@ namespace TAO { namespace Transport { - /** * @class IIOP_Current_Impl * diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Loader.h b/TAO/tao/TransportCurrent/IIOP_Current_Loader.h index 91bf6176485..939eab0a20f 100644 --- a/TAO/tao/TransportCurrent/IIOP_Current_Loader.h +++ b/TAO/tao/TransportCurrent/IIOP_Current_Loader.h @@ -25,7 +25,6 @@ namespace TAO { namespace Transport { - namespace IIOP { class TAO_Transport_Current_Export Current_Loader diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp index ee4e1641e7e..c5301cece9c 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp @@ -567,7 +567,6 @@ TAO_TypeCodeFactory_i::create_union_tc ( if (is_recursive) { - recursive_typecode_type * const rtc = dynamic_cast<recursive_typecode_type *> (recursive_tc.in ()); diff --git a/TAO/tao/Typecode_typesC.h b/TAO/tao/Typecode_typesC.h index 6042574391b..8a6b9778b87 100644 --- a/TAO/tao/Typecode_typesC.h +++ b/TAO/tao/Typecode_typesC.h @@ -51,7 +51,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace CORBA { - // TAO_IDL - Generated from // be\be_interface.cpp:598 diff --git a/TAO/tao/Unbounded_Array_Allocation_Traits_T.h b/TAO/tao/Unbounded_Array_Allocation_Traits_T.h index 27ff7275728..c1bff8b70ec 100644 --- a/TAO/tao/Unbounded_Array_Allocation_Traits_T.h +++ b/TAO/tao/Unbounded_Array_Allocation_Traits_T.h @@ -17,7 +17,6 @@ namespace TAO { namespace details { - template<typename T, bool dummy> struct unbounded_array_allocation_traits { diff --git a/TAO/tao/Unbounded_Array_Sequence_T.h b/TAO/tao/Unbounded_Array_Sequence_T.h index 2de921a3f0b..6a304a519b9 100644 --- a/TAO/tao/Unbounded_Array_Sequence_T.h +++ b/TAO/tao/Unbounded_Array_Sequence_T.h @@ -15,7 +15,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - template<typename T_array, typename T_slice, typename T_tag> class unbounded_array_sequence { diff --git a/TAO/tao/Unbounded_Object_Reference_Sequence_T.h b/TAO/tao/Unbounded_Object_Reference_Sequence_T.h index 5806cdbdad2..2de1bb30c5a 100644 --- a/TAO/tao/Unbounded_Object_Reference_Sequence_T.h +++ b/TAO/tao/Unbounded_Object_Reference_Sequence_T.h @@ -17,7 +17,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - template<typename object_t, typename object_t_var> class unbounded_object_reference_sequence { diff --git a/TAO/tao/Unbounded_Reference_Allocation_Traits_T.h b/TAO/tao/Unbounded_Reference_Allocation_Traits_T.h index be46e593cae..cd0a1e650cf 100644 --- a/TAO/tao/Unbounded_Reference_Allocation_Traits_T.h +++ b/TAO/tao/Unbounded_Reference_Allocation_Traits_T.h @@ -17,7 +17,6 @@ namespace TAO { namespace details { - template<typename T, class ref_traits, bool dummy> struct unbounded_reference_allocation_traits { diff --git a/TAO/tao/Unbounded_Value_Allocation_Traits_T.h b/TAO/tao/Unbounded_Value_Allocation_Traits_T.h index 1c35d77d422..b4f7e964db3 100644 --- a/TAO/tao/Unbounded_Value_Allocation_Traits_T.h +++ b/TAO/tao/Unbounded_Value_Allocation_Traits_T.h @@ -17,7 +17,6 @@ namespace TAO { namespace details { - template<typename T, bool dummy> struct unbounded_value_allocation_traits { diff --git a/TAO/tao/Unbounded_Value_Sequence_T.h b/TAO/tao/Unbounded_Value_Sequence_T.h index 2d268a1ba39..a9cbab9133e 100644 --- a/TAO/tao/Unbounded_Value_Sequence_T.h +++ b/TAO/tao/Unbounded_Value_Sequence_T.h @@ -17,7 +17,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - template<class T, class Tag=int> class unbounded_value_sequence { diff --git a/TAO/tao/Utils/Implicit_Deactivator.cpp b/TAO/tao/Utils/Implicit_Deactivator.cpp index 0115d46cf88..76066530e04 100644 --- a/TAO/tao/Utils/Implicit_Deactivator.cpp +++ b/TAO/tao/Utils/Implicit_Deactivator.cpp @@ -7,7 +7,6 @@ void TAO::Utils::Implicit_Deactivation_Functor::operator () ( PortableServer::ServantBase * servant) throw () { - try { PortableServer::POA_var poa (servant->_default_POA ()); diff --git a/TAO/tao/Utils/Implicit_Deactivator.h b/TAO/tao/Utils/Implicit_Deactivator.h index 6667bfa5f60..ca2e2051ed5 100644 --- a/TAO/tao/Utils/Implicit_Deactivator.h +++ b/TAO/tao/Utils/Implicit_Deactivator.h @@ -26,7 +26,6 @@ namespace TAO { namespace Utils { - /** * @struct Implicit_Deactivation_Functor * diff --git a/TAO/tao/Utils/ORB_Destroyer.h b/TAO/tao/Utils/ORB_Destroyer.h index f58ac29d3c3..fba3313200a 100644 --- a/TAO/tao/Utils/ORB_Destroyer.h +++ b/TAO/tao/Utils/ORB_Destroyer.h @@ -25,7 +25,6 @@ namespace TAO { namespace Utils { - /** * @struct ORB_Destroyer_Functor * diff --git a/TAO/tao/Utils/PolicyList_Destroyer.h b/TAO/tao/Utils/PolicyList_Destroyer.h index 4c0bb923ff5..639919637fb 100644 --- a/TAO/tao/Utils/PolicyList_Destroyer.h +++ b/TAO/tao/Utils/PolicyList_Destroyer.h @@ -23,7 +23,6 @@ namespace TAO { namespace Utils { - /** * @class PolicyList_Destroyer * diff --git a/TAO/tao/Utils/RIR_Narrow.h b/TAO/tao/Utils/RIR_Narrow.h index 7e1911c0dd4..573720023fe 100644 --- a/TAO/tao/Utils/RIR_Narrow.h +++ b/TAO/tao/Utils/RIR_Narrow.h @@ -28,7 +28,6 @@ namespace TAO { namespace Utils { - /** * @class RIR_Narrow * diff --git a/TAO/tao/Value_Traits_T.h b/TAO/tao/Value_Traits_T.h index fe36defb092..1be9dd82ccd 100644 --- a/TAO/tao/Value_Traits_T.h +++ b/TAO/tao/Value_Traits_T.h @@ -19,7 +19,6 @@ namespace TAO { namespace details { - template<typename T, bool dummy> struct value_traits { diff --git a/TAO/tao/Valuetype/Bounded_Valuetype_Allocation_Traits_T.h b/TAO/tao/Valuetype/Bounded_Valuetype_Allocation_Traits_T.h index 3e741a98488..b88a8bb7d47 100644 --- a/TAO/tao/Valuetype/Bounded_Valuetype_Allocation_Traits_T.h +++ b/TAO/tao/Valuetype/Bounded_Valuetype_Allocation_Traits_T.h @@ -17,7 +17,6 @@ namespace TAO { namespace details { - template<typename T, class ref_traits, CORBA::ULong MAX, bool dummy> struct bounded_valuetype_allocation_traits { diff --git a/TAO/tao/Valuetype/Bounded_Valuetype_Sequence_T.h b/TAO/tao/Valuetype/Bounded_Valuetype_Sequence_T.h index 4ec02bb7989..163806e5da2 100644 --- a/TAO/tao/Valuetype/Bounded_Valuetype_Sequence_T.h +++ b/TAO/tao/Valuetype/Bounded_Valuetype_Sequence_T.h @@ -17,7 +17,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - template<typename object_t, typename object_t_var, CORBA::ULong MAX> class bounded_valuetype_sequence { @@ -104,7 +103,6 @@ private: template <typename stream, typename object_t, typename object_t_var, CORBA::ULong MAX> bool marshal_sequence(stream & strm, const TAO::bounded_valuetype_sequence<object_t, object_t_var, MAX> & source) { - const ::CORBA::ULong length = source.length (); if (length > source.maximum () || !(strm << length)) { return false; diff --git a/TAO/tao/Valuetype/Unbounded_Valuetype_Allocation_Traits_T.h b/TAO/tao/Valuetype/Unbounded_Valuetype_Allocation_Traits_T.h index 8ba8125d052..8e7dc85abb2 100644 --- a/TAO/tao/Valuetype/Unbounded_Valuetype_Allocation_Traits_T.h +++ b/TAO/tao/Valuetype/Unbounded_Valuetype_Allocation_Traits_T.h @@ -17,7 +17,6 @@ namespace TAO { namespace details { - template<typename T, class ref_traits, bool dummy> struct unbounded_valuetype_allocation_traits { diff --git a/TAO/tao/Valuetype/Unbounded_Valuetype_Sequence_T.h b/TAO/tao/Valuetype/Unbounded_Valuetype_Sequence_T.h index 72a64f3a308..bc3d23335f8 100644 --- a/TAO/tao/Valuetype/Unbounded_Valuetype_Sequence_T.h +++ b/TAO/tao/Valuetype/Unbounded_Valuetype_Sequence_T.h @@ -17,7 +17,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - template<typename object_t, typename object_t_var> class unbounded_valuetype_sequence { diff --git a/TAO/tao/Valuetype/Valuetype_Sequence_Element_T.h b/TAO/tao/Valuetype/Valuetype_Sequence_Element_T.h index c7de0ff8594..f79741486d5 100644 --- a/TAO/tao/Valuetype/Valuetype_Sequence_Element_T.h +++ b/TAO/tao/Valuetype/Valuetype_Sequence_Element_T.h @@ -18,7 +18,6 @@ namespace TAO { namespace details { - template<typename obj_ref_traits> class valuetype_sequence_element { diff --git a/TAO/tao/Valuetype/Valuetype_Traits_Base_T.h b/TAO/tao/Valuetype/Valuetype_Traits_Base_T.h index 3ede77ef507..43c1d66bd53 100644 --- a/TAO/tao/Valuetype/Valuetype_Traits_Base_T.h +++ b/TAO/tao/Valuetype/Valuetype_Traits_Base_T.h @@ -16,7 +16,6 @@ namespace TAO { namespace details { - template<typename object_t, typename object_t_var> struct valuetype_traits_base { diff --git a/TAO/tao/Valuetype/Valuetype_Traits_T.h b/TAO/tao/Valuetype/Valuetype_Traits_T.h index 5899f30e0ab..3061b2dd417 100644 --- a/TAO/tao/Valuetype/Valuetype_Traits_T.h +++ b/TAO/tao/Valuetype/Valuetype_Traits_T.h @@ -19,7 +19,6 @@ namespace TAO { namespace details { - template<class object_t, class object_t_var, class derived> struct valuetype_traits_decorator { diff --git a/TAO/tao/Wait_On_Leader_Follower.h b/TAO/tao/Wait_On_Leader_Follower.h index c2b74bdadf6..67e6b5be830 100644 --- a/TAO/tao/Wait_On_Leader_Follower.h +++ b/TAO/tao/Wait_On_Leader_Follower.h @@ -37,7 +37,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL */ class TAO_Wait_On_Leader_Follower : public TAO_Wait_Strategy { - public: /// Constructor. TAO_Wait_On_Leader_Follower (TAO_Transport *transport); diff --git a/TAO/tao/Wait_On_Reactor.h b/TAO/tao/Wait_On_Reactor.h index 57993e40f77..31816c2cb29 100644 --- a/TAO/tao/Wait_On_Reactor.h +++ b/TAO/tao/Wait_On_Reactor.h @@ -28,7 +28,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL */ class TAO_Wait_On_Reactor : public TAO_Wait_Strategy { - public: /// Constructor. explicit TAO_Wait_On_Reactor (TAO_Transport *transport); diff --git a/TAO/tao/Wait_On_Read.h b/TAO/tao/Wait_On_Read.h index fde048dc907..437d9a8ae0a 100644 --- a/TAO/tao/Wait_On_Read.h +++ b/TAO/tao/Wait_On_Read.h @@ -26,7 +26,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL */ class TAO_Wait_On_Read : public TAO_Wait_Strategy { - public: /// Constructor. explicit TAO_Wait_On_Read (TAO_Transport *transport); diff --git a/TAO/tao/Wait_Strategy.h b/TAO/tao/Wait_Strategy.h index 34fdab5d184..866ec9cb38e 100644 --- a/TAO/tao/Wait_Strategy.h +++ b/TAO/tao/Wait_Strategy.h @@ -40,7 +40,6 @@ class TAO_Synch_Reply_Dispatcher; */ class TAO_Export TAO_Wait_Strategy { - public: /// Constructor. explicit TAO_Wait_Strategy (TAO_Transport *transport); diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h index 0ba98e74684..ad161848f6c 100644 --- a/TAO/tao/WrongTransactionC.h +++ b/TAO/tao/WrongTransactionC.h @@ -52,7 +52,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace CORBA { - // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:53 diff --git a/TAO/tao/XtResource/XtResource_Factory.cpp b/TAO/tao/XtResource/XtResource_Factory.cpp index f97a97b28bb..e8be70a1318 100644 --- a/TAO/tao/XtResource/XtResource_Factory.cpp +++ b/TAO/tao/XtResource/XtResource_Factory.cpp @@ -6,7 +6,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - XtResource_Factory::XtResource_Factory (XtAppContext p_context): reactor_impl_(nullptr), context_(p_context) diff --git a/TAO/tao/XtResource/XtResource_Factory.h b/TAO/tao/XtResource/XtResource_Factory.h index b3ef66a8ed1..7d288b0e663 100644 --- a/TAO/tao/XtResource/XtResource_Factory.h +++ b/TAO/tao/XtResource/XtResource_Factory.h @@ -24,7 +24,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - /** * @class XtResource_Factory * diff --git a/TAO/tao/XtResource/XtResource_Loader.cpp b/TAO/tao/XtResource/XtResource_Loader.cpp index 95078ee11d4..11dbc3a05cb 100644 --- a/TAO/tao/XtResource/XtResource_Loader.cpp +++ b/TAO/tao/XtResource/XtResource_Loader.cpp @@ -6,7 +6,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - XtResource_Loader::XtResource_Loader (XtAppContext context) { XtResource_Factory *tmp = 0; diff --git a/TAO/tao/XtResource/XtResource_Loader.h b/TAO/tao/XtResource/XtResource_Loader.h index 300df16a879..0349c26b015 100644 --- a/TAO/tao/XtResource/XtResource_Loader.h +++ b/TAO/tao/XtResource/XtResource_Loader.h @@ -41,7 +41,6 @@ namespace TAO */ class TAO_XtResource_Export XtResource_Loader { - public: XtResource_Loader (XtAppContext context); diff --git a/TAO/tao/default_resource.h b/TAO/tao/default_resource.h index b2e556c3d91..07c23673fbd 100644 --- a/TAO/tao/default_resource.h +++ b/TAO/tao/default_resource.h @@ -138,7 +138,6 @@ public: * @name Member Accessors */ //@{ - int get_parser_names (char **&names, int &number_of_names); enum diff --git a/TAO/tao/operation_details.h b/TAO/tao/operation_details.h index 9d85feb2355..53d4e7bf6e8 100644 --- a/TAO/tao/operation_details.h +++ b/TAO/tao/operation_details.h @@ -140,7 +140,6 @@ public: * @name Helper methods used by the Invocation classes. */ //@{ - /// Marshals the list of @c this->arg_ into the \a cdr. bool marshal_args (TAO_OutputCDR &cdr); diff --git a/TAO/tests/AMI/client.cpp b/TAO/tests/AMI/client.cpp index 17480ca2adb..56956036f51 100644 --- a/TAO/tests/AMI/client.cpp +++ b/TAO/tests/AMI/client.cpp @@ -128,7 +128,6 @@ public: void foo_excep (::Messaging::ExceptionHolder * excep_holder) { - ACE_DEBUG ((LM_DEBUG, "Callback method <foo_excep> called:\n")); try diff --git a/TAO/tests/AMI/simple_client.cpp b/TAO/tests/AMI/simple_client.cpp index 47a4fef9047..8e7b68040a1 100644 --- a/TAO/tests/AMI/simple_client.cpp +++ b/TAO/tests/AMI/simple_client.cpp @@ -94,7 +94,6 @@ public: void foo_excep (::Messaging::ExceptionHolder * excep_holder) { - ACE_DEBUG ((LM_DEBUG, "Callback method <foo_excep> called:\n" "Testing proper exception handling ...\n")); diff --git a/TAO/tests/Alt_Mapping/client.cpp b/TAO/tests/Alt_Mapping/client.cpp index 681c105de4f..780738d3232 100644 --- a/TAO/tests/Alt_Mapping/client.cpp +++ b/TAO/tests/Alt_Mapping/client.cpp @@ -98,7 +98,6 @@ Alt_Mapping_Client<T>::run_sii_test (void) } catch (const CORBA::Exception& ex) { - this->results_.error_count (this->results_.error_count () + 1); ex._tao_print_exception (opname); ACE_ERROR ((LM_ERROR, diff --git a/TAO/tests/BiDirectional_MultipleORB/destroy.cpp b/TAO/tests/BiDirectional_MultipleORB/destroy.cpp index 3588381540e..bdbc66000a2 100644 --- a/TAO/tests/BiDirectional_MultipleORB/destroy.cpp +++ b/TAO/tests/BiDirectional_MultipleORB/destroy.cpp @@ -22,7 +22,6 @@ test_with_bidir_poa (int argc, const char *orb_name, int destroy_orb) { - try { CORBA::ORB_var orb = diff --git a/TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp b/TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp index 743a534c959..6ae6ebf541a 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp +++ b/TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp @@ -8,7 +8,6 @@ Client_Task::Client_Task (CORBA::ORB_ptr orb) int Client_Task::svc (void) { - try { this->orb_->run (); diff --git a/TAO/tests/Bug_1020_Regression/Server_Task.cpp b/TAO/tests/Bug_1020_Regression/Server_Task.cpp index 214129aaa4f..cb93da3a251 100644 --- a/TAO/tests/Bug_1020_Regression/Server_Task.cpp +++ b/TAO/tests/Bug_1020_Regression/Server_Task.cpp @@ -14,7 +14,6 @@ Server_Task::Server_Task(Test::Echo_ptr echo) int Server_Task::svc (void) { - Test::Payload pload(16); pload.length(16); int stop_loop = 0; for(int i = 0; i != 1000000 && !stop_loop; ++i) diff --git a/TAO/tests/Bug_1330_Regression/server.cpp b/TAO/tests/Bug_1330_Regression/server.cpp index 83b309f26b3..5faa78d564c 100644 --- a/TAO/tests/Bug_1330_Regression/server.cpp +++ b/TAO/tests/Bug_1330_Regression/server.cpp @@ -39,7 +39,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { CORBA::ORB_var orb = diff --git a/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp b/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp index d72bfca1e54..6318b3f533c 100644 --- a/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp +++ b/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp @@ -15,7 +15,6 @@ void Reply_Handler::next_prime_excep ( ::Messaging::ExceptionHolder *ex) { - try { ex->raise_exception (); diff --git a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp index 16ea068aeca..0dc9dffc534 100644 --- a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp +++ b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp @@ -18,7 +18,6 @@ void Client_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) { - CORBA::String_var orb_id = info->orb_id (); diff --git a/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp b/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp index a4880e7cd1b..e69d3dbf1a1 100644 --- a/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp +++ b/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp @@ -54,7 +54,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { ACE_Argv_Type_Converter main_args_s (argc, argv); diff --git a/TAO/tests/Bug_1495_Regression/server_interceptor.cpp b/TAO/tests/Bug_1495_Regression/server_interceptor.cpp index 001a894e0b4..5eacad5a411 100644 --- a/TAO/tests/Bug_1495_Regression/server_interceptor.cpp +++ b/TAO/tests/Bug_1495_Regression/server_interceptor.cpp @@ -48,7 +48,6 @@ void Echo_Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri) { - CORBA::String_var operation = ri->operation (); ACE_DEBUG ((LM_DEBUG, @@ -100,7 +99,6 @@ void Echo_Server_Request_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr ri) { - // This will throw an exception if a location forward has not // occurred. If an exception is thrown then something is wrong with // the PortableInterceptor::ForwardRequest support. diff --git a/TAO/tests/Bug_1627_Regression/server.cpp b/TAO/tests/Bug_1627_Regression/server.cpp index 211ad19cee0..d141443a91f 100644 --- a/TAO/tests/Bug_1627_Regression/server.cpp +++ b/TAO/tests/Bug_1627_Regression/server.cpp @@ -39,7 +39,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { CORBA::ORB_var orb = diff --git a/TAO/tests/Bug_1635_Regression/client.cpp b/TAO/tests/Bug_1635_Regression/client.cpp index 38469ec3c1f..529c063fe4b 100644 --- a/TAO/tests/Bug_1635_Regression/client.cpp +++ b/TAO/tests/Bug_1635_Regression/client.cpp @@ -3,7 +3,6 @@ int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { CORBA::ORB_var orb = diff --git a/TAO/tests/Bug_1639_Regression/struct_client.cpp b/TAO/tests/Bug_1639_Regression/struct_client.cpp index 9e29e5fb013..12bee12cfae 100644 --- a/TAO/tests/Bug_1639_Regression/struct_client.cpp +++ b/TAO/tests/Bug_1639_Regression/struct_client.cpp @@ -10,10 +10,8 @@ using namespace DynamicAny; int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) //-------------------------------------------------------------------- { - // Generic catch handler try { - // Initialize the ORB // ------------------ CORBA::ORB_var orb; // _var, so we don't need/may not CORBA::release(orb) diff --git a/TAO/tests/Bug_1869_Regression/client.cpp b/TAO/tests/Bug_1869_Regression/client.cpp index 8add5c09f5f..a4187f33b6f 100644 --- a/TAO/tests/Bug_1869_Regression/client.cpp +++ b/TAO/tests/Bug_1869_Regression/client.cpp @@ -9,7 +9,6 @@ const ACE_TCHAR *port = ACE_TEXT ("12345"); class AdderCallback : public POA_AMI_test::AMI_adderHandler, public ACE_Task_Base { - public: AdderCallback(CORBA::ORB_ptr orb) : orb(CORBA::ORB::_duplicate(orb)) { @@ -70,11 +69,9 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { - ACE_TCHAR address_servant[1000]; try { - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); if (parse_args (argc, argv) != 0) diff --git a/TAO/tests/Bug_1869_Regression/server.cpp b/TAO/tests/Bug_1869_Regression/server.cpp index ec627ac1ee2..fbb775191cc 100644 --- a/TAO/tests/Bug_1869_Regression/server.cpp +++ b/TAO/tests/Bug_1869_Regression/server.cpp @@ -3,7 +3,6 @@ class AdderServant : public POA_AMI_test::adder { - public: AdderServant (void) {} @@ -21,7 +20,6 @@ public: int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); diff --git a/TAO/tests/Bug_2174_Regression/test_i.cpp b/TAO/tests/Bug_2174_Regression/test_i.cpp index 024e702ba64..63840f67d39 100644 --- a/TAO/tests/Bug_2174_Regression/test_i.cpp +++ b/TAO/tests/Bug_2174_Regression/test_i.cpp @@ -4,7 +4,6 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { - } CORBA::Long diff --git a/TAO/tests/Bug_2234_Regression/client.cpp b/TAO/tests/Bug_2234_Regression/client.cpp index f9c3cab03c4..76d6d2e61a9 100644 --- a/TAO/tests/Bug_2234_Regression/client.cpp +++ b/TAO/tests/Bug_2234_Regression/client.cpp @@ -39,7 +39,6 @@ ACE_TMAIN ( int argc, ACE_TCHAR *argv[]) { - CORBA::Boolean testFailed= 0; ACE_DEBUG( (LM_INFO, "Regression test for Bug 2234 (Interceptor arg list with var len out params)\n")); try diff --git a/TAO/tests/Bug_2356_Regression/client.cpp b/TAO/tests/Bug_2356_Regression/client.cpp index a856b824816..f89bb7b3545 100644 --- a/TAO/tests/Bug_2356_Regression/client.cpp +++ b/TAO/tests/Bug_2356_Regression/client.cpp @@ -65,7 +65,6 @@ public: void foo_excep (::Messaging::ExceptionHolder * excep_holder) { - ACE_DEBUG ((LM_DEBUG, "Callback method <foo_excep> called:\n" "Testing proper exception handling ...\n")); diff --git a/TAO/tests/Bug_2429_Regression/client.cpp b/TAO/tests/Bug_2429_Regression/client.cpp index 7614508edcf..607fe5ff843 100644 --- a/TAO/tests/Bug_2429_Regression/client.cpp +++ b/TAO/tests/Bug_2429_Regression/client.cpp @@ -99,7 +99,6 @@ client_parse_args(int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - CORBA::ORB_var orb; try diff --git a/TAO/tests/Bug_2494_Regression/client.cpp b/TAO/tests/Bug_2494_Regression/client.cpp index 10415af0516..f5c8e4f1fee 100644 --- a/TAO/tests/Bug_2494_Regression/client.cpp +++ b/TAO/tests/Bug_2494_Regression/client.cpp @@ -54,7 +54,6 @@ namespace struct Worker : ACE_Task_Base { - Worker (Simple_Server_ptr srv) : srv_(Simple_Server::_duplicate(srv)) { diff --git a/TAO/tests/Bug_2542_Regression/bug_2542_regression.cpp b/TAO/tests/Bug_2542_Regression/bug_2542_regression.cpp index 7ade799ab81..b50261e9d9d 100644 --- a/TAO/tests/Bug_2542_Regression/bug_2542_regression.cpp +++ b/TAO/tests/Bug_2542_Regression/bug_2542_regression.cpp @@ -3,7 +3,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); diff --git a/TAO/tests/Bug_2683_Regression/test_i.cpp b/TAO/tests/Bug_2683_Regression/test_i.cpp index 879bf15ecd3..cd37313afd3 100644 --- a/TAO/tests/Bug_2683_Regression/test_i.cpp +++ b/TAO/tests/Bug_2683_Regression/test_i.cpp @@ -9,7 +9,6 @@ test_i::test_i (ORB_Killer *k) void test_i::ping (void) { - } void diff --git a/TAO/tests/Bug_2805_Regression/client.cpp b/TAO/tests/Bug_2805_Regression/client.cpp index 19cffd46fb1..84297478797 100644 --- a/TAO/tests/Bug_2805_Regression/client.cpp +++ b/TAO/tests/Bug_2805_Regression/client.cpp @@ -124,7 +124,6 @@ public: void foo_excep (::Messaging::ExceptionHolder * excep_holder) { - ACE_DEBUG ((LM_DEBUG, "Callback method <foo_excep> called:\n")); try diff --git a/TAO/tests/Bug_3068_Regression/test_i.h b/TAO/tests/Bug_3068_Regression/test_i.h index 2be4f0ab63c..7558a4fae86 100644 --- a/TAO/tests/Bug_3068_Regression/test_i.h +++ b/TAO/tests/Bug_3068_Regression/test_i.h @@ -70,7 +70,6 @@ private: */ class Simple_Server_i : public POA_Simple_Server { - public: /// ctor Simple_Server_i (CORBA::ORB_ptr orb, int no_iterations); diff --git a/TAO/tests/Bug_3499_Regression/DLL_Service.cpp b/TAO/tests/Bug_3499_Regression/DLL_Service.cpp index 6b98c90e75b..a4df1715d6c 100644 --- a/TAO/tests/Bug_3499_Regression/DLL_Service.cpp +++ b/TAO/tests/Bug_3499_Regression/DLL_Service.cpp @@ -2,12 +2,10 @@ ACE_DLL_Service::ACE_DLL_Service (void) { - } ACE_DLL_Service::~ACE_DLL_Service (void) { - } int ACE_DLL_Service::init (int, ACE_TCHAR *[]) diff --git a/TAO/tests/Bug_3567_Regression/client.cpp b/TAO/tests/Bug_3567_Regression/client.cpp index 5f5ed1c9e56..e547de1ee14 100644 --- a/TAO/tests/Bug_3567_Regression/client.cpp +++ b/TAO/tests/Bug_3567_Regression/client.cpp @@ -145,7 +145,6 @@ public: void foo_excep (::Messaging::ExceptionHolder * excep_holder) { - ACE_DEBUG ((LM_DEBUG, "Callback method <foo_excep> called:\n")); try diff --git a/TAO/tests/Bug_3647_Regression/Backend_Impl.h b/TAO/tests/Bug_3647_Regression/Backend_Impl.h index 65ee28a8bb8..250ecc2e3df 100644 --- a/TAO/tests/Bug_3647_Regression/Backend_Impl.h +++ b/TAO/tests/Bug_3647_Regression/Backend_Impl.h @@ -5,7 +5,6 @@ namespace Bug_3647_Regression { - /** * @class Backend * diff --git a/TAO/tests/Bug_3647_Regression/Middle_Impl.h b/TAO/tests/Bug_3647_Regression/Middle_Impl.h index 4e9b2f7b45b..ed79d8ca8a2 100644 --- a/TAO/tests/Bug_3647_Regression/Middle_Impl.h +++ b/TAO/tests/Bug_3647_Regression/Middle_Impl.h @@ -5,7 +5,6 @@ namespace Bug_3647_Regression { - /** * @class Middle * diff --git a/TAO/tests/Bug_3672_Regression/client.cpp b/TAO/tests/Bug_3672_Regression/client.cpp index 6e604fc1de7..c01796bd2c4 100644 --- a/TAO/tests/Bug_3672_Regression/client.cpp +++ b/TAO/tests/Bug_3672_Regression/client.cpp @@ -122,7 +122,6 @@ public: void foo_excep (::Messaging::ExceptionHolder * excep_holder) { - ACE_DEBUG ((LM_DEBUG, "Callback method <foo_excep> called:\n")); try diff --git a/TAO/tests/Bug_3853_Regression/client.cpp b/TAO/tests/Bug_3853_Regression/client.cpp index 7428570eb11..a64e66818c1 100644 --- a/TAO/tests/Bug_3853_Regression/client.cpp +++ b/TAO/tests/Bug_3853_Regression/client.cpp @@ -42,7 +42,6 @@ public: } else { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ClientTask start.\n"))); int i = 0; ACE_Time_Value due = ACE_OS::gettimeofday () + ACE_Time_Value (test_duration); diff --git a/TAO/tests/Bug_3853_Regression/client_interceptor.cpp b/TAO/tests/Bug_3853_Regression/client_interceptor.cpp index 0c0313eee35..897099b003f 100644 --- a/TAO/tests/Bug_3853_Regression/client_interceptor.cpp +++ b/TAO/tests/Bug_3853_Regression/client_interceptor.cpp @@ -51,7 +51,6 @@ Echo_Client_Request_Interceptor::send_request ( isRecursive ++ ; if (isRecursive%2 == 1 ) { - if (isRecursive == 3) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t)Echo_Client_Request_Interceptor::send_request(%d) ") ACE_TEXT ("shutdown server 1 now. \n"), isRecursive)); diff --git a/TAO/tests/CDR/allocator.cpp b/TAO/tests/CDR/allocator.cpp index 52446b05ebc..d2f3d5830ab 100644 --- a/TAO/tests/CDR/allocator.cpp +++ b/TAO/tests/CDR/allocator.cpp @@ -33,7 +33,6 @@ */ class Application_Simulator { - public: /// Constructor, limits the amount of fragmentation and memory this /// class takes. diff --git a/TAO/tests/ClientPortSpan/client.cpp b/TAO/tests/ClientPortSpan/client.cpp index c132a448177..527ef0a537b 100644 --- a/TAO/tests/ClientPortSpan/client.cpp +++ b/TAO/tests/ClientPortSpan/client.cpp @@ -55,7 +55,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) try { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) - calling get_string\n")); CORBA::String_var the_string = hello->get_string (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%C>\n", diff --git a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.cpp b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.cpp index 5daa44d3224..34424b205bd 100644 --- a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.cpp +++ b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.cpp @@ -18,12 +18,10 @@ WIBM1047_ISO8859::WIBM1047_ISO8859 (void) { - } WIBM1047_ISO8859::~WIBM1047_ISO8859 (void) { - } // = Documented in $ACE_ROOT/ace/CDR_Stream.h diff --git a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp index 68b972c975d..3dbeafd115b 100644 --- a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp +++ b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp @@ -215,12 +215,10 @@ size_t count_potential_surrogates ( WUCS4_UTF16::WUCS4_UTF16 (void) { - } WUCS4_UTF16::~WUCS4_UTF16 (void) { - } // = Documented in $ACE_ROOT/ace/CDR_Stream.h diff --git a/TAO/tests/Compression/RLECompressorTest.cpp b/TAO/tests/Compression/RLECompressorTest.cpp index 085f655f79e..3ce87e99c89 100644 --- a/TAO/tests/Compression/RLECompressorTest.cpp +++ b/TAO/tests/Compression/RLECompressorTest.cpp @@ -181,7 +181,6 @@ struct HRTimer : ACE_High_Res_Timer static int init_compressor(::CORBA::ORB_ptr orb) { try { - ::CORBA::Object_var compression_manager = orb->resolve_initial_references(TAO_OBJID_COMPRESSIONMANAGER); @@ -296,7 +295,6 @@ static int testArray_compressor(const ::Compression::Compressor_var &compressor ACE_HEX_DUMP((LM_INFO, comp_data, (sizeof(comp_data) - 1), ACE_TEXT("Compression Data"))); for (unsigned i = 0; i < sizeof(comp_data); i++) { - COMP_RESULT &result = comp_result[i]; // Get A reference to our result for testing output Compression::Buffer in_data(i, i, reinterpret_cast<CORBA::Octet*>(comp_data), false), &out_data = result.out; @@ -526,7 +524,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try { - ::CORBA::ORB_var orb = ::CORBA::ORB_init(argc, argv); if (init_compressor(orb.in ()) != 0) { diff --git a/TAO/tests/DII_AMI_Forward/client.cpp b/TAO/tests/DII_AMI_Forward/client.cpp index 7aa615369e8..a63a9402ebd 100644 --- a/TAO/tests/DII_AMI_Forward/client.cpp +++ b/TAO/tests/DII_AMI_Forward/client.cpp @@ -54,7 +54,6 @@ do_primary_test (CORBA::Object_var &server, { try { - CORBA::Request_var req = server->_request("do_forward"); if (CORBA::is_nil (server.in ())) diff --git a/TAO/tests/DII_AMI_Forward/server_interceptor.cpp b/TAO/tests/DII_AMI_Forward/server_interceptor.cpp index 5a6df2d5af6..de80b330976 100644 --- a/TAO/tests/DII_AMI_Forward/server_interceptor.cpp +++ b/TAO/tests/DII_AMI_Forward/server_interceptor.cpp @@ -103,7 +103,6 @@ void ForwardTest_Request_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr ri) { - // This will throw an exception if a location forward has not // occurred. If an exception is thrown then something is wrong with // the PortableInterceptor::ForwardRequest support. diff --git a/TAO/tests/DIOP/UDP_Client_i.cpp b/TAO/tests/DIOP/UDP_Client_i.cpp index ec477c40297..9f6dbfeefb3 100644 --- a/TAO/tests/DIOP/UDP_Client_i.cpp +++ b/TAO/tests/DIOP/UDP_Client_i.cpp @@ -16,7 +16,6 @@ UDP_Client_i::UDP_Client_i (CORBA::ORB_ptr orb, , delay_ (msec) , iterations_ (iterations) { - } //Destructor. diff --git a/TAO/tests/DLL_ORB/client.cpp b/TAO/tests/DLL_ORB/client.cpp index 37b51cccd96..7af41133463 100644 --- a/TAO/tests/DLL_ORB/client.cpp +++ b/TAO/tests/DLL_ORB/client.cpp @@ -32,7 +32,6 @@ ACE_TMAIN(int, ACE_TCHAR *[]) "_make_Test_Client_Module", "-k file://test.ior")) != 0) { - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ERROR: Client unable to process the " diff --git a/TAO/tests/DSI_AMH/client.cpp b/TAO/tests/DSI_AMH/client.cpp index 74f23dad92b..a1961296db0 100644 --- a/TAO/tests/DSI_AMH/client.cpp +++ b/TAO/tests/DSI_AMH/client.cpp @@ -46,7 +46,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { CORBA::ORB_var orb = diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp index c4c71f9bd5f..7721aa40e59 100644 --- a/TAO/tests/DynAny_Test/test_dynsequence.cpp +++ b/TAO/tests/DynAny_Test/test_dynsequence.cpp @@ -18,7 +18,6 @@ namespace { - bool compare_string_sequence_elements( CORBA::ULong i, diff --git a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Client.cpp b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Client.cpp index edb2562a0ac..0b83d53e4bf 100644 --- a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Client.cpp +++ b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Client.cpp @@ -91,7 +91,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { CORBA::ORB_var orb = diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp index 81c07d0e08c..9201a12b92e 100644 --- a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp +++ b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp @@ -123,7 +123,6 @@ void Policy_Verifier::verify_reference (Counter_ptr object, RT_Properties *rt_properties) { - try { CORBA::Policy_var policy_var = @@ -162,7 +161,6 @@ Policy_Verifier::verify_reference (Counter_ptr object, if (Policy_Verifier::check_reference (policy_var.in (), "Unable to get Priority Banded Policy\n")) { - RTCORBA::PriorityBandedConnectionPolicy_var priority_banded_policy = RTCORBA::PriorityBandedConnectionPolicy::_narrow (policy_var.in ()); @@ -170,7 +168,6 @@ Policy_Verifier::verify_reference (Counter_ptr object, if (Policy_Verifier::check_reference (priority_banded_policy.in (), "Unable to get Priority Banded Policy\n")) { - // Here we have a priority banded connection policy. RTCORBA::PriorityBands_var pb = diff --git a/TAO/tests/Exposed_Policies/server.cpp b/TAO/tests/Exposed_Policies/server.cpp index 43e63c7a8a9..a26905e2eb5 100644 --- a/TAO/tests/Exposed_Policies/server.cpp +++ b/TAO/tests/Exposed_Policies/server.cpp @@ -15,7 +15,6 @@ int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { Policy_Tester policy_tester; diff --git a/TAO/tests/FL_Cube/test_i.cpp b/TAO/tests/FL_Cube/test_i.cpp index 205f563955b..1ae00f711a7 100644 --- a/TAO/tests/FL_Cube/test_i.cpp +++ b/TAO/tests/FL_Cube/test_i.cpp @@ -6,7 +6,6 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb, : orb_ (CORBA::ORB::_duplicate (orb)), window_ (window) { - } void diff --git a/TAO/tests/File_IO/client.cpp b/TAO/tests/File_IO/client.cpp index 8ce66422b4f..a68ed75cba6 100644 --- a/TAO/tests/File_IO/client.cpp +++ b/TAO/tests/File_IO/client.cpp @@ -100,7 +100,6 @@ validate_connection (CORBA::Object_ptr object) static void * MTTEST (void *args) { - ACE_CString &ior = *(ACE_CString*)args; try { @@ -144,7 +143,6 @@ MTTEST (void *args) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { // Initialize the ORB diff --git a/TAO/tests/Hang_Shutdown/client.cpp b/TAO/tests/Hang_Shutdown/client.cpp index d5f0e3a45c2..e568d3dda7d 100644 --- a/TAO/tests/Hang_Shutdown/client.cpp +++ b/TAO/tests/Hang_Shutdown/client.cpp @@ -59,7 +59,6 @@ namespace Test virtual int svc (void) { - try { this->h_->send_stuff ("Testing", @@ -117,7 +116,6 @@ namespace Test virtual int svc (void) { - try { ACE_DEBUG ((LM_DEBUG, @@ -169,7 +167,6 @@ namespace Test static int try_main (int argc, ACE_TCHAR *argv[]) { - try { CORBA::ORB_var orb = diff --git a/TAO/tests/Hang_Shutdown/server.cpp b/TAO/tests/Hang_Shutdown/server.cpp index 2a4975eb194..9022362a9fe 100644 --- a/TAO/tests/Hang_Shutdown/server.cpp +++ b/TAO/tests/Hang_Shutdown/server.cpp @@ -36,7 +36,6 @@ namespace Test try_main (int argc, ACE_TCHAR *argv[]) { - try { CORBA::ORB_var orb = diff --git a/TAO/tests/IDLv4/annotations/annotation_tests.cpp b/TAO/tests/IDLv4/annotations/annotation_tests.cpp index 3ddced256b8..bd874852c0e 100644 --- a/TAO/tests/IDLv4/annotations/annotation_tests.cpp +++ b/TAO/tests/IDLv4/annotations/annotation_tests.cpp @@ -10,7 +10,6 @@ #include <string> namespace { - void assert_node_has_annotation ( Annotation_Test &t, const char *node_name, AST_Annotation_Decl *annotation) { diff --git a/TAO/tests/InterOp-Naming/INS_test_server.cpp b/TAO/tests/InterOp-Naming/INS_test_server.cpp index d8b6c0fc962..2069fc55ca8 100644 --- a/TAO/tests/InterOp-Naming/INS_test_server.cpp +++ b/TAO/tests/InterOp-Naming/INS_test_server.cpp @@ -6,7 +6,6 @@ int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - Server_i server; ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Leader_Followers/client.cpp b/TAO/tests/Leader_Followers/client.cpp index e7419b54fce..714894abd1f 100644 --- a/TAO/tests/Leader_Followers/client.cpp +++ b/TAO/tests/Leader_Followers/client.cpp @@ -105,7 +105,6 @@ public: int svc (void) { - try { u_long work_from_this_thread = 0; @@ -175,7 +174,6 @@ public: int svc (void) { - try { u_long event_loop_timeout_for_this_thread = 0; @@ -222,7 +220,6 @@ private: int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try { // Initialize the ORB. diff --git a/TAO/tests/Leader_Followers/server.cpp b/TAO/tests/Leader_Followers/server.cpp index 73a7e5f0525..ac8630b8ac6 100644 --- a/TAO/tests/Leader_Followers/server.cpp +++ b/TAO/tests/Leader_Followers/server.cpp @@ -50,7 +50,6 @@ public: int svc (void) { - try { this->orb_->run (); diff --git a/TAO/tests/MProfile/client.cpp b/TAO/tests/MProfile/client.cpp index bd620441e42..3293557c49b 100644 --- a/TAO/tests/MProfile/client.cpp +++ b/TAO/tests/MProfile/client.cpp @@ -50,7 +50,6 @@ run_test (Simple_Server_ptr server); int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { CORBA::ORB_var orb = diff --git a/TAO/tests/MProfile_Connection_Timeout/client.cpp b/TAO/tests/MProfile_Connection_Timeout/client.cpp index c53a5b09e68..41a117c026c 100644 --- a/TAO/tests/MProfile_Connection_Timeout/client.cpp +++ b/TAO/tests/MProfile_Connection_Timeout/client.cpp @@ -54,7 +54,6 @@ run_test (Simple_Server_ptr server); int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { CORBA::ORB_var orb = diff --git a/TAO/tests/MProfile_Forwarding/Manager.cpp b/TAO/tests/MProfile_Forwarding/Manager.cpp index 6c708867d65..d682c73aadb 100644 --- a/TAO/tests/MProfile_Forwarding/Manager.cpp +++ b/TAO/tests/MProfile_Forwarding/Manager.cpp @@ -50,7 +50,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - Manager manager; try @@ -145,7 +144,6 @@ Manager::init (int argc, ACE_TCHAR *argv[]) int Manager::activate_servant (void) { - ACE_NEW_THROW_EX (this->servant_locator_, Servant_Locator (this->orb_.in ()), CORBA::NO_MEMORY ()); diff --git a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp index 9cb8cf143be..78e186910f6 100644 --- a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp +++ b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp @@ -32,7 +32,6 @@ Servant_Locator::preinvoke (const PortableServer::ObjectId &oid, const char * /*operation*/, PortableServer::ServantLocator::Cookie & /* cookie */) { - CORBA::String_var s = PortableServer::ObjectId_to_string (oid); ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/MProfile_Forwarding/client.cpp b/TAO/tests/MProfile_Forwarding/client.cpp index 336242aaf5d..f664cef6d66 100644 --- a/TAO/tests/MProfile_Forwarding/client.cpp +++ b/TAO/tests/MProfile_Forwarding/client.cpp @@ -36,7 +36,6 @@ run_test (Simple_Server_ptr server); int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { CORBA::ORB_var orb = diff --git a/TAO/tests/MT_BiDir/client.cpp b/TAO/tests/MT_BiDir/client.cpp index 58430f8754a..d3840afb384 100644 --- a/TAO/tests/MT_BiDir/client.cpp +++ b/TAO/tests/MT_BiDir/client.cpp @@ -35,7 +35,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { CORBA::ORB_var orb = diff --git a/TAO/tests/MT_Timeout/Client_Task.cpp b/TAO/tests/MT_Timeout/Client_Task.cpp index 4d22dcf690a..c43b52cb2b5 100644 --- a/TAO/tests/MT_Timeout/Client_Task.cpp +++ b/TAO/tests/MT_Timeout/Client_Task.cpp @@ -42,7 +42,6 @@ Client_Task::too_big_difference_calls () const int Client_Task::svc (void) { - int successful_calls = 0; int timed_out_calls = 0; diff --git a/TAO/tests/Multiple/Multiple_Impl.h b/TAO/tests/Multiple/Multiple_Impl.h index 82e3c9a76f4..ae7d72bd49b 100644 --- a/TAO/tests/Multiple/Multiple_Impl.h +++ b/TAO/tests/Multiple/Multiple_Impl.h @@ -25,7 +25,6 @@ */ class Bottom_Impl : public virtual POA_Multiple::Bottom { - public: // Ctor-Dtor Bottom_Impl (CORBA::ORB_ptr orb); @@ -57,7 +56,6 @@ private: */ class Delegated_Bottom_Impl : public virtual POA_Multiple::Bottom { - public: // Ctor-Dtor Delegated_Bottom_Impl (Multiple::Bottom_ptr delegate, CORBA::ORB_ptr orb); diff --git a/TAO/tests/Muxing/client.cpp b/TAO/tests/Muxing/client.cpp index 9f69fba62ea..e57a0724552 100644 --- a/TAO/tests/Muxing/client.cpp +++ b/TAO/tests/Muxing/client.cpp @@ -64,7 +64,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } else { - Client_Task client_task (receiver.in (), #if defined (ACE_OPENVMS) 750, /* test takes much longer on OpenVMS */ diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp index 03e0d81e9ea..fbaa94d8acc 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp @@ -182,7 +182,6 @@ int MT_Client::init (int argc, ACE_TCHAR **argv, int client_number) { - // Make a copy of argv since ORB_init will change it. this->argc_ = argc; this->argv_ = new ACE_TCHAR *[argc]; diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.h b/TAO/tests/NestedUpcall/MT_Client_Test/client.h index 3bb4ebc9cbf..df1b9a7b8d0 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/client.h +++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.h @@ -33,7 +33,6 @@ */ class MT_Client { - public: /// = Constructor and destructor. MT_Client (void); diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h index d19d2daa47d..ac9b5e5db30 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h +++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h @@ -36,7 +36,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL */ class MT_Server { - public: /// Default constructor MT_Server (); diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.h b/TAO/tests/NestedUpcall/MT_Client_Test/server.h index f0bd18c68b7..b1d934cfa9c 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/server.h +++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.h @@ -33,7 +33,6 @@ */ class MT_Object_Server { - public: /// Default constructor MT_Object_Server (void); diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp index 174e4c01d2b..9a4d50cc28b 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp @@ -31,7 +31,6 @@ Object_B_i::foo (Object_A_ptr theObject_A_ptr) { try { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) BEGIN Object_B_i::foo: Trying to call Object A\n")); diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h index db63be11074..23324226af3 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h @@ -33,7 +33,6 @@ */ class Initiator_Server { - public: /// Default constructor Initiator_Server (void); diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h index ee2169f7f28..b4f312cad07 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h @@ -33,7 +33,6 @@ */ class Object_A_Server { - public: /// Default constructor Object_A_Server (void); diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h index 41d776f93fa..43cfdb100b7 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h @@ -33,7 +33,6 @@ */ class Object_B_Server { - public: /// Default constructor Object_B_Server (void); diff --git a/TAO/tests/Nested_Event_Loop/client.cpp b/TAO/tests/Nested_Event_Loop/client.cpp index 418f0f450ac..17ecae6352e 100644 --- a/TAO/tests/Nested_Event_Loop/client.cpp +++ b/TAO/tests/Nested_Event_Loop/client.cpp @@ -66,7 +66,6 @@ parse_args (int argc, ACE_TCHAR **argv) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try { // Initialize the ORB. diff --git a/TAO/tests/Nested_Event_Loop/test_i.cpp b/TAO/tests/Nested_Event_Loop/test_i.cpp index ab3557f72a5..9a155f6f8ba 100644 --- a/TAO/tests/Nested_Event_Loop/test_i.cpp +++ b/TAO/tests/Nested_Event_Loop/test_i.cpp @@ -140,7 +140,6 @@ void client_i::oneway_no_op (const act &act_for_iterations, const act &act_for_flag) { - try { this->remote_partner_->no_op (self_.in (), diff --git a/TAO/tests/OBV/Any/client.cpp b/TAO/tests/OBV/Any/client.cpp index 4727efe5d5b..4aa7180c268 100644 --- a/TAO/tests/OBV/Any/client.cpp +++ b/TAO/tests/OBV/Any/client.cpp @@ -34,7 +34,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test started.\n")); CORBA::ORB_var orb = diff --git a/TAO/tests/OBV/Indirection/MessengerClient.cpp b/TAO/tests/OBV/Indirection/MessengerClient.cpp index 226a4cfd028..120703e5fcd 100644 --- a/TAO/tests/OBV/Indirection/MessengerClient.cpp +++ b/TAO/tests/OBV/Indirection/MessengerClient.cpp @@ -7,9 +7,7 @@ using namespace demo::value::idl; const char* IOR = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; int ACE_TMAIN (int ac, ACE_TCHAR* av[]) { - try { - CORBA::ORB_var orb = CORBA::ORB_init(ac, av); NodeFactory::register_new_factory(* orb.in()); diff --git a/TAO/tests/OBV/Simple/Simple_util.cpp b/TAO/tests/OBV/Simple/Simple_util.cpp index 4bd871dad87..3b5070f3c05 100644 --- a/TAO/tests/OBV/Simple/Simple_util.cpp +++ b/TAO/tests/OBV/Simple/Simple_util.cpp @@ -276,7 +276,6 @@ Client<InterfaceObj, Var>::init (const char *name, template <class InterfaceObj, class Var> int Client<InterfaceObj, Var>::obtain_initial_references (void) { - return 0; } diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp index e4ba7baa0e3..f2f2d2d7d57 100644 --- a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp +++ b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp @@ -118,7 +118,6 @@ void test_impl::pass_vt_graph_out ( Supports_Test::vt_graph_out vt_graph_param) { - vt_graph_impl * the_vt_graph = 0; ACE_NEW (the_vt_graph, vt_graph_impl (4)); vt_graph_param = the_vt_graph; @@ -132,7 +131,6 @@ void test_impl::pass_obj_graph_inout ( Supports_Test::graph * &graph_param) { - ACE_ASSERT (graph_param->size () == 6); graph_param->add_node ("NEW3"); ACE_ASSERT (graph_param->size () == 7); @@ -142,7 +140,6 @@ void test_impl::pass_vt_graph_inout ( Supports_Test::vt_graph * &vt_graph_param) { - ACE_ASSERT (vt_graph_param->size () == 6); vt_graph_param->add_node ("NEW3"); ACE_ASSERT (vt_graph_param->size () == 7); diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.h b/TAO/tests/OBV/Supports/Supports_Test_impl.h index 5355eea520d..590eaca9269 100644 --- a/TAO/tests/OBV/Supports/Supports_Test_impl.h +++ b/TAO/tests/OBV/Supports/Supports_Test_impl.h @@ -11,7 +11,6 @@ class node_impl : public virtual OBV_Supports_Test::Node, public virtual CORBA::DefaultValueRefCountBase { - public: node_impl (void); @@ -28,7 +27,6 @@ public: class node_init_impl : public Supports_Test::Node_init { - public: virtual Supports_Test::Node * create (void); @@ -41,7 +39,6 @@ class vt_graph_impl : public virtual POA_Supports_Test::vt_graph, public virtual CORBA::DefaultValueRefCountBase { - public: vt_graph_impl (void); @@ -57,7 +54,6 @@ class vt_graph_impl : class vt_graph_init_impl : public Supports_Test::vt_graph_init { - public: virtual Supports_Test::vt_graph * create (void); @@ -67,7 +63,6 @@ class vt_graph_init_impl : class test_impl : public virtual POA_Supports_Test::test { - public: test_impl (CORBA::ORB_ptr orb); diff --git a/TAO/tests/OBV/Supports/client.cpp b/TAO/tests/OBV/Supports/client.cpp index de74c2e2f51..dea938ec420 100644 --- a/TAO/tests/OBV/Supports/client.cpp +++ b/TAO/tests/OBV/Supports/client.cpp @@ -43,7 +43,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); @@ -124,7 +123,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) for (int i = 0; i < num_trials; i++) { - // Create a vt_graph_impl instance and store the reference as a // vt_graph_var. Then register the instance with the POA to obtain an // object reference, stored as a graph_var. Increment the reference count diff --git a/TAO/tests/OBV/ValueBox/client.cpp b/TAO/tests/OBV/ValueBox/client.cpp index 62d1e041b02..8d995b4842b 100644 --- a/TAO/tests/OBV/ValueBox/client.cpp +++ b/TAO/tests/OBV/ValueBox/client.cpp @@ -272,7 +272,6 @@ int test_basic_invocations (Test * test_object) try { - //============================================================ // Test method invocation with boxed value //============================================================ @@ -464,7 +463,6 @@ int test_boxed_string_invocations (Test * test_object) try { - //============================================================ // Test method invocation with boxed value //============================================================ @@ -620,7 +618,6 @@ int test_boxed_sequence_invocations (Test * test_object) try { - //============================================================ // Test method invocation with boxed value //============================================================ @@ -806,7 +803,6 @@ int test_boxed_struct_invocations (Test * test_object) try { - //============================================================ // Fixed struct // Test method invocation with boxed value diff --git a/TAO/tests/ORB_destroy/ORB_destroy.cpp b/TAO/tests/ORB_destroy/ORB_destroy.cpp index b27c41c88ee..66a6bc334c9 100644 --- a/TAO/tests/ORB_destroy/ORB_destroy.cpp +++ b/TAO/tests/ORB_destroy/ORB_destroy.cpp @@ -22,7 +22,6 @@ test_with_regular_poa_manager (int argc, int destroy_orb, int destroy_poa) { - try { CORBA::ORB_var orb = @@ -65,7 +64,6 @@ test_with_funky_poa_manager (int argc, int destroy_poa, int funky_poa_manager) { - try { CORBA::ORB_var orb = diff --git a/TAO/tests/ORT/ServerORBInitializer.cpp b/TAO/tests/ORT/ServerORBInitializer.cpp index 9840a5ded32..1ec3e480fec 100644 --- a/TAO/tests/ORT/ServerORBInitializer.cpp +++ b/TAO/tests/ORT/ServerORBInitializer.cpp @@ -15,7 +15,6 @@ void ServerORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) { - CORBA::Object_var obj = info->resolve_initial_references ("POACurrent"); diff --git a/TAO/tests/Objref_Sequence_Test/client.cpp b/TAO/tests/Objref_Sequence_Test/client.cpp index a7c7d19c97b..fc56e946f15 100644 --- a/TAO/tests/Objref_Sequence_Test/client.cpp +++ b/TAO/tests/Objref_Sequence_Test/client.cpp @@ -33,8 +33,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - - try { CORBA::ORB_var orb = diff --git a/TAO/tests/Oneway_Timeouts/client.cpp b/TAO/tests/Oneway_Timeouts/client.cpp index f74a1197835..355fce05a34 100644 --- a/TAO/tests/Oneway_Timeouts/client.cpp +++ b/TAO/tests/Oneway_Timeouts/client.cpp @@ -320,7 +320,6 @@ void reset_buffering (ORB_ptr orb) int ACE_TMAIN (int ac, ACE_TCHAR *av[]) { - ACE_Time_Value before = ACE_High_Res_Timer::gettimeofday_hr (); int num_requests_sent = 0; diff --git a/TAO/tests/Oneway_Timeouts/server.cpp b/TAO/tests/Oneway_Timeouts/server.cpp index 9c41900337a..e570f98f4bb 100644 --- a/TAO/tests/Oneway_Timeouts/server.cpp +++ b/TAO/tests/Oneway_Timeouts/server.cpp @@ -157,7 +157,6 @@ using namespace CORBA; using namespace PortableServer; namespace { - void print_usage () { //FUZZ: disable check_for_lack_ACE_OS diff --git a/TAO/tests/POA/Adapter_Activator/server.cpp b/TAO/tests/POA/Adapter_Activator/server.cpp index d2871619fef..7fcbd0d07f0 100644 --- a/TAO/tests/POA/Adapter_Activator/server.cpp +++ b/TAO/tests/POA/Adapter_Activator/server.cpp @@ -236,7 +236,6 @@ write_iors_to_file (const char *first_ior, int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try { // Initialize the ORB first. diff --git a/TAO/tests/POA/Current/Current.cpp b/TAO/tests/POA/Current/Current.cpp index f17155b7a59..66018b024cc 100644 --- a/TAO/tests/POA/Current/Current.cpp +++ b/TAO/tests/POA/Current/Current.cpp @@ -19,7 +19,6 @@ int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { // Initialize the ORB first. diff --git a/TAO/tests/POA/DSI/Database_i.cpp b/TAO/tests/POA/DSI/Database_i.cpp index 79999c36573..6b784f888bb 100644 --- a/TAO/tests/POA/DSI/Database_i.cpp +++ b/TAO/tests/POA/DSI/Database_i.cpp @@ -118,7 +118,6 @@ DatabaseImpl::Agent::Agent (CORBA::ORB_ptr orb, common_servant_ (orb, poa) { - this->poa_->set_servant (&this->common_servant_); } diff --git a/TAO/tests/POA/DSI/client.cpp b/TAO/tests/POA/DSI/client.cpp index 2647416cc9c..fb704e0fde3 100644 --- a/TAO/tests/POA/DSI/client.cpp +++ b/TAO/tests/POA/DSI/client.cpp @@ -95,7 +95,6 @@ read_IOR_from_file (void) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - char str [255]; // Initialize the ORB try diff --git a/TAO/tests/POA/DSI/server.cpp b/TAO/tests/POA/DSI/server.cpp index 437ea3794b4..bf94db7344f 100644 --- a/TAO/tests/POA/DSI/server.cpp +++ b/TAO/tests/POA/DSI/server.cpp @@ -74,7 +74,6 @@ write_iors_to_file (const char *first_ior) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { // Initialize the ORB diff --git a/TAO/tests/POA/Default_Servant/Default_Servant.cpp b/TAO/tests/POA/Default_Servant/Default_Servant.cpp index f3a54ca0129..b1054c535d5 100644 --- a/TAO/tests/POA/Default_Servant/Default_Servant.cpp +++ b/TAO/tests/POA/Default_Servant/Default_Servant.cpp @@ -132,7 +132,6 @@ test_reference_to_servant_active_object(PortableServer::POA_ptr root_poa) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { // Initialize the ORB. diff --git a/TAO/tests/POA/Default_Servant2/client.cpp b/TAO/tests/POA/Default_Servant2/client.cpp index 00e10b17a37..0b529812c8f 100644 --- a/TAO/tests/POA/Default_Servant2/client.cpp +++ b/TAO/tests/POA/Default_Servant2/client.cpp @@ -67,7 +67,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try { // Initialize the ORB diff --git a/TAO/tests/POA/EndpointPolicy/server.cpp b/TAO/tests/POA/EndpointPolicy/server.cpp index e73f8c5fd88..6854f0cb1a1 100644 --- a/TAO/tests/POA/EndpointPolicy/server.cpp +++ b/TAO/tests/POA/EndpointPolicy/server.cpp @@ -294,7 +294,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) try { - Hello *hello_impl; ACE_NEW_RETURN (hello_impl, Hello (orb.in ()), diff --git a/TAO/tests/POA/Etherealization/Etherealization.cpp b/TAO/tests/POA/Etherealization/Etherealization.cpp index 37de8d7661e..524539b0e89 100644 --- a/TAO/tests/POA/Etherealization/Etherealization.cpp +++ b/TAO/tests/POA/Etherealization/Etherealization.cpp @@ -100,7 +100,6 @@ Servant_Activator::etherealize (const PortableServer::ObjectId &id, int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { // Initialize the ORB first. diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp index fefde92e666..2f82d6b08ac 100644 --- a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp +++ b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp @@ -144,7 +144,6 @@ test_object_deactivation (PortableServer::POA_ptr poa, int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { // Initialize the ORB first. diff --git a/TAO/tests/POA/FindPOA/FindPOA.cpp b/TAO/tests/POA/FindPOA/FindPOA.cpp index 609dd992db1..e09ec1cb2da 100644 --- a/TAO/tests/POA/FindPOA/FindPOA.cpp +++ b/TAO/tests/POA/FindPOA/FindPOA.cpp @@ -45,7 +45,6 @@ find_non_existant_POA (PortableServer::POA_ptr parent, int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - // Initialize the ORB try { diff --git a/TAO/tests/POA/Forwarding/client.cpp b/TAO/tests/POA/Forwarding/client.cpp index 45d1fc3755e..02356b5ad39 100644 --- a/TAO/tests/POA/Forwarding/client.cpp +++ b/TAO/tests/POA/Forwarding/client.cpp @@ -88,7 +88,6 @@ do_calls (test_ptr test) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { // Initialize the ORB diff --git a/TAO/tests/POA/Generic_Servant/client.cpp b/TAO/tests/POA/Generic_Servant/client.cpp index c55fa2301cb..66d24818a24 100644 --- a/TAO/tests/POA/Generic_Servant/client.cpp +++ b/TAO/tests/POA/Generic_Servant/client.cpp @@ -103,7 +103,6 @@ print_stats (ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time, int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try { // Initialize the ORB diff --git a/TAO/tests/POA/Identity/Identity.cpp b/TAO/tests/POA/Identity/Identity.cpp index 7324fa0d956..5755fb27a36 100644 --- a/TAO/tests/POA/Identity/Identity.cpp +++ b/TAO/tests/POA/Identity/Identity.cpp @@ -481,7 +481,6 @@ test_poas (CORBA::ORB_ptr orb, int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); diff --git a/TAO/tests/POA/Loader/Server_Manager.cpp b/TAO/tests/POA/Loader/Server_Manager.cpp index 02631843c12..9aea898d1c0 100644 --- a/TAO/tests/POA/Loader/Server_Manager.cpp +++ b/TAO/tests/POA/Loader/Server_Manager.cpp @@ -209,7 +209,6 @@ Server_i::create_poa (const char *name, int Server_i::create_activator (PortableServer::POA_var first_poa) { - try { // An Servant Activator object is created which will activate @@ -257,7 +256,6 @@ Server_i::create_activator (PortableServer::POA_var first_poa) int Server_i::create_locator (PortableServer::POA_var second_poa) { - try { // An Servant Locator object is created which will activate @@ -307,7 +305,6 @@ Server_i::create_locator (PortableServer::POA_var second_poa) int Server_i::run (void) { - try { // Invoke object_to_string on the references created in firstPOA diff --git a/TAO/tests/POA/NewPOA/NewPOA.cpp b/TAO/tests/POA/NewPOA/NewPOA.cpp index 0eea1764dec..a2c25fb5368 100644 --- a/TAO/tests/POA/NewPOA/NewPOA.cpp +++ b/TAO/tests/POA/NewPOA/NewPOA.cpp @@ -66,7 +66,6 @@ print_poa (PortableServer::POA_ptr poa) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try { // The first step Initialize the ORB diff --git a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp index 095603ccc8a..4303b2aa470 100644 --- a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp +++ b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp @@ -191,7 +191,6 @@ Deactivator::svc (void) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { // Initialize the ORB first. diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Collocated_Test.cpp b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Collocated_Test.cpp index acc635e0d36..6ccf83cae0b 100644 --- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Collocated_Test.cpp +++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Collocated_Test.cpp @@ -46,7 +46,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - if (parse_args (argc, argv) == -1) return -1; diff --git a/TAO/tests/POA/On_Demand_Activation/server.cpp b/TAO/tests/POA/On_Demand_Activation/server.cpp index 252da700f7b..f375dca2cb6 100644 --- a/TAO/tests/POA/On_Demand_Activation/server.cpp +++ b/TAO/tests/POA/On_Demand_Activation/server.cpp @@ -97,7 +97,6 @@ write_iors_to_file (const char *first_ior, int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { // Initialize the ORB. diff --git a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp index 98fb48a9442..8e06fdad162 100644 --- a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp +++ b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.cpp @@ -63,7 +63,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { // Initialize the ORB first. diff --git a/TAO/tests/POA/POA_BiDir/POA_BiDir.cpp b/TAO/tests/POA/POA_BiDir/POA_BiDir.cpp index 636bf782c94..ee7da30c48e 100644 --- a/TAO/tests/POA/POA_BiDir/POA_BiDir.cpp +++ b/TAO/tests/POA/POA_BiDir/POA_BiDir.cpp @@ -63,7 +63,6 @@ print_poa (PortableServer::POA_ptr poa) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try { // The first step Initialize the ORB diff --git a/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp b/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp index fe211b69c9a..433e84c9c72 100644 --- a/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp +++ b/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp @@ -33,7 +33,6 @@ test_i::destroy_poa (void) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { // Initialize the ORB first. diff --git a/TAO/tests/POA/Persistent_ID/client.cpp b/TAO/tests/POA/Persistent_ID/client.cpp index 52e48de5944..50fc9d3d38c 100644 --- a/TAO/tests/POA/Persistent_ID/client.cpp +++ b/TAO/tests/POA/Persistent_ID/client.cpp @@ -55,7 +55,6 @@ parse_args (int argc, ACE_TCHAR **argv) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try { CORBA::ORB_var orb = diff --git a/TAO/tests/POA/Persistent_ID/server.cpp b/TAO/tests/POA/Persistent_ID/server.cpp index 12c2ccf5dbe..551ea4575c0 100644 --- a/TAO/tests/POA/Persistent_ID/server.cpp +++ b/TAO/tests/POA/Persistent_ID/server.cpp @@ -201,7 +201,6 @@ write_ior_to_file (const char *ior) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try { CORBA::ORB_var orb = diff --git a/TAO/tests/POA/Policies/Policies.cpp b/TAO/tests/POA/Policies/Policies.cpp index b47ab82b716..9913ecb6ec3 100644 --- a/TAO/tests/POA/Policies/Policies.cpp +++ b/TAO/tests/POA/Policies/Policies.cpp @@ -22,7 +22,6 @@ int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { // Initialize the ORB first. diff --git a/TAO/tests/POA/Reference_Counted_Servant/server.cpp b/TAO/tests/POA/Reference_Counted_Servant/server.cpp index 36da182f180..0746c719904 100644 --- a/TAO/tests/POA/Reference_Counted_Servant/server.cpp +++ b/TAO/tests/POA/Reference_Counted_Servant/server.cpp @@ -99,7 +99,6 @@ write_iors_to_file (const char *ior) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try { // Initialize the ORB first. diff --git a/TAO/tests/POA/RootPOA/RootPOA.cpp b/TAO/tests/POA/RootPOA/RootPOA.cpp index d97f7ab36a9..0d17d787ef5 100644 --- a/TAO/tests/POA/RootPOA/RootPOA.cpp +++ b/TAO/tests/POA/RootPOA/RootPOA.cpp @@ -20,7 +20,6 @@ int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { // Initilize the ORB diff --git a/TAO/tests/POA/TIE/server.cpp b/TAO/tests/POA/TIE/server.cpp index a8611154317..e67aedc6727 100644 --- a/TAO/tests/POA/TIE/server.cpp +++ b/TAO/tests/POA/TIE/server.cpp @@ -71,7 +71,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - char str[256]; try diff --git a/TAO/tests/Param_Test/client.cpp b/TAO/tests/Param_Test/client.cpp index 08f1dd6303b..94c090ff8ca 100644 --- a/TAO/tests/Param_Test/client.cpp +++ b/TAO/tests/Param_Test/client.cpp @@ -98,7 +98,6 @@ Param_Test_Client<T>::run_sii_test (void) } catch (const CORBA::Exception& ex) { - this->results_.error_count (this->results_.error_count () + 1); ex._tao_print_exception (opname); ACE_ERROR ((LM_ERROR, diff --git a/TAO/tests/Param_Test/fixed_array.cpp b/TAO/tests/Param_Test/fixed_array.cpp index b4e9cf443e7..c53e30d5782 100644 --- a/TAO/tests/Param_Test/fixed_array.cpp +++ b/TAO/tests/Param_Test/fixed_array.cpp @@ -80,7 +80,6 @@ Test_Fixed_Array::init_parameters (Param_Test_ptr /*objref*/ int Test_Fixed_Array::reset_parameters (void) { - for (CORBA::ULong i=0; i < Param_Test::DIM1; i++) { this->inout_ [i] = 0; diff --git a/TAO/tests/Param_Test/typecode.cpp b/TAO/tests/Param_Test/typecode.cpp index 0e478e64972..6dd0fa5e761 100644 --- a/TAO/tests/Param_Test/typecode.cpp +++ b/TAO/tests/Param_Test/typecode.cpp @@ -127,7 +127,6 @@ Test_TypeCode::run_sii_test (Param_Test_ptr objref) CORBA::Boolean Test_TypeCode::check_validity (void) { - try { CORBA::Boolean one, two, three; diff --git a/TAO/tests/Param_Test/ub_objref_seq.cpp b/TAO/tests/Param_Test/ub_objref_seq.cpp index aabd1d7835a..d57a08f8f92 100644 --- a/TAO/tests/Param_Test/ub_objref_seq.cpp +++ b/TAO/tests/Param_Test/ub_objref_seq.cpp @@ -148,7 +148,6 @@ Test_ObjRef_Sequence::run_sii_test (Param_Test_ptr objref) CORBA::Boolean Test_ObjRef_Sequence::check_validity (void) { - try { this->compare (this->in_, diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp index bfea67d3b52..5a5c04b804c 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp @@ -18,7 +18,6 @@ void Client_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) { - PortableInterceptor::ClientRequestInterceptor_ptr tmp = PortableInterceptor::ClientRequestInterceptor::_nil (); diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp index 6bb583988f2..4d6112bc7ef 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp @@ -18,7 +18,6 @@ void Server_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) { - PortableInterceptor::ServerRequestInterceptor_ptr tmp = PortableInterceptor::ServerRequestInterceptor::_nil (); diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp index 7289df05aaa..62e80790483 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp @@ -39,7 +39,6 @@ void Vault_Client_Request_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri) { - CORBA::String_var op = ri->operation (); if (ACE_OS::strcmp (op.in (), "authenticate") == 0) @@ -79,7 +78,6 @@ void Vault_Client_Request_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri) { - CORBA::String_var op = ri->operation (); if (ACE_OS::strcmp (op.in (), "update_records") == 0) @@ -102,7 +100,6 @@ void Vault_Client_Request_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri) { - CORBA::Any_var any = ri->received_exception (); CORBA::TypeCode_var tc = any->type (); @@ -153,7 +150,6 @@ void Vault_Client_Request_Context_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri) { - // MAke the context to send the context to the target IOP::ServiceContext sc; sc.context_id = request_ctx_id; @@ -184,14 +180,12 @@ void Vault_Client_Request_Context_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr) { - } void Vault_Client_Request_Context_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri) { - CORBA::Any_var any = ri->received_exception (); CORBA::TypeCode_var tc = any->type (); @@ -242,7 +236,6 @@ void Vault_Client_Request_Dynamic_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri) { - CORBA::String_var op = ri->operation (); if (ACE_OS::strcmp (op.in (), "authenticate") == 0) @@ -274,7 +267,6 @@ void Vault_Client_Request_Dynamic_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri) { - CORBA::String_var op = ri->operation (); if (ACE_OS::strcmp (op.in (), "ready") == 0) @@ -307,7 +299,6 @@ void Vault_Client_Request_Dynamic_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri) { - CORBA::Any_var any = ri->received_exception (); CORBA::TypeCode_var tc = any->type (); @@ -358,7 +349,6 @@ void Vault_Client_Request_NOOP_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr) { - } void @@ -372,14 +362,12 @@ void Vault_Client_Request_NOOP_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr) { - } void Vault_Client_Request_NOOP_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri) { - CORBA::Any_var any = ri->received_exception (); CORBA::TypeCode_var tc = any->type (); diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp index 1cb6435172c..eaf668deda6 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp @@ -39,7 +39,6 @@ void Vault_Server_Request_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr ri) { - CORBA::String_var op = ri->operation (); if (ACE_OS::strcmp (op.in (), "authenticate") == 0) @@ -73,7 +72,6 @@ void Vault_Server_Request_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr ri) { - CORBA::String_var op = ri->operation (); if (ACE_OS::strcmp (op.in (), "update_records") == 0) @@ -133,7 +131,6 @@ void Vault_Server_Request_Context_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr ri) { - IOP::ServiceId id = request_ctx_id; IOP::ServiceContext_var sc = ri->get_request_service_context (id); @@ -148,7 +145,6 @@ void Vault_Server_Request_Context_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr) { - } void @@ -190,7 +186,6 @@ void Vault_Server_Request_Dynamic_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr ri) { - CORBA::String_var op = ri->operation (); if (ACE_OS::strcmp (op.in (), "authenticate") == 0) @@ -229,7 +224,6 @@ void Vault_Server_Request_Dynamic_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr ri) { - CORBA::String_var op = ri->operation (); if (ACE_OS::strcmp (op.in (), "ready") == 0) @@ -301,7 +295,6 @@ void Vault_Server_Request_NOOP_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr) { - } void diff --git a/TAO/tests/Portable_Interceptors/Benchmark/test_i.h b/TAO/tests/Portable_Interceptors/Benchmark/test_i.h index cf7340431d0..9a5a3bb48b1 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/test_i.h +++ b/TAO/tests/Portable_Interceptors/Benchmark/test_i.h @@ -20,7 +20,6 @@ */ class Secure_Vault_i : public POA_Test_Interceptors::Secure_Vault { - public: /// ctor Secure_Vault_i (CORBA::ORB_ptr orb); diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp index 8477a62bab0..a70f9da6453 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp @@ -16,7 +16,6 @@ void Client_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) { - CORBA::String_var orb_id = info->orb_id (); diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp index 50382009f30..2c332e94e2b 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp @@ -34,7 +34,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) void run_test (Test_Interceptors::Visual_ptr server) { - server->normal (10); ACE_DEBUG ((LM_DEBUG, "\"normal\" operation done\n")); diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp index f295510e9df..985f0a49049 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp @@ -169,7 +169,6 @@ void Echo_Client_Request_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri) { - if (CORBA::is_nil (this->orb_.in ())) { int argc = 0; @@ -278,7 +277,6 @@ void Echo_Client_Request_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri) { - if (CORBA::is_nil (this->orb_.in ())) { int argc = 0; diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp index 044a8d74dac..a6ed938f31b 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp @@ -53,7 +53,6 @@ void Echo_Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri) { - CORBA::String_var operation = ri->operation (); ACE_DEBUG ((LM_DEBUG, @@ -122,7 +121,6 @@ void Echo_Server_Request_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr ri) { - CORBA::String_var operation = ri->operation (); ACE_DEBUG ((LM_DEBUG, @@ -168,7 +166,6 @@ void Echo_Server_Request_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr ri) { - CORBA::String_var operation = ri->operation (); ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h index 9cd704f3dcb..f53eeb2cb07 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h +++ b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h @@ -21,7 +21,6 @@ */ class Visual_i : public POA_Test_Interceptors::Visual { - public: Visual_i (CORBA::ORB_ptr orb); diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp index b3ba85faa40..ebd31a9366d 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp @@ -32,7 +32,6 @@ void Echo_Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri) { - CORBA::String_var operation = ri->operation (); ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h index 07425be504c..4dd3a4a22de 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h @@ -21,7 +21,6 @@ */ class Visual_i : public POA_Test_Interceptors::Visual { - public: Visual_i (CORBA::ORB_ptr orb); diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp index d59fc6c198a..c1ed4d78e36 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp @@ -20,7 +20,6 @@ Server_Task::svc (void) { try { - CORBA::Object_var poa_object = sorb_->resolve_initial_references ("RootPOA"); diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h index d2ee1a7d7a4..6029ec925fd 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h @@ -20,7 +20,6 @@ */ class Visual_i : public POA_Test_Interceptors::Visual { - public: /// ctor Visual_i (CORBA::ORB_ptr orb); diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp index e86871a0cae..5445f920662 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp @@ -16,7 +16,6 @@ void Collocated_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) { - CORBA::String_var orb_id = info->orb_id (); diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp index d37a68bc5aa..32f5ba5dd10 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp @@ -40,7 +40,6 @@ void Echo_Client_Request_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri) { - if (CORBA::is_nil (this->orb_.in ())) { int argc = 0; @@ -101,7 +100,6 @@ void Echo_Client_Request_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri) { - if (CORBA::is_nil (this->orb_.in ())) { int argc = 0; @@ -324,7 +322,6 @@ void Echo_Server_Request_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr ri) { - CORBA::String_var operation = ri->operation (); ACE_DEBUG ((LM_DEBUG, @@ -370,7 +367,6 @@ void Echo_Server_Request_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr ri) { - CORBA::String_var operation = ri->operation (); ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h index 462088b2a7b..f6cd81bb42a 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h @@ -19,7 +19,6 @@ */ class Visual_i : public virtual POA_Test_Interceptors::Visual { - public: Visual_i (CORBA::ORB_ptr orb); diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp index a51d948d3a1..024e5d6fd5e 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp @@ -19,7 +19,6 @@ void Echo_Client_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) { - PortableInterceptor::ClientRequestInterceptor_ptr interceptor = PortableInterceptor::ClientRequestInterceptor::_nil (); diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp index cae006a7f86..3d16645c0a9 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp @@ -19,7 +19,6 @@ void Echo_Server_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) { - PortableInterceptor::ServerRequestInterceptor_ptr interceptor = PortableInterceptor::ServerRequestInterceptor::_nil (); diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp index f16500edbc4..90cc634d689 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp @@ -90,7 +90,6 @@ void Client_Request_Interceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr ri) { - CORBA::Boolean response_expected = ri->response_expected (); diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp index c987a61ce31..17676f5844f 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp @@ -27,7 +27,6 @@ void ServerRequestInterceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri) { - CORBA::String_var op = ri->operation (); if (ACE_OS::strcmp (op.in (), "invoke_me") != 0) @@ -111,7 +110,6 @@ void ServerRequestInterceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr ri) { - CORBA::String_var op = ri->operation (); if (ACE_OS::strcmp (op.in (), "invoke_me") != 0) diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h index 659e70a0f0a..e09da0fda7b 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h @@ -48,7 +48,6 @@ public: * methods required for all PolicyFactory sub-classes. */ //@{ - /// Construct a Test::Policy object as a test. virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any & value); diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp index d59fc6c198a..c1ed4d78e36 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp @@ -20,7 +20,6 @@ Server_Task::svc (void) { try { - CORBA::Object_var poa_object = sorb_->resolve_initial_references ("RootPOA"); diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp index f74bba712bd..908941bf9ac 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp @@ -81,7 +81,6 @@ void Echo_Client_Request_Interceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr ri) { - CORBA::String_var op = ri->operation (); // Do not count the _is_a calls @@ -99,7 +98,6 @@ void Echo_Client_Request_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri) { - CORBA::String_var op = ri->operation (); // Do not count the _is_a calls @@ -151,7 +149,6 @@ void Echo_Client_Request_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri) { - CORBA::String_var op = ri->operation (); // Do not count the _is_a calls @@ -203,7 +200,6 @@ void Echo_Server_Request_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr ri) { - CORBA::String_var op = ri->operation (); // Do not count the _is_a calls @@ -247,7 +243,6 @@ void Echo_Server_Request_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr ri) { - CORBA::String_var op = ri->operation (); // Do not count the _is_a calls @@ -301,7 +296,6 @@ void Echo_Server_Request_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr ri) { - CORBA::String_var op = ri->operation (); // Do not count the _is_a calls diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h index d2ee1a7d7a4..6029ec925fd 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h @@ -20,7 +20,6 @@ */ class Visual_i : public POA_Test_Interceptors::Visual { - public: /// ctor Visual_i (CORBA::ORB_ptr orb); diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp index 522004e802c..ba642d0678b 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp @@ -17,7 +17,6 @@ Client_Task::svc (void) { try { - CORBA::Object_var object = corb_->string_to_object (input_); diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp index a219c75da48..9b0426ef035 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp @@ -20,7 +20,6 @@ Server_Task::svc (void) { try { - CORBA::Object_var poa_object = sorb_->resolve_initial_references ("RootPOA"); diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h index d2ee1a7d7a4..6029ec925fd 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h @@ -20,7 +20,6 @@ */ class Visual_i : public POA_Test_Interceptors::Visual { - public: /// ctor Visual_i (CORBA::ORB_ptr orb); diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp index d01f7c76f92..2989b40d3c7 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp @@ -13,7 +13,6 @@ void Client_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) { - // Create and register the test request interceptors. PortableInterceptor::ClientRequestInterceptor_ptr ci = PortableInterceptor::ClientRequestInterceptor::_nil (); diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp index ca47ad3f403..3102e499835 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp @@ -69,7 +69,6 @@ void Client_Request_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr ri) { - CORBA::Boolean client_side = this->client_side_test (ri); @@ -87,7 +86,6 @@ void Client_Request_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri) { - CORBA::Boolean client_side = this->client_side_test (ri); @@ -142,7 +140,6 @@ void Client_Request_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri) { - CORBA::Boolean client_side = this->client_side_test (ri); @@ -219,7 +216,6 @@ void Client_Request_Interceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr ri) { - CORBA::Boolean client_side = this->client_side_test (ri); diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp index 0a4590bf850..aeb29430a4a 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp @@ -17,7 +17,6 @@ Request_Interceptor::name () void Request_Interceptor::destroy (void) { - CORBA::ULong s_count = this->starting_interception_point_count_.value (); diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp index 7fd43c132b1..d87b33ee59f 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp @@ -13,7 +13,6 @@ void Server_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) { - // Create and register the test request interceptors. PortableInterceptor::ServerRequestInterceptor_ptr si = PortableInterceptor::ServerRequestInterceptor::_nil (); diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp index 0caaf005906..848ae9d00a4 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp @@ -72,7 +72,6 @@ void Server_Request_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr ri) { - CORBA::Boolean server_side = this->server_side_test (ri); diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp index 1f166b93d43..d65ed78aa37 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp @@ -17,7 +17,6 @@ void Client_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) { - CORBA::String_var orb_id = info->orb_id (); diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp index 1fe2ff983db..de2fa616bfb 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp @@ -35,7 +35,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) void run_test (Test_Interceptors::Visual_ptr server) { - server->normal (10); ACE_DEBUG ((LM_DEBUG, "\"normal\" operation done\n")); diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp index 7ba00642546..c9817031d44 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp @@ -41,7 +41,6 @@ void Echo_Client_Request_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri) { - if (CORBA::is_nil (this->orb_.in ())) { int argc = 0; @@ -104,7 +103,6 @@ void Echo_Client_Request_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri) { - if (CORBA::is_nil (this->orb_.in ())) { int argc = 0; @@ -179,7 +177,6 @@ void Echo_Client_Request_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri) { - if (CORBA::is_nil (this->orb_.in ())) { int argc = 0; diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp index d27ae377027..ae196bc661c 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp @@ -32,7 +32,6 @@ void Echo_Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri) { - CORBA::String_var operation = ri->operation (); ACE_DEBUG ((LM_DEBUG, @@ -137,7 +136,6 @@ void Echo_Server_Request_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr ri) { - CORBA::String_var operation = ri->operation (); #if 0 diff --git a/TAO/tests/Portable_Interceptors/Slot/driver.cpp b/TAO/tests/Portable_Interceptors/Slot/driver.cpp index e1519d1b7ee..d2d70067138 100644 --- a/TAO/tests/Portable_Interceptors/Slot/driver.cpp +++ b/TAO/tests/Portable_Interceptors/Slot/driver.cpp @@ -25,7 +25,6 @@ public: int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { PortableInterceptor::ORBInitializer_var orb_initializer = new ORB_Initializer (); diff --git a/TAO/tests/QtTests/client.cpp b/TAO/tests/QtTests/client.cpp index 6dc109b89c1..c49fb047aea 100644 --- a/TAO/tests/QtTests/client.cpp +++ b/TAO/tests/QtTests/client.cpp @@ -8,7 +8,6 @@ int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - ACE_Argv_Type_Converter ct (argc, argv); QApplication app (argc, ct.get_ASCII_argv ()); TAO::QtResource_Loader qt_resources (&app); diff --git a/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp b/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp index 97f659ec0cb..cbddcd432f3 100644 --- a/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp +++ b/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp @@ -83,7 +83,6 @@ static void del_message (TAO_Queued_Message *&head, int ACE_TMAIN(int, ACE_TCHAR *[]) { - // Initialize a random seed to get better coverage. // @@ The random seed and default values should be configurable // using command line options. diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.cpp b/TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.cpp index 9e925634654..a0745a4e2d8 100644 --- a/TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.cpp +++ b/TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.cpp @@ -17,7 +17,6 @@ void Client_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) { - CORBA::String_var orb_id = info->orb_id (); diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/client.cpp b/TAO/tests/RTCORBA/Bug_3382_Regression/client.cpp index 33105f69a6a..679816520a7 100644 --- a/TAO/tests/RTCORBA/Bug_3382_Regression/client.cpp +++ b/TAO/tests/RTCORBA/Bug_3382_Regression/client.cpp @@ -56,7 +56,6 @@ Task::Task (ACE_Thread_Manager &thread_manager, int Task::svc (void) { - int result = 0; try { diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.cpp b/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.cpp index 3e5e24aa0d4..dac74fd104e 100644 --- a/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.cpp +++ b/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.cpp @@ -42,7 +42,6 @@ void Client_Request_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri) { - try { // Try to get the RTCorbaPriority context. If its not there, @@ -71,7 +70,6 @@ void Client_Request_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri) { - if (CORBA::is_nil (this->orb_.in ())) { int argc = 0; diff --git a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp index 9e925634654..a0745a4e2d8 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp @@ -17,7 +17,6 @@ void Client_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) { - CORBA::String_var orb_id = info->orb_id (); diff --git a/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp b/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp index 3e5e24aa0d4..dac74fd104e 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp @@ -42,7 +42,6 @@ void Client_Request_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri) { - try { // Try to get the RTCorbaPriority context. If its not there, @@ -71,7 +70,6 @@ void Client_Request_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri) { - if (CORBA::is_nil (this->orb_.in ())) { int argc = 0; diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp index 123cd66c965..8139491449d 100644 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp +++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp @@ -173,7 +173,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } else { - // Thread Manager for managing task. ACE_Thread_Manager thread_manager; diff --git a/TAO/tests/RTCORBA/Policies/Policies.cpp b/TAO/tests/RTCORBA/Policies/Policies.cpp index e044720eec1..b7c6e4b06e1 100644 --- a/TAO/tests/RTCORBA/Policies/Policies.cpp +++ b/TAO/tests/RTCORBA/Policies/Policies.cpp @@ -21,7 +21,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try { // Initialize the ORB first. diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp index 8b0cf47ea8b..f33d08539bb 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp @@ -17,10 +17,8 @@ test_i::test_i (CORBA::ORB_ptr orb, current_iteration_ (0), total_iterations_ (0) { - try { - CORBA::Object_var object = this->orb_->resolve_initial_references ("RTCurrent"); diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp index f63ca3c4540..3d0a3128e24 100644 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp @@ -91,7 +91,6 @@ parse_args (int argc, ACE_TCHAR **argv) class Client { - public: Client (test_ptr test, CORBA::ORB_ptr orb, @@ -473,7 +472,6 @@ Task::svc (void) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try { CORBA::ORB_var orb = diff --git a/TAO/tests/RTScheduling/Current/Thread_Task.cpp b/TAO/tests/RTScheduling/Current/Thread_Task.cpp index 5184795bebd..154474fea0b 100644 --- a/TAO/tests/RTScheduling/Current/Thread_Task.cpp +++ b/TAO/tests/RTScheduling/Current/Thread_Task.cpp @@ -10,7 +10,6 @@ Thread_Task::Thread_Task (CORBA::ORB_ptr orb) int Thread_Task::activate_task (int thr_count) { - try { ACE_NEW_RETURN (shutdown_lock_, diff --git a/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h b/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h index cffcf82dbaf..8280f3f4862 100644 --- a/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h +++ b/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h @@ -32,7 +32,6 @@ Test_Thread_Action::Test_Thread_Action (void) void Test_Thread_Action::_cxx_do (CORBA::VoidData data) { - Data* tmp = (Data*) data; ACE_DEBUG ((LM_DEBUG, "Test_Thread_Action::do %C\n", diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp index 292b1e7ba73..db1cdfe229d 100644 --- a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp +++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp @@ -45,7 +45,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { - orb = CORBA::ORB_init (argc, argv); if (parse_args (argc, argv) == -1) diff --git a/TAO/tests/Servant_To_Reference_Test/server.cpp b/TAO/tests/Servant_To_Reference_Test/server.cpp index 4f820fd6b1f..65a3bf86b53 100644 --- a/TAO/tests/Servant_To_Reference_Test/server.cpp +++ b/TAO/tests/Servant_To_Reference_Test/server.cpp @@ -31,7 +31,6 @@ private: int MT_Task::svc (void) { - try { for (CORBA::Long i = 0; diff --git a/TAO/tests/Server_Connection_Purging/client2.cpp b/TAO/tests/Server_Connection_Purging/client2.cpp index 0ff2c2fd269..a6a6eec142f 100644 --- a/TAO/tests/Server_Connection_Purging/client2.cpp +++ b/TAO/tests/Server_Connection_Purging/client2.cpp @@ -39,7 +39,6 @@ parse_args (int argc, ACE_TCHAR **argv) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try { // Initialize the ORB. diff --git a/TAO/tests/Server_Connection_Purging/server.cpp b/TAO/tests/Server_Connection_Purging/server.cpp index d7c4dc6c141..a7bf81eb0b9 100644 --- a/TAO/tests/Server_Connection_Purging/server.cpp +++ b/TAO/tests/Server_Connection_Purging/server.cpp @@ -32,7 +32,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { CORBA::ORB_var orb = diff --git a/TAO/tests/Single_Read/client.cpp b/TAO/tests/Single_Read/client.cpp index a2c13bc6ef7..1db6e239f6b 100644 --- a/TAO/tests/Single_Read/client.cpp +++ b/TAO/tests/Single_Read/client.cpp @@ -66,7 +66,6 @@ parse_args (int argc, ACE_TCHAR **argv) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try { // Initialize the ORB. diff --git a/TAO/tests/Smart_Proxies/Benchmark/server.cpp b/TAO/tests/Smart_Proxies/Benchmark/server.cpp index e2d18adb283..4b9bab49faf 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/server.cpp +++ b/TAO/tests/Smart_Proxies/Benchmark/server.cpp @@ -86,7 +86,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { CORBA::ORB_var orb = CORBA::ORB_init (argc, diff --git a/TAO/tests/Smart_Proxies/On_Demand/server.cpp b/TAO/tests/Smart_Proxies/On_Demand/server.cpp index 0e351cc9c2b..82be6239c97 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/server.cpp +++ b/TAO/tests/Smart_Proxies/On_Demand/server.cpp @@ -83,7 +83,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { CORBA::ORB_var orb = CORBA::ORB_init (argc, diff --git a/TAO/tests/Smart_Proxies/dtor/server.cpp b/TAO/tests/Smart_Proxies/dtor/server.cpp index 1ccc4ed8a80..084d7474ab5 100644 --- a/TAO/tests/Smart_Proxies/dtor/server.cpp +++ b/TAO/tests/Smart_Proxies/dtor/server.cpp @@ -63,7 +63,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); diff --git a/TAO/tests/Smart_Proxies/server.cpp b/TAO/tests/Smart_Proxies/server.cpp index 8e7f1fcd58b..1f358d45de9 100644 --- a/TAO/tests/Smart_Proxies/server.cpp +++ b/TAO/tests/Smart_Proxies/server.cpp @@ -83,7 +83,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { CORBA::ORB_var orb = CORBA::ORB_init (argc, diff --git a/TAO/tests/Storable/Savable.cpp b/TAO/tests/Storable/Savable.cpp index be8d61f36c7..ee4667f0fb8 100644 --- a/TAO/tests/Storable/Savable.cpp +++ b/TAO/tests/Storable/Savable.cpp @@ -90,7 +90,6 @@ Savable::Savable (TAO::Storable_Factory & storable_factory) : storable_factory_(storable_factory) , loaded_from_stream_ (false) { - for (int index = 0; index < 2; ++index) { this->i_[index] = 0; diff --git a/TAO/tests/Storable/test.cpp b/TAO/tests/Storable/test.cpp index 0748cb9b409..568e6aa9848 100644 --- a/TAO/tests/Storable/test.cpp +++ b/TAO/tests/Storable/test.cpp @@ -112,7 +112,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { for (int j = 0; j < num_loops; ++j) { - // Constructor called num_loops times. // Each time state read from persistent store. Savable savable(factory); @@ -121,7 +120,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // written from other process is correct. if (savable.is_loaded_from_stream ()) { - int int_read = savable.int_get(read_index); // If value read is not 0 then the other // process has written to persistent store. diff --git a/TAO/tests/Timed_Buffered_Oneways/client.cpp b/TAO/tests/Timed_Buffered_Oneways/client.cpp index 0b93b2eece0..a80f7fbca30 100644 --- a/TAO/tests/Timed_Buffered_Oneways/client.cpp +++ b/TAO/tests/Timed_Buffered_Oneways/client.cpp @@ -116,7 +116,6 @@ parse_args (int argc, ACE_TCHAR **argv) test_ptr setup_policies (CORBA::ORB_ptr orb, test_ptr object) { - test_var object_with_policy; CORBA::PolicyList policy_list (1); if (timeout == -1) @@ -168,7 +167,6 @@ setup_policies (CORBA::ORB_ptr orb, test_ptr object) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try { // Initialize the ORB. diff --git a/TAO/tests/TransportCurrent/Framework/client.cpp b/TAO/tests/TransportCurrent/Framework/client.cpp index f91eea955d1..5b42814602a 100644 --- a/TAO/tests/TransportCurrent/Framework/client.cpp +++ b/TAO/tests/TransportCurrent/Framework/client.cpp @@ -103,10 +103,8 @@ Worker::svc (void) { try { - for (int i = 0; i < this->niterations_; ++i) { - // Minimum CORBA does not define Object::_request, so we're just // skipping the DII part in those cases. #if (!defined(TAO_HAS_MINIMUM_CORBA) || (TAO_HAS_MINIMUM_CORBA == 0)) @@ -249,7 +247,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } else { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Invoking server->self_test()\n"))); // Self-test the server side diff --git a/TAO/tests/TransportCurrent/Framework/server.cpp b/TAO/tests/TransportCurrent/Framework/server.cpp index 7d3caf9d35d..530ac296313 100644 --- a/TAO/tests/TransportCurrent/Framework/server.cpp +++ b/TAO/tests/TransportCurrent/Framework/server.cpp @@ -93,7 +93,6 @@ server_main (int argc, ACE_TCHAR *argv[], Test::Server_Request_Interceptor *cri) { - #if TAO_HAS_TRANSPORT_CURRENT == 1 try diff --git a/TAO/tests/TransportCurrent/Framework/simple.cpp b/TAO/tests/TransportCurrent/Framework/simple.cpp index 05180dba1a5..e5d271f837e 100644 --- a/TAO/tests/TransportCurrent/Framework/simple.cpp +++ b/TAO/tests/TransportCurrent/Framework/simple.cpp @@ -29,7 +29,6 @@ testCurrentORBInitializer (int argc, ACE_TCHAR *argv[]) int testCurrentLoader (int, char *[]) { - ACE_Service_Object *factory = 0; factory = ACE_Dynamic_Service<ACE_Service_Object>::instance @@ -50,7 +49,6 @@ testCurrentLoader (int, char *[]) -1); else { - #if !defined (TAO_AS_STATIC_LIBS) int ret = ACE_Service_Config::process_directive (ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE("TAO_Transport_Current_Loader", diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp index 4e1a630dd06..9b5d225c9e3 100644 --- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp +++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp @@ -6,7 +6,6 @@ #include "IIOP_Server_Request_Interceptor.h" namespace Test { - using namespace TAO; IIOP_Server_Request_Interceptor::IIOP_Server_Request_Interceptor (const char* orbid, TEST test) diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h index 4e26768f71d..9133d91b07f 100644 --- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h +++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h @@ -27,7 +27,6 @@ namespace Test { - class IIOP_Server_Request_Interceptor : public virtual Test::Server_Request_Interceptor , public virtual ::CORBA::LocalObject diff --git a/TAO/tests/TransportCurrent/IIOP/client.cpp b/TAO/tests/TransportCurrent/IIOP/client.cpp index 843baeaeb6f..c9abdc769c5 100644 --- a/TAO/tests/TransportCurrent/IIOP/client.cpp +++ b/TAO/tests/TransportCurrent/IIOP/client.cpp @@ -103,10 +103,8 @@ Worker::svc (void) { try { - for (int i = 0; i < this->niterations_; ++i) { - // Minimum CORBA does not define Object::_request, so we're just // skipping the DII part in those cases. #if (!defined(TAO_HAS_MINIMUM_CORBA) || (TAO_HAS_MINIMUM_CORBA == 0)) @@ -249,7 +247,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } else { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Client (%P|%t) Invoking server->self_test()\n"))); // Self-test the server side diff --git a/TAO/tests/TransportCurrent/IIOP/server.cpp b/TAO/tests/TransportCurrent/IIOP/server.cpp index 83c95e93308..fbcecce3a26 100644 --- a/TAO/tests/TransportCurrent/IIOP/server.cpp +++ b/TAO/tests/TransportCurrent/IIOP/server.cpp @@ -92,7 +92,6 @@ server_main (int argc, ACE_TCHAR *argv[], Test::Server_Request_Interceptor *cri) { - #if TAO_HAS_TRANSPORT_CURRENT == 1 try diff --git a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp index 2eb5c6e8d19..4a282cd8ab6 100644 --- a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp +++ b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp @@ -6,7 +6,6 @@ namespace Test { - Client_ORBInitializer::Client_ORBInitializer (PortableInterceptor::ClientRequestInterceptor_ptr interceptor) : interceptor_ diff --git a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h index 86ed8867cb4..a2f99cfd8bc 100644 --- a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h +++ b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h @@ -25,7 +25,6 @@ namespace Test { - class Current_Test_Export Client_ORBInitializer : public virtual PortableInterceptor::ORBInitializer, public virtual ::CORBA::LocalObject diff --git a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp index 5374a39a00f..890cf65a533 100644 --- a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp +++ b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp @@ -7,7 +7,6 @@ namespace Test { - Client_Request_Interceptor::Client_Request_Interceptor (const char *orb_id, TEST test) : orb_id_ (CORBA::string_dup (orb_id)) diff --git a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h index a3c37dcbd0d..30e64315bf9 100644 --- a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h +++ b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h @@ -29,7 +29,6 @@ namespace Test { - /// A metod doing the actual testing, so we could change it for the /// different traits implementations typedef int (*TEST) (CORBA::ORB_ptr); diff --git a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp index f15ce0662e4..8fb8af99ebf 100644 --- a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp +++ b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp @@ -6,7 +6,6 @@ namespace Test { - Server_ORBInitializer::Server_ORBInitializer (PortableInterceptor::ServerRequestInterceptor_ptr interceptor) : interceptor_ diff --git a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h index 216a63ac284..f3d554cf14a 100644 --- a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h +++ b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h @@ -24,7 +24,6 @@ namespace Test { - class Current_Test_Export Server_ORBInitializer : public virtual PortableInterceptor::ORBInitializer, public virtual ::CORBA::LocalObject diff --git a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp index 17064f19bbe..73980f0befb 100644 --- a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp +++ b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp @@ -6,7 +6,6 @@ namespace Test { - Server_Request_Interceptor::Server_Request_Interceptor (const char* orbid, TEST test) : request_count_ (0) , orb_id_ (::CORBA::string_dup (orbid)) diff --git a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h index 3830c787546..06e0c363d52 100644 --- a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h +++ b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h @@ -30,7 +30,6 @@ namespace Test { - /// A metod doing the actual testing, so we could change it for the /// different traits implementations diff --git a/TAO/tests/Two_Objects/Second_i.cpp b/TAO/tests/Two_Objects/Second_i.cpp index 324a470f8f5..286c37b03d2 100644 --- a/TAO/tests/Two_Objects/Second_i.cpp +++ b/TAO/tests/Two_Objects/Second_i.cpp @@ -11,7 +11,6 @@ Second_i::Second_i (CORBA::ORB_ptr orb, length_(len), two_way_done_(two_way_done) { - } Two_Objects_Test::Octet_Seq * diff --git a/TAO/tests/Two_Objects/worker.cpp b/TAO/tests/Two_Objects/worker.cpp index 7c88437acac..9387edcce9d 100644 --- a/TAO/tests/Two_Objects/worker.cpp +++ b/TAO/tests/Two_Objects/worker.cpp @@ -9,7 +9,6 @@ Worker::Worker (CORBA::ORB_ptr orb) int Worker::svc (void) { - try { this->orb_->run (); diff --git a/TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.cpp b/TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.cpp index 471d36cde19..4e774826bed 100644 --- a/TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.cpp +++ b/TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.cpp @@ -5,7 +5,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - Test_CompressorFactory::Test_CompressorFactory (void) : ::TAO::CompressorFactory (COMPRESSORID_FOR_TESTING), compressor_ (::Compression::Compressor::_nil ()) diff --git a/TAO/utils/NamingViewer/NamingObject.cpp b/TAO/utils/NamingViewer/NamingObject.cpp index b67dcb5e3ef..0823bfd7f6b 100644 --- a/TAO/utils/NamingViewer/NamingObject.cpp +++ b/TAO/utils/NamingViewer/NamingObject.cpp @@ -21,7 +21,6 @@ CNamingObject::CNamingObject(CosNaming::Name &Name, m_Object (CORBA::Object::_duplicate (pObject)), m_Context (Context) { - } CNamingObject::~CNamingObject (void) diff --git a/TAO/utils/NamingViewer/NamingTreeCtrl.cpp b/TAO/utils/NamingViewer/NamingTreeCtrl.cpp index 2c722b6b72b..415e10a3a24 100644 --- a/TAO/utils/NamingViewer/NamingTreeCtrl.cpp +++ b/TAO/utils/NamingViewer/NamingTreeCtrl.cpp @@ -125,7 +125,6 @@ void CNamingTreeCtrl::ClearChildren(HTREEITEM hItem) HTREEITEM hItem = GetRootItem(); if(hItem) { - //CORBA::Object_var Object = (CORBA::Object_ptr)GetItemData(hItem); ClearChildren(hItem); delete GetTreeObject(hItem); diff --git a/TAO/utils/logWalker/GIOP_Buffer.cpp b/TAO/utils/logWalker/GIOP_Buffer.cpp index 175c9136486..59cf1d2df43 100644 --- a/TAO/utils/logWalker/GIOP_Buffer.cpp +++ b/TAO/utils/logWalker/GIOP_Buffer.cpp @@ -481,7 +481,6 @@ GIOP_Buffer::parse_header (void) this->oid_ = this->cdr_->rd_ptr(); if (!this->cdr_->skip_bytes(len_ulong)) { - return false; } if (!(*this->cdr_ >> len_ulong)) diff --git a/TAO/utils/logWalker/HostProcess.cpp b/TAO/utils/logWalker/HostProcess.cpp index dea98ef4939..24a2c3427ae 100644 --- a/TAO/utils/logWalker/HostProcess.cpp +++ b/TAO/utils/logWalker/HostProcess.cpp @@ -114,7 +114,6 @@ HostProcess::find_thread_for_handle (long h) PeerProcess * HostProcess::find_peer (const ACE_CString &addr) { - PeerProcess *pp = 0; Endpoint ep (addr.c_str()); (void)this->by_addr_.find(ep,pp); diff --git a/TAO/utils/logWalker/Thread.cpp b/TAO/utils/logWalker/Thread.cpp index 9a5db19207e..d6769bf078c 100644 --- a/TAO/utils/logWalker/Thread.cpp +++ b/TAO/utils/logWalker/Thread.cpp @@ -280,7 +280,6 @@ Thread::get_summary (long &sent_reqs, size_t &sent_size, size_t &recv_size) { - for (ACE_DLList_Iterator <Invocation> i(this->invocations_); !i.done(); i.advance()) diff --git a/TAO/utils/nsgroup/nsgroup.cpp b/TAO/utils/nsgroup/nsgroup.cpp index 18abab6c93c..fe3505a3d09 100644 --- a/TAO/utils/nsgroup/nsgroup.cpp +++ b/TAO/utils/nsgroup/nsgroup.cpp @@ -142,7 +142,6 @@ NSGROUP::start_orb (void) try { - #if 0 ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("start_orb::argc(%u)\n"), this->argc_)); for( int i = 0; i < this->argc_; ++i){ @@ -159,7 +158,6 @@ NSGROUP::start_orb (void) if (RC_SUCCESS != svc_.set_orb (orb_.in ())) { - ACE_ERROR_RETURN (( LM_ERROR, ACE_TEXT (" (%P|%t) Unable to initialize the ORB.\n")), RC_ERROR); @@ -221,7 +219,6 @@ NSGROUP::run_cmd(void) switch( parse_command_line () ) { - case NSGROUP_HELP: return show_usage (); break; @@ -383,7 +380,6 @@ NSGROUP::parse_command_line (void) int non_option_arg_count = 0; for( int i = get_opts.opt_ind (); i < this->argc_; ++i) { - non_option_arg_count++; @@ -490,7 +486,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) try { - NSGROUP ns_group (argc, argv); if ( show_help (argc, argv) ) diff --git a/TAO/utils/wxNamingViewer/wxBindDialog.cpp b/TAO/utils/wxNamingViewer/wxBindDialog.cpp index 9a59a28d272..f796661a7f5 100644 --- a/TAO/utils/wxNamingViewer/wxBindDialog.cpp +++ b/TAO/utils/wxNamingViewer/wxBindDialog.cpp @@ -12,7 +12,6 @@ namespace // anonymous { - void create_dialog_components(wxDialog* dialog) { wxBoxSizer *topsizer = new wxBoxSizer(wxVERTICAL); @@ -100,11 +99,9 @@ WxBindDialog::WxBindDialog( create_dialog_components( this); #endif // defined(wxUSE_RESOURCES) && (wxUSE_RESOURCES == 1) if (isContext) { - SetTitle( "Bind Context"); } else { - SetTitle( "Bind Object"); } wxButton* ctrl = static_cast<wxButton*>( wxFindWindowByName( @@ -147,11 +144,9 @@ bool WxBindDialog::TransferDataFromWindow() name[0].id = CORBA::string_dup( id); name[0].kind = CORBA::string_dup( kind); try { - object = orb->string_to_object( ior); } catch(CORBA::Exception& ex) { - wxMessageBox( ex._rep_id(), "Invalid IOR"); object = CORBA::Object::_nil(); diff --git a/TAO/utils/wxNamingViewer/wxNamingTree.cpp b/TAO/utils/wxNamingViewer/wxNamingTree.cpp index e900f66dc37..af7288c1f9b 100644 --- a/TAO/utils/wxNamingViewer/wxNamingTree.cpp +++ b/TAO/utils/wxNamingViewer/wxNamingTree.cpp @@ -83,7 +83,6 @@ void WxNamingTree::clearChildren( void) { wxTreeItemId item = GetRootItem(); if (item) { - clearChildren( item); Delete( item); @@ -95,7 +94,6 @@ void WxNamingTree::clearChildren( wxTreeItemId& item) long cookie; wxTreeItemId child = GetFirstChild( item, cookie); while( child) { - clearChildren( child); Delete( child); child = GetFirstChild( item, cookie); @@ -108,17 +106,14 @@ void WxNamingTree::copySelectedToClipboard() { WxNamingObject* object = getTreeObject(); try { - wxString ior = orb->object_to_string( object->Object()); if (wxTheClipboard->Open()) { - wxTheClipboard->SetData( new wxTextDataObject( ior)); wxTheClipboard->Close(); } } catch( CORBA::Exception& ex) { - wxMessageBox( ex._rep_id(), "CORBA::Exception"); } @@ -148,9 +143,7 @@ void WxNamingTree::listBindingList( CosNaming::BindingList_var& bl) { try { - for( unsigned int i=0; i < bl->length(); i++) { - // Add each entry into the tree control CORBA::Object_var object = context->resolve( bl[i].binding_name); bool isContext =(bl[i].binding_type == CosNaming::ncontext); @@ -161,16 +154,13 @@ void WxNamingTree::listBindingList( wxString name = static_cast<const char*>( (bl[i].binding_name[0]).id); const wxString kind = static_cast<const char*>( (bl[i].binding_name[0]).kind); if (!kind.IsNull()) { - name << " | " << kind; } wxTreeItemId contextItem = AppendItem( item, name); SetItemData( contextItem, newObject); switch( bl[i].binding_type) { - case CosNaming::ncontext: { - // TODO: set a different icon for contexts // TODO: set only if there are children SetItemHasChildren( contextItem); @@ -186,7 +176,6 @@ void WxNamingTree::listBindingList( } } catch( CORBA::Exception& ex) { - wxMessageBox( ex._rep_id(), "CORBA::Exception"); } @@ -198,12 +187,10 @@ void WxNamingTree::listContext( wxTreeItemId& item) // TODO: use hourglass // SetCursor( *wxHOURGLASS_CURSOR); try { - // Get the item's object and make sure we have a context WxNamingObject* namingObject = getTreeObject( item); CosNaming::NamingContext_var context = namingObject->NamingContext(); if (CORBA::is_nil( context.in ())) { - return; } @@ -214,9 +201,7 @@ void WxNamingTree::listContext( wxTreeItemId& item) context->list( listQuantum, bl, bi); listBindingList( item, context.in(), bl); if (!CORBA::is_nil( bi.in ())) { - while( bl->length()) { - wxString text; text << "This context contains more than " << listQuantum << " entries, list the next " << listQuantum << "?"; @@ -224,7 +209,6 @@ void WxNamingTree::listContext( wxTreeItemId& item) text, "Question", wxYES_NO | wxICON_QUESTION) == wxYES) { - bi->next_n( listQuantum, bl); listBindingList( item, context.in(), bl); @@ -236,7 +220,6 @@ void WxNamingTree::listContext( wxTreeItemId& item) } } catch( CORBA::Exception& ex) { - wxMessageBox( ex._rep_id(), "CORBA::Exception"); } @@ -251,23 +234,19 @@ void WxNamingTree::onContextPopupBindContext( wxCommandEvent& event) orb, this)); if (dialog->ShowModal() != wxID_OK) { - return; } try { - WxNamingObject* object = getTreeObject(); CosNaming::NamingContext_var context = object->NamingContext(); if (CORBA::is_nil( context.in ())) { - return; } CosNaming::NamingContext_var newContext = CosNaming::NamingContext::_narrow( dialog->getObject()); if (CORBA::is_nil( newContext.in ())) { - wxMessageBox( "Object is not a CosNaming::NamingContext", "Error", @@ -282,7 +261,6 @@ void WxNamingTree::onContextPopupBindContext( wxCommandEvent& event) onContextPopupRefresh( event); } catch( CORBA::Exception& ex) { - wxMessageBox( ex._rep_id(), "CORBA::Exception"); @@ -298,17 +276,14 @@ void WxNamingTree::onContextPopupBindObject( wxCommandEvent& event) orb, this)); if (dialog->ShowModal() != wxID_OK) { - return; } try { - wxTreeItemId item = GetSelection(); WxNamingObject* object = getTreeObject( item); CosNaming::NamingContext_var context = object->NamingContext(); if (CORBA::is_nil( context.in ())) { - return; } @@ -316,7 +291,6 @@ void WxNamingTree::onContextPopupBindObject( wxCommandEvent& event) onContextPopupRefresh( event); } catch( CORBA::Exception& ex) { - wxMessageBox( ex._rep_id(), "CORBA::Exception"); @@ -331,24 +305,20 @@ void WxNamingTree::onContextPopupBindNewContext( wxCommandEvent& event) WxNamingObject* object = getTreeObject( item); CosNaming::NamingContext_var context = object->NamingContext(); if (CORBA::is_nil( context.in ())) { - return; } WxAutoDialog<WxBindNewContext> dialog( new WxBindNewContext( this)); if (dialog->ShowModal() != wxID_OK) { - return; } try { - CosNaming::NamingContext_var newContext = context->new_context(); context->bind_context( dialog->getName(), newContext.in ()); onContextPopupRefresh( event); } catch( CORBA::Exception& ex) { - wxMessageBox( ex._rep_id(), "CORBA::Exception"); @@ -363,14 +333,12 @@ void WxNamingTree::onContextPopupDestroy( wxCommandEvent&) "Are you sure you want to destroy this object?", "Confirm", wxYES_NO | wxICON_QUESTION) != wxYES) { - return; } wxTreeItemId item = GetSelection(); wxTreeItemId parentItem = GetParent( item); if (parentItem == 0) { - return; } @@ -378,7 +346,6 @@ void WxNamingTree::onContextPopupDestroy( wxCommandEvent&) WxNamingObject* parentObject = getTreeObject( parentItem); CosNaming::NamingContext_var parentNaming = parentObject->NamingContext(); try { - // First try to destroy, it will raise an exception if it's not empty CosNaming::NamingContext_var context = object->NamingContext(); context->destroy(); @@ -389,7 +356,6 @@ void WxNamingTree::onContextPopupDestroy( wxCommandEvent&) parentNaming->unbind( object->Name()); } catch( CORBA::Exception& ex) { - wxMessageBox( ex._rep_id(), "CORBA::Exception"); } @@ -410,14 +376,12 @@ void WxNamingTree::onContextPopupUnbind( wxCommandEvent&) "Are you sure you want to unbind this context?", "Confirm", wxYES_NO | wxICON_QUESTION) != wxYES) { - return; } wxTreeItemId item = GetSelection(); wxTreeItemId parentItem = GetParent( item); if (parentItem == 0) { - return; } @@ -425,13 +389,11 @@ void WxNamingTree::onContextPopupUnbind( wxCommandEvent&) WxNamingObject* parent = getTreeObject( parentItem); CosNaming::NamingContext_var context = parent->NamingContext(); try { - context->unbind( object->Name()); clearChildren( item); Delete( item); } catch( CORBA::Exception& ex) { - wxMessageBox( ex._rep_id(), "CORBA::Exception"); } @@ -440,11 +402,9 @@ void WxNamingTree::onContextPopupUnbind( wxCommandEvent&) void WxNamingTree::onItemExpanding( wxTreeEvent& event) { - wxTreeItemId item = event.GetItem(); // If this item has a child it has already been listed so nothing to do. if (GetLastChild( item) != wxTreeItemId( 0L)) { - return; } @@ -456,7 +416,6 @@ void WxNamingTree::onLeftDClick( wxMouseEvent& event) { wxTreeItemId item = HitTest( event.GetPosition()); if (!item) { - return; } WxAutoDialog<WxViewIORDialog> dialog( new WxViewIORDialog( @@ -474,7 +433,6 @@ void WxNamingTree::onObjectPopupUnbind( wxCommandEvent& ) "Are you sure you want to unbind this object?", "Confirm", wxYES_NO | wxICON_QUESTION) != wxYES) { - return; } @@ -483,7 +441,6 @@ void WxNamingTree::onObjectPopupUnbind( wxCommandEvent& ) // Make sure we don't unbind "Root" wxTreeItemId parentItem = GetParent( item); if (parentItem == 0) { - return; } @@ -491,13 +448,11 @@ void WxNamingTree::onObjectPopupUnbind( wxCommandEvent& ) WxNamingObject* parent = getTreeObject( parentItem); CosNaming::NamingContext_var context = parent->NamingContext(); try { - context->unbind( object->Name()); clearChildren( item); Delete( item); } catch( CORBA::Exception& ex) { - wxMessageBox( ex._rep_id(), "CORBA::Exception"); } @@ -519,7 +474,6 @@ void WxNamingTree::onRMouseUClick( wxMouseEvent& event) { wxTreeItemId item = HitTest( event.GetPosition()); if (!item) { - return; } // First select the item, then popup the appropriate menu @@ -527,11 +481,9 @@ void WxNamingTree::onRMouseUClick( wxMouseEvent& event) WxNamingObject* object = getTreeObject( item); CosNaming::NamingContext_var context = object->NamingContext(); if (CORBA::is_nil( context.in ())) { - PopupMenu( objectPopup, event.m_x, event.m_y); } else { - contextPopup->Enable( contextPopupDestroy, item != GetRootItem()); contextPopup->Enable( contextPopupUnbind, item != GetRootItem()); PopupMenu( contextPopup, event.m_x, event.m_y); @@ -543,13 +495,11 @@ void WxNamingTree::resolve( CosNaming::NamingContext_ptr pRootContext) { clearChildren(); if (!CORBA::is_nil( pRootContext)) { - wxTreeItemId item = AddRoot( "Root"); SetItemData( item, new WxNamingObject( pRootContext)); listContext( item); } else { - AddRoot( "<null>"); } diff --git a/TAO/utils/wxNamingViewer/wxNamingViewerFrame.cpp b/TAO/utils/wxNamingViewer/wxNamingViewerFrame.cpp index abd14d11e1f..2bad6ab022e 100644 --- a/TAO/utils/wxNamingViewer/wxNamingViewerFrame.cpp +++ b/TAO/utils/wxNamingViewer/wxNamingViewerFrame.cpp @@ -146,10 +146,8 @@ void WxNamingViewerFrame::onMenuCopy( wxCommandEvent& WXUNUSED( event)) void WxNamingViewerFrame::onSelectNS( wxCommandEvent& WXUNUSED( event)) { switch( selectNS->ShowModal()) { - case wxID_OK: try { - // TODO: need hourglass CORBA::Object_var object = pOrb->string_to_object( selectNS->getIOR().c_str()); @@ -159,7 +157,6 @@ void WxNamingViewerFrame::onSelectNS( wxCommandEvent& WXUNUSED( event)) resolve(); } catch( CORBA::Exception const & ex) { - wxMessageBox( ex._info().c_str(), "CORBA::Exception"); @@ -196,7 +193,6 @@ void WxNamingViewerFrame::setDefaultNS() TAO_Naming_Client client; if (client.init( pOrb) == 0) { - rootContext = client.get_context(); // For debugging, sets up some initial contexts in the NS diff --git a/TAO/utils/wxNamingViewer/wxSelectNSDialog.cpp b/TAO/utils/wxNamingViewer/wxSelectNSDialog.cpp index f7765017683..d82aa923577 100644 --- a/TAO/utils/wxNamingViewer/wxSelectNSDialog.cpp +++ b/TAO/utils/wxNamingViewer/wxSelectNSDialog.cpp @@ -124,10 +124,8 @@ WxSelectNSDialog::WxSelectNSDialog( wxWindow* parent) ACE_TString name; ACE_Configuration::VALUETYPE type; while(config->enumerate_values( section, index, name, type) == 0) { - ACE_TString value; if(config->get_string_value( section, name.c_str(), value) == 0) { - servers->Append( name.c_str(), new wxString( value.c_str())); @@ -143,7 +141,6 @@ WxSelectNSDialog::~WxSelectNSDialog() { int count = servers->Number(); for (int i = 0; i < count; i++) { - delete static_cast<wxString*>( servers->GetClientData( i)); } @@ -154,7 +151,6 @@ void WxSelectNSDialog::onAdd( wxCommandEvent& WXUNUSED(event)) { WxAutoDialog<WxAddNameServerDlg> dialog( new WxAddNameServerDlg( this)); if (dialog->ShowModal() == wxID_OK) { - servers->Append( dialog->getServerName(), new wxString( dialog->getIor())); @@ -205,7 +201,6 @@ void WxSelectNSDialog::onOK( wxCommandEvent& WXUNUSED(event)) { int index = servers->GetSelection(); if (index == -1) { - wxMessageBox( "You must select a server or cancel", "Error", @@ -222,7 +217,6 @@ void WxSelectNSDialog::onRemove( wxCommandEvent& WXUNUSED(event)) { int index = servers->GetSelection(); if (index != -1) { - wxString name = servers->GetString( index); delete static_cast<wxString*>( servers->GetClientData( index)); servers->Delete( index); diff --git a/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp b/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp index c25763fe68c..41c14182cfd 100644 --- a/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp +++ b/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp @@ -168,7 +168,6 @@ WxViewIORDialog::WxViewIORDialog( applyButton->Enable( false); if (object != CORBA::Object::_nil()) { - WxViewIORDialog::object = CORBA::Object::_duplicate( object); } @@ -184,7 +183,6 @@ void WxViewIORDialog::decodeIOR() // if object is nil, return out if(CORBA::is_nil( object.in())) { - typeID = ""; TransferDataToWindow(); return; @@ -202,10 +200,8 @@ void WxViewIORDialog::decodeIOR() CORBA::ULong count = baseProfiles.profile_count(); wxTreeItemId rootItem = profiles->AddRoot( "Profiles"); for( CORBA::ULong slot = 0; slot < count; slot++) { - const TAO_Profile* profile = baseProfiles.get_profile( slot); try{ - // The need to const_cast should disappear in TAO 1.1.2 BUT IT DIDN'T char* profileString = const_cast<TAO_Profile*>(profile)->to_string(); @@ -213,7 +209,6 @@ void WxViewIORDialog::decodeIOR() delete [] profileString; } catch (const CORBA::Exception& ex) { - wxMessageBox( ex._info().c_str(), "CORBA::Exception"); } @@ -227,12 +222,10 @@ void WxViewIORDialog::OnApply( wxCommandEvent& event) { wxDialog::OnApply( event); try { - object = orb->string_to_object( ior); decodeIOR(); } catch( CORBA::Exception& ex) { - wxMessageBox( ex._info().c_str(), "CORBA::Exception"); } } @@ -242,7 +235,6 @@ void WxViewIORDialog::onIORText( wxCommandEvent& event) { // Enable the Apply button if the IOR has changed if (event.GetString() != ior) { - applyButton->Enable( true); } |