diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-09-12 08:32:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-12 08:32:34 +0200 |
| commit | fe03724176dcfd20e0f9a6e493198469242be6b6 (patch) | |
| tree | 2245c24a6c4ef9c7d4010d1b61827850592777a3 | |
| parent | 41a1f3bc12f780cc087c936ab53d1074f363b630 (diff) | |
| parent | 00b403be7df0442405bd5e3dcc07beaa6730ddd2 (diff) | |
| download | ATCD-fe03724176dcfd20e0f9a6e493198469242be6b6.tar.gz | |
Merge pull request #1922 from knutpett/knutpett/whitespace
Remove whitespace
3269 files changed, 0 insertions, 6509 deletions
diff --git a/ACE/ACEXML/apps/svcconf/Svcconf_Handler.cpp b/ACE/ACEXML/apps/svcconf/Svcconf_Handler.cpp index b5d173d2fb3..6a4e85d3b61 100644 --- a/ACE/ACEXML/apps/svcconf/Svcconf_Handler.cpp +++ b/ACE/ACEXML/apps/svcconf/Svcconf_Handler.cpp @@ -129,7 +129,6 @@ ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *, this->stream_, svc_dll, this->stream_info_.active ()); - } else { @@ -308,7 +307,6 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *, else if (ACE_OS::strcmp (qName, ACE_TEXT ("initializer")) == 0) { this->get_initializer_attrs (alist); - } else if (ACE_OS::strcmp (qName, ACE_TEXT ("static")) == 0) { diff --git a/ACE/ACEXML/common/Attributes.h b/ACE/ACEXML/common/Attributes.h index 71482c30654..46b8fa1220d 100644 --- a/ACE/ACEXML/common/Attributes.h +++ b/ACE/ACEXML/common/Attributes.h @@ -55,7 +55,6 @@ class ACEXML_Export ACEXML_Attributes { public: - /// Destructor. virtual ~ACEXML_Attributes (); 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/CharStream.h b/ACE/ACEXML/common/CharStream.h index 555c04b204a..3656f217573 100644 --- a/ACE/ACEXML/common/CharStream.h +++ b/ACE/ACEXML/common/CharStream.h @@ -29,7 +29,6 @@ class ACEXML_Export ACEXML_CharStream { public: - /** * Virtual destructor, must have. */ @@ -77,7 +76,6 @@ public: * Get the systemId for the underlying CharStream */ virtual const ACEXML_Char* getSystemId () = 0; - }; #include /**/ "ace/post.h" diff --git a/ACE/ACEXML/common/ContentHandler.h b/ACE/ACEXML/common/ContentHandler.h index f5e88c150e0..7a6482da83d 100644 --- a/ACE/ACEXML/common/ContentHandler.h +++ b/ACE/ACEXML/common/ContentHandler.h @@ -42,7 +42,6 @@ class ACEXML_Export ACEXML_ContentHandler { public: - virtual ~ACEXML_ContentHandler (); /** diff --git a/ACE/ACEXML/common/DTDHandler.h b/ACE/ACEXML/common/DTDHandler.h index 52f701ccb02..36c91536e05 100644 --- a/ACE/ACEXML/common/DTDHandler.h +++ b/ACE/ACEXML/common/DTDHandler.h @@ -48,7 +48,6 @@ class ACEXML_Export ACEXML_DTDHandler { public: - virtual ~ACEXML_DTDHandler (); /** 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/Encoding.h b/ACE/ACEXML/common/Encoding.h index 0a31d3653b2..15bbfc243a7 100644 --- a/ACE/ACEXML/common/Encoding.h +++ b/ACE/ACEXML/common/Encoding.h @@ -51,7 +51,6 @@ public: static const ACEXML_UTF8 magic_values_[][4]; static const ACEXML_Char* get_encoding (const char* input); - }; #include /**/ "ace/post.h" diff --git a/ACE/ACEXML/common/EntityResolver.h b/ACE/ACEXML/common/EntityResolver.h index b2b143c34e3..041c0fbcfdf 100644 --- a/ACE/ACEXML/common/EntityResolver.h +++ b/ACE/ACEXML/common/EntityResolver.h @@ -41,7 +41,6 @@ class ACEXML_Export ACEXML_EntityResolver { public: - virtual ~ACEXML_EntityResolver (); /** diff --git a/ACE/ACEXML/common/ErrorHandler.h b/ACE/ACEXML/common/ErrorHandler.h index 72c8fb4a1a8..1d10779bfca 100644 --- a/ACE/ACEXML/common/ErrorHandler.h +++ b/ACE/ACEXML/common/ErrorHandler.h @@ -44,7 +44,6 @@ class ACEXML_Export ACEXML_ErrorHandler { public: - virtual ~ACEXML_ErrorHandler (); /** diff --git a/ACE/ACEXML/common/Exception.h b/ACE/ACEXML/common/Exception.h index 8520b2cfc2f..6942e4c4eb5 100644 --- a/ACE/ACEXML/common/Exception.h +++ b/ACE/ACEXML/common/Exception.h @@ -34,7 +34,6 @@ class ACEXML_Export ACEXML_Exception { public: - /// Destructor. virtual ~ACEXML_Exception (); diff --git a/ACE/ACEXML/common/FileCharStream.h b/ACE/ACEXML/common/FileCharStream.h index bb2f0ec5e2c..2d273b87a7c 100644 --- a/ACE/ACEXML/common/FileCharStream.h +++ b/ACE/ACEXML/common/FileCharStream.h @@ -95,7 +95,6 @@ public: virtual const ACEXML_Char* getSystemId (); private: - /** Read the next character as a normal character. Return -1 if EOF is * reached, else return 0. */ diff --git a/ACE/ACEXML/common/HttpCharStream.h b/ACE/ACEXML/common/HttpCharStream.h index a19b2d3b99f..24359adc767 100644 --- a/ACE/ACEXML/common/HttpCharStream.h +++ b/ACE/ACEXML/common/HttpCharStream.h @@ -89,7 +89,6 @@ public: private: - #if defined (ACE_USES_WCHAR) /** * Read the next character from the stream taking into account the diff --git a/ACE/ACEXML/common/Locator.h b/ACE/ACEXML/common/Locator.h index 14f27aefb99..e68880b5ac8 100644 --- a/ACE/ACEXML/common/Locator.h +++ b/ACE/ACEXML/common/Locator.h @@ -42,7 +42,6 @@ class ACEXML_Export ACEXML_Locator { public: - virtual ~ACEXML_Locator (); /* 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/Mem_Map_Stream.h b/ACE/ACEXML/common/Mem_Map_Stream.h index 52bb92fcd0f..df450f5b624 100644 --- a/ACE/ACEXML/common/Mem_Map_Stream.h +++ b/ACE/ACEXML/common/Mem_Map_Stream.h @@ -178,7 +178,6 @@ private: /// Address at the end of the file mapping. char *end_of_mapping_plus1_; - }; 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/StrCharStream.h b/ACE/ACEXML/common/StrCharStream.h index 47c9b0d04ae..c3554ebbcc5 100644 --- a/ACE/ACEXML/common/StrCharStream.h +++ b/ACE/ACEXML/common/StrCharStream.h @@ -92,7 +92,6 @@ private: ACEXML_Char *end_; ACEXML_Char* encoding_; ACEXML_Char* name_; - }; #include /**/ "ace/post.h" diff --git a/ACE/ACEXML/common/StreamFactory.cpp b/ACE/ACEXML/common/StreamFactory.cpp index c98d7a647da..80f722b50ed 100644 --- a/ACE/ACEXML/common/StreamFactory.cpp +++ b/ACE/ACEXML/common/StreamFactory.cpp @@ -9,7 +9,6 @@ #endif /* USE_ZZIP */ - ACEXML_CharStream* ACEXML_StreamFactory::create_stream (const ACEXML_Char* uri) { diff --git a/ACE/ACEXML/common/StreamFactory.h b/ACE/ACEXML/common/StreamFactory.h index dc751c9bc00..2149976b315 100644 --- a/ACE/ACEXML/common/StreamFactory.h +++ b/ACE/ACEXML/common/StreamFactory.h @@ -36,7 +36,6 @@ class ACEXML_CharStream; class ACEXML_Export ACEXML_StreamFactory { public: - // Destructor virtual ~ACEXML_StreamFactory (void); diff --git a/ACE/ACEXML/common/URL_Addr.h b/ACE/ACEXML/common/URL_Addr.h index ea280dac416..887834c0410 100644 --- a/ACE/ACEXML/common/URL_Addr.h +++ b/ACE/ACEXML/common/URL_Addr.h @@ -110,7 +110,6 @@ public: int destroy (void); private: - /// Calculate the maximum length of the address string size_t calculate_length (int ipaddr_format) const; 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/XMLReader.h b/ACE/ACEXML/common/XMLReader.h index a335291fc3e..a4dca783742 100644 --- a/ACE/ACEXML/common/XMLReader.h +++ b/ACE/ACEXML/common/XMLReader.h @@ -40,7 +40,6 @@ class ACEXML_Export ACEXML_XMLReader { public: - virtual ~ACEXML_XMLReader (); /** diff --git a/ACE/ACEXML/common/XML_Codecs.h b/ACE/ACEXML/common/XML_Codecs.h index 006dddb6d57..b20076aa28e 100644 --- a/ACE/ACEXML/common/XML_Codecs.h +++ b/ACE/ACEXML/common/XML_Codecs.h @@ -35,9 +35,7 @@ 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/common/ZipCharStream.h b/ACE/ACEXML/common/ZipCharStream.h index 8ed9ec48d30..44bc4132c71 100644 --- a/ACE/ACEXML/common/ZipCharStream.h +++ b/ACE/ACEXML/common/ZipCharStream.h @@ -96,7 +96,6 @@ public: virtual const ACEXML_Char* getSystemId (void); protected: - /** Read the next character as a normal character. Return -1 if EOF is * reached, else return 0. */ @@ -109,7 +108,6 @@ protected: virtual int peekchar_i (ACE_OFF_T offset = 0); private: - #if defined (ACE_USES_WCHAR) /** * Read the next character from the stream taking into account the diff --git a/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp b/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.cpp index bebc001277a..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"), @@ -140,7 +127,6 @@ ACEXML_SAXPrint_Handler::startPrefixMapping (const ACEXML_Char * , // ACE_TEXT ("* Event startPrefixMapping () ***************\n"))); // ACE_DEBUG ((LM_DEBUG, // ACE_TEXT ("Prefix = %s, URI = %s\n"), prefix, uri)); - } // *** Methods inherited from ACEXML_DTDHandler. diff --git a/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.h b/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.h index 33f38406458..b940c467836 100644 --- a/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.h +++ b/ACE/ACEXML/examples/SAXPrint/SAXPrint_Handler.h @@ -149,7 +149,6 @@ public: void print_indent (); private: - size_t indent_; ACEXML_Char* fileName_; ACEXML_Locator* locator_; 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_Attributes_Builder.cpp b/ACE/ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp index 35a07e5b433..6a34134531a 100644 --- a/ACE/ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp +++ b/ACE/ACEXML/parser/debug_validator/Debug_Attributes_Builder.cpp @@ -42,7 +42,6 @@ ACEXML_Debug_Attribute_Builder::setAttType (const ATT_TYPE type) return 0; } ACEXML_THROW_RETURN (ACEXML_SAXParseException (ACE_TEXT("Attribute type redefinition in Debug Validator")), -1); - } int 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/debug_validator/Element_Tree.cpp b/ACE/ACEXML/parser/debug_validator/Element_Tree.cpp index c41af174999..f0aea3fdb8b 100644 --- a/ACE/ACEXML/parser/debug_validator/Element_Tree.cpp +++ b/ACE/ACEXML/parser/debug_validator/Element_Tree.cpp @@ -66,5 +66,4 @@ ACEXML_Element_Tree_List_Node::dump (void) ACE_ALLOC_HOOK_DEFINE (ACEXML_Element_Tree_List_Node) - ACE_ALLOC_HOOK_DEFINE (ACEXML_Element_Tree_List_Stack) diff --git a/ACE/ACEXML/parser/debug_validator/Element_Tree.h b/ACE/ACEXML/parser/debug_validator/Element_Tree.h index 141de871f96..24dc90e5269 100644 --- a/ACE/ACEXML/parser/debug_validator/Element_Tree.h +++ b/ACE/ACEXML/parser/debug_validator/Element_Tree.h @@ -29,7 +29,6 @@ class ACEXML_DEBUG_DTD_MANAGER_Export ACEXML_Element_Tree_Node { public: - /// Default constructor. ACEXML_Element_Tree_Node (); 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/Entity_Manager.h b/ACE/ACEXML/parser/parser/Entity_Manager.h index f4a65b13f2b..9382d9ecc86 100644 --- a/ACE/ACEXML/parser/parser/Entity_Manager.h +++ b/ACE/ACEXML/parser/parser/Entity_Manager.h @@ -86,7 +86,6 @@ public: private: ACEXML_ENTITIES_MANAGER* entities_; // bool init_; - }; #if defined (__ACEXML_INLINE__) diff --git a/ACE/ACEXML/parser/parser/Parser.cpp b/ACE/ACEXML/parser/parser/Parser.cpp index 53d594b68c3..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 @@ -2613,7 +2612,6 @@ ACEXML_Parser::getFeature (const ACEXML_Char *name) } - void ACEXML_Parser::setFeature (const ACEXML_Char *name, int boolean_value) { diff --git a/ACE/ACEXML/parser/parser/Parser.h b/ACE/ACEXML/parser/parser/Parser.h index 49a728be1b0..4fd5ae981c3 100644 --- a/ACE/ACEXML/parser/parser/Parser.h +++ b/ACE/ACEXML/parser/parser/Parser.h @@ -131,7 +131,6 @@ public: virtual void setErrorHandler (ACEXML_ErrorHandler *handler); - protected: /** * Parse XML Prolog. @@ -560,7 +559,6 @@ protected: virtual ACEXML_Char peek (); private: - // *** Helper functions for parsing XML /** @@ -841,7 +839,6 @@ private: /// If set, the parser should include namespace declarations in the list /// of attributes of an element. int namespace_prefixes_; - }; #if defined (__ACEXML_INLINE__) diff --git a/ACE/ACEXML/parser/parser/ParserContext.h b/ACE/ACEXML/parser/parser/ParserContext.h index 9264273940b..978ba06ca4a 100644 --- a/ACE/ACEXML/parser/parser/ParserContext.h +++ b/ACE/ACEXML/parser/parser/ParserContext.h @@ -59,7 +59,6 @@ public: virtual void setLocator(ACEXML_LocatorImpl* locator); private: - /// Copy constructor ACEXML_Parser_Context (const ACEXML_Parser_Context& src); diff --git a/ACE/ACEXML/parser/parser/ParserInternals.h b/ACE/ACEXML/parser/parser/ParserInternals.h index ef4204997c6..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) @@ -91,7 +90,6 @@ public: IN_NOTATION, INVALID = -1 }; - }; #include /**/ "ace/post.h" diff --git a/ACE/ASNMP/asnmp/address.cpp b/ACE/ASNMP/asnmp/address.cpp index b4a64b327c2..001337d36f3 100644 --- a/ACE/ASNMP/asnmp/address.cpp +++ b/ACE/ASNMP/asnmp/address.cpp @@ -127,7 +127,6 @@ bool operator<=( const Address &lhs,const Address &rhs) return true; else return false; - } @@ -249,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; @@ -505,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; @@ -513,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); @@ -522,7 +518,6 @@ int IpAddress::parse_address( const char *inaddr) // save the friendly name ACE_OS::strcpy( iv_friendly_name_, inaddr); - } // end if lookup result else { iv_friendly_name_status_ = rc; @@ -570,7 +565,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) { @@ -1009,7 +1003,6 @@ void NetbiosAddress::InitNBAddr(const char *inaddr) NetbiosAddress::NetbiosAddress( const char *inaddr) { InitNBAddr(inaddr); - } NetbiosAddress::NetbiosAddress( const char *inaddr, nb_service svc) @@ -1714,7 +1707,6 @@ int IpxSockAddress::parse_address( const char *inaddr) } - //-------------[ set the socket number ]---------------------------------- void IpxSockAddress::set_socket( const unsigned short s) { @@ -1839,7 +1831,6 @@ MacAddress& MacAddress::operator=( const MacAddress &macaddress) } - //-----[ MAC Address general = operator ]--------------------------------- SnmpSyntax& MacAddress::operator=( SnmpSyntax &val) { @@ -2364,7 +2355,6 @@ int GenAddress::parse_address( const char *addr) return 1; // ok, its a mac } break; - } // otherwise its invalid delete address; diff --git a/ACE/ASNMP/asnmp/address.h b/ACE/ASNMP/asnmp/address.h index a46ddb66691..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(); @@ -294,7 +293,6 @@ protected: /// thread safe routine to lookup name given ip address /// return <> 0 on error static int resolve_to_hostname(const in_addr& quad_addr, char *hostname); - }; //------------------------------------------------------------------------ @@ -477,7 +475,6 @@ protected: class ASNMP_Export NetbiosAddress : public Address { public: - /// default constructor with string arg NetbiosAddress( const char *inaddr = ""); @@ -704,7 +701,6 @@ protected: }; - //------------------------------------------------------------------------ //---------[ IpxSock Address Class ]-------------------------------------- //------------------------------------------------------------------------ diff --git a/ACE/ASNMP/asnmp/asn1.cpp b/ACE/ASNMP/asnmp/asn1.cpp index a0f1eb1cb40..e5c8ad90171 100644 --- a/ACE/ASNMP/asnmp/asn1.cpp +++ b/ACE/ASNMP/asnmp/asn1.cpp @@ -418,7 +418,6 @@ u_char * asn1::build_header( u_char *data, *data++ = type; (*datalength)--; return asn1::build_length(data, datalength, length); - } /* @@ -519,7 +518,6 @@ u_char *asn1::build_length( u_char *data, } *datalength -= (data - start_data); return data; - } /* @@ -951,7 +949,6 @@ u_char * asn1::build_unsigned_int64( u_char *data, high = (high << 8) | ((low & mask) >> (8 * (sizeof(long) - 1))); low <<= 8; - } return data; } @@ -1084,7 +1081,6 @@ void cmu_snmp::add_var(struct snmp_pdu *pdu, break; - case sNMP_SYNTAX_TIMETICKS: case sNMP_SYNTAX_CNTR32: case sNMP_SYNTAX_GAUGE32: @@ -1125,7 +1121,6 @@ void cmu_snmp::add_var(struct snmp_pdu *pdu, sizeof( SmiCNTR64)); } break; - } // end switch } @@ -1316,7 +1311,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, @@ -1521,7 +1515,6 @@ cmu_snmp::parse_var_op( u_char *data, oid *var_name, } - // build a pdu from a data and length int cmu_snmp::parse( struct snmp_pdu *pdu, u_char *data, diff --git a/ACE/ASNMP/asnmp/asn1.h b/ACE/ASNMP/asnmp/asn1.h index c06f9d23d72..f2d7d309905 100644 --- a/ACE/ASNMP/asnmp/asn1.h +++ b/ACE/ASNMP/asnmp/asn1.h @@ -262,7 +262,6 @@ static unsigned char * build_unsigned_int64( unsigned char *data, unsigned char type, struct counter64 *cp, int countersize); - }; @@ -334,7 +333,6 @@ static unsigned char *parse_var_op( unsigned char *data, int *var_val_len, unsigned char **var_val, int *listlength); - }; #endif // ASN1 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 4a05750685a..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; @@ -145,7 +144,6 @@ Pdu& Pdu::operator+=( Vb &vb) // return self reference return *this; - } // return fomatted version of this object @@ -191,13 +189,11 @@ int Pdu::get_vblist( Vb* pvbs, const int pvb_count) pvbs[z] = *vbs_[z]; return 1; - } //=====================[ 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; @@ -275,7 +271,6 @@ int Pdu::set_vb( Vb &vb, const int index) validity_ = 1; return 1; - } //=====================[ return number of vbs_ ]========================== @@ -408,7 +403,6 @@ int Pdu::trim(const int p) } - // delete a Vb anywhere within the Pdu int Pdu::delete_vb( const int p) { diff --git a/ACE/ASNMP/asnmp/target.h b/ACE/ASNMP/asnmp/target.h index c439475fb26..3903f7dde4f 100644 --- a/ACE/ASNMP/asnmp/target.h +++ b/ACE/ASNMP/asnmp/target.h @@ -73,7 +73,6 @@ enum ASNMP_Defs { class ASNMP_Export SnmpTarget { public: - /// allow destruction of derived classes virtual ~SnmpTarget(); 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/vb.cpp b/ACE/ASNMP/asnmp/vb.cpp index 9c3cbedf5dd..59b8c9c2496 100644 --- a/ACE/ASNMP/asnmp/vb.cpp +++ b/ACE/ASNMP/asnmp/vb.cpp @@ -325,7 +325,6 @@ int Vb::get_value( SnmpSyntax &val) } - //-----[ misc]-------------------------------------------------------- // return the current syntax diff --git a/ACE/ASNMP/asnmp/wpdu.cpp b/ACE/ASNMP/asnmp/wpdu.cpp index aa4ac0e544f..1685d9190d2 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: @@ -510,7 +507,6 @@ int wpdu::restore_vbs(Pdu& pdu, const snmp_pdu *raw_pdu) const default: tempvb.set_null(); - } // end switch // append the vb to the pdu diff --git a/ACE/ASNMP/asnmp/wpdu.h b/ACE/ASNMP/asnmp/wpdu.h index 454592e1f82..bfa35adebe0 100644 --- a/ACE/ASNMP/asnmp/wpdu.h +++ b/ACE/ASNMP/asnmp/wpdu.h @@ -37,7 +37,6 @@ struct snmp_pdu; class ASNMP_Export wpdu { public: - /// construct CMU data from HP SNMP++ objects /// construct HP SNMP++ objects from raw buffer via CMU SNMP datatypes wpdu(const Pdu& pdu, const UdpTarget& target); 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 f1662556f34..ec796f58b63 100644 --- a/ACE/ASNMP/tests/Address_Test.cpp +++ b/ACE/ASNMP/tests/Address_Test.cpp @@ -351,7 +351,6 @@ static void TestIpxAddress() const char *ptr = (const char *)xa7; ACE_DEBUG ((LM_DEBUG, "(%P|%t) IpxAddress:xa7-ptr(\"01234567-012345-6789AB\") [%s]\n", ptr)); - } /* @@ -386,7 +385,6 @@ static void TestIpxAddress() static void TestMacAddress() { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) MacAddress: Tests\n")); MacAddress ma1; @@ -519,7 +517,6 @@ static void TestUdpAddress() ACE_ASSERT(ua1.get_port() == 333); ACE_DEBUG ((LM_DEBUG, "(%P|%t) UdpAddress:ua1.set_port()(\"333\") [%s]\n", (const char *)ua1)); - } int diff --git a/ACE/ASNMP/tests/Octet_Test.cpp b/ACE/ASNMP/tests/Octet_Test.cpp index 5f8677c69e3..acefb7eee2f 100644 --- a/ACE/ASNMP/tests/Octet_Test.cpp +++ b/ACE/ASNMP/tests/Octet_Test.cpp @@ -134,7 +134,6 @@ static void TestOctet() ACE_ASSERT(o3 <= o3); ACE_ASSERT(o3 == o3); ACE_ASSERT(!(o3 != o3)); - } int diff --git a/ACE/ASNMP/tests/Oid_Test.cpp b/ACE/ASNMP/tests/Oid_Test.cpp index dfa6931fcbc..26666837bc7 100644 --- a/ACE/ASNMP/tests/Oid_Test.cpp +++ b/ACE/ASNMP/tests/Oid_Test.cpp @@ -160,7 +160,6 @@ static void OidTest() ACE_ASSERT(!(d2 > d2)); ACE_ASSERT(d2 >= d2); ACE_ASSERT(d2 <= d2); - } int 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_CV_Dispatcher_Impl_T.h b/ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.h index 8d455ea223d..ccb663c7d9f 100644 --- a/ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.h +++ b/ACE/Kokyu/DSRT_CV_Dispatcher_Impl_T.h @@ -64,7 +64,6 @@ namespace Kokyu cond_lock_t run_cond_lock_; cond_t run_cond_; }; - } #if !defined (__ACE_INLINE__) 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_Direct_Dispatcher_Impl_T.h b/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.h index 644736d84f8..a86202c6db2 100644 --- a/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.h +++ b/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.h @@ -70,7 +70,6 @@ namespace Kokyu private: int svc (void); }; - } #if !defined (__ACE_INLINE__) 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_Dispatcher_Impl_T.h b/ACE/Kokyu/DSRT_Dispatcher_Impl_T.h index 7909bd96d97..319ac475991 100644 --- a/ACE/Kokyu/DSRT_Dispatcher_Impl_T.h +++ b/ACE/Kokyu/DSRT_Dispatcher_Impl_T.h @@ -21,7 +21,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ - namespace Kokyu { /** @@ -143,7 +142,6 @@ namespace Kokyu virtual ~DSRT_Dispatcher_Impl (); private: - //following an idiom to avoid public virtual functions. //instead make them private and use the template method //pattern - "Virtually Yours" article in CUJ Experts Forum @@ -188,7 +186,6 @@ namespace Kokyu ACE_hthread_t curr_scheduled_thr_handle_; Guid_t curr_scheduled_guid_; }; - } //end of namespace #if defined (__ACE_INLINE__) diff --git a/ACE/Kokyu/DSRT_Sched_Queue_T.h b/ACE/Kokyu/DSRT_Sched_Queue_T.h index 161210accaa..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 * @@ -68,7 +67,6 @@ namespace Kokyu DSRT_Scheduler_Traits::QoSDescriptor_t DSRT_QoSDescriptor_t; public: - /** * Given a guid, find an item in the priority queue. * @@ -130,7 +128,6 @@ namespace Kokyu void dump(); private: - /** * @class Guid_Hash * 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/Default_Dispatcher_Impl.h b/ACE/Kokyu/Default_Dispatcher_Impl.h index 350c88d179d..2eb559f454c 100644 --- a/ACE/Kokyu/Default_Dispatcher_Impl.h +++ b/ACE/Kokyu/Default_Dispatcher_Impl.h @@ -64,7 +64,6 @@ namespace Kokyu /// Command callback int execute (); }; - } //end of namespace #if defined (__ACE_INLINE__) 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 ca602ca2be7..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: @@ -92,7 +91,6 @@ private: ACE_Deadline_Message_Strategy deadline_msg_strategy_; ACE_Laxity_Message_Strategy laxity_msg_strategy_; }; - } //end of namespace #if defined (__ACE_INLINE__) 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_defs.h b/ACE/Kokyu/Kokyu_defs.h index 5998817b84d..9f8099dd08c 100644 --- a/ACE/Kokyu/Kokyu_defs.h +++ b/ACE/Kokyu/Kokyu_defs.h @@ -174,7 +174,6 @@ namespace Kokyu DSRT_ConfigInfo (); }; - } //end of namespace //to satisfy ACE_Array<ConfigInfo> 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..bda65df470c 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; /** @@ -152,7 +151,6 @@ namespace Kokyu const QoSDesc& qos2); }; - } //end of namespace #if defined (__ACE_INLINE__) diff --git a/ACE/Kokyu/tests/DSRT_MIF/MIF.cpp b/ACE/Kokyu/tests/DSRT_MIF/MIF.cpp index 045b97ba64d..6ceb80369fd 100644 --- a/ACE/Kokyu/tests/DSRT_MIF/MIF.cpp +++ b/ACE/Kokyu/tests/DSRT_MIF/MIF.cpp @@ -46,7 +46,6 @@ struct mif_scheduler_traits class MyTask : public ACE_Task_Base { public: - MyTask (ACE_Barrier& bar, Kokyu::DSRT_Dispatcher<mif_scheduler_traits>* dispatcher, mif_scheduler_traits::QoSDescriptor_t& qos, 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/ARGV.cpp b/ACE/ace/ARGV.cpp index 77353632b4d..2c08788a866 100644 --- a/ACE/ace/ARGV.cpp +++ b/ACE/ace/ARGV.cpp @@ -315,7 +315,6 @@ ACE_ARGV_T<CHAR_TYPE>::~ACE_ARGV_T () #endif /* ACE_HAS_ALLOC_HOOKS */ - #if defined (ACE_HAS_ALLOC_HOOKS) ACE_Allocator::instance()->free (this->argv_); ACE_Allocator::instance()->free (this->buf_); diff --git a/ACE/ace/Acceptor.h b/ACE/ace/Acceptor.h index ba2c14cf431..e0dc84ee258 100644 --- a/ACE/ace/Acceptor.h +++ b/ACE/ace/Acceptor.h @@ -406,7 +406,6 @@ public: virtual int resume (); protected: - /// Calls {handle_close} when dynamically unlinked. virtual int fini (); diff --git a/ACE/ace/Active_Map_Manager_T.h b/ACE/ace/Active_Map_Manager_T.h index fdc54b65492..78dd7a3f991 100644 --- a/ACE/ace/Active_Map_Manager_T.h +++ b/ACE/ace/Active_Map_Manager_T.h @@ -177,7 +177,6 @@ public: ACE_ALLOC_HOOK_DECLARE; protected: - /// Private base class typedef ACE_Map_Manager<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex> ACE_AMM_BASE; diff --git a/ACE/ace/Array_Base.h b/ACE/ace/Array_Base.h index d5ed71e47df..c2020aae474 100644 --- a/ACE/ace/Array_Base.h +++ b/ACE/ace/Array_Base.h @@ -159,7 +159,6 @@ public: void swap (ACE_Array_Base<T> & array); protected: - /// Returns 1 if @a slot is within range, i.e., 0 >= @a slot < /// @c cur_size_, else returns 0. bool in_range (size_type slot) const; diff --git a/ACE/ace/Asynch_Acceptor.h b/ACE/ace/Asynch_Acceptor.h index eaa2aae6f9b..172649e5000 100644 --- a/ACE/ace/Asynch_Acceptor.h +++ b/ACE/ace/Asynch_Acceptor.h @@ -210,7 +210,6 @@ public: virtual void bytes_to_read (size_t new_value); protected: - /// This is called when an outstanding accept completes. virtual void handle_accept (const ACE_Asynch_Accept::Result &result); diff --git a/ACE/ace/Asynch_Connector.h b/ACE/ace/Asynch_Connector.h index 415915d87b0..f7162cdb04b 100644 --- a/ACE/ace/Asynch_Connector.h +++ b/ACE/ace/Asynch_Connector.h @@ -122,7 +122,6 @@ public: virtual void validate_new_connection (bool new_value); protected: - /// This is called when an outstanding accept completes. virtual void handle_connect (const ACE_Asynch_Connect::Result &result); diff --git a/ACE/ace/Asynch_IO.cpp b/ACE/ace/Asynch_IO.cpp index e97457b75ee..b745791a118 100644 --- a/ACE/ace/Asynch_IO.cpp +++ b/ACE/ace/Asynch_IO.cpp @@ -699,7 +699,6 @@ ACE_Asynch_Accept::Result::implementation () const } - // ********************************************************************* ACE_Asynch_Connect::ACE_Asynch_Connect () diff --git a/ACE/ace/Asynch_IO.h b/ACE/ace/Asynch_IO.h index 7f485cd18d0..933ee627d10 100644 --- a/ACE/ace/Asynch_IO.h +++ b/ACE/ace/Asynch_IO.h @@ -1058,7 +1058,6 @@ public: friend class ACE_WIN32_Asynch_Connect_Result; public: - /// I/O handle for the connection. ACE_HANDLE connect_handle () const; diff --git a/ACE/ace/Asynch_Pseudo_Task.cpp b/ACE/ace/Asynch_Pseudo_Task.cpp index 72dff50ab0f..245581c6f9f 100644 --- a/ACE/ace/Asynch_Pseudo_Task.cpp +++ b/ACE/ace/Asynch_Pseudo_Task.cpp @@ -66,7 +66,6 @@ ACE_Asynch_Pseudo_Task::svc () } - int ACE_Asynch_Pseudo_Task::register_io_handler (ACE_HANDLE handle, ACE_Event_Handler *handler, 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/Auto_Functor.h b/ACE/ace/Auto_Functor.h index 7e75ae7b6a8..d6cb1682ddd 100644 --- a/ACE/ace/Auto_Functor.h +++ b/ACE/ace/Auto_Functor.h @@ -101,7 +101,6 @@ private: Functor f_; }; - } // namespace ACE_Utils ACE_END_VERSIONED_NAMESPACE_DECL 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/CDR_Stream.h b/ACE/ace/CDR_Stream.h index 506f92be917..6cb27ede244 100644 --- a/ACE/ace/CDR_Stream.h +++ b/ACE/ace/CDR_Stream.h @@ -1090,7 +1090,6 @@ public: #endif /* ACE_HAS_MONITOR_POINTS==1 */ protected: - /// The start of the chain of message blocks, even though in the /// current version the chain always has length 1. ACE_Message_Block start_; @@ -1371,7 +1370,6 @@ protected: ACE_CDR::Octet minor_version (ACE_InputCDR& input); ACE_CDR::Octet major_version (ACE_OutputCDR& output); ACE_CDR::Octet minor_version (ACE_OutputCDR& output); - }; // @@ These operators should not be inlined since they force SString.h diff --git a/ACE/ace/Cache_Map_Manager_T.cpp b/ACE/ace/Cache_Map_Manager_T.cpp index b1abcdb19a4..40933e8928e 100644 --- a/ACE/ace/Cache_Map_Manager_T.cpp +++ b/ACE/ace/Cache_Map_Manager_T.cpp @@ -30,7 +30,6 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP ACELIB_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Cache_Map_Manager::ACE_Cache_Map_Manager"))); - } template <class KEY, class VALUE, class CMAP_TYPE, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES> @@ -68,19 +67,16 @@ 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 // not complete. bind_result = -1; - } } @@ -101,13 +97,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 @@ -117,7 +111,6 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP // Unless the notification goes thru the rebind operation is // not complete. rebind_result = -1; - } } @@ -143,13 +136,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 @@ -159,13 +150,10 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP // Unless the notification goes thru the rebind operation is // not complete. rebind_result = -1; - } else { - old_value = old_cache_value.first (); - } } @@ -192,13 +180,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 @@ -208,13 +194,10 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP // Unless the notification goes thru the rebind operation is // not complete. rebind_result = -1; - } else { - old_value = old_cache_value.first (); - } } @@ -234,29 +217,24 @@ 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) this->map_.unbind (key); trybind_result = -1; - } 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) value = cache_value.first (); - } } @@ -276,7 +254,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); @@ -286,7 +263,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, @@ -295,7 +271,6 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP find_result = -1; else value = cache_value.first; - } } @@ -314,7 +289,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); @@ -324,7 +298,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, @@ -332,7 +305,6 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP if (rebind_result == -1) find_result = -1; - } } @@ -352,13 +324,11 @@ 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); if (result == -1) unbind_result = -1; - } return unbind_result; @@ -376,7 +346,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 ()); @@ -384,7 +353,6 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP unbind_result = -1; else value = cache_value.first (); - } return unbind_result; diff --git a/ACE/ace/Cache_Map_Manager_T.h b/ACE/ace/Cache_Map_Manager_T.h index e1415518d5f..74de2ec6bb3 100644 --- a/ACE/ace/Cache_Map_Manager_T.h +++ b/ACE/ace/Cache_Map_Manager_T.h @@ -218,7 +218,6 @@ public: ACE_ALLOC_HOOK_DECLARE; protected: - /// The underlying map which needs to be cached. CMAP_TYPE map_; diff --git a/ACE/ace/Cached_Connect_Strategy_T.cpp b/ACE/ace/Cached_Connect_Strategy_T.cpp index 3e7a3782209..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; @@ -306,7 +305,6 @@ ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATE } return 0; - } @@ -588,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/Caching_Utility_T.cpp b/ACE/ace/Caching_Utility_T.cpp index aa344562d86..e9260b64872 100644 --- a/ACE/ace/Caching_Utility_T.cpp +++ b/ACE/ace/Caching_Utility_T.cpp @@ -79,7 +79,6 @@ ACE_Pair_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::clear_cac key_to_remove, value_to_remove) == -1) return -1; - } return 0; diff --git a/ACE/ace/Caching_Utility_T.h b/ACE/ace/Caching_Utility_T.h index ac046b97462..a86b87d7318 100644 --- a/ACE/ace/Caching_Utility_T.h +++ b/ACE/ace/Caching_Utility_T.h @@ -59,7 +59,6 @@ public: int clear_cache (CONTAINER &container, double purge_percent); protected: - /// Find the entry with minimum caching attributes. void minimum (CONTAINER &container, KEY *&key_to_remove, @@ -110,7 +109,6 @@ public: double purge_percent); protected: - /// Find the entry with minimum caching attributes. void minimum (CONTAINER &container, KEY *&key_to_remove, @@ -161,7 +159,6 @@ public: double purge_percent); protected: - /// Find the entry with minimum caching attributes. void minimum (CONTAINER &container, KEY *&key_to_remove, @@ -218,7 +215,6 @@ public: double purge_percent); protected: - /** * Find the entry with minimum caching attributes. This is handler * specific since this utility is to be used very specifically for @@ -272,7 +268,6 @@ public: double purge_percent); protected: - /** * Find the entry with minimum caching attributes. This is handler * specific since this utility is to be used very specifically for diff --git a/ACE/ace/Cleanup_Strategies_T.cpp b/ACE/ace/Cleanup_Strategies_T.cpp index 53cf0b876ac..ecf960124fa 100644 --- a/ACE/ace/Cleanup_Strategies_T.cpp +++ b/ACE/ace/Cleanup_Strategies_T.cpp @@ -72,7 +72,6 @@ ACE_Handler_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup ( if (container.unbind (*key) == -1) return -1; - } return 0; 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..65a5424aecd 100644 --- a/ACE/ace/Configuration.cpp +++ b/ACE/ace/Configuration.cpp @@ -336,7 +336,6 @@ ACE_Configuration::operator== (const ACE_Configuration& rhs) const }// end else if values match. ++valueIndex; - }// end value while loop // look in the rhs for values not in this @@ -361,7 +360,6 @@ ACE_Configuration::operator== (const ACE_Configuration& rhs) const }// end else if sections match. ++sectionIndex; - }// end section while loop // Finally, make sure that there are no sections in rhs that do not @@ -1158,7 +1156,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/Configuration.h b/ACE/ace/Configuration.h index 3565c27a9cf..c192f0090a9 100644 --- a/ACE/ace/Configuration.h +++ b/ACE/ace/Configuration.h @@ -524,7 +524,6 @@ public: virtual bool operator!= (const ACE_Configuration_Win32Registry &rhs) const; protected: - /// Gets the HKEY for a configuration section int load_key (const ACE_Configuration_Section_Key& key, HKEY& hKey); diff --git a/ACE/ace/Configuration_Import_Export.cpp b/ACE/ace/Configuration_Import_Export.cpp index 609159bffd8..d2b1d5767e3 100644 --- a/ACE/ace/Configuration_Import_Export.cpp +++ b/ACE/ace/Configuration_Import_Export.cpp @@ -673,7 +673,6 @@ ACE_Ini_ImpExp::export_section (const ACE_Configuration_Section_Key& section, } default: return -3; - }// end switch on type line += ACE_TEXT ("\n"); @@ -699,7 +698,6 @@ ACE_Ini_ImpExp::export_section (const ACE_Configuration_Section_Key& section, ++index; } return 0; - } // Method to squish leading and trailing whitespaces from a string. diff --git a/ACE/ace/Containers_T.cpp b/ACE/ace/Containers_T.cpp index 2c69a6b0c6e..c4ac4b5e2da 100644 --- a/ACE/ace/Containers_T.cpp +++ b/ACE/ace/Containers_T.cpp @@ -1604,7 +1604,6 @@ ACE_Ordered_MultiSet<T>::find (const T &item, } - template <class T> void ACE_Ordered_MultiSet<T>::reset () { diff --git a/ACE/ace/Containers_T.h b/ACE/ace/Containers_T.h index 5cbbca05813..b4739ea6c34 100644 --- a/ACE/ace/Containers_T.h +++ b/ACE/ace/Containers_T.h @@ -330,7 +330,6 @@ private: }; - /** * @class ACE_Unbounded_Stack * @@ -1031,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/DLL_Manager.h b/ACE/ace/DLL_Manager.h index 23a4150f206..9c320d20553 100644 --- a/ACE/ace/DLL_Manager.h +++ b/ACE/ace/DLL_Manager.h @@ -314,7 +314,6 @@ private: /// Synchronization variable for the MT_SAFE Repository ACE_Thread_Mutex lock_; #endif /* ACE_MT_SAFE */ - }; ACE_END_VERSIONED_NAMESPACE_DECL 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 c75cbc8cba0..05efadb696a 100644 --- a/ACE/ace/Dev_Poll_Reactor.h +++ b/ACE/ace/Dev_Poll_Reactor.h @@ -167,7 +167,6 @@ public: ACE_ALLOC_HOOK_DECLARE; protected: - /** * Keep a back pointer to the ACE_Dev_Poll_Reactor. If this value * if NULL then the ACE_Dev_Poll_Reactor has been initialized with @@ -252,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 * @@ -332,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); @@ -360,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_). @@ -398,7 +394,6 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl * an @c ACE_HANDLE value. This is Unix-specific. */ Event_Tuple *handlers_; - }; public: @@ -865,7 +860,6 @@ public: * manipulated with these methods. */ //@{ - /// GET/SET/ADD/CLR the dispatch mask "bit" bound with the /// event_handler and mask. /** @@ -892,7 +886,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, @@ -913,7 +906,6 @@ public: ACE_ALLOC_HOOK_DECLARE; protected: - class Token_Guard; /// Non-locking version of wait_pending(). @@ -1090,7 +1082,6 @@ protected: bool restart_; protected: - /** * @class Token_Guard * diff --git a/ACE/ace/ETCL/ETCL_Interpreter.h b/ACE/ace/ETCL/ETCL_Interpreter.h index b5f57b570ab..0a16b259f84 100644 --- a/ACE/ace/ETCL/ETCL_Interpreter.h +++ b/ACE/ace/ETCL/ETCL_Interpreter.h @@ -91,7 +91,6 @@ public: static int copy_into (char* buf, int max_size); private: - /// Pointers to keep track of the input string. static char* string_; static char* current_; diff --git a/ACE/ace/ETCL/ETCL_l.cpp b/ACE/ace/ETCL/ETCL_l.cpp index ee9e119dd4f..b2bc659285e 100644 --- a/ACE/ace/ETCL/ETCL_l.cpp +++ b/ACE/ace/ETCL/ETCL_l.cpp @@ -1514,7 +1514,6 @@ YY_BUFFER_STATE b; } - #ifdef YY_USE_PROTOS void yy_init_buffer( YY_BUFFER_STATE b, FILE *file ) #else @@ -1737,7 +1736,6 @@ char msg[]; } - /* Redefine yyless() so it works in section 3 code. */ #undef yyless diff --git a/ACE/ace/ETCL/ETCL_y.cpp b/ACE/ace/ETCL/ETCL_y.cpp index 2744a3c238a..3f27b8a8670 100644 --- a/ACE/ace/ETCL/ETCL_y.cpp +++ b/ACE/ace/ETCL/ETCL_y.cpp @@ -86,7 +86,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL #endif - #define YYFINAL 114 #define YYFLAG -32768 #define YYNTBASE 46 @@ -836,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/Event_Handler.cpp b/ACE/ace/Event_Handler.cpp index db98ca84d53..b67015a0691 100644 --- a/ACE/ace/Event_Handler.cpp +++ b/ACE/ace/Event_Handler.cpp @@ -362,7 +362,6 @@ bool ACE_Event_Handler_var::operator !=(std::nullptr_t) const { return this->ptr_ != nullptr; - } // --------------------------------------------------------------------- diff --git a/ACE/ace/Event_Handler.h b/ACE/ace/Event_Handler.h index b41ecb4f22f..0e7471deb89 100644 --- a/ACE/ace/Event_Handler.h +++ b/ACE/ace/Event_Handler.h @@ -229,7 +229,6 @@ public: class ACE_Export Policy { public: - /// Virtual destructor. virtual ~Policy (); }; 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/Filecache.h b/ACE/ace/Filecache.h index 4e6e712507c..870dce8c316 100644 --- a/ACE/ace/Filecache.h +++ b/ACE/ace/Filecache.h @@ -88,7 +88,6 @@ class ACE_Export ACE_Filecache_Handle // Since this design should be simpler, problems should be easier to spot. // public: - /// Query cache for file, and acquire it. Assumes the file is being /// opened for reading. ACE_Filecache_Handle (const ACE_TCHAR *filename, diff --git a/ACE/ace/FlReactor/FlReactor.cpp b/ACE/ace/FlReactor/FlReactor.cpp index edbac9be35e..ecb2f088a19 100644 --- a/ACE/ace/FlReactor/FlReactor.cpp +++ b/ACE/ace/FlReactor/FlReactor.cpp @@ -86,7 +86,6 @@ ACE_FlReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_s handle_set.wr_mask_, handle_set.ex_mask_, &zero); - } while (nfound == -1 && this->handle_error () > 0); if (nfound > 0) 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/FoxReactor/FoxReactor.cpp b/ACE/ace/FoxReactor/FoxReactor.cpp index 9560a5ae2c2..339107ba842 100644 --- a/ACE/ace/FoxReactor/FoxReactor.cpp +++ b/ACE/ace/FoxReactor/FoxReactor.cpp @@ -65,7 +65,6 @@ ACE_FoxReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_ nfound = FoxWaitForMultipleEvents (width, handle_set, max_wait_time); - } while( nfound == -1 && this->handle_error () > 0 ); if (nfound > 0) diff --git a/ACE/ace/Guard_T.h b/ACE/ace/Guard_T.h index 575c17a91be..d7ffa9cd7af 100644 --- a/ACE/ace/Guard_T.h +++ b/ACE/ace/Guard_T.h @@ -110,7 +110,6 @@ public: // Declare the dynamic allocation hooks. protected: - /// Helper, meant for subclass only. ACE_Guard (ACE_LOCK *lock): lock_ (lock), owner_ (0) {} 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..5eb4bcc825d 100644 --- a/ACE/ace/Hash_Cache_Map_Manager_T.cpp +++ b/ACE/ace/Hash_Cache_Map_Manager_T.cpp @@ -42,19 +42,16 @@ 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 // not complete. bind_result = -1; - } } @@ -75,13 +72,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 @@ -91,7 +86,6 @@ ACE_Hash_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY // Unless the notification goes thru the rebind operation is // not complete. rebind_result = -1; - } } @@ -118,23 +112,19 @@ 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) this->map_.unbind (key); trybind_result = -1; - } 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) value = cache_value.first (); - } } @@ -152,7 +142,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); @@ -162,7 +151,6 @@ ACE_Hash_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY find_result = -1; else find_result = 0; - } return find_result; @@ -202,13 +190,11 @@ 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); if (result == -1) unbind_result = -1; - } return unbind_result; 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/INET_Addr.cpp b/ACE/ace/INET_Addr.cpp index de9abf60c77..9ba557bb94d 100644 --- a/ACE/ace/INET_Addr.cpp +++ b/ACE/ace/INET_Addr.cpp @@ -983,7 +983,6 @@ int ACE_INET_Addr::set_address (const char *ip_addr, // Here with an unrecognized length. errno = EAFNOSUPPORT; return -1; - } #if (defined (ACE_LINUX) || defined (ACE_WIN32)) && defined (ACE_HAS_IPV6) @@ -1009,7 +1008,6 @@ ACE_INET_Addr::set_interface (const char *intf_name) } else return 0; - } #endif /* ACE_LINUX && ACE_HAS_IPV6 */ diff --git a/ACE/ace/IOStream.h b/ACE/ace/IOStream.h index 51f94101ae0..e04a1583710 100644 --- a/ACE/ace/IOStream.h +++ b/ACE/ace/IOStream.h @@ -128,7 +128,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_Streambuf : public streambuf { public: - /** * If the default allocation strategy were used the common buffer * would be deleted when the object destructs. Since we are diff --git a/ACE/ace/If_Then_Else.h b/ACE/ace/If_Then_Else.h index 626b331f8fc..9d645e026e8 100644 --- a/ACE/ace/If_Then_Else.h +++ b/ACE/ace/If_Then_Else.h @@ -78,7 +78,6 @@ namespace ACE { typedef Tb result_type; }; - } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Lib_Find.cpp b/ACE/ace/Lib_Find.cpp index 650412aafad..a5918e499d9 100644 --- a/ACE/ace/Lib_Find.cpp +++ b/ACE/ace/Lib_Find.cpp @@ -111,7 +111,6 @@ ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, ACE_LD_Symbol_Registry, ACE_SY #endif - ACE_BEGIN_VERSIONED_NAMESPACE_DECL int diff --git a/ACE/ace/Local_Name_Space_T.cpp b/ACE/ace/Local_Name_Space_T.cpp index 27a17710d4a..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); @@ -232,7 +231,6 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::unbind ( { } return result; - } template <ACE_MEM_POOL_1, class ACE_LOCK> int 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/MMAP_Memory_Pool.h b/ACE/ace/MMAP_Memory_Pool.h index d0f76ca8d93..c150243e150 100644 --- a/ACE/ace/MMAP_Memory_Pool.h +++ b/ACE/ace/MMAP_Memory_Pool.h @@ -333,7 +333,6 @@ public: /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; - }; ACE_END_VERSIONED_NAMESPACE_DECL 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/Malloc.h b/ACE/ace/Malloc.h index 9fc2efb11ee..06b9eb6cbe3 100644 --- a/ACE/ace/Malloc.h +++ b/ACE/ace/Malloc.h @@ -254,7 +254,6 @@ union ACE_max_align_info class ACE_Export ACE_Control_Block { public: - /** * @class ACE_Malloc_Header * 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/Map_Manager.h b/ACE/ace/Map_Manager.h index 99ef7f94021..d559d00ef8a 100644 --- a/ACE/ace/Map_Manager.h +++ b/ACE/ace/Map_Manager.h @@ -283,7 +283,6 @@ public: ACE_ALLOC_HOOK_DECLARE; protected: - // = The following methods do the actual work. // These methods assume that the locks are held by the private diff --git a/ACE/ace/Map_T.h b/ACE/ace/Map_T.h index bfe52db6a4d..4773818d113 100644 --- a/ACE/ace/Map_T.h +++ b/ACE/ace/Map_T.h @@ -32,7 +32,6 @@ template <class T> class ACE_Noop_Key_Generator { public: - /// Functor method: generates a new key. int operator () (T &); }; @@ -685,7 +684,6 @@ public: IMPLEMENTATION &impl (); protected: - /// All implementation details are forwarded to this class. IMPLEMENTATION implementation_; @@ -716,7 +714,6 @@ template <class T, class VALUE> class ACE_Active_Map_Manager_Iterator_Adapter : public ACE_Iterator_Impl<T> { public: - // = Traits. typedef typename ACE_Active_Map_Manager<VALUE>::iterator implementation; @@ -746,7 +743,6 @@ public: ACE_Map_Iterator<ACE_Active_Map_Manager_Key, VALUE, ACE_Null_Mutex> &impl (); protected: - /// All implementation details are forwarded to this class. ACE_Map_Iterator<ACE_Active_Map_Manager_Key, VALUE, ACE_Null_Mutex> implementation_; }; @@ -762,7 +758,6 @@ template <class T, class VALUE> class ACE_Active_Map_Manager_Reverse_Iterator_Adapter : public ACE_Reverse_Iterator_Impl<T> { public: - // = Traits. typedef typename ACE_Active_Map_Manager<VALUE>::reverse_iterator implementation; @@ -792,7 +787,6 @@ public: ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, VALUE, ACE_Null_Mutex> &impl (); protected: - /// All implementation details are forwarded to this class. ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, VALUE, ACE_Null_Mutex> implementation_; }; @@ -966,7 +960,6 @@ public: KEY_ADAPTER &key_adapter (); protected: - /// Find helper. virtual int find (const KEY &key, expanded_value *&internal_value); @@ -1008,7 +1001,6 @@ template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS> class ACE_Hash_Map_Manager_Ex_Iterator_Adapter : public ACE_Iterator_Impl<T> { public: - // = Traits. typedef typename ACE_Hash_Map_Manager_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>::iterator implementation; @@ -1038,7 +1030,6 @@ public: ACE_Hash_Map_Iterator_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> &impl (); protected: - /// All implementation details are forwarded to this class. ACE_Hash_Map_Iterator_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> implementation_; }; @@ -1054,7 +1045,6 @@ template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS> class ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter : public ACE_Reverse_Iterator_Impl<T> { public: - // = Traits. typedef typename ACE_Hash_Map_Manager_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>::reverse_iterator implementation; @@ -1084,7 +1074,6 @@ public: ACE_Hash_Map_Reverse_Iterator_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> &impl (); protected: - /// All implementation details are forwarded to this class. ACE_Hash_Map_Reverse_Iterator_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> implementation_; }; @@ -1257,7 +1246,6 @@ public: KEY_GENERATOR &key_generator (); protected: - /// All implementation details are forwarded to this class. ACE_Hash_Map_Manager_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> implementation_; @@ -1291,7 +1279,6 @@ template <class T, class KEY, class VALUE> class ACE_Map_Manager_Iterator_Adapter : public ACE_Iterator_Impl<T> { public: - // = Traits. typedef typename ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex>::iterator implementation; @@ -1321,7 +1308,6 @@ public: ACE_Map_Iterator<KEY, VALUE, ACE_Null_Mutex> &impl (); protected: - /// All implementation details are forwarded to this class. ACE_Map_Iterator<KEY, VALUE, ACE_Null_Mutex> implementation_; }; @@ -1337,7 +1323,6 @@ template <class T, class KEY, class VALUE> class ACE_Map_Manager_Reverse_Iterator_Adapter : public ACE_Reverse_Iterator_Impl<T> { public: - // = Traits. typedef typename ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex>::reverse_iterator implementation; @@ -1367,7 +1352,6 @@ public: ACE_Map_Reverse_Iterator<KEY, VALUE, ACE_Null_Mutex> &impl (); protected: - /// All implementation details are forwarded to this class. ACE_Map_Reverse_Iterator<KEY, VALUE, ACE_Null_Mutex> implementation_; }; @@ -1540,7 +1524,6 @@ public: KEY_GENERATOR &key_generator (); protected: - /// All implementation details are forwarded to this class. ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex> implementation_; diff --git a/ACE/ace/Mem_Map.h b/ACE/ace/Mem_Map.h index 4ea7b55be55..b44241b064d 100644 --- a/ACE/ace/Mem_Map.h +++ b/ACE/ace/Mem_Map.h @@ -183,7 +183,6 @@ public: ACE_ALLOC_HOOK_DECLARE; private: - /// This method does the dirty work of actually calling ::mmap to map /// the file into memory. int map_it (ACE_HANDLE handle, diff --git a/ACE/ace/Message_Block.cpp b/ACE/ace/Message_Block.cpp index 3c6e51350ca..f675a9450f5 100644 --- a/ACE/ace/Message_Block.cpp +++ b/ACE/ace/Message_Block.cpp @@ -611,7 +611,6 @@ ACE_Message_Block::ACE_Message_Block (const ACE_Message_Block &mb, // Set our rd & wr pointers this->rd_ptr (start); this->wr_ptr (start); - } else { diff --git a/ACE/ace/Message_Queue_NT.h b/ACE/ace/Message_Queue_NT.h index 2e50483b67d..0cde39ca08a 100644 --- a/ACE/ace/Message_Queue_NT.h +++ b/ACE/ace/Message_Queue_NT.h @@ -214,7 +214,6 @@ private: /// Underlying NT IoCompletionPort. ACE_HANDLE completion_port_; - }; #endif /* ACE_HAS_WIN32_OVERLAPPED_IO */ 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 bc49d81d80b..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 @@ -841,7 +837,6 @@ public: ACE_ALLOC_HOOK_DECLARE; protected: - /** * Enqueue an <ACE_Message_Block *> in accordance with its priority. * priority may be *dynamic* or *static* or a combination or *both* @@ -1002,7 +997,6 @@ template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY = ACE_System class ACE_Message_Queue_Ex { public: - enum { /// Default priority value. This is the lowest priority. @@ -1254,7 +1248,6 @@ public: /** @name Queue statistics methods */ //@{ - /// True if queue is full, else false. virtual bool is_full (); @@ -1294,7 +1287,6 @@ public: /** @name Water mark (flow control) methods */ //@{ - /** * Get high watermark. */ @@ -1323,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, @@ -1361,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/Metrics_Cache_T.h b/ACE/ace/Metrics_Cache_T.h index c05862183c5..254cba424f3 100644 --- a/ACE/ace/Metrics_Cache_T.h +++ b/ACE/ace/Metrics_Cache_T.h @@ -45,7 +45,6 @@ class ACE_Metrics_Timeprobe : public ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR> { public: - typedef ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR> ACE_METRICS_TIMEPROBE_TYPE; @@ -94,7 +93,6 @@ public: void flush_ACE_Metrics_Timeprobe (); protected: - /// Identifier for the timeprobe. u_int id_; @@ -102,7 +100,6 @@ protected: char* name_; private: - // Declare but do not define. ACE_Metrics_Timeprobe (const ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR> &); void operator =(const ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR> &); @@ -120,7 +117,6 @@ template <class ACE_LOCK, class ALLOCATOR> class ACE_Metrics_Cache { public: - typedef ACE_Metrics_Cache <ACE_LOCK, ALLOCATOR> ACE_METRICS_CACHE_TYPE; /// Default constructor. @@ -165,7 +161,6 @@ public: int metrics_enabled() const; protected: - /// Obtain an allocator pointer correctly thunked for the current /// address space. If there is no allocator stored in the instance, /// the singleton allocator in the current process is used. 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/NT_Service.cpp b/ACE/ace/NT_Service.cpp index 720ceefa9b3..3af1814f415 100644 --- a/ACE/ace/NT_Service.cpp +++ b/ACE/ace/NT_Service.cpp @@ -75,7 +75,6 @@ ACE_NT_Service::open (void *args) } return svc_return; - } int @@ -234,7 +233,6 @@ ACE_NT_Service::insert (DWORD start_type, this->svc_sc_handle_ = sh; return 0; - } int @@ -302,7 +300,6 @@ ACE_NT_Service::startup (void) // Zero is a valid return value for QueryServiceConfig, so if // QueryServiceConfig fails, return the DWORD equivalent of -1. return MAXDWORD; - } void diff --git a/ACE/ace/Name_Space.cpp b/ACE/ace/Name_Space.cpp index 0e1228909a5..57ebe136393 100644 --- a/ACE/ace/Name_Space.cpp +++ b/ACE/ace/Name_Space.cpp @@ -4,7 +4,6 @@ #include "ace/OS_NS_stdlib.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Name_Binding::ACE_Name_Binding () diff --git a/ACE/ace/Name_Space.h b/ACE/ace/Name_Space.h index ddde081c490..4e38f412709 100644 --- a/ACE/ace/Name_Space.h +++ b/ACE/ace/Name_Space.h @@ -82,7 +82,6 @@ typedef ACE_Unbounded_Set_Iterator<ACE_NS_WString> ACE_PWSTRING_ITERATOR; class ACE_Export ACE_Name_Space { public: - /// virtual destructor to ensure destructors of subclasses get /// called. virtual ~ACE_Name_Space (); diff --git a/ACE/ace/Netlink_Addr.h b/ACE/ace/Netlink_Addr.h index 5b08d5fb78f..9d53b94e8da 100644 --- a/ACE/ace/Netlink_Addr.h +++ b/ACE/ace/Netlink_Addr.h @@ -111,4 +111,3 @@ ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_NETLINK_ADDR_H */ - diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp index 6c866aeea8f..1d454befb1b 100644 --- a/ACE/ace/OS_NS_Thread.cpp +++ b/ACE/ace/OS_NS_Thread.cpp @@ -604,7 +604,6 @@ public: ACE_TSS_Cleanup * operator ->(); private: - ACE_TSS_Cleanup * operator *(); private: @@ -3358,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 @@ -3881,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_Thread.h b/ACE/ace/OS_NS_Thread.h index 32ffcdf915c..9a0bfecc5d4 100644 --- a/ACE/ace/OS_NS_Thread.h +++ b/ACE/ace/OS_NS_Thread.h @@ -340,7 +340,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_cond_t { public: - /// Returns the number of waiters. long waiters () const; @@ -417,7 +416,6 @@ struct ACE_Export ACE_rwlock_t { public: //protected: - /// Serialize access to internal state. ACE_mutex_t lock_; @@ -937,7 +935,6 @@ public: bool operator!= (const ACE_TSS_Ref &) const; // private: - /// ID of thread using a specific key. ACE_thread_t tid_; }; diff --git a/ACE/ace/OS_NS_arpa_inet.h b/ACE/ace/OS_NS_arpa_inet.h index f33340376f6..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); @@ -53,7 +52,6 @@ namespace ACE_OS { int inet_pton (int family, const char *strptr, void *addrptr); - } /* namespace ACE_OS */ ACE_END_VERSIONED_NAMESPACE_DECL 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 c1ed2975b90..982dee5db42 100644 --- a/ACE/ace/OS_NS_devctl.h +++ b/ACE/ace/OS_NS_devctl.h @@ -19,12 +19,10 @@ 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, int *dev_info_ptr); - } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_dirent.cpp b/ACE/ace/OS_NS_dirent.cpp index a5efb466c06..449a0c96694 100644 --- a/ACE/ace/OS_NS_dirent.cpp +++ b/ACE/ace/OS_NS_dirent.cpp @@ -1,7 +1,6 @@ #include "ace/OS_NS_dirent.h" - #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_dirent.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ 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_math.h b/ACE/ace/OS_NS_math.h index daf9e9f70c4..de6d2e1516c 100644 --- a/ACE/ace/OS_NS_math.h +++ b/ACE/ace/OS_NS_math.h @@ -122,7 +122,6 @@ namespace ACE_OS /// This method computes the base-2 logarithm of x. ACE_NAMESPACE_INLINE_FUNCTION double log2 (double x); - } /* namespace ACE_OS */ ACE_END_VERSIONED_NAMESPACE_DECL 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 a4f21d62f49..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, @@ -45,7 +44,6 @@ namespace ACE_OS int poll (struct pollfd *pollfds, unsigned long len, const ACE_Time_Value &tv); - } /* namespace ACE_OS */ ACE_END_VERSIONED_NAMESPACE_DECL 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.cpp b/ACE/ace/OS_NS_strings.cpp index d09d152fd2e..964549785ad 100644 --- a/ACE/ace/OS_NS_strings.cpp +++ b/ACE/ace/OS_NS_strings.cpp @@ -1,7 +1,6 @@ #include "ace/OS_NS_strings.h" - #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_strings.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ 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.cpp b/ACE/ace/OS_NS_stropts.cpp index bdcd3317c7f..c3bdaee9b9c 100644 --- a/ACE/ace/OS_NS_stropts.cpp +++ b/ACE/ace/OS_NS_stropts.cpp @@ -1,7 +1,6 @@ #include "ace/OS_NS_stropts.h" - #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_stropts.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ diff --git a/ACE/ace/OS_NS_stropts.h b/ACE/ace/OS_NS_stropts.h index 7b48d769b78..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, @@ -148,7 +147,6 @@ namespace ACE_OS { const struct strbuf *data, int band, int flags); - } /* namespace ACE_OS */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_sys_mman.h b/ACE/ace/OS_NS_sys_mman.h index ffcd4df547c..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, @@ -76,7 +75,6 @@ namespace ACE_OS ACE_NAMESPACE_INLINE_FUNCTION int shm_unlink (const ACE_TCHAR *path); - } /* namespace ACE_OS */ ACE_END_VERSIONED_NAMESPACE_DECL 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 9b4fbc999e1..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); @@ -46,7 +45,6 @@ namespace ACE_OS ACE_NAMESPACE_INLINE_FUNCTION int setrlimit (int resource, const struct rlimit *rl); - } /* namespace ACE_OS */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_sys_select.h b/ACE/ace/OS_NS_sys_select.h index 807cdbab7f7..d1e74768677 100644 --- a/ACE/ace/OS_NS_sys_select.h +++ b/ACE/ace/OS_NS_sys_select.h @@ -56,7 +56,6 @@ namespace ACE_OS fd_set *wfds, fd_set *efds, const ACE_Time_Value &tv); - } /* namespace ACE_OS */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_sys_socket.h b/ACE/ace/OS_NS_sys_socket.h index 27218a44dd9..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_; @@ -315,7 +314,6 @@ namespace ACE_OS int type, int protocol, ACE_HANDLE sv[2]); - } /* namespace ACE_OS */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_sys_stat.h b/ACE/ace/OS_NS_sys_stat.h index cac80f04e01..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); @@ -118,7 +117,6 @@ namespace ACE_OS ACE_NAMESPACE_INLINE_FUNCTION mode_t umask (mode_t cmask); - } /* namespace ACE_OS */ ACE_END_VERSIONED_NAMESPACE_DECL 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 6c9a71efa9b..249f4d7eebf 100644 --- a/ACE/ace/OS_NS_sys_utsname.h +++ b/ACE/ace/OS_NS_sys_utsname.h @@ -55,10 +55,8 @@ ACE_END_VERSIONED_NAMESPACE_DECL ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { - extern ACE_Export int uname (ACE_utsname *name); - } /* namespace ACE_OS */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_sys_wait.h b/ACE/ace/OS_NS_sys_wait.h index dc9f1eafbd7..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 @@ -66,7 +65,6 @@ namespace ACE_OS ACE_exitcode *status = 0, int wait_options = 0, ACE_HANDLE handle = 0); - } /* namespace ACE_OS */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_unistd.h b/ACE/ace/OS_NS_unistd.h index 6686583efa3..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); @@ -354,7 +353,6 @@ namespace ACE_OS const void *buf, size_t len, size_t *bytes_transferred = 0); - } /* namespace ACE_OS */ ACE_END_VERSIONED_NAMESPACE_DECL 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/OS_QoS.h b/ACE/ace/OS_QoS.h index e84c633b806..70ea271eed7 100644 --- a/ACE/ace/OS_QoS.h +++ b/ACE/ace/OS_QoS.h @@ -293,11 +293,9 @@ public: #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) #else private: - ACE_Flow_Spec *sending_flowspec_; ACE_Flow_Spec *receiving_flowspec_; #endif - }; /** diff --git a/ACE/ace/OS_TLI.cpp b/ACE/ace/OS_TLI.cpp index 1ae8e540e15..9ca114803ca 100644 --- a/ACE/ace/OS_TLI.cpp +++ b/ACE/ace/OS_TLI.cpp @@ -1,7 +1,6 @@ #include "ace/OS_TLI.h" - #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_TLI.inl" #endif /* !ACE_HAS_INLINED_OSCALLS */ diff --git a/ACE/ace/OS_TLI.h b/ACE/ace/OS_TLI.h index c8b82bfd10e..07b8ace2fa2 100644 --- a/ACE/ace/OS_TLI.h +++ b/ACE/ace/OS_TLI.h @@ -243,7 +243,6 @@ namespace ACE_OS ACE_NAMESPACE_INLINE_FUNCTION int t_unbind (ACE_HANDLE fildes); - } /* namespace ACE_OS */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_Thread_Adapter.h b/ACE/ace/OS_Thread_Adapter.h index 738e5e88230..536d06079ef 100644 --- a/ACE/ace/OS_Thread_Adapter.h +++ b/ACE/ace/OS_Thread_Adapter.h @@ -60,7 +60,6 @@ public: ACE_ALLOC_HOOK_DECLARE; protected: - /// Ensure that this object is allocated on the heap. ~ACE_OS_Thread_Adapter (void); }; 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/Object_Manager_Base.cpp b/ACE/ace/Object_Manager_Base.cpp index 0cf1b6c9e89..a98f62fab27 100644 --- a/ACE/ace/Object_Manager_Base.cpp +++ b/ACE/ace/Object_Manager_Base.cpp @@ -199,7 +199,6 @@ ACE_OS_Object_Manager::instance () // ACE_ASSERT (instance_pointer == instance_); instance_pointer->dynamically_allocated_ = true; - } return instance_; diff --git a/ACE/ace/POSIX_Asynch_IO.cpp b/ACE/ace/POSIX_Asynch_IO.cpp index 0631292ce78..9f524ec5871 100644 --- a/ACE/ace/POSIX_Asynch_IO.cpp +++ b/ACE/ace/POSIX_Asynch_IO.cpp @@ -1741,7 +1741,6 @@ public: int transmit (); protected: - /// The asynch result pointer made from the initial transmit file /// request. ACE_POSIX_Asynch_Transmit_File_Result *result_; diff --git a/ACE/ace/POSIX_Asynch_IO.h b/ACE/ace/POSIX_Asynch_IO.h index e98a7151d36..e06557c67ce 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; @@ -401,8 +400,6 @@ class ACE_Export ACE_POSIX_Asynch_Read_File_Result : public virtual ACE_Asynch_R /// The Proactor constructs the Result class for faking results. friend class ACE_POSIX_Proactor; -public: - protected: /// Constructor is protected since creation is limited to /// ACE_Asynch_Read_File factory. @@ -446,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); @@ -658,7 +654,6 @@ class ACE_Export ACE_POSIX_Asynch_Accept : public ACE_Event_Handler { public: - /// Constructor. ACE_POSIX_Asynch_Accept (ACE_POSIX_Proactor * posix_proactor); @@ -764,7 +759,6 @@ class ACE_Export ACE_POSIX_Asynch_Connect_Result : public virtual ACE_Asynch_Con friend class ACE_POSIX_Proactor; public: - /// I/O handle for the connection. ACE_HANDLE connect_handle () const; @@ -802,7 +796,6 @@ class ACE_Export ACE_POSIX_Asynch_Connect : public ACE_Event_Handler { public: - /// Constructor. ACE_POSIX_Asynch_Connect (ACE_POSIX_Proactor * posix_proactor); @@ -1143,7 +1136,6 @@ protected: /// I/O handle used for writing. ACE_HANDLE handle_; - }; /** @@ -1216,7 +1208,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; @@ -1281,7 +1272,6 @@ protected: /// I/O handle used for reading. ACE_HANDLE handle_; - }; ACE_END_VERSIONED_NAMESPACE_DECL 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 225e4acc18e..11308f32efd 100644 --- a/ACE/ace/POSIX_Proactor.cpp +++ b/ACE/ace/POSIX_Proactor.cpp @@ -688,7 +688,6 @@ ACE_AIOCB_Notify_Pipe_Manager::~ACE_AIOCB_Notify_Pipe_Manager () h = this->pipe_.read_handle (); if ( h != ACE_INVALID_HANDLE) ACE_OS::closesocket (h); - } @@ -764,7 +763,6 @@ ACE_POSIX_AIOCB_Proactor::ACE_POSIX_AIOCB_Proactor (size_t max_aio_operations) // start pseudo-asynchronous accept task // one per all future acceptors this->get_asynch_pseudo_task().start (); - } // Special protected constructor for ACE_SUN_Proactor @@ -1218,7 +1216,6 @@ ACE_POSIX_AIOCB_Proactor::find_completed_aio (int &error_status, error_status, transfer_count)) // completed break; - } // end for if (count == 0) // all processed , nothing found @@ -1995,7 +1992,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 076c0847a59..75a43c409f9 100644 --- a/ACE/ace/POSIX_Proactor.h +++ b/ACE/ace/POSIX_Proactor.h @@ -309,7 +309,6 @@ protected: private: /// Task to process pseudo-asynchronous accept/connect ACE_Asynch_Pseudo_Task pseudo_task_; - }; // Forward declarations. @@ -324,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; @@ -385,7 +383,6 @@ public: virtual int cancel_aio (ACE_HANDLE h); protected: - /// Special constructor for ACE_SUN_Proactor /// and ACE_POSIX_SIG_Proactor ACE_POSIX_AIOCB_Proactor (size_t nmaxop, @@ -505,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/Parse_Node.cpp b/ACE/ace/Parse_Node.cpp index 006f0e59710..295d3160a90 100644 --- a/ACE/ace/Parse_Node.cpp +++ b/ACE/ace/Parse_Node.cpp @@ -510,7 +510,6 @@ ACE_Location_Node::open_dll (int & yyerrno) } return 0; - } void diff --git a/ACE/ace/Parse_Node.h b/ACE/ace/Parse_Node.h index 89217ff9dea..930073987e5 100644 --- a/ACE/ace/Parse_Node.h +++ b/ACE/ace/Parse_Node.h @@ -409,7 +409,6 @@ public: ACE_ALLOC_HOOK_DECLARE; private: - /// Return mangled function name that takes into account ACE /// versioned namespace. /** @@ -430,7 +429,6 @@ private: ACE_TCHAR * make_func_name (ACE_TCHAR const * func_name); private: - /// Name of the function that we're parsing. const ACE_TCHAR *function_name_; @@ -495,7 +493,6 @@ public: ACE_ALLOC_HOOK_DECLARE; private: - /** * Not implemented to enforce no copying */ diff --git a/ACE/ace/Ping_Socket.h b/ACE/ace/Ping_Socket.h index 9e16cf18447..08a5fa4bbee 100644 --- a/ACE/ace/Ping_Socket.h +++ b/ACE/ace/Ping_Socket.h @@ -76,7 +76,6 @@ public: ACE_ALLOC_HOOK_DECLARE; public: - enum { PING_BUFFER_SIZE = (1024 * 2) diff --git a/ACE/ace/Priority_Reactor.cpp b/ACE/ace/Priority_Reactor.cpp index e4418972540..4036aaed213 100644 --- a/ACE/ace/Priority_Reactor.cpp +++ b/ACE/ace/Priority_Reactor.cpp @@ -2,7 +2,6 @@ #include "ace/Malloc_T.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL using QUEUE_ITERATOR = ACE_Unbounded_Queue_Iterator<ACE_Event_Tuple>; @@ -148,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/Proactor.h b/ACE/ace/Proactor.h index a2c87f35cdf..7ddaf92696a 100644 --- a/ACE/ace/Proactor.h +++ b/ACE/ace/Proactor.h @@ -561,7 +561,6 @@ public: int signal_number = ACE_SIGRTMIN); protected: - /** * Post <how_many> completions to the completion port so that all * threads can wake up. This is used in conjunction with the diff --git a/ACE/ace/Process.h b/ACE/ace/Process.h index 045daf60229..6ddf5215231 100644 --- a/ACE/ace/Process.h +++ b/ACE/ace/Process.h @@ -365,7 +365,6 @@ public: void inherit_environment (bool nv); #endif /* ACE_WIN32 */ protected: - #if !defined (ACE_HAS_WINCE) /// Add @a assignment to environment_buf_ and adjust /// environment_argv_. @a len is the strlen of @a assignment. diff --git a/ACE/ace/QoS/QoS_Decorator.cpp b/ACE/ace/QoS/QoS_Decorator.cpp index 3f2d9b15bf3..13ee649acb9 100644 --- a/ACE/ace/QoS/QoS_Decorator.cpp +++ b/ACE/ace/QoS/QoS_Decorator.cpp @@ -110,7 +110,6 @@ ACE_QoS_Decorator::init (void) ACE_Event_Handler::READ_MASK); #endif return 0; - } // Constructor. diff --git a/ACE/ace/QoS/QoS_Decorator.h b/ACE/ace/QoS/QoS_Decorator.h index b6ff20c74e4..a15d3654bdc 100644 --- a/ACE/ace/QoS/QoS_Decorator.h +++ b/ACE/ace/QoS/QoS_Decorator.h @@ -40,9 +40,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL */ class ACE_QoS_Export ACE_QoS_Decorator_Base : public ACE_Event_Handler { - public: - // Initialization and termination methods. /// Constructor. ACE_QoS_Decorator_Base (void); @@ -63,10 +61,8 @@ public: virtual int handle_qos (ACE_HANDLE fd); private: - /// The event handler that is decorated by this class. ACE_Event_Handler *event_handler_; - }; /** @@ -81,7 +77,6 @@ private: */ class ACE_QoS_Export ACE_QoS_Event_Handler : public ACE_Event_Handler { - /// Destructor. ~ACE_QoS_Event_Handler (void); @@ -97,7 +92,6 @@ class ACE_QoS_Export ACE_QoS_Event_Handler : public ACE_Event_Handler friend class ACE_QoS_Decorator; private: - /// Constructor is private because only ACE_QoS_Decorator should /// create this object. ACE_QoS_Event_Handler (void); @@ -110,7 +104,6 @@ private: /// Requests on the class are forwarded to this base class; ACE_QoS_Decorator_Base *decorator_base_; - }; /** @@ -124,9 +117,7 @@ private: */ class ACE_QoS_Export ACE_QoS_Decorator : public ACE_QoS_Decorator_Base { - public: - // Initialization and termination methods. /// Constructor. ACE_QoS_Decorator (void); @@ -153,7 +144,6 @@ public: int init (void); private: - /// Requests on the class are forwarded to this base class; ACE_QoS_Decorator_Base *decorator_base_; @@ -168,7 +158,6 @@ private: /// If the application wants to use an instance of Reactor other /// than the Singleton one. ACE_Reactor *reactor_; - }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/QoS/QoS_Manager.h b/ACE/ace/QoS/QoS_Manager.h index c57eeb6405f..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); @@ -61,7 +60,6 @@ public: ACE_QOS_SESSION_SET qos_session_set (void); private: - /// Set of QoS sessions that this socket has joined. ACE_QOS_SESSION_SET qos_session_set_; }; diff --git a/ACE/ace/QoS/QoS_Session.h b/ACE/ace/QoS/QoS_Session.h index bfa19ef8878..f045e96f718 100644 --- a/ACE/ace/QoS/QoS_Session.h +++ b/ACE/ace/QoS/QoS_Session.h @@ -41,9 +41,7 @@ typedef int ACE_Protocol_ID; */ class ACE_QoS_Export ACE_QoS_Session { - public: - enum RSVP_Event_Type { RSVP_PATH_EVENT, @@ -148,7 +146,6 @@ public: virtual int version (void) = 0; protected: - /// Source port if this is a Sender session. Used for rapi_sender (). u_short source_port_; @@ -172,7 +169,6 @@ protected: RSVP_Event_Type rsvp_event_type_; //Has the last rsvp event that occurred - }; ACE_END_VERSIONED_NAMESPACE_DECL 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_Factory.h b/ACE/ace/QoS/QoS_Session_Factory.h index cdb48235fba..f3d8de8cf05 100644 --- a/ACE/ace/QoS/QoS_Session_Factory.h +++ b/ACE/ace/QoS/QoS_Session_Factory.h @@ -69,7 +69,6 @@ public : int destroy_session (ACE_QoS_Session *qos_session); private: - /// Used by the create_session () to add new sessions to the /// set of sessions created by this factory. int add_session (ACE_QoS_Session *qos_session); @@ -81,7 +80,6 @@ private: /// Unordered set of QoS Sessions. typedef ACE_Unbounded_Set <ACE_QoS_Session *> QOS_SESSION_SET; QOS_SESSION_SET qos_session_set_; - }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/QoS/QoS_Session_Impl.cpp b/ACE/ace/QoS/QoS_Session_Impl.cpp index 28d42bc0b82..dd247f68339 100644 --- a/ACE/ace/QoS/QoS_Session_Impl.cpp +++ b/ACE/ace/QoS/QoS_Session_Impl.cpp @@ -212,7 +212,6 @@ rsvp_callback (rapi_sid_t /* sid */, ACELIB_DEBUG ((LM_DEBUG, "Unknown RSVP Event Received\n")); break; - } // Set the updated ACE_QoS for the RSVP callback argument(QoS session). @@ -305,7 +304,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 +423,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 +656,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/QoS/QoS_Session_Impl.h b/ACE/ace/QoS/QoS_Session_Impl.h index 6fda16087dc..284980b5d26 100644 --- a/ACE/ace/QoS/QoS_Session_Impl.h +++ b/ACE/ace/QoS/QoS_Session_Impl.h @@ -139,7 +139,6 @@ private: /// Set receiving QoS for this RAPI session. int receiving_qos (const ACE_QoS &ace_qos); - }; ACE_END_VERSIONED_NAMESPACE_DECL @@ -159,7 +158,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_QoS_Export ACE_GQoS_Session : public ACE_QoS_Session { public: - /// Default destructor. ~ACE_GQoS_Session (void); diff --git a/ACE/ace/QtReactor/QtReactor.cpp b/ACE/ace/QtReactor/QtReactor.cpp index 99066b8c599..4e1e38f0938 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)); @@ -660,7 +659,6 @@ ACE_QtReactor::wait_for_multiple_events ( nfound = QtWaitForMultipleEvents (static_cast<int> (width), handle_set, max_wait_time); - } while( nfound == -1 && this->handle_error () > 0 ); if (nfound > 0) diff --git a/ACE/ace/RB_Tree.h b/ACE/ace/RB_Tree.h index c8ef635b3a4..83404fe0e3d 100644 --- a/ACE/ace/RB_Tree.h +++ b/ACE/ace/RB_Tree.h @@ -89,7 +89,6 @@ public: void right (ACE_RB_Tree_Node<EXT_ID, INT_ID> * r); private: - /// The key. EXT_ID k_; @@ -180,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>; @@ -563,7 +561,6 @@ protected: int lessthan (const EXT_ID &k1, const EXT_ID &k2); private: - // = Private members. /// Synchronization variable for the MT_SAFE ACE_RB_Tree. @@ -587,9 +584,7 @@ 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); @@ -672,7 +667,6 @@ protected: /// Pointer to the node currently under the iterator. ACE_RB_Tree_Node <EXT_ID, INT_ID> *node_; - }; /** @@ -787,7 +781,6 @@ public: * node, returns 1 if not. */ int is_done (); - }; /** diff --git a/ACE/ace/Reactor_Timer_Interface.h b/ACE/ace/Reactor_Timer_Interface.h index 71202e0ccf7..c1878b292bf 100644 --- a/ACE/ace/Reactor_Timer_Interface.h +++ b/ACE/ace/Reactor_Timer_Interface.h @@ -66,7 +66,6 @@ public: virtual int cancel_timer (ACE_Event_Handler *event_handler, int dont_call_handle_close = 1) = 0; - }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Recyclable.h b/ACE/ace/Recyclable.h index a78da3e16a9..da2dad0e3d3 100644 --- a/ACE/ace/Recyclable.h +++ b/ACE/ace/Recyclable.h @@ -57,7 +57,6 @@ public: void recycle_state (ACE_Recyclable_State new_state); protected: - /// Constructor. ACE_Recyclable (ACE_Recyclable_State initial_state); diff --git a/ACE/ace/Registry.h b/ACE/ace/Registry.h index 893d4ec9b68..1878c304fe7 100644 --- a/ACE/ace/Registry.h +++ b/ACE/ace/Registry.h @@ -42,7 +42,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_Registry { public: - /// International string struct ACE_Export Name_Component { @@ -438,7 +437,6 @@ public: Naming_Context &naming_context (void); private: - /// Set naming_context that the iterator is iterating over void naming_context (Naming_Context& naming_context); diff --git a/ACE/ace/Registry_Name_Space.h b/ACE/ace/Registry_Name_Space.h index ee4ea7418a3..a3b770928ee 100644 --- a/ACE/ace/Registry_Name_Space.h +++ b/ACE/ace/Registry_Name_Space.h @@ -123,7 +123,6 @@ public: void dump () const; private: - /// current context ACE_Registry::Naming_Context context_; }; diff --git a/ACE/ace/Remote_Tokens.h b/ACE/ace/Remote_Tokens.h index e77398412e2..3e6e52a25c8 100644 --- a/ACE/ace/Remote_Tokens.h +++ b/ACE/ace/Remote_Tokens.h @@ -140,7 +140,6 @@ public: void dump () const; protected: - /// If shadows report deadlock, go remote anyway int ignore_shadow_deadlock_; diff --git a/ACE/ace/Reverse_Lock_T.h b/ACE/ace/Reverse_Lock_T.h index 16400fc9305..3348c837b6f 100644 --- a/ACE/ace/Reverse_Lock_T.h +++ b/ACE/ace/Reverse_Lock_T.h @@ -68,7 +68,6 @@ template <class ACE_LOCKING_MECHANISM> class ACE_Reverse_Lock : public ACE_Lock { public: - typedef ACE_LOCKING_MECHANISM ACE_LOCK; // = Initialization/Finalization methods. diff --git a/ACE/ace/SOCK_Dgram_Mcast.cpp b/ACE/ace/SOCK_Dgram_Mcast.cpp index 6398ea640b7..9071ed56933 100644 --- a/ACE/ace/SOCK_Dgram_Mcast.cpp +++ b/ACE/ace/SOCK_Dgram_Mcast.cpp @@ -466,7 +466,6 @@ ACE_SOCK_Dgram_Mcast::subscribe_ifs (const ACE_INET_Addr &mcast_addr, } return 0; - } int @@ -691,8 +690,6 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr, } return 1; - - } else { @@ -743,7 +740,6 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr, } return 1; - } #else /* ACE_HAS_IPV6 */ // Unsubscribe on all local multicast-capable network interfaces, by diff --git a/ACE/ace/SOCK_Dgram_Mcast.h b/ACE/ace/SOCK_Dgram_Mcast.h index 1fc3ab2430c..203d5454e8c 100644 --- a/ACE/ace/SOCK_Dgram_Mcast.h +++ b/ACE/ace/SOCK_Dgram_Mcast.h @@ -98,7 +98,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_SOCK_Dgram_Mcast : public ACE_SOCK_Dgram { public: - /** * @brief Option parameters. * @@ -393,7 +392,6 @@ private: mutable ACE_SDM_LOCK subscription_list_lock_; // (Lock type does not need to support recursive locking.) #endif /* ACE_SOCK_DGRAM_MCAST_DUMPABLE */ - }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/SOCK_SEQPACK_Connector.cpp b/ACE/ace/SOCK_SEQPACK_Connector.cpp index 61572837a45..e2522863ed2 100644 --- a/ACE/ace/SOCK_SEQPACK_Connector.cpp +++ b/ACE/ace/SOCK_SEQPACK_Connector.cpp @@ -37,7 +37,6 @@ ACE_SOCK_SEQPACK_Connector::shared_open (ACE_SOCK_SEQPACK_Association &new_assoc ACE_TRACE ("ACE_SOCK_SEQPACK_Connector::shared_open"); - // Only open a new socket if we don't already have a valid handle. if (new_association.get_handle () == ACE_INVALID_HANDLE && #if defined (ACE_HAS_LKSCTP) diff --git a/ACE/ace/SPIPE_Acceptor.cpp b/ACE/ace/SPIPE_Acceptor.cpp index e3313097ae9..c65f5d89f5c 100644 --- a/ACE/ace/SPIPE_Acceptor.cpp +++ b/ACE/ace/SPIPE_Acceptor.cpp @@ -11,7 +11,6 @@ #endif // ACE_HAS_STREAM_PIPES - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_SPIPE_Acceptor::ACE_SPIPE_Acceptor () diff --git a/ACE/ace/SPIPE_Acceptor.h b/ACE/ace/SPIPE_Acceptor.h index 817c53bcc1a..0f95a384706 100644 --- a/ACE/ace/SPIPE_Acceptor.h +++ b/ACE/ace/SPIPE_Acceptor.h @@ -155,7 +155,6 @@ private: ACE_HANDLE pipe_handle_; int already_connected_; #endif /* ACE_HAS_WIN32_NAMED_PIPES */ - }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/SPIPE_Addr.h b/ACE/ace/SPIPE_Addr.h index bcb2eb510e5..7ad05a91feb 100644 --- a/ACE/ace/SPIPE_Addr.h +++ b/ACE/ace/SPIPE_Addr.h @@ -106,7 +106,6 @@ private: /// Pathname in the file system. ACE_TCHAR rendezvous_[MAXPATHLEN + 1]; - } SPIPE_addr_; // Contents of an SPIPE address. }; diff --git a/ACE/ace/SPIPE_Connector.cpp b/ACE/ace/SPIPE_Connector.cpp index 2bcf32ce187..2f8e4a96269 100644 --- a/ACE/ace/SPIPE_Connector.cpp +++ b/ACE/ace/SPIPE_Connector.cpp @@ -114,7 +114,6 @@ ACE_SPIPE_Connector::connect (ACE_SPIPE_Stream &new_io, } // Get the amount of time remaining for ::WaitNamedPipe. time_out_value = relative_time.msec (); - } // Wait for the named pipe to become available. diff --git a/ACE/ace/SSL/SSL_Asynch_Stream.cpp b/ACE/ace/SSL/SSL_Asynch_Stream.cpp index f084c5375e7..40bdb2869a2 100644 --- a/ACE/ace/SSL/SSL_Asynch_Stream.cpp +++ b/ACE/ace/SSL/SSL_Asynch_Stream.cpp @@ -125,7 +125,6 @@ ACE_SSL_Asynch_Stream::ACE_SSL_Asynch_Stream ( ACE_TEXT ("(%P|%t) ACE_SSL_Asynch_Stream %p\n"), ACE_TEXT ("- cannot allocate new SSL structure") )); - } ACE_SSL_Asynch_Stream::~ACE_SSL_Asynch_Stream (void) diff --git a/ACE/ace/SSL/SSL_Asynch_Stream.h b/ACE/ace/SSL/SSL_Asynch_Stream.h index 65a6d5d6b83..082c022f209 100644 --- a/ACE/ace/SSL/SSL_Asynch_Stream.h +++ b/ACE/ace/SSL/SSL_Asynch_Stream.h @@ -144,7 +144,6 @@ class ACE_SSL_Export ACE_SSL_Asynch_Stream public ACE_Handler { public: - // Use a class/struct to work around scoping // problems for extern "C" free functions with some compilers. For // example, some can't handle diff --git a/ACE/ace/SSL/SSL_SOCK.h b/ACE/ace/SSL/SSL_SOCK.h index d1c68ea5604..2f0f534c7ba 100644 --- a/ACE/ace/SSL/SSL_SOCK.h +++ b/ACE/ace/SSL/SSL_SOCK.h @@ -85,4 +85,3 @@ ACE_END_VERSIONED_NAMESPACE_DECL - diff --git a/ACE/ace/SSL/SSL_SOCK_Acceptor.cpp b/ACE/ace/SSL/SSL_SOCK_Acceptor.cpp index 9ec3d58e9a2..3bedfc4276d 100644 --- a/ACE/ace/SSL/SSL_SOCK_Acceptor.cpp +++ b/ACE/ace/SSL/SSL_SOCK_Acceptor.cpp @@ -157,7 +157,6 @@ ACE_SSL_SOCK_Acceptor::ssl_accept (ACE_SSL_SOCK_Stream &new_stream, } return (status == -1 ? -1 : 0); - } // General purpose routine for accepting new connections. @@ -198,7 +197,6 @@ ACE_SSL_SOCK_Acceptor::accept (ACE_SSL_SOCK_Stream &new_stream, } return 0; - } int diff --git a/ACE/ace/SSL/SSL_SOCK_Connector.cpp b/ACE/ace/SSL/SSL_SOCK_Connector.cpp index 25a32629b21..b628cae9822 100644 --- a/ACE/ace/SSL/SSL_SOCK_Connector.cpp +++ b/ACE/ace/SSL/SSL_SOCK_Connector.cpp @@ -366,7 +366,6 @@ ACE_SSL_SOCK_Connector::complete (ACE_SSL_SOCK_Stream &new_stream, } return 0; - } diff --git a/ACE/ace/SSL/SSL_SOCK_Stream.cpp b/ACE/ace/SSL/SSL_SOCK_Stream.cpp index 113adf25a61..961b889afb6 100644 --- a/ACE/ace/SSL/SSL_SOCK_Stream.cpp +++ b/ACE/ace/SSL/SSL_SOCK_Stream.cpp @@ -257,7 +257,6 @@ ACE_SSL_SOCK_Stream::send (size_t n, ...) const // buffer in the varargs occurred. if (result < data_len) break; - } } diff --git a/ACE/ace/SUN_Proactor.cpp b/ACE/ace/SUN_Proactor.cpp index d9b3ba7b0ab..e257cc22e70 100644 --- a/ACE/ace/SUN_Proactor.cpp +++ b/ACE/ace/SUN_Proactor.cpp @@ -135,7 +135,6 @@ ACE_SUN_Proactor::handle_events_i (ACE_Time_Value *delta) retval += this->process_result_queue (); return retval > 0 ? 1 : 0 ; - } int @@ -143,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_Base.h b/ACE/ace/Select_Reactor_Base.h index edac5a28aa9..aab32a0fa39 100644 --- a/ACE/ace/Select_Reactor_Base.h +++ b/ACE/ace/Select_Reactor_Base.h @@ -107,7 +107,6 @@ public: /// ACE_Event_Handler associated with the ACE_HANDLE. ACE_Event_Handler *event_handler_; - }; /** @@ -409,7 +408,6 @@ private: class ACE_Export ACE_Select_Reactor_Handler_Repository_Iterator { public: - typedef ACE_Select_Reactor_Handler_Repository::map_type::const_iterator const_base_iterator; diff --git a/ACE/ace/Select_Reactor_T.cpp b/ACE/ace/Select_Reactor_T.cpp index 5087c40e605..d8bce72fa15 100644 --- a/ACE/ace/Select_Reactor_T.cpp +++ b/ACE/ace/Select_Reactor_T.cpp @@ -984,7 +984,6 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::is_suspended_i (ACE_HANDLE handl return this->suspend_set_.rd_mask_.is_set (handle) || this->suspend_set_.wr_mask_.is_set (handle) || this->suspend_set_.ex_mask_.is_set (handle); - } // Must be called with locks held @@ -1216,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; } @@ -1500,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 f88ef610fe4..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 @@ -453,7 +452,6 @@ ACE_Service_Config::current (ACE_Service_Gestalt* newcurrent) } - #if (ACE_USES_CLASSIC_SVC_CONF == 0) ACE_Service_Type * ACE_Service_Config::create_service_type (const ACE_TCHAR *n, @@ -507,7 +505,6 @@ ACE_Service_Config::create_service_type_impl (const ACE_TCHAR *name, break; } return stp; - } diff --git a/ACE/ace/Service_Gestalt.cpp b/ACE/ace/Service_Gestalt.cpp index 37c8313b398..fe41085324d 100644 --- a/ACE/ace/Service_Gestalt.cpp +++ b/ACE/ace/Service_Gestalt.cpp @@ -123,7 +123,6 @@ ACE_Service_Type_Dynamic_Guard::~ACE_Service_Type_Dynamic_Guard () } - // ---------------------------------------- ACE_Service_Gestalt::Processed_Static_Svc:: @@ -174,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_; @@ -290,11 +288,9 @@ ACE_Service_Gestalt::load_static_svcs () return -1; } return 0; - } /* load_static_svcs () */ - /// Find a static service descriptor by name int ACE_Service_Gestalt::find_static_svc_descriptor (const ACE_TCHAR* name, @@ -341,7 +337,6 @@ ACE_Service_Gestalt::find_processed_static_svc (const ACE_TCHAR* name) } - /// @brief Captures a list of the direcives processed (explicitely) for this /// Gestalt so that services can be replicated in other repositories /// upon their first initialization. @@ -352,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 @@ -611,7 +605,6 @@ ACE_Service_Gestalt::initialize (const ACE_Service_Type *sr, } return this->initialize_i (sr, parameters); - } /// Dynamically link the shared object file and retrieve a pointer to @@ -984,7 +977,6 @@ ACE_Service_Gestalt::init_svc_conf_file_queue () #endif return 0; - } /* init_svc_conf_file_queue () */ @@ -1087,7 +1079,6 @@ ACE_Service_Gestalt::open_i (const ACE_TCHAR program_name[], ACE_OS::fclose(fp); else add_default = false; - } } @@ -1171,7 +1162,6 @@ ACE_Service_Gestalt::process_commandline_directives () } return result; - } /* process_commandline_directives () */ @@ -1249,7 +1239,6 @@ ACE_Service_Gestalt::parse_args_i (int argc, } /* parse_args_i () */ - // Process service configuration directives from the files queued for // processing int @@ -1277,7 +1266,6 @@ ACE_Service_Gestalt::process_directives (bool ) } return failed; - } /* process_directives () */ // Tidy up and perform last rites on a terminating ACE_Service_Gestalt. diff --git a/ACE/ace/Service_Repository.h b/ACE/ace/Service_Repository.h index 4ed680a955c..ecf6f24f1a9 100644 --- a/ACE/ace/Service_Repository.h +++ b/ACE/ace/Service_Repository.h @@ -138,7 +138,6 @@ public: ACE_ALLOC_HOOK_DECLARE; protected: - friend class ACE_Service_Type_Dynamic_Guard; /// Remove an existing service record. It requires @a sr != 0, which diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp index 04ce825ce6b..6f19185c439 100644 --- a/ACE/ace/Sock_Connect.cpp +++ b/ACE/ace/Sock_Connect.cpp @@ -111,7 +111,6 @@ namespace // Does this box have ipv6 turned on? int ace_ipv6_enabled = -1; - } #else /* ACE_HAS_IPV6 */ # define SIOCGIFCONF_CMD SIOCGIFCONF @@ -1289,7 +1288,6 @@ ACE::get_ip_interfaces (size_t &count, ACE_INET_Addr *&addrs) ++count; } ACE_OS::freeaddrinfo (res0); - } ACE_OS::fclose (fp); } @@ -1471,7 +1469,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/Strategies_T.cpp b/ACE/ace/Strategies_T.cpp index 4afcd174683..1ada5a8543d 100644 --- a/ACE/ace/Strategies_T.cpp +++ b/ACE/ace/Strategies_T.cpp @@ -865,7 +865,6 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::connect_s found); if (result != 0) return result; - } // If it is a new connection, activate it. @@ -932,7 +931,6 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::connect_s if (result != 0) return result; - } // If it is a new connection, activate it. diff --git a/ACE/ace/Strategies_T.h b/ACE/ace/Strategies_T.h index 9e46fd5f228..7cc0ad7341a 100644 --- a/ACE/ace/Strategies_T.h +++ b/ACE/ace/Strategies_T.h @@ -173,7 +173,6 @@ template <class SVC_HANDLER> class ACE_DLL_Strategy : public ACE_Creation_Strategy<SVC_HANDLER> { public: - // Useful STL-style traits. typedef ACE_Creation_Strategy<SVC_HANDLER> base_type; @@ -243,7 +242,6 @@ template <class SVC_HANDLER> class ACE_Concurrency_Strategy { public: - // Useful STL-style traits. typedef typename SVC_HANDLER::addr_type addr_type; typedef SVC_HANDLER handler_type; @@ -271,7 +269,6 @@ public: ACE_ALLOC_HOOK_DECLARE; protected: - /// Flags that are parsed to set options for the connected /// SVC_HANDLER. int flags_; @@ -291,7 +288,6 @@ template <class SVC_HANDLER> class ACE_Reactive_Strategy : public ACE_Concurrency_Strategy <SVC_HANDLER> { public: - // Useful STL-style traits. typedef ACE_Concurrency_Strategy<SVC_HANDLER> base_type; @@ -351,7 +347,6 @@ template <class SVC_HANDLER> class ACE_Thread_Strategy : public ACE_Concurrency_Strategy<SVC_HANDLER> { public: - // Useful STL-style traits. typedef ACE_Concurrency_Strategy<SVC_HANDLER> base_type; @@ -418,7 +413,6 @@ template <class SVC_HANDLER> class ACE_Process_Strategy : public ACE_Concurrency_Strategy<SVC_HANDLER> { public: - // Useful STL-style traits. typedef ACE_Concurrency_Strategy<SVC_HANDLER> base_type; @@ -674,7 +668,6 @@ public: virtual void dump () const; protected: - /// Reactor ACE_Reactor *reactor_; }; @@ -711,7 +704,6 @@ public: virtual void dump () const; protected: - /// Thread Manager ACE_Thread_Manager *thr_mgr_; }; @@ -731,7 +723,6 @@ template <class SVC_HANDLER> class ACE_NOOP_Creation_Strategy : public ACE_Creation_Strategy<SVC_HANDLER> { public: - // Useful STL-style traits. typedef ACE_Creation_Strategy<SVC_HANDLER> base_type; @@ -755,7 +746,6 @@ class ACE_NOOP_Concurrency_Strategy : public ACE_Concurrency_Strategy<SVC_HANDLER> { public: - // Useful STL-style traits. typedef ACE_Concurrency_Strategy<SVC_HANDLER> base_type; @@ -812,7 +802,6 @@ class ACE_Cached_Connect_Strategy public ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2> { public: - // Useful STL-style traits. typedef ACE_Creation_Strategy<SVC_HANDLER> creation_strategy_type; @@ -940,7 +929,6 @@ public: virtual ACE_Concurrency_Strategy<SVC_HANDLER> *concurrency_strategy () const; protected: - /// Creates a new connection. virtual int new_connection (SVC_HANDLER *&sh, const ACE_PEER_CONNECTOR_ADDR &remote_addr, diff --git a/ACE/ace/Stream.cpp b/ACE/ace/Stream.cpp index 31bb58aff0c..0079d50883a 100644 --- a/ACE/ace/Stream.cpp +++ b/ACE/ace/Stream.cpp @@ -571,7 +571,6 @@ ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::unlink_i (void) other_tail = other_tail->next (); other_tail->writer ()->next (this->linked_us_->stream_tail_->writer ()); - } // Make sure the other side is also aware that it's been unlinked! diff --git a/ACE/ace/Svc_Conf_Lexer.cpp b/ACE/ace/Svc_Conf_Lexer.cpp index 321897c584e..8406c152ef7 100644 --- a/ACE/ace/Svc_Conf_Lexer.cpp +++ b/ACE/ace/Svc_Conf_Lexer.cpp @@ -119,7 +119,6 @@ ace_yylex (YYSTYPE *ace_yylval, void *YYLEX_PARAM) -1)); return ACE_Svc_Conf_Lexer::yylex (ace_yylval, ACE_SVC_CONF_PARAM); - } void diff --git a/ACE/ace/Svc_Conf_Param.h b/ACE/ace/Svc_Conf_Param.h index 4b03076bb55..fff69f2dcb7 100644 --- a/ACE/ace/Svc_Conf_Param.h +++ b/ACE/ace/Svc_Conf_Param.h @@ -52,7 +52,6 @@ extern void ace_yy_delete_buffer (ace_yy_buffer_state *buffer); class ACE_Svc_Conf_Param { public: - enum SVC_CONF_PARAM_TYPE { /// The lexer will scan a file containing one or more directives. @@ -92,7 +91,6 @@ public: } public: - union { /// FILE stream from which directives will be scanned and parsed. @@ -100,7 +98,6 @@ public: /// String containing directive that will be scanned and parsed. const ACE_TCHAR *directive; - } source; /// Discriminant use to determine which union member to use. diff --git a/ACE/ace/Svc_Conf_Token_Table.h b/ACE/ace/Svc_Conf_Token_Table.h index 78df46db92e..7aadffd3ba4 100644 --- a/ACE/ace/Svc_Conf_Token_Table.h +++ b/ACE/ace/Svc_Conf_Token_Table.h @@ -73,7 +73,6 @@ - #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef int YYSTYPE; # define ace_yystype YYSTYPE /* obsolescent; will be withdrawn */ diff --git a/ACE/ace/Svc_Conf_y.cpp b/ACE/ace/Svc_Conf_y.cpp index 3ca0d39ae80..bd9a781b839 100644 --- a/ACE/ace/Svc_Conf_y.cpp +++ b/ACE/ace/Svc_Conf_y.cpp @@ -59,7 +59,6 @@ #define YYLSP_NEEDED 0 - /* Tokens. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE @@ -100,7 +99,6 @@ - /* Copy the first part of user declarations. */ @@ -173,7 +171,6 @@ typedef int YYSTYPE; #endif - /* Copy the second part of user declarations. */ @@ -884,7 +881,6 @@ int ace_yydebug; #endif - #if YYERROR_VERBOSE # ifndef ace_yystrlen @@ -1121,7 +1117,6 @@ ace_yydestruct (ace_yymsg, ace_yytype, ace_yyvaluep) switch (ace_yytype) { - default: break; } @@ -1148,7 +1143,6 @@ int ace_yyparse (); - /*----------. | ace_yyparse. | `----------*/ @@ -1217,7 +1211,6 @@ int ace_yynerrs; YYSTYPE *ace_yyvsp; - #define YYPOPSTACK(N) (ace_yyvsp -= (N), ace_yyssp -= (N)) YYSIZE_T ace_yystacksize = YYINITDEPTH; @@ -1771,7 +1764,6 @@ ace_yyerrlab: } - if (ace_yyerrstatus == 3) { /* If just tried and failed to reuse look-ahead token after an @@ -1914,7 +1906,6 @@ ace_yyreturn: - ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Prints the error string to standard output. Cleans up the error diff --git a/ACE/ace/Svc_Handler.h b/ACE/ace/Svc_Handler.h index f4db11ea9a5..8ee46fe75d2 100644 --- a/ACE/ace/Svc_Handler.h +++ b/ACE/ace/Svc_Handler.h @@ -212,7 +212,6 @@ public: void dump () const; public: - // = The following methods are not suppose to be public. // Because friendship is *not* inherited in C++, these methods have diff --git a/ACE/ace/System_Time.cpp b/ACE/ace/System_Time.cpp index aa22dbd757f..af0f79c5264 100644 --- a/ACE/ace/System_Time.cpp +++ b/ACE/ace/System_Time.cpp @@ -9,7 +9,6 @@ #include "ace/OS_NS_time.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_System_Time::ACE_System_Time (const ACE_TCHAR *poolname) 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/TP_Reactor.h b/ACE/ace/TP_Reactor.h index 3bf1e09a5c6..bb576733de2 100644 --- a/ACE/ace/TP_Reactor.h +++ b/ACE/ace/TP_Reactor.h @@ -87,7 +87,6 @@ private: class ACE_TP_Token_Guard { public: - /// Constructor that will grab the token for us ACE_TP_Token_Guard (ACE_Select_Reactor_Token &token); @@ -122,7 +121,6 @@ private: ACE_TP_Token_Guard &operator= (ACE_TP_Token_Guard &&) = delete; private: - /// The Select Reactor token. ACE_Select_Reactor_Token &token_; @@ -172,7 +170,6 @@ private: class ACE_Export ACE_TP_Reactor : public ACE_Select_Reactor { public: - /// Initialize ACE_TP_Reactor with the default size. ACE_TP_Reactor (ACE_Sig_Handler * = 0, ACE_Timer_Queue * = 0, @@ -282,7 +279,6 @@ protected: ACE_Event_Handler *eh, ACE_EH_PTMF callback); private: - /// Get the handle of the notify pipe from the ready set if there is /// an event in the notify pipe. ACE_HANDLE get_notify_handle (void); diff --git a/ACE/ace/TSS_Adapter.h b/ACE/ace/TSS_Adapter.h index f5dbc99fd0f..b1a35bc48ef 100644 --- a/ACE/ace/TSS_Adapter.h +++ b/ACE/ace/TSS_Adapter.h @@ -44,7 +44,6 @@ public: ACE_ALLOC_HOOK_DECLARE; //private: - /// The real TS object. void * const ts_obj_; diff --git a/ACE/ace/Thread_Exit.h b/ACE/ace/Thread_Exit.h index daebbb4fe39..0f6459c37a4 100644 --- a/ACE/ace/Thread_Exit.h +++ b/ACE/ace/Thread_Exit.h @@ -101,7 +101,6 @@ public: private: /// Holds the underlying instance. ACE_Thread_Exit *instance_; - }; ACE_END_VERSIONED_NAMESPACE_DECL 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/Timeprobe_T.cpp b/ACE/ace/Timeprobe_T.cpp index a88eb00bba4..c67edb60607 100644 --- a/ACE/ace/Timeprobe_T.cpp +++ b/ACE/ace/Timeprobe_T.cpp @@ -33,7 +33,6 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::ACE_Timeprobe_Ex (u_long size) this->max_size_); //FUZZ: enable check_for_lack_ACE_OS this->timeprobes_ = temp; - } template <class ACE_LOCK, class ALLOCATOR> @@ -56,7 +55,6 @@ ACE_Timeprobe_Ex (ALLOCATOR *allocator, this->max_size_); //FUZZ: enable check_for_lack_ACE_OS this->timeprobes_ = temp; - } template <class ACE_LOCK, class ALLOCATOR> diff --git a/ACE/ace/Timeprobe_T.h b/ACE/ace/Timeprobe_T.h index 0512060af6f..9277897b5a3 100644 --- a/ACE/ace/Timeprobe_T.h +++ b/ACE/ace/Timeprobe_T.h @@ -59,7 +59,6 @@ template <class ACE_LOCK, class ALLOCATOR> class ACE_Timeprobe_Ex { public: - /// Self typedef ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR> SELF; @@ -134,7 +133,6 @@ public: u_long current_size (void); protected: - /// Obtain an allocator pointer. If there is no allocator stored in /// the instance, the singleton allocator in the current process is used. ALLOCATOR * allocator (void); diff --git a/ACE/ace/Timer_Hash_T.h b/ACE/ace/Timer_Hash_T.h index fa0a7337ef0..6c59b16d28f 100644 --- a/ACE/ace/Timer_Hash_T.h +++ b/ACE/ace/Timer_Hash_T.h @@ -276,7 +276,6 @@ protected: virtual void free_node (ACE_Timer_Node_T<TYPE> *); private: - /** * Schedule @a type that will expire at @a future_time, * which is specified in absolute time. If it expires then @a act is diff --git a/ACE/ace/Timer_Heap_T.h b/ACE/ace/Timer_Heap_T.h index 4dcd896665d..62d57e72b7c 100644 --- a/ACE/ace/Timer_Heap_T.h +++ b/ACE/ace/Timer_Heap_T.h @@ -193,7 +193,6 @@ public: ACE_ALLOC_HOOK_DECLARE; protected: - /** * Schedule a timer that may optionally auto-reset. * Schedule @a type that will expire at @a future_time, diff --git a/ACE/ace/Timer_List_T.cpp b/ACE/ace/Timer_List_T.cpp index 5a9c27d8152..5705da077ff 100644 --- a/ACE/ace/Timer_List_T.cpp +++ b/ACE/ace/Timer_List_T.cpp @@ -10,7 +10,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ - // Default Constructor template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> diff --git a/ACE/ace/Timer_Queue_Adapters.h b/ACE/ace/Timer_Queue_Adapters.h index 90104b4a27d..94f41f1333c 100644 --- a/ACE/ace/Timer_Queue_Adapters.h +++ b/ACE/ace/Timer_Queue_Adapters.h @@ -201,7 +201,6 @@ public: # endif /* ACE_HAS_DEFERRED_TIMER_COMMANDS */ private: - # if defined (ACE_HAS_DEFERRED_TIMER_COMMANDS) /// Dispatches all command objects enqueued in the most /// recent event handler context. diff --git a/ACE/ace/Timer_Queue_T.cpp b/ACE/ace/Timer_Queue_T.cpp index 94600bb5800..923cae1b7b8 100644 --- a/ACE/ace/Timer_Queue_T.cpp +++ b/ACE/ace/Timer_Queue_T.cpp @@ -286,7 +286,6 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::expire (const ACE_Time_ this->postinvoke (info, cur_time, upcall_act); ++number_of_timers_expired; - } ACE_UNUSED_ARG (result); 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/TkReactor/TkReactor.cpp b/ACE/ace/TkReactor/TkReactor.cpp index 13c5904ccda..be79fff1826 100644 --- a/ACE/ace/TkReactor/TkReactor.cpp +++ b/ACE/ace/TkReactor/TkReactor.cpp @@ -65,7 +65,6 @@ ACE_TkReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_s nfound = TkWaitForMultipleEvents (width, handle_set, max_wait_time); - } while (nfound == -1 && this->handle_error () > 0); if (nfound > 0) diff --git a/ACE/ace/Token_Collection.h b/ACE/ace/Token_Collection.h index 3323aad0031..83b0ecbf49d 100644 --- a/ACE/ace/Token_Collection.h +++ b/ACE/ace/Token_Collection.h @@ -193,7 +193,6 @@ public: virtual const ACE_TCHAR *name () const; protected: - typedef ACE_Token_Name TOKEN_NAME; /// COLLECTION maintains a mapping from token names to ACE_Tokens* diff --git a/ACE/ace/Token_Invariants.h b/ACE/ace/Token_Invariants.h index 209fb1c32a9..959281cbb37 100644 --- a/ACE/ace/Token_Invariants.h +++ b/ACE/ace/Token_Invariants.h @@ -126,7 +126,6 @@ private: class ACE_Export ACE_Token_Invariant_Manager : public ACE_Cleanup { public: - /// Singleton access point. static ACE_Token_Invariant_Manager *instance (void); 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/UUID.h b/ACE/ace/UUID.h index 33f5018fcda..664e25259ee 100644 --- a/ACE/ace/UUID.h +++ b/ACE/ace/UUID.h @@ -199,7 +199,6 @@ namespace ACE_Utils class ACE_Export UUID_Generator { public: - enum {ACE_UUID_CLOCK_SEQ_MASK = 0x3FFF}; /// Default constructor. diff --git a/ACE/ace/Value_Ptr.h b/ACE/ace/Value_Ptr.h index 2f558b98c15..220184be263 100644 --- a/ACE/ace/Value_Ptr.h +++ b/ACE/ace/Value_Ptr.h @@ -129,7 +129,6 @@ namespace ACE /// Object owned by this @c Value_Ptr. T * p_; }; - } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Vector_T.h b/ACE/ace/Vector_T.h index e4cf710602e..eed72a38973 100644 --- a/ACE/ace/Vector_T.h +++ b/ACE/ace/Vector_T.h @@ -199,7 +199,6 @@ public: ///} protected: - /** * Dynamic size (length) of the vector. */ diff --git a/ACE/ace/WFMO_Reactor.cpp b/ACE/ace/WFMO_Reactor.cpp index c08b0e744de..193f1a9a8f0 100644 --- a/ACE/ace/WFMO_Reactor.cpp +++ b/ACE/ace/WFMO_Reactor.cpp @@ -1484,7 +1484,6 @@ ACE_WFMO_Reactor::mask_ops_i (ACE_HANDLE io_handle, } - int ACE_WFMO_Reactor_Handler_Repository::modify_network_events_i (ACE_HANDLE io_handle, ACE_Reactor_Mask new_masks, diff --git a/ACE/ace/WFMO_Reactor.h b/ACE/ace/WFMO_Reactor.h index 92eed922bb9..85dd128a1ab 100644 --- a/ACE/ace/WFMO_Reactor.h +++ b/ACE/ace/WFMO_Reactor.h @@ -469,7 +469,6 @@ protected: /// Number of records to be deleted size_t handles_to_be_deleted_; - }; /** 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 42d91ee4ca5..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); @@ -1147,7 +1145,6 @@ class ACE_Export ACE_WIN32_Asynch_Connect_Result : public virtual ACE_Asynch_Con friend class ACE_WIN32_Proactor; public: - /// I/O handle for the connection. ACE_HANDLE connect_handle () const; @@ -1227,7 +1224,6 @@ class ACE_Export ACE_WIN32_Asynch_Connect : public ACE_Event_Handler { public: - /// Constructor. ACE_WIN32_Asynch_Connect (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/ace/XML_Utils/XercesString.h b/ACE/ace/XML_Utils/XercesString.h index 1915832d503..8e7ebd84ea8 100644 --- a/ACE/ace/XML_Utils/XercesString.h +++ b/ACE/ace/XML_Utils/XercesString.h @@ -62,7 +62,6 @@ namespace XML /// Release the held string and free its memory. void reset (void); private: - XMLCh* _wstr; // Internal representation }; diff --git a/ACE/ace/XtReactor/XtReactor.cpp b/ACE/ace/XtReactor/XtReactor.cpp index 945562c3dac..c1d690e0fe6 100644 --- a/ACE/ace/XtReactor/XtReactor.cpp +++ b/ACE/ace/XtReactor/XtReactor.cpp @@ -67,7 +67,6 @@ ACE_XtReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_s nfound = XtWaitForMultipleEvents (width, handle_set, max_wait_time); - } while (nfound == -1 && this->handle_error () > 0); if (nfound > 0) diff --git a/ACE/apps/Gateway/Gateway/Config_Files.h b/ACE/apps/Gateway/Gateway/Config_Files.h index d6204ff21de..6bcddec6f05 100644 --- a/ACE/apps/Gateway/Gateway/Config_Files.h +++ b/ACE/apps/Gateway/Gateway/Config_Files.h @@ -64,7 +64,6 @@ public: /// Read in a <Connection_Config_Info> entry. virtual FPRT::Return_Type read_entry (Connection_Config_Info &entry, int &line_number); - }; /** diff --git a/ACE/apps/Gateway/Gateway/Connection_Handler_Connector.h b/ACE/apps/Gateway/Gateway/Connection_Handler_Connector.h index 26e3283c777..b5ef112aecd 100644 --- a/ACE/apps/Gateway/Gateway/Connection_Handler_Connector.h +++ b/ACE/apps/Gateway/Gateway/Connection_Handler_Connector.h @@ -36,7 +36,6 @@ public: // Initiate (or reinitiate) a connection on the Connection_Handler. int initiate_connection (Connection_Handler *, ACE_Synch_Options & = ACE_Synch_Options::synch); - }; #endif /* _IO_HANDLER_CONNECTOR */ diff --git a/ACE/apps/Gateway/Gateway/Event_Channel.cpp b/ACE/apps/Gateway/Gateway/Event_Channel.cpp index 45bece8d553..f192bd3a8c8 100644 --- a/ACE/apps/Gateway/Gateway/Event_Channel.cpp +++ b/ACE/apps/Gateway/Gateway/Event_Channel.cpp @@ -158,7 +158,6 @@ Event_Channel::subscription_event (ACE_Message_Block *data) "(%t) consumers_[%d] = %d\n", i, subscription->consumers_[i])); - } void diff --git a/ACE/apps/Gateway/Gateway/File_Parser.h b/ACE/apps/Gateway/Gateway/File_Parser.h index 141d051e055..2ca3f86e79c 100644 --- a/ACE/apps/Gateway/Gateway/File_Parser.h +++ b/ACE/apps/Gateway/Gateway/File_Parser.h @@ -47,7 +47,6 @@ template <class ENTRY> class File_Parser { public: - /// Destructor. virtual ~File_Parser (void); diff --git a/ACE/apps/Gateway/Gateway/Options.cpp b/ACE/apps/Gateway/Gateway/Options.cpp index cccc5a3a37b..a0f8edcf8ab 100644 --- a/ACE/apps/Gateway/Gateway/Options.cpp +++ b/ACE/apps/Gateway/Gateway/Options.cpp @@ -9,7 +9,6 @@ #include "ace/os_include/os_fcntl.h" - // Static initialization. Options *Options::instance_ = 0; diff --git a/ACE/apps/JAWS/clients/Blobby/Blob.cpp b/ACE/apps/JAWS/clients/Blobby/Blob.cpp index 0b33cf9bc68..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; @@ -36,7 +35,6 @@ ACE_Blob::read (ACE_Message_Block *mb, size_t length, size_t offset) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_Blob::read():Connector error"), -1); return blob_reader.byte_count (); - } // write to connection length bytes from offset, into Message block @@ -44,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; @@ -61,13 +58,11 @@ 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_); filename_ = 0; } return 0; - } diff --git a/ACE/apps/JAWS/clients/Blobby/Blob.h b/ACE/apps/JAWS/clients/Blobby/Blob.h index 6682be7b06d..9b8bb296c93 100644 --- a/ACE/apps/JAWS/clients/Blobby/Blob.h +++ b/ACE/apps/JAWS/clients/Blobby/Blob.h @@ -81,7 +81,6 @@ private: /// The connector endpoint to initiate the client connection ACE_Connector<ACE_Blob_Handler, ACE_SOCK_CONNECTOR> connector_; - }; #endif /* ACE_BLOB_H */ diff --git a/ACE/apps/JAWS/clients/Blobby/Blob_Handler.cpp b/ACE/apps/JAWS/clients/Blobby/Blob_Handler.cpp index 4d6e617024c..a4de50b048b 100644 --- a/ACE/apps/JAWS/clients/Blobby/Blob_Handler.cpp +++ b/ACE/apps/JAWS/clients/Blobby/Blob_Handler.cpp @@ -40,7 +40,6 @@ ACE_Blob_Handler::open (void *) if (this->receive_reply () != 0) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_Blob_Handler::open():receive_reply failed"), -1); return 0; - } // No-op 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/clients/Caching/URL_Array_Helper.cpp b/ACE/apps/JAWS/clients/Caching/URL_Array_Helper.cpp index 19df1267a8c..62cf3c41be8 100644 --- a/ACE/apps/JAWS/clients/Caching/URL_Array_Helper.cpp +++ b/ACE/apps/JAWS/clients/Caching/URL_Array_Helper.cpp @@ -35,5 +35,4 @@ size_t ace_array_decode (void *buf, T &x) } - #endif /* ACE_URL_ARRAY_HELPER_C */ diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/bench.h b/ACE/apps/JAWS/clients/WebSTONE/src/bench.h index cc196ef09ac..8934f6247c8 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/bench.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/bench.h @@ -208,7 +208,6 @@ typedef struct page_list { }page_list_t; - /* shared variables */ extern THREAD FILE *debugfile; extern int debug; diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/cinfo.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/cinfo.h index 6cfdbd6c2c6..73a3d867c81 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/cinfo.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/cinfo.h @@ -20,12 +20,10 @@ */ - #ifndef CINFO_H #define CINFO_H - /* ------------------------------ Constants ------------------------------- */ diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/ereport.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/ereport.h index 8fe585f9e00..2052552a3c0 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/ereport.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/ereport.h @@ -83,7 +83,6 @@ #define ERRORS_TO_SYSLOG -1 - /* ------------------------------ Prototypes ------------------------------ */ diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/eventlog.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/eventlog.h index 5146d18add1..a90e680b493 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/eventlog.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/eventlog.h @@ -53,7 +53,3 @@ BOOL CALLBACK ErrorDialogProc( - - - - diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/minissl.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/minissl.h index 4eb09688d4c..f0bd5156d57 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/minissl.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/minissl.h @@ -11,7 +11,6 @@ /* ------------------------------------------------------------------------ */ - /* Prototypes for SSL I/O functions */ extern int SSL_Close(int); extern int SSL_Socket(int, int, int); diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/net.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/net.h index 349018ba048..b8191b7bd8a 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/net.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/net.h @@ -58,7 +58,6 @@ extern int net_enabledns; - /* ------------------------------ Data types ------------------------------ */ diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/session.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/session.h index 4531a34e966..3e4472ea1f4 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/session.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/session.h @@ -33,7 +33,6 @@ /* ------------------------------ Structures ------------------------------ */ - #define SESSION_HASHSIZE 5 diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/shexp.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/shexp.h index 94ea72c8667..50ec8eb0528 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/shexp.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/base/shexp.h @@ -50,7 +50,6 @@ #include <string.h> /* strlen */ - /* --------------------------- Public routines ---------------------------- */ diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/conf.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/conf.h index 79a8b84dbbc..1ff7f63e459 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/conf.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/conf.h @@ -59,7 +59,6 @@ #endif - /* ------------------------------- Globals -------------------------------- */ diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/httpact.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/httpact.h index 25d01a16927..9c776eaaa9a 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/httpact.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/httpact.h @@ -84,7 +84,6 @@ int servact_handle_processed(Session *sn, Request *rq); char *servact_translate_uri(char *uri, Session *sn); - #ifdef MCC_PROXY /* ----------------------- proxy specific prototypes ---------------------- */ diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/object.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/object.h index 41719e77038..a000b6ce566 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/object.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/object.h @@ -36,7 +36,6 @@ - /* ------------------------------ Constants ------------------------------- */ @@ -48,7 +47,6 @@ /* ------------------------------ Structures ------------------------------ */ - /* * Hierarchy of httpd_object * @@ -105,7 +103,6 @@ typedef struct { - /* ------------------------------ Prototypes ------------------------------ */ diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/objset.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/objset.h index 6022433e27d..35941baab35 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/objset.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/objset.h @@ -38,7 +38,6 @@ #include "frame/object.h" - /* ------------------------------ Constants ------------------------------- */ diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/req.h b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/req.h index e198ce22df8..820fccc74aa 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/req.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/nsapi-includes/frame/req.h @@ -30,7 +30,6 @@ #include <sys/stat.h> - /* ------------------------------ Constants ------------------------------- */ @@ -55,7 +54,6 @@ #define REQ_EXIT -3 - /* ------------------------------ Structures ------------------------------ */ diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/sysdep.h b/ACE/apps/JAWS/clients/WebSTONE/src/sysdep.h index 4749c2e7949..147a52ac547 100644 --- a/ACE/apps/JAWS/clients/WebSTONE/src/sysdep.h +++ b/ACE/apps/JAWS/clients/WebSTONE/src/sysdep.h @@ -68,7 +68,6 @@ typedef unsigned short ushort; #define MAXPATHLEN 512 - #else /* not WIN32 */ #define NETREAD(sock, buf, len) read(sock, buf, len) #define NETWRITE(sock, buf, len) write(sock, buf, len) 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_Helpers.h b/ACE/apps/JAWS/server/HTTP_Helpers.h index 0f22d53ddee..132a83f7c6b 100644 --- a/ACE/apps/JAWS/server/HTTP_Helpers.h +++ b/ACE/apps/JAWS/server/HTTP_Helpers.h @@ -26,7 +26,6 @@ class HTTP_Helper { public: - // Convert and HTTP-date into a time_t static time_t HTTP_mktime (const char *httpdate); @@ -45,7 +44,6 @@ public: static char *HTTP_encode_base64 (char *data); private: - static int fixyear (int year); private: 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/server/HTTP_Response.h b/ACE/apps/JAWS/server/HTTP_Response.h index 82848cf290a..1fc44e35790 100644 --- a/ACE/apps/JAWS/server/HTTP_Response.h +++ b/ACE/apps/JAWS/server/HTTP_Response.h @@ -42,7 +42,6 @@ public: const char *log_message); private: - /// Called by process_request when the request is a normal request. void normal_response (void); @@ -50,7 +49,6 @@ private: void cgi_response (void); private: - /// static version of process_request, just in case. static void process_request (HTTP_Response &response); diff --git a/ACE/apps/JAWS/server/JAWS_IO.h b/ACE/apps/JAWS/server/JAWS_IO.h index b0010b73a67..83590805a46 100644 --- a/ACE/apps/JAWS/server/JAWS_IO.h +++ b/ACE/apps/JAWS/server/JAWS_IO.h @@ -84,7 +84,6 @@ protected: class JAWS_IO_Handler { public: - /// Destructor. virtual ~JAWS_IO_Handler (void); @@ -123,7 +122,6 @@ public: /// This method is called by the IO class when the error message has /// been delivered to the client. virtual void error_message_complete (void) = 0; - }; /** 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 f1a5d068ce1..d78e95ce476 100644 --- a/ACE/apps/JAWS/stress_testing/cp.cpp +++ b/ACE/apps/JAWS/stress_testing/cp.cpp @@ -1,7 +1,5 @@ #include "cp.h" Client_Parameters::Client_Parameters(int i) { - id = i; - } diff --git a/ACE/apps/JAWS/stress_testing/global.h b/ACE/apps/JAWS/stress_testing/global.h index ae7977c3929..b8ec2700295 100644 --- a/ACE/apps/JAWS/stress_testing/global.h +++ b/ACE/apps/JAWS/stress_testing/global.h @@ -24,6 +24,3 @@ - - - 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 b2b29f5b8f4..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,18 +65,14 @@ 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 0de9231957b..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); @@ -45,7 +44,6 @@ char *URL::get_filename(void) { - void cleanup(void) { ACE_OS::unlink(TEMPORARY_FILE_NAME); ACE_OS::unlink(INCOMING_FILE_NAME); diff --git a/ACE/apps/JAWS/stress_testing/util.h b/ACE/apps/JAWS/stress_testing/util.h index ea5b29da104..c9e509baae7 100644 --- a/ACE/apps/JAWS/stress_testing/util.h +++ b/ACE/apps/JAWS/stress_testing/util.h @@ -3,9 +3,7 @@ #ifndef _D_URL #define _D_URL class URL { - public: - URL(char *buffer); char *get_protocol(); @@ -29,4 +27,3 @@ int copier(connection in); - diff --git a/ACE/apps/JAWS2/HTTPU/http_base.h b/ACE/apps/JAWS2/HTTPU/http_base.h index e028885a382..eedda2e4af5 100644 --- a/ACE/apps/JAWS2/HTTPU/http_base.h +++ b/ACE/apps/JAWS2/HTTPU/http_base.h @@ -15,7 +15,6 @@ class HTTPU_Export HTTP_Base : public HTTP_SCode_Base { public: - HTTP_Base (void); virtual ~HTTP_Base (void); @@ -40,7 +39,6 @@ public: void dump (void); protected: - virtual void parse_line (void) = 0; // Hook into the receive function to do specialized parsing of initial line. // Sets the status_ variable. @@ -61,7 +59,6 @@ protected: // Return 1 if line successfully parsed. protected: - int status_; char *line_; int deliver_state_; @@ -70,7 +67,6 @@ protected: JAWS_Header_Table_Iterator iter_; ACE_Message_Block *mb_; ACE_Message_Block payload_; - }; diff --git a/ACE/apps/JAWS2/HTTPU/http_headers.h b/ACE/apps/JAWS2/HTTPU/http_headers.h index 3a48b23848d..0d4a45133dd 100644 --- a/ACE/apps/JAWS2/HTTPU/http_headers.h +++ b/ACE/apps/JAWS2/HTTPU/http_headers.h @@ -133,11 +133,9 @@ public: static const int &NUM_HEADER_STRINGS; protected: - const HTTP_Hdr_Node &hcode (int type) const; protected: - HTTP_Header_Nodes *header_nodes_; }; diff --git a/ACE/apps/JAWS2/HTTPU/http_request.h b/ACE/apps/JAWS2/HTTPU/http_request.h index 64a9e6ee493..82996bf32dc 100644 --- a/ACE/apps/JAWS2/HTTPU/http_request.h +++ b/ACE/apps/JAWS2/HTTPU/http_request.h @@ -35,7 +35,6 @@ public: void dump (void); protected: - virtual void parse_line (void); virtual int espouse_line (void); virtual void set_status (int); diff --git a/ACE/apps/JAWS2/HTTPU/http_response.h b/ACE/apps/JAWS2/HTTPU/http_response.h index abb28aa66c4..0d23fbdf7a0 100644 --- a/ACE/apps/JAWS2/HTTPU/http_response.h +++ b/ACE/apps/JAWS2/HTTPU/http_response.h @@ -29,7 +29,6 @@ public: void dump (void); protected: - virtual void parse_line (void); virtual int espouse_line (void); diff --git a/ACE/apps/JAWS2/HTTPU/http_status.h b/ACE/apps/JAWS2/HTTPU/http_status.h index 312ff36d2d0..209e5e6092c 100644 --- a/ACE/apps/JAWS2/HTTPU/http_status.h +++ b/ACE/apps/JAWS2/HTTPU/http_status.h @@ -70,12 +70,10 @@ class HTTPU_Export HTTP_SCode : public HTTP_SCode_Base friend class ACE_Singleton<HTTP_SCode, ACE_SYNCH_MUTEX>; protected: - HTTP_SCode (void); ~HTTP_SCode (void); public: - const char * operator[] (int) const; // Return the reason string corresponding to a status code number. diff --git a/ACE/apps/JAWS2/HTTPU/parse_http_request.h b/ACE/apps/JAWS2/HTTPU/parse_http_request.h index 5943cbc6fdb..c1af6a84f30 100644 --- a/ACE/apps/JAWS2/HTTPU/parse_http_request.h +++ b/ACE/apps/JAWS2/HTTPU/parse_http_request.h @@ -35,7 +35,6 @@ public: void dump (void); private: - HTTP_Hdr_Node *method_; int major_version_; int minor_version_; @@ -43,7 +42,6 @@ private: char *url_; char *request_; int error_; - }; #if defined (ACE_HAS_INLINED_OSCALLS) diff --git a/ACE/apps/JAWS2/HTTPU/parse_http_response.h b/ACE/apps/JAWS2/HTTPU/parse_http_response.h index eefd0473e47..ccbd0a0b5c0 100644 --- a/ACE/apps/JAWS2/HTTPU/parse_http_response.h +++ b/ACE/apps/JAWS2/HTTPU/parse_http_response.h @@ -31,7 +31,6 @@ public: // 0 -> ok private: - int code_; char *code_str_; int major_version_; @@ -39,7 +38,6 @@ private: char *version_; char *response_; int error_; - }; #if defined (ACE_HAS_INLINED_OSCALLS) diff --git a/ACE/apps/JAWS2/HTTP_10.cpp b/ACE/apps/JAWS2/HTTP_10.cpp index e3d7e08a06b..632fbfc7d08 100644 --- a/ACE/apps/JAWS2/HTTP_10.cpp +++ b/ACE/apps/JAWS2/HTTP_10.cpp @@ -3,7 +3,6 @@ #include "JAWS/JAWS.h" - char * JAWS_HTTP_10_Helper::HTTP_decode_string (char *path) { diff --git a/ACE/apps/JAWS2/HTTP_10.h b/ACE/apps/JAWS2/HTTP_10.h index ecd6996d6f2..38cbd6b9778 100644 --- a/ACE/apps/JAWS2/HTTP_10.h +++ b/ACE/apps/JAWS2/HTTP_10.h @@ -35,7 +35,6 @@ public: virtual ~JAWS_HTTP_10_Parse_Task (void); virtual int handle_put (JAWS_Data_Block *data, ACE_Time_Value *tv); - }; // Write the response @@ -57,10 +56,8 @@ class JAWS_HTTP_10_Helper // Static functions to enhance the lives of HTTP programmers everywhere. { public: - static char *HTTP_decode_string (char *path); // Decode '%' escape codes in a URI - }; #endif /* !defined (JAWS_HTTP_10_H) */ diff --git a/ACE/apps/JAWS2/HTTP_10_Parse.cpp b/ACE/apps/JAWS2/HTTP_10_Parse.cpp index 5e137cf6d4b..54f92bdde75 100644 --- a/ACE/apps/JAWS2/HTTP_10_Parse.cpp +++ b/ACE/apps/JAWS2/HTTP_10_Parse.cpp @@ -8,7 +8,6 @@ #include "HTTP_10_Request.h" - // --------------- PARSE TASK ---------------------- JAWS_HTTP_10_Parse_Task::JAWS_HTTP_10_Parse_Task (void) diff --git a/ACE/apps/JAWS2/HTTP_10_Read.cpp b/ACE/apps/JAWS2/HTTP_10_Read.cpp index b5fd077a247..06b73ac74fc 100644 --- a/ACE/apps/JAWS2/HTTP_10_Read.cpp +++ b/ACE/apps/JAWS2/HTTP_10_Read.cpp @@ -6,7 +6,6 @@ #include "JAWS/Policy.h" - // --------------- READ TASK ---------------------- JAWS_HTTP_10_Read_Task::JAWS_HTTP_10_Read_Task (void) diff --git a/ACE/apps/JAWS2/HTTP_10_Request.cpp b/ACE/apps/JAWS2/HTTP_10_Request.cpp index d72e08c58a8..3f82897994b 100644 --- a/ACE/apps/JAWS2/HTTP_10_Request.cpp +++ b/ACE/apps/JAWS2/HTTP_10_Request.cpp @@ -3,7 +3,6 @@ #include "ace/OS_NS_pwd.h" - static int dummy; JAWS_HTTP_10_Request::JAWS_HTTP_10_Request (void) diff --git a/ACE/apps/JAWS2/HTTP_10_Request.h b/ACE/apps/JAWS2/HTTP_10_Request.h index db54acefafc..780300847c1 100644 --- a/ACE/apps/JAWS2/HTTP_10_Request.h +++ b/ACE/apps/JAWS2/HTTP_10_Request.h @@ -8,7 +8,6 @@ class JAWS_HTTP_10_Request : public HTTP_Request, public HTTP_HCodes { public: - JAWS_HTTP_10_Request (void); ~JAWS_HTTP_10_Request (void); @@ -22,7 +21,6 @@ public: void set_status (int); private: - char *path_; }; diff --git a/ACE/apps/JAWS2/HTTP_10_Write.cpp b/ACE/apps/JAWS2/HTTP_10_Write.cpp index 97ded62a99c..d15b740d2ac 100644 --- a/ACE/apps/JAWS2/HTTP_10_Write.cpp +++ b/ACE/apps/JAWS2/HTTP_10_Write.cpp @@ -8,7 +8,6 @@ #include "HTTP_10_Request.h" - // --------------- WRITE TASK ---------------------- JAWS_HTTP_10_Write_Task::JAWS_HTTP_10_Write_Task (void) diff --git a/ACE/apps/JAWS2/HTTP_Policy.cpp b/ACE/apps/JAWS2/HTTP_Policy.cpp index 8c8fd56f9cb..921c738ac85 100644 --- a/ACE/apps/JAWS2/HTTP_Policy.cpp +++ b/ACE/apps/JAWS2/HTTP_Policy.cpp @@ -1,7 +1,6 @@ #include "HTTP_Policy.h" - HTTP_Policy::HTTP_Policy (JAWS_Concurrency_Base *concurrency) : concurrency_ (concurrency) { diff --git a/ACE/apps/JAWS2/JAWS/Assoc_Array.h b/ACE/apps/JAWS2/JAWS/Assoc_Array.h index 811f75ae4d5..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: @@ -44,7 +43,6 @@ public: // Destroys all keys and associated data. protected: - int find_i (const KEY &k); // If k points to an associated data item, then this function // returns the index into the arrays that hold it. Otherwise, it @@ -61,7 +59,6 @@ template <class KEY, class DATA> class JAWS_Assoc_Array_Iterator { public: - JAWS_Assoc_Array_Iterator (const JAWS_Assoc_Array<KEY, DATA> &aa); ~JAWS_Assoc_Array_Iterator (void); @@ -75,14 +72,12 @@ public: int is_done (void); private: - // declare private and do not define: explicitly // prevent assignment and copy construction of iterators JAWS_Assoc_Array_Iterator (const JAWS_Assoc_Array_Iterator<KEY, DATA> &); void operator= (const JAWS_Assoc_Array_Iterator<KEY, DATA> &); private: - const JAWS_Assoc_Array<KEY, DATA> &aa_; int i_; @@ -90,7 +85,6 @@ private: int j_; // The next item to be pointed to by iterator. - }; #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/ACE/apps/JAWS2/JAWS/Cache_Hash_T.cpp b/ACE/apps/JAWS2/JAWS/Cache_Hash_T.cpp index a5349ab5bf1..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, @@ -94,7 +93,6 @@ JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::~JAWS_Cache_Hash (void) - this->hashtable_[i] = 0; } } @@ -231,5 +229,4 @@ JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::size () const - #endif /* JAWS_CACHEHASH_T_CPP */ diff --git a/ACE/apps/JAWS2/JAWS/Cache_Hash_T.h b/ACE/apps/JAWS2/JAWS/Cache_Hash_T.h index 501f20e1700..538896fd8d5 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Hash_T.h +++ b/ACE/apps/JAWS2/JAWS/Cache_Hash_T.h @@ -12,7 +12,6 @@ template <class EXT_ID, class HASH_FUNC, class EQ_FUNC> class JAWS_Cache_Hash { public: - typedef JAWS_Hash_Bucket_Manager<EXT_ID, JAWS_Cache_Object *, EQ_FUNC> CACHE_BUCKET_MANAGER; @@ -36,19 +35,16 @@ public: size_t size () const; protected: - virtual unsigned long hash (const EXT_ID &ext_id) const; bool isprime (size_t number) const; int new_cachebucket (size_t idx); private: - ACE_Allocator *allocator_; size_t size_; ACE_SYNCH_MUTEX lock_; CACHE_BUCKET_MANAGER **hashtable_; - }; #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/ACE/apps/JAWS2/JAWS/Cache_Heap_T.h b/ACE/apps/JAWS2/JAWS/Cache_Heap_T.h index 7e80bbeb84e..12308b42c23 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Heap_T.h +++ b/ACE/apps/JAWS2/JAWS/Cache_Heap_T.h @@ -19,7 +19,6 @@ class JAWS_Cache_Heap // standalone data structure. { public: - typedef JAWS_Cache_Manager<EXT_ID, FACT, H_FN, E_FN> Cache_Manager; typedef JAWS_Cache_Heap_Item<EXT_ID, FACT, H_FN, E_FN> Cache_Heap_Item; @@ -52,7 +51,6 @@ public: // treat item as a Cache_Heap_Item, and alter its heap position protected: - void insert_i (Cache_Heap_Item *item); // insert item into heap. @@ -63,35 +61,29 @@ protected: // remove the element residing at the top of heap, but do not delete it. private: - ACE_Allocator *allocator_; size_t maxsize_; size_t size_; Cache_Heap_Item **heap_; - }; 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: - JAWS_Cache_Heap_Item (const EXT_ID &ext_id, JAWS_Cache_Object *const &int_id); unsigned int priority (void); private: - EXT_ID ext_id_; JAWS_Cache_Object *int_id_; size_t heap_idx_; - }; #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/ACE/apps/JAWS2/JAWS/Cache_List_T.h b/ACE/apps/JAWS2/JAWS/Cache_List_T.h index d249db04cbf..4b147775b83 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_List_T.h +++ b/ACE/apps/JAWS2/JAWS/Cache_List_T.h @@ -22,7 +22,6 @@ class JAWS_Cache_List // trying to simplify all the heap operations to be O(1). { public: - typedef JAWS_Cache_Manager<EXT_ID, FACT, H_FN, E_FN> Cache_Manager; typedef JAWS_Cache_List_Item<EXT_ID, FACT, H_FN, E_FN> Cache_List_Item; @@ -55,7 +54,6 @@ public: // treat item as a Cache_List_Item, and alter its heap position protected: - void insert_i (Cache_List_Item *item); // insert item into heap. @@ -66,7 +64,6 @@ protected: // remove the element residing at the top of heap, but do not delete it. private: - ACE_Allocator *allocator_; size_t maxsize_; @@ -76,25 +73,21 @@ private: Cache_List_Item *head_; Cache_List_Item *tail_; - }; 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: - typedef JAWS_Cache_List<EXT_ID, FACT, H_FN, E_FN> Cache_List; JAWS_Cache_List_Item (const EXT_ID &ext_id, JAWS_Cache_Object *const &int_id); unsigned int priority (void); private: - EXT_ID ext_id_; JAWS_Cache_Object *int_id_; diff --git a/ACE/apps/JAWS2/JAWS/Cache_Manager.h b/ACE/apps/JAWS2/JAWS/Cache_Manager.h index 5705521a6c9..a8bf25ab346 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Manager.h +++ b/ACE/apps/JAWS2/JAWS/Cache_Manager.h @@ -29,7 +29,6 @@ private: class JAWS_Strdup_String { public: - JAWS_Strdup_String (void); JAWS_Strdup_String (const char *s); JAWS_Strdup_String (const JAWS_Strdup_String &s); @@ -40,10 +39,8 @@ public: void operator = (const JAWS_Strdup_String &s); private: - int *c_; char *s_; - }; typedef JAWS_Cache_Manager<JAWS_Strdup_String, diff --git a/ACE/apps/JAWS2/JAWS/Cache_Manager_T.cpp b/ACE/apps/JAWS2/JAWS/Cache_Manager_T.cpp index 5dd377d766f..9aebb67a912 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Manager_T.cpp +++ b/ACE/apps/JAWS2/JAWS/Cache_Manager_T.cpp @@ -78,7 +78,6 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> KEY, HASH_FUNC, EQ_FUNC); - this->hash_ = 0; this->hashsize_ = 0; } @@ -150,7 +149,6 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> KEY, HASH_FUNC, EQ_FUNC); - this->hash_ = 0; this->hashsize_ = 0; @@ -175,25 +173,21 @@ 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); - this->hash_ = 0; } if (this->heap_) { - ACE_DES_FREE_TEMPLATE4(this->heap_, this->allocator_->free, JAWS_Cache_List, KEY, FACTORY, HASH_FUNC, EQ_FUNC); - this->heap_ = 0; } diff --git a/ACE/apps/JAWS2/JAWS/Cache_Manager_T.h b/ACE/apps/JAWS2/JAWS/Cache_Manager_T.h index 22dcbbd4d20..2d2c87385ef 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Manager_T.h +++ b/ACE/apps/JAWS2/JAWS/Cache_Manager_T.h @@ -16,13 +16,11 @@ 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>; public: - typedef ACE_Singleton<FACTORY, ACE_SYNCH_MUTEX> Object_Factory; typedef JAWS_Cache_Hash<KEY, HASH_FUNC, EQ_FUNC> Cache_Hash; typedef JAWS_Cache_List<KEY, FACTORY, HASH_FUNC, EQ_FUNC> Cache_Heap; @@ -102,7 +100,6 @@ public: // Removes lowest priority object from cache. protected: - int GET_i (const KEY &key, JAWS_Cache_Object *&object); // Retrieve the object associated with key from cache. Return 0 on // success, -1 on failure. @@ -122,7 +119,6 @@ protected: // Decrement reference count on cached object, perhaps delete. private: - ACE_Allocator *allocator_; JAWS_Cache_Object_Factory *factory_; @@ -140,7 +136,6 @@ private: Cache_Heap *heap_; ACE_SYNCH_RW_MUTEX lock_; - }; diff --git a/ACE/apps/JAWS2/JAWS/Cache_Object.cpp b/ACE/apps/JAWS2/JAWS/Cache_Object.cpp index b024434f121..c01050ff69e 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Object.cpp +++ b/ACE/apps/JAWS2/JAWS/Cache_Object.cpp @@ -146,7 +146,6 @@ JAWS_Referenced_Cache_Object::priority_i () const } - JAWS_Counted_Cache_Object:: JAWS_Counted_Cache_Object (const void *data, size_t size) : JAWS_Cache_Object (data, size), diff --git a/ACE/apps/JAWS2/JAWS/Cache_Object.h b/ACE/apps/JAWS2/JAWS/Cache_Object.h index 3c92bdbb0bf..a5506ea641a 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Object.h +++ b/ACE/apps/JAWS2/JAWS/Cache_Object.h @@ -46,14 +46,12 @@ public: virtual ACE_Lock & lock (void) = 0; protected: - virtual unsigned int count_i () const = 0; virtual int acquire_i (void) = 0; virtual int release_i (void) = 0; virtual unsigned int priority_i () const = 0; private: - void *internal_; const void *data_; size_t size_; @@ -63,7 +61,6 @@ private: time_t new_last_access_; void *heap_item_; - }; class JAWS_Referenced_Cache_Object : public JAWS_Cache_Object @@ -75,17 +72,14 @@ public: virtual ACE_Lock & lock (void); protected: - virtual unsigned int count_i () const; virtual int acquire_i (void); virtual int release_i (void); virtual unsigned int priority_i () const; private: - mutable ACE_SYNCH_RW_MUTEX count_; mutable ACE_Lock_Adapter<ACE_SYNCH_RW_MUTEX> lock_adapter_; - }; class JAWS_Counted_Cache_Object : public JAWS_Cache_Object @@ -97,25 +91,21 @@ public: virtual ACE_Lock & lock (void); protected: - virtual unsigned int count_i () const; virtual int acquire_i (void); virtual int release_i (void); virtual unsigned int priority_i () const; private: - unsigned int count_; unsigned int new_count_; mutable ACE_SYNCH_MUTEX lock_; mutable ACE_Lock_Adapter<ACE_SYNCH_MUTEX> lock_adapter_; - }; class JAWS_Cache_Object_Factory { public: - JAWS_Cache_Object_Factory (ACE_Allocator *alloc = 0); virtual ~JAWS_Cache_Object_Factory (void); @@ -125,9 +115,7 @@ public: virtual void destroy (JAWS_Cache_Object *) = 0; protected: - ACE_Allocator *allocator_; - }; class JAWS_Referenced_Cache_Object_Factory : public JAWS_Cache_Object_Factory @@ -138,7 +126,6 @@ public: virtual JAWS_Cache_Object * create (const void *, size_t); virtual void destroy (JAWS_Cache_Object *); - }; class JAWS_Counted_Cache_Object_Factory : public JAWS_Cache_Object_Factory @@ -149,7 +136,6 @@ public: virtual JAWS_Cache_Object * create (const void *, size_t); virtual void destroy (JAWS_Cache_Object *); - }; #endif /* JAWS_CACHE_OBJECT_H */ diff --git a/ACE/apps/JAWS2/JAWS/Concurrency.cpp b/ACE/apps/JAWS2/JAWS/Concurrency.cpp index 6f41bfde363..bb47fcc24c5 100644 --- a/ACE/apps/JAWS2/JAWS/Concurrency.cpp +++ b/ACE/apps/JAWS2/JAWS/Concurrency.cpp @@ -8,7 +8,6 @@ #include "JAWS/Reaper.h" - JAWS_Concurrency_Base::JAWS_Concurrency_Base (void) : ACE_Task<ACE_SYNCH> (new ACE_Thread_Manager), mb_acquired_ (0), diff --git a/ACE/apps/JAWS2/JAWS/Data_Block.cpp b/ACE/apps/JAWS2/JAWS/Data_Block.cpp index 7c46296241a..f1b7c4d9aec 100644 --- a/ACE/apps/JAWS2/JAWS/Data_Block.cpp +++ b/ACE/apps/JAWS2/JAWS/Data_Block.cpp @@ -2,7 +2,6 @@ #include "JAWS/Policy.h" - JAWS_Data_Block::JAWS_Data_Block (void) : ACE_Message_Block (JAWS_DATA_BLOCK_SIZE), io_handler_ (0), diff --git a/ACE/apps/JAWS2/JAWS/FILE.cpp b/ACE/apps/JAWS2/JAWS/FILE.cpp index 2667ed4f2f6..d7408c77435 100644 --- a/ACE/apps/JAWS2/JAWS/FILE.cpp +++ b/ACE/apps/JAWS2/JAWS/FILE.cpp @@ -60,7 +60,6 @@ JAWS_FILE::mem_map (int length, } return this->map_; - } diff --git a/ACE/apps/JAWS2/JAWS/FILE.h b/ACE/apps/JAWS2/JAWS/FILE.h index b06b3e7ef2c..f80c7c9f509 100644 --- a/ACE/apps/JAWS2/JAWS/FILE.h +++ b/ACE/apps/JAWS2/JAWS/FILE.h @@ -15,7 +15,6 @@ class JAWS_Export JAWS_FILE : public ACE_FILE_IO // Like ACE_FILE_IO, but support for ACE_Mem_Map; { public: - JAWS_FILE (void); ~JAWS_FILE (void); @@ -36,10 +35,8 @@ public: ACE_Mem_Map *map () const; private: - ACE_SYNCH_MUTEX lock_; ACE_Mem_Map *map_; - }; #endif /* JAWS_FILE_H */ diff --git a/ACE/apps/JAWS2/JAWS/Filecache.h b/ACE/apps/JAWS2/JAWS/Filecache.h index 03a5e2c3789..62ae5783680 100644 --- a/ACE/apps/JAWS2/JAWS/Filecache.h +++ b/ACE/apps/JAWS2/JAWS/Filecache.h @@ -12,18 +12,14 @@ class JAWS_Export JAWS_Referenced_Filecache_Factory : public JAWS_Referenced_Cache_Object_Factory { public: - virtual void destroy (JAWS_Cache_Object *); - }; class JAWS_Export JAWS_Counted_Filecache_Factory : public JAWS_Counted_Cache_Object_Factory { public: - virtual void destroy (JAWS_Cache_Object *); - }; typedef JAWS_Cache_Manager<JAWS_Strdup_String, @@ -47,7 +43,6 @@ typedef JAWS_Cache_Proxy<const char *, class JAWS_Export JAWS_Cached_FILE : private JAWS_Filecache_Proxy { public: - JAWS_Cached_FILE (const char *const &filename, JAWS_Filecache_Proxy::Cache_Manager *cm = 0); JAWS_Cached_FILE (const char *const &filename, @@ -61,9 +56,7 @@ public: ACE_Mem_Map * mmap (void); private: - ACE_FILE_IO file_; - }; diff --git a/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.h b/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.h index 16ef1b45200..934ee54bbe0 100644 --- a/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.h +++ b/ACE/apps/JAWS2/JAWS/Hash_Bucket_T.h @@ -43,7 +43,6 @@ public: JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *prev_; // Pointer to the prev item in the bucket of overflow nodes. - }; @@ -60,7 +59,6 @@ class JAWS_Hash_Bucket_DLCStack friend class JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>; public: - JAWS_Hash_Bucket_DLCStack (ACE_Allocator *alloc = 0); ~JAWS_Hash_Bucket_DLCStack (void); @@ -90,10 +88,8 @@ public: ACE_Allocator *allocator_; private: - JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *head_; JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *tail_; - }; @@ -101,7 +97,6 @@ template <class EXT_ID, class INT_ID> class JAWS_Hash_Bucket_DLCStack_Iterator { public: - JAWS_Hash_Bucket_DLCStack_Iterator (const JAWS_HASH_BUCKET_DLCSTACK &dlcstack); int first (void); @@ -185,15 +180,12 @@ public: // if unbind succeeds, -1 otherwise. protected: - JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *find_i (const EXT_ID &ext_id) const; // Returns the item associated with ext_id if found in list. // Returns NULL if not found. private: - JAWS_Hash_Bucket_DLCStack<EXT_ID, INT_ID> dlcstack_; - }; diff --git a/ACE/apps/JAWS2/JAWS/IO_Acceptor.cpp b/ACE/apps/JAWS2/JAWS/IO_Acceptor.cpp index c44ae37fd02..f7249e89f76 100644 --- a/ACE/apps/JAWS2/JAWS/IO_Acceptor.cpp +++ b/ACE/apps/JAWS2/JAWS/IO_Acceptor.cpp @@ -4,7 +4,6 @@ #include "ace/OS_NS_sys_socket.h" - JAWS_IO_Acceptor::JAWS_IO_Acceptor (void) { } @@ -93,7 +92,6 @@ JAWS_IO_Synch_Acceptor::get_handle (void) } - JAWS_IO_Asynch_Acceptor::JAWS_IO_Asynch_Acceptor (void) #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) : acceptor_ (*(new ACE_Asynch_Acceptor<JAWS_Asynch_Handler>)), diff --git a/ACE/apps/JAWS2/JAWS/IO_Acceptor.h b/ACE/apps/JAWS2/JAWS/IO_Acceptor.h index 35a7473ece6..49db8f68176 100644 --- a/ACE/apps/JAWS2/JAWS/IO_Acceptor.h +++ b/ACE/apps/JAWS2/JAWS/IO_Acceptor.h @@ -33,7 +33,6 @@ typedef ACE_LOCK_SOCK_Acceptor<ACE_SYNCH_MUTEX> JAWS_IO_SOCK_Acceptor; class JAWS_Export JAWS_IO_Acceptor { public: - JAWS_IO_Acceptor (void); virtual ~JAWS_IO_Acceptor (void); @@ -62,13 +61,11 @@ public: enum { ASYNC = 0, SYNCH = 1 }; // identify if this is being used for asynchronous or synchronous // accept calls - }; class JAWS_Export JAWS_IO_Synch_Acceptor : public JAWS_IO_Acceptor { public: - virtual int open (const ACE_INET_Addr &local_sap, int backlog = 20); // Initiate a passive mode socket. @@ -96,7 +93,6 @@ private: class JAWS_Export JAWS_IO_Asynch_Acceptor : public JAWS_IO_Acceptor { public: - JAWS_IO_Asynch_Acceptor (void); virtual ~JAWS_IO_Asynch_Acceptor (void); @@ -115,7 +111,6 @@ public: virtual void close (void); private: - virtual int accept (ACE_SOCK_Stream &new_stream, ACE_Addr *remote_addr = 0, ACE_Time_Value *timeout = 0, diff --git a/ACE/apps/JAWS2/JAWS/IO_Handler.cpp b/ACE/apps/JAWS2/JAWS/IO_Handler.cpp index 98eb420d4e7..54e836a20de 100644 --- a/ACE/apps/JAWS2/JAWS/IO_Handler.cpp +++ b/ACE/apps/JAWS2/JAWS/IO_Handler.cpp @@ -480,7 +480,6 @@ JAWS_Asynch_Handler::handle_accept (const ACE_Asynch_Accept::Result &result) } else this->handler ()->accept_error (); - } void diff --git a/ACE/apps/JAWS2/JAWS/IO_Handler.h b/ACE/apps/JAWS2/JAWS/IO_Handler.h index 9d23baa2205..ac6d100f9f3 100644 --- a/ACE/apps/JAWS2/JAWS/IO_Handler.h +++ b/ACE/apps/JAWS2/JAWS/IO_Handler.h @@ -134,7 +134,6 @@ public: RECEIVE_OK = 18, RECEIVE_OK_A = 19, /// The different states of the handler RECEIVE_ERROR = 20, RECEIVE_ERROR_A = 21 }; - }; #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined(ACE_HAS_AIO_CALLS) @@ -292,7 +291,6 @@ public: virtual void release (void); protected: - JAWS_Asynch_Handler *handler_; ACE_SYNCH_RW_MUTEX count_; }; diff --git a/ACE/apps/JAWS2/JAWS/Jaws_IO.cpp b/ACE/apps/JAWS2/JAWS/Jaws_IO.cpp index 9b8e7c3068f..633d4d8dcef 100644 --- a/ACE/apps/JAWS2/JAWS/Jaws_IO.cpp +++ b/ACE/apps/JAWS2/JAWS/Jaws_IO.cpp @@ -19,7 +19,6 @@ // #include "HTTP_Helpers.h" - JAWS_IO::JAWS_IO (void) : handle_ (ACE_INVALID_HANDLE), handler_ (0), diff --git a/ACE/apps/JAWS2/JAWS/Jaws_IO.h b/ACE/apps/JAWS2/JAWS/Jaws_IO.h index 9bc060aaa5c..4106daf0cc3 100644 --- a/ACE/apps/JAWS2/JAWS/Jaws_IO.h +++ b/ACE/apps/JAWS2/JAWS/Jaws_IO.h @@ -226,7 +226,6 @@ public: }; protected: - virtual void send_message (JAWS_IO_Handler *ioh, const char *buffer, unsigned int length, @@ -247,7 +246,6 @@ public: virtual void accept (JAWS_IO_Handler *ioh, ACE_Message_Block *mb = 0, unsigned int size = 0); - }; typedef ACE_Singleton<JAWS_Asynch2_IO, ACE_SYNCH_MUTEX> diff --git a/ACE/apps/JAWS2/JAWS/Parse_Headers.h b/ACE/apps/JAWS2/JAWS/Parse_Headers.h index e2cddf11460..bed98f9078c 100644 --- a/ACE/apps/JAWS2/JAWS/Parse_Headers.h +++ b/ACE/apps/JAWS2/JAWS/Parse_Headers.h @@ -88,7 +88,6 @@ private: class JAWS_Export JAWS_Parse_Headers { public: - int parse_headers (JAWS_Header_Info *info, ACE_Message_Block &mb); // Return 0 means need more data, and call it again. // Return 1 means all done or error. @@ -111,7 +110,6 @@ public: // Scans from start to end for characters that match skip set. // Returns pointer to first location between start and end of a // character that is *not* in the skip set. - }; typedef ACE_Singleton<JAWS_Parse_Headers, ACE_SYNCH_MUTEX> diff --git a/ACE/apps/JAWS2/JAWS/Pipeline.cpp b/ACE/apps/JAWS2/JAWS/Pipeline.cpp index b6a3dc93c9f..8b5478cf2a5 100644 --- a/ACE/apps/JAWS2/JAWS/Pipeline.cpp +++ b/ACE/apps/JAWS2/JAWS/Pipeline.cpp @@ -1,7 +1,6 @@ #include "JAWS/Pipeline.h" - JAWS_Pipeline::JAWS_Pipeline (void) { } diff --git a/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.cpp b/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.cpp index c5973bfd6e5..ef0b598cd3f 100644 --- a/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.cpp +++ b/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.cpp @@ -4,7 +4,6 @@ #include "JAWS/Pipeline_Handler_T.h" - template <class TYPE> JAWS_Pipeline_Abstract_Handler<TYPE>::JAWS_Pipeline_Abstract_Handler (void) { diff --git a/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.h b/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.h index 51db1562e04..693904bc8e3 100644 --- a/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.h +++ b/ACE/apps/JAWS2/JAWS/Pipeline_Handler_T.h @@ -20,7 +20,6 @@ public: virtual int handle_put (TYPE *data, ACE_Time_Value *tv) = 0; // Callback hook for specialized data processing - }; #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.cpp b/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.cpp index 3f27630b8b0..e96cf0c5391 100644 --- a/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.cpp +++ b/ACE/apps/JAWS2/JAWS/Pipeline_Tasks.cpp @@ -6,7 +6,6 @@ #include "JAWS/Policy.h" - JAWS_Pipeline_Handler::JAWS_Pipeline_Handler (void) : policy_ (0) { diff --git a/ACE/apps/JAWS2/JAWS/Policy.cpp b/ACE/apps/JAWS2/JAWS/Policy.cpp index 207863c729d..cfd062537f3 100644 --- a/ACE/apps/JAWS2/JAWS/Policy.cpp +++ b/ACE/apps/JAWS2/JAWS/Policy.cpp @@ -4,7 +4,6 @@ #include "JAWS/IO_Acceptor.h" - JAWS_Dispatch_Policy::JAWS_Dispatch_Policy (void) { } diff --git a/ACE/apps/JAWS2/JAWS/Reaper.cpp b/ACE/apps/JAWS2/JAWS/Reaper.cpp index 1fe52cb04e7..a7800bb446e 100644 --- a/ACE/apps/JAWS2/JAWS/Reaper.cpp +++ b/ACE/apps/JAWS2/JAWS/Reaper.cpp @@ -3,7 +3,6 @@ #include "JAWS/IO_Acceptor.h" - JAWS_Reaper::JAWS_Reaper (JAWS_Concurrency_Base *concurrency) : concurrency_ (concurrency), waiting_ (0) diff --git a/ACE/apps/JAWS2/JAWS/Reaper.h b/ACE/apps/JAWS2/JAWS/Reaper.h index 28ec31dc159..a4c7ff3f081 100644 --- a/ACE/apps/JAWS2/JAWS/Reaper.h +++ b/ACE/apps/JAWS2/JAWS/Reaper.h @@ -39,7 +39,6 @@ private: JAWS_Concurrency_Base *concurrency_; int waiting_; ACE_SYNCH_MUTEX lock_; - }; #endif /* JAWS_REAPER_H */ diff --git a/ACE/apps/JAWS2/JAWS/Server.cpp b/ACE/apps/JAWS2/JAWS/Server.cpp index e26ba15d3f8..915c340ef1c 100644 --- a/ACE/apps/JAWS2/JAWS/Server.cpp +++ b/ACE/apps/JAWS2/JAWS/Server.cpp @@ -15,7 +15,6 @@ #include "JAWS/Pipeline_Tasks.h" - JAWS_Server::JAWS_Server (void) : port_ (5432), concurrency_ (0), diff --git a/ACE/apps/JAWS2/JAWS/Waiter.cpp b/ACE/apps/JAWS2/JAWS/Waiter.cpp index b35e560b05b..efd915513d7 100644 --- a/ACE/apps/JAWS2/JAWS/Waiter.cpp +++ b/ACE/apps/JAWS2/JAWS/Waiter.cpp @@ -4,7 +4,6 @@ #include "JAWS/IO_Handler.h" - JAWS_Waiter::JAWS_Waiter (void) : iter_ (*this) { diff --git a/ACE/apps/JAWS2/JAWS/Waiter.h b/ACE/apps/JAWS2/JAWS/Waiter.h index 613868e7f9e..e7854dc8de0 100644 --- a/ACE/apps/JAWS2/JAWS/Waiter.h +++ b/ACE/apps/JAWS2/JAWS/Waiter.h @@ -39,7 +39,6 @@ public: private: JAWS_Waiter_Base_Iterator iter_; - }; typedef ACE_Singleton<JAWS_Waiter, ACE_SYNCH_MUTEX> JAWS_Waiter_Singleton; diff --git a/ACE/apps/JAWS2/main.cpp b/ACE/apps/JAWS2/main.cpp index 2032bdf427c..2c6b857b657 100644 --- a/ACE/apps/JAWS2/main.cpp +++ b/ACE/apps/JAWS2/main.cpp @@ -2,7 +2,6 @@ #include "HTTP_10.h" - #ifdef ACE_HAS_SIG_C_FUNC extern "C" { diff --git a/ACE/apps/JAWS3/bench/rqfiles.cpp b/ACE/apps/JAWS3/bench/rqfiles.cpp index f09c56662b3..007efaa7459 100644 --- a/ACE/apps/JAWS3/bench/rqfiles.cpp +++ b/ACE/apps/JAWS3/bench/rqfiles.cpp @@ -16,7 +16,6 @@ class HTTP_Sink_Svc_Handler : public ACE_Svc_Handler <ACE_SOCK_STREAM, ACE_NULL_SYNCH> { public: - //FUZZ: disable check_for_lack_ACE_OS int open (void *) { @@ -59,7 +58,6 @@ public: ->schedule_wakeup (handle, ACE_Event_Handler::READ_MASK); return 0; } - }; typedef ACE_Connector <HTTP_Sink_Svc_Handler, ACE_SOCK_CONNECTOR> @@ -70,7 +68,6 @@ class HTTP_Make_Request_Event_Handler : public ACE_Event_Handler { public: - HTTP_Make_Request_Event_Handler (const ACE_Time_Value &request_rate, int number_of_requests = -1, const char *website = 0) @@ -121,7 +118,6 @@ public: } private: - int number_of_requests_; int number_of_outstanding_requests_; @@ -129,7 +125,6 @@ private: ACE_INET_Addr addr_; long timer_id_; - }; class Signal_Handler diff --git a/ACE/apps/JAWS3/http/HTTP_Data.h b/ACE/apps/JAWS3/http/HTTP_Data.h index 39dd63b79b7..f08081d9f98 100644 --- a/ACE/apps/JAWS3/http/HTTP_Data.h +++ b/ACE/apps/JAWS3/http/HTTP_Data.h @@ -11,7 +11,6 @@ class JAWS_HTTP_Service_Handler; class JAWS_HTTP_Data { public: - JAWS_HTTP_Data (JAWS_HTTP_Service_Handler *sh); ACE_SOCK_Stream & peer (void); @@ -19,11 +18,9 @@ public: ACE_FILE_IO & file_io (void); private: - JAWS_HTTP_Service_Handler *sh_; ACE_Message_Block mb_; ACE_FILE_IO file_io_; - }; #endif /* JAWS_HTTP_DATA_H */ diff --git a/ACE/apps/JAWS3/http/HTTP_Service_Handler.h b/ACE/apps/JAWS3/http/HTTP_Service_Handler.h index c8df6d3eba1..812fd041b31 100644 --- a/ACE/apps/JAWS3/http/HTTP_Service_Handler.h +++ b/ACE/apps/JAWS3/http/HTTP_Service_Handler.h @@ -26,7 +26,6 @@ class JAWS_HTTP_Service_Handler // there is less programming effort. { public: - JAWS_HTTP_Service_Handler (void); int open (void *); @@ -34,9 +33,7 @@ public: int close (unsigned long); private: - JAWS_HTTP_Data data_; - }; @@ -52,9 +49,7 @@ class ACE_Svc_Export JAWS_HTTP_Acceptor // is created. { public: - int init (int argc, ACE_TCHAR *argv[]); - }; ACE_SVC_FACTORY_DECLARE (JAWS_HTTP_Acceptor) diff --git a/ACE/apps/JAWS3/jaws3/Asynch_IO.cpp b/ACE/apps/JAWS3/jaws3/Asynch_IO.cpp index bc00dc656d4..8b894bae75a 100644 --- a/ACE/apps/JAWS3/jaws3/Asynch_IO.cpp +++ b/ACE/apps/JAWS3/jaws3/Asynch_IO.cpp @@ -118,7 +118,6 @@ JAWS_Asynch_IO::transmit ( ACE_HANDLE handle } - JAWS_EC_AH_Adapter * JAWS_EC_AH_Adapter::make (JAWS_Event_Completer *completer) { diff --git a/ACE/apps/JAWS3/jaws3/Asynch_IO.h b/ACE/apps/JAWS3/jaws3/Asynch_IO.h index bb55cf58d5a..1c787eaf88f 100644 --- a/ACE/apps/JAWS3/jaws3/Asynch_IO.h +++ b/ACE/apps/JAWS3/jaws3/Asynch_IO.h @@ -16,7 +16,6 @@ class JAWS_Asynch_IO; class JAWS_Export JAWS_Asynch_IO : public JAWS_IO_Impl { public: - static JAWS_Asynch_IO * instance (void) { return ACE_Singleton<JAWS_Asynch_IO, ACE_SYNCH_MUTEX>::instance (); @@ -64,7 +63,6 @@ public: , ACE_Message_Block *header = 0 , ACE_Message_Block *trailer = 0 ); - }; #endif /* JAWS_ASYNCH_IO_H */ diff --git a/ACE/apps/JAWS3/jaws3/Asynch_IO_Helpers.h b/ACE/apps/JAWS3/jaws3/Asynch_IO_Helpers.h index 08567ddb5b2..693250730c5 100644 --- a/ACE/apps/JAWS3/jaws3/Asynch_IO_Helpers.h +++ b/ACE/apps/JAWS3/jaws3/Asynch_IO_Helpers.h @@ -20,7 +20,6 @@ class JAWS_EC_AH_Adapter : public ACE_Handler // if the given platform supports POSIX or WIN32 asynch IO. { public: - static JAWS_EC_AH_Adapter * make (JAWS_Event_Completer *); void handle_read_stream (const ACE_Asynch_Read_Stream::Result &result); @@ -30,23 +29,19 @@ public: void handle_transmit_file (const ACE_Asynch_Transmit_File::Result &result); private: - JAWS_EC_AH_Adapter (JAWS_Event_Completer *completer) : completer_ (completer) { } protected: - JAWS_Event_Result make_io_result ( const ACE_Asynch_Result &result , JAWS_Event_Result::JE_REASON reason_ok , JAWS_Event_Result::JE_REASON reason_fail ); private: - JAWS_Event_Completer *completer_; - }; #endif /* JAWS_ASYNCH_IO_HELPERS_H */ diff --git a/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h b/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h index 67082e2bad6..2b4a0c1d8d5 100644 --- a/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h +++ b/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h @@ -22,7 +22,6 @@ class JAWS_Cached_Allocator : public ACE_New_Allocator // fixed-sized classes. { public: - JAWS_Cached_Allocator (size_t n_chunks = JAWS_DEFAULT_ALLOCATOR_CHUNKS); ~JAWS_Cached_Allocator (void); @@ -34,7 +33,6 @@ public: // return a chunk of memory back to free store. protected: - char * get_next_pool (char *pool); void set_next_pool (char *pool, char *next_pool); @@ -42,7 +40,6 @@ protected: void extend_pool (void); private: - size_t pool_size_; char *pool_head_; @@ -53,11 +50,9 @@ private: ACE_Locked_Free_List<ACE_Cached_Mem_Pool_Node<T>, ACE_LOCK> free_list_; // Maintain a cached memory free list. - }; - template <class T> class JAWS_TSS_Cached_Allocator : public ACE_New_Allocator // = TITLE @@ -69,7 +64,6 @@ class JAWS_TSS_Cached_Allocator : public ACE_New_Allocator // fixed-sized classes. { public: - JAWS_TSS_Cached_Allocator (size_t n_chunks = JAWS_DEFAULT_ALLOCATOR_CHUNKS); ~JAWS_TSS_Cached_Allocator (void); @@ -81,15 +75,12 @@ public: // return a chunk of memory back to free store. protected: - JAWS_Cached_Allocator<T, ACE_SYNCH_NULL_MUTEX> * ts_allocator (void); private: - size_t n_chunks_; ACE_TSS_TYPE (JAWS_CACHED_ALLOCATOR(T)) ts_allocator_; - }; diff --git a/ACE/apps/JAWS3/jaws3/Concurrency.h b/ACE/apps/JAWS3/jaws3/Concurrency.h index 7009bbacc5d..16a9ad059ea 100644 --- a/ACE/apps/JAWS3/jaws3/Concurrency.h +++ b/ACE/apps/JAWS3/jaws3/Concurrency.h @@ -15,7 +15,6 @@ typedef ACE_Task<ACE_SYNCH> JAWS_CONCURRENCY_TASK; class JAWS_Export JAWS_Concurrency_Impl : public JAWS_CONCURRENCY_TASK { public: - virtual ~JAWS_Concurrency_Impl (void) {}; virtual int putq (JAWS_Protocol_Handler *ph) = 0; @@ -23,7 +22,6 @@ public: virtual int getq (JAWS_Protocol_Handler *&ph) = 0; int svc (void); - }; @@ -35,7 +33,6 @@ template<> class JAWS_Export JAWS_Concurrency_Bridge<JAWS_Concurrency_Impl> { public: - JAWS_Concurrency_Bridge (JAWS_Concurrency_Impl *impl = 0); int putq (JAWS_Protocol_Handler *ph); @@ -44,9 +41,7 @@ public: void shutdown (void); protected: - JAWS_Concurrency_Impl *impl_; - }; @@ -59,12 +54,10 @@ class JAWS_Export JAWS_Concurrency : public JAWS_Concurrency_Bridge<JAWS_CONCURRENCY_CONCRETE_IMPL> { public: - static JAWS_Concurrency * instance (void) { return ACE_Singleton<JAWS_Concurrency, ACE_SYNCH_MUTEX>::instance (); } - }; diff --git a/ACE/apps/JAWS3/jaws3/Concurrency_T.h b/ACE/apps/JAWS3/jaws3/Concurrency_T.h index cbae2ebe0b4..4c4582db890 100644 --- a/ACE/apps/JAWS3/jaws3/Concurrency_T.h +++ b/ACE/apps/JAWS3/jaws3/Concurrency_T.h @@ -21,7 +21,6 @@ class JAWS_Concurrency_Bridge // { public: - JAWS_Concurrency_Bridge (CONCURRENCY_IMPL *impl = 0); int putq (JAWS_Protocol_Handler *ph); @@ -30,9 +29,7 @@ public: void shutdown (void); protected: - CONCURRENCY_IMPL *impl_; - }; #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/ACE/apps/JAWS3/jaws3/Config_File.cpp b/ACE/apps/JAWS3/jaws3/Config_File.cpp index ff2fa889489..a62a7cd14ea 100644 --- a/ACE/apps/JAWS3/jaws3/Config_File.cpp +++ b/ACE/apps/JAWS3/jaws3/Config_File.cpp @@ -17,7 +17,6 @@ class JAWS_strings { public: - ~JAWS_strings (void) { void *p; @@ -50,9 +49,7 @@ public: } private: - ACE_Unbounded_Queue<void *> queue_; - }; @@ -62,7 +59,6 @@ private: class JAWS_Config_File_Impl { public: - JAWS_Config_File_Impl (const ACE_TCHAR *config_file); ~JAWS_Config_File_Impl (void); int find (const ACE_TCHAR *key, const ACE_TCHAR *&value); @@ -74,11 +70,9 @@ public: enum { JAWS_CONFIG_FILE_SYMBOL_TABLE_SIZE = 211 }; private: - ACE_FILE_Addr faddr_; JAWS_strings *strings_; JAWS_Symbol_Table *symbols_; - }; JAWS_Config_File_Impl::JAWS_Config_File_Impl (const ACE_TCHAR *config_file) diff --git a/ACE/apps/JAWS3/jaws3/Config_File.h b/ACE/apps/JAWS3/jaws3/Config_File.h index cc93f9af134..bac607cf2bd 100644 --- a/ACE/apps/JAWS3/jaws3/Config_File.h +++ b/ACE/apps/JAWS3/jaws3/Config_File.h @@ -41,7 +41,6 @@ class JAWS_Export JAWS_Config_File // No <configuration-line> is to exceed 4094 characters. { public: - // = Initialization JAWS_Config_File (const ACE_TCHAR *config_file, @@ -54,7 +53,6 @@ public: // Find the <value> associated with <key>. public: - void reset (void); // Re-read the configuration file. @@ -62,10 +60,8 @@ public: // Dump the values of all configuration variables. private: - JAWS_Config_File_Impl *impl_; // Opaque implementation. - }; #endif /* JAWS_CONFIG_FILE_H */ diff --git a/ACE/apps/JAWS3/jaws3/Datagram.h b/ACE/apps/JAWS3/jaws3/Datagram.h index 244c1a35f79..ce39f969914 100644 --- a/ACE/apps/JAWS3/jaws3/Datagram.h +++ b/ACE/apps/JAWS3/jaws3/Datagram.h @@ -13,7 +13,6 @@ class JAWS_Export JAWS_Datagram_Impl { public: - virtual ~JAWS_Datagram_Impl (void) {} virtual void accept ( const ACE_Addr &local_sap @@ -72,14 +71,12 @@ public: // The address to new_dgram is passed back as the data member of // the JAWS_Event_Result that is returned to the completer. // Use the specified local access point. - }; class JAWS_Export JAWS_Datagram { public: - JAWS_Datagram (JAWS_Datagram_Impl *impl = 0); static JAWS_Datagram * instance (void) @@ -129,9 +126,7 @@ public: ); private: - JAWS_Datagram_Impl *impl_; - }; #endif /* JAWS_DATAGRAM_H */ diff --git a/ACE/apps/JAWS3/jaws3/Event_Completer.h b/ACE/apps/JAWS3/jaws3/Event_Completer.h index 26e2e4b9775..f3e5e4a42e9 100644 --- a/ACE/apps/JAWS3/jaws3/Event_Completer.h +++ b/ACE/apps/JAWS3/jaws3/Event_Completer.h @@ -12,7 +12,6 @@ class JAWS_Export JAWS_Event_Completer // Event completion callback class. { public: - virtual ~JAWS_Event_Completer (void); virtual void accept_complete (const JAWS_Event_Result &r, void *act = 0); @@ -35,7 +34,6 @@ public: virtual void default_complete (const JAWS_Event_Result &r, void *act = 0); // The defaul callback entry point when an event completes. - }; #endif /* JAWS_EVENT_COMPLETER_H */ diff --git a/ACE/apps/JAWS3/jaws3/Event_Dispatcher.h b/ACE/apps/JAWS3/jaws3/Event_Dispatcher.h index d7534dd3c23..dfc17932de8 100644 --- a/ACE/apps/JAWS3/jaws3/Event_Dispatcher.h +++ b/ACE/apps/JAWS3/jaws3/Event_Dispatcher.h @@ -41,10 +41,8 @@ class JAWS_Event_Dispatcher; class JAWS_Export JAWS_Event_Dispatcher { public: - static void end_event_loop (void); static void run_event_loop (void); - }; #endif /* JAWS_EVENT_DISPATCHER_H */ diff --git a/ACE/apps/JAWS3/jaws3/Event_Result.h b/ACE/apps/JAWS3/jaws3/Event_Result.h index c2a20d68a29..095a557ee36 100644 --- a/ACE/apps/JAWS3/jaws3/Event_Result.h +++ b/ACE/apps/JAWS3/jaws3/Event_Result.h @@ -12,7 +12,6 @@ class JAWS_Event_Result; class JAWS_Export JAWS_Event_Result { public: - enum JE_STATUS { JE_IDLE , JE_OK @@ -87,7 +86,6 @@ public: void * data () const { return this->data_; } private: - size_t bytes_; JE_STATUS status_; @@ -96,7 +94,6 @@ private: int error_number_; void *data_; - }; #endif /* JAWS_EVENT_RESULT_H */ diff --git a/ACE/apps/JAWS3/jaws3/FILE.cpp b/ACE/apps/JAWS3/jaws3/FILE.cpp index 2d27cb76e40..856b6ce16f5 100644 --- a/ACE/apps/JAWS3/jaws3/FILE.cpp +++ b/ACE/apps/JAWS3/jaws3/FILE.cpp @@ -74,7 +74,6 @@ JAWS_FILE::mem_map (int length, } return this->map_; - } diff --git a/ACE/apps/JAWS3/jaws3/FILE.h b/ACE/apps/JAWS3/jaws3/FILE.h index e729add3126..f09ff65b7a0 100644 --- a/ACE/apps/JAWS3/jaws3/FILE.h +++ b/ACE/apps/JAWS3/jaws3/FILE.h @@ -13,7 +13,6 @@ class JAWS_Export JAWS_FILE : public ACE_FILE_IO // Like ACE_FILE_IO, but support for ACE_Mem_Map; { public: - JAWS_FILE (void); ~JAWS_FILE (void); @@ -36,12 +35,10 @@ public: void can_map (int); private: - ACE_SYNCH_MUTEX lock_; ACE_Mem_Map *map_; int can_map_; - }; #endif /* JAWS_FILE_H */ diff --git a/ACE/apps/JAWS3/jaws3/Jaws_IO.h b/ACE/apps/JAWS3/jaws3/Jaws_IO.h index eb0b8930285..ffd7db696c3 100644 --- a/ACE/apps/JAWS3/jaws3/Jaws_IO.h +++ b/ACE/apps/JAWS3/jaws3/Jaws_IO.h @@ -19,7 +19,6 @@ class JAWS_Export JAWS_IO_Impl // Bridge Pattern. { public: - virtual ~JAWS_IO_Impl (void) {} // = Regular IO methods. @@ -68,14 +67,12 @@ public: , ACE_Message_Block *header = 0 , ACE_Message_Block *trailer = 0 ) = 0; - }; class JAWS_Export JAWS_IO { public: - JAWS_IO (JAWS_IO_Impl *impl = 0); ~JAWS_IO (void); @@ -130,9 +127,7 @@ public: private: - JAWS_IO_Impl *impl_; - }; #endif /* JAWS_IO_H */ diff --git a/ACE/apps/JAWS3/jaws3/Options.h b/ACE/apps/JAWS3/jaws3/Options.h index 3f9d847475b..0c91f080ad2 100644 --- a/ACE/apps/JAWS3/jaws3/Options.h +++ b/ACE/apps/JAWS3/jaws3/Options.h @@ -19,7 +19,6 @@ class JAWS_Options; class JAWS_Export JAWS_Options { public: - JAWS_Options (void); const char *getenv (const char *key); @@ -30,9 +29,7 @@ public: } private: - JAWS_Config_File *cf_; - }; #endif /* JAWS_OPTIONS_H */ diff --git a/ACE/apps/JAWS3/jaws3/Protocol_Handler.h b/ACE/apps/JAWS3/jaws3/Protocol_Handler.h index 11cc55d0dc3..92a534d3392 100644 --- a/ACE/apps/JAWS3/jaws3/Protocol_Handler.h +++ b/ACE/apps/JAWS3/jaws3/Protocol_Handler.h @@ -9,22 +9,18 @@ class JAWS_Export JAWS_Protocol_State { - friend class JAWS_Protocol_Handler; public: - virtual ~JAWS_Protocol_State (void); protected: - virtual int service (JAWS_Event_Completer *, void *data) = 0; virtual JAWS_Protocol_State * transition ( const JAWS_Event_Result & , void *data , void *act ) = 0; - }; class JAWS_Export JAWS_Protocol_Handler @@ -32,13 +28,11 @@ 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; public: - JAWS_Protocol_Handler (JAWS_Protocol_State *state = 0, void *data = 0); virtual int service (void); @@ -49,12 +43,10 @@ public: } protected: - virtual ~JAWS_Protocol_Handler (void); // Try to guarantee this class will be created dynamically. protected: - void event_complete (const JAWS_Event_Result &result, void *act); // The event completion routine that triggers the transition // to the next Protocol State. @@ -65,14 +57,12 @@ protected: } private: - JAWS_Protocol_State *state_; void *data_; ACE_Data_Block db_; ACE_Message_Block mb_; - }; 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.h b/ACE/apps/JAWS3/jaws3/Reactive_IO.h index d4bf77283bf..c385a4befbb 100644 --- a/ACE/apps/JAWS3/jaws3/Reactive_IO.h +++ b/ACE/apps/JAWS3/jaws3/Reactive_IO.h @@ -16,7 +16,6 @@ class JAWS_Reactive_IO; class JAWS_Export JAWS_Reactive_IO : public JAWS_IO_Impl { public: - static JAWS_Reactive_IO * instance (void) { return ACE_Singleton<JAWS_Reactive_IO, ACE_SYNCH_MUTEX>::instance (); @@ -64,7 +63,6 @@ public: , ACE_Message_Block *header = 0 , ACE_Message_Block *trailer = 0 ); - }; #endif /* JAWS_REACTIVE_IO_H */ diff --git a/ACE/apps/JAWS3/jaws3/Reactive_IO_Helpers.h b/ACE/apps/JAWS3/jaws3/Reactive_IO_Helpers.h index 780737ec32b..aff12038559 100644 --- a/ACE/apps/JAWS3/jaws3/Reactive_IO_Helpers.h +++ b/ACE/apps/JAWS3/jaws3/Reactive_IO_Helpers.h @@ -16,13 +16,11 @@ 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; public: - virtual void open (void); int handle_timeout (const ACE_Time_Value &, const void *); @@ -36,11 +34,9 @@ public: void set_handle (ACE_HANDLE handle) { this->handle_ = handle; } protected: - virtual void close (int result); private: - JAWS_IO_Reactive_Handler ( ACE_HANDLE handle , JAWS_Event_Completer *completer , const ACE_Time_Value &tv @@ -70,7 +66,6 @@ public: // needed for destructor due to "aCC: HP ANSI C++ B3910B A.03.39" compil } private: - JAWS_Event_Result io_result_; size_t bytes_; @@ -83,17 +78,14 @@ private: long timer_id_; int was_active_; - }; class JAWS_IO_Reactive_Send : public JAWS_IO_Reactive_Handler { - friend class JAWS_Reactive_IO; public: - int handle_output (ACE_HANDLE handle); static JAWS_IO_Reactive_Send * make ( ACE_HANDLE handle @@ -128,7 +120,6 @@ public: } private: - JAWS_IO_Reactive_Send ( ACE_HANDLE handle , ACE_Message_Block *mb , JAWS_Event_Completer *completer @@ -142,19 +133,15 @@ private: } private: - ACE_Message_Block *mb_; - }; class JAWS_IO_Reactive_Recv : public JAWS_IO_Reactive_Handler { - friend class JAWS_Reactive_IO; public: - int handle_input (ACE_HANDLE handle); static JAWS_IO_Reactive_Recv * make ( ACE_HANDLE handle @@ -189,7 +176,6 @@ public: } private: - JAWS_IO_Reactive_Recv ( ACE_HANDLE handle , ACE_Message_Block *mb , JAWS_Event_Completer *completer @@ -203,19 +189,15 @@ private: } private: - ACE_Message_Block *mb_; - }; class JAWS_IO_Reactive_Transmit : public JAWS_IO_Reactive_Handler { - friend class JAWS_Reactive_IO; public: - int handle_timeout (const ACE_Time_Value &, const void *); int handle_output (ACE_HANDLE handle); @@ -262,7 +244,6 @@ public: } protected: - void close (int result); int handle_output_header (ACE_HANDLE handle); @@ -274,7 +255,6 @@ protected: int handle_output_mb (ACE_HANDLE handle, ACE_Message_Block *&mb); private: - JAWS_IO_Reactive_Transmit ( ACE_HANDLE handle , ACE_HANDLE source , JAWS_Event_Completer *completer @@ -294,13 +274,11 @@ private: } private: - ACE_HANDLE source_; ACE_Message_Block source_mb_; ACE_Message_Block *source_buf_; ACE_Message_Block *header_; ACE_Message_Block *trailer_; - }; #endif /* JAWS_REACTIVE_IO_HELPERS_H */ diff --git a/ACE/apps/JAWS3/jaws3/Signal_Task.cpp b/ACE/apps/JAWS3/jaws3/Signal_Task.cpp index a379721fb69..f5d20c75c74 100644 --- a/ACE/apps/JAWS3/jaws3/Signal_Task.cpp +++ b/ACE/apps/JAWS3/jaws3/Signal_Task.cpp @@ -44,7 +44,6 @@ JAWS_Signal_Task_function (void *) #endif // !defined (ACE_WIN32) default: break; - } } diff --git a/ACE/apps/JAWS3/jaws3/Signal_Task.h b/ACE/apps/JAWS3/jaws3/Signal_Task.h index 242db3f9f8a..f3eb3169246 100644 --- a/ACE/apps/JAWS3/jaws3/Signal_Task.h +++ b/ACE/apps/JAWS3/jaws3/Signal_Task.h @@ -11,7 +11,6 @@ class JAWS_Export JAWS_Signal_Task { public: - JAWS_Signal_Task (void); static JAWS_Signal_Task * instance (void) @@ -22,9 +21,7 @@ public: ACE_Sig_Set & sigset (void) { return this->sigset_; } private: - ACE_Sig_Set sigset_; - }; #endif /* JAWS_SIGNAL_TASK_H */ diff --git a/ACE/apps/JAWS3/jaws3/Symbol_Table.h b/ACE/apps/JAWS3/jaws3/Symbol_Table.h index c19120c5eca..05b798daa9a 100644 --- a/ACE/apps/JAWS3/jaws3/Symbol_Table.h +++ b/ACE/apps/JAWS3/jaws3/Symbol_Table.h @@ -41,7 +41,6 @@ class JAWS_Export JAWS_Symbol_Table : public JAWS_SYMBOL_TABLE_BASE public: JAWS_Symbol_Table (size_t size = 211); // Hash table <size> should be a prime. - }; #endif /* JAWS_SYMBOL_TABLE_H */ diff --git a/ACE/apps/JAWS3/jaws3/Synch_IO.h b/ACE/apps/JAWS3/jaws3/Synch_IO.h index d4d56063605..0ef9acdc722 100644 --- a/ACE/apps/JAWS3/jaws3/Synch_IO.h +++ b/ACE/apps/JAWS3/jaws3/Synch_IO.h @@ -9,7 +9,6 @@ class JAWS_Export JAWS_Synch_IO : public JAWS_IO_Impl { public: - static JAWS_Synch_IO * instance (void) { return ACE_Singleton<JAWS_Synch_IO, ACE_SYNCH_MUTEX>::instance (); @@ -57,7 +56,6 @@ public: , ACE_Message_Block *header = 0 , ACE_Message_Block *trailer = 0 ); - }; #endif /* JAWS_SYNCH_IO_H */ diff --git a/ACE/apps/JAWS3/jaws3/THYBRID_Concurrency.h b/ACE/apps/JAWS3/jaws3/THYBRID_Concurrency.h index 0600e9ca287..257dc9f5293 100644 --- a/ACE/apps/JAWS3/jaws3/THYBRID_Concurrency.h +++ b/ACE/apps/JAWS3/jaws3/THYBRID_Concurrency.h @@ -9,7 +9,6 @@ class JAWS_Export JAWS_THYBRID_Concurrency : public JAWS_Concurrency_Impl { public: - JAWS_THYBRID_Concurrency (void); int putq (JAWS_Protocol_Handler *ph); @@ -23,13 +22,11 @@ public: } private: - ACE_Atomic_Op<ACE_SYNCH_MUTEX, int> getting_; int min_number_of_threads_; int max_number_of_threads_; int shutdown_task_; int error_; - }; #endif /* JAWS_THYBRID_CONCURRENCY_H */ diff --git a/ACE/apps/JAWS3/jaws3/TPOOL_Concurrency.h b/ACE/apps/JAWS3/jaws3/TPOOL_Concurrency.h index 2a614b2fb0d..1e8935414da 100644 --- a/ACE/apps/JAWS3/jaws3/TPOOL_Concurrency.h +++ b/ACE/apps/JAWS3/jaws3/TPOOL_Concurrency.h @@ -7,7 +7,6 @@ class JAWS_Export JAWS_TPOOL_Concurrency : public JAWS_Concurrency_Impl { public: - JAWS_TPOOL_Concurrency (void); int putq (JAWS_Protocol_Handler *ph); @@ -20,11 +19,9 @@ public: } private: - int number_of_threads_; int shutdown_task_; int error_; - }; #endif /* JAWS_TPOOL_CONCURRENCY_H */ diff --git a/ACE/apps/JAWS3/jaws3/TPR_Concurrency.h b/ACE/apps/JAWS3/jaws3/TPR_Concurrency.h index 32d57830192..e47286a4275 100644 --- a/ACE/apps/JAWS3/jaws3/TPR_Concurrency.h +++ b/ACE/apps/JAWS3/jaws3/TPR_Concurrency.h @@ -9,7 +9,6 @@ class JAWS_Export JAWS_TPR_Concurrency : public JAWS_Concurrency_Impl { public: - JAWS_TPR_Concurrency (void); int putq (JAWS_Protocol_Handler *ph); @@ -22,12 +21,10 @@ public: } private: - ACE_Atomic_Op<ACE_SYNCH_MUTEX, int> getting_; int min_number_of_threads_; int shutdown_task_; int error_; - }; #endif /* JAWS_TPR_CONCURRENCY_H */ diff --git a/ACE/apps/JAWS3/jaws3/Task_Timer.h b/ACE/apps/JAWS3/jaws3/Task_Timer.h index 7353fb4faa4..5f1c91a5460 100644 --- a/ACE/apps/JAWS3/jaws3/Task_Timer.h +++ b/ACE/apps/JAWS3/jaws3/Task_Timer.h @@ -14,7 +14,6 @@ class JAWS_Task_Timer; class JAWS_Export JAWS_Task_Timer : public JAWS_Timer_Impl { public: - JAWS_Task_Timer (void); static JAWS_Timer_Impl * instance (void) @@ -46,9 +45,7 @@ public: // is being used as the timer helper). private: - ACE_Thread_Timer_Queue_Adapter<ACE_Timer_Wheel> timer_queue_; - }; #endif /* JAWS_TASK_TIMER_H */ diff --git a/ACE/apps/JAWS3/jaws3/Timer.h b/ACE/apps/JAWS3/jaws3/Timer.h index 9f00ed5a75d..a59f5ef14c3 100644 --- a/ACE/apps/JAWS3/jaws3/Timer.h +++ b/ACE/apps/JAWS3/jaws3/Timer.h @@ -18,7 +18,6 @@ class JAWS_Export JAWS_Timer_Impl // RHS of the Bridge pattern. { public: - virtual ~JAWS_Timer_Impl (void) {} virtual void schedule_timer ( long *timer_id @@ -44,7 +43,6 @@ public: virtual void cancel_timer (long timer_id) = 0; // Cancel a timer. - }; @@ -54,7 +52,6 @@ class JAWS_Export JAWS_Timer // Bridge pattern. { public: - JAWS_Timer (JAWS_Timer_Impl *impl = 0); static JAWS_Timer * instance (void) @@ -83,9 +80,7 @@ public: void cancel_timer (long timer_id); private: - JAWS_Timer_Impl *impl_; - }; diff --git a/ACE/apps/JAWS3/jaws3/Timer_Helpers.h b/ACE/apps/JAWS3/jaws3/Timer_Helpers.h index 3429dedbbab..5a346716afb 100644 --- a/ACE/apps/JAWS3/jaws3/Timer_Helpers.h +++ b/ACE/apps/JAWS3/jaws3/Timer_Helpers.h @@ -12,7 +12,6 @@ class JAWS_Timer_EH : public ACE_Event_Handler { public: - JAWS_Timer_EH ( JAWS_Event_Completer *completer , void *act = 0 , int interval = 0 @@ -31,12 +30,10 @@ public: // Called directly when timer is canceled. private: - JAWS_Event_Completer *completer_; void *act_; const int interval_; int expired_; - }; #endif /* JAWS_TIMER_HELPERS_H */ diff --git a/ACE/apps/JAWS3/small/SS_Data.h b/ACE/apps/JAWS3/small/SS_Data.h index 84edf314676..2fa551bc38b 100644 --- a/ACE/apps/JAWS3/small/SS_Data.h +++ b/ACE/apps/JAWS3/small/SS_Data.h @@ -11,7 +11,6 @@ class TeraSS_Service_Handler; class TeraSS_Data { public: - TeraSS_Data (TeraSS_Service_Handler *sh); ACE_SOCK_Stream & peer (void); @@ -19,11 +18,9 @@ public: ACE_FILE_IO & file_io (void); private: - ACE_Message_Block mb_; TeraSS_Service_Handler *sh_; ACE_FILE_IO file_io_; - }; #endif /* TERA_SS_DATA_H */ diff --git a/ACE/apps/JAWS3/small/SS_Service_Handler.h b/ACE/apps/JAWS3/small/SS_Service_Handler.h index a7e49ba2d8d..91392dbc4c0 100644 --- a/ACE/apps/JAWS3/small/SS_Service_Handler.h +++ b/ACE/apps/JAWS3/small/SS_Service_Handler.h @@ -27,7 +27,6 @@ class TeraSS_Service_Handler // there is less programming effort. { public: - TeraSS_Service_Handler (void); int open (void *); @@ -35,9 +34,7 @@ public: int close (unsigned long); private: - TeraSS_Data data_; - }; class ACE_Svc_Export TeraSS_Acceptor @@ -52,9 +49,7 @@ class ACE_Svc_Export TeraSS_Acceptor // is created. { public: - int init (int argc, ACE_TCHAR *argv[]); - }; ACE_SVC_FACTORY_DECLARE (TeraSS_Acceptor) diff --git a/ACE/apps/JAWS3/small/SS_State_DONE.h b/ACE/apps/JAWS3/small/SS_State_DONE.h index de73a3e1c5d..be67fde6aa0 100644 --- a/ACE/apps/JAWS3/small/SS_State_DONE.h +++ b/ACE/apps/JAWS3/small/SS_State_DONE.h @@ -10,7 +10,6 @@ class TeraSS_State_DONE : public JAWS_Protocol_State { public: - int service (JAWS_Event_Completer *, void *data); JAWS_Protocol_State * transition ( const JAWS_Event_Result &result @@ -22,7 +21,6 @@ public: { return ACE_Singleton<TeraSS_State_DONE, ACE_SYNCH_MUTEX>::instance (); } - }; #endif /* TERA_SS_STATE_DONE_H */ diff --git a/ACE/apps/JAWS3/small/SS_State_ERROR.h b/ACE/apps/JAWS3/small/SS_State_ERROR.h index 4fb09f3c758..d042d6fcf0c 100644 --- a/ACE/apps/JAWS3/small/SS_State_ERROR.h +++ b/ACE/apps/JAWS3/small/SS_State_ERROR.h @@ -9,7 +9,6 @@ class TeraSS_State_ERROR : public JAWS_Protocol_State { public: - int service (JAWS_Event_Completer *, void *data); JAWS_Protocol_State * transition ( const JAWS_Event_Result &result @@ -21,7 +20,6 @@ public: { return ACE_Singleton<TeraSS_State_ERROR, ACE_SYNCH_MUTEX>::instance (); } - }; #endif /* TERA_SS_STATE_ERROR_H */ diff --git a/ACE/apps/JAWS3/small/SS_State_PARSE.h b/ACE/apps/JAWS3/small/SS_State_PARSE.h index d4224a3a078..54ec2a93068 100644 --- a/ACE/apps/JAWS3/small/SS_State_PARSE.h +++ b/ACE/apps/JAWS3/small/SS_State_PARSE.h @@ -9,7 +9,6 @@ class TeraSS_State_PARSE : public JAWS_Protocol_State { public: - int service (JAWS_Event_Completer *, void *data); JAWS_Protocol_State * transition ( const JAWS_Event_Result &result @@ -21,7 +20,6 @@ public: { return ACE_Singleton<TeraSS_State_PARSE, ACE_SYNCH_MUTEX>::instance (); } - }; #endif /* TERA_SS_STATE_PARSE_H */ diff --git a/ACE/apps/JAWS3/small/SS_State_READ.h b/ACE/apps/JAWS3/small/SS_State_READ.h index c6e2fdcf5d0..2fb1861116b 100644 --- a/ACE/apps/JAWS3/small/SS_State_READ.h +++ b/ACE/apps/JAWS3/small/SS_State_READ.h @@ -9,7 +9,6 @@ class TeraSS_State_READ : public JAWS_Protocol_State { public: - int service (JAWS_Event_Completer *, void *data); JAWS_Protocol_State * transition ( const JAWS_Event_Result &result @@ -21,7 +20,6 @@ public: { return ACE_Singleton<TeraSS_State_READ, ACE_SYNCH_MUTEX>::instance (); } - }; #endif /* TERA_SS_STATE_READ_H */ diff --git a/ACE/apps/JAWS3/small/SS_State_WRITE.h b/ACE/apps/JAWS3/small/SS_State_WRITE.h index a12c2578ab9..18f3340a34f 100644 --- a/ACE/apps/JAWS3/small/SS_State_WRITE.h +++ b/ACE/apps/JAWS3/small/SS_State_WRITE.h @@ -9,7 +9,6 @@ class TeraSS_State_WRITE : public JAWS_Protocol_State { public: - int service (JAWS_Event_Completer *, void *data); JAWS_Protocol_State * transition ( const JAWS_Event_Result &result @@ -21,7 +20,6 @@ public: { return ACE_Singleton<TeraSS_State_WRITE, ACE_SYNCH_MUTEX>::instance (); } - }; #endif /* TERA_SS_STATE_WRITE_H */ diff --git a/ACE/apps/drwho/Comm_Manager.h b/ACE/apps/drwho/Comm_Manager.h index 911f312b22f..dc681033755 100644 --- a/ACE/apps/drwho/Comm_Manager.h +++ b/ACE/apps/drwho/Comm_Manager.h @@ -18,7 +18,6 @@ class Comm_Manager { public: - virtual ~Comm_Manager (void); // = TITLE 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 8deb3ee4024..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 "); @@ -1000,7 +996,6 @@ Key_List::output_binary_search_function (void) ACE_OS::fflush(stdout); return 0; - } // Generates C code for the linear search algorithm that returns @@ -1089,7 +1084,6 @@ Key_List::output_linear_search_function (void) ACE_OS::fflush (stdout); return 0; - } // Generates C code for the hash function that returns the proper // encoding for each key word. @@ -1249,7 +1243,6 @@ Key_List::output_hash_function (void) do { - while (--count > key_pos) ACE_OS::printf (" case %d:\n", count); @@ -1814,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/gperf/src/Version.cpp b/ACE/apps/gperf/src/Version.cpp index dcc911c171b..05cdd217bbe 100644 --- a/ACE/apps/gperf/src/Version.cpp +++ b/ACE/apps/gperf/src/Version.cpp @@ -26,5 +26,4 @@ #include "ace/ACE.h" - const char *version_string = "2.8 (ACE version)"; 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/apps/soreduce/Library.h b/ACE/apps/soreduce/Library.h index 0c6f0ab0e3b..b5263c637c6 100644 --- a/ACE/apps/soreduce/Library.h +++ b/ACE/apps/soreduce/Library.h @@ -80,7 +80,6 @@ protected: class Library { public: - Library (const ACE_TCHAR *name = 0 ); /// Constructor is responsible for loading all of the modules related to the /// library diff --git a/ACE/apps/soreduce/SO_Group.cpp b/ACE/apps/soreduce/SO_Group.cpp index 5bd30c4ae8c..5ab3b76f3e6 100644 --- a/ACE/apps/soreduce/SO_Group.cpp +++ b/ACE/apps/soreduce/SO_Group.cpp @@ -217,5 +217,3 @@ SO_Group::list_libs (void) - - diff --git a/ACE/apps/soreduce/Signature.h b/ACE/apps/soreduce/Signature.h index f2be8aaae1f..2abe20fdcc1 100644 --- a/ACE/apps/soreduce/Signature.h +++ b/ACE/apps/soreduce/Signature.h @@ -22,7 +22,6 @@ class Signature { public: - enum Kind { text_, undef_ 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/Reactor/Reschedule.cpp b/ACE/examples/APG/Reactor/Reschedule.cpp index ab525e4c31d..807d76e6cb0 100644 --- a/ACE/examples/APG/Reactor/Reschedule.cpp +++ b/ACE/examples/APG/Reactor/Reschedule.cpp @@ -19,7 +19,6 @@ public: ACE_OS::ctime(&epoch))); return 0; } - }; // Listing 1 code/ch07 diff --git a/ACE/examples/APG/Reactor/Timer_Cancel.cpp b/ACE/examples/APG/Reactor/Timer_Cancel.cpp index 2dc784d7ac4..8928b046f01 100644 --- a/ACE/examples/APG/Reactor/Timer_Cancel.cpp +++ b/ACE/examples/APG/Reactor/Timer_Cancel.cpp @@ -19,7 +19,6 @@ public: ACE_OS::ctime(&epoch))); return 0; } - }; #if !defined (ACE_LACKS_UNIX_SIGNALS) 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/APG/Streams/RecordingDeviceFactory.h b/ACE/examples/APG/Streams/RecordingDeviceFactory.h index f8f4162d8cf..af0b370572f 100644 --- a/ACE/examples/APG/Streams/RecordingDeviceFactory.h +++ b/ACE/examples/APG/Streams/RecordingDeviceFactory.h @@ -11,7 +11,6 @@ class RecordingDevice; class RecordingDeviceFactory { public: - // Instantiate the appropriate RecordingDevice implementation static RecordingDevice *instantiate (int argc, ACE_TCHAR *argv[]); }; diff --git a/ACE/examples/APG/ThreadManagement/Coop_Cancel.cpp b/ACE/examples/APG/ThreadManagement/Coop_Cancel.cpp index 753f39af91f..0fd82167e7c 100644 --- a/ACE/examples/APG/ThreadManagement/Coop_Cancel.cpp +++ b/ACE/examples/APG/ThreadManagement/Coop_Cancel.cpp @@ -10,7 +10,6 @@ class CanceledTask : public ACE_Task<ACE_MT_SYNCH> { public: - virtual int svc (void) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) starting up\n"))); diff --git a/ACE/examples/APG/ThreadPools/Futures.cpp b/ACE/examples/APG/ThreadPools/Futures.cpp index c207c734828..3ad8c8b8c39 100644 --- a/ACE/examples/APG/ThreadPools/Futures.cpp +++ b/ACE/examples/APG/ThreadPools/Futures.cpp @@ -274,7 +274,6 @@ Manager::shut_down (void) delete req; delete worker; - } while (iter.advance ()); diff --git a/ACE/examples/APG/ThreadSafety/Tokens.cpp b/ACE/examples/APG/ThreadSafety/Tokens.cpp index 29496803034..bf17405a8f4 100644 --- a/ACE/examples/APG/ThreadSafety/Tokens.cpp +++ b/ACE/examples/APG/ThreadSafety/Tokens.cpp @@ -11,7 +11,6 @@ class Device; class HA_Device_Repository { public: - enum { N_DEVICES = 100 }; HA_Device_Repository () diff --git a/ACE/examples/ASX/CCM_App/CCM_App.cpp b/ACE/examples/ASX/CCM_App/CCM_App.cpp index 696fa0aa19e..1b59432e963 100644 --- a/ACE/examples/ASX/CCM_App/CCM_App.cpp +++ b/ACE/examples/ASX/CCM_App/CCM_App.cpp @@ -6,7 +6,6 @@ #include "ace/svc_export.h" - typedef ACE_Task<ACE_SYNCH> MT_Task; typedef ACE_Stream<ACE_SYNCH> MT_Stream; typedef ACE_Module<ACE_SYNCH> MT_Module; diff --git a/ACE/examples/ASX/CCM_App/SC_Client.cpp b/ACE/examples/ASX/CCM_App/SC_Client.cpp index 311de59c89d..f38955830ad 100644 --- a/ACE/examples/ASX/CCM_App/SC_Client.cpp +++ b/ACE/examples/ASX/CCM_App/SC_Client.cpp @@ -1,7 +1,6 @@ #include "ace/ACE.h" - // Pretty simple, eh? ;-) int diff --git a/ACE/examples/ASX/CCM_App/SC_Server.cpp b/ACE/examples/ASX/CCM_App/SC_Server.cpp index 8cfa03453f9..5b77547b128 100644 --- a/ACE/examples/ASX/CCM_App/SC_Server.cpp +++ b/ACE/examples/ASX/CCM_App/SC_Server.cpp @@ -9,7 +9,6 @@ #include "ace/Sig_Adapter.h" - class Event_Handler : public ACE_Event_Handler { public: diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp index 8a74e8039b4..489a6d3dacc 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp +++ b/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp @@ -6,7 +6,6 @@ #include "Options.h" - Consumer_Router::Consumer_Router (Peer_Router_Context *prc) : Peer_Router (prc) { diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp index 33e079ca875..d97f61f976c 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp +++ b/ACE/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp @@ -4,7 +4,6 @@ #include "Event_Analyzer.h" - int Event_Analyzer::open (void *) { diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Options.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Options.cpp index 76c24753020..d8ee1bddc3d 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Options.cpp +++ b/ACE/examples/ASX/Event_Server/Event_Server/Options.cpp @@ -9,7 +9,6 @@ #include "Options.h" - /* static */ Options *Options::instance_ = 0; diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Options.h b/ACE/examples/ASX/Event_Server/Event_Server/Options.h index de5bc064093..5d125cb16ee 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Options.h +++ b/ACE/examples/ASX/Event_Server/Event_Server/Options.h @@ -113,7 +113,6 @@ private: static Options *instance_; // Static Singleton. - }; #include "Options.inl" diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp index 41f00d1bb4c..c9b98e55bac 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp +++ b/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp @@ -7,7 +7,6 @@ #include "Peer_Router.h" - // Send the <ACE_Message_Block> to all the peers. Note that in a // "real" application this logic would most likely be more selective, // i.e., it would actually do "routing" based on addressing diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp index 81e20cfc3c7..8b5e41dab67 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp +++ b/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp @@ -6,7 +6,6 @@ #include "Options.h" - // Handle outgoing messages in a separate thread. int diff --git a/ACE/examples/ASX/Message_Queue/bounded_buffer.cpp b/ACE/examples/ASX/Message_Queue/bounded_buffer.cpp index be146982be5..1024ab549da 100644 --- a/ACE/examples/ASX/Message_Queue/bounded_buffer.cpp +++ b/ACE/examples/ASX/Message_Queue/bounded_buffer.cpp @@ -9,7 +9,6 @@ #include "ace/OS_NS_unistd.h" - #if defined (ACE_HAS_THREADS) // The producer reads data from the stdin stream, creates a message, diff --git a/ACE/examples/ASX/Message_Queue/buffer_stream.cpp b/ACE/examples/ASX/Message_Queue/buffer_stream.cpp index 95408d3897d..e8f60673ba1 100644 --- a/ACE/examples/ASX/Message_Queue/buffer_stream.cpp +++ b/ACE/examples/ASX/Message_Queue/buffer_stream.cpp @@ -18,7 +18,6 @@ #include "ace/Truncate.h" - #if defined (ACE_HAS_THREADS) typedef ACE_Stream<ACE_MT_SYNCH> MT_Stream; @@ -66,7 +65,6 @@ public: // Receive message from producer and print to stdout. private: - ACE_Time_Value timeout_; }; diff --git a/ACE/examples/ASX/Message_Queue/priority_buffer.cpp b/ACE/examples/ASX/Message_Queue/priority_buffer.cpp index cb72c5fa5e9..c622d99844b 100644 --- a/ACE/examples/ASX/Message_Queue/priority_buffer.cpp +++ b/ACE/examples/ASX/Message_Queue/priority_buffer.cpp @@ -11,7 +11,6 @@ #include "ace/Truncate.h" - #if defined (ACE_HAS_THREADS) // Global thread manager. diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp index 153fbd557e4..37a3f6bbb3b 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp +++ b/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp @@ -5,7 +5,6 @@ #include "Options.h" - #if defined (ACE_HAS_THREADS) typedef Acceptor_Factory<Consumer_Handler, CONSUMER_KEY> CONSUMER_FACTORY; diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp index 53341e28ee3..511ef3e899b 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp +++ b/ACE/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp @@ -3,7 +3,6 @@ #include "Event_Analyzer.h" - #if defined (ACE_HAS_THREADS) int diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Options.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Options.cpp index 2c464220d6e..80084147d6e 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Options.cpp +++ b/ACE/examples/ASX/UPIPE_Event_Server/Options.cpp @@ -9,7 +9,6 @@ #include "Options.h" - #if defined (ACE_HAS_THREADS) Options::Options (void) diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp index 51daaf8dcd7..7e8797e5102 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp +++ b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp @@ -9,7 +9,6 @@ #include "Options.h" - #if defined (ACE_HAS_THREADS) // Define some short-hand macros to deal with long templates @@ -140,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/ASX/UPIPE_Event_Server/Supplier_Router.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp index f372147bf67..246dd46374b 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp +++ b/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp @@ -5,7 +5,6 @@ #include "Supplier_Router.h" - #if defined (ACE_HAS_THREADS) typedef Acceptor_Factory<Supplier_Handler, SUPPLIER_KEY> SUPPLIER_FACTORY; diff --git a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.cpp b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.cpp index 41bea6c84e1..9ff1b557d5d 100644 --- a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.cpp +++ b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.cpp @@ -15,7 +15,6 @@ #include "BPR_Drivers.h" - // Constructor. Input_Device_Wrapper_Base::Input_Device_Wrapper_Base (ACE_Thread_Manager *input_task_mgr) @@ -487,7 +486,6 @@ Bounded_Packet_Relay::queue_lwm (ACE_UINT32 lwm) } - // Returns string corresponding to current status. const char * diff --git a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.h b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.h index 33d96964c37..152bfdb8f9d 100644 --- a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.h +++ b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.h @@ -154,7 +154,6 @@ private: /// Ending time of the most recent transmission. ACE_Time_Value transmission_end_; - }; /** @@ -245,7 +244,6 @@ protected: /// Currently remaining count of messages to send before stopping /// (-1 indicates the device should not stop). long current_count_; - }; /** @@ -264,7 +262,6 @@ protected: class Output_Device_Wrapper_Base { public: - virtual ~Output_Device_Wrapper_Base (void); /// Writes contents of the passed message block out to the underlying diff --git a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.cpp b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.cpp index b320b20a433..b58feac6f95 100644 --- a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.cpp +++ b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.cpp @@ -21,7 +21,6 @@ #include "ace/OS_NS_unistd.h" - // Constructor. template <class TQ> 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 880f1052c35..d6250357ecd 100644 --- a/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp +++ b/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp @@ -22,7 +22,6 @@ typedef ACE_Command_Callback<BPR_Handler_Base, BPR_Handler_Base::ACTION> HANDLER typedef ACE_Command_Callback<Send_Handler, Send_Handler::ACTION> SEND_HANDLER_CMD; - // Constructor. Text_Input_Device_Wrapper::Text_Input_Device_Wrapper (ACE_Thread_Manager *input_task_mgr, @@ -69,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/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h b/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h index 727393c5514..691149db411 100644 --- a/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h +++ b/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h @@ -65,7 +65,6 @@ class Thread_Bounded_Packet_Relay_Driver; class Text_Input_Device_Wrapper : public Input_Device_Wrapper_Base { public: - // = Enumerated logging level flags enum Logging_Flags {NO_LOGGING = 0, LOG_MSGS_CREATED = 1}; @@ -106,7 +105,6 @@ private: /// This value holds a count of packets created. u_long packet_count_; - }; /** @@ -120,7 +118,6 @@ private: class Text_Output_Device_Wrapper : public Output_Device_Wrapper_Base { public: - // = Enumerated logging level flags enum Logging_Flags {NO_LOGGING = 0, LOG_MSGS_RCVD = 2, @@ -142,13 +139,11 @@ public: virtual int modify_device_settings (void *logging); private: - /// This value holds the logging level. int logging_; /// This value holds a count of packets received. u_long packet_count_; - }; /** @@ -163,7 +158,6 @@ private: class User_Input_Task : public ACE_Task_Base { public: - // = Trait for command accessible entry points. typedef int (User_Input_Task::*ACTION) (void *); @@ -241,7 +235,6 @@ private: class BPR_Handler_Base : public ACE_Event_Handler { public: - // = Trait for command accessible entry points. typedef int (BPR_Handler_Base::*ACTION) (void *); @@ -286,7 +279,6 @@ class Send_Handler; class Send_Handler : public BPR_Handler_Base { public: - // = Trait for command accessible entry points. typedef int (Send_Handler::*ACTION) (void *); @@ -314,7 +306,6 @@ public: virtual int reregister (void *timeout); private: - /// Count of the number of messages to send from the /// relay object to the output device object. u_long send_count_; diff --git a/ACE/examples/C++NPv1/Iterative_Logging_Server.h b/ACE/examples/C++NPv1/Iterative_Logging_Server.h index b55e4471e16..bb724b6a66e 100644 --- a/ACE/examples/C++NPv1/Iterative_Logging_Server.h +++ b/ACE/examples/C++NPv1/Iterative_Logging_Server.h @@ -56,7 +56,6 @@ protected: logging_handler_.close (); // Close the socket handle. return 0; } - }; #endif /* _ITERATIVE_LOGGING_SERVER_H */ diff --git a/ACE/examples/C++NPv1/Process_Per_Connection_Logging_Server.h b/ACE/examples/C++NPv1/Process_Per_Connection_Logging_Server.h index 5fee428b026..5ce9920f8d3 100644 --- a/ACE/examples/C++NPv1/Process_Per_Connection_Logging_Server.h +++ b/ACE/examples/C++NPv1/Process_Per_Connection_Logging_Server.h @@ -45,7 +45,6 @@ protected: public: virtual int run (int argc, char *argv[]); - }; #endif /* _PROCESS_PER_CONNECTION_LOGGING_SERVER_H */ diff --git a/ACE/examples/C++NPv1/Reactive_Logging_Server.h b/ACE/examples/C++NPv1/Reactive_Logging_Server.h index 3c6f261ad0e..533da5e08fd 100644 --- a/ACE/examples/C++NPv1/Reactive_Logging_Server.h +++ b/ACE/examples/C++NPv1/Reactive_Logging_Server.h @@ -73,7 +73,6 @@ protected: } return 0; } - }; #endif /* _REACTIVE_LOGGING_SERVER_H */ diff --git a/ACE/examples/C++NPv1/Reactive_Logging_Server_Ex.h b/ACE/examples/C++NPv1/Reactive_Logging_Server_Ex.h index 85b7e8a22cf..29cfea005c5 100644 --- a/ACE/examples/C++NPv1/Reactive_Logging_Server_Ex.h +++ b/ACE/examples/C++NPv1/Reactive_Logging_Server_Ex.h @@ -88,7 +88,6 @@ protected: } return 0; } - }; #endif /* _REACTIVE_LOGGING_SERVER_EX_H */ 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/C++NPv2/Select_Reactor_Logging_Server.cpp b/ACE/examples/C++NPv2/Select_Reactor_Logging_Server.cpp index cc3a1ae9b36..366562ef167 100644 --- a/ACE/examples/C++NPv2/Select_Reactor_Logging_Server.cpp +++ b/ACE/examples/C++NPv2/Select_Reactor_Logging_Server.cpp @@ -35,7 +35,6 @@ public: { delete this; return 0; } protected: - // Protected destructor ensures dynamic allocation. virtual ~Quit_Handler () {} }; diff --git a/ACE/examples/C++NPv2/Server_Shutdown.cpp b/ACE/examples/C++NPv2/Server_Shutdown.cpp index 5e9f7cfec4a..eb75e3d6b1a 100644 --- a/ACE/examples/C++NPv2/Server_Shutdown.cpp +++ b/ACE/examples/C++NPv2/Server_Shutdown.cpp @@ -33,7 +33,6 @@ public: { delete this; return 0; } protected: - // Protected destructor ensures dynamic allocation. virtual ~Quit_Handler () {} }; diff --git a/ACE/examples/C++NPv2/TP_Reactor_Logging_Server.cpp b/ACE/examples/C++NPv2/TP_Reactor_Logging_Server.cpp index 0695e751c8e..ab9c42ccc13 100644 --- a/ACE/examples/C++NPv2/TP_Reactor_Logging_Server.cpp +++ b/ACE/examples/C++NPv2/TP_Reactor_Logging_Server.cpp @@ -36,7 +36,6 @@ public: { delete this; return 0; } protected: - // Protected destructor ensures dynamic allocation. virtual ~Quit_Handler () {} }; diff --git a/ACE/examples/ConfigViewer/ValueDlg.h b/ACE/examples/ConfigViewer/ValueDlg.h index d909e75770d..faae174c18a 100644 --- a/ACE/examples/ConfigViewer/ValueDlg.h +++ b/ACE/examples/ConfigViewer/ValueDlg.h @@ -42,7 +42,6 @@ protected: u_int m_UINTValue; private: - }; #endif diff --git a/ACE/examples/ConfigViewer/ValueListCtrl.cpp b/ACE/examples/ConfigViewer/ValueListCtrl.cpp index 53bbc04cdc5..9a30226ef3b 100644 --- a/ACE/examples/ConfigViewer/ValueListCtrl.cpp +++ b/ACE/examples/ConfigViewer/ValueListCtrl.cpp @@ -136,7 +136,6 @@ void ValueListCtrl::OnModify(wxCommandEvent& event) Value = Dlg.GetUINTValue(); m_pConfig->set_integer_value(m_Key, Name, Value); - } break; case ACE_Configuration::BINARY: diff --git a/ACE/examples/ConfigViewer/ValueListCtrl.h b/ACE/examples/ConfigViewer/ValueListCtrl.h index 914a8d71967..78f33256a89 100644 --- a/ACE/examples/ConfigViewer/ValueListCtrl.h +++ b/ACE/examples/ConfigViewer/ValueListCtrl.h @@ -36,7 +36,6 @@ protected: DECLARE_EVENT_TABLE() private: - ACE_Configuration* m_pConfig; ACE_Configuration_Section_Key m_Key; }; diff --git a/ACE/examples/ConfigViewer/stdafx.h b/ACE/examples/ConfigViewer/stdafx.h index 5a62cdd3a2d..0a3e236f075 100644 --- a/ACE/examples/ConfigViewer/stdafx.h +++ b/ACE/examples/ConfigViewer/stdafx.h @@ -11,4 +11,3 @@ - diff --git a/ACE/examples/Connection/blocking/SPIPE-acceptor.cpp b/ACE/examples/Connection/blocking/SPIPE-acceptor.cpp index 9d0766d61d9..310ee23b1b6 100644 --- a/ACE/examples/Connection/blocking/SPIPE-acceptor.cpp +++ b/ACE/examples/Connection/blocking/SPIPE-acceptor.cpp @@ -10,7 +10,6 @@ #include "SPIPE-acceptor.h" - #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) Svc_Handler::Svc_Handler (void) diff --git a/ACE/examples/Connection/blocking/SPIPE-connector.cpp b/ACE/examples/Connection/blocking/SPIPE-connector.cpp index 61ef11b801c..65f3dd5b859 100644 --- a/ACE/examples/Connection/blocking/SPIPE-connector.cpp +++ b/ACE/examples/Connection/blocking/SPIPE-connector.cpp @@ -11,7 +11,6 @@ #include "SPIPE-connector.h" - Peer_Handler::Peer_Handler (int iterations) : iterations_ (iterations) { diff --git a/ACE/examples/Connection/blocking/test_spipe_acceptor.cpp b/ACE/examples/Connection/blocking/test_spipe_acceptor.cpp index 18ed1b7f6a7..1d3d2af5ebe 100644 --- a/ACE/examples/Connection/blocking/test_spipe_acceptor.cpp +++ b/ACE/examples/Connection/blocking/test_spipe_acceptor.cpp @@ -3,7 +3,6 @@ #include "SPIPE-acceptor.h" - #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) int diff --git a/ACE/examples/Connection/blocking/test_spipe_connector.cpp b/ACE/examples/Connection/blocking/test_spipe_connector.cpp index f6a52f6c805..7d992f7c30e 100644 --- a/ACE/examples/Connection/blocking/test_spipe_connector.cpp +++ b/ACE/examples/Connection/blocking/test_spipe_connector.cpp @@ -3,7 +3,6 @@ #include "SPIPE-connector.h" - int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { diff --git a/ACE/examples/Connection/misc/test_upipe.cpp b/ACE/examples/Connection/misc/test_upipe.cpp index 37b7e48d7f8..a2b6e225acd 100644 --- a/ACE/examples/Connection/misc/test_upipe.cpp +++ b/ACE/examples/Connection/misc/test_upipe.cpp @@ -10,7 +10,6 @@ #include "ace/UPIPE_Addr.h" - #if defined (ACE_HAS_THREADS) #include "test_upipe.h" diff --git a/ACE/examples/Connection/non_blocking/test_lsock_connector.cpp b/ACE/examples/Connection/non_blocking/test_lsock_connector.cpp index 9589a043e5b..419fc488bbe 100644 --- a/ACE/examples/Connection/non_blocking/test_lsock_connector.cpp +++ b/ACE/examples/Connection/non_blocking/test_lsock_connector.cpp @@ -18,7 +18,6 @@ ACE_TMAIN (int, ACE_TCHAR *argv[]) #include "CPP-connector.h" - typedef Peer_Handler<ACE_LSOCK_STREAM> PEER_HANDLER; typedef IPC_Client<PEER_HANDLER, ACE_LSOCK_CONNECTOR> IPC_CLIENT; diff --git a/ACE/examples/Connection/non_blocking/test_sock_connector.cpp b/ACE/examples/Connection/non_blocking/test_sock_connector.cpp index 50bd1fc51ea..10693f528c6 100644 --- a/ACE/examples/Connection/non_blocking/test_sock_connector.cpp +++ b/ACE/examples/Connection/non_blocking/test_sock_connector.cpp @@ -5,7 +5,6 @@ #include "CPP-connector.h" - typedef Peer_Handler<ACE_SOCK_STREAM> PEER_HANDLER; typedef IPC_Client<PEER_HANDLER, ACE_SOCK_CONNECTOR> IPC_CLIENT; diff --git a/ACE/examples/Connection/non_blocking/test_spipe_connector.cpp b/ACE/examples/Connection/non_blocking/test_spipe_connector.cpp index 954cd8de269..baa6c8e43b0 100644 --- a/ACE/examples/Connection/non_blocking/test_spipe_connector.cpp +++ b/ACE/examples/Connection/non_blocking/test_spipe_connector.cpp @@ -5,7 +5,6 @@ #include "CPP-connector.h" - #if !defined (ACE_WIN32) typedef Peer_Handler<ACE_SPIPE_STREAM> PEER_HANDLER; typedef IPC_Client<PEER_HANDLER, ACE_SPIPE_CONNECTOR> IPC_CLIENT; diff --git a/ACE/examples/Connection/non_blocking/test_tli_connector.cpp b/ACE/examples/Connection/non_blocking/test_tli_connector.cpp index 8dca142fff6..a61ba999683 100644 --- a/ACE/examples/Connection/non_blocking/test_tli_connector.cpp +++ b/ACE/examples/Connection/non_blocking/test_tli_connector.cpp @@ -5,7 +5,6 @@ #include "CPP-connector.h" - #if defined (ACE_HAS_TLI) typedef Peer_Handler<ACE_TLI_STREAM> PEER_HANDLER; diff --git a/ACE/examples/IPC_SAP/ATM_SAP/CPP-client.cpp b/ACE/examples/IPC_SAP/ATM_SAP/CPP-client.cpp index aa1a68175bc..4623ff1ae84 100644 --- a/ACE/examples/IPC_SAP/ATM_SAP/CPP-client.cpp +++ b/ACE/examples/IPC_SAP/ATM_SAP/CPP-client.cpp @@ -5,7 +5,6 @@ #include "ace/Log_Msg.h" - #if defined (ACE_HAS_ATM) #define MAX_LEAVES 32 @@ -132,7 +131,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) hosts[ i ], i, 0 ); - } } /* if num_leaves == 1 */ diff --git a/ACE/examples/IPC_SAP/ATM_SAP/CPP-server.cpp b/ACE/examples/IPC_SAP/ATM_SAP/CPP-server.cpp index cca4b3e62cb..57acb4a7930 100644 --- a/ACE/examples/IPC_SAP/ATM_SAP/CPP-server.cpp +++ b/ACE/examples/IPC_SAP/ATM_SAP/CPP-server.cpp @@ -5,7 +5,6 @@ #include "ace/Log_Msg.h" - #if defined (ACE_HAS_ATM) // ACE_ATM Server diff --git a/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-client.cpp b/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-client.cpp index 82810c26a36..65025e07ba2 100644 --- a/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-client.cpp +++ b/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-client.cpp @@ -6,7 +6,6 @@ #include "ace/OS_NS_string.h" - #if defined (ACE_HAS_STREAM_PIPES) int diff --git a/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-server.cpp b/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-server.cpp index 588716fc91e..a3d63dc0aaf 100644 --- a/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-server.cpp +++ b/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-server.cpp @@ -7,7 +7,6 @@ #include "ace/OS_main.h" - #if defined (ACE_HAS_STREAM_PIPES) int diff --git a/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-client.cpp b/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-client.cpp index 6ff0fea3b5d..9f27ef580b9 100644 --- a/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-client.cpp +++ b/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-client.cpp @@ -6,7 +6,6 @@ #include "ace/OS_main.h" - int ACE_TMAIN (int, ACE_TCHAR *[]) { diff --git a/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-server.cpp b/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-server.cpp index 3dbafa20cba..918f533b8c8 100644 --- a/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-server.cpp +++ b/ACE/examples/IPC_SAP/FIFO_SAP/FIFO-server.cpp @@ -5,7 +5,6 @@ #include "ace/OS_main.h" - int ACE_TMAIN (int, ACE_TCHAR *[]) { diff --git a/ACE/examples/IPC_SAP/FILE_SAP/client.cpp b/ACE/examples/IPC_SAP/FILE_SAP/client.cpp index 8bb5342e248..1a0f4c4e8cb 100644 --- a/ACE/examples/IPC_SAP/FILE_SAP/client.cpp +++ b/ACE/examples/IPC_SAP/FILE_SAP/client.cpp @@ -7,7 +7,6 @@ #include "ace/OS_NS_stdio.h" - int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp index 3b374b7de52..e4328d0f0b5 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/C-inclient.cpp @@ -8,7 +8,6 @@ #include "ace/Default_Constants.h" - /* BSD socket client */ int diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp index d68cc78ac5b..500f091fee8 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp @@ -9,7 +9,6 @@ #include "ace/Default_Constants.h" - /* BSD socket server. */ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) 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/SOCK_SAP/CPP-inserver-fancy.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp index 369bde93281..1d5453ba7fe 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp @@ -14,7 +14,6 @@ #include "CPP-inserver-fancy.h" - // Forward declaration. class Handler; diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp index 9b3d40111bd..b23f99c9b9c 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp @@ -12,7 +12,6 @@ #include "ace/OS_NS_stdio.h" - #if defined (ACE_HAS_POLL) // Should we be verbose? diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-memserver.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-memserver.cpp index 648882e29c7..77916986d5d 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-memserver.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-memserver.cpp @@ -9,7 +9,6 @@ #include "ace/Profile_Timer.h" - static int run_event_loop (u_short port) { diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-unclient.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-unclient.cpp index f9693012135..afd85f1bcf0 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-unclient.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-unclient.cpp @@ -7,7 +7,6 @@ #include "ace/OS_NS_unistd.h" - #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp index 5baabeb8b61..2dd15f63352 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp @@ -8,7 +8,6 @@ #include "ace/OS_NS_unistd.h" - #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) // Are we running verbosely? @@ -55,7 +54,6 @@ server (void *arg) ACE_TEXT ("%p\n"), ACE_TEXT ("recv"))); break; - } else if (r_bytes == 0) { diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/FD-unclient.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/FD-unclient.cpp index 2533bb321b4..03e5131f917 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/FD-unclient.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/FD-unclient.cpp @@ -5,7 +5,6 @@ #include "ace/OS_main.h" - #if defined (ACE_HAS_MSG) && !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) // ACE_LSOCK Client. diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp index 3f7690a43d1..6fc1b3f4bf0 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp @@ -9,7 +9,6 @@ #include "ace/OS_NS_stdlib.h" - #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) // ACE_LSOCK Server diff --git a/ACE/examples/IPC_SAP/SPIPE_SAP/NPClient.cpp b/ACE/examples/IPC_SAP/SPIPE_SAP/NPClient.cpp index e997ab26962..6341ccc8d98 100644 --- a/ACE/examples/IPC_SAP/SPIPE_SAP/NPClient.cpp +++ b/ACE/examples/IPC_SAP/SPIPE_SAP/NPClient.cpp @@ -8,7 +8,6 @@ #include "ace/OS_Memory.h" - #if defined (ACE_WIN32) #define MAKE_PIPE_NAME(X) ACE_TEXT ("\\\\.\\pipe\\") ACE_TEXT (X) #else diff --git a/ACE/examples/IPC_SAP/SPIPE_SAP/NPServer.cpp b/ACE/examples/IPC_SAP/SPIPE_SAP/NPServer.cpp index 55cf607e59f..3afde969abe 100644 --- a/ACE/examples/IPC_SAP/SPIPE_SAP/NPServer.cpp +++ b/ACE/examples/IPC_SAP/SPIPE_SAP/NPServer.cpp @@ -5,7 +5,6 @@ #include "ace/OS_NS_unistd.h" - #if defined (ACE_WIN32) #define MAKE_PIPE_NAME(X) ACE_TEXT ("\\\\.\\pipe\\") ACE_TEXT (X) #else diff --git a/ACE/examples/IPC_SAP/SPIPE_SAP/client.cpp b/ACE/examples/IPC_SAP/SPIPE_SAP/client.cpp index 9c61536b21c..37ea3bdc535 100644 --- a/ACE/examples/IPC_SAP/SPIPE_SAP/client.cpp +++ b/ACE/examples/IPC_SAP/SPIPE_SAP/client.cpp @@ -6,7 +6,6 @@ #include "ace/OS_NS_string.h" - #if defined (ACE_HAS_STREAM_PIPES) #include "shared.h" diff --git a/ACE/examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp b/ACE/examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp index c1511cbb2d6..41f0631cb29 100644 --- a/ACE/examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp +++ b/ACE/examples/IPC_SAP/SPIPE_SAP/consumer_msg.cpp @@ -7,7 +7,6 @@ #include "ace/Time_Value.h" - #if defined (ACE_HAS_STREAM_PIPES) #include "shared.h" diff --git a/ACE/examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp b/ACE/examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp index f772fef27ef..392513f92b2 100644 --- a/ACE/examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp +++ b/ACE/examples/IPC_SAP/SPIPE_SAP/consumer_read.cpp @@ -7,7 +7,6 @@ #include "ace/Time_Value.h" - #if defined (ACE_HAS_STREAM_PIPES) #include "shared.h" diff --git a/ACE/examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp b/ACE/examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp index 0c4d479b1e1..fbb9a7e06c5 100644 --- a/ACE/examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp +++ b/ACE/examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp @@ -9,7 +9,6 @@ #include "ace/Time_Value.h" - #if defined (ACE_HAS_STREAM_PIPES) #include "shared.h" diff --git a/ACE/examples/IPC_SAP/SPIPE_SAP/producer_read.cpp b/ACE/examples/IPC_SAP/SPIPE_SAP/producer_read.cpp index 9f6f6eadbf8..d16fc8d080c 100644 --- a/ACE/examples/IPC_SAP/SPIPE_SAP/producer_read.cpp +++ b/ACE/examples/IPC_SAP/SPIPE_SAP/producer_read.cpp @@ -6,7 +6,6 @@ - #if defined (ACE_HAS_STREAM_PIPES) #include "shared.h" diff --git a/ACE/examples/IPC_SAP/SPIPE_SAP/server.cpp b/ACE/examples/IPC_SAP/SPIPE_SAP/server.cpp index 16e03de54a0..43b65be91f2 100644 --- a/ACE/examples/IPC_SAP/SPIPE_SAP/server.cpp +++ b/ACE/examples/IPC_SAP/SPIPE_SAP/server.cpp @@ -7,7 +7,6 @@ #include "ace/OS_NS_unistd.h" - #if defined (ACE_HAS_STREAM_PIPES) #include "shared.h" diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h index 5284aaa8957..96f3179ee2c 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h @@ -90,7 +90,6 @@ private: char oneway_; // Are we running oneway or twoway? - }; #endif /* ACE_SSL_CLIENT_SIMPLE_H */ 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 2601dc12389..1e1a552154d 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp @@ -73,7 +73,6 @@ public: //FUZZ: enable check_for_lack_ACE_OS protected: - Handler (ACE_SSL_SOCK_Stream *ssl_stream); // Constructor. @@ -111,15 +110,12 @@ class Twoway_Handler : public Handler // = TITLE // Performs the twoway protocol. public: - Twoway_Handler (ACE_SSL_SOCK_Stream *ssl_stream); // Constructor. private: - virtual int run (void); // Template Method hook called by <svc>. - }; class Oneway_Handler : public Handler @@ -590,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/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp b/ACE/examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp index 4f9e645ee83..618133a284c 100644 --- a/ACE/examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp +++ b/ACE/examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp @@ -4,7 +4,6 @@ #include "ace/Log_Msg.h" - #if defined (ACE_HAS_FORE_ATM_XTI) /* ACE_XTI/ATM Client */ diff --git a/ACE/examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp b/ACE/examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp index 0f12a3f53bc..b35ba5910ee 100644 --- a/ACE/examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp +++ b/ACE/examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp @@ -3,7 +3,6 @@ #include "ace/Log_Msg.h" - #if defined (ACE_HAS_FORE_ATM_XTI) // ACE_TLI Server @@ -97,7 +96,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_ERROR ((LM_ERROR, "%p\n", "close")); - } /* NOTREACHED */ return 0; diff --git a/ACE/examples/IPC_SAP/TLI_SAP/CPP-client.cpp b/ACE/examples/IPC_SAP/TLI_SAP/CPP-client.cpp index d91475470b4..6e3e63413da 100644 --- a/ACE/examples/IPC_SAP/TLI_SAP/CPP-client.cpp +++ b/ACE/examples/IPC_SAP/TLI_SAP/CPP-client.cpp @@ -6,7 +6,6 @@ #include "ace/Time_Value.h" - #if defined (ACE_HAS_TLI) /* ACE_TLI Client */ diff --git a/ACE/examples/IPC_SAP/TLI_SAP/CPP-server.cpp b/ACE/examples/IPC_SAP/TLI_SAP/CPP-server.cpp index f6559ae097d..7aa26e1ee48 100644 --- a/ACE/examples/IPC_SAP/TLI_SAP/CPP-server.cpp +++ b/ACE/examples/IPC_SAP/TLI_SAP/CPP-server.cpp @@ -4,7 +4,6 @@ #include "ace/OS_NS_unistd.h" - #if defined (ACE_HAS_TLI) // ACE_TLI Server @@ -71,7 +70,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_ERROR ((LM_ERROR, "%p\n", "close")); - } /* NOTREACHED */ return 0; diff --git a/ACE/examples/IPC_SAP/TLI_SAP/db-server.cpp b/ACE/examples/IPC_SAP/TLI_SAP/db-server.cpp index f656a51b249..de27c79613a 100644 --- a/ACE/examples/IPC_SAP/TLI_SAP/db-server.cpp +++ b/ACE/examples/IPC_SAP/TLI_SAP/db-server.cpp @@ -5,7 +5,6 @@ #include "ace/Thread_Manager.h" - #if defined (ACE_HAS_THREADS) && defined (ACE_HAS_TLI) // Global thread manager. diff --git a/ACE/examples/IPC_SAP/TLI_SAP/ftp-client.cpp b/ACE/examples/IPC_SAP/TLI_SAP/ftp-client.cpp index c5357163db3..48f11eea4b7 100644 --- a/ACE/examples/IPC_SAP/TLI_SAP/ftp-client.cpp +++ b/ACE/examples/IPC_SAP/TLI_SAP/ftp-client.cpp @@ -6,7 +6,6 @@ #include "ace/OS_NS_unistd.h" - #if defined (ACE_HAS_TLI) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) diff --git a/ACE/examples/IPC_SAP/TLI_SAP/ftp-server.cpp b/ACE/examples/IPC_SAP/TLI_SAP/ftp-server.cpp index ac5a9fa34a6..735a3f327bb 100644 --- a/ACE/examples/IPC_SAP/TLI_SAP/ftp-server.cpp +++ b/ACE/examples/IPC_SAP/TLI_SAP/ftp-server.cpp @@ -5,7 +5,6 @@ #include "ace/TLI_Acceptor.h" - #if defined (ACE_HAS_THREADS) && defined (ACE_HAS_TLI) ACE_Thread_Manager thr_mgr; diff --git a/ACE/examples/IPC_SAP/UPIPE_SAP/ex1.cpp b/ACE/examples/IPC_SAP/UPIPE_SAP/ex1.cpp index a658cb705c2..a40faca8ed9 100644 --- a/ACE/examples/IPC_SAP/UPIPE_SAP/ex1.cpp +++ b/ACE/examples/IPC_SAP/UPIPE_SAP/ex1.cpp @@ -18,7 +18,6 @@ #include "ace/UPIPE_Connector.h" - #if defined (ACE_HAS_THREADS) // Global pattern diff --git a/ACE/examples/IPC_SAP/UPIPE_SAP/ex2.cpp b/ACE/examples/IPC_SAP/UPIPE_SAP/ex2.cpp index a676f751bfc..f4eb783f9f8 100644 --- a/ACE/examples/IPC_SAP/UPIPE_SAP/ex2.cpp +++ b/ACE/examples/IPC_SAP/UPIPE_SAP/ex2.cpp @@ -18,7 +18,6 @@ #include "ace/OS_NS_time.h" - #if defined (ACE_HAS_THREADS) // Data for testsuite. diff --git a/ACE/examples/IPC_SAP/UPIPE_SAP/ex3.cpp b/ACE/examples/IPC_SAP/UPIPE_SAP/ex3.cpp index 7f02b89b9ce..4e725621728 100644 --- a/ACE/examples/IPC_SAP/UPIPE_SAP/ex3.cpp +++ b/ACE/examples/IPC_SAP/UPIPE_SAP/ex3.cpp @@ -19,7 +19,6 @@ #include "ace/OS_NS_time.h" - #if defined (ACE_HAS_THREADS) // Data for testsuite. diff --git a/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.h b/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.h index 40bc0d6bece..23a4ba17a71 100644 --- a/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.h +++ b/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFC.h @@ -46,7 +46,6 @@ public: // MFC Log class for ACE_Log_Msg. To be used by ACE_DEBUG MFC_Log m_mfc_logger; - }; diff --git a/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFCDlg.cpp b/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFCDlg.cpp index 6528e292d48..c05addf6cc7 100644 --- a/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFCDlg.cpp +++ b/ACE/examples/Log_Msg/Log_Msg_MFC/Log_Msg_MFCDlg.cpp @@ -177,7 +177,6 @@ HCURSOR CLog_Msg_MFCDlg::OnQueryDragIcon() void CLog_Msg_MFCDlg::OnDebugButtonClicked() { ACE_DEBUG(( LM_DEBUG, "Debug message sent!\n" )); - } #endif /* ACE_WIN32 */ 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/Log_Msg/Log_Msg_MFC/MFC_Log.h b/ACE/examples/Log_Msg/Log_Msg_MFC/MFC_Log.h index 121839979fc..285c3df7d77 100644 --- a/ACE/examples/Log_Msg/Log_Msg_MFC/MFC_Log.h +++ b/ACE/examples/Log_Msg/Log_Msg_MFC/MFC_Log.h @@ -38,7 +38,6 @@ public: /// destructor virtual ~MFC_Log(); - }; #endif /* MFC_LOG_H */ diff --git a/ACE/examples/Log_Msg/Log_Msg_MFC/StdAfx.cpp b/ACE/examples/Log_Msg/Log_Msg_MFC/StdAfx.cpp index 367c927dfe8..fe6cac897f6 100644 --- a/ACE/examples/Log_Msg/Log_Msg_MFC/StdAfx.cpp +++ b/ACE/examples/Log_Msg/Log_Msg_MFC/StdAfx.cpp @@ -5,4 +5,3 @@ #include "stdafx.h" - diff --git a/ACE/examples/Log_Msg/test_callback.cpp b/ACE/examples/Log_Msg/test_callback.cpp index 2216758203a..5ccef91eed5 100644 --- a/ACE/examples/Log_Msg/test_callback.cpp +++ b/ACE/examples/Log_Msg/test_callback.cpp @@ -19,7 +19,6 @@ #include "ace/OS_NS_stdio.h" - /** * @class Logger Subclassing from ACE_Log_Msg_Callback means that an instance of diff --git a/ACE/examples/Log_Msg/test_log_msg.cpp b/ACE/examples/Log_Msg/test_log_msg.cpp index 35b75307228..4da36aaddd4 100644 --- a/ACE/examples/Log_Msg/test_log_msg.cpp +++ b/ACE/examples/Log_Msg/test_log_msg.cpp @@ -21,7 +21,6 @@ #include "ace/OS_NS_stdlib.h" - static void cleanup (void) { diff --git a/ACE/examples/Log_Msg/test_ostream.cpp b/ACE/examples/Log_Msg/test_ostream.cpp index b8776e019cc..ae6b9e9bd2b 100644 --- a/ACE/examples/Log_Msg/test_ostream.cpp +++ b/ACE/examples/Log_Msg/test_ostream.cpp @@ -19,7 +19,6 @@ #include "ace/Log_Msg.h" - int ACE_TMAIN (int, ACE_TCHAR *[]) { diff --git a/ACE/examples/Mem_Map/IO-tests/IO_Test.h b/ACE/examples/Mem_Map/IO-tests/IO_Test.h index d179bfa1fcf..5098a992656 100644 --- a/ACE/examples/Mem_Map/IO-tests/IO_Test.h +++ b/ACE/examples/Mem_Map/IO-tests/IO_Test.h @@ -12,7 +12,6 @@ class IO_Test { public: - // Initialize the test name IO_Test (const char *name, ACE_Profile_Timer &tm); diff --git a/ACE/examples/Mem_Map/file-reverse/file-reverse.cpp b/ACE/examples/Mem_Map/file-reverse/file-reverse.cpp index e858abad6ad..7e02c1fd312 100644 --- a/ACE/examples/Mem_Map/file-reverse/file-reverse.cpp +++ b/ACE/examples/Mem_Map/file-reverse/file-reverse.cpp @@ -7,7 +7,6 @@ #include "ace/Truncate.h" - static void putline (const char *s) { diff --git a/ACE/examples/Misc/test_dump.cpp b/ACE/examples/Misc/test_dump.cpp index 291693a38fe..9b8757f9963 100644 --- a/ACE/examples/Misc/test_dump.cpp +++ b/ACE/examples/Misc/test_dump.cpp @@ -9,7 +9,6 @@ #include "ace/Reactor.h" - int ACE_TMAIN (int, ACE_TCHAR *[]) { diff --git a/ACE/examples/Misc/test_get_opt.cpp b/ACE/examples/Misc/test_get_opt.cpp index 261ff47a13a..5c35ad26ff2 100644 --- a/ACE/examples/Misc/test_get_opt.cpp +++ b/ACE/examples/Misc/test_get_opt.cpp @@ -5,7 +5,6 @@ #include "ace/Log_Msg.h" - int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { diff --git a/ACE/examples/Misc/test_profile_timer.cpp b/ACE/examples/Misc/test_profile_timer.cpp index 9143ab0652c..042053f45d8 100644 --- a/ACE/examples/Misc/test_profile_timer.cpp +++ b/ACE/examples/Misc/test_profile_timer.cpp @@ -5,7 +5,6 @@ #include "ace/OS_NS_unistd.h" - static const int DEFAULT_ITERATIONS = 100000000; int diff --git a/ACE/examples/Misc/test_sstring.cpp b/ACE/examples/Misc/test_sstring.cpp index 8243ef71482..a76a7758eb8 100644 --- a/ACE/examples/Misc/test_sstring.cpp +++ b/ACE/examples/Misc/test_sstring.cpp @@ -3,7 +3,6 @@ #include "ace/Log_Msg.h" - int ACE_TMAIN (int, ACE_TCHAR *[]) { diff --git a/ACE/examples/Misc/test_timestamp.cpp b/ACE/examples/Misc/test_timestamp.cpp index 8d1eb5249b5..a0d3d6246dc 100644 --- a/ACE/examples/Misc/test_timestamp.cpp +++ b/ACE/examples/Misc/test_timestamp.cpp @@ -5,7 +5,6 @@ #include "ace/Log_Msg.h" - int ACE_TMAIN (int, ACE_TCHAR *[]) { diff --git a/ACE/examples/Monitor/MC_Test_Utilities.cpp b/ACE/examples/Monitor/MC_Test_Utilities.cpp index a49f8ad4f24..d6daa81d20e 100644 --- a/ACE/examples/Monitor/MC_Test_Utilities.cpp +++ b/ACE/examples/Monitor/MC_Test_Utilities.cpp @@ -98,4 +98,3 @@ MC_Test_Utilities::display_packets_received ( #endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */ - diff --git a/ACE/examples/Naming/test_non_existent.cpp b/ACE/examples/Naming/test_non_existent.cpp index a5b5a92647a..03516654670 100644 --- a/ACE/examples/Naming/test_non_existent.cpp +++ b/ACE/examples/Naming/test_non_existent.cpp @@ -3,7 +3,6 @@ #include "ace/Log_Msg.h" - int ACE_TMAIN (int, ACE_TCHAR *[]) { int i; diff --git a/ACE/examples/Naming/test_open.cpp b/ACE/examples/Naming/test_open.cpp index abf9f393670..cdaf3323ca4 100644 --- a/ACE/examples/Naming/test_open.cpp +++ b/ACE/examples/Naming/test_open.cpp @@ -66,7 +66,6 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv) if (i != 0) return -1; - } result = ns.close (); diff --git a/ACE/examples/Naming/test_writers.cpp b/ACE/examples/Naming/test_writers.cpp index 16a5b0997cc..83a4f4fc93a 100644 --- a/ACE/examples/Naming/test_writers.cpp +++ b/ACE/examples/Naming/test_writers.cpp @@ -65,7 +65,6 @@ int ACE_TMAIN (int, ACE_TCHAR *[]) if (i != 0) return -1; - } } return 0; diff --git a/ACE/examples/OS/Process/imore.cpp b/ACE/examples/OS/Process/imore.cpp index 827e7ec4ccb..9a191a84b1c 100644 --- a/ACE/examples/OS/Process/imore.cpp +++ b/ACE/examples/OS/Process/imore.cpp @@ -29,7 +29,6 @@ #include "ace/Signal.h" - #if defined (ACE_WIN32) static const ACE_TCHAR *executable = ACE_TEXT("MORE.COM"); #else diff --git a/ACE/examples/OS/Process/process.cpp b/ACE/examples/OS/Process/process.cpp index 17e27597fa4..c96553954a2 100644 --- a/ACE/examples/OS/Process/process.cpp +++ b/ACE/examples/OS/Process/process.cpp @@ -26,7 +26,6 @@ #include "ace/Tokenizer_T.h" - #if defined (ACE_WIN32) #define EXEC_NAME ACE_TEXT ("MORE.COM") const ACE_TCHAR *DATE_PATH = ACE_TEXT ("date.exe"); diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.cpp b/ACE/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.cpp index c3f9e587b95..9802af0b8ab 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.cpp +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.cpp @@ -2,7 +2,6 @@ #include "Fill_ACE_QoS.h" - const iovec Fill_ACE_QoS::iov_ = {0,0}; Fill_ACE_QoS::Fill_ACE_QoS (void) 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 dda1fe34d3f..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; @@ -59,7 +58,6 @@ public: FLOW_SPEC_HASH_MAP& map (void); private: - // The Service Provider is currently set to NULL for all ACE_QoS. static const iovec iov_; diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Signal_Handler.cpp b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Signal_Handler.cpp index 8a21d050fe0..38a09ac0b2e 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Signal_Handler.cpp +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Signal_Handler.cpp @@ -3,7 +3,6 @@ #include "QoS_Signal_Handler.h" - // constructor. QoS_Signal_Handler::QoS_Signal_Handler (ACE_QoS_Session *qos_session) : qos_session_ (qos_session) diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp index e8ae923d642..424fa4b09ac 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp @@ -7,7 +7,6 @@ #include "ace/OS_NS_strings.h" - // constructor. QoS_Util::QoS_Util (int argc, ACE_TCHAR *argv[]) diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h index 3c9716d63cd..b3dccdb02e6 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h @@ -23,9 +23,7 @@ */ class QoS_Util { - public: - // constructor. QoS_Util (int argc, ACE_TCHAR *argv[]); @@ -47,7 +45,6 @@ public: int multicast_flag () const; private: - // Command line arguments. int argc_; ACE_TCHAR **argv_; @@ -66,7 +63,6 @@ private: // Multicast Flag. int multicast_flag_; - }; #endif /* QOS_UTIL_H */ diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.h b/ACE/examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.h index b6a31e43ead..003c171ad22 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.h +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.h @@ -50,4 +50,3 @@ private: #endif /* RECEIVER_QOS_EVENT_HANDLER_H */ - diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.h b/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.h index 5d04e7ed862..316e7710122 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.h +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.h @@ -43,7 +43,6 @@ public: virtual int handle_qos (ACE_HANDLE fd); private: - ACE_SOCK_Dgram_Mcast_QoS dgram_mcast_qos_; ACE_QoS_Session *qos_session_; }; diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/receiver.cpp b/ACE/examples/QOS/Change_Receiver_FlowSpec/receiver.cpp index 6edc97b6d4a..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) @@ -292,4 +291,3 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) } - diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/sender.cpp b/ACE/examples/QOS/Change_Receiver_FlowSpec/sender.cpp index 4da83d1ab65..67e6ea972cf 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/sender.cpp +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/sender.cpp @@ -9,7 +9,6 @@ //============================================================================= - #include "ace/QoS/QoS_Session.h" #include "ace/QoS/QoS_Session_Factory.h" #include "ace/QoS/QoS_Session_Impl.h" @@ -50,7 +49,6 @@ FillQoSParams (ACE_QoS_Params &qos_params, int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { - ACE_DEBUG ((LM_DEBUG, "Sender\n")); @@ -287,7 +285,6 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) - // Start the event loop. ACE_DEBUG ((LM_DEBUG, "Running the Event Loop ...\n")); @@ -307,5 +304,3 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) - - diff --git a/ACE/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.cpp b/ACE/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.cpp index c3f9e587b95..9802af0b8ab 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.cpp +++ b/ACE/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.cpp @@ -2,7 +2,6 @@ #include "Fill_ACE_QoS.h" - const iovec Fill_ACE_QoS::iov_ = {0,0}; Fill_ACE_QoS::Fill_ACE_QoS (void) 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 f8f650c5212..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; @@ -58,7 +57,6 @@ public: FLOW_SPEC_HASH_MAP& map (void); private: - // The Service Provider is currently set to NULL for all ACE_QoS. static const iovec iov_; diff --git a/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp b/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp index e8ae923d642..424fa4b09ac 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp +++ b/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp @@ -7,7 +7,6 @@ #include "ace/OS_NS_strings.h" - // constructor. QoS_Util::QoS_Util (int argc, ACE_TCHAR *argv[]) diff --git a/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.h b/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.h index 3c9716d63cd..b3dccdb02e6 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.h +++ b/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.h @@ -23,9 +23,7 @@ */ class QoS_Util { - public: - // constructor. QoS_Util (int argc, ACE_TCHAR *argv[]); @@ -47,7 +45,6 @@ public: int multicast_flag () const; private: - // Command line arguments. int argc_; ACE_TCHAR **argv_; @@ -66,7 +63,6 @@ private: // Multicast Flag. int multicast_flag_; - }; #endif /* QOS_UTIL_H */ diff --git a/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.cpp b/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.cpp index 1a4d08b08ea..39f75176ab4 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.cpp +++ b/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.cpp @@ -130,11 +130,9 @@ Receiver_QoS_Event_Handler::handle_qos (ACE_HANDLE fd) return 0; - } - diff --git a/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.h b/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.h index b6a31e43ead..003c171ad22 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.h +++ b/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.h @@ -50,4 +50,3 @@ private: #endif /* RECEIVER_QOS_EVENT_HANDLER_H */ - diff --git a/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.h b/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.h index 5d04e7ed862..316e7710122 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.h +++ b/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.h @@ -43,7 +43,6 @@ public: virtual int handle_qos (ACE_HANDLE fd); private: - ACE_SOCK_Dgram_Mcast_QoS dgram_mcast_qos_; ACE_QoS_Session *qos_session_; }; diff --git a/ACE/examples/QOS/Change_Sender_TSpec/receiver.cpp b/ACE/examples/QOS/Change_Sender_TSpec/receiver.cpp index 36fb26fdf22..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) @@ -311,4 +310,3 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) } - diff --git a/ACE/examples/QOS/Change_Sender_TSpec/sender.cpp b/ACE/examples/QOS/Change_Sender_TSpec/sender.cpp index 2f2a2d2856d..2654e16535a 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/sender.cpp +++ b/ACE/examples/QOS/Change_Sender_TSpec/sender.cpp @@ -9,7 +9,6 @@ //============================================================================= - #include "ace/QoS/QoS_Session.h" #include "ace/QoS/QoS_Session_Factory.h" #include "ace/QoS/QoS_Session_Impl.h" @@ -50,7 +49,6 @@ FillQoSParams (ACE_QoS_Params &qos_params, int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { - ACE_DEBUG ((LM_DEBUG, "Sender\n")); @@ -304,5 +302,3 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) - - 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.cpp b/ACE/examples/QOS/Simple/Fill_ACE_QoS.cpp index c3f9e587b95..9802af0b8ab 100644 --- a/ACE/examples/QOS/Simple/Fill_ACE_QoS.cpp +++ b/ACE/examples/QOS/Simple/Fill_ACE_QoS.cpp @@ -2,7 +2,6 @@ #include "Fill_ACE_QoS.h" - const iovec Fill_ACE_QoS::iov_ = {0,0}; Fill_ACE_QoS::Fill_ACE_QoS (void) diff --git a/ACE/examples/QOS/Simple/Fill_ACE_QoS.h b/ACE/examples/QOS/Simple/Fill_ACE_QoS.h index 8873f3852ec..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; @@ -58,7 +57,6 @@ public: FLOW_SPEC_HASH_MAP& map (void); private: - // The Service Provider is currently set to NULL for all ACE_QoS. static const iovec iov_; diff --git a/ACE/examples/QOS/Simple/QoS_Signal_Handler.cpp b/ACE/examples/QOS/Simple/QoS_Signal_Handler.cpp index 77937f484b3..40201e0e091 100644 --- a/ACE/examples/QOS/Simple/QoS_Signal_Handler.cpp +++ b/ACE/examples/QOS/Simple/QoS_Signal_Handler.cpp @@ -3,7 +3,6 @@ #include "QoS_Signal_Handler.h" - // constructor. QoS_Signal_Handler::QoS_Signal_Handler (ACE_QoS_Session *qos_session) : qos_session_ (qos_session) @@ -14,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.cpp b/ACE/examples/QOS/Simple/QoS_Util.cpp index e8ae923d642..424fa4b09ac 100644 --- a/ACE/examples/QOS/Simple/QoS_Util.cpp +++ b/ACE/examples/QOS/Simple/QoS_Util.cpp @@ -7,7 +7,6 @@ #include "ace/OS_NS_strings.h" - // constructor. QoS_Util::QoS_Util (int argc, ACE_TCHAR *argv[]) diff --git a/ACE/examples/QOS/Simple/QoS_Util.h b/ACE/examples/QOS/Simple/QoS_Util.h index 3c9716d63cd..b3dccdb02e6 100644 --- a/ACE/examples/QOS/Simple/QoS_Util.h +++ b/ACE/examples/QOS/Simple/QoS_Util.h @@ -23,9 +23,7 @@ */ class QoS_Util { - public: - // constructor. QoS_Util (int argc, ACE_TCHAR *argv[]); @@ -47,7 +45,6 @@ public: int multicast_flag () const; private: - // Command line arguments. int argc_; ACE_TCHAR **argv_; @@ -66,7 +63,6 @@ private: // Multicast Flag. int multicast_flag_; - }; #endif /* QOS_UTIL_H */ diff --git a/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.cpp b/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.cpp index c253dc28381..5d97ebbbf6c 100644 --- a/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.cpp +++ b/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.cpp @@ -128,5 +128,4 @@ Receiver_QoS_Event_Handler::handle_qos (ACE_HANDLE fd) ace_get_qos.sending_flowspec ()->minimum_policed_size ())); return 0; - } diff --git a/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.h b/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.h index b6a31e43ead..003c171ad22 100644 --- a/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.h +++ b/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.h @@ -50,4 +50,3 @@ private: #endif /* RECEIVER_QOS_EVENT_HANDLER_H */ - diff --git a/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.h b/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.h index 5d04e7ed862..316e7710122 100644 --- a/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.h +++ b/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.h @@ -43,7 +43,6 @@ public: virtual int handle_qos (ACE_HANDLE fd); private: - ACE_SOCK_Dgram_Mcast_QoS dgram_mcast_qos_; ACE_QoS_Session *qos_session_; }; diff --git a/ACE/examples/QOS/Simple/receiver.cpp b/ACE/examples/QOS/Simple/receiver.cpp index 0e4c2865df6..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) @@ -293,4 +292,3 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) } - diff --git a/ACE/examples/QOS/Simple/sender.cpp b/ACE/examples/QOS/Simple/sender.cpp index 44443955faf..8a3fa9f114c 100644 --- a/ACE/examples/QOS/Simple/sender.cpp +++ b/ACE/examples/QOS/Simple/sender.cpp @@ -9,7 +9,6 @@ //============================================================================= - #include "ace/QoS/QoS_Session.h" #include "ace/QoS/QoS_Session_Factory.h" #include "ace/QoS/QoS_Session_Impl.h" @@ -50,7 +49,6 @@ FillQoSParams (ACE_QoS_Params &qos_params, int ACE_TMAIN (int argc, ACE_TCHAR * argv[]) { - ACE_DEBUG ((LM_DEBUG, "Sender\n")); @@ -286,7 +284,6 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) -1); - // Start the event loop. ACE_DEBUG ((LM_DEBUG, "Running the Event Loop ...\n")); @@ -306,5 +303,3 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) - - diff --git a/ACE/examples/Reactor/Dgram/CODgram.cpp b/ACE/examples/Reactor/Dgram/CODgram.cpp index 2b531e2c3dd..f8671b31e99 100644 --- a/ACE/examples/Reactor/Dgram/CODgram.cpp +++ b/ACE/examples/Reactor/Dgram/CODgram.cpp @@ -33,7 +33,6 @@ #include "ace/Log_Msg.h" - // Port used to receive for dgrams. static u_short port1; diff --git a/ACE/examples/Reactor/Dgram/Dgram.cpp b/ACE/examples/Reactor/Dgram/Dgram.cpp index 04944fc5704..0c2920df69a 100644 --- a/ACE/examples/Reactor/Dgram/Dgram.cpp +++ b/ACE/examples/Reactor/Dgram/Dgram.cpp @@ -32,7 +32,6 @@ #include "ace/Log_Msg.h" - // Port used to receive for dgrams. static u_short port1; diff --git a/ACE/examples/Reactor/FIFO/client.cpp b/ACE/examples/Reactor/FIFO/client.cpp index fbfd55bf82e..f84085f5194 100644 --- a/ACE/examples/Reactor/FIFO/client.cpp +++ b/ACE/examples/Reactor/FIFO/client.cpp @@ -3,7 +3,6 @@ #include "ace/OS_NS_stropts.h" - int ACE_TMAIN (int, ACE_TCHAR *[]) { diff --git a/ACE/examples/Reactor/FIFO/server.cpp b/ACE/examples/Reactor/FIFO/server.cpp index a3f264170c0..4b47f830ff9 100644 --- a/ACE/examples/Reactor/FIFO/server.cpp +++ b/ACE/examples/Reactor/FIFO/server.cpp @@ -7,7 +7,6 @@ #include "ace/OS_NS_stropts.h" - class FIFO_Recv_Handler : public ACE_Event_Handler { public: diff --git a/ACE/examples/Reactor/Misc/notification.cpp b/ACE/examples/Reactor/Misc/notification.cpp index a31fd5f3fe1..e05f48db7fb 100644 --- a/ACE/examples/Reactor/Misc/notification.cpp +++ b/ACE/examples/Reactor/Misc/notification.cpp @@ -7,7 +7,6 @@ #include "ace/Truncate.h" - #if defined (ACE_HAS_THREADS) #define MAX_ITERATIONS 10000 diff --git a/ACE/examples/Reactor/Misc/test_demuxing.cpp b/ACE/examples/Reactor/Misc/test_demuxing.cpp index 661dfce25b2..c952c8a00a7 100644 --- a/ACE/examples/Reactor/Misc/test_demuxing.cpp +++ b/ACE/examples/Reactor/Misc/test_demuxing.cpp @@ -16,7 +16,6 @@ #include "ace/OS_NS_unistd.h" - // Default is to have a 2 second timeout. static int timeout = 2; diff --git a/ACE/examples/Reactor/Misc/test_reactors.cpp b/ACE/examples/Reactor/Misc/test_reactors.cpp index 1d01416e1e9..1afa4f40229 100644 --- a/ACE/examples/Reactor/Misc/test_reactors.cpp +++ b/ACE/examples/Reactor/Misc/test_reactors.cpp @@ -7,7 +7,6 @@ #include "ace/Atomic_Op.h" - #if defined (ACE_HAS_THREADS) #include "ace/Recursive_Thread_Mutex.h" @@ -152,7 +151,6 @@ worker (void *args) } // ACE_DEBUG ((LM_DEBUG, "(%t) done with handle_events\n")); - } ACE_NOTREACHED(return 0); diff --git a/ACE/examples/Reactor/Misc/test_signals_2.cpp b/ACE/examples/Reactor/Misc/test_signals_2.cpp index 66db4d2d5fb..437aedee1bb 100644 --- a/ACE/examples/Reactor/Misc/test_signals_2.cpp +++ b/ACE/examples/Reactor/Misc/test_signals_2.cpp @@ -102,7 +102,6 @@ #include "ace/Signal.h" - class Sig_Handler_1 : public ACE_Event_Handler { public: diff --git a/ACE/examples/Reactor/Misc/test_time_value.cpp b/ACE/examples/Reactor/Misc/test_time_value.cpp index 8949b9c7c8d..fc3563629c1 100644 --- a/ACE/examples/Reactor/Misc/test_time_value.cpp +++ b/ACE/examples/Reactor/Misc/test_time_value.cpp @@ -5,7 +5,6 @@ #include "ace/Time_Value.h" - inline int my_abs (int d) { return d > 0 ? d : -d; } ostream & diff --git a/ACE/examples/Reactor/Multicast/Log_Wrapper.cpp b/ACE/examples/Reactor/Multicast/Log_Wrapper.cpp index e7016d4e22b..72f407c4ca8 100644 --- a/ACE/examples/Reactor/Multicast/Log_Wrapper.cpp +++ b/ACE/examples/Reactor/Multicast/Log_Wrapper.cpp @@ -11,7 +11,6 @@ #include "ace/OS_NS_stdlib.h" - Log_Wrapper::Log_Wrapper (void) { sequence_number_ = 0; diff --git a/ACE/examples/Reactor/Multicast/client.cpp b/ACE/examples/Reactor/Multicast/client.cpp index cc219eea84d..d4e2d028516 100644 --- a/ACE/examples/Reactor/Multicast/client.cpp +++ b/ACE/examples/Reactor/Multicast/client.cpp @@ -11,7 +11,6 @@ #include "Log_Wrapper.h" - // Multi-cast address. static const char *MCAST_ADDR = ACE_DEFAULT_MULTICAST_ADDR; diff --git a/ACE/examples/Reactor/Multicast/server.cpp b/ACE/examples/Reactor/Multicast/server.cpp index ee081dd0948..d2d329a895d 100644 --- a/ACE/examples/Reactor/Multicast/server.cpp +++ b/ACE/examples/Reactor/Multicast/server.cpp @@ -15,7 +15,6 @@ #include "ace/os_include/os_netdb.h" - #if defined (ACE_HAS_IP_MULTICAST) class Server_Events : public ACE_Event_Handler { diff --git a/ACE/examples/Reactor/Proactor/Aio_Platform_Test_C.cpp b/ACE/examples/Reactor/Proactor/Aio_Platform_Test_C.cpp index 29fd141ee59..5354cd4ab60 100644 --- a/ACE/examples/Reactor/Proactor/Aio_Platform_Test_C.cpp +++ b/ACE/examples/Reactor/Proactor/Aio_Platform_Test_C.cpp @@ -11,7 +11,6 @@ //============================================================================= - #include <unistd.h> #include <fcntl.h> #include <sys/types.h> 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 68635e259c0..08d0e2c996c 100644 --- a/ACE/examples/Reactor/Proactor/simple_test_proactor.cpp +++ b/ACE/examples/Reactor/Proactor/simple_test_proactor.cpp @@ -19,7 +19,6 @@ #include "ace/OS_main.h" - #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) // This only works on Win32 platforms and on Unix platforms supporting // POSIX aio calls. @@ -37,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_cancel.cpp b/ACE/examples/Reactor/Proactor/test_cancel.cpp index e02228084fd..04df3895080 100644 --- a/ACE/examples/Reactor/Proactor/test_cancel.cpp +++ b/ACE/examples/Reactor/Proactor/test_cancel.cpp @@ -45,7 +45,6 @@ #include "ace/OS_NS_sys_socket.h" - #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) // This only works on Win32 platforms and on Unix platforms supporting // POSIX aio calls. diff --git a/ACE/examples/Reactor/Proactor/test_multiple_loops.cpp b/ACE/examples/Reactor/Proactor/test_multiple_loops.cpp index 6d00413a2a4..54a459d613c 100644 --- a/ACE/examples/Reactor/Proactor/test_multiple_loops.cpp +++ b/ACE/examples/Reactor/Proactor/test_multiple_loops.cpp @@ -19,7 +19,6 @@ #include "ace/OS_NS_unistd.h" - #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) /** @@ -29,7 +28,6 @@ */ class Timeout_Handler : public ACE_Handler, public ACE_Event_Handler { - public: Timeout_Handler (void) { @@ -68,7 +66,6 @@ private: class Worker : public ACE_Task <ACE_NULL_SYNCH> { public: - // Thread fuction. int svc (void) { diff --git a/ACE/examples/Reactor/Proactor/test_proactor.cpp b/ACE/examples/Reactor/Proactor/test_proactor.cpp index e944f6b2f89..241024aa3c3 100644 --- a/ACE/examples/Reactor/Proactor/test_proactor.cpp +++ b/ACE/examples/Reactor/Proactor/test_proactor.cpp @@ -33,7 +33,6 @@ #include "ace/OS_NS_fcntl.h" - #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) // This only works on Win32 platforms and on Unix platforms supporting // POSIX aio calls. diff --git a/ACE/examples/Reactor/Proactor/test_proactor2.cpp b/ACE/examples/Reactor/Proactor/test_proactor2.cpp index c0408654225..e15a15c77b6 100644 --- a/ACE/examples/Reactor/Proactor/test_proactor2.cpp +++ b/ACE/examples/Reactor/Proactor/test_proactor2.cpp @@ -35,7 +35,6 @@ #include "ace/OS_main.h" - #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) // This only works on Win32 platforms and on Unix platforms supporting // POSIX aio calls. @@ -82,9 +81,7 @@ static int initial_read_size = BUFSIZ; //-------------------------------------------------------------------------- class MyTask: public ACE_Task<ACE_MT_SYNCH> { - public: - int svc (void) ; }; @@ -108,7 +105,6 @@ int MyTask::svc () class Receiver : public ACE_Service_Handler { public: - Receiver (void); ~Receiver (void); @@ -198,7 +194,6 @@ void Receiver::open (ACE_HANDLE handle, ACE_ERROR ((LM_ERROR, "%p\n", "ACE_Asynch_Write_Stream::open")); - } else if (this->rs_.open (*this, this->handle_) == -1) { @@ -387,7 +382,6 @@ virtual void handle_write_stream (const ACE_Asynch_Write_Stream::Result &result); private: - int initiate_read_stream (void); int initiate_write_stream (void); @@ -704,7 +698,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { // Simplify , initial read with zero size Rc = acceptor.open (ACE_INET_Addr (port),0,1); - } else { @@ -740,7 +733,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_proactor3.cpp b/ACE/examples/Reactor/Proactor/test_proactor3.cpp index 096e89b0021..7e5ea77f349 100644 --- a/ACE/examples/Reactor/Proactor/test_proactor3.cpp +++ b/ACE/examples/Reactor/Proactor/test_proactor3.cpp @@ -33,7 +33,6 @@ #include "ace/Task.h" - #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) // This only works on Win32 platforms and on Unix platforms // supporting POSIX aio calls. @@ -184,7 +183,6 @@ MyTask::svc (void) class Receiver : public ACE_Service_Handler { public: - Receiver (void); ~Receiver (void); @@ -443,7 +441,6 @@ protected: virtual void handle_write_stream (const ACE_Asynch_Write_Stream::Result &result); private: - int initiate_read_stream (void); int initiate_write_stream (void); diff --git a/ACE/examples/Reactor/Proactor/test_timeout_st.cpp b/ACE/examples/Reactor/Proactor/test_timeout_st.cpp index dbc7fdb820c..3dffa7bb76f 100644 --- a/ACE/examples/Reactor/Proactor/test_timeout_st.cpp +++ b/ACE/examples/Reactor/Proactor/test_timeout_st.cpp @@ -16,7 +16,6 @@ #include "ace/OS_main.h" - #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) // This only works on Win32 platforms and on Unix platforms supporting // POSIX aio calls. @@ -28,7 +27,6 @@ */ class Timeout_Handler : public ACE_Handler { - public: Timeout_Handler (void) : count_ (0), diff --git a/ACE/examples/Reactor/Proactor/test_udp_proactor.cpp b/ACE/examples/Reactor/Proactor/test_udp_proactor.cpp index e0de23e7284..35be6c6d568 100644 --- a/ACE/examples/Reactor/Proactor/test_udp_proactor.cpp +++ b/ACE/examples/Reactor/Proactor/test_udp_proactor.cpp @@ -23,7 +23,6 @@ #include "ace/Log_Msg.h" - #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) // This only works on asynch I/O-capable platforms. @@ -234,7 +233,6 @@ protected: virtual void handle_write_dgram (const ACE_Asynch_Write_Dgram::Result &result); private: - /// Network I/O handle ACE_SOCK_Dgram sock_dgram_; diff --git a/ACE/examples/Reactor/TP_Reactor/AcceptHandler.h b/ACE/examples/Reactor/TP_Reactor/AcceptHandler.h index ba388aaac29..9116f1280ab 100644 --- a/ACE/examples/Reactor/TP_Reactor/AcceptHandler.h +++ b/ACE/examples/Reactor/TP_Reactor/AcceptHandler.h @@ -15,9 +15,7 @@ * 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. */ @@ -29,7 +27,6 @@ class AcceptHandler : public ACE_Event_Handler { ACE_SOCK_Acceptor mAcceptor; public: - /** * @param reactor The reactor which will use this accept handler. */ @@ -51,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 2f3fcaf13c9..4c5100b46ea 100644 --- a/ACE/examples/Reactor/TP_Reactor/ReadHandler.h +++ b/ACE/examples/Reactor/TP_Reactor/ReadHandler.h @@ -17,9 +17,7 @@ * data sent in the second call. */ class ReadHandler : public ACE_Event_Handler { - private: - /** * The stream socket used for data exchange. */ @@ -47,7 +45,6 @@ class ReadHandler : public ACE_Event_Handler { int mInvocationCounter; public: - /** * Initialization. */ @@ -67,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/Reactor/WFMO_Reactor/Handle_Close.cpp b/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp index 71511985a77..5d8fe687f6e 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp @@ -21,7 +21,6 @@ #include "ace/OS_main.h" - // Use the WFMO_Reactor static int opt_wfmo_reactor = 0; @@ -112,7 +111,6 @@ protected: class Different_Handler : public ACE_Event_Handler { public: - Different_Handler (ACE_Pipe &pipe) : pipe_ (pipe) { diff --git a/ACE/examples/Reactor/WFMO_Reactor/Multithreading.cpp b/ACE/examples/Reactor/WFMO_Reactor/Multithreading.cpp index 06735f2eaf7..af9f81725dd 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Multithreading.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Multithreading.cpp @@ -25,7 +25,6 @@ #include "ace/OS_NS_time.h" - static int concurrent_threads = 1; static int number_of_handles = static_cast<int> (ACE_Reactor::instance ()->size ()); static int number_of_handles_to_signal = 1; diff --git a/ACE/examples/Reactor/WFMO_Reactor/Network_Events.cpp b/ACE/examples/Reactor/WFMO_Reactor/Network_Events.cpp index 304b746e536..685cfaf11a3 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Network_Events.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Network_Events.cpp @@ -31,7 +31,6 @@ #include "ace/OS_main.h" - class Network_Handler : public ACE_Event_Handler { public: @@ -44,7 +43,6 @@ public: virtual ACE_HANDLE get_handle () const; ACE_SOCK_Stream stream_; - }; Network_Handler::Network_Handler (ACE_SOCK_Stream &s) diff --git a/ACE/examples/Reactor/WFMO_Reactor/Prerun_State_Changes.cpp b/ACE/examples/Reactor/WFMO_Reactor/Prerun_State_Changes.cpp index d117cb07e17..998f71ca6c1 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Prerun_State_Changes.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Prerun_State_Changes.cpp @@ -16,7 +16,6 @@ #include "ace/Log_Msg.h" - /** * @class Event_Handler * diff --git a/ACE/examples/Reactor/WFMO_Reactor/Registration.cpp b/ACE/examples/Reactor/WFMO_Reactor/Registration.cpp index d9d89d72160..d3d069885ea 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Registration.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Registration.cpp @@ -35,7 +35,6 @@ #include "ace/Log_Msg.h" - // Globals for this test int stop_test = 0; ACE_Reactor reactor; diff --git a/ACE/examples/Reactor/WFMO_Reactor/Removals.cpp b/ACE/examples/Reactor/WFMO_Reactor/Removals.cpp index ce267ee9541..a35703ad692 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Removals.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Removals.cpp @@ -20,7 +20,6 @@ #include "ace/Event.h" - /** * @class Event_Handler * diff --git a/ACE/examples/Reactor/WFMO_Reactor/Suspended_Removals.cpp b/ACE/examples/Reactor/WFMO_Reactor/Suspended_Removals.cpp index 942fd9e9795..7f1c7f1adec 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Suspended_Removals.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Suspended_Removals.cpp @@ -20,7 +20,6 @@ class Event_Handler : public ACE_Event_Handler { public: - ACE_HANDLE get_handle () const { return this->event_.handle (); diff --git a/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp b/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp index 6e62e2efde2..df47a665049 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp @@ -139,7 +139,6 @@ #include "ace/OS_NS_unistd.h" - typedef ACE_Task<ACE_MT_SYNCH> MT_TASK; /** diff --git a/ACE/examples/Reactor/WFMO_Reactor/Timeouts.cpp b/ACE/examples/Reactor/WFMO_Reactor/Timeouts.cpp index 5ae99f803c9..bc7b068ebde 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Timeouts.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Timeouts.cpp @@ -20,7 +20,6 @@ #include "ace/OS_main.h" - /** * @class Timeout_Handler * diff --git a/ACE/examples/Registry/test_registry_iterator.cpp b/ACE/examples/Registry/test_registry_iterator.cpp index 7403838781a..6ee7023c825 100644 --- a/ACE/examples/Registry/test_registry_iterator.cpp +++ b/ACE/examples/Registry/test_registry_iterator.cpp @@ -15,7 +15,6 @@ #include "ace/streams.h" - // Indentation while printing names static const u_long INDENTATION_LEVEL = 3; diff --git a/ACE/examples/Registry/test_registry_update.cpp b/ACE/examples/Registry/test_registry_update.cpp index 919eb050b67..a9d7c80ae95 100644 --- a/ACE/examples/Registry/test_registry_update.cpp +++ b/ACE/examples/Registry/test_registry_update.cpp @@ -21,7 +21,6 @@ #include "ace/streams.h" - // Name for application's naming context static ACE_Registry::Name application_context_name; diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp index 7d837aac71f..e38bab25073 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp @@ -1,7 +1,6 @@ #include "Handle_L_FIFO.h" - #if defined (SunOS4) extern "C" { diff --git a/ACE/examples/Service_Configurator/Misc/Timer_Service.cpp b/ACE/examples/Service_Configurator/Misc/Timer_Service.cpp index bd2fd5a7fd6..6ce12e216f0 100644 --- a/ACE/examples/Service_Configurator/Misc/Timer_Service.cpp +++ b/ACE/examples/Service_Configurator/Misc/Timer_Service.cpp @@ -3,7 +3,6 @@ #include "ace/Log_Msg.h" - Timer_Service_1::Timer_Service_1 (void) { ACE_OS::strcpy (this->name_, diff --git a/ACE/examples/Service_Configurator/Misc/main.cpp b/ACE/examples/Service_Configurator/Misc/main.cpp index 8d717900e61..0dde3f483a8 100644 --- a/ACE/examples/Service_Configurator/Misc/main.cpp +++ b/ACE/examples/Service_Configurator/Misc/main.cpp @@ -19,7 +19,6 @@ #include "Timer_Service.h" - // Create an object that will insert the <Timer_Service> into the list // of statically linked services that the <ACE_Service_Config> will // process at run-time. diff --git a/ACE/examples/Shared_Malloc/Malloc.cpp b/ACE/examples/Shared_Malloc/Malloc.cpp index 5cc8afe9635..1115e9d1e88 100644 --- a/ACE/examples/Shared_Malloc/Malloc.cpp +++ b/ACE/examples/Shared_Malloc/Malloc.cpp @@ -15,7 +15,6 @@ #include "ace/Malloc_T.h" - // Strategic typedefs for memory allocation. typedef ACE_Malloc <ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX> L_ALLOCATOR; diff --git a/ACE/examples/Shared_Malloc/test_malloc.cpp b/ACE/examples/Shared_Malloc/test_malloc.cpp index 9f68c9eb745..fb2fa936954 100644 --- a/ACE/examples/Shared_Malloc/test_malloc.cpp +++ b/ACE/examples/Shared_Malloc/test_malloc.cpp @@ -14,7 +14,6 @@ #include "Options.h" - static int gen_size (void) { diff --git a/ACE/examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp b/ACE/examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp index ec9044d0b7b..12586b1136d 100644 --- a/ACE/examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp +++ b/ACE/examples/System_V_IPC/SV_Message_Queues/MQ_Client.cpp @@ -10,7 +10,6 @@ #include "ace/OS_NS_stdlib.h" - #if defined (ACE_HAS_SYSV_IPC) && !defined(ACE_LACKS_SYSV_SHMEM) int diff --git a/ACE/examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp b/ACE/examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp index 8b92f26eba3..b38313766a2 100644 --- a/ACE/examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp +++ b/ACE/examples/System_V_IPC/SV_Message_Queues/MQ_Server.cpp @@ -10,7 +10,6 @@ #include "ace/OS_NS_stdlib.h" - #if defined (ACE_HAS_SYSV_IPC) && !defined(ACE_LACKS_SYSV_SHMEM) // Must be global for signal Message... diff --git a/ACE/examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp b/ACE/examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp index b705830d207..86081a2049f 100644 --- a/ACE/examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp +++ b/ACE/examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp @@ -9,7 +9,6 @@ #include "ace/OS_NS_unistd.h" - int ACE_TMAIN (int, ACE_TCHAR *[]) { diff --git a/ACE/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp b/ACE/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp index c04a4f8ba87..15023846051 100644 --- a/ACE/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp +++ b/ACE/examples/System_V_IPC/SV_Message_Queues/TMQ_Server.cpp @@ -12,7 +12,6 @@ #include "ace/OS_NS_unistd.h" - #if defined (ACE_HAS_SYSV_IPC) && !defined(ACE_LACKS_SYSV_SHMEM) // Must be global for signal Message... diff --git a/ACE/examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp b/ACE/examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp index 7e4d1a1fa48..c2f71ae81a1 100644 --- a/ACE/examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp +++ b/ACE/examples/System_V_IPC/SV_Semaphores/Semaphores_2.cpp @@ -11,7 +11,6 @@ #include "ace/OS_NS_unistd.h" - #if defined (ACE_HAS_SYSV_IPC) && !defined(ACE_LACKS_SYSV_SHMEM) // Shared memory allocator (note that this chews up the diff --git a/ACE/examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.cpp b/ACE/examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.cpp index 0f399034ec1..0bbbc7eea4f 100644 --- a/ACE/examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.cpp +++ b/ACE/examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.cpp @@ -6,7 +6,6 @@ #include "ace/OS_NS_unistd.h" - #if defined (ACE_HAS_SYSV_IPC) && !defined(ACE_LACKS_SYSV_SHMEM) static void diff --git a/ACE/examples/Threads/TSS_Data.h b/ACE/examples/Threads/TSS_Data.h index c10a1f8781e..b676f85d30d 100644 --- a/ACE/examples/Threads/TSS_Data.h +++ b/ACE/examples/Threads/TSS_Data.h @@ -35,4 +35,3 @@ private: typedef ACE_TSS_Singleton<TSS_Data, ACE_SYNCH_MUTEX> TSS_DATA; - diff --git a/ACE/examples/Threads/TSS_Obj.h b/ACE/examples/Threads/TSS_Obj.h index 1df5b751c8a..07ba7a6a5fd 100644 --- a/ACE/examples/Threads/TSS_Obj.h +++ b/ACE/examples/Threads/TSS_Obj.h @@ -30,7 +30,6 @@ public: ~TSS_Obj (void); private: - static ACE_Atomic_Op<ACE_SYNCH_MUTEX, int> count_; }; diff --git a/ACE/examples/Threads/TSS_Task.h b/ACE/examples/Threads/TSS_Task.h index 0bb3a765f96..2fe503f2e1c 100644 --- a/ACE/examples/Threads/TSS_Task.h +++ b/ACE/examples/Threads/TSS_Task.h @@ -22,7 +22,6 @@ class Test_Task { public: - Test_Task (void); ~Test_Task (void); diff --git a/ACE/examples/Threads/barrier1.cpp b/ACE/examples/Threads/barrier1.cpp index 5db1564217a..6dea32ad377 100644 --- a/ACE/examples/Threads/barrier1.cpp +++ b/ACE/examples/Threads/barrier1.cpp @@ -7,7 +7,6 @@ #include "ace/Service_Config.h" - #if defined (ACE_HAS_THREADS) struct Tester_Args diff --git a/ACE/examples/Threads/barrier2.cpp b/ACE/examples/Threads/barrier2.cpp index aaddab06bc9..2c5866aa306 100644 --- a/ACE/examples/Threads/barrier2.cpp +++ b/ACE/examples/Threads/barrier2.cpp @@ -15,7 +15,6 @@ #include "ace/Service_Config.h" - #if defined (ACE_HAS_THREADS) #include "ace/Null_Barrier.h" diff --git a/ACE/examples/Threads/future1.cpp b/ACE/examples/Threads/future1.cpp index 57fe594f4ae..f1e57c6f7c3 100644 --- a/ACE/examples/Threads/future1.cpp +++ b/ACE/examples/Threads/future1.cpp @@ -24,7 +24,6 @@ #include "ace/Atomic_Op.h" - #if defined (ACE_HAS_THREADS) typedef ACE_Atomic_Op<ACE_Thread_Mutex, int> ATOMIC_INT; diff --git a/ACE/examples/Threads/future2.cpp b/ACE/examples/Threads/future2.cpp index 1708fbe0d5e..a136de35ff5 100644 --- a/ACE/examples/Threads/future2.cpp +++ b/ACE/examples/Threads/future2.cpp @@ -47,7 +47,6 @@ class Scheduler : public ACE_Task_Base friend class Method_Request_name; friend class Method_Request_end; public: - Scheduler (const char *, Scheduler * = 0); virtual ~Scheduler (void); diff --git a/ACE/examples/Threads/manual_event.cpp b/ACE/examples/Threads/manual_event.cpp index 52fe12859f3..a3647c2351e 100644 --- a/ACE/examples/Threads/manual_event.cpp +++ b/ACE/examples/Threads/manual_event.cpp @@ -18,7 +18,6 @@ #include "ace/Atomic_Op.h" - #if defined (ACE_HAS_THREADS) static ACE_Atomic_Op <ACE_Thread_Mutex, int> amount_of_work = 0; diff --git a/ACE/examples/Threads/process_semaphore.cpp b/ACE/examples/Threads/process_semaphore.cpp index 31defa67b12..e8c6718c7af 100644 --- a/ACE/examples/Threads/process_semaphore.cpp +++ b/ACE/examples/Threads/process_semaphore.cpp @@ -9,7 +9,6 @@ #include "ace/OS_NS_stdlib.h" - static sig_atomic_t done; extern "C" void diff --git a/ACE/examples/Threads/reader_writer.cpp b/ACE/examples/Threads/reader_writer.cpp index aed53cbda4b..8f403319d32 100644 --- a/ACE/examples/Threads/reader_writer.cpp +++ b/ACE/examples/Threads/reader_writer.cpp @@ -8,7 +8,6 @@ #include "ace/Atomic_Op.h" - #if defined (ACE_HAS_THREADS) #include "ace/Guard_T.h" diff --git a/ACE/examples/Threads/recursive_mutex.cpp b/ACE/examples/Threads/recursive_mutex.cpp index 42470e525ee..55d4c057ac6 100644 --- a/ACE/examples/Threads/recursive_mutex.cpp +++ b/ACE/examples/Threads/recursive_mutex.cpp @@ -7,7 +7,6 @@ #include "ace/Get_Opt.h" - #if defined (ACE_HAS_THREADS) #include "ace/Guard_T.h" diff --git a/ACE/examples/Threads/task_five.cpp b/ACE/examples/Threads/task_five.cpp index 1a5a5c197c0..5d8d686a215 100644 --- a/ACE/examples/Threads/task_five.cpp +++ b/ACE/examples/Threads/task_five.cpp @@ -11,7 +11,6 @@ //============================================================================= - #include "ace/OS_main.h" #include "ace/Thread_Manager.h" #include "ace/Task.h" diff --git a/ACE/examples/Threads/task_one.cpp b/ACE/examples/Threads/task_one.cpp index bb0474c2894..a30478a7ab4 100644 --- a/ACE/examples/Threads/task_one.cpp +++ b/ACE/examples/Threads/task_one.cpp @@ -8,7 +8,6 @@ #include "ace/Service_Config.h" - #if defined (ACE_HAS_THREADS) #include "ace/Task.h" diff --git a/ACE/examples/Threads/task_three.cpp b/ACE/examples/Threads/task_three.cpp index dd7d1c749ee..eda453579fe 100644 --- a/ACE/examples/Threads/task_three.cpp +++ b/ACE/examples/Threads/task_three.cpp @@ -22,7 +22,6 @@ #include "ace/Signal.h" - #if defined (ACE_HAS_THREADS) static ACE_OSTREAM_TYPE *out_stream = 0; diff --git a/ACE/examples/Threads/task_two.cpp b/ACE/examples/Threads/task_two.cpp index 828322defa8..e0dadf0bd44 100644 --- a/ACE/examples/Threads/task_two.cpp +++ b/ACE/examples/Threads/task_two.cpp @@ -9,7 +9,6 @@ #include "ace/Atomic_Op.h" - #if defined (ACE_HAS_THREADS) typedef ACE_Atomic_Op<ACE_Thread_Mutex, int> ATOMIC_INT; diff --git a/ACE/examples/Threads/thread_manager.cpp b/ACE/examples/Threads/thread_manager.cpp index f38c9ac932e..408ca76f53c 100644 --- a/ACE/examples/Threads/thread_manager.cpp +++ b/ACE/examples/Threads/thread_manager.cpp @@ -10,7 +10,6 @@ #include "ace/Signal.h" - #if defined (ACE_HAS_THREADS) extern "C" void diff --git a/ACE/examples/Threads/thread_pool.cpp b/ACE/examples/Threads/thread_pool.cpp index 9d560cb29e0..4b3124d3aa2 100644 --- a/ACE/examples/Threads/thread_pool.cpp +++ b/ACE/examples/Threads/thread_pool.cpp @@ -17,7 +17,6 @@ #include "ace/Service_Config.h" - #if defined (ACE_HAS_THREADS) // Default number of iterations to run the test. diff --git a/ACE/examples/Threads/token.cpp b/ACE/examples/Threads/token.cpp index b9c7bbd3e41..391a7adafa3 100644 --- a/ACE/examples/Threads/token.cpp +++ b/ACE/examples/Threads/token.cpp @@ -6,7 +6,6 @@ #include "ace/OS_NS_time.h" - #if defined (ACE_HAS_THREADS) class My_Task : public ACE_Task<ACE_MT_SYNCH> diff --git a/ACE/examples/Threads/tss1.cpp b/ACE/examples/Threads/tss1.cpp index 9fa78c3f2af..5b00898aba3 100644 --- a/ACE/examples/Threads/tss1.cpp +++ b/ACE/examples/Threads/tss1.cpp @@ -20,7 +20,6 @@ #include "ace/Task.h" - #if defined (ACE_HAS_THREADS) #include "thread_specific.h" diff --git a/ACE/examples/Threads/tss2.cpp b/ACE/examples/Threads/tss2.cpp index e7ee60fee4d..8abd9de1f0a 100644 --- a/ACE/examples/Threads/tss2.cpp +++ b/ACE/examples/Threads/tss2.cpp @@ -20,7 +20,6 @@ #include "TSS_Task.h" - #if defined (ACE_HAS_THREADS) const int MAX_TASKS = 4; diff --git a/ACE/examples/Threads/wfmo.cpp b/ACE/examples/Threads/wfmo.cpp index a0c22c33991..65aad644704 100644 --- a/ACE/examples/Threads/wfmo.cpp +++ b/ACE/examples/Threads/wfmo.cpp @@ -11,7 +11,6 @@ #include "ace/OS_main.h" - #if defined (ACE_WIN32) // Number of threads. diff --git a/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.cpp b/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.cpp index daab575784e..8a39ab6c705 100644 --- a/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.cpp +++ b/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.cpp @@ -19,7 +19,6 @@ #include "Async_Timer_Queue_Test.h" - // Hook method that is called to handle the expiration of a timer. int Async_Timer_Handler::handle_timeout (const ACE_Time_Value &tv, diff --git a/ACE/examples/Timer_Queue/Custom_Handler.h b/ACE/examples/Timer_Queue/Custom_Handler.h index 04194962778..e1454379314 100644 --- a/ACE/examples/Timer_Queue/Custom_Handler.h +++ b/ACE/examples/Timer_Queue/Custom_Handler.h @@ -28,9 +28,7 @@ */ class Custom_Handler { - public: - Custom_Handler (const ACE_Time_Value &expiration_time); virtual ~Custom_Handler (void); @@ -43,7 +41,6 @@ class Custom_Handler const void *arg); private: - // Store the expected time of expiration, it is used to print a nice // message saying how much delay was at the actual expiration time. ACE_Time_Value expires_; @@ -61,7 +58,6 @@ class Custom_Handler class ACE_Svc_Export Custom_Handler_Upcall { public: - typedef ACE_Timer_Queue_T<Custom_Handler*, Custom_Handler_Upcall, ACE_Null_Mutex> TTimerQueue; diff --git a/ACE/examples/Timer_Queue/Driver.cpp b/ACE/examples/Timer_Queue/Driver.cpp index 52b1332ea62..3b7ff955884 100644 --- a/ACE/examples/Timer_Queue/Driver.cpp +++ b/ACE/examples/Timer_Queue/Driver.cpp @@ -21,7 +21,6 @@ #include "Driver.h" - // constructor template <class RECEIVER, class ACTION> @@ -133,7 +132,6 @@ Timer_Queue_Test_Driver<TQ, RECEIVER, ACTION>::parse_commands (const char *buf) if (cancel_cmd_->execute ((void *) &id) == -1) ACE_DEBUG ((LM_DEBUG, "Timer #%d is not valid\n", id)); - } break; /* NOTREACHED */ diff --git a/ACE/examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp b/ACE/examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp index 8463e2ba5ee..007fd06e849 100644 --- a/ACE/examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp +++ b/ACE/examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp @@ -20,7 +20,6 @@ #include "Reactor_Timer_Queue_Test.h" - void Reactor_Timer_Handler::set_timer_id (long tid) { diff --git a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp index c49e8ca9756..8af8cfdccf5 100644 --- a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp +++ b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp @@ -23,7 +23,6 @@ #include "ace/Thread_Mutex.h" - // Administrivia methods... Handler::Handler(const ACE_Time_Value &expiration_time) : expires_ (expiration_time), diff --git a/ACE/examples/Web_Crawler/Command_Processor.cpp b/ACE/examples/Web_Crawler/Command_Processor.cpp index 4957b91c4d0..e2f59ebd460 100644 --- a/ACE/examples/Web_Crawler/Command_Processor.cpp +++ b/ACE/examples/Web_Crawler/Command_Processor.cpp @@ -6,7 +6,6 @@ #include "URL_Visitor.h" - Command::~Command (void) { } @@ -19,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/HTTP_URL.cpp b/ACE/examples/Web_Crawler/HTTP_URL.cpp index af4d404072d..f146ac108e1 100644 --- a/ACE/examples/Web_Crawler/HTTP_URL.cpp +++ b/ACE/examples/Web_Crawler/HTTP_URL.cpp @@ -6,7 +6,6 @@ #include "HTTP_URL.h" - const ACE_URL_Addr & HTTP_URL::url_addr () const { diff --git a/ACE/examples/Web_Crawler/Iterators.cpp b/ACE/examples/Web_Crawler/Iterators.cpp index ef691d18f68..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")); @@ -76,7 +75,6 @@ HTML_Body_Iterator::next (ACE_CString &url) } } return 0; - } HTTP_Header_Iterator::HTTP_Header_Iterator (URL &url) diff --git a/ACE/examples/Web_Crawler/Mem_Map_Stream.cpp b/ACE/examples/Web_Crawler/Mem_Map_Stream.cpp index 532f1b636c7..1f5b68164ea 100644 --- a/ACE/examples/Web_Crawler/Mem_Map_Stream.cpp +++ b/ACE/examples/Web_Crawler/Mem_Map_Stream.cpp @@ -5,7 +5,6 @@ #include "Mem_Map_Stream.h" - ACE_SOCK_Stream & Mem_Map_Stream::stream (void) { @@ -145,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 60a504f3b2d..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; @@ -193,7 +192,6 @@ private: /// Address at the end of the file mapping. char *end_of_mapping_plus1_; - }; #include /**/ "ace/post.h" diff --git a/ACE/examples/Web_Crawler/Options.cpp b/ACE/examples/Web_Crawler/Options.cpp index b09d892e053..34d1cf47ef0 100644 --- a/ACE/examples/Web_Crawler/Options.cpp +++ b/ACE/examples/Web_Crawler/Options.cpp @@ -5,7 +5,6 @@ #include "ace/OS_NS_string.h" - int Options::parse_args (int argc, ACE_TCHAR *argv[]) { diff --git a/ACE/examples/Web_Crawler/URL.cpp b/ACE/examples/Web_Crawler/URL.cpp index 3f75e5685e9..69a36d6acbb 100644 --- a/ACE/examples/Web_Crawler/URL.cpp +++ b/ACE/examples/Web_Crawler/URL.cpp @@ -1,7 +1,6 @@ #include "URL.h" - Mem_Map_Stream & URL::stream (void) { diff --git a/ACE/examples/Web_Crawler/URL.h b/ACE/examples/Web_Crawler/URL.h index bbbc8b37655..529747dd89d 100644 --- a/ACE/examples/Web_Crawler/URL.h +++ b/ACE/examples/Web_Crawler/URL.h @@ -66,7 +66,6 @@ public: virtual void content_type (const ACE_CString &); - private: /// Reply status of the URL. URL_Status reply_status_; diff --git a/ACE/examples/Web_Crawler/URL_Status.cpp b/ACE/examples/Web_Crawler/URL_Status.cpp index 29a3d017fd8..c58153b7ce7 100644 --- a/ACE/examples/Web_Crawler/URL_Status.cpp +++ b/ACE/examples/Web_Crawler/URL_Status.cpp @@ -2,7 +2,6 @@ #include "URL_Status.h" - URL_Status::URL_Status (STATUS_CODE code) : status_ (code) { diff --git a/ACE/examples/Web_Crawler/URL_Visitor.cpp b/ACE/examples/Web_Crawler/URL_Visitor.cpp index 2383eae253d..bf6ef871193 100644 --- a/ACE/examples/Web_Crawler/URL_Visitor.cpp +++ b/ACE/examples/Web_Crawler/URL_Visitor.cpp @@ -4,7 +4,6 @@ #include "Command_Processor.h" - URL_Processing_Strategy::URL_Processing_Strategy (URL &url, URL_Iterator &iterator) : url_ (url), @@ -88,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"); @@ -97,7 +95,6 @@ HTTP_Header_Processing_Strategy::execute (void) } } return 0; - } HTML_Body_Validation_Strategy::HTML_Body_Validation_Strategy (URL &url, @@ -255,7 +252,6 @@ URL_Validation_Visitor::URL_Validation_Visitor (void) "%p %s\n" "strategy connector creation failed")); - } URL_Validation_Visitor::~URL_Validation_Visitor (void) @@ -323,7 +319,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, @@ -412,7 +407,6 @@ URL_Validation_Visitor::visit (HTTP_URL &http_url) "%p\n", "body execute"), -1); - } return 0; } @@ -492,7 +486,6 @@ URL_Download_Visitor::make_visitation_strategy_factory (URL &url) int retval = url.send_request (); if (retval != -1) break; - } // @@ Here's where we could check to see if the <url> was HTTP or // FTP, etc. But for now we'll just assume that everything is an @@ -502,7 +495,6 @@ URL_Download_Visitor::make_visitation_strategy_factory (URL &url) URL_Download_Visitation_Strategy_Factory (&url), 0); return vs; - } int diff --git a/ACE/examples/Web_Crawler/URL_Visitor.h b/ACE/examples/Web_Crawler/URL_Visitor.h index d0a0b8c5013..2e4f816a2bc 100644 --- a/ACE/examples/Web_Crawler/URL_Visitor.h +++ b/ACE/examples/Web_Crawler/URL_Visitor.h @@ -226,7 +226,6 @@ private: class URL_Visitor { public: - virtual ~URL_Visitor (void); /// Visit an <HTTP_URL>. diff --git a/ACE/examples/Web_Crawler/URL_Visitor_Factory.h b/ACE/examples/Web_Crawler/URL_Visitor_Factory.h index 64aa68e00de..5bfd1834b53 100644 --- a/ACE/examples/Web_Crawler/URL_Visitor_Factory.h +++ b/ACE/examples/Web_Crawler/URL_Visitor_Factory.h @@ -30,7 +30,6 @@ class URL_Visitor_Factory { public: - /// Destructor. virtual ~URL_Visitor_Factory (void); @@ -55,8 +54,6 @@ public: /// Factory Method that makes a <FIFO_Command_Processor>. virtual Command_Processor *make_command_processor (void); - - }; /** diff --git a/ACE/examples/Web_Crawler/Web_Crawler.cpp b/ACE/examples/Web_Crawler/Web_Crawler.cpp index e5972e90b5c..9a6f06fa5a4 100644 --- a/ACE/examples/Web_Crawler/Web_Crawler.cpp +++ b/ACE/examples/Web_Crawler/Web_Crawler.cpp @@ -3,7 +3,6 @@ #include "Web_Crawler.h" - Web_Crawler::~Web_Crawler (void) { delete this->url_visitor_factory_; diff --git a/ACE/examples/Web_Crawler/main.cpp b/ACE/examples/Web_Crawler/main.cpp index 3521fe405fb..7a2091ee52d 100644 --- a/ACE/examples/Web_Crawler/main.cpp +++ b/ACE/examples/Web_Crawler/main.cpp @@ -17,7 +17,6 @@ #include "Options.h" - void sig_handler (int) { ACE_DEBUG ((LM_DEBUG, @@ -42,4 +41,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } - diff --git a/ACE/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp b/ACE/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp index d3b598dad6f..7d060ed3a35 100644 --- a/ACE/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp +++ b/ACE/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp @@ -12,7 +12,6 @@ #include "ace/OS_NS_unistd.h" - Dump_Restore::Dump_Restore (int argc, ACE_TCHAR *argv[]) : infile_ (0) { diff --git a/ACE/netsvcs/clients/Naming/Dump_Restore/createfile.cpp b/ACE/netsvcs/clients/Naming/Dump_Restore/createfile.cpp index efca2e5eff4..ce32ac6f1d0 100644 --- a/ACE/netsvcs/clients/Naming/Dump_Restore/createfile.cpp +++ b/ACE/netsvcs/clients/Naming/Dump_Restore/createfile.cpp @@ -3,7 +3,6 @@ #include "ace/ACE.h" - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/ACE/netsvcs/clients/Naming/Dump_Restore/main.cpp b/ACE/netsvcs/clients/Naming/Dump_Restore/main.cpp index 77724d89d2d..11c5c2f7e64 100644 --- a/ACE/netsvcs/clients/Naming/Dump_Restore/main.cpp +++ b/ACE/netsvcs/clients/Naming/Dump_Restore/main.cpp @@ -5,7 +5,6 @@ #include "Dump_Restore.h" - int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { diff --git a/ACE/netsvcs/clients/Tokens/collection/collection.cpp b/ACE/netsvcs/clients/Tokens/collection/collection.cpp index 842a9841c95..583c9912372 100644 --- a/ACE/netsvcs/clients/Tokens/collection/collection.cpp +++ b/ACE/netsvcs/clients/Tokens/collection/collection.cpp @@ -21,7 +21,6 @@ #include "ace/Service_Config.h" - #if defined (ACE_HAS_THREADS) && defined (ACE_HAS_THREADS_LIBRARY) static const char *server_host = ACE_DEFAULT_SERVER_HOST; diff --git a/ACE/netsvcs/clients/Tokens/collection/rw_locks.cpp b/ACE/netsvcs/clients/Tokens/collection/rw_locks.cpp index 3a4dc1e6138..f84d15b7f19 100644 --- a/ACE/netsvcs/clients/Tokens/collection/rw_locks.cpp +++ b/ACE/netsvcs/clients/Tokens/collection/rw_locks.cpp @@ -6,7 +6,6 @@ #if defined (ACE_HAS_THREADS) && defined (ACE_HAS_THREADS_LIBRARY) - static ACE_Token_Proxy *global_rlock; static ACE_Token_Proxy *global_wlock; diff --git a/ACE/netsvcs/clients/Tokens/manual/manual.cpp b/ACE/netsvcs/clients/Tokens/manual/manual.cpp index 82f2bad2a18..0f204851456 100644 --- a/ACE/netsvcs/clients/Tokens/manual/manual.cpp +++ b/ACE/netsvcs/clients/Tokens/manual/manual.cpp @@ -23,7 +23,6 @@ #if defined (ACE_HAS_THREADS) && defined (ACE_HAS_THREADS_LIBRARY) - typedef ACE_Token_Invariant_Manager ACE_TOKEN_INVARIANTS; /** @@ -54,7 +53,6 @@ public: typedef ACE_CString TID; private: - /// Display options. void display_menu (void); diff --git a/ACE/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp b/ACE/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp index 6e4a5716754..fd1b2797d12 100644 --- a/ACE/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp +++ b/ACE/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp @@ -20,7 +20,6 @@ #if defined (ACE_HAS_THREADS) && defined (ACE_HAS_THREADS_LIBRARY) - typedef ACE_Token_Invariant_Manager ACE_TOKEN_INVARIANTS; static ACE_Token_Proxy *global_rlock; 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/Name_Handler.h b/ACE/netsvcs/lib/Name_Handler.h index 43a063beb9a..217bc71048a 100644 --- a/ACE/netsvcs/lib/Name_Handler.h +++ b/ACE/netsvcs/lib/Name_Handler.h @@ -105,7 +105,6 @@ protected: ~ACE_Name_Handler (void); private: - /// Table of pointers to member functions OPERATION op_table_[ACE_Name_Request::MAX_ENUM]; 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 bbfa532c8b1..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); @@ -114,7 +113,6 @@ protected: ACE_Token_Proxy *get_proxy (void); private: - /// Switches on the type of token_request_ and creates a new /// Token_Proxy. virtual ACE_Token_Proxy *create_proxy (void); @@ -155,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/RPC/client.cpp b/ACE/performance-tests/RPC/client.cpp index c55671bf358..5481f774054 100644 --- a/ACE/performance-tests/RPC/client.cpp +++ b/ACE/performance-tests/RPC/client.cpp @@ -58,7 +58,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) throughput.sample (end - test_start, end - start); - } ACE_DEBUG ((LM_DEBUG, "Calibrating high resolution timer . . .")); diff --git a/ACE/performance-tests/SCTP/Options_Manager.cpp b/ACE/performance-tests/SCTP/Options_Manager.cpp index acba6c08253..acd9373de2c 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, @@ -509,7 +501,6 @@ void Options_Manager::_show_usage(FILE* out, ACE_TCHAR const * const opts_set) ACE_OS::fprintf (out, " -h none help\n"); ACE_OS::fprintf (out, "\n"); - } else if (!ACE_OS::strcmp(ACE_TEXT ("server-opts"), opts_set)){ ACE_OS::fprintf (out, " Flag Args Option-Name Default\n" " -n none test-enable-nagle NO NAGLING\n"); @@ -533,7 +524,6 @@ void Options_Manager::_show_usage(FILE* out, ACE_TCHAR const * const opts_set) ACE_OS::fprintf (out, " -h none help\n"); ACE_OS::fprintf (out, "\n"); - } else { ACE_OS::fprintf (out, "Invalid options set specified.\n"); } diff --git a/ACE/performance-tests/SCTP/Options_Manager.h b/ACE/performance-tests/SCTP/Options_Manager.h index 7239d7aae68..b26e168a250 100644 --- a/ACE/performance-tests/SCTP/Options_Manager.h +++ b/ACE/performance-tests/SCTP/Options_Manager.h @@ -16,7 +16,6 @@ class Options_Manager { public: - Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * const opts_set); // constant string size @@ -59,7 +58,6 @@ public: private: static ACE_CDR::Boolean __initialized; static ACE_TCHAR __program_name[string_len]; - }; #endif /* OPTIONS_MANAGER_H */ diff --git a/ACE/performance-tests/SCTP/SOCK_SEQPACK_Association_Test.cpp b/ACE/performance-tests/SCTP/SOCK_SEQPACK_Association_Test.cpp index 3fdfa90ed9c..c677a757f0f 100644 --- a/ACE/performance-tests/SCTP/SOCK_SEQPACK_Association_Test.cpp +++ b/ACE/performance-tests/SCTP/SOCK_SEQPACK_Association_Test.cpp @@ -37,27 +37,20 @@ 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 +77,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 +87,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 +105,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 +115,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 f218a31cf44..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) @@ -289,7 +284,6 @@ ACE_SCTP::HIST runTest(ACE_SOCK_SEQPACK_Association & stream) msgLen *= 2; - // send a header to the server that contains test parameters if (sendHeader(stream) < 0) ACE_ERROR_RETURN((LM_ERROR, diff --git a/ACE/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp b/ACE/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp index f2d91c0082c..6cd98f45771 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; @@ -89,7 +87,6 @@ static ACE_THR_FUNC_RETURN unmarshalledOctetServer (void *arg){ ACE_TEXT ("%p\n"), ACE_TEXT ("send_n")), 0); - } while (--numIterations); // close and destroy the stream @@ -216,7 +213,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 +302,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; @@ -330,7 +325,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){ else if (result == 0){ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) select timed out\n"))); - } else { // case where a file descriptor was actually set if (!(temp.is_set(acceptor_socket.get_handle()))){ @@ -349,7 +343,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){ else{ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) spawning server\n"))); - } // Run the server. run_server (new_stream.get_handle ()); 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..cfffabcb2d7 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; @@ -87,7 +85,6 @@ static ACE_THR_FUNC_RETURN unmarshalledOctetServer (void *arg){ ACE_TEXT ("%p\n"), ACE_TEXT ("send_n")), 0); - } while (--numIterations); // close and destroy the stream @@ -221,7 +218,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 +297,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; @@ -325,7 +320,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){ else if (result == 0){ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) select timed out\n"))); - } else { // case where a file descriptor was actually set if (!(temp.is_set(acceptor_socket.get_handle()))){ @@ -344,7 +338,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){ else{ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) spawning server\n"))); - } // Run the server. run_server (new_stream.get_handle ()); 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 1ab919b1b2a..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 @@ -1,7 +1,6 @@ #include "RT_CORBA_Leader_Follower.h" - #if defined (ACE_HAS_THREADS) // We need the following only if we have threads enabled.. @@ -38,7 +37,6 @@ ACE_High_Res_Timer test_timer; - /*******************************************************************/ // Constructor for Synchronisers Synchronisers::Synchronisers (void) @@ -67,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; @@ -109,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/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.h b/ACE/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.h index f8512655a8e..ff2d42aec5d 100644 --- a/ACE/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.h +++ b/ACE/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.h @@ -53,7 +53,6 @@ public: int end_synchronization (void); private: - /// The mutex and condition variable that is used for /// synchronisation. ACE_SYNCH_MUTEX mutex_; @@ -79,7 +78,6 @@ private: class Leader_Follower_Task : public ACE_Task_Base { public: - /// Ctor with a mutex and a condition variable Leader_Follower_Task (Synchronisers &synch); diff --git a/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp b/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp index 6c604f70d8d..5204a996263 100644 --- a/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp +++ b/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp @@ -519,7 +519,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } - // Activate the input and output threads result = input_task.activate (flags, 1, @@ -530,7 +529,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) return result; - // Activate the workers. result = output_task.activate (flags, 1, @@ -541,7 +539,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) return result; - // Wait for all threads to terminate. result = ACE_Thread_Manager::instance ()->wait (); diff --git a/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.h b/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.h index 3fc194cdd2b..3b796e8d72b 100644 --- a/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.h +++ b/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.h @@ -63,7 +63,6 @@ public: int end_synchronization (void); private: - /// The mutex that is used for synchronisation. ACE_SYNCH_MUTEX mutex_; @@ -91,7 +90,6 @@ public: int svc (void); private: - /// Our referance to Synchronisers Synchronisers &synch_; }; @@ -118,7 +116,6 @@ public: virtual int put (ACE_Message_Block *, ACE_Time_Value * = 0); private: - /// Our referance to Synchronisers Synchronisers &synch_; }; @@ -145,7 +142,6 @@ public: /// Processed messages int processed (void); private: - /// Our referance to Synchronisers Synchronisers &synch_; @@ -155,7 +151,6 @@ private: - #endif /*ACE_HAS_THREADS*/ #include /**/ "ace/post.h" 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..b84300798a8 100644 --- a/ACE/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp +++ b/ACE/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp @@ -713,7 +713,6 @@ read_timer (char *str, int len) { perror ("Getting 'itimer' REAL failed"); return (0.0); - } fprintf(stdout, "End transaction time = %d sec and %d usec\n", itimedol.it_value.tv_sec, itimedol.it_value.tv_usec); prusage (&ru0, &ru1, &itime0.it_value, &itimedol.it_value, line); @@ -851,7 +850,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 +859,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..3484700dc53 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 * @@ -80,7 +79,6 @@ namespace ACE /// HTID - web-obtained unique-identifier ACE_CString htid_; }; - } } diff --git a/ACE/protocols/ace/HTBP/HTBP_Channel.h b/ACE/protocols/ace/HTBP/HTBP_Channel.h index 02c4285fa1a..b1b59f0b295 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Channel.h +++ b/ACE/protocols/ace/HTBP/HTBP_Channel.h @@ -232,7 +232,6 @@ namespace ACE int consume_error (void); private: - /// The filter_ is a pluggable component used to manage the /// wrapping of data in a way suitable for the proxy to /// manage. The actual filter instance is owned by the diff --git a/ACE/protocols/ace/HTBP/HTBP_Environment.h b/ACE/protocols/ace/HTBP/HTBP_Environment.h index 91fda93cf16..8e8d88691bf 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 * @@ -31,7 +30,6 @@ namespace ACE class HTBP_Export Environment { public: - /// Constructor Environment (ACE_Configuration *config = 0, int using_registry = 0, @@ -97,7 +95,6 @@ namespace ACE /// We created the config instance, so we must clean it up bool own_config_; - }; } } diff --git a/ACE/protocols/ace/HTBP/HTBP_Filter.h b/ACE/protocols/ace/HTBP/HTBP_Filter.h index 456f0984fc3..2e2b458ded6 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; @@ -88,7 +87,6 @@ namespace ACE /// Store the most recent HTTP result code. Typically it will be 200, /// but it could be a 4xx or 5xx code if the proxy reports an error. int http_code_; - }; } } diff --git a/ACE/protocols/ace/HTBP/HTBP_Filter_Factory.cpp b/ACE/protocols/ace/HTBP/HTBP_Filter_Factory.cpp index 00cf1cd5b45..d1770741c8e 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Filter_Factory.cpp +++ b/ACE/protocols/ace/HTBP/HTBP_Filter_Factory.cpp @@ -7,7 +7,6 @@ #include "ace/Log_Msg.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE::HTBP::Filter_Factory::Filter_Factory () diff --git a/ACE/protocols/ace/HTBP/HTBP_Filter_Factory.h b/ACE/protocols/ace/HTBP/HTBP_Filter_Factory.h index f50428d88da..eddcb895e9f 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Filter_Factory.h +++ b/ACE/protocols/ace/HTBP/HTBP_Filter_Factory.h @@ -40,7 +40,6 @@ namespace ACE class HTBP_Export Filter_Factory : public ACE_Service_Object { public: - /// Constructor Filter_Factory (); @@ -61,6 +60,5 @@ ACE_STATIC_SVC_DECLARE_EXPORT (HTBP, ACE_HTBP_Filter_Factory) ACE_FACTORY_DECLARE (HTBP, ACE_HTBP_Filter_Factory) - #include /**/ "ace/post.h" #endif /* ACE_HTBP_FILTER_FACTORY */ diff --git a/ACE/protocols/ace/HTBP/HTBP_ID_Requestor.h b/ACE/protocols/ace/HTBP/HTBP_ID_Requestor.h index 8e76da9128c..03bb0c4cd2e 100644 --- a/ACE/protocols/ace/HTBP/HTBP_ID_Requestor.h +++ b/ACE/protocols/ace/HTBP/HTBP_ID_Requestor.h @@ -51,7 +51,6 @@ namespace ACE static ACE_TString htid_; static ACE_SYNCH_MUTEX htid_lock_; }; - } } 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..08915e26f5a 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 * @@ -74,7 +73,6 @@ namespace ACE virtual ssize_t recv_data_trailer(Channel *); private: int make_request_header (Channel *, const char *, char *, size_t ); - }; } } diff --git a/ACE/protocols/ace/HTBP/HTBP_Notifier.cpp b/ACE/protocols/ace/HTBP/HTBP_Notifier.cpp index 6caeb70eb0d..eda0a2b6ca2 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Notifier.cpp +++ b/ACE/protocols/ace/HTBP/HTBP_Notifier.cpp @@ -69,7 +69,6 @@ int ACE::HTBP::Notifier::handle_output (ACE_HANDLE ) { return -1; - } void diff --git a/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h b/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h index dcdd49f9919..95dfe9d8f38 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h +++ b/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h @@ -70,7 +70,6 @@ namespace ACE virtual ssize_t recv_data_header (Channel *); virtual ssize_t recv_data_trailer(Channel *); }; - } } 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/HTBP/HTBP_Stream.cpp b/ACE/protocols/ace/HTBP/HTBP_Stream.cpp index a371cfc68d4..0479a0040e0 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Stream.cpp +++ b/ACE/protocols/ace/HTBP/HTBP_Stream.cpp @@ -39,7 +39,6 @@ ACE::HTBP::Stream::dump () const } - //--------------------------------------------------------------------------- // = I/O functions. diff --git a/ACE/protocols/ace/HTBP/HTBP_Stream.h b/ACE/protocols/ace/HTBP/HTBP_Stream.h index e6f5f3a7ca1..50630da7720 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Stream.h +++ b/ACE/protocols/ace/HTBP/HTBP_Stream.h @@ -278,7 +278,6 @@ namespace ACE /// associated with. On the inside, sessions are created by the Connector, /// which then create streams on demand. Session *session_; - }; } } 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/BidirStreamBuffer.h b/ACE/protocols/ace/INet/BidirStreamBuffer.h index 4267be12d21..61306083a9d 100644 --- a/ACE/protocols/ace/INet/BidirStreamBuffer.h +++ b/ACE/protocols/ace/INet/BidirStreamBuffer.h @@ -119,7 +119,6 @@ namespace ACE BidirStreamBuffer(const BidirStreamBuffer&); BidirStreamBuffer& operator = (const BidirStreamBuffer&); }; - } } 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 c0ef1f794b6..8b17d981330 100644 --- a/ACE/protocols/ace/INet/ClientRequestHandler.cpp +++ b/ACE/protocols/ace/INet/ClientRequestHandler.cpp @@ -6,14 +6,12 @@ #endif - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE { namespace INet { - ClientRequestHandler::ClientRequestHandler () {} ClientRequestHandler::~ClientRequestHandler () {} diff --git a/ACE/protocols/ace/INet/ClientRequestHandler.h b/ACE/protocols/ace/INet/ClientRequestHandler.h index 660eeeaddee..f448e06cb0e 100644 --- a/ACE/protocols/ace/INet/ClientRequestHandler.h +++ b/ACE/protocols/ace/INet/ClientRequestHandler.h @@ -96,7 +96,6 @@ namespace ACE u_short port_; }; }; - } } diff --git a/ACE/protocols/ace/INet/ConnectionCache.cpp b/ACE/protocols/ace/INet/ConnectionCache.cpp index 064baaf346b..703b06be77e 100644 --- a/ACE/protocols/ace/INet/ConnectionCache.cpp +++ b/ACE/protocols/ace/INet/ConnectionCache.cpp @@ -7,14 +7,12 @@ #include "ace/INet/INet_Log.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE { namespace INet { - ConnectionKey::ConnectionKey () {} diff --git a/ACE/protocols/ace/INet/ConnectionCache.h b/ACE/protocols/ace/INet/ConnectionCache.h index 2cac139da5b..809503fd0d4 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 * @@ -254,8 +253,6 @@ namespace ACE ACE_SYNCH_CONDITION condition_; map_type cache_map_; }; - - } } diff --git a/ACE/protocols/ace/INet/FTP_ClientRequestHandler.cpp b/ACE/protocols/ace/INet/FTP_ClientRequestHandler.cpp index f406821a1dd..dda84653107 100644 --- a/ACE/protocols/ace/INet/FTP_ClientRequestHandler.cpp +++ b/ACE/protocols/ace/INet/FTP_ClientRequestHandler.cpp @@ -13,14 +13,12 @@ #include "ace/SOCK_Acceptor.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE { namespace FTP { - ClientRequestHandler::SessionHolder::SessionHolder () : session_ () { diff --git a/ACE/protocols/ace/INet/FTP_ClientRequestHandler.h b/ACE/protocols/ace/INet/FTP_ClientRequestHandler.h index a11dc3bf840..64019d9c178 100644 --- a/ACE/protocols/ace/INet/FTP_ClientRequestHandler.h +++ b/ACE/protocols/ace/INet/FTP_ClientRequestHandler.h @@ -218,7 +218,6 @@ namespace ACE ACE_CString current_user_; }; - } } diff --git a/ACE/protocols/ace/INet/FTP_IOStream.cpp b/ACE/protocols/ace/INet/FTP_IOStream.cpp index 110b9431681..b58eb0135e5 100644 --- a/ACE/protocols/ace/INet/FTP_IOStream.cpp +++ b/ACE/protocols/ace/INet/FTP_IOStream.cpp @@ -8,14 +8,12 @@ #include "ace/Truncate.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL 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..feb001bf3aa 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 * @@ -111,7 +110,6 @@ namespace ACE void set_interceptor (StreamBuffer::interceptor_type& interceptor); }; - } } diff --git a/ACE/protocols/ace/INet/FTP_Request.cpp b/ACE/protocols/ace/INet/FTP_Request.cpp index 13206f0e7bf..edddd1ef555 100644 --- a/ACE/protocols/ace/INet/FTP_Request.cpp +++ b/ACE/protocols/ace/INet/FTP_Request.cpp @@ -10,14 +10,12 @@ #include "ace/INet/String_IOStream.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL 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..69d44972ff6 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 * @@ -101,7 +100,6 @@ namespace ACE ACE_CString command_; ACE_CString args_; }; - } } diff --git a/ACE/protocols/ace/INet/FTP_Response.cpp b/ACE/protocols/ace/INet/FTP_Response.cpp index 84b30c58889..a08528b8e42 100644 --- a/ACE/protocols/ace/INet/FTP_Response.cpp +++ b/ACE/protocols/ace/INet/FTP_Response.cpp @@ -11,7 +11,6 @@ #include "ace/INet/String_IOStream.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE diff --git a/ACE/protocols/ace/INet/FTP_Response.h b/ACE/protocols/ace/INet/FTP_Response.h index 72d3545e857..9b54236dd08 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 * @@ -117,7 +116,6 @@ namespace ACE int status_; ACE_Array<ACE_CString> 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_Session.h b/ACE/protocols/ace/INet/HTTPS_Session.h index 91dd7d11cfc..51f0132c530 100644 --- a/ACE/protocols/ace/INet/HTTPS_Session.h +++ b/ACE/protocols/ace/INet/HTTPS_Session.h @@ -62,7 +62,6 @@ namespace ACE bool attach_connection (connection_type* connection); protected: - void close_connection (); virtual bool connect_i (const ACE_Synch_Options& sync_opt); 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/HTTPS_SessionFactory.h b/ACE/protocols/ace/INet/HTTPS_SessionFactory.h index a38b99f6c68..7d64fef1747 100644 --- a/ACE/protocols/ace/INet/HTTPS_SessionFactory.h +++ b/ACE/protocols/ace/INet/HTTPS_SessionFactory.h @@ -59,7 +59,6 @@ namespace ACE virtual ACE::INet::ConnectionHolder* create_connection ( const ACE::INet::ConnectionKey& key) const; }; - } } diff --git a/ACE/protocols/ace/INet/HTTP_BasicAuthentication.cpp b/ACE/protocols/ace/INet/HTTP_BasicAuthentication.cpp index e03154b718c..1454898d3eb 100644 --- a/ACE/protocols/ace/INet/HTTP_BasicAuthentication.cpp +++ b/ACE/protocols/ace/INet/HTTP_BasicAuthentication.cpp @@ -7,14 +7,12 @@ #endif - ACE_BEGIN_VERSIONED_NAMESPACE_DECL 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_ClientRequestHandler.h b/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.h index d1f2c77d22a..79747658edf 100644 --- a/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.h +++ b/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.h @@ -117,7 +117,6 @@ namespace ACE friend class ACE_Singleton<SessionFactoryRegistry, ACE_SYNCH::MUTEX>; public: - void register_session_factory (const ACE_CString& scheme, SessionFactory* factory); @@ -234,7 +233,6 @@ namespace ACE Response response_; SessionHolder* session_; }; - } } diff --git a/ACE/protocols/ace/INet/HTTP_Header.cpp b/ACE/protocols/ace/INet/HTTP_Header.cpp index 392ca645514..ceb296554a9 100644 --- a/ACE/protocols/ace/INet/HTTP_Header.cpp +++ b/ACE/protocols/ace/INet/HTTP_Header.cpp @@ -7,14 +7,12 @@ #endif - ACE_BEGIN_VERSIONED_NAMESPACE_DECL 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 7095c673c9b..c7dabea92c6 100644 --- a/ACE/protocols/ace/INet/HTTP_IOStream.cpp +++ b/ACE/protocols/ace/INet/HTTP_IOStream.cpp @@ -8,14 +8,12 @@ #include "ace/Truncate.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL 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..621c1f3a3ee 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 * @@ -117,7 +116,6 @@ namespace ACE void set_interceptor (StreamBuffer::interceptor_type& interceptor); }; - } } diff --git a/ACE/protocols/ace/INet/HTTP_Request.cpp b/ACE/protocols/ace/INet/HTTP_Request.cpp index 980ffb70cd5..1511672f91e 100644 --- a/ACE/protocols/ace/INet/HTTP_Request.cpp +++ b/ACE/protocols/ace/INet/HTTP_Request.cpp @@ -9,14 +9,12 @@ #include "ace/INet/INet_Log.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL 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 25e77c5eef8..a3f5d1309d6 100644 --- a/ACE/protocols/ace/INet/HTTP_Response.cpp +++ b/ACE/protocols/ace/INet/HTTP_Response.cpp @@ -10,14 +10,12 @@ #include "ace/INet/INet_Log.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL 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_Session.h b/ACE/protocols/ace/INet/HTTP_Session.h index b1254a8c76e..ef45d3006e5 100644 --- a/ACE/protocols/ace/INet/HTTP_Session.h +++ b/ACE/protocols/ace/INet/HTTP_Session.h @@ -45,7 +45,6 @@ namespace ACE bool attach_connection (connection_type* connection); protected: - void close_connection (); virtual bool connect_i (const ACE_Synch_Options& sync_opt); 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_SessionBase.h b/ACE/protocols/ace/INet/HTTP_SessionBase.h index 492facfca3f..1b6b492c8b5 100644 --- a/ACE/protocols/ace/INet/HTTP_SessionBase.h +++ b/ACE/protocols/ace/INet/HTTP_SessionBase.h @@ -84,7 +84,6 @@ namespace ACE void close (); protected: - bool reconnect_needed (); void close_streams (); diff --git a/ACE/protocols/ace/INet/HTTP_Status.cpp b/ACE/protocols/ace/INet/HTTP_Status.cpp index 6fc7471d374..d7927115e7b 100644 --- a/ACE/protocols/ace/INet/HTTP_Status.cpp +++ b/ACE/protocols/ace/INet/HTTP_Status.cpp @@ -7,14 +7,12 @@ #endif - ACE_BEGIN_VERSIONED_NAMESPACE_DECL 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/HTTP_StreamPolicy.h b/ACE/protocols/ace/INet/HTTP_StreamPolicy.h index c465148b5b1..73e15241500 100644 --- a/ACE/protocols/ace/INet/HTTP_StreamPolicy.h +++ b/ACE/protocols/ace/INet/HTTP_StreamPolicy.h @@ -80,7 +80,6 @@ namespace ACE }; typedef ChunkedTransferStreamPolicyBase<StreamBuffer> ChunkedTransferStreamPolicy; - } } diff --git a/ACE/protocols/ace/INet/HeaderBase.cpp b/ACE/protocols/ace/INet/HeaderBase.cpp index e944c312f43..bbff0b8b17e 100644 --- a/ACE/protocols/ace/INet/HeaderBase.cpp +++ b/ACE/protocols/ace/INet/HeaderBase.cpp @@ -8,14 +8,12 @@ #include "ace/INet/INet_Log.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL 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"; @@ -62,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 49dab2ce012..d59763ed197 100644 --- a/ACE/protocols/ace/INet/Request.cpp +++ b/ACE/protocols/ace/INet/Request.cpp @@ -1,14 +1,12 @@ #include "ace/INet/Request.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL 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..947cb71dea3 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 * @@ -30,7 +29,6 @@ namespace ACE Request (); virtual ~Request (); }; - } } diff --git a/ACE/protocols/ace/INet/RequestHandler.cpp b/ACE/protocols/ace/INet/RequestHandler.cpp index 2c9d0b12583..bce353071ee 100644 --- a/ACE/protocols/ace/INet/RequestHandler.cpp +++ b/ACE/protocols/ace/INet/RequestHandler.cpp @@ -1,14 +1,12 @@ #include "ace/INet/RequestHandler.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL 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..37dbb4aa589 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 * @@ -40,7 +39,6 @@ namespace ACE virtual const Response& response () const = 0; }; - } } diff --git a/ACE/protocols/ace/INet/Response.cpp b/ACE/protocols/ace/INet/Response.cpp index 6660475afd7..65cbc49c7ff 100644 --- a/ACE/protocols/ace/INet/Response.cpp +++ b/ACE/protocols/ace/INet/Response.cpp @@ -1,14 +1,12 @@ #include "ace/INet/Response.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL 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..8ddecfc40b1 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 * @@ -30,7 +29,6 @@ namespace ACE Response (); virtual ~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/SSLSock_IOStream.h b/ACE/protocols/ace/INet/SSLSock_IOStream.h index cec9f4f6ba9..f97887a9e1d 100644 --- a/ACE/protocols/ace/INet/SSLSock_IOStream.h +++ b/ACE/protocols/ace/INet/SSLSock_IOStream.h @@ -158,7 +158,6 @@ namespace ACE typedef SSLSock_IStreamBase<ACE_NULL_SYNCH> SSLSock_IStream; typedef SSLSock_OStreamBase<ACE_NULL_SYNCH> SSLSock_OStream; typedef SSLSock_IOStreamBase<ACE_NULL_SYNCH> SSLSock_IOStream; - } } 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/Sock_IOStream.h b/ACE/protocols/ace/INet/Sock_IOStream.h index 970480246bd..ddd101c7453 100644 --- a/ACE/protocols/ace/INet/Sock_IOStream.h +++ b/ACE/protocols/ace/INet/Sock_IOStream.h @@ -157,7 +157,6 @@ namespace ACE typedef Sock_IStreamBase<ACE_NULL_SYNCH> Sock_IStream; typedef Sock_OStreamBase<ACE_NULL_SYNCH> Sock_OStream; typedef Sock_IOStreamBase<ACE_NULL_SYNCH> Sock_IOStream; - } } 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/StreamInterceptor.h b/ACE/protocols/ace/INet/StreamInterceptor.h index 82368efefbd..9e080a744da 100644 --- a/ACE/protocols/ace/INet/StreamInterceptor.h +++ b/ACE/protocols/ace/INet/StreamInterceptor.h @@ -54,7 +54,6 @@ namespace ACE }; typedef StreamInterceptorBase<char> StreamInterceptor; - } } 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/String_IOStream.h b/ACE/protocols/ace/INet/String_IOStream.h index 2cddd9cbf1e..508852317d9 100644 --- a/ACE/protocols/ace/INet/String_IOStream.h +++ b/ACE/protocols/ace/INet/String_IOStream.h @@ -155,7 +155,6 @@ namespace ACE typedef String_IOSBase<char> CString_IOS; typedef String_OStreamBase<char> CString_OStream; typedef String_IStreamBase<char> CString_IStream; - } } 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..e6efb596a92 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 * @@ -239,7 +238,6 @@ namespace ACE static authenticator_map authenticators_; }; - } } diff --git a/ACE/protocols/ace/RMCast/Acknowledge.cpp b/ACE/protocols/ace/RMCast/Acknowledge.cpp index a07977a6076..bd617f220fe 100644 --- a/ACE/protocols/ace/RMCast/Acknowledge.cpp +++ b/ACE/protocols/ace/RMCast/Acknowledge.cpp @@ -116,7 +116,6 @@ namespace ACE_RMCast Message_ptr m (new Message); m->add (nrtm); msgs.push_back (m); - } } } diff --git a/ACE/protocols/ace/RMCast/Link.cpp b/ACE/protocols/ace/RMCast/Link.cpp index b2bef9723a8..fb5bc709de3 100644 --- a/ACE/protocols/ace/RMCast/Link.cpp +++ b/ACE/protocols/ace/RMCast/Link.cpp @@ -51,7 +51,6 @@ namespace ACE_RMCast ssock_.get_option (SOL_SOCKET, SO_RCVBUF, &r, &s); //cerr << 5 << "send buffer size: " << r << endl; - } // Bind address and port. diff --git a/ACE/protocols/ace/RMCast/Protocol.h b/ACE/protocols/ace/RMCast/Protocol.h index ce36bffc407..9bbd6ee49e7 100644 --- a/ACE/protocols/ace/RMCast/Protocol.h +++ b/ACE/protocols/ace/RMCast/Protocol.h @@ -750,7 +750,6 @@ namespace ACE_RMCast class NAK : public Profile { public: - static u16 const id; typedef ACE_Vector<u64, ACE_VECTOR_DEFAULT_SIZE> SerialNumbers; @@ -1078,7 +1077,6 @@ namespace ACE_RMCast os << sn; os << addr; os << port; - } } @@ -1262,7 +1260,6 @@ namespace ACE_RMCast u32 of_; u64 total_size_; }; - } /* 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/ACE_Init_Test.cpp b/ACE/tests/ACE_Init_Test.cpp index 4884ae93053..62dad5f2ad6 100644 --- a/ACE/tests/ACE_Init_Test.cpp +++ b/ACE/tests/ACE_Init_Test.cpp @@ -122,7 +122,6 @@ wait_and_kill_dialog (void *pBox) ACE_OS::sleep(2); pDialog->EndModalLoop (IDOK); return 0; - } #endif /* ACE_HAS_MFC */ diff --git a/ACE/tests/ARGV_Test.cpp b/ACE/tests/ARGV_Test.cpp index 4f6f90e25cf..64f8e106264 100644 --- a/ACE/tests/ARGV_Test.cpp +++ b/ACE/tests/ARGV_Test.cpp @@ -20,7 +20,6 @@ #include "test_config.h" - static void consume_arg (int argc, ACE_TCHAR *argv[]) { diff --git a/ACE/tests/Arg_Shifter_Test.cpp b/ACE/tests/Arg_Shifter_Test.cpp index 08bb29c2900..407cbdf80b2 100644 --- a/ACE/tests/Arg_Shifter_Test.cpp +++ b/ACE/tests/Arg_Shifter_Test.cpp @@ -15,7 +15,6 @@ #include "test_config.h" - int run_main (int, ACE_TCHAR *[]) { diff --git a/ACE/tests/Array_Map_Test.cpp b/ACE/tests/Array_Map_Test.cpp index 2e48f16b4d4..9d8ad4448ce 100644 --- a/ACE/tests/Array_Map_Test.cpp +++ b/ACE/tests/Array_Map_Test.cpp @@ -336,7 +336,6 @@ index_operator_test () class RefCounted { public: - RefCounted () : refcount_ (0) { @@ -382,9 +381,7 @@ public: } private: - unsigned int * refcount_; - }; // -------- diff --git a/ACE/tests/Auto_IncDec_Test.cpp b/ACE/tests/Auto_IncDec_Test.cpp index e075af5f713..8022519994b 100644 --- a/ACE/tests/Auto_IncDec_Test.cpp +++ b/ACE/tests/Auto_IncDec_Test.cpp @@ -18,7 +18,6 @@ #include "ace/OS_NS_unistd.h" - #if defined (ACE_HAS_THREADS) // Default number of threads. diff --git a/ACE/tests/Barrier_Test.cpp b/ACE/tests/Barrier_Test.cpp index 9f332599731..a79a4d1daf3 100644 --- a/ACE/tests/Barrier_Test.cpp +++ b/ACE/tests/Barrier_Test.cpp @@ -16,7 +16,6 @@ #include "ace/Thread_Manager.h" - #if defined (ACE_HAS_THREADS) struct Tester_Args diff --git a/ACE/tests/Buffer_Stream_Test.cpp b/ACE/tests/Buffer_Stream_Test.cpp index 254a60aa11d..798f61f5e00 100644 --- a/ACE/tests/Buffer_Stream_Test.cpp +++ b/ACE/tests/Buffer_Stream_Test.cpp @@ -23,7 +23,6 @@ #include "ace/OS_NS_time.h" - #if defined (ACE_HAS_THREADS) static const char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz"; @@ -80,7 +79,6 @@ public: /// Receive message from Supplier and print to stdout. int svc () override; private: - /// Amount of time to wait for a timeout. ACE_Time_Value timeout_; }; 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_2653_Regression_Test.cpp b/ACE/tests/Bug_2653_Regression_Test.cpp index bd33cc00d3e..e6e971506b5 100644 --- a/ACE/tests/Bug_2653_Regression_Test.cpp +++ b/ACE/tests/Bug_2653_Regression_Test.cpp @@ -24,7 +24,6 @@ #include "ace/OS_NS_unistd.h" - static const char *message = "Hello there! Hope you get this message"; diff --git a/ACE/tests/Bug_2659_Regression_Test.cpp b/ACE/tests/Bug_2659_Regression_Test.cpp index f393e7626dd..f5ae94fa881 100644 --- a/ACE/tests/Bug_2659_Regression_Test.cpp +++ b/ACE/tests/Bug_2659_Regression_Test.cpp @@ -67,7 +67,6 @@ private: #endif // if defined RUN_DEBUG - static void handle_signal (int ) { @@ -79,7 +78,6 @@ handle_signal (int ) class ReactorTask : public ACE_Task_Base { public: - ~ReactorTask () override { EE_DEBUG ("ReactorTask", "~ReactorTask", this); 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_3334_Regression_Test.cpp b/ACE/tests/Bug_3334_Regression_Test.cpp index 9f129fb08de..4631ead5bb7 100644 --- a/ACE/tests/Bug_3334_Regression_Test.cpp +++ b/ACE/tests/Bug_3334_Regression_Test.cpp @@ -18,7 +18,6 @@ #include "ace/Service_Config.h" - int run_main (int, ACE_TCHAR *argv[]) { diff --git a/ACE/tests/Bug_3432_Regression_Test.cpp b/ACE/tests/Bug_3432_Regression_Test.cpp index c56d92c5ae7..e0ff5a8c9cb 100644 --- a/ACE/tests/Bug_3432_Regression_Test.cpp +++ b/ACE/tests/Bug_3432_Regression_Test.cpp @@ -19,7 +19,6 @@ #include "ace/OS_NS_time.h" - int strptime_test () { diff --git a/ACE/tests/Bug_3505_Regression_Test.cpp b/ACE/tests/Bug_3505_Regression_Test.cpp index 1f3fc5d39e9..0609ec07ed7 100644 --- a/ACE/tests/Bug_3505_Regression_Test.cpp +++ b/ACE/tests/Bug_3505_Regression_Test.cpp @@ -15,7 +15,6 @@ #include "test_config.h" - int run_main (int, ACE_TCHAR *[]) { diff --git a/ACE/tests/Bug_3710_Regression_Test.cpp b/ACE/tests/Bug_3710_Regression_Test.cpp index 82451b7d526..d61b05770cd 100644 --- a/ACE/tests/Bug_3710_Regression_Test.cpp +++ b/ACE/tests/Bug_3710_Regression_Test.cpp @@ -12,7 +12,6 @@ #include "ace/OS_Memory.h" - // Main function. int diff --git a/ACE/tests/Bug_3911_Regression_Test.cpp b/ACE/tests/Bug_3911_Regression_Test.cpp index 39657681b56..7eb5463d201 100644 --- a/ACE/tests/Bug_3911_Regression_Test.cpp +++ b/ACE/tests/Bug_3911_Regression_Test.cpp @@ -135,7 +135,6 @@ public: return shared; }; - }; ShmemMan* ShmemMan::c_instance = 0; diff --git a/ACE/tests/Bug_3912_Regression_Test.cpp b/ACE/tests/Bug_3912_Regression_Test.cpp index c1c9fe0a321..ea997da539e 100644 --- a/ACE/tests/Bug_3912_Regression_Test.cpp +++ b/ACE/tests/Bug_3912_Regression_Test.cpp @@ -31,7 +31,6 @@ using MT_Module = ACE_Module<ACE_MT_SYNCH>; class Close_Handler : public virtual MT_Task { public: - Close_Handler(bool* close_called_arg) : close_called_ (close_called_arg) { diff --git a/ACE/tests/Bug_3943_Regression_Test.cpp b/ACE/tests/Bug_3943_Regression_Test.cpp index 8fdf4a0f98b..2763741b581 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'; @@ -244,7 +243,6 @@ namespace { ssize_t send (char send_char, const ACE_TCHAR * const send_desc); const ACE_Time_Value DEFAULT_TIME_VALUE; - }; } // namespace "" @@ -974,7 +972,6 @@ client (void *arg) { // Send the data to the server. svc_handler->send_data (); - } return 0; } diff --git a/ACE/tests/CDR_Array_Test.cpp b/ACE/tests/CDR_Array_Test.cpp index a051dcfa379..9b68d8a0991 100644 --- a/ACE/tests/CDR_Array_Test.cpp +++ b/ACE/tests/CDR_Array_Test.cpp @@ -48,7 +48,6 @@ #endif - // Default number of elements for check buffer, for each tested CDR type. // Be aware that time will be affected by the buffer fitting/not fitting // in the cache (ie, if default_total*sizeof(T) bytes fit in the cache). @@ -233,7 +232,6 @@ CDR_Test<T, H>::CDR_Test (int total, int niter, int use_array) CDR_Test<T, H>::do_test(tdelta, niter, 1, srcbuf, dstbuf, sk, dk); - } } } 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/CDR_Test.cpp b/ACE/tests/CDR_Test.cpp index fa140dc5c65..c9fcf68dcf2 100644 --- a/ACE/tests/CDR_Test.cpp +++ b/ACE/tests/CDR_Test.cpp @@ -22,7 +22,6 @@ #include "ace/OS_NS_wchar.h" - static int n = 4096; static int nloops = 100; diff --git a/ACE/tests/Cached_Accept_Conn_Test.h b/ACE/tests/Cached_Accept_Conn_Test.h index 28f8d089211..9581f92c7bd 100644 --- a/ACE/tests/Cached_Accept_Conn_Test.h +++ b/ACE/tests/Cached_Accept_Conn_Test.h @@ -28,7 +28,6 @@ class Client_Svc_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> { public: - Client_Svc_Handler (ACE_Thread_Manager *t = 0); int open (void *v = 0); int close (u_long flags = 0); @@ -37,7 +36,6 @@ public: class Server_Svc_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> { public: - Server_Svc_Handler (ACE_Thread_Manager *t = 0); int open (void *v = 0); }; @@ -101,7 +99,6 @@ template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> class Accept_Strategy : public ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2> { public: - /// Constructor. Accept_Strategy (CACHED_CONNECT_STRATEGY &caching_connect_strategy); @@ -122,7 +119,6 @@ public: int accept_svc_handler (SVC_HANDLER *svc_handler); protected: - typedef ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2> ACCEPT_STRATEGY_BASE; /// Handler for removing cached connections. diff --git a/ACE/tests/Cached_Allocator_Test.cpp b/ACE/tests/Cached_Allocator_Test.cpp index d954c2980cd..0012f88c57f 100644 --- a/ACE/tests/Cached_Allocator_Test.cpp +++ b/ACE/tests/Cached_Allocator_Test.cpp @@ -16,7 +16,6 @@ #include "ace/High_Res_Timer.h" - #include "ace/Synch_Traits.h" #include "ace/Null_Mutex.h" @@ -76,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/Cached_Conn_Test.cpp b/ACE/tests/Cached_Conn_Test.cpp index 9f6bb780237..1b98d391959 100644 --- a/ACE/tests/Cached_Conn_Test.cpp +++ b/ACE/tests/Cached_Conn_Test.cpp @@ -39,7 +39,6 @@ #endif /* _MSC_VER */ - using ATTRIBUTES = size_t; using CACHED_HANDLER = std::pair<Svc_Handler *, ATTRIBUTES>; using ACE_ADDR = ARHR<ACE_INET_Addr>; diff --git a/ACE/tests/Cached_Conn_Test.h b/ACE/tests/Cached_Conn_Test.h index 09a9da0169c..c9e9d6e6fe5 100644 --- a/ACE/tests/Cached_Conn_Test.h +++ b/ACE/tests/Cached_Conn_Test.h @@ -20,7 +20,6 @@ class Svc_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> { public: - Svc_Handler (ACE_Thread_Manager *t = 0); int open (void *v = 0); int close (u_long flags = 0); diff --git a/ACE/tests/Chrono_Test.cpp b/ACE/tests/Chrono_Test.cpp index 1c9e86c6857..7a09b1d9a99 100644 --- a/ACE/tests/Chrono_Test.cpp +++ b/ACE/tests/Chrono_Test.cpp @@ -289,7 +289,6 @@ test_streamers () } - ACE_Time_Value const test_sec {12, 132}; // Seconds s << test_sec; diff --git a/ACE/tests/Codecs_Test.cpp b/ACE/tests/Codecs_Test.cpp index c851b26c08e..24b65cb9c9f 100644 --- a/ACE/tests/Codecs_Test.cpp +++ b/ACE/tests/Codecs_Test.cpp @@ -16,7 +16,6 @@ #include "ace/ACE.h" - // Don't change the strings thinking that they are typos const ACE_Byte normal_stream[] = "This is a sample test stream, to test simple Base64 encoding"; diff --git a/ACE/tests/Compiler_Features_01_Test.cpp b/ACE/tests/Compiler_Features_01_Test.cpp index ecf26f1b251..75d5b7e5421 100644 --- a/ACE/tests/Compiler_Features_01_Test.cpp +++ b/ACE/tests/Compiler_Features_01_Test.cpp @@ -16,7 +16,6 @@ #include <list> - int run_main (int, ACE_TCHAR *[]) { diff --git a/ACE/tests/Compiler_Features_10_Test.cpp b/ACE/tests/Compiler_Features_10_Test.cpp index 5c5ed2a6b60..4621bc62f5e 100644 --- a/ACE/tests/Compiler_Features_10_Test.cpp +++ b/ACE/tests/Compiler_Features_10_Test.cpp @@ -125,7 +125,6 @@ namespace } - int run_main (int, ACE_TCHAR *[]) { @@ -201,7 +200,6 @@ run_main (int, ACE_TCHAR *[]) namespace { - void check_constructor_count(int expected, char const * filename, diff --git a/ACE/tests/Compiler_Features_22_DLL.h b/ACE/tests/Compiler_Features_22_DLL.h index a7dd73aff6b..a45101a2107 100644 --- a/ACE/tests/Compiler_Features_22_DLL.h +++ b/ACE/tests/Compiler_Features_22_DLL.h @@ -19,7 +19,6 @@ class A { public: - A () {}; }; diff --git a/ACE/tests/Config_Test.cpp b/ACE/tests/Config_Test.cpp index 31eda47e3e1..e16932db307 100644 --- a/ACE/tests/Config_Test.cpp +++ b/ACE/tests/Config_Test.cpp @@ -780,7 +780,6 @@ Config_Test::testEquality () ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Cannot open heap1\n")), -1); - } else if ((heap2.open ()) != 0) { @@ -1077,7 +1076,6 @@ iniCompare (ACE_Configuration_Heap& fromFile, ACE_Configuration_Heap& original) else // if the type is invalid, then go ahead and fail it. rc = false; - }// end if the original type was not a string. else { @@ -1097,11 +1095,9 @@ iniCompare (ACE_Configuration_Heap& fromFile, ACE_Configuration_Heap& original) // before we move on remove this value from the original. original.remove_value (originalSection, valueName.c_str ()); - }// end else if values match. valueIndex++; - }// end value while loop // at this point the original should have no values. look @@ -1116,7 +1112,6 @@ iniCompare (ACE_Configuration_Heap& fromFile, ACE_Configuration_Heap& original) // having a value indicates a mismatch rc = valueIndex == 0; - }// end else if sections match. if (rc) @@ -1126,7 +1121,6 @@ iniCompare (ACE_Configuration_Heap& fromFile, ACE_Configuration_Heap& original) 0); // do not remove subsections. ++sectionIndex; - }// end section while loop // Finally, if the original has any sections, then we're not equal diff --git a/ACE/tests/Conn_Test.cpp b/ACE/tests/Conn_Test.cpp index 4986926a2a0..c44c607df25 100644 --- a/ACE/tests/Conn_Test.cpp +++ b/ACE/tests/Conn_Test.cpp @@ -36,7 +36,6 @@ #include "ace/os_include/os_netdb.h" - static const char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz"; // This test doesn't work well using fork() on MacOS X. So we diff --git a/ACE/tests/Dev_Poll_Reactor_Echo_Test.cpp b/ACE/tests/Dev_Poll_Reactor_Echo_Test.cpp index f33a16646cd..b634d93a081 100644 --- a/ACE/tests/Dev_Poll_Reactor_Echo_Test.cpp +++ b/ACE/tests/Dev_Poll_Reactor_Echo_Test.cpp @@ -37,7 +37,6 @@ using SVC_HANDLER = ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH>; class Client : public SVC_HANDLER { public: - Client (); //FUZZ: disable check_for_lack_ACE_OS @@ -65,7 +64,6 @@ private: class Server : public SVC_HANDLER { public: - Server (); int handle_input (ACE_HANDLE handle) override; @@ -369,7 +367,6 @@ using CONNECTOR = ACE_Connector<Client, ACE_SOCK_Connector>; class TestAcceptor : public ACCEPTOR { public: - int accept_svc_handler (Server * handler) override { int result = this->ACCEPTOR::accept_svc_handler (handler); @@ -391,7 +388,6 @@ public: return result; } - }; // ---------------------------------------------------- @@ -399,7 +395,6 @@ public: class TestConnector : public CONNECTOR { public: - int connect_svc_handler ( CONNECTOR::handler_type *& handler, const CONNECTOR::addr_type &remote_addr, diff --git a/ACE/tests/Dev_Poll_Reactor_Test.cpp b/ACE/tests/Dev_Poll_Reactor_Test.cpp index 14cfa9e27e8..8dffa050bf3 100644 --- a/ACE/tests/Dev_Poll_Reactor_Test.cpp +++ b/ACE/tests/Dev_Poll_Reactor_Test.cpp @@ -43,7 +43,6 @@ using SVC_HANDLER = ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH>; class Client : public SVC_HANDLER { public: - Client (); //FUZZ: disable check_for_lack_ACE_OS @@ -59,16 +58,13 @@ public: ACE_Reactor_Mask mask) override; private: - unsigned int call_count_; - }; class Server : public SVC_HANDLER { public: - Server (); int handle_input (ACE_HANDLE handle) override; @@ -80,9 +76,7 @@ public: ACE_Reactor_Mask mask) override; private: - unsigned int call_count_; - }; // ---------------------------------------------------- @@ -230,7 +224,6 @@ Server::handle_input (ACE_HANDLE /* handle */) { if (errno == EWOULDBLOCK) { - // ACE_HEX_DUMP ((LM_DEBUG, // buf, // 80, @@ -318,7 +311,6 @@ using CONNECTOR = ACE_Connector<Client, ACE_SOCK_Connector>; class TestAcceptor : public ACCEPTOR { public: - int accept_svc_handler (Server * handler) override { int result = this->ACCEPTOR::accept_svc_handler (handler); @@ -360,7 +352,6 @@ public: return result; } - }; // ---------------------------------------------------- @@ -368,7 +359,6 @@ public: class TestConnector : public CONNECTOR { public: - int connect_svc_handler ( CONNECTOR::handler_type *& handler, const CONNECTOR::addr_type &remote_addr, 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/Dynamic_Priority_Test.cpp b/ACE/tests/Dynamic_Priority_Test.cpp index 136e29f0e44..de5939b43ed 100644 --- a/ACE/tests/Dynamic_Priority_Test.cpp +++ b/ACE/tests/Dynamic_Priority_Test.cpp @@ -52,7 +52,6 @@ #endif /* VXWORKS */ - #if defined (ACE_HAS_TIMED_MESSAGE_BLOCKS) enum Test_Type {BEST, WORST, RANDOM}; @@ -64,7 +63,6 @@ enum Test_Type {BEST, WORST, RANDOM}; class ArgStruct { public: - /// message queue to test ACE_Message_Queue<ACE_SYNCH> *queue_; @@ -683,7 +681,6 @@ run_performance_test (u_int min_load, // Free the allocated pointer array. delete [] supplier_args.array_; - } // Free resources and leave. diff --git a/ACE/tests/Dynamic_Test.cpp b/ACE/tests/Dynamic_Test.cpp index 958ac6fa10e..77c000b2c46 100644 --- a/ACE/tests/Dynamic_Test.cpp +++ b/ACE/tests/Dynamic_Test.cpp @@ -16,7 +16,6 @@ #include "ace/OS_Memory.h" - class A { public: diff --git a/ACE/tests/FlReactor_Test.cpp b/ACE/tests/FlReactor_Test.cpp index 834345bb963..9a442d42a10 100644 --- a/ACE/tests/FlReactor_Test.cpp +++ b/ACE/tests/FlReactor_Test.cpp @@ -20,7 +20,6 @@ - #include "ace/FlReactor/FlReactor.h" #include "ace/Event_Handler.h" #include "ace/Acceptor.h" diff --git a/ACE/tests/Get_Opt_Test.cpp b/ACE/tests/Get_Opt_Test.cpp index 7ba700aa89c..6395c0a1f2e 100644 --- a/ACE/tests/Get_Opt_Test.cpp +++ b/ACE/tests/Get_Opt_Test.cpp @@ -20,7 +20,6 @@ #include "test_config.h" - /* * This is the heart of the test. It sets up the optstring, instantiates * ACE_Get_Opt, add long options, processes them in a loop, and prints out diff --git a/ACE/tests/Hash_Map_Manager_Test.cpp b/ACE/tests/Hash_Map_Manager_Test.cpp index 034c73e80ba..f03a5b3f7d5 100644 --- a/ACE/tests/Hash_Map_Manager_Test.cpp +++ b/ACE/tests/Hash_Map_Manager_Test.cpp @@ -20,7 +20,6 @@ #include "ace/Null_Mutex.h" - static const size_t STRING_TABLE_ENTRIES = 3 * 2; static const size_t MAX_HASH = 6; diff --git a/ACE/tests/Hash_Multi_Map_Manager_Test.cpp b/ACE/tests/Hash_Multi_Map_Manager_Test.cpp index 144befd426b..3c687bc65b0 100644 --- a/ACE/tests/Hash_Multi_Map_Manager_Test.cpp +++ b/ACE/tests/Hash_Multi_Map_Manager_Test.cpp @@ -16,7 +16,6 @@ #include "ace/Null_Mutex.h" - using HASH_STRING_MAP = ACE_Hash_Multi_Map_Manager<const ACE_TCHAR *, const ACE_TCHAR *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>; using HASH_STRING_ENTRY = HASH_STRING_MAP::ENTRY; diff --git a/ACE/tests/Lazy_Map_Manager_Test.cpp b/ACE/tests/Lazy_Map_Manager_Test.cpp index 22bae652ccc..eb155786a1e 100644 --- a/ACE/tests/Lazy_Map_Manager_Test.cpp +++ b/ACE/tests/Lazy_Map_Manager_Test.cpp @@ -17,7 +17,6 @@ #include "ace/Active_Map_Manager.h" - // Simple map manager. using LAZY_MAP = ACE_Map_Manager<int, int, ACE_Null_Mutex>; 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 85cedf6f5c4..6b952c9d5d0 100644 --- a/ACE/tests/MT_Reactor_Timer_Test.cpp +++ b/ACE/tests/MT_Reactor_Timer_Test.cpp @@ -19,7 +19,6 @@ #include "ace/OS_NS_unistd.h" - #if defined (ACE_HAS_THREADS) // This test exercises the setting and cancelling of timers from a @@ -147,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_Reactor_Timer_Test.h b/ACE/tests/MT_Reactor_Timer_Test.h index 966a48e1500..fe8ffeebce4 100644 --- a/ACE/tests/MT_Reactor_Timer_Test.h +++ b/ACE/tests/MT_Reactor_Timer_Test.h @@ -66,7 +66,6 @@ private: #if defined ACE_HAS_THREADS ACE_Thread_Mutex lock_; #endif /* ACE_HAS_THREADS */ - }; /** @@ -104,7 +103,6 @@ private: int input_seen_; int notify_seen_; size_t timers_fired_; - }; #endif /* ACE_TESTS_MT_REACTOR_TIMER_TEST_H */ diff --git a/ACE/tests/MT_Reactor_Upcall_Test.cpp b/ACE/tests/MT_Reactor_Upcall_Test.cpp index 207233b05aa..7b850bb1d2a 100644 --- a/ACE/tests/MT_Reactor_Upcall_Test.cpp +++ b/ACE/tests/MT_Reactor_Upcall_Test.cpp @@ -25,7 +25,6 @@ #include "ace/ACE.h" - int number_of_event_loop_threads = 3; int number_of_messages = 10; int sleep_time_in_msec = 100; diff --git a/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp b/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp index f9d2d2156c6..42b22901170 100644 --- a/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp +++ b/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp @@ -138,7 +138,6 @@ disable_signal (int sigmin, int sigmax) class Pipe { public: - Pipe (); //FUZZ: disable check_for_lack_ACE_OS @@ -226,7 +225,6 @@ static Event_Loop_Thread *global_event_loop_thread_variable = 0; class Sender : public ACE_Event_Handler { public: - Sender (ACE_HANDLE handle, Connection_Cache &connection_cache); @@ -243,13 +241,11 @@ public: ACE_HANDLE handle_; Connection_Cache &connection_cache_; - }; class Connection_Cache { public: - Connection_Cache (); ~Connection_Cache (); @@ -361,20 +357,17 @@ Sender::send_message () class Event_Loop_Thread : public ACE_Task_Base { public: - Event_Loop_Thread (ACE_Thread_Manager &thread_manager, ACE_Reactor &reactor); int svc () override; ACE_Reactor &reactor_; - }; class Receiver : public ACE_Task_Base { public: - Receiver (ACE_Thread_Manager &thread_manager, ACE_HANDLE handle, int nested_upcalls); @@ -398,7 +391,6 @@ public: int nested_upcalls_; int nested_upcalls_level_; - }; Receiver::Receiver (ACE_Thread_Manager &thread_manager, @@ -541,7 +533,6 @@ Receiver::close (u_long) class Connector { public: - Connector (ACE_Thread_Manager &thread_manager, ACE_Reactor &reactor, int nested_upcalls); @@ -557,7 +548,6 @@ public: ACE_Reactor &reactor_; int nested_upcalls_; - }; Connector::Connector (ACE_Thread_Manager &thread_manager, @@ -760,7 +750,6 @@ Connection_Cache::~Connection_Cache () class Invocation_Thread : public ACE_Task_Base { public: - Invocation_Thread (ACE_Thread_Manager &thread_manager, ACE_Reactor &reactor, Connection_Cache &connection_cache, @@ -786,7 +775,6 @@ public: int run_receiver_thread_; int nested_upcalls_; - }; Invocation_Thread::Invocation_Thread (ACE_Thread_Manager &thread_manager, @@ -970,7 +958,6 @@ Invocation_Thread::svc () class Close_Socket_Thread : public ACE_Task_Base { public: - Close_Socket_Thread (ACE_Thread_Manager &thread_manager, ACE_Reactor &reactor, ACE_Auto_Event &new_connection_event, @@ -986,7 +973,6 @@ public: int make_invocations_; int run_receiver_thread_; - }; Close_Socket_Thread::Close_Socket_Thread (ACE_Thread_Manager &thread_manager, @@ -1105,7 +1091,6 @@ Event_Loop_Thread::svc () class Purger_Thread : public ACE_Task_Base { public: - Purger_Thread (ACE_Thread_Manager &thread_manager, ACE_Reactor &reactor, Connection_Cache &connection_cache); @@ -1115,7 +1100,6 @@ public: ACE_Reactor &reactor_; Connection_Cache &connection_cache_; - }; Purger_Thread::Purger_Thread (ACE_Thread_Manager &thread_manager, @@ -1280,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/MT_Reference_Counted_Notify_Test.cpp b/ACE/tests/MT_Reference_Counted_Notify_Test.cpp index a1ba7346316..ab03322f092 100644 --- a/ACE/tests/MT_Reference_Counted_Notify_Test.cpp +++ b/ACE/tests/MT_Reference_Counted_Notify_Test.cpp @@ -37,7 +37,6 @@ static int debug = 1; class Reference_Counted_Event_Handler : public ACE_Event_Handler { public: - Reference_Counted_Event_Handler (); ~Reference_Counted_Event_Handler () override; @@ -47,7 +46,6 @@ public: ACE_Event_Handler::Reference_Count add_reference () override; ACE_Event_Handler::Reference_Count remove_reference () override; - }; Reference_Counted_Event_Handler::Reference_Counted_Event_Handler () @@ -131,7 +129,6 @@ Reference_Counted_Event_Handler::remove_reference () class Simple_Event_Handler : public ACE_Event_Handler { public: - Simple_Event_Handler (int notifies); ~Simple_Event_Handler () override; @@ -172,7 +169,6 @@ Simple_Event_Handler::handle_input (ACE_HANDLE) class Event_Loop_Thread : public ACE_Task_Base { public: - Event_Loop_Thread (ACE_Thread_Manager &thread_manager, ACE_Reactor &reactor, int extra_iterations_needed); 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/Map_Test.cpp b/ACE/tests/Map_Test.cpp index 91c55896b43..706ca1bb788 100644 --- a/ACE/tests/Map_Test.cpp +++ b/ACE/tests/Map_Test.cpp @@ -17,7 +17,6 @@ #include "ace/Profile_Timer.h" - #undef THIS_IS_NOT_AN_ASSERT_IT_IS_A_NON_DEBUG_TEST_AS_WELL #define THIS_IS_NOT_AN_ASSERT_IT_IS_A_NON_DEBUG_TEST_AS_WELL(X) \ ((X) \ diff --git a/ACE/tests/Map_Test.h b/ACE/tests/Map_Test.h index c896c52e71a..b330b8f8f47 100644 --- a/ACE/tests/Map_Test.h +++ b/ACE/tests/Map_Test.h @@ -38,7 +38,6 @@ typedef ACE_Array<char> KEY; class Key_Generator { public: - Key_Generator (void) : counter_ (0) { @@ -90,7 +89,6 @@ public: class Key_Adapter { public: - int encode (const KEY &original_key, const ACE_Active_Map_Manager_Key &active_key, KEY &modified_key) diff --git a/ACE/tests/Max_Default_Port_Test.cpp b/ACE/tests/Max_Default_Port_Test.cpp index 2e555005b3a..90641fcb154 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"), @@ -60,7 +59,6 @@ My_Accept_Handler::open (ACE_INET_Addr &addr) } return 0; - } ACE_HANDLE @@ -72,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"))); @@ -164,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); @@ -287,7 +283,6 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_TEXT ("Invalid ACE_MAX_DEFAULT_PORT ") ACE_TEXT ("or %d port may be busy; got to %d\n"), ACE_MAX_DEFAULT_PORT, max_listened_port)); - } #endif // ACE_LACKS_ACCEPT diff --git a/ACE/tests/Max_Default_Port_Test.h b/ACE/tests/Max_Default_Port_Test.h index 70d68dea586..10439aaeedc 100644 --- a/ACE/tests/Max_Default_Port_Test.h +++ b/ACE/tests/Max_Default_Port_Test.h @@ -9,7 +9,6 @@ //============================================================================= - #ifndef ACE_TESTS_MAX_DEFAULT_PORT_TEST #define ACE_TESTS_MAX_DEFAULT_PORT_TEST @@ -25,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 22ae15ea6ee..fe0df33bcf7 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"), @@ -52,7 +51,6 @@ My_Accept_Handler::open (ACE_INET_Addr &addr) } return 0; - } ACE_HANDLE @@ -64,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"))); @@ -242,7 +239,6 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_TEXT ("Invalid ACE_MAX_DEFAULT_PORT ") ACE_TEXT ("or %d port may be busy; got to %d\n"), ACE_MAX_DEFAULT_PORT, max_listened_port)); - } #endif /* ACE_HAS_IPV6 */ diff --git a/ACE/tests/Mem_Map_Test.cpp b/ACE/tests/Mem_Map_Test.cpp index 73bb98590cf..7549be0c73a 100644 --- a/ACE/tests/Mem_Map_Test.cpp +++ b/ACE/tests/Mem_Map_Test.cpp @@ -22,7 +22,6 @@ #include "ace/OS_Memory.h" - #if !defined (ACE_LACKS_MMAP) static const char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz"; 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_Notifications_Test.cpp b/ACE/tests/Message_Queue_Notifications_Test.cpp index 91cb7138a5d..7ea1d2971eb 100644 --- a/ACE/tests/Message_Queue_Notifications_Test.cpp +++ b/ACE/tests/Message_Queue_Notifications_Test.cpp @@ -41,7 +41,6 @@ #include "ace/OS_NS_unistd.h" - static int iterations = 10; static const size_t worker_threads = 2; @@ -219,7 +218,6 @@ Watermark_Test::producer () i--; if (this->msg_queue ()->is_full ()) break; - } ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Producer: High water mark hit ----\n"))); diff --git a/ACE/tests/Message_Queue_Test.cpp b/ACE/tests/Message_Queue_Test.cpp index 0e3768ab837..ce5163e5be4 100644 --- a/ACE/tests/Message_Queue_Test.cpp +++ b/ACE/tests/Message_Queue_Test.cpp @@ -38,7 +38,6 @@ #include "ace/OS_NS_unistd.h" - const ACE_TCHAR usage[] = ACE_TEXT ("usage: Message_Queue_Test <number of messages>\n"); using QUEUE = ACE_Message_Queue<ACE_NULL_SYNCH>; @@ -409,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; @@ -959,7 +957,6 @@ run_main (int argc, ACE_TCHAR *argv[]) timer = 0; - ACE_END_TEST; return status; } diff --git a/ACE/tests/Message_Queue_Test_Ex.cpp b/ACE/tests/Message_Queue_Test_Ex.cpp index 3182d2c6d0b..853eebb8504 100644 --- a/ACE/tests/Message_Queue_Test_Ex.cpp +++ b/ACE/tests/Message_Queue_Test_Ex.cpp @@ -373,7 +373,6 @@ MQ_Ex_N_Tester::test_enqueue_head () timer->reset (); return 0; - } #if defined (ACE_HAS_THREADS) diff --git a/ACE/tests/Multicast_Test.cpp b/ACE/tests/Multicast_Test.cpp index f07d65e65c8..c00aaa347b0 100644 --- a/ACE/tests/Multicast_Test.cpp +++ b/ACE/tests/Multicast_Test.cpp @@ -80,7 +80,6 @@ static sig_atomic_t error = 0; class MCT_Config { public: - enum { PRODUCER = 1, @@ -759,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 0eda873a68c..65347b3bf7d 100644 --- a/ACE/tests/Multicast_Test_IPV6.cpp +++ b/ACE/tests/Multicast_Test_IPV6.cpp @@ -86,7 +86,6 @@ static sig_atomic_t error = 0; class MCT_Config { public: - enum { PRODUCER = 1, @@ -755,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. @@ -930,7 +928,6 @@ int advance_addr (ACE_INET_Addr &addr) ACE_TEXT ("multicast group address past %s\n"), addr.get_host_addr ()), -1); - } } #endif /* ACE_HAS_IPV6 */ diff --git a/ACE/tests/Multihomed_INET_Addr_Test.cpp b/ACE/tests/Multihomed_INET_Addr_Test.cpp index bf8d53308c2..922c2fc38d3 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,14 +176,12 @@ 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"), returned_num_secondaries, num_secondaries)); status = 1; - } @@ -230,7 +221,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 +231,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,13 +254,11 @@ 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"))); status = 1; - } // Check that the secondary addresses in the in_out_sockaddr @@ -280,9 +266,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 +276,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 +322,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 +332,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,14 +350,12 @@ 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"), returned_num_secondaries, num_secondaries)); status = 1; - } @@ -415,7 +393,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 +403,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 +421,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 bab97e3c032..ef9fc882510 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,13 +133,11 @@ 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"))); status = 1; - } // Check that the secondary addresses in the in_out_sockaddr @@ -152,10 +145,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 +155,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"), @@ -177,5 +167,4 @@ int run_main (int argc, ACE_TCHAR *argv[]) ACE_END_TEST; return status; - } diff --git a/ACE/tests/Network_Adapters_Test.cpp b/ACE/tests/Network_Adapters_Test.cpp index e42fc226182..7ef95d8116d 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], @@ -992,7 +991,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) default: // return print_usage (argc,argv); break; - } } diff --git a/ACE/tests/Network_Adapters_Test.h b/ACE/tests/Network_Adapters_Test.h index ead6e6a120a..c49a81410c8 100644 --- a/ACE/tests/Network_Adapters_Test.h +++ b/ACE/tests/Network_Adapters_Test.h @@ -124,7 +124,6 @@ public: int does_echo_test_successful (void); private: - /// Wrapper for sending/receiving ICMPs. ACE_Ping_Socket ping_socket_; @@ -197,7 +196,6 @@ public: virtual int unregister_handler (ACE_Event_Handler * handler); private: - enum { HANDLERS_TO_STOP_TABLE_SIZE = 10 diff --git a/ACE/tests/OS_Test.cpp b/ACE/tests/OS_Test.cpp index abe20bdc17a..03666ca0ae2 100644 --- a/ACE/tests/OS_Test.cpp +++ b/ACE/tests/OS_Test.cpp @@ -861,7 +861,6 @@ string_strsncpy_test () 9) == 0); // size should be 9 (+ '\0' char) THIS_IS_NOT_AN_ASSERT_IT_IS_A_NON_DEBUG_TEST_AS_WELL(ACE_OS::strlen(strsncpy2) == 9); - } #if defined (ACE_HAS_WCHAR) diff --git a/ACE/tests/Object_Manager_Flipping_Test.cpp b/ACE/tests/Object_Manager_Flipping_Test.cpp index 572df1a262c..0531220c232 100644 --- a/ACE/tests/Object_Manager_Flipping_Test.cpp +++ b/ACE/tests/Object_Manager_Flipping_Test.cpp @@ -105,5 +105,4 @@ int run_main (int, ACE_TCHAR *[]) } return errors == 0 ? 0 : 1; - } diff --git a/ACE/tests/Object_Manager_Test.cpp b/ACE/tests/Object_Manager_Test.cpp index 27870763f34..b34eee97e24 100644 --- a/ACE/tests/Object_Manager_Test.cpp +++ b/ACE/tests/Object_Manager_Test.cpp @@ -16,7 +16,6 @@ #include "ace/Init_ACE.h" - static u_int *ip; extern "C" diff --git a/ACE/tests/OrdMultiSet_Test.cpp b/ACE/tests/OrdMultiSet_Test.cpp index f62bf4ada6f..efd30bb1d51 100644 --- a/ACE/tests/OrdMultiSet_Test.cpp +++ b/ACE/tests/OrdMultiSet_Test.cpp @@ -20,7 +20,6 @@ #include "ace/Containers.h" - int run_main (int, ACE_TCHAR *[]) { diff --git a/ACE/tests/Priority_Buffer_Test.cpp b/ACE/tests/Priority_Buffer_Test.cpp index 57d257d8b37..4877f5e1cdb 100644 --- a/ACE/tests/Priority_Buffer_Test.cpp +++ b/ACE/tests/Priority_Buffer_Test.cpp @@ -18,7 +18,6 @@ #include "ace/Thread_Manager.h" - #if defined (ACE_HAS_THREADS) static const char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz"; diff --git a/ACE/tests/Priority_Reactor_Test.cpp b/ACE/tests/Priority_Reactor_Test.cpp index b2a99ea8e0a..c37451a6189 100644 --- a/ACE/tests/Priority_Reactor_Test.cpp +++ b/ACE/tests/Priority_Reactor_Test.cpp @@ -32,7 +32,6 @@ #include <utility> - static const char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz"; // The number of children to run, it can be changed using the -c diff --git a/ACE/tests/Proactor_Scatter_Gather_Test.cpp b/ACE/tests/Proactor_Scatter_Gather_Test.cpp index d0e75e84e25..785576e9c6d 100644 --- a/ACE/tests/Proactor_Scatter_Gather_Test.cpp +++ b/ACE/tests/Proactor_Scatter_Gather_Test.cpp @@ -916,7 +916,6 @@ class Sender : public ACE_Service_Handler { friend class Connector; public: - Sender (Connector *connector = 0, int index = -1); virtual ~Sender (void); diff --git a/ACE/tests/Proactor_Test.cpp b/ACE/tests/Proactor_Test.cpp index 04bea2e7779..e82b054b90c 100644 --- a/ACE/tests/Proactor_Test.cpp +++ b/ACE/tests/Proactor_Test.cpp @@ -103,13 +103,11 @@ static char complete_message[] = class LogLocker { public: - LogLocker () { ACE_LOG_MSG->acquire (); } virtual ~LogLocker () { ACE_LOG_MSG->release (); } }; - // Function to remove signals from the signal mask. static int disable_signal (int sigmin, int sigmax) @@ -190,7 +188,6 @@ private: ACE_SYNCH_RECURSIVE_MUTEX lock_; ACE_Thread_Semaphore sem_; ACE_Proactor * proactor_; - }; int diff --git a/ACE/tests/Proactor_Test.h b/ACE/tests/Proactor_Test.h index 02bd4a40796..94b51d30584 100644 --- a/ACE/tests/Proactor_Test.h +++ b/ACE/tests/Proactor_Test.h @@ -83,7 +83,6 @@ private: class Client : public ACE_Service_Handler { public: - /// This is called after the new connection has been established. virtual void open (ACE_HANDLE handle, ACE_Message_Block &message_block); diff --git a/ACE/tests/Proactor_UDP_Test.cpp b/ACE/tests/Proactor_UDP_Test.cpp index 9f4cbd438fb..5d32acc263d 100644 --- a/ACE/tests/Proactor_UDP_Test.cpp +++ b/ACE/tests/Proactor_UDP_Test.cpp @@ -100,7 +100,6 @@ static char close_ack_msg[] = "CLOSE-ACK"; class LogLocker { public: - LogLocker () { ACE_LOG_MSG->acquire (); } virtual ~LogLocker () { ACE_LOG_MSG->release (); } }; @@ -184,7 +183,6 @@ private: ACE_SYNCH_RECURSIVE_MUTEX lock_; ACE_Thread_Semaphore sem_; ACE_Proactor * proactor_; - }; int 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/Process_Strategy_Test.h b/ACE/tests/Process_Strategy_Test.h index 190b1d392ea..dafc57487ae 100644 --- a/ACE/tests/Process_Strategy_Test.h +++ b/ACE/tests/Process_Strategy_Test.h @@ -72,7 +72,6 @@ protected: class Process_Strategy : public ACE_Process_Strategy<Counting_Service> { public: - // Constructor Process_Strategy (size_t n_processes = 1, ACE_Event_Handler *acceptor = 0, diff --git a/ACE/tests/QtReactor_Test.cpp b/ACE/tests/QtReactor_Test.cpp index cbc994d4300..dbb33561dee 100644 --- a/ACE/tests/QtReactor_Test.cpp +++ b/ACE/tests/QtReactor_Test.cpp @@ -611,7 +611,6 @@ int HandlersRegister::scheduleTimers (const ACE_Time_Value &p_TestTime) -1); DgramHandlers_[ i ] ->expectedTriggers (DgramsToSend); - } return 0; @@ -900,7 +899,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 1b9d52fa91c..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. @@ -50,7 +49,6 @@ public: void run_test (void); private: - /// Tests stable and deprecated insertion interfaces. void test_tree_insertion (void); @@ -101,5 +99,4 @@ private: /// Order of indices in the key and item arrays. int *order_index_; - }; diff --git a/ACE/tests/RW_Process_Mutex_Test.cpp b/ACE/tests/RW_Process_Mutex_Test.cpp index 36ba22dd187..0b057803db9 100644 --- a/ACE/tests/RW_Process_Mutex_Test.cpp +++ b/ACE/tests/RW_Process_Mutex_Test.cpp @@ -22,7 +22,6 @@ #include "ace/OS_NS_unistd.h" - // The parent process is number -1. Writer is 0; Readers are 1-3. static int child_nr = -1; static u_short reporting_port = 0; 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/Reactor_Registration_Test.cpp b/ACE/tests/Reactor_Registration_Test.cpp index f4d98da89e5..ffee3485de3 100644 --- a/ACE/tests/Reactor_Registration_Test.cpp +++ b/ACE/tests/Reactor_Registration_Test.cpp @@ -24,7 +24,6 @@ static int iteration = 1; class Event_Handler : public ACE_Event_Handler { public: - Event_Handler (ACE_Reactor &reactor, ACE_HANDLE read, ACE_HANDLE write); diff --git a/ACE/tests/Reactor_Remove_Resume_Test.cpp b/ACE/tests/Reactor_Remove_Resume_Test.cpp index e70af6e1f09..6fa52a697ec 100644 --- a/ACE/tests/Reactor_Remove_Resume_Test.cpp +++ b/ACE/tests/Reactor_Remove_Resume_Test.cpp @@ -29,13 +29,11 @@ int overall_result = 0; class Bogus_Handler : public ACE_Event_Handler { public: - Bogus_Handler (ACE_Reactor * reactor, ACE_HANDLE read_handle, bool & okay_to_close); protected: - ~Bogus_Handler () override; ACE_HANDLE get_handle () const override; @@ -45,13 +43,11 @@ protected: int resume_handler () override; private: - ACE_HANDLE const read_handle_; // If the reactor closes the event handler before it gets the okay, // we will issue an error. bool & okay_to_close_; - }; Bogus_Handler::Bogus_Handler (ACE_Reactor * reactor, @@ -113,7 +109,6 @@ Bogus_Handler::resume_handler () class Bad_Handler : public ACE_Event_Handler { public: - Bad_Handler (ACE_Reactor * reactor, ACE_HANDLE read_handle, bool & okay_to_close, @@ -122,11 +117,9 @@ public: ACE_HANDLE write_handle () const; protected: - ~Bad_Handler () override; private: - ACE_HANDLE get_handle () const override; int handle_input (ACE_HANDLE handle) override; int handle_close (ACE_HANDLE handle, @@ -135,7 +128,6 @@ private: int handle_input_result () const; private: - ACE_HANDLE const read_handle_; bool handle_close_called_; @@ -146,7 +138,6 @@ private: // Are we running the event handler suspension or removal test? bool suspension_test_; - }; Bad_Handler::Bad_Handler (ACE_Reactor * reactor, @@ -161,7 +152,6 @@ Bad_Handler::Bad_Handler (ACE_Reactor * reactor, { this->reference_counting_policy ().value ( ACE_Event_Handler::Reference_Counting_Policy::ENABLED); - } Bad_Handler::~Bad_Handler () diff --git a/ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp b/ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp index 943304eaf49..e591a9b0159 100644 --- a/ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp +++ b/ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp @@ -33,13 +33,11 @@ int overall_result = 0; class Bogus_Handler : public ACE_Event_Handler { public: - Bogus_Handler (ACE_Reactor * reactor, ACE_HANDLE read_handle, bool & okay_to_close); protected: - ~Bogus_Handler () override; ACE_HANDLE get_handle () const override; @@ -49,13 +47,11 @@ protected: int resume_handler () override; private: - ACE_HANDLE const read_handle_; // If the reactor closes the event handler before it gets the okay, // we will issue an error. bool & okay_to_close_; - }; Bogus_Handler::Bogus_Handler (ACE_Reactor * reactor, @@ -117,7 +113,6 @@ Bogus_Handler::resume_handler () class Bad_Handler : public ACE_Event_Handler { public: - Bad_Handler (ACE_Reactor * reactor, ACE_HANDLE read_handle, bool & okay_to_close, @@ -126,11 +121,9 @@ public: ACE_HANDLE write_handle () const; protected: - ~Bad_Handler () override; private: - ACE_HANDLE get_handle () const override; int handle_input (ACE_HANDLE handle) override; int handle_close (ACE_HANDLE handle, @@ -139,7 +132,6 @@ private: int handle_input_result () const; private: - ACE_HANDLE const read_handle_; bool handle_close_called_; @@ -150,7 +142,6 @@ private: // Are we running the event handler suspension or removal test? bool suspension_test_; - }; Bad_Handler::Bad_Handler (ACE_Reactor * reactor, @@ -165,7 +156,6 @@ Bad_Handler::Bad_Handler (ACE_Reactor * reactor, { this->reference_counting_policy ().value ( ACE_Event_Handler::Reference_Counting_Policy::ENABLED); - } Bad_Handler::~Bad_Handler () diff --git a/ACE/tests/Reader_Writer_Test.cpp b/ACE/tests/Reader_Writer_Test.cpp index a9c747f5f2f..95ff35d4457 100644 --- a/ACE/tests/Reader_Writer_Test.cpp +++ b/ACE/tests/Reader_Writer_Test.cpp @@ -157,7 +157,6 @@ reader (void *) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) could not upgrade to write lock!\n"))); - } else // result == -1 { diff --git a/ACE/tests/Recursive_Mutex_Test.cpp b/ACE/tests/Recursive_Mutex_Test.cpp index 891cf42b6df..4ecd657ffa2 100644 --- a/ACE/tests/Recursive_Mutex_Test.cpp +++ b/ACE/tests/Recursive_Mutex_Test.cpp @@ -21,7 +21,6 @@ #include "ace/Recursive_Thread_Mutex.h" - #if defined (ACE_HAS_THREADS) #include "ace/Guard_T.h" diff --git a/ACE/tests/Refcounted_Event_Handler_Test_DevPoll.cpp b/ACE/tests/Refcounted_Event_Handler_Test_DevPoll.cpp index 92bad5dd0dd..591581b8951 100644 --- a/ACE/tests/Refcounted_Event_Handler_Test_DevPoll.cpp +++ b/ACE/tests/Refcounted_Event_Handler_Test_DevPoll.cpp @@ -21,7 +21,6 @@ #include "ace/ACE.h" - #if defined (ACE_HAS_DEV_POLL) || defined (ACE_HAS_EVENT_POLL) static const char *message = diff --git a/ACE/tests/Reference_Counted_Event_Handler_Test.cpp b/ACE/tests/Reference_Counted_Event_Handler_Test.cpp index 7e2081b837d..02a2272cbd5 100644 --- a/ACE/tests/Reference_Counted_Event_Handler_Test.cpp +++ b/ACE/tests/Reference_Counted_Event_Handler_Test.cpp @@ -764,7 +764,6 @@ simple (ACE_Reactor_Impl *impl) class Closed_In_Upcall_Event_Handler : public ACE_Event_Handler { public: - Closed_In_Upcall_Event_Handler (int &events); ~Closed_In_Upcall_Event_Handler () override; @@ -781,7 +780,6 @@ public: ACE_Pipe pipe_; int &events_; - }; Closed_In_Upcall_Event_Handler::Closed_In_Upcall_Event_Handler (int &events) diff --git a/ACE/tests/SOCK_Connector_Test.cpp b/ACE/tests/SOCK_Connector_Test.cpp index 78cabecb0d0..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 @@ -316,4 +315,3 @@ run_main (int, ACE_TCHAR *[]) } - diff --git a/ACE/tests/SOCK_Netlink_Test.cpp b/ACE/tests/SOCK_Netlink_Test.cpp index d4c8e08bd2a..49122342009 100644 --- a/ACE/tests/SOCK_Netlink_Test.cpp +++ b/ACE/tests/SOCK_Netlink_Test.cpp @@ -190,7 +190,6 @@ struct Netlink_Request }; - /** * The handler first is trying to delete an ip-address, further * to add the ip and, if successful to cleanup the address. @@ -198,7 +197,6 @@ struct Netlink_Request class Secondary_Ipaddr_Handler : public ACE_Event_Handler { public: - // Default constructor Secondary_Ipaddr_Handler (); @@ -260,7 +258,6 @@ public: int get_state () const { return this->state_;} protected: - //FUZZ: disable check_for_lack_ACE_OS // De-registers the handler from the reactor, // other cleanup jobs @@ -270,7 +267,6 @@ protected: ACE_SOCK_Netlink& socket (); private: - // Schedule two sec timer. int schedule_one_sec_timer (); diff --git a/ACE/tests/SOCK_Send_Recv_Test.cpp b/ACE/tests/SOCK_Send_Recv_Test.cpp index 045ee1077ad..544bf8a6641 100644 --- a/ACE/tests/SOCK_Send_Recv_Test.cpp +++ b/ACE/tests/SOCK_Send_Recv_Test.cpp @@ -29,7 +29,6 @@ #include "ace/SOCK_Stream.h" - // Change to non-zero if test fails static int Test_Result = 0; diff --git a/ACE/tests/SOCK_Test.cpp b/ACE/tests/SOCK_Test.cpp index 0235a6b9123..63e74c76a63 100644 --- a/ACE/tests/SOCK_Test.cpp +++ b/ACE/tests/SOCK_Test.cpp @@ -25,7 +25,6 @@ #include "ace/Handle_Set.h" - static const char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz"; void * diff --git a/ACE/tests/SPIPE_Test.cpp b/ACE/tests/SPIPE_Test.cpp index 7d782abd66a..0871fbdb147 100644 --- a/ACE/tests/SPIPE_Test.cpp +++ b/ACE/tests/SPIPE_Test.cpp @@ -25,7 +25,6 @@ #include "ace/OS_NS_unistd.h" - #if defined (ACE_HAS_STREAM_PIPES) || defined (ACE_HAS_WIN32_NAMED_PIPES) # define TEST_HAS_STREAM_PIPES #endif diff --git a/ACE/tests/SSL/SSL_Asynch_Stream_Test.cpp b/ACE/tests/SSL/SSL_Asynch_Stream_Test.cpp index 3bfe9271e7f..8a52126f1b0 100644 --- a/ACE/tests/SSL/SSL_Asynch_Stream_Test.cpp +++ b/ACE/tests/SSL/SSL_Asynch_Stream_Test.cpp @@ -39,7 +39,6 @@ #include "ace/SSL/SSL_SOCK_Stream.h" - #if defined (ACE_HAS_THREADS) && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))) // This only works on Win32 platforms and on Unix platforms // supporting POSIX aio calls. diff --git a/ACE/tests/SString_Test.cpp b/ACE/tests/SString_Test.cpp index b79c5979105..75d47ad8b84 100644 --- a/ACE/tests/SString_Test.cpp +++ b/ACE/tests/SString_Test.cpp @@ -18,7 +18,6 @@ #include "ace/SString.h" - static int testConcatenation() { #ifdef ACE_HAS_WCHAR ACE_WString s1; @@ -161,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/SV_Shared_Memory_Test.cpp b/ACE/tests/SV_Shared_Memory_Test.cpp index ab3a6aba346..b8776216917 100644 --- a/ACE/tests/SV_Shared_Memory_Test.cpp +++ b/ACE/tests/SV_Shared_Memory_Test.cpp @@ -24,7 +24,6 @@ - #if defined (ACE_HAS_SYSV_IPC) && !defined(ACE_LACKS_SYSV_SHMEM) // The shared memory allocator, which uses up the ACE_DEFAULT_SEM_KEY. diff --git a/ACE/tests/Service_Config_DLL.h b/ACE/tests/Service_Config_DLL.h index ca66ec748db..e2bdf906c9d 100644 --- a/ACE/tests/Service_Config_DLL.h +++ b/ACE/tests/Service_Config_DLL.h @@ -34,7 +34,6 @@ class Service_Config_DLL_Export Service_Config_DLL : public ACE_Task_Base { public: - /// Constructor. Service_Config_DLL (void); @@ -52,11 +51,9 @@ public: virtual int svc (); private: - /// Directives to be passed to be processed by the Service /// Configurator in separate threads. ACE_TCHAR directive_[2][BUFSIZ]; - }; /** diff --git a/ACE/tests/Service_Config_Stream_DLL.cpp b/ACE/tests/Service_Config_Stream_DLL.cpp index c33e875e931..377c4d71ecc 100644 --- a/ACE/tests/Service_Config_Stream_DLL.cpp +++ b/ACE/tests/Service_Config_Stream_DLL.cpp @@ -3,7 +3,6 @@ #include "ace/Service_Types.h" - int Test_Task::open (void *) { diff --git a/ACE/tests/Sig_Handlers_Test.cpp b/ACE/tests/Sig_Handlers_Test.cpp index 495fc85aadc..9378667c33c 100644 --- a/ACE/tests/Sig_Handlers_Test.cpp +++ b/ACE/tests/Sig_Handlers_Test.cpp @@ -23,7 +23,6 @@ #include "ace/SString.h" - class Test_SIGINT_Handler : public ACE_Event_Handler { public: diff --git a/ACE/tests/Sigset_Ops_Test.cpp b/ACE/tests/Sigset_Ops_Test.cpp index e29272100e1..9402ab7f0cc 100644 --- a/ACE/tests/Sigset_Ops_Test.cpp +++ b/ACE/tests/Sigset_Ops_Test.cpp @@ -17,7 +17,6 @@ #include "ace/OS_NS_errno.h" - void siglistset (sigset_t x, int *sigset, int can_miss = 0) { diff --git a/ACE/tests/Simple_Message_Block_Test.cpp b/ACE/tests/Simple_Message_Block_Test.cpp index 0023f88a4a3..2c331dd9696 100644 --- a/ACE/tests/Simple_Message_Block_Test.cpp +++ b/ACE/tests/Simple_Message_Block_Test.cpp @@ -21,7 +21,6 @@ #include "ace/Thread_Mutex.h" - int run_main (int, ACE_TCHAR *[]) { diff --git a/ACE/tests/Singleton_Test.cpp b/ACE/tests/Singleton_Test.cpp index 33d9ab857c7..936295f4277 100644 --- a/ACE/tests/Singleton_Test.cpp +++ b/ACE/tests/Singleton_Test.cpp @@ -14,7 +14,6 @@ #include "ace/Singleton.h" - int run_main (int, ACE_TCHAR *[]) { diff --git a/ACE/tests/Stack_Trace_Test.cpp b/ACE/tests/Stack_Trace_Test.cpp index ec14d0dc9e4..57cda976c31 100644 --- a/ACE/tests/Stack_Trace_Test.cpp +++ b/ACE/tests/Stack_Trace_Test.cpp @@ -16,7 +16,6 @@ #include "test_config.h" - /* * Ultra-basic test of stack trace. * diff --git a/ACE/tests/TP_Reactor_Test.cpp b/ACE/tests/TP_Reactor_Test.cpp index 48691c478c4..d81410851ba 100644 --- a/ACE/tests/TP_Reactor_Test.cpp +++ b/ACE/tests/TP_Reactor_Test.cpp @@ -106,7 +106,6 @@ static char data[] = class LogLocker { public: - LogLocker () { ACE_LOG_MSG->acquire (); } virtual ~LogLocker () { ACE_LOG_MSG->release (); } }; @@ -693,13 +692,11 @@ Connector::on_delete_sender (Sender & sndr) bufs, bufr, this->sessions_)); - } 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 @@ -1176,7 +1173,6 @@ run_main (int argc, ACE_TCHAR *argv[]) if (addr.set (port, host, 1, addr.get_type ()) == -1) ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), host)); rc += connector.start (addr, senders); - } if (rc > 0) diff --git a/ACE/tests/TP_Reactor_Test.h b/ACE/tests/TP_Reactor_Test.h index 92fe33b0747..d9c8f608dec 100644 --- a/ACE/tests/TP_Reactor_Test.h +++ b/ACE/tests/TP_Reactor_Test.h @@ -38,7 +38,6 @@ class Receiver : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_MT_SYNCH> { friend class Acceptor; public: - Receiver (Acceptor * acceptor=0, size_t index=MAX_RECEIVERS+1); ~Receiver (void); @@ -94,7 +93,6 @@ public: virtual int make_svc_handler (Receiver * & sh); private: - ACE_Recursive_Thread_Mutex mutex_; size_t sessions_; Receiver *list_receivers_[MAX_RECEIVERS]; @@ -178,7 +176,6 @@ public: virtual int make_svc_handler (Sender * & sh); private: - ACE_Recursive_Thread_Mutex mutex_; size_t sessions_; Sender * list_senders_ [MAX_SENDERS]; diff --git a/ACE/tests/TSS_Static_Test.cpp b/ACE/tests/TSS_Static_Test.cpp index 8a3aef6f659..b08f33ebee2 100644 --- a/ACE/tests/TSS_Static_Test.cpp +++ b/ACE/tests/TSS_Static_Test.cpp @@ -20,7 +20,6 @@ #include "ace/Thread.h" - #if defined (ACE_HAS_TSS_EMULATION) class Some_Object diff --git a/ACE/tests/TSS_Test.cpp b/ACE/tests/TSS_Test.cpp index 79c7ca3d113..62feb204519 100644 --- a/ACE/tests/TSS_Test.cpp +++ b/ACE/tests/TSS_Test.cpp @@ -23,7 +23,6 @@ #include "TSS_Test_Errno.h" - static u_int errors = 0; #if defined (ACE_HAS_THREADS) diff --git a/ACE/tests/Task_Ex_Test.cpp b/ACE/tests/Task_Ex_Test.cpp index 4acc9159ea6..c362de4c6fb 100644 --- a/ACE/tests/Task_Ex_Test.cpp +++ b/ACE/tests/Task_Ex_Test.cpp @@ -41,7 +41,6 @@ public: /// svc thread entry point int svc () override; private: - }; int Consumer::open (void*) 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_Creation_Threshold_Test.cpp b/ACE/tests/Thread_Creation_Threshold_Test.cpp index 04d501e1eb6..a84bd553651 100644 --- a/ACE/tests/Thread_Creation_Threshold_Test.cpp +++ b/ACE/tests/Thread_Creation_Threshold_Test.cpp @@ -21,7 +21,6 @@ #include "ace/Task.h" - #if defined (ACE_HAS_THREADS) #include "ace/Lock_Adapter_T.h" #include "ace/OS_NS_stdio.h" 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/ACE/tests/Thread_Mutex_Test.cpp b/ACE/tests/Thread_Mutex_Test.cpp index b8b0485b56b..3f72afe6db6 100644 --- a/ACE/tests/Thread_Mutex_Test.cpp +++ b/ACE/tests/Thread_Mutex_Test.cpp @@ -19,7 +19,6 @@ #include "ace/OS_NS_unistd.h" - #if defined (ACE_HAS_THREADS) #include "ace/Guard_T.h" diff --git a/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp b/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp index 16835222354..edfbcf035a7 100644 --- a/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp +++ b/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp @@ -39,7 +39,6 @@ #include "ace/TP_Reactor.h" - #if defined (ACE_HAS_THREADS) && !defined ACE_LACKS_ACCEPT #include "Thread_Pool_Reactor_Resume_Test.h" diff --git a/ACE/tests/Thread_Pool_Reactor_Resume_Test.h b/ACE/tests/Thread_Pool_Reactor_Resume_Test.h index 677dd333e1c..41d00f74901 100644 --- a/ACE/tests/Thread_Pool_Reactor_Resume_Test.h +++ b/ACE/tests/Thread_Pool_Reactor_Resume_Test.h @@ -31,7 +31,6 @@ class Request_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_MT_SYNCH> { public: - /// The default constructor makes sure the right reactor is used. Request_Handler (ACE_Thread_Manager *tm = 0); diff --git a/ACE/tests/Thread_Pool_Reactor_Test.cpp b/ACE/tests/Thread_Pool_Reactor_Test.cpp index 07c134f96fd..aa654361fba 100644 --- a/ACE/tests/Thread_Pool_Reactor_Test.cpp +++ b/ACE/tests/Thread_Pool_Reactor_Test.cpp @@ -42,7 +42,6 @@ #include "ace/TP_Reactor.h" - #if defined (ACE_HAS_THREADS) && !defined ACE_LACKS_ACCEPT #include "Thread_Pool_Reactor_Test.h" diff --git a/ACE/tests/Thread_Timer_Queue_Adapter_Test.cpp b/ACE/tests/Thread_Timer_Queue_Adapter_Test.cpp index f932dbd2ad5..b5d62df79a6 100644 --- a/ACE/tests/Thread_Timer_Queue_Adapter_Test.cpp +++ b/ACE/tests/Thread_Timer_Queue_Adapter_Test.cpp @@ -22,7 +22,6 @@ class ICustomEventHandler { public: - /// Default constructor. /// /// @return @@ -51,7 +50,6 @@ class ICustomEventHandler class CCustomEventHandlerUpcall { public: - using TTimerQueue = ACE_Timer_Queue_T<ICustomEventHandler *, CCustomEventHandlerUpcall, ACE_Null_Mutex>; /// Default constructor @@ -115,7 +113,6 @@ class CCustomEventHandlerUpcall class CTestEventHandler : public ICustomEventHandler { public: - /// Default constructor. /// /// @return @@ -154,7 +151,6 @@ class CTestEventHandler : public ICustomEventHandler } private: - long* m_p_iCallCount; ACE_Thread_Mutex m_Mutex; }; diff --git a/ACE/tests/Timeprobe_Test.cpp b/ACE/tests/Timeprobe_Test.cpp index 9c518837edb..d4fa1f1d350 100644 --- a/ACE/tests/Timeprobe_Test.cpp +++ b/ACE/tests/Timeprobe_Test.cpp @@ -23,7 +23,6 @@ #include "ace/Timeprobe.h" - #if defined (ACE_ENABLE_TIMEPROBES) static const char *events_descriptions_0[] = diff --git a/ACE/tests/Timer_Cancellation_Test.cpp b/ACE/tests/Timer_Cancellation_Test.cpp index b4f3aa96d46..af2a3fae4cb 100644 --- a/ACE/tests/Timer_Cancellation_Test.cpp +++ b/ACE/tests/Timer_Cancellation_Test.cpp @@ -19,7 +19,6 @@ class Deadlock : public ACE_Task_Base { public: - int svc () override; int handle_timeout (const ACE_Time_Value ¤t_time, @@ -55,7 +54,6 @@ Deadlock::handle_timeout (const ACE_Time_Value &, class Event_Handler : public ACE_Event_Handler { public: - Event_Handler (Deadlock &deadlock); int handle_timeout (const ACE_Time_Value ¤t_time, diff --git a/ACE/tests/Timer_Queue_Reference_Counting_Test.cpp b/ACE/tests/Timer_Queue_Reference_Counting_Test.cpp index 94f7f395e85..2ada4183a34 100644 --- a/ACE/tests/Timer_Queue_Reference_Counting_Test.cpp +++ b/ACE/tests/Timer_Queue_Reference_Counting_Test.cpp @@ -24,7 +24,6 @@ #include "ace/OS_NS_unistd.h" - static int debug = 0; static const char *one_second_timeout = "one second timeout"; static const char *two_second_timeout = "two second timeout"; @@ -45,7 +44,6 @@ namespace class Reference_Counted_Event_Handler : public ACE_Event_Handler { public: - Reference_Counted_Event_Handler (int expected_number_of_handle_close_calls); ~Reference_Counted_Event_Handler () override; @@ -349,7 +347,6 @@ upcall_test<TIMER_QUEUE>::upcall_test (const char *timer_queue_type) class Simple_Event_Handler : public ACE_Event_Handler { public: - Simple_Event_Handler (); ~Simple_Event_Handler () override; diff --git a/ACE/tests/Token_Strategy_Test.cpp b/ACE/tests/Token_Strategy_Test.cpp index cc1401aa540..5c1e990164d 100644 --- a/ACE/tests/Token_Strategy_Test.cpp +++ b/ACE/tests/Token_Strategy_Test.cpp @@ -24,13 +24,11 @@ #include "ace/Barrier.h" - #if defined (ACE_HAS_THREADS) class Token_Strategy_Test : public ACE_Task<ACE_MT_SYNCH> { public: - Token_Strategy_Test (ACE_Token::QUEUEING_STRATEGY strategy = ACE_Token::FIFO, int threads = 5, int invocations = 10); ~Token_Strategy_Test () override; diff --git a/ACE/tests/UPIPE_SAP_Test.cpp b/ACE/tests/UPIPE_SAP_Test.cpp index c0b5a243b73..b8c420529eb 100644 --- a/ACE/tests/UPIPE_SAP_Test.cpp +++ b/ACE/tests/UPIPE_SAP_Test.cpp @@ -20,7 +20,6 @@ #include "ace/OS_NS_unistd.h" - #if defined (ACE_HAS_THREADS) && \ (defined (ACE_HAS_STREAM_PIPES) || defined (ACE_HAS_WIN32_NAMED_PIPES)) diff --git a/ACE/tests/Upgradable_RW_Test.cpp b/ACE/tests/Upgradable_RW_Test.cpp index e0f02830709..d6ef8d0b607 100644 --- a/ACE/tests/Upgradable_RW_Test.cpp +++ b/ACE/tests/Upgradable_RW_Test.cpp @@ -19,7 +19,6 @@ #include "ace/Atomic_Op.h" - #if defined (ACE_HAS_THREADS) // Default number of iterations. @@ -92,7 +91,6 @@ find_last () } return 0; - } // Explain usage and exit. diff --git a/ACE/tests/randomize.h b/ACE/tests/randomize.h index 5389814548f..25d47a543b6 100644 --- a/ACE/tests/randomize.h +++ b/ACE/tests/randomize.h @@ -73,7 +73,6 @@ namespace } private: - // The array. T * const array_; @@ -82,7 +81,6 @@ namespace // Random number generator seed value. unsigned int seed_; - }; /** diff --git a/ACE/websvcs/tests/Test_URL_Addr.cpp b/ACE/websvcs/tests/Test_URL_Addr.cpp index cafb934b761..eac973ec5d4 100644 --- a/ACE/websvcs/tests/Test_URL_Addr.cpp +++ b/ACE/websvcs/tests/Test_URL_Addr.cpp @@ -2,7 +2,6 @@ #include "ace/Log_Msg.h" - void test_http_addr (void); void test_ftp_addr (void); void test_mailto_addr (void); @@ -119,7 +118,6 @@ void test_ftp_addr (void) "FTP[%d]\n" " \"%s\" ERROR\n", i, addresses[i])); - } } } @@ -160,7 +158,6 @@ void test_mailto_addr (void) "Mailto[%d]\n" " \"%s\" ERROR\n", i, addresses[i])); - } } } @@ -205,7 +202,6 @@ void test_url_addr (void) "URL[%d]\n" " \"%s\" ERROR\n", i, addresses[i])); - } } } diff --git a/TAO/DevGuideExamples/AMH_AMI/inner_cb.cpp b/TAO/DevGuideExamples/AMH_AMI/inner_cb.cpp index 6ce5e712976..e4d990f9161 100644 --- a/TAO/DevGuideExamples/AMH_AMI/inner_cb.cpp +++ b/TAO/DevGuideExamples/AMH_AMI/inner_cb.cpp @@ -13,7 +13,6 @@ Inner_callback_i::Inner_callback_i (PortableServer::POA_ptr p, Inner_callback_i::~Inner_callback_i (void) { std::cout << "Inner_callback_i destroying" << std::endl; - } void 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/Messenger/Messenger_i.cpp b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp index 77880838f4f..37d68bd61df 100644 --- a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp +++ b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp @@ -22,6 +22,5 @@ CORBA::Boolean Messenger_i::send_message ( CORBA::string_free(message); message = CORBA::string_dup("Thanks for the message."); return true; - } diff --git a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h index cb0454e8fdc..b3cfc6c83e8 100644 --- a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h +++ b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h @@ -24,7 +24,6 @@ virtual CORBA::Boolean send_message ( const char * subject, char *& message ); - }; #endif /* MESSENGERI_H_ */ 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/AMIcallback/Messenger_i.h b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h index 86c1412ebff..4f64f81be01 100644 --- a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h +++ b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h @@ -42,9 +42,7 @@ private: // Force an exception to be thrown to test client-side // exception handling CORBA::Boolean throw_exception_; - }; - #endif /* MESSENGER_IMPL_H_ */ 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/Messaging/RelativeRoundtripTimeout/Messenger_i.h b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h index d49d63761c2..440732375dd 100644 --- a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h +++ b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h @@ -31,7 +31,6 @@ virtual CORBA::Boolean send_message ( const char * subject, char *& message ); - }; diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerClient.cpp b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerClient.cpp index 769f2b7c0b9..d86f8e03fc6 100644 --- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerClient.cpp +++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerClient.cpp @@ -28,7 +28,6 @@ int parse_args (int argc, ACE_TCHAR* argv[]) "-x - call shutdown on server\n", argv[0]), -1); - } } return 0; diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp index bb4ae1a774c..7ee82018714 100644 --- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp +++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp @@ -134,7 +134,6 @@ int MessengerServer::parse_args (int argc, ACE_TCHAR* argv[]) "-r <n> - run ORB for <n> seconds\n", argv[0]), -1); - } } return 0; diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.h b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.h index 5b42492bc30..4674176a963 100644 --- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.h +++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.h @@ -65,10 +65,8 @@ public: }; private: - CORBA::ORB_var orb_; ConsoleMonitor * monitor_; - }; #endif /* MESSENGERSERVER_H_ */ diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h index eca9e343812..dd2ae33a614 100644 --- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h +++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h @@ -36,7 +36,6 @@ public: private: CORBA::ORB_var orb_; - }; #endif /* MESSENGER_I_H_ */ diff --git a/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.h b/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.h index d49d63761c2..440732375dd 100644 --- a/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.h +++ b/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.h @@ -31,7 +31,6 @@ virtual CORBA::Boolean send_message ( const char * subject, char *& message ); - }; diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h index d49d63761c2..440732375dd 100644 --- a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h +++ b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h @@ -31,7 +31,6 @@ virtual CORBA::Boolean send_message ( const char * subject, char *& message ); - }; diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h b/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h index d49d63761c2..440732375dd 100644 --- a/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h +++ b/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h @@ -31,7 +31,6 @@ virtual CORBA::Boolean send_message ( const char * subject, char *& message ); - }; 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.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp index e0c2bef7b55..44fb5acca7c 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp @@ -59,7 +59,6 @@ ClientInterceptor::send_request ( // Add this context to the service context list. ri->add_request_service_context (sc, false); - } void 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.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp index b8d9b9b3a06..711e6188f93 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp @@ -84,7 +84,6 @@ ClientInterceptor::send_request ( // Add this context to the service context list. ri->add_request_service_context (sc, false); - } void 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/IOR/Messenger_i.h b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.h index d481b7803f5..413c1cd8b64 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.h +++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.h @@ -19,7 +19,6 @@ class Messenger_i : public virtual POA_Messenger virtual void send_message (const CORBA::OctetSeq & user_name); - }; diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp index c46cca7caf8..b42c29831c5 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp @@ -87,7 +87,6 @@ ClientInterceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri) x = false; flag <<= CORBA::Any::from_boolean(x); pic->set_slot(slot,flag); - } void 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.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp index 656d2383bce..bfefd32bb06 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp @@ -20,7 +20,6 @@ ClientInterceptor (IOP::CodecFactory_var cf) // Obtain the CDR encapsulation Codec. this->codec = cf->create_codec (encoding); - } ClientInterceptor::~ClientInterceptor (void) @@ -67,7 +66,6 @@ ClientInterceptor::send_request ( // Add this context to the service context list. ri->add_request_service_context (sc, false); - } void diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.h index 5bd7dd2a6d4..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) ; @@ -33,7 +32,6 @@ class ClientInterceptor: private: const char *myname_; IOP::Codec_var codec; - }; #endif diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.h b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.h index 24befa12b87..0b7ddbfbb9e 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.h +++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.h @@ -19,7 +19,6 @@ class Messenger_i : public virtual POA_Messenger virtual void send_message (const CORBA::OctetSeq & user_name); - }; #endif /* MESSENGERI_H_ */ diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp index e59cd9bb0d5..76e16098445 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp @@ -21,7 +21,6 @@ ServerInterceptor::ServerInterceptor (IOP::CodecFactory_var cf) // Obtain the CDR encapsulation Codec. this->codec = cf->create_codec (encoding); - } ServerInterceptor::~ServerInterceptor () 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..3a51587727f 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) @@ -100,7 +98,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { std::cout << "Client: Ending balance: " << b/100.0 << std::endl; orb->destroy(); - } catch(const CORBA::Exception& e) { std::cerr << e << std::endl; return 1; diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerClient.cpp b/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerClient.cpp index 1c310744b18..06071e1be93 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,11 +49,9 @@ 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; - } else { std::cout << "Message refused." << std::endl; } @@ -64,7 +61,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { } orb->destroy(); - } catch(const CORBA::Exception& e) { std::cerr << e << std::endl; return 1; 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_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index d61acfd99b3..988d7442bfe 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -2338,7 +2338,6 @@ TAO_CodeGen::gen_stub_hdr_includes () this->client_header_); - if (idl_global->abstract_iface_seen_ || idl_global->abstractbase_seen_) { // Include the AbstractBase file from the Valuetype library. 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_union.cpp b/TAO/TAO_IDL/be/be_union.cpp index f13367ddab0..01ecb59fbdd 100644 --- a/TAO/TAO_IDL/be/be_union.cpp +++ b/TAO/TAO_IDL/be/be_union.cpp @@ -187,7 +187,6 @@ be_union::destroy () this->be_scope::destroy (); this->be_type::destroy (); this->AST_Union::destroy (); - } // Visitor method. diff --git a/TAO/TAO_IDL/be/be_valuetype.cpp b/TAO/TAO_IDL/be/be_valuetype.cpp index 6454a20f47a..869ed85a162 100644 --- a/TAO/TAO_IDL/be/be_valuetype.cpp +++ b/TAO/TAO_IDL/be/be_valuetype.cpp @@ -218,7 +218,6 @@ be_valuetype::determine_factory_style () ACE_TEXT ("determine_factory_style") ACE_TEXT ("bad node in this scope\n")), factory_style); - } AST_Decl::NodeType node_type = d->node_type (); @@ -279,7 +278,6 @@ be_valuetype::have_operation () ACE_TEXT ("has_operation") ACE_TEXT ("bad node in this scope\n")), 0); - } AST_Decl::NodeType nt = d->node_type(); diff --git a/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp index 87b095402ab..27bbd0f0e13 100644 --- a/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp +++ b/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp @@ -488,7 +488,6 @@ be_visitor_amh_pre_proc::add_normal_reply (be_operation *node, ACE_TEXT ("add_normal_reply - ") ACE_TEXT ("bad node in this scope\n")), -1); - } //be_decl *arg = dynamic_cast<be_decl*> (d); @@ -738,7 +737,6 @@ be_visitor_amh_pre_proc::generate_name (ACE_CString &destination, } - be_operation * be_visitor_amh_pre_proc::generate_get_operation (be_attribute *node) { diff --git a/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp index cc0145cd2e8..5b37f293a44 100644 --- a/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp +++ b/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp @@ -519,7 +519,6 @@ be_visitor_ami_pre_proc::create_sendc_operation (be_operation *node) ), 0 ); - } AST_Argument *original_arg = dynamic_cast<AST_Argument*> (d); @@ -653,7 +652,6 @@ be_visitor_ami_pre_proc::create_reply_handler_operation ( ACE_TEXT ("create_reply_handler_operation - ") ACE_TEXT ("bad node in this scope\n")), -1); - } AST_Argument *original_arg = dynamic_cast<AST_Argument*> (d); @@ -847,7 +845,6 @@ be_visitor_ami_pre_proc::visit_scope (be_scope *node) "(%N:%l) be_visitor_scope::visit_scope - " "bad node in this scope\n"), -1); - } if (!d->ami_visit()) diff --git a/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp index f8505ad354a..de4f218b6f7 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp @@ -432,7 +432,6 @@ be_visitor_args_vardecl_ss::emit_common ( } - int be_visitor_args_vardecl_ss::emit_common2 (be_type *node) { 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..014fd2f28ce 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 = @@ -1799,7 +1798,6 @@ be_visitor_ccm_pre_proc::compute_inheritance (be_home *node) UTL_NameList (full_name, nullptr), nullptr); - } else { 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_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_component/context_ex_idl.cpp index 1e0c8462031..f69d3265add 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/context_ex_idl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/context_ex_idl.cpp @@ -110,7 +110,6 @@ be_visitor_context_ex_idl::visit_uses (be_uses *node) { os_ << IdentifierHelper::orig_sn (impl->name ()).c_str () << " get_connection_" << lname << " ();"; - } 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 61b409b8594..bc19dd0ce0d 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/connector_dds_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp index 03394c4b548..02595291cc2 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp @@ -160,7 +160,6 @@ be_visitor_connector_dds_exh::visit_connector (be_connector *node) << "};"; this->gen_exec_entrypoint_decl (); - } os_ << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp index d114738c868..61c9585d658 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp @@ -135,7 +135,6 @@ be_visitor_connector_dds_exs::visit_connector (be_connector *node) << "}"; this->gen_exec_entrypoint_defn (); - } os_ << be_uidt_nl 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 b8a19f5ce7b..c3084e8c4c9 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 (), @@ -321,7 +320,6 @@ be_visitor_facet_ami_exh::gen_facet_executor_class () sync_iface->get_insert_queue ().enqueue_tail (sync_iface); - Facet_AMI_ExecH_Op_Attr_Generator op_attr_gen (this); int status = sync_iface->traverse_inheritance_graph( @@ -337,7 +335,6 @@ be_visitor_facet_ami_exh::gen_facet_executor_class () ACE_TEXT ("::gen_facet_executor_class - ") ACE_TEXT ("traverse_inheritance_graph() on ") ACE_TEXT ("interface failed\n"))); - } } else 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 456c207211f..04b9540766a 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 (), @@ -230,7 +228,6 @@ be_visitor_facet_ami_exs::init () else this->sync_ = false; - } int be_visitor_facet_ami_exs::gen_reply_handler_class () @@ -327,7 +324,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"; @@ -386,7 +382,6 @@ be_visitor_facet_ami_exs::gen_facet_executor_class () ACE_TEXT ("::gen_facet_executor_class - ") ACE_TEXT ("traverse_inheritance_graph() on ") ACE_TEXT ("interface failed\n"))); - } ACE_CString scope_str (scope_name, nullptr, false); @@ -451,7 +446,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 +531,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 +640,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/amh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp index 92808317280..4dd5df87a48 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp @@ -296,7 +296,6 @@ be_visitor_amh_interface_sh::add_amh_operation (be_operation *node, ACE_TEXT ("create_response_handler_operation - ") ACE_TEXT ("bad node in this scope\n")), -1); - } AST_Argument *original_arg = diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp index eab1ed7d3c8..6333aae01d4 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp @@ -99,7 +99,6 @@ be_visitor_amh_interface_ss::this_method (be_interface *node) *os << be_uidt << be_uidt_nl << "}"; - } void 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/interface_ih.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp index 5ec81099376..0ea927be15e 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp @@ -91,7 +91,6 @@ be_visitor_interface_ih::visit_interface (be_interface *node) << be_global->impl_class_suffix () << "& " << "operator=(const " << be_global->impl_class_prefix () << namebuf << be_global->impl_class_suffix () << "&);" << be_nl_2; - } *os << "// Destructor" << be_nl 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_module/module_sh.cpp b/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp index 9fdb5f2cd0c..2546eba51b7 100644 --- a/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp @@ -68,5 +68,4 @@ be_visitor_module_sh::visit_module (be_module *node) << node->name (); return 0; - } diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp index 6c7bd3eb425..ded343c6836 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp @@ -180,7 +180,6 @@ be_visitor_amh_operation_ss::visit_operation (be_operation *node) } return 0; - } int diff --git a/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp index f1918f568b1..e24d7d6d397 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp @@ -129,7 +129,6 @@ be_visitor_operation_direct_proxy_impl_ss::visit_operation ( } - int be_visitor_operation_direct_proxy_impl_ss::gen_invoke ( be_visitor_context & /*ctx*/, diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp index 9135f9dfe30..bb59f46d946 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp @@ -52,8 +52,6 @@ be_visitor_operation_ch::visit_operation (be_operation *node) *os << "/// Setter for " << node->local_name() << " attribute" << be_nl << "/// @param[in] " << node->local_name() << " - New value for " << node->local_name() << " attribute" << be_nl; - - } else { 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_operation/upcall_command_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp index 80569862e4b..1bfee6eed03 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp @@ -332,7 +332,6 @@ be_visitor_operation_upcall_command_ss::gen_upcall ( } os << be_uidt_nl; - } --index; diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp index 17ab3682ae8..3638b222ea6 100644 --- a/TAO/TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp @@ -25,7 +25,6 @@ TAO::be_visitor_alias_typecode::visit_typedef (be_typedef * node) return this->common (node, base, "tk_alias"); - } diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp index 869aadd95ce..5d8745b9630 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp @@ -510,7 +510,6 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type ( << "if (result)" << be_idt_nl << "{" << be_idt_nl << "_tao_union." << f->local_name () << " (_tao_union_tmp.in ());"; - } else if (pt == AST_PredefinedType::PT_pseudo) { @@ -519,7 +518,6 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type ( << "if (result)" << be_idt_nl << "{" << be_idt_nl << "_tao_union." << f->local_name () << " (_tao_union_tmp.in ());"; - } else if (pt == AST_PredefinedType::PT_value) { @@ -528,7 +526,6 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type ( << "if (result)" << be_idt_nl << "{" << be_idt_nl << "_tao_union." << f->local_name () << " (_tao_union_tmp);"; - } else if (pt == AST_PredefinedType::PT_char) { diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp index 30516f8ea3d..b5c8612f781 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp @@ -497,7 +497,6 @@ be_visitor_valuebox_field_ch::emit_member_set (be_decl *field, *os << "void " << field->local_name () << " (" << const_arg << field_type->name () << arg_modifier << ");" << be_nl; - } diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp index d99a559fcbf..0251e6e9b86 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp @@ -561,7 +561,6 @@ be_visitor_valuebox_field_ci::emit_member_set (be_decl *field, << "this->_pd_value->" << field->local_name () << " = val;" << be_uidt_nl << "}" << be_nl_2; - } void diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp index 18c7a86cf41..956ac7d7ef9 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp @@ -516,7 +516,6 @@ be_visitor_valuebox_union_member_ci::emit_member_set ( << "this->_pd_value->" << field->local_name () << " (val);" << be_uidt_nl << "}" << be_nl_2; - } void diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp index ea9b678bd2b..93d48a76d10 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp @@ -558,7 +558,6 @@ be_visitor_valuebox_ci::visit_union (be_union *node) } - int be_visitor_valuebox_ci::emit_for_predef_enum (be_type *node, const char * type_suffix, @@ -621,7 +620,6 @@ be_visitor_valuebox_ci::emit_for_predef_enum (be_type *node, << "{" << be_idt_nl << "return this->_pd_value;" << be_uidt_nl << "}" << be_nl_2; - } return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp index c006b6c6384..272c249456c 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp @@ -44,7 +44,6 @@ be_visitor_valuetype_marshal_ch::visit_valuetype (be_valuetype *node) "(%N:%l) be_visitor_scope::visit_scope - " "bad node in this scope\n"), -1); - } be_field *field = dynamic_cast<be_field*> (d); diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp index c03b411a649..4bacf9ed310 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp @@ -65,7 +65,6 @@ be_visitor_valuetype::visit_valuetype_scope (be_valuetype *node) "(%N:%l) be_visitor_scope::visit_scope - " "codegen for scope failed\n"), -1); - } } @@ -931,7 +930,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 e74dc18254a..4d25ff32d53 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 8137fdab957..979bfd31bbf 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 @@ -181,7 +180,6 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) << "return formal_type_id == reinterpret_cast<ptrdiff_t> (" << node->name() << "::_downcast);" << be_uidt_nl << "}" << be_nl_2; - } else if (is_an_amh_exception_holder) { 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 a530e07d45d..e52833958bb 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_codegen.h b/TAO/TAO_IDL/be_include/be_codegen.h index 1369ca69e02..bcbb638e7eb 100644 --- a/TAO/TAO_IDL/be_include/be_codegen.h +++ b/TAO/TAO_IDL/be_include/be_codegen.h @@ -35,7 +35,6 @@ class be_decl; class TAO_IDL_BE_Export TAO_CodeGen { public: - // Define all the code generation states. // The first letter C/S of the suffix stands for client/server-side // The second letter H/I/S stands for header/inline/impl file. diff --git a/TAO/TAO_IDL/be_include/be_helper.h b/TAO/TAO_IDL/be_include/be_helper.h index 1986da3fa73..1dd0ca843f1 100644 --- a/TAO/TAO_IDL/be_include/be_helper.h +++ b/TAO/TAO_IDL/be_include/be_helper.h @@ -92,7 +92,6 @@ struct TAO_ACE_CHECK class TAO_OutStream { public: - /// Enumerated type to indicate the stream type enum STREAM_TYPE { diff --git a/TAO/TAO_IDL/be_include/be_sequence.h b/TAO/TAO_IDL/be_include/be_sequence.h index 7bce2c9e839..4ec3e99e4f7 100644 --- a/TAO/TAO_IDL/be_include/be_sequence.h +++ b/TAO/TAO_IDL/be_include/be_sequence.h @@ -102,7 +102,6 @@ public: virtual char *gen_name (); protected: - /// Computes the fully scoped typecode name. virtual void compute_tc_name (); diff --git a/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h b/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h index 761859541eb..20d1f7f4686 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h +++ b/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h @@ -53,7 +53,6 @@ public: virtual int visit_valuebox (be_valuebox *node); private: - bool generated (be_decl *node) const; void generated (be_decl *node, bool val); diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/invoke_cs.h b/TAO/TAO_IDL/be_include/be_visitor_argument/invoke_cs.h index d60d2ce918b..a59b36f581c 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_argument/invoke_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_argument/invoke_cs.h @@ -91,7 +91,6 @@ public: private: int emit_common (); int emit_common2 (be_type *node); - }; #endif /* _BE_VISITOR_ARGUMENT_INVOKE_CS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h index 2000dcf2c52..b3ea3593cb4 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h @@ -89,7 +89,6 @@ public: private: int emit_common (be_type *node); int emit_common2 (be_type *node); - }; #endif /* _BE_VISITOR_ARGUMENT_VARDECL_SS_H_ */ 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_exception/ctor.h b/TAO/TAO_IDL/be_include/be_visitor_exception/ctor.h index e7f10cd0346..ffbc746d40d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/ctor.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/ctor.h @@ -49,7 +49,6 @@ public: private: int emit_common (be_type *node); - }; #endif /* _BE_VISITOR_EXCEPTION_CTOR_H_ */ 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_operation/amh_rh_sh.h b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_sh.h index a3bb7bd730d..56269d211e1 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_sh.h @@ -28,7 +28,6 @@ class be_visitor_amh_rh_operation_sh : public be_visitor_operation ~be_visitor_amh_rh_operation_sh (); int visit_operation (be_operation *node); - }; #endif /* AMH_RH_OPERATION_SH_H */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_ss.h index 09a5a3eeb52..7954fc9b11a 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_ss.h @@ -31,7 +31,6 @@ class be_visitor_operation_exceptlist_ss : public be_visitor_decl { public: - /// constructor be_visitor_operation_exceptlist_ss (be_visitor_context * ctx); @@ -40,7 +39,6 @@ public: /// visit the operation int visit_operation (be_operation * node); - }; #endif /* _BE_VISITOR_OPERATION_EXCEPTIONLIST_SS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/upcall_command_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/upcall_command_ss.h index b35c5df1a10..2afcfb6d424 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/upcall_command_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/upcall_command_ss.h @@ -18,7 +18,6 @@ class be_visitor_operation_upcall_command_ss : public be_visitor_operation { public: - /// constructor be_visitor_operation_upcall_command_ss (be_visitor_context * ctx); @@ -32,10 +31,8 @@ public: char const * upcall_command_name); private: - /// Generate the upcall. int gen_upcall (be_operation * node); - }; #endif /* _BE_VISITOR_OPERATION_UPCALL_COMMAND_SS_H_ */ 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/buffer_type.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/buffer_type.h index e43be03ecb5..3fec61a78c4 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/buffer_type.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/buffer_type.h @@ -58,7 +58,6 @@ public: protected: /// helper that does the common job int visit_node (be_type *); - }; #endif /* _BE_VISITOR_SEQUENCE_BUFFER_TYPE_H_ */ 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_sequence/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h index 1c10aa152cf..7d2e369a5c6 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h @@ -90,7 +90,6 @@ public: protected: /// helper that does the common job int visit_node (be_type *); - }; #endif /* _BE_VISITOR_SEQUENCE_CDR_OP_CS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_base.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_base.h index 47313216b25..9539ebbe056 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_base.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_base.h @@ -59,7 +59,6 @@ public: protected: /// helper that does the common job int visit_node (be_type *); - }; /** 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 e3e4db8d5f4..ed8046910f7 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 * @@ -27,7 +26,6 @@ namespace TAO : public be_visitor_typecode_defn { public: - /// Constructor. be_visitor_alias_typecode (be_visitor_context * ctx); @@ -48,9 +46,7 @@ namespace TAO int common (be_type * node, be_type * base, const char * tctype); - }; - } #endif /* TAO_BE_VISITOR_ALIAS_TYPECODE_H */ 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 42e1a55ca89..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 * @@ -29,7 +28,6 @@ namespace TAO : public be_visitor_typecode_defn { public: - /// Constructor. be_visitor_enum_typecode (be_visitor_context * ctx); @@ -44,12 +42,9 @@ namespace TAO virtual int visit_enum (be_enum * node); private: - /// Generate structure field related TypeCode code. int visit_members (be_enum * node); - }; - } #endif /* TAO_BE_VISITOR_ENUM_TYPECODE_H */ 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 3b104a97762..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 * @@ -27,7 +26,6 @@ namespace TAO : public be_visitor_typecode_defn { public: - /// Constructor. be_visitor_struct_typecode (be_visitor_context * ctx); @@ -52,7 +50,6 @@ namespace TAO virtual int visit_exception (be_exception * node); private: - /// Underlying structure/exception visitor code. /** * @note Structure/exception TypeCode generation really starts in @@ -67,7 +64,6 @@ namespace TAO int visit_members (AST_Structure * node); private: - /// @c true if the struct is recursive. /** * @note Only applies for struct TypeCodes. Exceptions cannot be @@ -78,9 +74,7 @@ namespace TAO /// @c true if this visitor is already visiting an outer scope /// struct or exception bool is_nested_; - }; - } #endif /* TAO_BE_VISITOR_STRUCT_TYPECODE_H */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_decl.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_decl.h index 6f6ae5b285b..ee94b220535 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_decl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_decl.h @@ -23,7 +23,6 @@ */ class be_visitor_typecode_decl : public be_visitor_decl { - public: be_visitor_typecode_decl (be_visitor_context *ctx); ~be_visitor_typecode_decl (); diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h index 242f3b0c74e..4fcfc3fb8b7 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h @@ -99,7 +99,6 @@ protected: void gen_end_NS_for_anon (); protected: - /// Queue to keep nodes ACE_Unbounded_Queue <QNode*> tc_queue_; @@ -139,7 +138,6 @@ private: int pop (ACE_CDR::Long &); protected: - // queue related routines const QNode *queue_insert (ACE_Unbounded_Queue <QNode*> &, @@ -148,7 +146,6 @@ protected: const QNode *queue_lookup (ACE_Unbounded_Queue <QNode*> &, be_type *node); void queue_reset (ACE_Unbounded_Queue <QNode*> &); - }; #endif /* _BE_VISITOR_TYPECODE_TYPECODE_DEFN_H_ */ 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 1af092e18f7..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 * @@ -27,7 +26,6 @@ namespace TAO : public be_visitor_typecode_defn { public: - /// Constructor. be_visitor_union_typecode (be_visitor_context * ctx); @@ -42,7 +40,6 @@ namespace TAO virtual int visit_union (be_union * node); private: - /// Generate union field TypeCode declarations, if necessary. int gen_case_typecodes (be_union * node); @@ -50,16 +47,13 @@ namespace TAO int visit_cases (be_union * node); private: - /// @c true if the union is recursive. bool is_recursive_; /// @c true if this visitor is already visiting an outer scope /// struct or exception bool is_nested_; - }; - } #endif /* TAO_BE_VISITOR_UNION_TYPECODE_H */ 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 e618dd2970d..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 * @@ -27,7 +26,6 @@ namespace TAO : public be_visitor_typecode_defn { public: - /// Constructor. be_visitor_value_typecode (be_visitor_context * ctx); @@ -42,7 +40,6 @@ namespace TAO virtual int visit_valuetype (be_valuetype * node); private: - /// Generate valuetype field TypeCode declarations, if necessary. int gen_member_typecodes (be_valuetype * node); @@ -50,16 +47,13 @@ namespace TAO int visit_members (be_valuetype * node); private: - /// @c true if the valuetype or eventtype is recursive. bool is_recursive_; /// @c true if this visitor is already visiting an outer scope /// struct or exception bool is_nested_; - }; - } #endif /* TAO_BE_VISITOR_VALUE_TYPECODE_H */ 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 b56dc448931..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); @@ -55,7 +54,6 @@ public: /// visit a union virtual int visit_union (be_union *node); - }; #endif /* _BE_VISITOR_TYPEDEF_ANY_OP_CH_H_*/ 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 aa4b7381f82..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); @@ -55,7 +54,6 @@ public: /// visit a union virtual int visit_union (be_union *node); - }; #endif /* _BE_VISITOR_TYPEDEF_ANY_OP_CS_H_*/ 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 1ce2eca9e79..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); @@ -36,7 +35,6 @@ public: /// visit union virtual int visit_union (be_union *node); - }; #endif /* _BE_VISITOR_UNION_CDR_OP_CH_H_ */ 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_union/discriminant_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_cs.h index 037f3e95ada..2b35cacd244 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_cs.h @@ -36,7 +36,6 @@ public: /// visit an enum. Required to generate the typecode for an enum definition /// appearing side the union virtual int visit_enum (be_enum *node); - }; #endif /* _BE_VISITOR_UNION_DISCRIMINANT_CS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/union_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union/union_ch.h index a70a7905448..24920107c00 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/union_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/union_ch.h @@ -33,7 +33,6 @@ public: /// visit union. We provide code for this method in the derived class virtual int visit_union (be_union *node); - }; #endif /* _BE_VISITOR_UNION_UNION_CH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/union_ci.h b/TAO/TAO_IDL/be_include/be_visitor_union/union_ci.h index c94dda604c1..6319c6b8936 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/union_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/union_ci.h @@ -33,7 +33,6 @@ public: /// visit union. We provide code for this method in the derived class virtual int visit_union (be_union *node); - }; #endif /* _BE_VISITOR_UNION_UNION_CI_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/union_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union/union_cs.h index e7de0e48a79..de0d1a59ada 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/union_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/union_cs.h @@ -33,7 +33,6 @@ public: /// visit union. We provide code for this method in the derived class virtual int visit_union (be_union *node); - }; #endif /* _BE_VISITOR_UNION_UNION_CS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_ch.h index af566f93483..4d76addd7ad 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_ch.h @@ -52,7 +52,6 @@ public: /// visit union type virtual int visit_union (be_union *node); - }; #endif /* _BE_VISITOR_UNION_BRANCH_CDR_OP_CH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_assign_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_assign_cs.h index 4159df97ac9..b740b24ed88 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_assign_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_assign_cs.h @@ -50,7 +50,6 @@ public: private: int emit_valuetype_common (be_type *node); - }; #endif /* _BE_VISITOR_UNION_BRANCH_PUBLIC_ASSIGN_CS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ci.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ci.h index 4667b8f4801..ea0334aca6f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ci.h @@ -49,7 +49,6 @@ public: private: int emit_valuetype_common (be_type *node); - }; #endif /* _BE_VISITOR_UNION_BRANCI_PUBLIC_CI_H_ */ 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 37bf0fadb88..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); @@ -35,7 +34,6 @@ public: /// visit valuebox virtual int visit_valuebox (be_valuebox *node); - }; #endif /* _BE_VISITOR_VALUEBOX_CDR_OP_CS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ch.h index 34fefe71189..e47aa9907a7 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ch.h @@ -90,7 +90,6 @@ private: const char *const_prefix, const char *type_suffix, const char *const_method); - }; #endif /* _BE_VISITOR_VALUEBOX_FIELD_CH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ch.h index a51de1e2bf3..72990f109aa 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ch.h @@ -90,7 +90,6 @@ private: void emit_boxed_member_var (be_decl *node, const char * type_suffix); - }; #endif /* _BE_VISITOR_VALUEBOX_CH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_cs.h index 04f7d3c99f7..e2ab5f1ce56 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_cs.h @@ -62,12 +62,10 @@ public: virtual int visit_union (be_union *node); private: - /// Generate virtual destructor. void emit_destructor (); int emit_for_predef_enum (char const * marshal_arg); - }; #endif /* _BE_VISITOR_VALUEBOX_CS_H_ */ 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/field_cdr_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_cs.h index c85bb564e38..7748d1d0e27 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_cs.h @@ -89,7 +89,6 @@ public: private: int valuetype_common (be_type *); - }; /** 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.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h index fe09e70ad43..3c9a80fe600 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h @@ -25,9 +25,7 @@ */ class be_visitor_valuetype : public be_visitor_scope { - public: - /// constructor be_visitor_valuetype (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 9157b6c534c..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); @@ -33,7 +32,6 @@ public: ~be_visitor_valuetype_init (); public: - void begin_public (); void begin_private (); }; 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/driver/drv_args.cpp b/TAO/TAO_IDL/driver/drv_args.cpp index 00031ab9adf..03c82030f93 100644 --- a/TAO/TAO_IDL/driver/drv_args.cpp +++ b/TAO/TAO_IDL/driver/drv_args.cpp @@ -229,7 +229,6 @@ DRV_parse_args (long ac, char **av) )); idl_global->parse_args_exit (1); return; - } } else diff --git a/TAO/TAO_IDL/fe/idl.tab.cpp b/TAO/TAO_IDL/fe/idl.tab.cpp index d22f815b466..66dff08f611 100644 --- a/TAO/TAO_IDL/fe/idl.tab.cpp +++ b/TAO/TAO_IDL/fe/idl.tab.cpp @@ -709,7 +709,6 @@ typedef enum yysymbol_kind_t yysymbol_kind_t; - #ifdef short # undef short #endif @@ -2446,7 +2445,6 @@ int yydebug; - /*-----------------------------------------------. | Release the memory associated to this symbol. | `-----------------------------------------------*/ @@ -2476,7 +2474,6 @@ int yynerrs; - /*----------. | yyparse. | `----------*/ @@ -2514,7 +2511,6 @@ yyparse (void) YYSTYPE yyval; - #define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) /* The number of symbols on the RHS of the reduced rule. @@ -10123,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..c2bfaf9678d 100644 --- a/TAO/TAO_IDL/fe/idl.yy.cpp +++ b/TAO/TAO_IDL/fe/idl.yy.cpp @@ -2766,7 +2766,6 @@ static int yy_get_next_buffer (void) YY_FATAL_ERROR( "input buffer overflow, can't enlarge buffer because scanner uses REJECT" ); - } if ( num_to_read > YY_READ_BUF_SIZE ) @@ -2995,7 +2994,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 +3010,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 +3082,6 @@ static void yy_load_buffer_state (void) */ void yy_delete_buffer (YY_BUFFER_STATE b ) { - if ( ! b ) return; @@ -3213,7 +3209,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 +3228,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 +3290,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 +3364,6 @@ static void yynoreturn yy_fatal_error (const char* msg ) */ int yyget_lineno (void) { - return yylineno; } @@ -3414,7 +3406,6 @@ char *yyget_text (void) */ void yyset_lineno (int _line_number ) { - yylineno = _line_number; } @@ -3480,7 +3471,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 +3499,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 +3523,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/TAO_IDL/include/ast_annotation_decl.h b/TAO/TAO_IDL/include/ast_annotation_decl.h index 28ae96220e4..184d2aab6c8 100644 --- a/TAO/TAO_IDL/include/ast_annotation_decl.h +++ b/TAO/TAO_IDL/include/ast_annotation_decl.h @@ -13,7 +13,6 @@ class TAO_IDL_FE_Export AST_Annotation_Decl : public virtual AST_Structure { public: - AST_Annotation_Decl (UTL_ScopedName *name); virtual ~AST_Annotation_Decl (); diff --git a/TAO/TAO_IDL/include/ast_extern.h b/TAO/TAO_IDL/include/ast_extern.h index 92eb7908cc9..70387c74934 100644 --- a/TAO/TAO_IDL/include/ast_extern.h +++ b/TAO/TAO_IDL/include/ast_extern.h @@ -66,7 +66,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #define _AST_EXTERN_AST_EXTERN_HH - class AST_Type; class AST_Decl; diff --git a/TAO/TAO_IDL/include/fe_component_header.h b/TAO/TAO_IDL/include/fe_component_header.h index 55280e7ade4..c723d14fce4 100644 --- a/TAO/TAO_IDL/include/fe_component_header.h +++ b/TAO/TAO_IDL/include/fe_component_header.h @@ -15,7 +15,6 @@ class AST_Component; class FE_ComponentHeader : public FE_InterfaceHeader { public: - FE_ComponentHeader (UTL_ScopedName *n, UTL_ScopedName *base_component, UTL_NameList *supports, diff --git a/TAO/TAO_IDL/include/fe_obv_header.h b/TAO/TAO_IDL/include/fe_obv_header.h index 0dc51b91176..876830c8e06 100644 --- a/TAO/TAO_IDL/include/fe_obv_header.h +++ b/TAO/TAO_IDL/include/fe_obv_header.h @@ -12,7 +12,6 @@ class AST_ValueType; class TAO_IDL_FE_Export FE_OBVHeader : public FE_InterfaceHeader { public: - FE_OBVHeader (UTL_ScopedName *n, UTL_NameList *inherits, UTL_NameList *supports, diff --git a/TAO/TAO_IDL/include/utl_list.h b/TAO/TAO_IDL/include/utl_list.h index a70b9d0ff5d..4705e85be83 100644 --- a/TAO/TAO_IDL/include/utl_list.h +++ b/TAO/TAO_IDL/include/utl_list.h @@ -120,7 +120,6 @@ private: class TAO_IDL_FE_Export UTL_ListActiveIterator { public: - UTL_ListActiveIterator (UTL_List *s); virtual ~UTL_ListActiveIterator () {} diff --git a/TAO/docs/tutorials/Quoter/AMI/Handler_i.h b/TAO/docs/tutorials/Quoter/AMI/Handler_i.h index 1d12efe41f5..aca571691e6 100644 --- a/TAO/docs/tutorials/Quoter/AMI/Handler_i.h +++ b/TAO/docs/tutorials/Quoter/AMI/Handler_i.h @@ -25,7 +25,6 @@ public: void price_excep (::Messaging::ExceptionHolder *); private: - int *response_count_; }; diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.h b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.h index 7a7734f739a..6b22f03ed8d 100644 --- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.h +++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Handler_i.h @@ -25,7 +25,6 @@ public: void price_excep (::Messaging::ExceptionHolder *); private: - int *response_count_; }; 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/On_Demand_Activation/Stock_Factory_Locator_i.h b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h index 5fd51694afd..f420f2e7392 100644 --- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h +++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h @@ -26,7 +26,6 @@ class Quoter_Stock_Factory_Locator_i : public PortableServer::ServantLocator private: CORBA::ORB_var orb_; - }; #endif /* STOCK_FACTORY_LOCATOR_I_H */ diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.cpp b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.cpp index 746362c2a14..eec81a98842 100644 --- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.cpp +++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.cpp @@ -39,4 +39,3 @@ Quoter_Stock_i::get_price_and_names (CORBA::String_out symbol, } - diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp index 8c1b17ee70e..36f94f34dc1 100644 --- a/TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp +++ b/TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp @@ -70,7 +70,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) std::cerr << "Warning: Invalid priority detected, defaulting to very low.\n"; priority_level = Priority_Mapping::VERY_LOW; break; - } break; diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp index d5e0b70a470..afb3d13f713 100644 --- a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp +++ b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp @@ -268,7 +268,6 @@ StockQuoter_i::get_stock_info (const char * stock_name) stock_info->last = si.last_; return stock_info._retn (); - } catch (Stock_Database<StockDistributor_i>::Invalid_Stock &ex) { diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h index b114b2124d3..7bfce34d745 100644 --- a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h +++ b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h @@ -48,7 +48,6 @@ namespace Stock /// Register mapping. static void register_mapping (CORBA::ORB_ptr orb); }; - } #endif // !defined STOCK_PRIORITYMAPPING_ 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/icp.cpp b/TAO/examples/Advanced/ch_12/icp.cpp index 369d5addf5c..25fa92c8557 100644 --- a/TAO/examples/Advanced/ch_12/icp.cpp +++ b/TAO/examples/Advanced/ch_12/icp.cpp @@ -127,7 +127,6 @@ vary_temp (long temp) if (ACE_OS::rand() % 2) delta = -delta; return temp + delta; - } // Function object. Locates a thermostat that is in the same room as 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/icp.cpp b/TAO/examples/Advanced/ch_18/icp.cpp index 1717861115a..7f22eb1e084 100644 --- a/TAO/examples/Advanced/ch_18/icp.cpp +++ b/TAO/examples/Advanced/ch_18/icp.cpp @@ -12,7 +12,6 @@ - #include <string> #include <map> #include <algorithm> @@ -133,7 +132,6 @@ vary_temp(long temp) if (ACE_OS::rand() % 2) delta = -delta; return temp + delta; - } //---------------------------------------------------------------- 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_18/server.h b/TAO/examples/Advanced/ch_18/server.h index 97b6ed266ba..d3c9e58be7e 100644 --- a/TAO/examples/Advanced/ch_18/server.h +++ b/TAO/examples/Advanced/ch_18/server.h @@ -12,7 +12,6 @@ - #ifndef server_HH_ #define server_HH_ diff --git a/TAO/examples/Advanced/ch_21/icp.cpp b/TAO/examples/Advanced/ch_21/icp.cpp index 2cb291765f9..8a66d24aba3 100644 --- a/TAO/examples/Advanced/ch_21/icp.cpp +++ b/TAO/examples/Advanced/ch_21/icp.cpp @@ -12,7 +12,6 @@ - #include <string> #include <map> #include <algorithm> @@ -132,7 +131,6 @@ vary_temp(long temp) if (ACE_OS::rand() % 2) delta = -delta; return temp + delta; - } //---------------------------------------------------------------- @@ -388,6 +386,3 @@ static ICP_Persist mydb("/tmp/CCS_DB"); - - - diff --git a/TAO/examples/Advanced/ch_21/icp.h b/TAO/examples/Advanced/ch_21/icp.h index 367dba07e09..6174b4b9b17 100644 --- a/TAO/examples/Advanced/ch_21/icp.h +++ b/TAO/examples/Advanced/ch_21/icp.h @@ -37,5 +37,3 @@ extern "C" { - - 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_21/server.h b/TAO/examples/Advanced/ch_21/server.h index f0c94184bc1..ed8bba2774e 100644 --- a/TAO/examples/Advanced/ch_21/server.h +++ b/TAO/examples/Advanced/ch_21/server.h @@ -12,7 +12,6 @@ - #ifndef server_HH_ #define server_HH_ diff --git a/TAO/examples/Advanced/ch_3/server.cpp b/TAO/examples/Advanced/ch_3/server.cpp index b59b38df1c2..a47c32f9579 100644 --- a/TAO/examples/Advanced/ch_3/server.cpp +++ b/TAO/examples/Advanced/ch_3/server.cpp @@ -81,5 +81,3 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) - - diff --git a/TAO/examples/Advanced/ch_8_and_10/icp.cpp b/TAO/examples/Advanced/ch_8_and_10/icp.cpp index 4788e48ac07..c0223f2b86c 100644 --- a/TAO/examples/Advanced/ch_8_and_10/icp.cpp +++ b/TAO/examples/Advanced/ch_8_and_10/icp.cpp @@ -12,7 +12,6 @@ - #include <string> #include <map> #include <algorithm> 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/Advanced/ch_8_and_10/server.h b/TAO/examples/Advanced/ch_8_and_10/server.h index 45d0c88a980..925de61a5b2 100644 --- a/TAO/examples/Advanced/ch_8_and_10/server.h +++ b/TAO/examples/Advanced/ch_8_and_10/server.h @@ -12,7 +12,6 @@ - #ifndef server_HH_ #define server_HH_ 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 ab440861826..394ca3f9b12 100644 --- a/TAO/examples/Buffered_Oneways/client.cpp +++ b/TAO/examples/Buffered_Oneways/client.cpp @@ -18,7 +18,6 @@ #include "ace/Read_Buffer.h" - // Name of file contains ior. static const ACE_TCHAR *IOR = ACE_TEXT ("file://ior"); @@ -113,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/Buffered_Oneways/server.cpp b/TAO/examples/Buffered_Oneways/server.cpp index 0956a0c58c1..5b0cd76c6b0 100644 --- a/TAO/examples/Buffered_Oneways/server.cpp +++ b/TAO/examples/Buffered_Oneways/server.cpp @@ -3,7 +3,6 @@ #include "ace/OS_NS_stdio.h" - const ACE_TCHAR *ior_output_file = ACE_TEXT("ior"); int diff --git a/TAO/examples/Buffered_Oneways/test_i.cpp b/TAO/examples/Buffered_Oneways/test_i.cpp index a35f50caa4d..332bfb5d808 100644 --- a/TAO/examples/Buffered_Oneways/test_i.cpp +++ b/TAO/examples/Buffered_Oneways/test_i.cpp @@ -1,7 +1,6 @@ #include "test_i.h" - test_i::test_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp index e932771d85d..519863e3f55 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp @@ -72,7 +72,6 @@ ClientApp::run (int argc, ACE_TCHAR* argv[]) { ACE_DEBUG((LM_DEBUG, "(%P|%t) ===> Caught FooException - as expected.\n")); - } } diff --git a/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.h index 137791f75c5..3c0b73b2607 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.h +++ b/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.h @@ -8,7 +8,6 @@ class ClientApp { public: - ClientApp(); ~ClientApp(); @@ -16,7 +15,6 @@ class ClientApp private: - int parse_args(int argc, ACE_TCHAR* argv[]); void usage_statement(); diff --git a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h index 9751030b8ae..b1f1585613b 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h +++ b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h @@ -9,7 +9,6 @@ class Foo_i : public virtual POA_Foo { public: - Foo_i(unsigned num_clients); virtual ~Foo_i(); @@ -27,7 +26,6 @@ class Foo_i : public virtual POA_Foo private: - CORBA::Long value_; unsigned num_clients_; diff --git a/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.h index f9d1517383f..788ddcc9c57 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.h +++ b/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.h @@ -9,7 +9,6 @@ class ServerApp { public: - ServerApp(); ~ServerApp(); @@ -17,7 +16,6 @@ class ServerApp private: - int parse_args(int argc, ACE_TCHAR* argv[]); void usage_statement(); diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp index 035329c2b13..ef25dc055cb 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp @@ -86,7 +86,6 @@ ClientApp::run(int argc, ACE_TCHAR* argv[]) } - int ClientApp::parse_args(int argc, ACE_TCHAR* argv[]) { diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.h index eb50cb27a4f..2df9e8939d1 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.h +++ b/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.h @@ -9,7 +9,6 @@ class ClientApp { public: - ClientApp(); ~ClientApp(); @@ -17,7 +16,6 @@ class ClientApp private: - int parse_args(int argc, ACE_TCHAR* argv[]); void usage_statement(); diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h index 4e191c54b2a..d0159af88c7 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h +++ b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h @@ -11,7 +11,6 @@ class FooServantList; class Foo_i : public virtual POA_Foo { public: - Foo_i(const ACE_TCHAR* servant_name, FooServantList* mgr); virtual ~Foo_i(); @@ -29,7 +28,6 @@ class Foo_i : public virtual POA_Foo private: - CORBA::Long value_; unsigned count_op1_; diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.h index 0f5b1e1a040..9f0be76663d 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.h +++ b/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.h @@ -8,7 +8,6 @@ class ServerApp { public: - ServerApp(); ~ServerApp(); @@ -16,7 +15,6 @@ class ServerApp private: - int parse_args(int argc, ACE_TCHAR* argv[]); void usage_statement(); diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp index 24f3ef64fa2..59f8533b79a 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp @@ -72,7 +72,6 @@ ClientApp::run (int argc, ACE_TCHAR* argv[]) { ACE_DEBUG((LM_DEBUG, "(%P|%t) ===> Caught FooException - as expected.\n")); - } } diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.h index eb50cb27a4f..2df9e8939d1 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.h +++ b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.h @@ -9,7 +9,6 @@ class ClientApp { public: - ClientApp(); ~ClientApp(); @@ -17,7 +16,6 @@ class ClientApp private: - int parse_args(int argc, ACE_TCHAR* argv[]); void usage_statement(); diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp index 5018a78c872..f7d79613a9d 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp @@ -34,7 +34,6 @@ Foo_i::op3(void) } - void Foo_i::op4(CORBA::Long value) { diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h index ea7db122e12..25c7b138359 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h +++ b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h @@ -7,7 +7,6 @@ class Foo_i : public virtual POA_Foo { public: - Foo_i(unsigned num_clients); virtual ~Foo_i(); @@ -24,7 +23,6 @@ class Foo_i : public virtual POA_Foo virtual void done(void); private: - CORBA::Long value_; unsigned num_clients_; }; diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.h index 76e7619aca6..0c89c7606e7 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.h +++ b/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.h @@ -9,7 +9,6 @@ class ServerApp { public: - ServerApp(); ~ServerApp(); @@ -17,7 +16,6 @@ class ServerApp private: - int parse_args(int argc, ACE_TCHAR* argv[]); void usage_statement(); diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp index ce50c43b3e6..099bdc5a585 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp @@ -16,6 +16,5 @@ Callback_i::test_method ( ) { ACE_DEBUG((LM_DEBUG, "(%P|%t)Callback_i::test_method called\n")); - } diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h index 5a013fe4f88..dca0793904f 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h +++ b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h @@ -7,14 +7,12 @@ class Callback_i : public virtual POA_Callback { public: - Callback_i(); virtual ~Callback_i(); virtual void test_method ( ); - }; diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp index e3a52473c9d..fd06475dcff 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp @@ -72,7 +72,6 @@ ClientTask::svc() { ACE_DEBUG((LM_DEBUG, "(%P|%t) ===> Caught FooException - as expected.\n")); - } // Two-Way calls with inout parameters. diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h index 651e3c1d151..05c782300ef 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h +++ b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h @@ -12,7 +12,6 @@ class FooServantList; class Foo_i : public virtual POA_Foo { public: - Foo_i(const char* servant_name); virtual ~Foo_i(); @@ -82,7 +81,6 @@ class Foo_i : public virtual POA_Foo private: - CORBA::Long value_; unsigned count_op1_; diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.h index fba7ea86b08..7cdd32318fc 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.h +++ b/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.h @@ -8,7 +8,6 @@ class ServerApp { public: - ServerApp(); ~ServerApp(); @@ -16,7 +15,6 @@ class ServerApp private: - int parse_args(int argc, ACE_TCHAR* argv[]); void usage_statement(); diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp index ce50c43b3e6..099bdc5a585 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp @@ -16,6 +16,5 @@ Callback_i::test_method ( ) { ACE_DEBUG((LM_DEBUG, "(%P|%t)Callback_i::test_method called\n")); - } diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h index ce967dfe29b..dca0793904f 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h +++ b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h @@ -7,7 +7,6 @@ class Callback_i : public virtual POA_Callback { public: - Callback_i(); virtual ~Callback_i(); diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.h index 689c7371573..8eab095a92e 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.h +++ b/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.h @@ -10,7 +10,6 @@ class ClientTask; class ClientApp { public: - ClientApp(); ~ClientApp(); @@ -18,7 +17,6 @@ class ClientApp private: - int parse_args(int argc, ACE_TCHAR* argv[]); void usage_statement(); diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp index c64376c9403..b2fb6013b67 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp @@ -87,7 +87,6 @@ ClientTask::svc() { ACE_DEBUG((LM_DEBUG, "(%P|%t) ===> Caught FooException - as expected.\n")); - } // Two-Way calls with inout parameters. diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h index 4a06102f735..e819f7e3a1a 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h +++ b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h @@ -12,7 +12,6 @@ class Foo_i; class FooServantList { public: - FooServantList(const ACE_TCHAR* prefix, unsigned num_servants, unsigned num_clients, diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.h index 6f390f129cc..fe582ee5f86 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.h +++ b/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.h @@ -8,7 +8,6 @@ class ServerApp { public: - ServerApp(); ~ServerApp(); @@ -16,7 +15,6 @@ class ServerApp private: - int parse_args(int argc, ACE_TCHAR* argv[]); void usage_statement(); diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp index ccfcbb7837d..4ddf2b2a130 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp @@ -73,7 +73,6 @@ ClientApp::run (int argc, ACE_TCHAR* argv[]) { ACE_DEBUG((LM_DEBUG, "(%P|%t) ===> Caught FooException - as expected.\n")); - } } diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.h index eb50cb27a4f..2df9e8939d1 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.h +++ b/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.h @@ -9,7 +9,6 @@ class ClientApp { public: - ClientApp(); ~ClientApp(); @@ -17,7 +16,6 @@ class ClientApp private: - int parse_args(int argc, ACE_TCHAR* argv[]); void usage_statement(); diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h index 858fc65a6da..fa8776f57d8 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h +++ b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h @@ -7,7 +7,6 @@ class Foo_i { public: - Foo_i(unsigned num_clients); virtual ~Foo_i(); @@ -25,7 +24,6 @@ class Foo_i private: - CORBA::Long value_; unsigned num_clients_; diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.h index f9d1517383f..788ddcc9c57 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.h +++ b/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.h @@ -9,7 +9,6 @@ class ServerApp { public: - ServerApp(); ~ServerApp(); @@ -17,7 +16,6 @@ class ServerApp private: - int parse_args(int argc, ACE_TCHAR* argv[]); void usage_statement(); diff --git a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp index b35acf60602..96809c6d364 100644 --- a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp +++ b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp @@ -168,8 +168,6 @@ Consumer_Handler::via_naming_service () // the <_narrow> method. this->server_ = Notifier::_narrow (notifier_obj.in ()); - - } catch (const CORBA::Exception& ex) { @@ -185,7 +183,6 @@ Consumer_Handler::via_naming_service () int Consumer_Handler::init (int argc, ACE_TCHAR **argv) { - this->argc_ = argc; this->argv_ = argv; @@ -247,7 +244,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 +302,6 @@ Consumer_Handler::run () if (this->interactive_ == 0) { - // Register with the server. this->server_->register_callback (this->stock_name_.c_str (), this->threshold_value_, @@ -322,7 +317,6 @@ Consumer_Handler::run () // Run the ORB. this->orb_->run (); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp index 3819b279e74..d88b3ad1849 100644 --- a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp +++ b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp @@ -60,7 +60,6 @@ Notifier_Input_Handler::init_naming_service () naming_server_->rebind (notifier_obj_name, notifier_obj.in()); - } catch (const CosNaming::NamingContext::AlreadyBound&) { diff --git a/TAO/examples/Callback_Quoter/Notifier_i.cpp b/TAO/examples/Callback_Quoter/Notifier_i.cpp index 7c32b117b31..675bfedf1e1 100644 --- a/TAO/examples/Callback_Quoter/Notifier_i.cpp +++ b/TAO/examples/Callback_Quoter/Notifier_i.cpp @@ -188,7 +188,6 @@ Notifier_i::shutdown () // Instruct the ORB to shutdown. this->orb_->shutdown (); - } bool 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/AMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp index ef4f4883e4a..c3d2dd11196 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp @@ -6,7 +6,6 @@ #include "Content_Iterator_i.h" - Content_Iterator_i::Content_Iterator_i (const char *pathname, CORBA::ULongLong file_size) : file_ (ACE_TEXT_CHAR_TO_TCHAR(pathname)), diff --git a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h index cae2d5192ea..ac038fbfb01 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h +++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h @@ -38,7 +38,6 @@ class Content_Iterator_i : friend class Iterator_Factory_i; public: - /// Constructor Content_Iterator_i (const char *filename, CORBA::ULongLong file_size); @@ -54,12 +53,10 @@ public: virtual void destroy (void); private: - /// Initialize the Content_Iterator. int init (void); private: - /// The Addr representing the requested file. ACE_FILE_Addr file_; diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h index 3e5850ceba1..5d405cb6a89 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h +++ b/TAO/examples/Content_Server/AMI_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 * to read the <contents> associated with <pathname> one ``chunk'' diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp index 33476782525..26d18d23418 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp @@ -49,7 +49,6 @@ Iterator_Handler::next_chunk (CORBA::Boolean pending_data, this->contents_->sendc_next_chunk (this->ami_handler_.in (), this->offset_); - } else { diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h index ee4c911dd0e..9e54c08e93c 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h +++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h @@ -41,7 +41,6 @@ class Iterator_Handler friend class Iterator_Handler_Friend; public: - /// Constructor that creates a content iterator corresponding to the /// name of the file being retrieved from the web server. Iterator_Handler (void); @@ -89,7 +88,6 @@ private: int spawn_viewer (void); private: - /// The Addr corresponding to the retrieved file. ACE_FILE_Addr file_; diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h index 82de8dd4bcf..d89f3f3a9ee 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h +++ b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h @@ -96,7 +96,6 @@ private: void deactivate (void); private: - /// The Addr corresponding to the retrieved file. ACE_FILE_Addr file_; diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_i.h b/TAO/examples/Content_Server/AMI_Observer/Callback_i.h index b1022a1757d..a4545d7f237 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Callback_i.h +++ b/TAO/examples/Content_Server/AMI_Observer/Callback_i.h @@ -63,7 +63,6 @@ public: void metadata (const Web_Server::Metadata_Type &metadata); private: - /// Destructor must be private to ensure that this object is /// allocated on the heap. ~Callback_i (void); @@ -83,12 +82,10 @@ private: int spawn_viewer (void); private: - /// Deactivate this Callback servant. void deactivate (void); private: - /// The Addr corresponding to the retrieved file. ACE_FILE_Addr file_; diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h index ec5f4048be8..035c890c3b2 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h +++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h @@ -65,7 +65,6 @@ public: Web_Server::Iterator_Factory_ptr factory); private: - /// Destructor (private to ensure that Iterator_Handler is allocated /// on the heap). ~Push_Iterator_Handler (void); 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/Content_Iterator_i.h b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h index cae2d5192ea..ac038fbfb01 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h +++ b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h @@ -38,7 +38,6 @@ class Content_Iterator_i : friend class Iterator_Factory_i; public: - /// Constructor Content_Iterator_i (const char *filename, CORBA::ULongLong file_size); @@ -54,12 +53,10 @@ public: virtual void destroy (void); private: - /// Initialize the Content_Iterator. int init (void); private: - /// The Addr representing the requested file. ACE_FILE_Addr file_; 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 612f5b7d018..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,9 +38,7 @@ 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 * to read the <contents> associated with <pathname> one ``chunk'' @@ -58,7 +56,6 @@ public: /// Set the type of file content in the metadata structure. int content_type (const char *filename, Web_Server::Metadata_Type_out metadata); - }; diff --git a/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp b/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp index cef8fb40b2c..f185296101e 100644 --- a/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp +++ b/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp @@ -84,7 +84,6 @@ Supplier_Input_Handler::handle_input (ACE_HANDLE) } - if (ACE_OS::strncmp (buf, "quit", 4) == 0) // Tell the main event loop to shutdown. this->notifier_->shutdown (); 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 688e14eff77..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; @@ -340,7 +337,6 @@ EDF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri, DSUI_EVENT_LOG (EDF_SCHED_FAM, ENTER_SERVER_SCHED_TIME, 0, 0, 0); - #ifdef KOKYU_DSRT_LOGGING ACE_DEBUG ((LM_DEBUG, "(%t|%T):entered EDF_Scheduler::receive_request\n")); #endif @@ -665,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/EDF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h index f29d4b42b52..e60038a6f32 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h +++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h @@ -48,7 +48,6 @@ public EDF_Scheduling::SchedulingParameterPolicy, public ::CORBA::LocalObject { public: - EDF_Scheduling::SchedulingParameter value (void); void value (const EDF_Scheduling::SchedulingParameter & value); @@ -62,7 +61,6 @@ public EDF_Scheduling::Scheduler, public ::CORBA::LocalObject { public: - EDF_Scheduler (CORBA::ORB_ptr orb, Kokyu::DSRT_Dispatcher_Impl_t, int ace_sched_policy, 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/FP_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h index 173ad5460a1..b511e81505b 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h +++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h @@ -65,7 +65,6 @@ public FP_Scheduling::FP_Scheduler, public ::CORBA::LocalObject { public: - Fixed_Priority_Scheduler (CORBA::ORB_ptr orb, Kokyu::DSRT_Dispatcher_Impl_t, int ace_sched_policy, 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/MIF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h index bbd078cc7ec..b2ba9ae5b95 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h +++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h @@ -62,7 +62,6 @@ public MIF_Scheduling::Scheduler, public ::CORBA::LocalObject { public: - MIF_Scheduler (CORBA::ORB_ptr orb, Kokyu::DSRT_Dispatcher_Impl_t, int ace_sched_policy, 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/Kokyu_dsrt_schedulers/MUF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h index 1ef90070061..9e279f3a909 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h +++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h @@ -78,7 +78,6 @@ public MUF_Scheduling::Scheduler, public ::CORBA::LocalObject { public: - MUF_Scheduler (CORBA::ORB_ptr orb, Kokyu::DSRT_Dispatcher_Impl_t, int ace_sched_policy, diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp index 4ac44575a48..136e71cbc06 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp @@ -191,7 +191,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) current = RTScheduling::Current::_narrow (object.in ()); - } Worker worker1 (orb.in (), diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp index c71fa10bf11..bbbe337f20f 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp @@ -191,7 +191,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) current = RTScheduling::Current::_narrow (object.in ()); - } Worker worker1 (orb.in (), server.in (), current.in (), scheduler, 10, 15); diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp index 625164d0927..dac14afb350 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp @@ -196,7 +196,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) current = RTScheduling::Current::_narrow (object.in ()); - } TimeBase::TimeT deadline; diff --git a/TAO/examples/Load_Balancing/Identity_Client.h b/TAO/examples/Load_Balancing/Identity_Client.h index d5b36de150d..dda809513f5 100644 --- a/TAO/examples/Load_Balancing/Identity_Client.h +++ b/TAO/examples/Load_Balancing/Identity_Client.h @@ -40,7 +40,6 @@ class Identity_Client { public: - /// Default constructor. Identity_Client (void); diff --git a/TAO/examples/Load_Balancing/Identity_Server.h b/TAO/examples/Load_Balancing/Identity_Server.h index 563c49a45b6..e9fac45c6af 100644 --- a/TAO/examples/Load_Balancing/Identity_Server.h +++ b/TAO/examples/Load_Balancing/Identity_Server.h @@ -34,7 +34,6 @@ class Identity_Server { public: - /// Default constructor. Identity_Server (void); diff --git a/TAO/examples/Load_Balancing/Identity_i.h b/TAO/examples/Load_Balancing/Identity_i.h index 2eba466c8f5..145808d82b0 100644 --- a/TAO/examples/Load_Balancing/Identity_i.h +++ b/TAO/examples/Load_Balancing/Identity_i.h @@ -20,7 +20,6 @@ class Identity_i : // = TITLE // This class implements Identity.idl interface. public: - /// Constructor - initializes the name of this object. Identity_i (const char *name); @@ -31,7 +30,6 @@ public: virtual void get_name (CORBA::String_out name); private: - /// Stores the name of this object. CORBA::String_var name_; }; diff --git a/TAO/examples/Load_Balancing/Load_Balancer_i.h b/TAO/examples/Load_Balancing/Load_Balancer_i.h index fd1f91d685c..43308af99c8 100644 --- a/TAO/examples/Load_Balancing/Load_Balancer_i.h +++ b/TAO/examples/Load_Balancing/Load_Balancer_i.h @@ -201,7 +201,6 @@ public: void destroy (void); protected: - /// Typedefs for ease of use. typedef ACE_DLList<ACE_CString> LIST; typedef ACE_DLList_Iterator<ACE_CString> ITERATOR; @@ -273,7 +272,6 @@ public: class RR_Object_Group: public Object_Group_i { public: - /// Constructor. RR_Object_Group (const char *id, Object_Group_Factory_i *my_factory); @@ -301,7 +299,6 @@ public: void destroy (void); private: - /// Index into the Object_Group_i::member_id_list_: keeps track of /// the member_id to return on the next invocation of <resolve>. size_t next_; diff --git a/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp index 0cb1fc165ba..68363132cfc 100644 --- a/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp +++ b/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp @@ -105,7 +105,6 @@ Load_Balancing_Service::init (int argc, } - int Load_Balancing_Service::run (void) { diff --git a/TAO/examples/Load_Balancing/Load_Balancing_Service.h b/TAO/examples/Load_Balancing/Load_Balancing_Service.h index db53e83d4bc..7e6b2098d7d 100644 --- a/TAO/examples/Load_Balancing/Load_Balancing_Service.h +++ b/TAO/examples/Load_Balancing/Load_Balancing_Service.h @@ -30,7 +30,6 @@ class Load_Balancing_Service { public: - /// Default constructor. Load_Balancing_Service (void); diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp index 282a235b963..ae098dcb145 100644 --- a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp +++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp @@ -155,7 +155,6 @@ Identity_Client::run (void) // Record statistics. throughput.sample (now - throughput_base, now - latency_base); - } ACE_OS::printf ("*=*=*=*=Aggregated result *=*=*=*=*=\n"); @@ -208,7 +207,6 @@ Identity_Client::run (void) ACE_DEBUG ((LM_DEBUG, "Invocation %s\n", identity.in ())); - } return 0; diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.h b/TAO/examples/Load_Balancing_persistent/Identity_Client.h index 88992c2dae6..3f5ffac3dbc 100644 --- a/TAO/examples/Load_Balancing_persistent/Identity_Client.h +++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.h @@ -40,7 +40,6 @@ class Identity_Client { public: - /// Default constructor. Identity_Client (void); diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp index e6a4069813d..5d5b72afde6 100644 --- a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp +++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp @@ -101,9 +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 (); @@ -217,7 +214,6 @@ Identity_Server::create_objects (size_t number_of_objects, // Bind the servant in the random <Object_Group>. group->bind (member); - } } diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.h b/TAO/examples/Load_Balancing_persistent/Identity_Server.h index 7711e40f516..58a488e4ef3 100644 --- a/TAO/examples/Load_Balancing_persistent/Identity_Server.h +++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.h @@ -34,7 +34,6 @@ class Identity_Server { public: - /// Default constructor. Identity_Server (void); @@ -55,8 +54,6 @@ public: int run (void); private: - - /** * Creates the specified number of identity objects, and registers * each one with the provided <Object_Group>. Identity servants are diff --git a/TAO/examples/Load_Balancing_persistent/Identity_i.h b/TAO/examples/Load_Balancing_persistent/Identity_i.h index cf6a0008667..522a0ed0296 100644 --- a/TAO/examples/Load_Balancing_persistent/Identity_i.h +++ b/TAO/examples/Load_Balancing_persistent/Identity_i.h @@ -20,7 +20,6 @@ class Identity_i : // = TITLE // This class implements Identity.idl interface. public: - /// Constructor - initializes the name of this object. Identity_i (const char *name, PortableServer::POA_ptr poa); @@ -36,7 +35,6 @@ public: PortableServer::POA_ptr _default_POA (void); private: - /// Stores the name of this object. CORBA::String_var name_; diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp index 24294b84f8a..4c50b22b832 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, @@ -121,7 +120,6 @@ Object_Group_Factory_i::unbind_round_robin (const char * id) // Bump down the flags value --this->flags_; - } Load_Balancer::Object_Group_ptr @@ -229,7 +227,6 @@ Object_Group_Factory_i::make_group (int random, } - // As we are sure that it is not in the list go ahead and insert it if (random) ACE_NEW_THROW_EX (group_servant, @@ -285,7 +282,6 @@ Object_Group_Factory_i::make_group (int random, } - // Update the value of flags_ this->update_flags (random); @@ -295,7 +291,6 @@ Object_Group_Factory_i::make_group (int random, // dynamically allocated memory. this->mem_pool_->free ((void *) ptr); throw Load_Balancer::duplicate_group (); - } // Return. @@ -308,9 +303,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. @@ -357,7 +349,6 @@ Object_Group_Factory_i::resolve (const char * id) ACE_TEXT ("(%N|%l) The factory does not have any references ") ACE_TEXT ("to the group that you have sought \n\n")), 0); - } } @@ -389,7 +380,6 @@ Object_Group_Factory_i::resolve (const char * id) object_group = Load_Balancer::Object_Group::_narrow (objref.in ()); - #if defined (DOORS_MEASURE_STATS) // Grab timestamp again. ACE_hrtime_t now = ACE_OS::gethrtime (); @@ -506,7 +496,6 @@ Object_Group_Factory_i::update_flags (int random) if (!random) *(this->flags_) = 3; break; - } } @@ -563,7 +552,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); @@ -606,7 +594,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 (); @@ -634,7 +621,6 @@ Object_Group_i::bind (const Load_Balancer::Member & member) { ACE_ERROR ((LM_ERROR, "Unable to bind\n")); - } } } @@ -756,7 +742,6 @@ Object_Group_i::unbind (const char * id) } - Object_Group_i::ITERATOR iter (*(this->member_id_list_)); while (ACE_OS::strcmp (id,*(iter.next ()))) @@ -780,7 +765,6 @@ Object_Group_i::resolve_with_id (const char * id) char *retn_ptr = CORBA::string_dup (ior.in ()); return retn_ptr; - } Load_Balancer::Member_ID_List * @@ -885,7 +869,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 (); @@ -953,7 +936,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/Load_Balancing_persistent/Load_Balancer_i.h b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h index cd60a1a87f7..9ed1a3fc2f7 100644 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h @@ -109,7 +109,6 @@ public: Load_Balancer::Group_List * random_groups (void); private: - /// Our ORB CORBA::ORB_var orb_; @@ -163,7 +162,6 @@ private: CORBA::Short *flags_; ACE_Throughput_Stats throughput_; - }; class Object_Group_i @@ -240,7 +238,6 @@ public: void destroy (void); protected: - /// This will replenish all the pointers that could have been lost /// because of failure void read_from_memory (void); @@ -289,7 +286,6 @@ public: /// Returns a member object from this <Object_Group> in accordance with /// the "random" load balancing policy. char * resolve (void); - }; /** @@ -301,7 +297,6 @@ public: class RR_Object_Group: public Object_Group_i { public: - /// Constructor. RR_Object_Group (const char *id, PortableServer::POA_ptr poa); @@ -318,7 +313,6 @@ public: char * resolve (void); private: - /// Index into the Object_Group_i::member_id_list_: keeps track of /// the member_id to return on the next invocation of <resolve>. size_t next_; diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp index f22a46aea6a..78028eecc73 100644 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp @@ -135,7 +135,6 @@ Load_Balancing_Service::init (int argc, ACE_TCHAR* argv[]) } - int Load_Balancing_Service::run (void) { diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h index e4a86a12397..510d8483d50 100644 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h @@ -30,7 +30,6 @@ class Load_Balancing_Service { public: - /// Default constructor. Load_Balancing_Service (void); diff --git a/TAO/examples/Logging/Logging_Test.cpp b/TAO/examples/Logging/Logging_Test.cpp index 83fe0565eb7..d85983cd541 100644 --- a/TAO/examples/Logging/Logging_Test.cpp +++ b/TAO/examples/Logging/Logging_Test.cpp @@ -13,5 +13,4 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return 1; return logger_client.run (); - } diff --git a/TAO/examples/Logging/Logging_Test_i.cpp b/TAO/examples/Logging/Logging_Test_i.cpp index 865adcf7d55..86ce2bd23a2 100644 --- a/TAO/examples/Logging/Logging_Test_i.cpp +++ b/TAO/examples/Logging/Logging_Test_i.cpp @@ -67,7 +67,6 @@ Logger_Client::init (int argc, ACE_TCHAR *argv[]) } return 0; - } int diff --git a/TAO/examples/OBV/Simple_util.cpp b/TAO/examples/OBV/Simple_util.cpp index 8c2475d30d2..45b412010c2 100644 --- a/TAO/examples/OBV/Simple_util.cpp +++ b/TAO/examples/OBV/Simple_util.cpp @@ -230,7 +230,6 @@ Client<InterfaceObj, Var>::init (const char *name, this->argv_ = argv; - try { // Retrieve the ORB. @@ -259,8 +258,6 @@ Client<InterfaceObj, Var>::init (const char *name, ACE_ERROR_RETURN ((LM_ERROR, "no ior or naming options specified\n"), -1); - - } catch (const CORBA::Exception& ex) { @@ -276,7 +273,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/OBV/Simple_util.h b/TAO/examples/OBV/Simple_util.h index 856ed38c13b..9185c1f0f6f 100644 --- a/TAO/examples/OBV/Simple_util.h +++ b/TAO/examples/OBV/Simple_util.h @@ -147,7 +147,6 @@ protected: /// Flag for shutting down the server int shutdown_; - }; #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/examples/OBV/Typed_Events/Client_i.cpp b/TAO/examples/OBV/Typed_Events/Client_i.cpp index 008cfcda06e..f16ddf658fd 100644 --- a/TAO/examples/OBV/Typed_Events/Client_i.cpp +++ b/TAO/examples/OBV/Typed_Events/Client_i.cpp @@ -77,7 +77,6 @@ Checkpoint_Client_i::run (const char *name, if (checkpoint.shutdown () == 1) checkpoint->shutdown (); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/examples/OBV/Typed_Events/Server_i.cpp b/TAO/examples/OBV/Typed_Events/Server_i.cpp index 2cdd221fc7b..e317239e1d2 100644 --- a/TAO/examples/OBV/Typed_Events/Server_i.cpp +++ b/TAO/examples/OBV/Typed_Events/Server_i.cpp @@ -9,7 +9,6 @@ Criterion_List_var criterions; // Arriving events are tested against the list members. - // Set the ORB pointer, register OBV factories and init the // lists declared above. @@ -120,7 +119,6 @@ Checkpoint_i::put_event (Event *event) } - // If we want to return the event (e.g. return type is Event *) // return (DUP_REF (event)); // should be right. diff --git a/TAO/examples/OBV/Typed_Events/client.cpp b/TAO/examples/OBV/Typed_Events/client.cpp index 584df60e71e..1989bef9b76 100644 --- a/TAO/examples/OBV/Typed_Events/client.cpp +++ b/TAO/examples/OBV/Typed_Events/client.cpp @@ -17,5 +17,4 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return -1; else return 0; - } diff --git a/TAO/examples/Persistent_Grid/Grid_Client_i.cpp b/TAO/examples/Persistent_Grid/Grid_Client_i.cpp index ddc3bae71cf..9c674fe0ea6 100644 --- a/TAO/examples/Persistent_Grid/Grid_Client_i.cpp +++ b/TAO/examples/Persistent_Grid/Grid_Client_i.cpp @@ -86,7 +86,6 @@ Grid_Client_i::run (const char *name, grid->set (index_, ctr, (value_ + ctr)); - } } diff --git a/TAO/examples/Persistent_Grid/Simple_util.cpp b/TAO/examples/Persistent_Grid/Simple_util.cpp index d692a78648d..3984299e49b 100644 --- a/TAO/examples/Persistent_Grid/Simple_util.cpp +++ b/TAO/examples/Persistent_Grid/Simple_util.cpp @@ -144,7 +144,6 @@ Server<Servant>::run (void) } - ///////////////////////////////////////////////////////////////// // Client code Starts here //////////////////////////////////////////////////////////////// @@ -261,8 +260,6 @@ Client<InterfaceObj, Var>::init (const char * /*name*/, ACE_ERROR_RETURN ((LM_ERROR, "no ior or naming options specified\n"), -1); - - } catch (const CORBA::Exception& ex) { diff --git a/TAO/examples/Persistent_Grid/Simple_util.h b/TAO/examples/Persistent_Grid/Simple_util.h index 2a3c7473825..24367cc0d0d 100644 --- a/TAO/examples/Persistent_Grid/Simple_util.h +++ b/TAO/examples/Persistent_Grid/Simple_util.h @@ -76,7 +76,6 @@ public: /// The command line arguments. ACE_TCHAR **argv_; - }; diff --git a/TAO/examples/Persistent_Grid/client.cpp b/TAO/examples/Persistent_Grid/client.cpp index a8d3ab80ead..870292aa893 100644 --- a/TAO/examples/Persistent_Grid/client.cpp +++ b/TAO/examples/Persistent_Grid/client.cpp @@ -14,7 +14,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return -1; else return 0; - } diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp index 18a7e506b5d..47d93a2863d 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp @@ -1,7 +1,6 @@ #include "UDP_i.h" - // Constructor UDP_i::UDP_i (void) : messages_count_ (0) diff --git a/TAO/examples/PluggableUDP/tests/Performance/client.cpp b/TAO/examples/PluggableUDP/tests/Performance/client.cpp index b16acb89b2d..6bd848410e2 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/client.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/client.cpp @@ -10,7 +10,6 @@ //============================================================================= - #include "ace/Get_Opt.h" #include "ace/Task.h" @@ -24,7 +23,6 @@ #include "tao/Strategies/advanced_resource.h" - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); ACE_UINT32 burst_messages = 1000; @@ -135,7 +133,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // the one calling orb->shutdown () triggering the end of the ORB // event loop. delete client; - } catch (const CORBA::Exception& ex) { diff --git a/TAO/examples/PluggableUDP/tests/Performance/server.cpp b/TAO/examples/PluggableUDP/tests/Performance/server.cpp index 379e624c0af..d0c1655024a 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/server.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/server.cpp @@ -21,7 +21,6 @@ - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int orb_threads = 1; // Number of threads running inside the ORB. diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp index d4caa0614df..cf4cc23bf95 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp @@ -198,7 +198,6 @@ Client::svc (void) for (int c = 0; c < 10; ++c) server_->shutdown (); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp index 06757f4f51a..3ce36a8aaba 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp @@ -10,7 +10,6 @@ //============================================================================= - #include "ace/Get_Opt.h" #include "test_i.h" 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.cpp b/TAO/examples/Quoter/Generic_Factory_i.cpp index 5ba2333b03c..66a60ebb862 100644 --- a/TAO/examples/Quoter/Generic_Factory_i.cpp +++ b/TAO/examples/Quoter/Generic_Factory_i.cpp @@ -36,7 +36,6 @@ Quoter_Generic_Factory_i::supports (const CosLifeCycle::Key &) } - CosNaming::NamingContext_ptr Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_key) { @@ -78,7 +77,6 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k } - CORBA::Object_ptr Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key, const CosLifeCycle::Criteria &) @@ -136,7 +134,6 @@ Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key, if (this->debug_level_ > 1) ACE_DEBUG ((LM_DEBUG, "Generic_Factory: Return an object reference to a new object.\n")); - } catch (const CORBA::Exception&) { 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/Quoter/client.cpp b/TAO/examples/Quoter/client.cpp index d1a5c03878b..a65a944c5e1 100644 --- a/TAO/examples/Quoter/client.cpp +++ b/TAO/examples/Quoter/client.cpp @@ -124,7 +124,6 @@ Quoter_Client::run (void) if (this->debug_level_ >= 1) ACE_DEBUG ((LM_DEBUG, "Quoter Client: Copied object: ACE Hardware = %i\n", q)); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/examples/Quoter/client.h b/TAO/examples/Quoter/client.h index 9a58d890955..35721ddd9f1 100644 --- a/TAO/examples/Quoter/client.h +++ b/TAO/examples/Quoter/client.h @@ -109,7 +109,6 @@ private: Quoter_Client quoter_client; int argc_; ACE_TCHAR **argv_; - }; #endif /* QUOTER_CLIENT_H */ diff --git a/TAO/examples/Quoter/server.h b/TAO/examples/Quoter/server.h index a6d650cd0f9..cefb4aca3a4 100644 --- a/TAO/examples/Quoter/server.h +++ b/TAO/examples/Quoter/server.h @@ -41,7 +41,6 @@ class Quoter_Server { public: - /// Default constructor Quoter_Server (void); diff --git a/TAO/examples/RTCORBA/Activity/Activity.cpp b/TAO/examples/RTCORBA/Activity/Activity.cpp index 70f2dbdd2f5..ba7dab08712 100644 --- a/TAO/examples/RTCORBA/Activity/Activity.cpp +++ b/TAO/examples/RTCORBA/Activity/Activity.cpp @@ -174,7 +174,6 @@ Activity::activate_job_list (void) job_name.c_str ())); active_job_count_++; - } /* while */ } diff --git a/TAO/examples/RTCORBA/Activity/Builder.h b/TAO/examples/RTCORBA/Activity/Builder.h index 8b0db2a892f..bd184c32be1 100644 --- a/TAO/examples/RTCORBA/Activity/Builder.h +++ b/TAO/examples/RTCORBA/Activity/Builder.h @@ -48,7 +48,6 @@ class Builder : public ACE_Service_Object int job_list (JOB_LIST &job_list); protected: - /// Number of POA's declared int poa_count_; diff --git a/TAO/examples/RTCORBA/Activity/POA_Holder.cpp b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp index b880c30d6f7..b999f5f3283 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 @@ -159,7 +158,6 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_ // Create a thread-pool policy. lanes_policy = rt_orb->create_threadpool_policy (threadpool_id); - } if (bands_.length () != 0) 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/RTCORBA/Activity/Thread_Task.h b/TAO/examples/RTCORBA/Activity/Thread_Task.h index 1538a8acd0e..a0d97d97da7 100644 --- a/TAO/examples/RTCORBA/Activity/Thread_Task.h +++ b/TAO/examples/RTCORBA/Activity/Thread_Task.h @@ -34,7 +34,6 @@ class Thread_Task : public Periodic_Task virtual int activate_task (ACE_Barrier* barrier, RTCORBA::PriorityMapping *priority_mapping); protected: - /// task svc virtual int svc (); }; diff --git a/TAO/examples/RTScheduling/DT_Creator.cpp b/TAO/examples/RTScheduling/DT_Creator.cpp index d1ee3959cec..fb1818c3f98 100644 --- a/TAO/examples/RTScheduling/DT_Creator.cpp +++ b/TAO/examples/RTScheduling/DT_Creator.cpp @@ -204,7 +204,6 @@ DT_Creator::register_synch_obj (void) this->naming_->resolve (name); synch_context = CosNaming::NamingContext::_narrow (object.in ()); - } ACE_CString synch_name ("Synch"); @@ -229,7 +228,6 @@ DT_Creator::register_synch_obj (void) // Register the synch object with the Synch context. synch_context->rebind (name, synch.in ()); - } @@ -279,7 +277,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")); @@ -325,8 +322,6 @@ DT_Creator::activate_job_list (void) this->naming_->rebind (name.in (), server.in ()); - - } /* while */ ACE_DEBUG ((LM_DEBUG, @@ -395,7 +390,6 @@ DT_Creator::activate_schedule (void) ACE_DEBUG ((LM_DEBUG, "Activated schedule, task count = %d\n", dt_count_)); - } int @@ -577,7 +571,6 @@ DT_Creator::check_ifexit (void) } ACE_DEBUG ((LM_DEBUG, "Log File Ready\n")); - } } } diff --git a/TAO/examples/RTScheduling/DT_Creator.h b/TAO/examples/RTScheduling/DT_Creator.h index 0e6ca315bff..8132c8549b0 100644 --- a/TAO/examples/RTScheduling/DT_Creator.h +++ b/TAO/examples/RTScheduling/DT_Creator.h @@ -82,8 +82,6 @@ class RTSCHEDTESTLIB_Export DT_Creator : public ACE_Service_Object int activate_root_poa (void); protected: - - DT_LIST dt_list_; POA_LIST poa_list_; JOB_LIST job_list_; diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.cpp index 12fbc8127a2..3a92fd23bc3 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.cpp +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.cpp @@ -5,7 +5,6 @@ FP_DT_Creator::FP_DT_Creator (void) { DT_TEST::instance ()->dt_creator (this); - } Thread_Task* diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.h index a39bfc021d1..2c0f6620005 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.h +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.h @@ -24,7 +24,6 @@ public: virtual void wait (void); virtual int total_load (void); - }; diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp index 28563f1378f..3873dcaa59a 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp @@ -76,7 +76,6 @@ Fixed_Priority_Scheduler::create_segment_scheduling_parameter (RTCORBA::Priority segment_policy->value (segment_priority); return segment_policy; - } @@ -110,7 +109,6 @@ Fixed_Priority_Scheduler::update_scheduling_segment (const RTScheduling::Current name, sched_param, implicit_sched_param); - } void @@ -130,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); @@ -152,7 +149,6 @@ Fixed_Priority_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_p sizeof (size_t)); request_info->add_request_service_context (*srv_con, 0); - } void diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h index 09bb04dc53d..c1c2a22dd00 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h @@ -29,7 +29,6 @@ public FP_Scheduling::FP_Scheduler, public ::CORBA::LocalObject { public: - Fixed_Priority_Scheduler (CORBA::ORB_ptr orb); ~Fixed_Priority_Scheduler (void); diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.h index 65912189c78..5f1d2780c76 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.h +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.h @@ -22,7 +22,6 @@ public: virtual int perform_task (void); virtual void pre_activate (void); - }; #endif /*FP_TASK_H*/ 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/Fixed_Priority_Scheduler/test.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h index 34a0323310d..3d87db7a750 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h @@ -15,7 +15,6 @@ class Task_Stats; class DT_Test :public ACE_Task <ACE_SYNCH> { public: - DT_Test (void); void check_supported_priorities (void); @@ -40,7 +39,6 @@ class DT_Test :public ACE_Task <ACE_SYNCH> virtual int svc (); - private: /// = Policies long thr_sched_policy_; @@ -55,7 +53,6 @@ class DT_Test :public ACE_Task <ACE_SYNCH> RTCORBA::RTORB_var rt_orb_; /// Reference to the root poa. PortableServer::POA_var root_poa_; - }; typedef ACE_Singleton <DT_Test, TAO_SYNCH_MUTEX> DT_TEST; diff --git a/TAO/examples/RTScheduling/Job_i.cpp b/TAO/examples/RTScheduling/Job_i.cpp index b2a518cb81e..ce90a908d1b 100644 --- a/TAO/examples/RTScheduling/Job_i.cpp +++ b/TAO/examples/RTScheduling/Job_i.cpp @@ -16,7 +16,6 @@ Job_i::Job_i (DT_Creator* dt_creator) // create the stat object. ACE_NEW (task_stats_, Task_Stats); task_stats_->init (100); - } Job_i::~Job_i (void) 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 a26d17387d1..10af4fdab2f 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp +++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp @@ -371,7 +371,6 @@ MIF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_ free_que_.enqueue_prio (run_dt); } lock_.release (); - } void @@ -381,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")); @@ -451,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_Scheduler.h b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h index ea546dc40e9..0883dc31a73 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h +++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h @@ -54,7 +54,6 @@ public MIF_Scheduling::MIF_Scheduler, public ::CORBA::LocalObject { public: - MIF_Scheduler (CORBA::ORB_ptr orb); ~MIF_Scheduler (void); diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp index d60b0961c97..b56821f79a3 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp +++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp @@ -23,7 +23,6 @@ MIF_Task::MIF_Task (int importance, // create the stat object. ACE_NEW (task_stats_, Task_Stats); task_stats_->init (iter_); - } MIF_Task::~MIF_Task (void) @@ -49,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", @@ -85,7 +83,6 @@ MIF_Task::perform_task (void) { try { - ACE_TCHAR msg [BUFSIZ]; ACE_OS::sprintf (msg, ACE_TEXT("MIF_Task::perform_task ") @@ -136,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); @@ -146,7 +142,6 @@ MIF_Task::perform_task (void) current_->update_scheduling_segment (name, sched_param.in (), sched_param.in ()); - } } diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp index 612fc46bb0f..7bba63a6bb9 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 |= @@ -150,7 +149,6 @@ DT_Test::svc (void) try { dt_creator_->create_distributable_threads (current_.in ()); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/test.h b/TAO/examples/RTScheduling/MIF_Scheduler/test.h index f308c4df398..41f2bc737e7 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/test.h +++ b/TAO/examples/RTScheduling/MIF_Scheduler/test.h @@ -14,7 +14,6 @@ class Task_Stats; class DT_Test //:public ACE_Task <ACE_SYNCH> { public: - DT_Test (void); int init (int argc, ACE_TCHAR *argv []); diff --git a/TAO/examples/RTScheduling/POA_Holder.cpp b/TAO/examples/RTScheduling/POA_Holder.cpp index 5049898618e..7178f23d0cb 100644 --- a/TAO/examples/RTScheduling/POA_Holder.cpp +++ b/TAO/examples/RTScheduling/POA_Holder.cpp @@ -90,7 +90,6 @@ POA_Holder::init (ACE_Arg_Shifter& arg_shifter) arg_shifter.consume_arg (); ACE_DEBUG ((LM_DEBUG, "Thread Pool Initialized\n")); - } else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Bands")))) { @@ -127,7 +126,6 @@ POA_Holder::init (ACE_Arg_Shifter& arg_shifter) } /* while -- Band values */ ACE_DEBUG ((LM_DEBUG, "Bands Initialized\n")); - } /* if -Bands */ else // something else is showing up ... { @@ -179,7 +177,6 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_ ACE_DEBUG ((LM_DEBUG, "Activated Lanes\n")); - } if (thread_pool_) @@ -203,8 +200,6 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_ ACE_DEBUG ((LM_DEBUG, "Activated thread pool\n")); - - } if (bands_.length () != 0) @@ -214,7 +209,6 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_ rt_orb->create_priority_banded_connection_policy (this->bands_); ACE_DEBUG ((LM_DEBUG, "Activated Bands\n")); - } CORBA::PolicyList poa_policy_list; diff --git a/TAO/examples/RTScheduling/Starter.cpp b/TAO/examples/RTScheduling/Starter.cpp index 57eb4474de0..3a6bc37c1eb 100644 --- a/TAO/examples/RTScheduling/Starter.cpp +++ b/TAO/examples/RTScheduling/Starter.cpp @@ -126,7 +126,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) Starter starter (orb.in ()); starter.init (); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/examples/RTScheduling/Starter.h b/TAO/examples/RTScheduling/Starter.h index 49b50d41afa..c15851b81ae 100644 --- a/TAO/examples/RTScheduling/Starter.h +++ b/TAO/examples/RTScheduling/Starter.h @@ -12,7 +12,6 @@ class Starter { public: - Starter (CORBA::ORB_ptr orb); void init (void); diff --git a/TAO/examples/RTScheduling/Synch_i.h b/TAO/examples/RTScheduling/Synch_i.h index f5c6a981cde..72256b7424a 100644 --- a/TAO/examples/RTScheduling/Synch_i.h +++ b/TAO/examples/RTScheduling/Synch_i.h @@ -6,7 +6,6 @@ class SYNCH_Export Synch_i : public POA_Synch { public: - Synch_i (void); virtual void go (CORBA::Long base_time); diff --git a/TAO/examples/RTScheduling/Thread_Task.h b/TAO/examples/RTScheduling/Thread_Task.h index 0079d0e256e..feeeea0d9c8 100644 --- a/TAO/examples/RTScheduling/Thread_Task.h +++ b/TAO/examples/RTScheduling/Thread_Task.h @@ -13,7 +13,6 @@ class DT_Creator; class RTSCHEDTESTLIB_Export Thread_Task : public ACE_Task <ACE_SYNCH> { public: - Thread_Task (void); virtual int activate_task (RTScheduling::Current_ptr current, diff --git a/TAO/examples/Simple/Simple_util.cpp b/TAO/examples/Simple/Simple_util.cpp index b4dd8c39ef2..9843d76d6c4 100644 --- a/TAO/examples/Simple/Simple_util.cpp +++ b/TAO/examples/Simple/Simple_util.cpp @@ -387,8 +387,6 @@ Client<ServerInterface>::init (const char *name, ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("no ior or naming options specified\n")), -1); - - } catch (const CORBA::Exception& ex) { 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/DOVE_Supplier.cpp b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp index 750be01de8b..d5e299cc3c2 100644 --- a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp +++ b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp @@ -54,7 +54,6 @@ DOVE_Supplier::~DOVE_Supplier () delete [] this->connection_params_list_; delete internal_DOVE_Supplier_ptr_; - } // Initialize the ORB and the connection to the Name Service @@ -206,7 +205,6 @@ DOVE_Supplier::connect (const char* MIB_name, } return 0; - } @@ -303,7 +301,6 @@ DOVE_Supplier::use_prev_connection () } - // -------------------- Internal Demo Supplier ----------------------------- DOVE_Supplier::Internal_DOVE_Supplier::Internal_DOVE_Supplier (DOVE_Supplier *impl_ptr) @@ -400,7 +397,6 @@ DOVE_Supplier::connect_Supplier () static_cast<RtecScheduler::Info_Type_t> (this->current_connection_params_->pod_rt_info_.info_type)); - // Set the publications to report them to the event channel. CORBA::Short x = 0; @@ -442,7 +438,6 @@ DOVE_Supplier::connect_Supplier () } return 0; - } diff --git a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h index 3fa707d27e8..f5411123a3d 100644 --- a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h +++ b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h @@ -30,7 +30,6 @@ class DOVE_Supplier { public: - /// Constructor. DOVE_Supplier (); @@ -62,7 +61,6 @@ public: void use_prev_connection (); private: - // The following Supplier is needed because DOVE_Supplier has not // inherited from PushSupplier. @@ -71,20 +69,17 @@ private: friend class DOVE_Supplier; public: - virtual void disconnect_push_supplier (void) { } private: - Internal_DOVE_Supplier (DOVE_Supplier* impl_ptr); DOVE_Supplier* impl_ptr_; }; private: - struct Connection_Params { const char * es_name_; diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp index fb2b427f324..cbad17be5ad 100644 --- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp @@ -186,7 +186,6 @@ DualEC_Supplier::init () this->naming_context_ = CosNaming::NamingContext::_narrow (namingObj_var.in ()); - } catch (const CORBA::Exception& ex) { @@ -349,10 +348,8 @@ DualEC_Supplier::run_nav_thread (void *arg) if (nav_iter.done ()) nav_iter.first (); - } while (++total_sent < sup->total_messages_); - } catch (const CORBA::Exception&) { @@ -418,10 +415,8 @@ DualEC_Supplier::run_weap_thread (void *arg) if (weap_iter.done ()) weap_iter.first (); - } while (++total_sent < sup->total_messages_); - } catch (const CORBA::Exception&) { @@ -431,7 +426,6 @@ DualEC_Supplier::run_weap_thread (void *arg) } - // Create two scheduling service instances, register // them with the Naming Service. @@ -548,8 +542,6 @@ DualEC_Supplier::create_schedulers (void) this->rt_info_dummy_lo_.quantum, this->rt_info_dummy_lo_.threads, static_cast<RtecScheduler::Info_Type_t> (this->rt_info_dummy_lo_.info_type)); - - } } catch (const CORBA::Exception& ex) @@ -601,7 +593,6 @@ DualEC_Supplier::create_event_channels (void) naming_context_->bind (this->channel_lo_name_, this->ec_lo_.in ()); - } catch (const CORBA::Exception& ex) { @@ -1032,7 +1023,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } - try { // Initialize ORB. diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h index e9df243f731..4f36119ca62 100644 --- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h +++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h @@ -50,7 +50,6 @@ struct Schedule_Viewer_Data class DualEC_Supplier { public: - DualEC_Supplier (int argc, ACE_TCHAR** argv); ~DualEC_Supplier (void); @@ -72,7 +71,6 @@ public: private: - /** * @class Terminator * diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp index 8b3f456d39c..76ca7f5475d 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")); @@ -332,7 +331,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) delete demo_consumer; root_poa->destroy (true, true); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp index 5afcf85c89c..8acdacb1272 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); @@ -330,7 +329,6 @@ Event_Supplier::insert_event_data (CORBA::Any &data, } - if (last_completion > (*sched_data)->completion_time) last_completion = 0; @@ -361,7 +359,6 @@ Event_Supplier::insert_event_data (CORBA::Any &data, } - // Function get_options. unsigned int @@ -456,7 +453,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // when done, we clean up delete event_Supplier_ptr; - } catch (const CORBA::Exception& ex) { diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.h b/TAO/examples/Simulator/Event_Supplier/Event_Sup.h index 9b27ba8c1f6..f2f6b9ecf85 100644 --- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.h +++ b/TAO/examples/Simulator/Event_Supplier/Event_Sup.h @@ -42,7 +42,6 @@ struct Schedule_Viewer_Data class Event_Supplier { public: - Event_Supplier (int argc, ACE_TCHAR** argv); ~Event_Supplier (void); diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp index 2f343983540..59cb0a0f392 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); @@ -364,7 +363,6 @@ Logging_Supplier::insert_event_data (CORBA::Any &data, } - if (last_completion > (*sched_data)->completion_time) last_completion = 0; @@ -504,7 +502,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // when done, we clean up delete event_Supplier_ptr; - } catch (const CORBA::Exception& ex) { diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.h b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.h index 3ebcc0dbf10..f959bdbc9a0 100644 --- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.h +++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.h @@ -43,7 +43,6 @@ struct Schedule_Viewer_Data class Logging_Supplier { public: - Logging_Supplier (int argc, ACE_TCHAR** argv); ~Logging_Supplier (void); diff --git a/TAO/examples/TypeCode_Creation/main.cpp b/TAO/examples/TypeCode_Creation/main.cpp index ba0c21c4a93..bc39e1fb4b7 100644 --- a/TAO/examples/TypeCode_Creation/main.cpp +++ b/TAO/examples/TypeCode_Creation/main.cpp @@ -3,7 +3,6 @@ #include "tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h" - int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try @@ -94,7 +93,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_ERROR_RETURN ((LM_ERROR, "ORB-created typecode not correct!\n"), -1); - } } catch (const CORBA::Exception& ex) 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/examples/mfc/MainFrm.h b/TAO/examples/mfc/MainFrm.h index 2e29e9f9c81..cfdeaa6c135 100644 --- a/TAO/examples/mfc/MainFrm.h +++ b/TAO/examples/mfc/MainFrm.h @@ -17,10 +17,8 @@ protected: // create from serialization only // Attributes public: - // Operations public: - // Overrides // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CMainFrame) diff --git a/TAO/examples/mfc/StdAfx.cpp b/TAO/examples/mfc/StdAfx.cpp index bd1211b1c68..f02b85711c1 100644 --- a/TAO/examples/mfc/StdAfx.cpp +++ b/TAO/examples/mfc/StdAfx.cpp @@ -5,4 +5,3 @@ #include "stdafx.h" - diff --git a/TAO/examples/mfc/serverDoc.h b/TAO/examples/mfc/serverDoc.h index 7abfa6f910a..d8761b778ee 100644 --- a/TAO/examples/mfc/serverDoc.h +++ b/TAO/examples/mfc/serverDoc.h @@ -18,10 +18,8 @@ protected: // create from serialization only // Attributes public: - // Operations public: - // Overrides // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CServerDoc) @@ -39,7 +37,6 @@ public: #endif protected: - // Generated message map functions protected: //{{AFX_MSG(CServerDoc) diff --git a/TAO/examples/mfc/serverView.h b/TAO/examples/mfc/serverView.h index 25c5a1714be..89f879ba3ee 100644 --- a/TAO/examples/mfc/serverView.h +++ b/TAO/examples/mfc/serverView.h @@ -22,7 +22,6 @@ public: // Operations public: - // Overrides // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(CServerView) @@ -44,7 +43,6 @@ public: #endif protected: - // Generated message map functions protected: //{{AFX_MSG(CServerView) 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/AnyTypeCode/tao/Demo_i.h b/TAO/interop-tests/AnyTypeCode/tao/Demo_i.h index c04236e94ea..7618e410182 100644 --- a/TAO/interop-tests/AnyTypeCode/tao/Demo_i.h +++ b/TAO/interop-tests/AnyTypeCode/tao/Demo_i.h @@ -47,7 +47,6 @@ public: virtual char * do_value (const ::CORBA::Any & a); virtual void shutdown (void); - }; 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 45ffa3d97a6..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; @@ -65,7 +64,6 @@ Echo_Client_Request_Interceptor::send_request ( #endif /*if 0*/ - // Populate target member of the ClientRequestInfo. // Make the context to send the context to the target 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 087c0c86fbf..6a2721a9f6e 100644 --- a/TAO/interop-tests/CdrOutArg/tao/test_i.h +++ b/TAO/interop-tests/CdrOutArg/tao/test_i.h @@ -21,9 +21,7 @@ */ class CDR_Out_Arg_i : public POA_Interop::CDR_Out_Arg { - public: - CDR_Out_Arg_i (CORBA::ORB_ptr orb); void get_out (CORBA::Long_out arg); @@ -31,10 +29,8 @@ public: void shutdown (void); private: - /// The ORB pseudo-reference (for shutdown). CORBA::ORB_var orb_; - }; #endif /* TAO_INTERCEPTOR_TEST_I_H */ diff --git a/TAO/interop-tests/wchar/interop_wchar_i.h b/TAO/interop-tests/wchar/interop_wchar_i.h index 50890e75163..3350932888b 100644 --- a/TAO/interop-tests/wchar/interop_wchar_i.h +++ b/TAO/interop-tests/wchar/interop_wchar_i.h @@ -87,7 +87,6 @@ virtual void shutdown (void); private: CORBA::ORB_var orb_; wchar_reference ref_; - }; 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/OMG_TypedEC/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.h index 88d3007c575..d437c61d1fd 100644 --- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.h @@ -38,7 +38,6 @@ private: CORBA::ORB_var orb_; CosEventChannelAdmin::ProxyPushSupplier_var supplier_; int event_limit_; - }; 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/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp index e06fb21e21f..ffcc01d103d 100644 --- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp +++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp @@ -93,7 +93,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) orb->destroy(); return 0; - } catch(const CORBA::Exception& exc) { 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_Context_Ext/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h index 2c39b9ac146..e2cd0fc8925 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h @@ -31,7 +31,6 @@ virtual CORBA::Boolean send_message ( const char * subject, char *& message ); - }; 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/NamingService/Naming_Server/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h index 2c39b9ac146..e2cd0fc8925 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h @@ -31,7 +31,6 @@ virtual CORBA::Boolean send_message ( const char * subject, char *& message ); - }; diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp index 6d05f65ede8..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,14 +27,12 @@ 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()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id(); poa->deactivate_object(objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp index c47f465d145..697d711ff81 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp @@ -9,14 +9,12 @@ 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()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp index 54a3ec2ab39..0bfc413654b 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp @@ -67,7 +67,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) } return 0; - } @@ -76,5 +75,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) - - diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp index 9e0a217a91a..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"); @@ -116,6 +115,5 @@ CORBA::Boolean Messenger_i::send_message (const char * user_name, consumer_proxy_->push_structured_events(events); return 1; - } diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h index 524f58f339c..a74227a4345 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h @@ -31,4 +31,3 @@ private: - diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerClient.cpp index ee8f68f6e63..7a425646582 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerClient.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerClient.cpp @@ -49,7 +49,6 @@ int ACE_TMAIN(int argc, ACE_TCHAR * argv[]) messenger->send_message ("sysadmin@company.com", "OCI's Distribution of TAO", message.inout()); - } catch(const CORBA::Exception& ex) { std::cerr << "Caught a CORBA exception: " << ex << std::endl; diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerConsumer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerConsumer.cpp index ce7ed668126..b96c97316a5 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerConsumer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerConsumer.cpp @@ -147,7 +147,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) orb->run(); orb->destroy (); - } catch(const CORBA::Exception& ex) { std::cerr << ex << std::endl; diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerServer.cpp index 8938018d98d..0c917958e46 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerServer.cpp @@ -82,7 +82,6 @@ ACE_TMAIN(int argc, ACE_TCHAR* argv[]) // Accept requests orb->run(); orb->destroy(); - } catch(const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp index 10a9e283676..b02d68f1b92 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp @@ -92,7 +92,6 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) } consumer_proxy_->connect_structured_push_supplier(supplier.in()); - } catch(const CORBA::Exception& ex) { std::cerr << ex << std::endl; @@ -112,14 +111,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/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.h index 4327f7e112f..28e15e9d4f9 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.h @@ -26,7 +26,6 @@ public: private: CORBA::ORB_var orb_; CosNotifyChannelAdmin::StructuredProxyPushConsumer_var consumer_proxy_; - }; #endif /* MESSENGERI_H_ */ diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp index 28e2fb05627..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,14 +26,12 @@ 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()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp index a8331596d84..932640f7adf 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp @@ -9,14 +9,12 @@ 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()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp index 8728eb776c4..d4f1ee8853a 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp @@ -64,7 +64,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) } return 0; - } @@ -73,5 +72,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) - - 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/Messenger/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.h index 2d9c4182adb..e488e183bcf 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.h @@ -25,4 +25,3 @@ class Messenger_i : public POA_Messenger - diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp index 11cb57adaf5..97d8865479b 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp @@ -15,7 +15,6 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier () PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp index 0208d26fc7f..d32ac5960fc 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp @@ -43,10 +43,8 @@ int ACE_TMAIN(int argc, ACE_TCHAR * argv[]) std::cout << "MessengerClient: success" << std::endl; return 0; - } - diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerServer.cpp index ad834dd609c..b9acf920824 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerServer.cpp @@ -88,5 +88,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) - - 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 a1c11e2cc82..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,14 +25,12 @@ 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()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp index 0c3cf2b94d5..f7e401db29f 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp @@ -9,14 +9,12 @@ 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()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void 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/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.h index 2d9c4182adb..e488e183bcf 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.h @@ -25,4 +25,3 @@ class Messenger_i : public POA_Messenger - diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp index e80efb54cee..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,14 +26,12 @@ 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()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp index b11df7abb34..75ebbf9449a 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp @@ -9,14 +9,12 @@ 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()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp index 8728eb776c4..d4f1ee8853a 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp @@ -64,7 +64,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) } return 0; - } @@ -73,5 +72,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) - - diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp index e80efb54cee..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,14 +26,12 @@ 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()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp index 263b4d03d66..4f5d0f097ea 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp @@ -9,14 +9,12 @@ 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()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerClient.cpp index 56bb0b9cae4..a8762480edd 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerClient.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerClient.cpp @@ -42,7 +42,6 @@ int ACE_TMAIN(int argc, ACE_TCHAR * argv[]) messenger->send_message ("person@company.com", "OCI's Distribution of TAO", message.inout()); - } catch(const CORBA::Exception& ex) { std::cerr << "Caught a CORBA exception: " << ex << std::endl; diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerConsumer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerConsumer.cpp index 04368337c92..0aa9ba196b1 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerConsumer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerConsumer.cpp @@ -130,7 +130,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) orb->run(); orb->destroy (); - } catch(const CORBA::Exception& ex) { std::cerr << ex << std::endl; diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp index 14e332e2672..6573ddbd7a8 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp @@ -75,14 +75,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) // Accept requests orb->run(); orb->destroy(); - } catch(const CORBA::Exception& ex) { std::cerr << ex << std::endl; return 1; } return 0; - } diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp index ea1a56d9e66..5a001740634 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp @@ -103,7 +103,6 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) } consumer_proxy_->connect_structured_push_supplier(supplier.in()); - } catch(const CORBA::Exception& ex) { std::cerr << ex << std::endl; @@ -127,7 +126,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 b3d363c0d52..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,14 +24,12 @@ 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()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp index 8cf0e0abd35..e75774d4483 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp @@ -9,14 +9,12 @@ 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()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp index 6bdd7c6a1de..86ba4505116 100644 --- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp +++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp @@ -84,7 +84,6 @@ ClientInterceptor::send_request ( // reset recursion test flag <<= 0; pic->set_slot(slot,flag); - } void 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/PortableInterceptors/PICurrent_NameService/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerClient.cpp index 7376b2e1281..13c3a0fd154 100644 --- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerClient.cpp +++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerClient.cpp @@ -59,7 +59,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::String_var message = CORBA::string_dup( "Hello!" ); messenger->send_message( "TAO User", "TAO Test", message.inout() ); - } catch(const CORBA::Exception& ex) diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.h index e0249baef77..a75058af397 100644 --- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.h @@ -35,7 +35,6 @@ virtual CORBA::Boolean send_message ( virtual char * get_time ( ); - }; #endif /* MESSENGERI_H_ */ 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..bb3e8a4048c 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) @@ -84,7 +83,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) std::cout << "Messenger Server is shut down!" << std::endl; std::cout << std::endl; - } catch(const CORBA::Exception& ex) { ex._tao_print_exception("Server Error: main block"); 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/Security/PolicyControllingApp/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h index 0a628dac14e..1c47ddf998f 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h @@ -24,7 +24,6 @@ virtual CORBA::Boolean send_message ( const char * subject, char *& message ); - }; diff --git a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h index 0a628dac14e..1c47ddf998f 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h @@ -24,7 +24,6 @@ virtual CORBA::Boolean send_message ( const char * subject, char *& message ); - }; diff --git a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp index ac2684ce17d..5a51f6c45e3 100644 --- a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp @@ -59,7 +59,6 @@ class TestConsumer : public POA_CosEventComm::PushConsumer PortableServer::POA_ptr poa_; CORBA::ORB_ptr orb_; public: - TestConsumer(int evts, CosNotifyChannelAdmin::EventChannelFactory_ptr ecf, PortableServer::POA_ptr poa, @@ -153,11 +152,9 @@ public: void disconnect_self() { } - }; int ACE_TMAIN (int ac, ACE_TCHAR* av[]) { - int num_events = 0; try { @@ -202,7 +199,6 @@ int ACE_TMAIN (int ac, ACE_TCHAR* av[]) { orb->destroy(); return 0; - } catch(const CORBA::Exception& e) { std::cerr << "Consumer: main() exception: " << e << std::endl; } catch(const std::invalid_argument& e) { diff --git a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp index a443e406eb6..303108b72d7 100644 --- a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp +++ b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp @@ -76,7 +76,6 @@ class TestSupplier CORBA::ORB_ptr orb_; public: - TestSupplier(int evts, CosNotifyChannelAdmin::EventChannelFactory_ptr ecf, CORBA::ORB_ptr orb, PortableServer::POA_ptr poa) @@ -186,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) @@ -247,7 +244,6 @@ int ACE_TMAIN (int ac, ACE_TCHAR* av[]) { orb->destroy(); return 0; - } catch(CORBA::Exception& e) { std::cerr << "Supplier: main() exception: " << e << std::endl; } catch(std::invalid_argument& e) { 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 3d1fb378775..688399a5eb1 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); @@ -117,7 +116,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) orb->run(); - } catch (const CORBA::Exception& ex) { @@ -125,7 +123,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } - return 0; } diff --git a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp index 11362ff2019..43bf42d75f5 100644 --- a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp +++ b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp @@ -50,7 +50,6 @@ TAO_FT_Naming_Service::init (int argc, ACE_TCHAR* argv[]) if (result == -1) return result; - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.h b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.h index acd6971f46e..a9828df3d37 100644 --- a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.h +++ b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.h @@ -50,7 +50,6 @@ public: virtual ~TAO_FT_Naming_Service (void); protected: - /// Parse the command line arguments to find /// the timeout period. int parse_args (int &argc, ACE_TCHAR* argv[]); diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h index 992d9d4a0d9..36baa65335c 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. @@ -51,7 +49,6 @@ namespace TAO virtual ~FT_DefaultFaultAnalyzer (); public: - /** * Validate event type to make sure it is one we can handle. * @param event The structured fault event, as from the Fault Notifier. @@ -75,9 +72,7 @@ namespace TAO FT_DefaultFaultAnalyzer (const FT_DefaultFaultAnalyzer & rhs); /// Assignment operator. FT_DefaultFaultAnalyzer & operator = (const FT_DefaultFaultAnalyzer & rhs); - }; - } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h index ac81edbb323..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. @@ -46,7 +45,6 @@ namespace TAO virtual ~FT_FaultAnalyzer (); public: - /** * Validate event type to make sure it is one we can handle. * @param event The structured fault event, as from the Fault Notifier. @@ -74,9 +72,7 @@ namespace TAO /////////////// // Data Members private: - }; - } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL 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 48cf24e5970..882c0144437 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 @@ -90,7 +88,6 @@ namespace TAO size_t notifications () const; public: - /** * @name POA_CosNotifyComm::StructuredPushConsumer Methods * @@ -98,7 +95,6 @@ namespace TAO * interface. */ //@{ - //////////////// // CORBA methods virtual void push_structured_event ( @@ -123,7 +119,6 @@ namespace TAO /////////////// // Data Members private: - /// The POA with which we are activated. PortableServer::POA_var poa_; @@ -145,9 +140,7 @@ namespace TAO ///TODO: Remove this later, it is just for testing. // Keep track of how many notifications we have received. size_t notifications_; - }; - } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h index 1a20aad8742..8d93dc33a79 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h @@ -32,7 +32,6 @@ namespace TAO struct TAO_ReplicationManagerLib_Export FT_FaultEventDescriptor { public: - /// Default constructor. FT_FaultEventDescriptor (); @@ -65,9 +64,7 @@ namespace TAO /// The object group's factories. PortableGroup::FactoryInfos_var factories; - }; - } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h index 3ed49696565..1cbc87839bc 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h @@ -35,7 +35,6 @@ namespace TAO class FT_Property_Validator : public TAO_PG_Default_Property_Validator { public: - /// Constructor. FT_Property_Validator (void); @@ -55,7 +54,6 @@ namespace TAO void validate_criteria (const PortableGroup::Properties & criteria); private: - /** * @name Pre-initialize property Names. * @@ -77,7 +75,6 @@ namespace TAO //@} }; - } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp index 270584224fd..d6ae2013e48 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); @@ -660,7 +657,6 @@ TAO::FT_ReplicationManager::add_member ( member); result = group->reference (); - } else { @@ -894,7 +890,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 462c98a8168..1f4b4fdbff4 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h @@ -77,7 +77,6 @@ namespace TAO class FT_ReplicationManager : public virtual POA_FT::ReplicationManager { - ////////////////////// // non-CORBA interface @@ -95,7 +94,6 @@ namespace TAO virtual ~FT_ReplicationManager (); public: - /** * Parse command line arguments. * @param argc traditional C argc @@ -144,14 +142,12 @@ namespace TAO // CORBA interface(s) public: - /** * @name POA_FT::ReplicationManager Methods * * 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); @@ -174,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); @@ -236,7 +231,6 @@ namespace TAO * interface. */ //@{ - /// Create a member in an object group. virtual PortableGroup::ObjectGroup_ptr create_member ( PortableGroup::ObjectGroup_ptr object_group, @@ -314,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 @@ -364,7 +357,6 @@ namespace TAO /////////////// // Data Members private: - /// The orb CORBA::ORB_var orb_; @@ -405,7 +397,6 @@ namespace TAO /// Quit flag. int quit_; }; - } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL 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 a8e714f4ae3..520cfe46714 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; @@ -49,7 +48,6 @@ namespace TAO class FT_ReplicationManagerFaultAnalyzer : public ::TAO::FT_DefaultFaultAnalyzer { - public: /** * Constructor. @@ -64,7 +62,6 @@ namespace TAO virtual ~FT_ReplicationManagerFaultAnalyzer (); public: - /** * Validate event type to make sure it is one we can handle. * @param event The structured fault event, as from the Fault Notifier. @@ -98,7 +95,6 @@ namespace TAO ///////////////////////// // Implementation methods protected: - /// Helper functions for fault analysis. // Extract the type id from a CORBA any. @@ -185,9 +181,7 @@ namespace TAO // Data Members private: FT_ReplicationManager * replication_manager_; - }; - } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h index 75de43bf26d..6a91d96a957 100644 --- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h +++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h @@ -192,7 +192,6 @@ namespace TAO /////////////// // Data Members private: - /** * Protect internal state. * Mutex should be locked by corba methods, or by 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/Fault_Notifier/FT_Notifier_i.h b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h index ecc69f45a19..fa82d98e021 100644 --- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h +++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h @@ -226,7 +226,6 @@ namespace TAO * boolean: set true when CORBA is done with this object. */ int gone_; - }; } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.h b/TAO/orbsvcs/IFR_Service/IFR_Service.h index 6e3d62ee102..e3d7ebee02a 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Service.h +++ b/TAO/orbsvcs/IFR_Service/IFR_Service.h @@ -28,7 +28,6 @@ class IFR_Service { public: - /// Default constructor. IFR_Service (void); diff --git a/TAO/orbsvcs/IFR_Service/be_produce.cpp b/TAO/orbsvcs/IFR_Service/be_produce.cpp index 2774ca20bfb..515b22f7c04 100644 --- a/TAO/orbsvcs/IFR_Service/be_produce.cpp +++ b/TAO/orbsvcs/IFR_Service/be_produce.cpp @@ -200,7 +200,6 @@ BE_produce (void) catch (const CORBA::Exception& ex) { ex._tao_print_exception (ACE_TEXT ("BE_produce")); - } // Clean up. diff --git a/TAO/orbsvcs/IFR_Service/drv_init_ifr.cpp b/TAO/orbsvcs/IFR_Service/drv_init_ifr.cpp index 3012c700d76..c8332057f1e 100644 --- a/TAO/orbsvcs/IFR_Service/drv_init_ifr.cpp +++ b/TAO/orbsvcs/IFR_Service/drv_init_ifr.cpp @@ -70,7 +70,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "be_extern.h" - const size_t LOCAL_ESCAPES_BUFFER_SIZE = 1024; void diff --git a/TAO/orbsvcs/IFR_Service/drv_private_ifr.cpp b/TAO/orbsvcs/IFR_Service/drv_private_ifr.cpp index 293564a0d33..95b7fb43177 100644 --- a/TAO/orbsvcs/IFR_Service/drv_private_ifr.cpp +++ b/TAO/orbsvcs/IFR_Service/drv_private_ifr.cpp @@ -69,7 +69,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "drv_private_ifr.h" - // Storage for file names #if !defined (NFILES) diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.h b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.h index 45c4ceb6d74..a70cfb44783 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.h +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.h @@ -65,7 +65,6 @@ private: /// Holder for the member list passed to create_struct() or /// create_exception(). CORBA::StructMemberSeq members_; - }; #endif /* TAO_IFR_ADDING_VISITOR_EXCEPTION_H */ diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp index a05fe2197c8..0c8a041bd6b 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp @@ -89,7 +89,6 @@ Activator_NT_Service::svc (void) status = server.fini (); report_status (SERVICE_STOPPED); - } if (status != -1) return 0; diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h index 6149c8f469d..041d5a17718 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h +++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.h @@ -30,7 +30,6 @@ class Activator_Export Activator_Options { public: - enum SERVICE_COMMAND { SC_NONE, SC_INSTALL, @@ -97,7 +96,6 @@ private: int load_registry_options (); private: - /// Our extra command line arguments ACE_CString cmdline_; diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp index 75a1cf2ce32..65e8aa1e9b4 100644 --- a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp @@ -386,7 +386,6 @@ AsyncAccessManager::status_name (ImplementationRepository::AAM_Status s) return "UPDATE_FAILED"; case ImplementationRepository::AAM_ACTIVE_TERMINATE: return "ACTIVE_TERMINATE"; - } return "<undefined status>"; } diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp index d9cf14c4a7d..60621b1f137 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); @@ -1630,8 +1629,6 @@ ImR_Locator_i::connect_server (UpdateableServerInfo& info) this->opts_->ping_external (), sip->server.in(), sip->pid); - - } catch (const CORBA::Exception& ) { diff --git a/TAO/orbsvcs/ImplRepo_Service/Iterator.h b/TAO/orbsvcs/ImplRepo_Service/Iterator.h index 959adb90b45..d606a97858f 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Iterator.h +++ b/TAO/orbsvcs/ImplRepo_Service/Iterator.h @@ -22,7 +22,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ - class ImR_AsyncIterator : public POA_ImplementationRepository::AMH_ServerInformationIterator { 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/Locator_NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp index 0ba84a23c44..26e98badd8e 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp @@ -85,7 +85,6 @@ Locator_NT_Service::svc (void) status = server.fini (); report_status (SERVICE_STOPPED); - } if (status != -1) return 0; diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h index ce0cb52bef6..7e6856b6680 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h @@ -34,7 +34,6 @@ class LiveCheck; class Locator_Export Options { public: - enum SERVICE_COMMAND { SC_NONE, SC_INSTALL, diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp index 2c41bddea40..3c244cfdc9e 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp @@ -592,7 +592,6 @@ Locator_Repository::link_peers (Server_Info_Ptr base, this->persistent_update (base, true); return 0; - } // ------------------------------------------------------------------------------------- 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/ImplRepo_Service/Shared_Backing_Store.cpp b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp index 8f06171529d..5084fa7e53a 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp @@ -895,7 +895,6 @@ Shared_Backing_Store::locator_service_ior (const char* peer_ior) const char* const combined_ior = this->orb_->object_to_string(locator_service.in ()); return combined_ior; - } void diff --git a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.h b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.h index f4c6ecc082e..f29305cfdab 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.h +++ b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.h @@ -288,7 +288,6 @@ private: Update_Handler (Shared_Backing_Store *owner) : owner_ (owner) {} int handle_exception (ACE_HANDLE); } update_handler_; - }; #endif /* SHARED_BACKING_STORE_H */ diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h index acdcc910380..1c291c84d7f 100644 --- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h +++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h @@ -30,7 +30,6 @@ class TAO_IMR_Op; class TAO_IMR_i { public: - // = Constructor and destructor. TAO_IMR_i (void); ~TAO_IMR_i (void); @@ -227,7 +226,6 @@ protected: }; - /** * @class TAO_IMR_Op_List * @@ -345,7 +343,6 @@ public: virtual int run (void); protected: - /// Enables pre-registration checks bool is_add_; diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp index ecc9e69a0f2..c395b67f8a8 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp +++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp @@ -14,7 +14,6 @@ #include "ace/OS_NS_string.h" - Criteria_Evaluator::Criteria_Evaluator (const CosLifeCycle::Criteria &criteria) : criteria_ (criteria) { diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h index be0dd75e3f5..63c3d225195 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h +++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h @@ -50,4 +50,3 @@ private: - diff --git a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp index f9daa66dd22..d0585c80483 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp +++ b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp @@ -136,7 +136,6 @@ Factory_Trader::_cxx_export (const char * name, register_ptr->_cxx_export (CORBA::Object::_duplicate (object_ptr), CORBA::string_dup("GenericFactory"), propertySeq); - } catch (const CORBA::Exception& ex) { 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 b81dbb945b7..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); @@ -62,5 +61,3 @@ private: - - diff --git a/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.h b/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.h index b205c0b392d..73e57c89fa8 100644 --- a/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.h +++ b/TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.h @@ -32,7 +32,6 @@ class TAO_LB_Monitor_Signal_Handler : public TAO_LB_Signal_Handler { public: - /// Constructor. TAO_LB_Monitor_Signal_Handler ( CORBA::ORB_ptr orb, @@ -41,19 +40,16 @@ public: const PortableGroup::Location & location); protected: - /// Template method that initiates the cleanup process. virtual int perform_cleanup (int signum); private: - /// Reference to the LoadManager with which the LoadMonitor is /// registered. CosLoadBalancing::LoadManager_var load_manager_; /// Reference to the location the LoadMonitor resides at. const PortableGroup::Location & location_; - }; diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp index 1887780411e..74ad8a93515 100644 --- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp +++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp @@ -181,7 +181,6 @@ TAO_NT_Naming_Service::arg_manip (char *args, DWORD arglen, bool query) } RegCloseKey (hkey); - } int diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h index cfdfb3e55fe..2cf49e00aba 100644 --- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h +++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h @@ -71,7 +71,6 @@ private: friend class ACE_Singleton<TAO_NT_Naming_Service, MUTEX>; friend class AutoFinalizer; - }; /** @@ -81,7 +80,6 @@ private: */ class AutoFinalizer { - public: AutoFinalizer (TAO_NT_Naming_Service &service); ~AutoFinalizer (); @@ -91,7 +89,6 @@ private: }; - typedef ACE_Singleton<TAO_NT_Naming_Service, TAO_NT_Naming_Service::MUTEX> SERVICE; #endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */ diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp index ece6aeb0e1c..64942450df1 100644 --- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp +++ b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp @@ -49,7 +49,6 @@ TAO_Naming_Service::init (int argc, ACE_TCHAR* argv[]) if (result == -1) return result; - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.h b/TAO/orbsvcs/Naming_Service/Naming_Service.h index dfcf77754ce..6d11543466d 100644 --- a/TAO/orbsvcs/Naming_Service/Naming_Service.h +++ b/TAO/orbsvcs/Naming_Service/Naming_Service.h @@ -54,7 +54,6 @@ public: virtual ~TAO_Naming_Service (void); protected: - /// Parse the command line arguments to find /// the timeout period. int parse_args (int &argc, ACE_TCHAR* argv[]); diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp index a561076517f..cde1f49c6c3 100644 --- a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp +++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp @@ -149,7 +149,6 @@ TAO_NT_Notify_Service::arg_manip (char *args, DWORD arglen, bool query) } RegCloseKey (hkey); - } int diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.cpp b/TAO/orbsvcs/Time_Service/Clerk_i.cpp index f40c0085859..ef188c1982c 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_, @@ -378,7 +376,6 @@ Clerk_i::register_clerk (void) this->naming_client_->rebind (clerk_name, this->time_service_clerk_.in ()); - } catch (const CORBA::Exception& ex) { @@ -440,7 +437,6 @@ Clerk_i::init (int argc, // first IOR. if (this->get_first_IOR () != 0) return -1; - } // Create an instance of the Clerk. diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.h b/TAO/orbsvcs/Time_Service/Clerk_i.h index a811aff45c7..5712627db78 100644 --- a/TAO/orbsvcs/Time_Service/Clerk_i.h +++ b/TAO/orbsvcs/Time_Service/Clerk_i.h @@ -30,7 +30,6 @@ class Clerk_i { public: - enum { // Pre-allocate slots for this many servers. The capacity grows on // demand. @@ -58,7 +57,6 @@ private: void insert_server (CosTime::TimeService_ptr server); private: - /// Read the server IORs from a file instead of using a naming /// service. int read_ior (const ACE_TCHAR* filename); diff --git a/TAO/orbsvcs/Time_Service/Server_i.cpp b/TAO/orbsvcs/Time_Service/Server_i.cpp index ef6c3b7aa7e..90133414c07 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, @@ -229,7 +228,6 @@ Server_i::init (int argc, // Register the server object with the Naming Service. this->register_server (); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/Time_Service/Server_i.h b/TAO/orbsvcs/Time_Service/Server_i.h index a2d898301fb..1ceb27508ca 100644 --- a/TAO/orbsvcs/Time_Service/Server_i.h +++ b/TAO/orbsvcs/Time_Service/Server_i.h @@ -57,7 +57,6 @@ public: ACE_TCHAR* argv[]); private: - /// My orb. CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp index dcd98386e8e..b5b4906cfc8 100644 --- a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp +++ b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp @@ -3,7 +3,6 @@ #include "ace/OS_main.h" - // This is the main driver program for the Time Service clerk. int diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp b/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp index 5adc3578fb1..3b3b460b7f4 100644 --- a/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp +++ b/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp @@ -3,7 +3,6 @@ #include "ace/OS_main.h" - // This is the main driver program for the Time Service server. int 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 4a6b0e23017..ef01d16308b 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp @@ -3,11 +3,9 @@ #include "CountryC.h" - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { // ORB initialization boiler plate... @@ -69,4 +67,3 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } - diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h index 6582df0c2d7..165f126b4f7 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.h @@ -11,7 +11,6 @@ class ORB_Initializer : public virtual ::CORBA::LocalObject { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp index f2fbc5e6f7f..0681024f2f9 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp @@ -63,7 +63,6 @@ associate_state (CORBA::ORB_ptr orb, CORBA::Any const& state) pic->set_slot (state_slot_id (), state); - } catch (const CORBA::Exception& ex) { @@ -492,7 +491,6 @@ void ReplicaController::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr) { - } void diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h index 5aa00ad9d8d..1d6b81b6ac7 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h @@ -74,7 +74,6 @@ private: resolve_poa (PortableInterceptor::AdapterName const& name); private: - class RecordId { public: diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp index 051e09989a5..a13dffdb184 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp @@ -119,7 +119,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "IOR%d: %s\n",cntr, ior->c_str ())); iors [cntr] = orb->string_to_object (ior->c_str()); - } ACE_DEBUG ((LM_DEBUG, "Prepare to merge IORs.\n")); @@ -127,7 +126,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) object = iorm->merge_iors (iors); - FT::TagFTGroupTaggedComponent ft_tag_component; // Property values diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h b/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h index b1824922771..ca1e362a95c 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h +++ b/TAO/orbsvcs/examples/ImR/Advanced/Manager_i.h @@ -23,7 +23,6 @@ public: virtual CORBA::Long endRetry (); private: - long server_instance_; long retry_count_; long retry_attempt_; diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp index 28543b33482..e9e5ff59a93 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp +++ b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp @@ -134,7 +134,6 @@ void TestClient::run() this->wait(); ACE_DEBUG((LM_DEBUG, "* Client ended.\n")); - } // Read in the stringified object references into an array diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp index 995ef08cb47..147fb42f0e8 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); @@ -70,7 +69,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) poa->destroy(1, 1); orb->destroy(); - } catch (const CORBA::Exception& e) { e._tao_print_exception ("Combined Service:"); } diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp index 048c040e03b..8cf2c96d7fe 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"); @@ -110,7 +109,6 @@ DynServer_Loader::init (int argc, ACE_TCHAR* argv[]) runner_->activate(); ACE_DEBUG((LM_DEBUG, "dynserver: running.\n")); - } catch (Exception& e) { e._tao_print_exception ("DynServer::init()"); } @@ -122,7 +120,6 @@ DynServer_Loader::fini (void) { ACE_ASSERT(runner_.get() != 0); try { - ACE_DEBUG((LM_DEBUG, "dynserver: shutting down.\n")); runner_->end(); @@ -134,7 +131,6 @@ DynServer_Loader::fini (void) ACE_DEBUG((LM_DEBUG, "dynserver: shut down successfully.\n")); return 0; - } catch (Exception& e) { e._tao_print_exception ("DynServer::fini()"); } 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/ImR/Combined_Service/test_server.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp index e890ce2cc25..c270870f635 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp @@ -83,7 +83,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { root_poa->destroy(1, 1); orb->destroy(); - } catch (const CORBA::Exception& e) { e._tao_print_exception ("TestServer::init()"); } 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 009117f7ac1..e24f5c1f2f3 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h +++ b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.h @@ -33,7 +33,6 @@ class RPS_Monitor : public virtual POA_CosLoadBalancing::LoadMonitor { public: - /// Constructor RPS_Monitor (ServerRequestInterceptor * interceptor); @@ -43,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. @@ -62,7 +60,6 @@ public: //@} protected: - /// Destructor /** * Protected destructor to enforce proper memory management through @@ -71,7 +68,6 @@ protected: ~RPS_Monitor (void); private: - /// The name of the location at which this LoadMonitor resides. CosLoadBalancing::Location location_; diff --git a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp index 4902f70300f..f0550d67bb8 100644 --- a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp +++ b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp @@ -9,7 +9,6 @@ #define QUERY_LANG "TCL" - TLS_Client::TLS_Client (void) { // No-Op. diff --git a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h index 729b414a5a1..dea614b2c50 100644 --- a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h +++ b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h @@ -53,6 +53,5 @@ class TLS_Client // The basic log factory from the Log Service. - }; #endif /* TLS_CLIENT_H */ diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp index bc3aa1ea8ea..9bce68a2b19 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp @@ -90,13 +90,11 @@ Consumer::run (int argc, ACE_TCHAR* argv[]) void Consumer::push (const CORBA::Any &) { - this->event_count_ ++; ACE_DEBUG ((LM_DEBUG, "Consumer (%P|%t): %d log generated events received\n", this->event_count_)); - } void diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h index 1117e907a81..e23c33959b3 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h +++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h @@ -45,7 +45,6 @@ public: // The skeleton methods. private: - // = Data Members CORBA::ULong event_count_; // Keep track of the number of events received. @@ -62,7 +61,6 @@ private: CosEventChannelAdmin::ProxyPushSupplier_var supplier_; // The proxy that we are connected to. - }; #endif /* EVENT_CONSUMER_H */ diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp index 80d40ebf367..13d885b60db 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp @@ -165,7 +165,6 @@ Supplier::run (int argc, ACE_TCHAR* argv[]) // Destroy the POA poa->destroy (1, 0); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h index 4296b533ac7..6b2d7a484d3 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h +++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h @@ -42,7 +42,6 @@ public: // The skeleton methods. private: - // = Data Members CORBA::ORB_var orb_; // The ORB that we use. @@ -55,7 +54,6 @@ private: CosEventChannelAdmin::ProxyPushConsumer_var consumer_; // The proxy that we are connected to. - }; #endif /* EVENT_SUPPLIER_H */ diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h index 4357cc56362..805a9900f3e 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h @@ -71,8 +71,6 @@ private: DsNotifyLogAdmin::NotifyLogFactory_var notify_log_factory_; CosNotifyChannelAdmin::ProxyPushSupplier_var proxy_supplier_; - - }; #endif /* NOTIFY_CONSUMER_H */ diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp index 7040112fe63..5d5dfad91bd 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 @@ -41,7 +40,6 @@ Supplier::run (int argc, ACE_TCHAR* argv[]) CORBA::ORB_init (argc, argv); - CORBA::Object_var naming_obj = this->orb_->resolve_initial_references (NAMING_SERVICE_NAME); @@ -221,7 +219,6 @@ Supplier::run (int argc, ACE_TCHAR* argv[]) ACE_DEBUG ((LM_DEBUG, "Size of data in Log = %d\n", retval)); this->notify_log_->destroy(); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h index f2557c33a17..3324eced5e2 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h @@ -44,7 +44,6 @@ public: // Run the test private: - // = Data Members CORBA::ORB_var orb_; // The ORB that we use. diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h index acaba8da10d..6ebec884016 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h @@ -60,7 +60,6 @@ private: RtecEventChannelAdmin::ProxyPushSupplier_var supplier_; // The proxy that we are connected to. - }; #endif /* RTEVENT_CONSUMER_H */ diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp index b7e4f09ed25..653890485d1 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp @@ -17,7 +17,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) Supplier supplier; return supplier.run (argc, argv); - } // **************************************************************** @@ -93,7 +92,6 @@ Supplier::run (int argc, ACE_TCHAR* argv[]) - // create a log.. ACE_DEBUG ((LM_DEBUG, @@ -212,8 +210,6 @@ Supplier::run (int argc, ACE_TCHAR* argv[]) // Destroy the POA poa->destroy (1, 0); - - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h index 426e5225dca..20de42fc970 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h @@ -43,7 +43,6 @@ public: // The skeleton methods. private: - // = Data Members CosNaming::NamingContext_var naming_context_; // Handle to the name service. diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp index 627d28c99e1..a61c03e454f 100644 --- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp +++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp @@ -190,7 +190,6 @@ private: ProxyID supplier_id_; StructuredProxyPushSupplier_var 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/Notify/Lanes/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp index 285db7c8a01..786c1029bc9 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp @@ -9,7 +9,6 @@ #include "ace/OS_NS_errno.h" - TAO_Notify_Lanes_Consumer_Client::TAO_Notify_Lanes_Consumer_Client (TAO_Notify_ORB_Objects& orb_objects) : orb_objects_ (orb_objects) , lane_priority_ (0) @@ -181,7 +180,6 @@ TAO_Notify_Lanes_Consumer_Client::svc (void) catch (const CORBA::Exception& ex) { ex._tao_print_exception (ACE_TEXT ("Supplier error ")); - } return 0; diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp index 687fa6053ea..7bbd202e3d3 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp @@ -1,7 +1,6 @@ #include "ORB_Objects.h" - TAO_Notify_ORB_Objects::TAO_Notify_ORB_Objects (void) { } diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp index d27314e6c6b..5e1cb1fb3f2 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp @@ -1,7 +1,6 @@ #include "ORB_Run_Task.h" - TAO_Notify_ORB_Run_Task::TAO_Notify_ORB_Run_Task (TAO_Notify_ORB_Objects& orb_objects) : orb_objects_ (orb_objects) { diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp index 3651c9fd1ef..8bab425bc0f 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp @@ -1,7 +1,6 @@ #include "Supplier.h" - #include "tao/ORB_Core.h" TAO_Notify_Lanes_Supplier::TAO_Notify_Lanes_Supplier (TAO_Notify_ORB_Objects& orb_objects) diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp index 32865fcd20c..12f60304909 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp @@ -10,7 +10,6 @@ #include "ace/OS_NS_errno.h" - TAO_Notify_Lanes_Supplier_Client::TAO_Notify_Lanes_Supplier_Client (TAO_Notify_ORB_Objects& orb_objects) : orb_objects_ (orb_objects) ,supplier_ (0) @@ -187,7 +186,6 @@ TAO_Notify_Lanes_Supplier_Client::svc (void) catch (const CORBA::Exception& ex) { ex._tao_print_exception (ACE_TEXT ("Supplier error ")); - } return 0; diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp index a6f96cbe249..93cd4e1f219 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp @@ -329,7 +329,6 @@ Subscribe_StructuredPushConsumer::push_structured_event if (++g_result_count == EVENT_COUNT) subscribe_->done (); - } void diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp index d34251bb9b7..a61cbed6fe5 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp @@ -9,7 +9,6 @@ #include "ace/OS_NS_errno.h" - TAO_Notify_ThreadPool_Consumer_Client::TAO_Notify_ThreadPool_Consumer_Client (TAO_Notify_ORB_Objects& orb_objects) : orb_objects_ (orb_objects) , consumer_ (0) @@ -185,7 +184,6 @@ TAO_Notify_ThreadPool_Consumer_Client::svc (void) catch (const CORBA::Exception& ex) { ex._tao_print_exception (ACE_TEXT ("Supplier error ")); - } return 0; diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp index 687fa6053ea..7bbd202e3d3 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp @@ -1,7 +1,6 @@ #include "ORB_Objects.h" - TAO_Notify_ORB_Objects::TAO_Notify_ORB_Objects (void) { } diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp index d27314e6c6b..5e1cb1fb3f2 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp @@ -1,7 +1,6 @@ #include "ORB_Run_Task.h" - TAO_Notify_ORB_Run_Task::TAO_Notify_ORB_Run_Task (TAO_Notify_ORB_Objects& orb_objects) : orb_objects_ (orb_objects) { diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp index af8bf93d61b..416239c0e0e 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp @@ -1,7 +1,6 @@ #include "Supplier.h" - #include "tao/ORB_Core.h" TAO_Notify_ThreadPool_Supplier::TAO_Notify_ThreadPool_Supplier (TAO_Notify_ORB_Objects& orb_objects) diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp index 8fe87a8af5e..6afd9723a61 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp @@ -183,7 +183,6 @@ TAO_Notify_ThreadPool_Supplier_Client::svc (void) catch (const CORBA::Exception& ex) { ex._tao_print_exception (ACE_TEXT ("Supplier error ")); - } return 0; diff --git a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h index 3a3889856df..27ba0514a18 100644 --- a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h +++ b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h @@ -14,7 +14,6 @@ class Gateway_ObjRef_Factory public virtual OBV_ORT::ObjectReferenceFactory { public: - Gateway_ObjRef_Factory ( Gateway::Object_Factory_ptr gateway_object_factory, PortableInterceptor::ObjectReferenceFactory *old_factory); diff --git a/TAO/orbsvcs/examples/ORT/Gateway_i.h b/TAO/orbsvcs/examples/ORT/Gateway_i.h index 081dee4ed14..b375ea65a25 100644 --- a/TAO/orbsvcs/examples/ORT/Gateway_i.h +++ b/TAO/orbsvcs/examples/ORT/Gateway_i.h @@ -34,7 +34,6 @@ public: PortableServer::POA_ptr poa); private: - CORBA::ORB_ptr orb_; PortableServer::Current_ptr poa_current_; diff --git a/TAO/orbsvcs/examples/ORT/Object_Factory_i.h b/TAO/orbsvcs/examples/ORT/Object_Factory_i.h index 80aaf03d774..fce4a82e0df 100644 --- a/TAO/orbsvcs/examples/ORT/Object_Factory_i.h +++ b/TAO/orbsvcs/examples/ORT/Object_Factory_i.h @@ -21,7 +21,6 @@ class Object_Factory_i : public virtual POA_Gateway::Object_Factory { public: - /// Constructor Object_Factory_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr gateway_poa); @@ -31,7 +30,6 @@ class Object_Factory_i : public virtual POA_Gateway::Object_Factory CORBA::Object_ptr gatewayed_object); private: - CORBA::ORB_ptr orb_; PortableServer::POA_ptr gateway_poa_; }; diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h index 47774c8921e..32748ae6eee 100644 --- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h +++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h @@ -22,7 +22,6 @@ class Server_IORInterceptor public virtual ::CORBA::LocalObject { public: - Server_IORInterceptor (Gateway::Object_Factory_ptr gateway_object_factory); /** @@ -57,13 +56,10 @@ public: //@} protected: - ~Server_IORInterceptor (void); private: - Gateway::Object_Factory_ptr gateway_object_factory_; - }; #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h index 1832257174a..e5b4d270230 100644 --- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h +++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h @@ -20,7 +20,6 @@ class Server_IORInterceptor_ORBInitializer public virtual ::CORBA::LocalObject { public: - //@{ /// The pre-initialization hook. virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); @@ -28,7 +27,6 @@ class Server_IORInterceptor_ORBInitializer /// The post-initialization hook. virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); //@} - }; #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/examples/ORT/sum_server_i.h b/TAO/orbsvcs/examples/ORT/sum_server_i.h index 730542b0aa4..b3bfb5c2d5f 100644 --- a/TAO/orbsvcs/examples/ORT/sum_server_i.h +++ b/TAO/orbsvcs/examples/ORT/sum_server_i.h @@ -21,14 +21,12 @@ class sum_server_i : public virtual POA_ORT::sum_server { public: - /// Constructor sum_server_i (); /// add variables method CORBA::Long add_variables (CORBA::Long a, CORBA::Long b); - }; #endif /* SUM_SERVER_I_H */ diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp index 6affe0ce442..8ba0a0c792a 100644 --- a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp @@ -1,7 +1,6 @@ #include "Consumer.h" - Consumer::Consumer (void) { } diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp index d5294b91bec..5032ec9520a 100644 --- a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp @@ -20,7 +20,6 @@ #include "ace/Thread.h" - namespace { int config_run = 0; diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp index a08693a781d..a62d2de04dd 100644 --- a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp @@ -4,7 +4,6 @@ #include "orbsvcs/RtecEventCommC.h" - Supplier::Supplier (RtecEventComm::EventSourceID id, const RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer_proxy) :id_ (id), diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp index 09820b9d704..3afa9f99684 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp @@ -15,7 +15,6 @@ #include "ace/OS_NS_unistd.h" - int config_run = 0; int parse_args (int argc, ACE_TCHAR *argv[]); 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/examples/Security/SecurityLevel1/SLevel1_Test_i.h b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h index e5c1b8615fd..67a9c41c128 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h @@ -26,7 +26,6 @@ class SLevel1_Server_i : public POA_SLevel1_Server static int authorized_1; static int authorized_2; - }; #endif /* TAO_SLEVEL1_TEST_I_H */ diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp index 66f5acd3b42..5e292c26972 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp @@ -1,7 +1,6 @@ #include "SLevel1_TestC.h" - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp index 07c950987ef..00090f0dbf6 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp @@ -49,7 +49,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->run (); root_poa->destroy (true, true); - } catch (const CORBA::SytemException& ) { diff --git a/TAO/orbsvcs/examples/Security/Send_File/client.cpp b/TAO/orbsvcs/examples/Security/Send_File/client.cpp index ab977303ded..68a578d17cc 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/client.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/client.cpp @@ -3,7 +3,6 @@ #include "testC.h" - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int diff --git a/TAO/orbsvcs/examples/Security/Send_File/server.cpp b/TAO/orbsvcs/examples/Security/Send_File/server.cpp index 9b9f82aab2c..326958271d9 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/server.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/server.cpp @@ -4,7 +4,6 @@ #include "ace/OS_NS_unistd.h" - const ACE_TCHAR *ior_output_file = 0; int diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp index 8f06732eb5c..3e2822e1927 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp @@ -5,7 +5,6 @@ #endif /* __ACE_INLINE__ */ - void Simple_Server_i::send_line (const char *line) { diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index baafac90542..9d85332a732 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -739,7 +739,6 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, ex._tao_print_exception ( "producer_check: not a producer"); - } } } @@ -834,9 +833,6 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, this->sep_b_.in (), the_qos, the_flows); - - - } // This is the light profile, call connect() else if (!CORBA::is_nil (this->vdev_a_.in ()) && !CORBA::is_nil (this->vdev_b_.in ())) @@ -1006,7 +1002,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 ()) { @@ -1393,7 +1388,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 ()) @@ -1480,7 +1474,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; @@ -1763,7 +1756,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 (); @@ -2004,7 +1996,6 @@ TAO_StreamEndPoint::destroy (const AVStreams::flowSpec &flow_spec) TAO_AV_CORE::instance()->remove_connector(entry->flowname()); TAO_AV_CORE::instance()->remove_connector(control_flowname.c_str()); entry->protocol_object ()->destroy (); - } } } @@ -2131,7 +2122,6 @@ TAO_StreamEndPoint::change_qos (AVStreams::streamQoS &new_qos, ORBSVCS_ERROR_RETURN ((LM_ERROR, "Modifying QoS Failed\n"), -1); - } } return 0; @@ -2152,7 +2142,6 @@ TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos, return 0; return 1; - } // Sets the list of protocols this streamendpoint can understand. @@ -2537,7 +2526,6 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos, } else { - switch (forward_entry->direction ()) { case TAO_FlowSpec_Entry::TAO_AV_DIR_IN: @@ -2608,9 +2596,7 @@ TAO_StreamEndPoint_A::disconnect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep const AVStreams::flowSpec & /* theSpec */) { - throw AVStreams::notSupported (); - } TAO_StreamEndPoint_A::~TAO_StreamEndPoint_A () @@ -3303,7 +3289,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) @@ -3572,7 +3557,6 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer, { try { - AVStreams::FlowProducer_ptr flow_producer = AVStreams::FlowProducer::_duplicate (producer); AVStreams::FlowConsumer_ptr flow_consumer = @@ -3786,7 +3770,6 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer, // flow_producer, // this->fp_name_.inout () //); - } if (CORBA::is_nil (this->mcastconfigif_.in ())) ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_FlowConnection::add_consumer: first add a producer and then a consumer\n"), 0); @@ -3922,7 +3905,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 c9005430917..ecd767ce52a 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h @@ -51,7 +51,6 @@ typedef ACE_Hash_Map_Entry <ACE_CString,TAO_AV_Flow_Handler*> Flow_Handler_Map_E typedef ACE_Hash_Map_Iterator <ACE_CString,TAO_AV_Flow_Handler*,ACE_Null_Mutex> Flow_Handler_Map_Iterator; - class TAO_AV_Export AV_Null_MediaCtrl : public virtual POA_Null_MediaCtrl { @@ -59,9 +58,7 @@ public: AV_Null_MediaCtrl (void); protected: - virtual ~AV_Null_MediaCtrl (void); - }; /** @@ -73,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); @@ -117,7 +113,6 @@ public: CORBA::Object_ptr flow_connection); protected: - /// Destructor. virtual ~TAO_Basic_StreamCtrl (void); @@ -192,9 +187,7 @@ class TAO_AV_Export TAO_StreamCtrl : public virtual POA_AVStreams::StreamCtrl, public virtual TAO_Basic_StreamCtrl { - public: - /// Default Constructor TAO_StreamCtrl (void); @@ -257,7 +250,6 @@ public: const AVStreams::flowSpec &the_spec); protected: - struct MMDevice_Map_Entry { AVStreams::StreamEndPoint_var sep_; @@ -282,7 +274,6 @@ class TAO_AV_Export TAO_MCastConfigIf public virtual TAO_PropertySet { public: - enum Peer_Interface {VDEV = 0, FLOWENDPOINT=1}; struct Peer_Info { @@ -380,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); @@ -431,7 +421,6 @@ public: int is_protocol_object_set (void); protected: - TAO_AV_QoS qos_; Flow_Handler_Map flow_handler_map_; Flow_Handler_Map control_flow_handler_map_; @@ -453,7 +442,6 @@ class TAO_AV_Export TAO_StreamEndPoint : public virtual POA_AVStreams::StreamEndPoint, public virtual TAO_Base_StreamEndPoint { - public: /// Constructor TAO_StreamEndPoint (void); @@ -579,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); @@ -599,7 +586,6 @@ public: /// Destructor virtual ~TAO_StreamEndPoint_A (void); - }; // For backward compatibility. @@ -637,7 +623,6 @@ class TAO_AV_Export TAO_VDev :public virtual TAO_PropertySet, public virtual POA_AVStreams::VDev { - public: /// Default Constructor TAO_VDev (void); @@ -697,9 +682,7 @@ class TAO_AV_Export TAO_MMDevice :public virtual POA_AVStreams::MMDevice, public virtual TAO_PropertySet { - public: - /// Constructor enum MMDevice_Type {MMDEVICE_A = 0,MMDEVICE_B = 1}; TAO_MMDevice (TAO_AV_Endpoint_Strategy *endpoint_strategy_); @@ -762,7 +745,6 @@ protected: char* add_fdev_i (AVStreams::FDev_ptr fdev); protected: - TAO_AV_Endpoint_Strategy *endpoint_strategy_; /// Count of the number of flows in this MMDevice , used to @@ -798,7 +780,6 @@ class TAO_AV_Export TAO_FlowConnection : public virtual POA_AVStreams::FlowConnection, public virtual TAO_PropertySet { - public: /// default constructor. TAO_FlowConnection (void); @@ -880,9 +861,7 @@ class TAO_AV_Export TAO_FlowEndPoint : public virtual POA_AVStreams::FlowEndPoint, public virtual TAO_Base_StreamEndPoint { - public: - ///default constructor. TAO_FlowEndPoint (void); @@ -1068,7 +1047,6 @@ public: const char * use_flow_protocol); - /// sets the public key to be used for encryption of the data. virtual void set_key (const AVStreams::key & the_key); 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.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp index ed0f32ee71a..ce63260d5ae 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp @@ -259,7 +259,6 @@ TAO_AV_Endpoint_Process_Strategy_A::create_A (AVStreams::StreamEndPoint_A_ptr &s stream_endpoint = AVStreams::StreamEndPoint_A::_duplicate( this->stream_endpoint_a_.in() ); vdev = AVStreams::VDev::_duplicate( this->vdev_.in() ); return 0; - } // Gets the stream endpoint object reference from the naming service diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp index bbe3cfc9108..7167c33c74c 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); @@ -150,7 +149,6 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ this->vdev_->define_property ("Related_MediaCtrl", anyval); - } catch (const CORBA::Exception& ex) { @@ -239,7 +237,6 @@ TAO_AV_Endpoint_Reactive_Strategy_A<T_StreamEndpoint, T_VDev, T_MediaCtrl>::crea stream_endpoint = AVStreams::StreamEndPoint_A::_duplicate( this->stream_endpoint_a_.in() ); vdev = AVStreams::VDev::_duplicate( this->vdev_.in() ); return 0; - } // Put the stream_endpoint into the POA @@ -249,7 +246,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; @@ -397,7 +393,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/Endpoint_Strategy_T.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h index a16bcc74b66..f9b63701db0 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h @@ -227,7 +227,6 @@ protected: CORBA::ORB_ptr orb_; PortableServer::POA_ptr poa_; - }; // ---------------------------------------------------------------------- diff --git a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp index f0b511711d2..122d5116d24 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp @@ -3,7 +3,6 @@ #if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS) - TAO_BEGIN_VERSIONED_NAMESPACE_DECL const iovec Fill_ACE_QoS::iov_ = {0,0}; diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp index ee6a19ed0eb..b9bec6fe64c 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp @@ -596,7 +596,6 @@ TAO_Forward_FlowSpec_Entry::parse (const char *flowSpec_entry) ORBSVCS_DEBUG ((LM_DEBUG, "Peer Address %s\n", buf)); - } if (tokenizer [TAO_AV_FLOW_PROTOCOL] != 0) @@ -736,7 +735,6 @@ TAO_Forward_FlowSpec_Entry::entry_to_string () //inet_addr->get_host_name (address, BUFSIZ); //cstring += ACE_OS::itoa (address, BUFSIZ, inet_addr->get_port_number ()); - } break; default: @@ -982,7 +980,6 @@ TAO_Reverse_FlowSpec_Entry::entry_to_string () char port_str[10]; ACE_OS::sprintf(port_str, "%u", control_port); address_str += port_str; - } this->entry_ = this->flowname_; diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp index 8848fffcf47..57dfc5fc1e4 100644 --- a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp @@ -167,7 +167,6 @@ TAO_AV_UDP_MCast_Transport::send (const char *buf, // if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"to %s\n",addr)); return this->handler_->get_mcast_socket ()->send (buf, len); - } ssize_t @@ -178,7 +177,6 @@ TAO_AV_UDP_MCast_Transport::send (const iovec *iov, return this->handler_->get_mcast_socket ()->send (iov, iovcnt, 0); - } int 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 4d3a2c5dc31..eaf6739f453 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) @@ -81,7 +80,6 @@ TAO_AV_UDP_QoS_Session_Helper::set_qos (ACE_Flow_Spec &ace_flow_spec, if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "Filled up the Receiver QoS parameters\n")); - } ACE_QoS_Manager qos_manager = handler->get_socket ()->qos_manager (); @@ -180,7 +178,6 @@ TAO_AV_UDP_QoS_Session_Helper::activate_qos_handler (ACE_QoS_Session *qos_sessio -1); return 0; - } TAO_AV_UDP_QoS_Flow_Handler::TAO_AV_UDP_QoS_Flow_Handler (void) @@ -319,7 +316,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")); @@ -487,7 +483,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]; @@ -510,7 +505,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, @@ -920,7 +914,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, @@ -983,7 +976,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, @@ -1002,7 +994,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, @@ -1066,7 +1057,6 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr) this->entry_->handler (flow_handler); return 0; - } int @@ -1226,7 +1216,6 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry, session_addr->set (local_addr->get_port_number (), local_addr->get_host_name ()); - } else { @@ -1271,7 +1260,6 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry, -1); this->qos_session_->source_addr (src_addr); - } handler->qos_session (this->qos_session_); @@ -1285,7 +1273,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/RTCP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp index feb571fe886..7fad90c6c92 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp @@ -177,7 +177,6 @@ TAO_AV_RTCP_Callback::receive_control_frame (ACE_Message_Block *data, } first_rtcp_packet = 0; - } if (more != 0) @@ -330,7 +329,6 @@ TAO_AV_RTCP::rtcp_interval (int members, } - // TAO_AV_RTCP_Flow_Factory TAO_AV_RTCP_Flow_Factory::TAO_AV_RTCP_Flow_Factory () { @@ -437,7 +435,6 @@ TAO_AV_RTCP_Object::TAO_AV_RTCP_Object (TAO_AV_Callback *client_cb, { rtcp_cb = &this->rtcp_cb_; this->client_cb_ = client_cb; - } TAO_AV_RTCP_Object::~TAO_AV_RTCP_Object () diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp index 9423eef309a..f346476b939 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp @@ -66,7 +66,6 @@ RTCP_Packet::is_valid (char is_first) } return 1; - } /* @@ -143,7 +142,6 @@ RTCP_BYE_Packet::RTCP_BYE_Packet(char* buffer, int *len) index++; ACE_OS::memcpy(this->reason_, &buffer[index], this->reason_length_); index+=this->reason_length_; - } else this->reason_length_ = 0; diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.h b/TAO/orbsvcs/orbsvcs/AV/RTP.h index ea8d3821ac7..6b629a8788a 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTP.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTP.h @@ -239,7 +239,6 @@ public: unsigned char ebit; ACE_UINT16 blkno; }; - }; /** @@ -391,7 +390,6 @@ protected: }; - /** * @class TAO_AV_RTP_Flow_Factory * @brief diff --git a/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h b/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h index 374aa83731f..4aebea969d3 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h +++ b/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h @@ -35,14 +35,12 @@ class TAO_AV_Export TAO_AV_Resource_Factory : public ACE_Service_Object { public: - /** * @name Service Configurator Hooks */ //@{ /// Dynamic linking hook virtual int init (int argc, ACE_TCHAR *argv[]) = 0; - }; TAO_END_VERSIONED_NAMESPACE_DECL 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..9f6ab194b87 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 (); @@ -293,7 +292,6 @@ TAO_AV_Acceptor_Registry::open (TAO_Base_StreamEndPoint *endpoint, this->acceptors_.insert (acceptor); entry->protocol_object ()->control_object (entry->control_protocol_object ()); - } else ORBSVCS_ERROR_RETURN ((LM_ERROR, @@ -386,7 +384,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 d320d327028..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; @@ -280,7 +279,6 @@ TAO_AV_UDP_Transport::send (const iovec *iov, return this->handler_->get_socket ()->send ((const iovec *) iov, iovcnt, this->peer_addr_); - } ssize_t @@ -678,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 7b482492ebc..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); @@ -198,7 +197,6 @@ protected: TAO_FlowSpec_Entry *entry_; TAO_AV_Flow_Protocol_Factory *flow_protocol_factory_; TAO_AV_Core::Flow_Component flow_component_; - }; /** diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp index 77b9e1542a7..ddba84bfa49 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp @@ -649,7 +649,6 @@ TAO_SFP_Base::send_message (TAO_AV_Transport *transport, return -1; } return 1; - } int @@ -1093,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 = @@ -1270,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/Concurrency/CC_LockSetFactory.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp index 03a2175adb9..247cc2bf866 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp @@ -11,7 +11,6 @@ #include "orbsvcs/Concurrency/CC_LockSet.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Default constructor diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp index 74555ec8ed7..d192342a8cb 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp @@ -15,7 +15,6 @@ #include "ace/Dynamic_Service.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Concurrency_Loader::TAO_Concurrency_Loader () diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h index 693e026a7a2..2b5d4362b06 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h @@ -30,7 +30,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Concurrency_Serv_Export TAO_Concurrency_Loader : public TAO_Object_Loader { public: - /// Constructor TAO_Concurrency_Loader (void); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h index 96ce57e6d30..4b72ce2fc6c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h @@ -100,7 +100,6 @@ private: /// Implement the pull side of this class TAO_ESF_Proxy_Admin<TAO_CEC_EventChannel,TAO_CEC_ProxyPullSupplier,CosEventChannelAdmin::ProxyPullSupplier> pull_admin_; - }; // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h index 6227b513645..4f1108e825d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h @@ -29,7 +29,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_CEC_DynamicImplementationServer : public TAO_DynamicImplementation { public: - /// Constructor TAO_CEC_DynamicImplementationServer (PortableServer::POA_ptr poa, TAO_CEC_TypedProxyPushConsumer *typed_pp_consumer, diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp index 0e5bc198acb..c7117ca75b4 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 () ) @@ -379,7 +377,6 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer ( this->typed_event_channel_->reconnected (this); } return; - } this->typed_consumer_ = apply_policy (local_typed_consumer.in () ); @@ -391,7 +388,6 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer ( // Notify the event channel... this->typed_event_channel_->connected (this); - } /* this->is_typed_ec */ else { @@ -405,7 +401,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_TypedConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h index fa7a864fef8..41481d88c72 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h @@ -36,7 +36,6 @@ class TAO_Event_Serv_Export TAO_CEC_TypedConsumerAdmin : public POA_CosTypedEventChannelAdmin::TypedConsumerAdmin { public: - // Constructor TAO_CEC_TypedConsumerAdmin (TAO_CEC_TypedEventChannel* 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/ESF/ESF_Delayed_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp index b1dcefda33e..d6d4918ceca 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp @@ -55,7 +55,6 @@ TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>:: for (ITERATOR i = this->collection_.begin (); i != end; ++i) { worker->work (*i); - } } diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp index a60a7f02583..f69967a1709 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp @@ -8,5 +8,4 @@ #endif /* __ACE_INLINE__ */ - #endif /* TAO_ESF_REFCOUNT_GUARD_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h index c44cadd0a86..f1ceb4aa5b6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h @@ -39,7 +39,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_RTEvent_Serv_Export TAO_ECG_Handler_Shutdown { public: - // Define virtual destructor to make sure we can delete derived // objects through a pointer to TAO_ECG_Handler_Shutdown. virtual ~TAO_ECG_Handler_Shutdown (); @@ -57,7 +56,6 @@ public: class TAO_RTEvent_Serv_Export TAO_ECG_Dgram_Handler { public: - virtual ~TAO_ECG_Dgram_Handler (); virtual int handle_input (ACE_SOCK_Dgram& dgram) = 0; diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h index d0bfcaf73f8..5115cfd085c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h @@ -28,7 +28,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_Address_Server_Base : public virtual POA_RtecUDPAdmin::AddrServer { public: - virtual int init (const char *arg) = 0; }; diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h index 199834e90fc..bf0363145ac 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h @@ -86,7 +86,6 @@ public: char* fragment_buffer (CORBA::ULong fragment_offset); private: - TAO_ECG_UDP_Request_Entry (const TAO_ECG_UDP_Request_Entry & rhs); TAO_ECG_UDP_Request_Entry& operator= (const TAO_ECG_UDP_Request_Entry & rhs); @@ -176,7 +175,6 @@ public: static TAO_ECG_UDP_Request_Entry Request_Completed_; private: - enum { ECG_DEFAULT_MAX_FRAGMENTED_REQUESTS = 1024, ECG_DEFAULT_FRAGMENTED_REQUESTS_MIN_PURGE_COUNT = 32 @@ -190,7 +188,6 @@ private: ACE_Null_Mutex> Request_Map; private: - /// Returns 1 on success, 0 if <request_id> has already been /// received or is below current request range, and -1 on error. int mark_received (const ACE_INET_Addr &from, @@ -208,7 +205,6 @@ private: Request_Map::ENTRY* get_source_entry (const ACE_INET_Addr &from); private: - /// Ignore any events coming from this IP address. TAO_ECG_Refcounted_Endpoint ignore_from_; @@ -257,7 +253,6 @@ struct TAO_ECG_CDR_Message_Receiver::Mcast_Header class TAO_ECG_CDR_Message_Receiver::Requests { public: - Requests (); ~Requests (); @@ -274,7 +269,6 @@ public: TAO_ECG_UDP_Request_Entry ** get_request (CORBA::ULong request_id); private: - /// Delete any outstanding requests with ids in the range /// [<purge_first>, <purge_last>] from <fragmented_requests> and /// and reset their slots. diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp index a218fb7f0d5..b07c2c26bc3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp @@ -10,7 +10,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL void @@ -171,7 +170,6 @@ TAO_ECG_CDR_Message_Sender::send_message (const TAO_OutputCDR &cdr, } // ACE_ASSERT (total_length == fragment_offset); // ACE_ASSERT (fragment_id == fragment_count); - } diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h index d9ce3dd8bbb..c06a668793c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h @@ -73,7 +73,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_RTEvent_Serv_Export TAO_ECG_CDR_Message_Sender { public: - enum { ECG_HEADER_SIZE = 32, ECG_MIN_MTU = 32 + 8, diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h index 5bb96c44b7b..7b911e886bb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h @@ -46,7 +46,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_Complex_Address_Server : public virtual POA_RtecUDPAdmin::AddrServer { public: - /// Create a new TAO_ECG_Complex_Address_Server object. /* * (Constructor access is restricted to insure that all @@ -75,7 +74,6 @@ public: void dump_content (); protected: - /// Constructor (protected). Clients can create new /// TAO_ECG_Complex_Address_Server objects using the static create() /// method. @@ -84,7 +82,6 @@ protected: TAO_ECG_Complex_Address_Server (int is_source_mapping = 1); private: - /// Helper. Given key and mcast address in string form, add them to /// the mapping. int add_entry (const char * key, const char * mcast_addr); diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp index 9c513ff2b77..925b755b3b7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp @@ -1,7 +1,6 @@ #include "orbsvcs/Event/ECG_ConsumerEC_Control.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ECG_ConsumerEC_Control::TAO_ECG_ConsumerEC_Control () diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp index 8c36dc6b44c..59d75748768 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp @@ -13,7 +13,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ECG_Mcast_EH::TAO_ECG_Mcast_EH (TAO_ECG_Dgram_Handler *recv, diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h index 8afc5439610..881df9b925b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h @@ -51,7 +51,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_Mcast_EH : public TAO_ECG_Handler_Shutdown { public: - /// Initialization and termination methods. //@{ /** @@ -97,7 +96,6 @@ public: virtual int handle_input (ACE_HANDLE fd); private: - /** * @class Observer * @@ -211,7 +209,6 @@ private: void execute (); private: - RtecEventChannelAdmin::Observer_Handle handle_; RtecEventChannelAdmin::EventChannel_var ec_; }; diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h index a34a07843f8..dddb8ab6772 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h @@ -125,7 +125,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_Mcast_Gateway : public ACE_Service_Object { public: - /// The Service_Object entry points. //@{ virtual int init (int argc, ACE_TCHAR* argv[]); @@ -219,7 +218,6 @@ public: RtecEventChannelAdmin::EventChannel_ptr ec); private: - /// Helpers. //@{ /// Check that arguments to run() are not nil. diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp index 04b881ae603..fd3a321051d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp @@ -7,7 +7,6 @@ #include "ace/Reactor.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ECG_Reactive_ConsumerEC_Control:: @@ -175,7 +174,6 @@ TAO_ECG_Reactive_ConsumerEC_Control::event_channel_not_exist ( gateway->cleanup_consumer_ec (); gateway->cleanup_consumer_proxies (); - } catch (const CORBA::Exception& ex) { @@ -195,7 +193,6 @@ TAO_ECG_Reactive_ConsumerEC_Control::system_exception ( gateway->cleanup_consumer_ec (); gateway->cleanup_consumer_proxies (); - } catch (const CORBA::Exception&) { diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp index 018b710de09..bdba1aba31a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp @@ -5,7 +5,6 @@ #include "ace/Reactor.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ECG_Reconnect_ConsumerEC_Control:: diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h index 267cea8f0c9..c79bf550925 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h @@ -28,7 +28,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_Simple_Address_Server : public virtual POA_RtecUDPAdmin::AddrServer { public: - /// Create a new TAO_ECG_Simple_Address_Server object. /// (Constructor access is restricted to insure that all /// TAO_ECG_Simple_Address_Server objects are heap-allocated.) @@ -46,7 +45,6 @@ public: RtecUDPAdmin::UDP_Address_out addr6); protected: - /// Constructor (protected). Clients can create new /// TAO_ECG_Simple_Address_Server objects using the static create() /// method. diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h index 69c5ac53150..5281a8e75a6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h @@ -38,7 +38,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_Simple_Mcast_EH , public TAO_ECG_Handler_Shutdown { public: - /// Initialization and termination methods. //@{ /// Constructor. @@ -70,7 +69,6 @@ public: virtual int handle_input (ACE_HANDLE fd); private: - // Socket on which we listen for messages. ACE_SOCK_Dgram_Mcast dgram_; diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp index 49ff6f35ecf..36d9075a0fd 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp @@ -8,7 +8,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ECG_UDP_EH::TAO_ECG_UDP_EH (TAO_ECG_Dgram_Handler *recv) diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h index 0d865c992c5..a5a194fd14d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h @@ -43,7 +43,6 @@ class TAO_RTEvent_Serv_Export TAO_ECG_UDP_EH : , public TAO_ECG_Handler_Shutdown { public: - /// Initialization and termination methods. //@{ /// Constructor. @@ -81,7 +80,6 @@ public: ACE_SOCK_Dgram &dgram (); private: - /// The datagram used to receive the data. ACE_SOCK_Dgram dgram_; diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp index 6f238efb3c1..1a8404f7906 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp @@ -8,7 +8,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ECG_UDP_Out_Endpoint::~TAO_ECG_UDP_Out_Endpoint () diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h index 68532c6b4b0..0a0abc3db9c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h @@ -84,7 +84,6 @@ public: void execute (); private: - RtecEventChannelAdmin::ProxyPushConsumer_var proxy_; }; @@ -104,10 +103,8 @@ class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Receiver : , public virtual TAO_ECG_Dgram_Handler { 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.) @@ -186,13 +183,11 @@ public: virtual int handle_input (ACE_SOCK_Dgram& dgram); protected: - /// Constructor (protected). Clients can create new /// TAO_ECG_UDP_Receiver objects using the static create() method. TAO_ECG_UDP_Receiver (CORBA::Boolean perform_crc = false); private: - /// Helpers for the connect() method. //@{ // Establishes connection to the Event Channel for the first time. diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h index 67f29c6fc14..63d5482588f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h @@ -83,7 +83,6 @@ public: void execute (); private: - RtecEventChannelAdmin::ProxyPushSupplier_var proxy_; }; @@ -101,10 +100,8 @@ class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Sender : public TAO_EC_Deactivated_Object { 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.) @@ -175,13 +172,11 @@ public: //@} protected: - /// Constructor (protected). Clients can create new /// TAO_ECG_UDP_Sender objects using the static create() method. TAO_ECG_UDP_Sender (CORBA::Boolean crc = 0); private: - /// Helpers for the connect() method. //@{ // Establishes connection to the Event Channel for the first time. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h index 4230f1a6370..3f555a24f20 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h @@ -37,7 +37,6 @@ class TAO_RTEvent_Serv_Export TAO_EC_Default_ProxyPushConsumer : public TAO_EC_ProxyPushConsumer { public: - /// Constructor... TAO_EC_Default_ProxyPushConsumer (TAO_EC_Event_Channel_Base* event_channel); @@ -60,7 +59,6 @@ public: virtual void _remove_ref (); private: - virtual PortableServer::ObjectId object_id (); }; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h index df5589db1f6..334928d75b6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h @@ -34,7 +34,6 @@ class TAO_RTEvent_Serv_Export TAO_EC_Default_ProxyPushSupplier public TAO_EC_ProxyPushSupplier { public: - /// Constructor... TAO_EC_Default_ProxyPushSupplier (TAO_EC_Event_Channel_Base* event_channel, int validate_connection); @@ -58,7 +57,6 @@ public: virtual void _remove_ref (); private: - virtual PortableServer::ObjectId object_id (); }; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h index fac5d0fd162..c9701bf5525 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h @@ -96,7 +96,6 @@ protected: class TAO_RTEvent_Serv_Export TAO_EC_Dispatching_Task : public ACE_Task<ACE_SYNCH> { public: - #ifdef ACE_WIN32_VC14 // Work around for Connect #2869042 Bugzilla #4215 TAO_EC_Dispatching_Task (ACE_Thread_Manager *thr_manager, TAO_EC_Queue_Full_Service_Object *queue_full_service_object = 0); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h index 931b66be256..6d4f6ca041a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h @@ -49,7 +49,6 @@ public: virtual TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier, RtecEventChannelAdmin::ConsumerQOS& qos) const = 0; - }; // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h index 8ea47da59ff..91bd7ac2925 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h @@ -233,7 +233,6 @@ protected: /// proxy push consumer, if 0, we only use one proxy push consumer (the /// default) for all source ids. int use_consumer_proxy_map_; - }; TAO_END_VERSIONED_NAMESPACE_DECL 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/Event/EC_Kokyu_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h index 14657975f06..4cae0ea5f86 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h @@ -101,7 +101,6 @@ public: protected: //Protected so can't be put on stack; must be dynamically allocated virtual ~TAO_EC_Kokyu_Shutdown_Command (void); - }; // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h index f95099e6ab0..c97ba05367f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h @@ -81,7 +81,6 @@ public: PortableServer::POA_var poa () const; private: - /// Disallow. //@{ TAO_EC_Object_Deactivator (const TAO_EC_Object_Deactivator &rhs); @@ -119,13 +118,11 @@ private: class TAO_RTEvent_Serv_Export TAO_EC_Deactivated_Object { public: - /// Set deactivation state to that specified by the @a deactivator /// argument. void set_deactivator (TAO_EC_Object_Deactivator & deactivator); protected: - TAO_EC_Deactivated_Object (); ~TAO_EC_Deactivated_Object (); @@ -158,7 +155,6 @@ public: void init (CORBA::ORB_var orb_var); private: - /// Disallow. //@{ TAO_EC_ORB_Holder & operator= (const TAO_EC_ORB_Holder &rhs); @@ -194,7 +190,6 @@ public: void init (RtecEventChannelAdmin::EventChannel_var ec_var); private: - /// Disallow. //@{ TAO_EC_Event_Channel_Holder & operator= (const TAO_EC_Event_Channel_Holder &rhs); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h index 6b2ff5f2ae4..8855e9962bd 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h @@ -82,7 +82,6 @@ public: void execute (); private: - T target_; }; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp index 0aabbbc08bc..615034df663 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp @@ -3,7 +3,6 @@ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_MT_Dispatching::TAO_EC_MT_Dispatching (int nthreads, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp index 249dbb9e7ee..f323262abe0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp @@ -1,7 +1,6 @@ #include "orbsvcs/Event/EC_Masked_Type_Filter.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Masked_Type_Filter:: diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp index a64fc8b06f1..573a860d455 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp @@ -1,7 +1,6 @@ #include "orbsvcs/Event/EC_Negation_Filter.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Negation_Filter::TAO_EC_Negation_Filter (TAO_EC_Filter* child) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp index 8bc8ff7eab4..284b0d7d748 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp @@ -18,7 +18,6 @@ #include "tao/ORB_Core.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Null_Factory::TAO_EC_Null_Factory () diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp index 141c3bd9b3b..a5bf9bac800 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp @@ -7,7 +7,6 @@ #endif /* __ACE_INLINE__ */ - void TAO_EC_Null_Scheduling::add_proxy_supplier_dependencies ( TAO_EC_ProxyPushSupplier *, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp index 74b29ea94cf..446b3e72b5f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp @@ -14,7 +14,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Per_Supplier_Filter:: diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp index 9aa1306d3b4..4ef991a850f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp @@ -14,7 +14,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Prefix_Filter_Builder::~TAO_EC_Prefix_Filter_Builder () diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp index 1908203fd0b..8afced46cac 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp @@ -10,7 +10,6 @@ #include "ace/Sched_Params.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Priority_Dispatching::TAO_EC_Priority_Dispatching (TAO_EC_Event_Channel_Base *ec) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp index 7f8bae66487..a0667e99cd9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp @@ -10,7 +10,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Priority_Scheduling::~TAO_EC_Priority_Scheduling () diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h index 65e699545b2..f361456a132 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h @@ -186,7 +186,6 @@ protected: /// Validate the connection to consumer on connect int consumer_validate_connection_; private: - /// Template method hooks. virtual void refcount_zero_hook (); virtual void pre_dispatch_hook (RtecEventComm::EventSet&); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h index bee04b5b3c7..d8a0d1104a8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h @@ -39,7 +39,6 @@ typedef ACE_Utils::Auto_Functor< TAO_EC_Supplier_Proxy_Disconnector; - /** * @struct TAO_EC_Consumer_Proxy_Disconnect_Functor * diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp index 07ecf59d97c..64a79b50eff 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp @@ -2,7 +2,6 @@ #include "tao/RTCORBA/Priority_Mapping.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_RTCORBA_Dispatching:: diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp index 8c0d8d3723a..4d12df4083e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp @@ -4,7 +4,6 @@ #include "tao/RTCORBA/Priority_Mapping_Manager.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_RTCORBA_Factory:: diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp index 585b4a0e10e..662a83b1532 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp @@ -14,7 +14,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Reactive_ConsumerControl:: diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp index 1a2dee5f5d9..0148937adc8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp @@ -2,7 +2,6 @@ #include "orbsvcs/Event/EC_ProxySupplier.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Reactive_Dispatching::TAO_EC_Reactive_Dispatching () diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp index b76dc2aa4e7..a4edbf59e43 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp @@ -14,7 +14,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Reactive_SupplierControl:: diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp index edc5a380c27..2404a9287d6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp @@ -15,7 +15,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Sched_Factory::~TAO_EC_Sched_Factory () diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp index 99a0693f1f7..749f4fabdd4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp @@ -3,7 +3,6 @@ #include "orbsvcs/Log_Macros.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Sched_Filter:: @@ -208,7 +207,6 @@ TAO_EC_Sched_Filter::init_rt_info () ORBSVCS_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", info->entry_point.in (), this->name_.c_str ())); - } #endif /* 0 */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp index 3df2fa9f386..ca4940982e9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp @@ -14,7 +14,6 @@ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Sched_Filter_Builder::~TAO_EC_Sched_Filter_Builder () diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp index ea13e8047b4..778c2086f39 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp @@ -2,7 +2,6 @@ #include "orbsvcs/Event/EC_QOS_Info.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Scheduling_Strategy::~TAO_EC_Scheduling_Strategy () diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h index 6216f869b2c..731897ae5aa 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h @@ -59,7 +59,6 @@ public: virtual void schedule_event (const RtecEventComm::EventSet &event, TAO_EC_ProxyPushConsumer *consumer, TAO_EC_Supplier_Filter *filter) = 0; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp index e31589276a4..dc6f1409a96 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp @@ -7,7 +7,6 @@ #include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_SupplierAdmin::TAO_EC_SupplierAdmin (TAO_EC_Event_Channel_Base *ec) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp index 5519b5b9022..c91a5ce03f5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp @@ -1,7 +1,6 @@ #include "orbsvcs/Event/EC_SupplierControl.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_SupplierControl::TAO_EC_SupplierControl () diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp index 46ea1b4e70e..6efc05751f2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp @@ -7,7 +7,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Supplier_Filter::~TAO_EC_Supplier_Filter () diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp index 446058b3f45..ab000125751 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp @@ -1,7 +1,6 @@ #include "orbsvcs/Event/EC_Supplier_Filter_Builder.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Supplier_Filter_Builder::~TAO_EC_Supplier_Filter_Builder () diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp index 52af0795fc3..827973d288f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp @@ -12,7 +12,6 @@ #include "ace/OS_NS_strings.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL unsigned long TAO_EC_TPC_debug_level; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp index a08142d98ab..fc4299bf109 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp @@ -7,7 +7,6 @@ #include "ace/Sched_Params.h" - #define TETFSF(flag) { #flag, flag } TAO_EC_Thread_Flags::Supported_Flag TAO_EC_Thread_Flags::supported_flags_[] = { #if defined (ACE_HAS_THREADS) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.h b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.h index 81f87cf51b5..185e3182d64 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.h @@ -90,7 +90,6 @@ public: long default_priority () const; - struct Supported_Flag { const char* n; /// Flag name, e.g., THR_NEW_LWP diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp index 1ec13c1e230..713dc5e93f7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp @@ -7,7 +7,6 @@ #include "orbsvcs/Event/EC_ProxyConsumer.h" // @@ MSVC 6 bug - // **************************************************************** TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp index 56ec593b2ea..15e693cfc85 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp @@ -1,7 +1,6 @@ #include "orbsvcs/Event/EC_Type_Filter.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Type_Filter::TAO_EC_Type_Filter (const RtecEventComm::EventHeader& header) diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp index 3768edc213e..444d5e710c3 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp +++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp @@ -215,7 +215,6 @@ void ACE_SupplierQOS_Factory::debug (const RtecEventChannelAdmin::SupplierQOS& q buf, qos.publications[i].dependency_info.number_of_calls)); } ORBSVCS_DEBUG ((LM_DEBUG, "}\n")); - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h index e07bb62982e..029d297772d 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.h @@ -36,13 +36,11 @@ class TAO_FT_ClientORBInitializer , public virtual ::CORBA::LocalObject { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: - /// Register FTCORBA policy factories. void register_policy_factories ( PortableInterceptor::ORBInitInfo_ptr info); 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_ClientPolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h index 77af6b0532a..23c63bfb18e 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h @@ -39,7 +39,6 @@ class TAO_FT_ClientPolicyFactory , public ::CORBA::LocalObject { public: - virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any &value); }; diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp index f3203343855..26f075f4eb2 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp @@ -11,7 +11,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TimeBase::TimeT diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h index 379bc6d240b..7757a3266da 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h @@ -45,7 +45,6 @@ class TAO_FT_Request_Duration_Policy public ::CORBA::LocalObject { public: - /// Constructor. TAO_FT_Request_Duration_Policy (const TimeBase::TimeT& relative_expiry); @@ -90,7 +89,6 @@ class TAO_FT_Heart_Beat_Policy public ::CORBA::LocalObject { public: - /// Constructor. TAO_FT_Heart_Beat_Policy (const CORBA::Boolean boolean, const TimeBase::TimeT &interval, @@ -120,7 +118,6 @@ public: const TimeBase::TimeT &timebase); private: - // The attributes /// <heartbeat_> indicates whether heartbeating is enabled or not. CORBA::Boolean heartbeat_; diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp index 51faf3010a7..44d849d394b 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp @@ -33,7 +33,6 @@ namespace TAO // Would be nice to have runtime option. ACE_NEW (this->lock_, ACE_Lock_Adapter<TAO_SYNCH_MUTEX>); - } FT_ClientRequest_Interceptor::~FT_ClientRequest_Interceptor () @@ -269,7 +268,6 @@ namespace TAO } // Add this context to the service context list. ri->add_request_service_context (sc, 0); - } catch (const CORBA::Exception&) { diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h index 7545b9f3f2f..50843b72b72 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h @@ -70,7 +70,6 @@ namespace TAO public virtual ::CORBA::LocalObject { public: - FT_ClientRequest_Interceptor (void); /// Canonical name of the interceptor. @@ -92,11 +91,9 @@ namespace TAO void ft_send_extended_sc (CORBA::Boolean send); protected: - ~FT_ClientRequest_Interceptor (void); private: - void group_version_context (PortableInterceptor::ClientRequestInfo_ptr ri, IOP::TaggedComponent* tp); @@ -105,7 +102,6 @@ namespace TAO TimeBase::TimeT request_expiration_time (CORBA::Policy *policy); private: - /// Name of the interceptor const char *name_; 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_Endpoint_Selector_Factory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h index c940fcd66a2..0aac7c2ead0 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h @@ -41,7 +41,6 @@ class TAO_FT_ClientORB_Export TAO_FT_Endpoint_Selector_Factory : public TAO_Endpoint_Selector_Factory { public: - /// Constructor. TAO_FT_Endpoint_Selector_Factory (void); @@ -53,7 +52,6 @@ public: virtual TAO_Invocation_Endpoint_Selector *get_selector (); private: - /// The possible endpoint selector strategies that can be /// returned by this factory TAO_FT_Invocation_Endpoint_Selector *ft_endpoint_selector_; diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp index fd5333e870b..2875d17ab83 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp @@ -64,7 +64,6 @@ TAO_FT_IOGR_Property::set_property ( // Success return 1; - } @@ -83,7 +82,6 @@ CORBA::Object_ptr TAO_FT_IOGR_Property::get_primary ( CORBA::Object_ptr ior) { - TAO_Profile *pfile = this->get_primary_profile (ior); @@ -139,7 +137,6 @@ TAO_FT_IOGR_Property::get_primary ( stub = safe_stub.release (); return new_obj._retn (); - } @@ -275,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 (); } @@ -339,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_IOGR_Property.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h index 2030c2ce1e5..af7b62b651b 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h @@ -53,7 +53,6 @@ class TAO_FT_ORB_Utils_Export TAO_FT_IOGR_Property public virtual ::CORBA::LocalObject { public: - /// Our Constructor TAO_FT_IOGR_Property (FT::TagFTGroupTaggedComponent &ft_group); @@ -92,7 +91,6 @@ public: FT::TagFTGroupTaggedComponent &ft_group) const; private: - /// An helper function that gets the primary profile from the <ior> TAO_Profile *get_primary_profile (CORBA::Object_ptr ior); diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h index 13abc9d8c9c..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); @@ -77,8 +76,6 @@ protected: /// Helper method that checks whether the profile is a primary or /// not. bool check_profile_for_primary (TAO_Profile *); - - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h index d01446d25ab..47b9b4adb03 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h @@ -37,13 +37,11 @@ class TAO_FT_ORBInitializer , public virtual ::CORBA::LocalObject { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: - /// Register FTCORBA policy factories. void register_policy_factories ( PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h index e6e78f463cf..fa88107faef 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.h @@ -29,19 +29,16 @@ class TAO_FT_ServerORBInitializer , public virtual ::CORBA::LocalObject { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: - /// Register FTCORBA policy factories. void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info); /// Register the necessary interceptors. void register_server_request_interceptors (PortableInterceptor::ORBInitInfo_ptr info); - }; TAO_END_VERSIONED_NAMESPACE_DECL 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_ServerPolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h index 8955540c4d3..f11eb4fc675 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h @@ -39,7 +39,6 @@ class TAO_FT_ServerPolicyFactory , public ::CORBA::LocalObject { public: - virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any &value); }; diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp index 195f5c2bdce..813e82221fa 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp @@ -10,7 +10,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Boolean diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h index 8c6351a7475..a63ae4c0db0 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h @@ -33,7 +33,6 @@ class TAO_FT_Heart_Beat_Enabled_Policy , public ::CORBA::LocalObject { public: - /// Constructor. TAO_FT_Heart_Beat_Enabled_Policy (const CORBA::Boolean boolean); @@ -59,7 +58,6 @@ public: virtual void destroy (); private: - /// indicates whether heartbeating is enabled or not. CORBA::Boolean heartbeat_enabled_value_; }; diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h index 9b9b73dcc7b..6a2392367b5 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h @@ -50,7 +50,6 @@ namespace TAO , public virtual ::CORBA::LocalObject { public: - /// Constructor. FT_ServerRequest_Interceptor (void); @@ -87,14 +86,12 @@ namespace TAO PortableInterceptor::ServerRequestInfo_ptr ri); //@} private: - void check_iogr_version (const IOP::ServiceContext &svc); void update_iogr ( PortableInterceptor::ServerRequestInfo_ptr ri); private: - CORBA::ULong object_group_ref_version_; CORBA::Boolean is_primary_; @@ -103,7 +100,6 @@ namespace TAO CORBA::ORB_var orb_; }; - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h index b6b3ed984b7..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); @@ -47,7 +46,6 @@ public: /// Used to force the initialization. static int Initializer (void); - }; static int diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp index 2e87871cfb0..9133eee20a7 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp @@ -82,7 +82,6 @@ TAO_FT_Service_Callbacks::object_is_nil (CORBA::Object_ptr obj) // If it reaches here then it should be nill return true; - } TAO_Service_Callbacks::Profile_Equivalence diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h index 12ab8f07bca..a37d8e152c4 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h @@ -86,12 +86,10 @@ public: static TimeBase::TimeT now (void); private: - /// Check whether the right flags are available so that we can issue a /// restart. CORBA::Boolean restart_policy_check (IOP::ServiceContextList &service_list, const TAO_Profile *profile); - }; TAO_END_VERSIONED_NAMESPACE_DECL 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/ConnectionHandler_T.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h index cf3b2612c9f..b2efff697c7 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h @@ -29,7 +29,6 @@ public: virtual void destroy (void); virtual int close (u_long flags = 0); protected: - virtual int handle_input (ACE_HANDLE); virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp index a0d88dd93f7..a86235cd2a5 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp @@ -198,7 +198,6 @@ TAO_FTEC_Event_Channel::remove_observer (RtecEventChannelAdmin::Observer_Handle) } - CORBA::Boolean TAO_FTEC_Event_Channel::start ( FTRT::FaultListener_ptr listener, @@ -271,7 +270,6 @@ TAO_FTEC_Event_Channel::connect_push_supplier ( ) { return ec_impl_->connect_push_supplier(push_supplier, qos); - } void diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h index 11214925e1c..871789e47b7 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h @@ -26,8 +26,6 @@ class TAO_FTRTEC_Export TAO_FTEC_Event_Channel : public POA_FtRtecEventChannelAdmin::EventChannel { public: - - TAO_FTEC_Event_Channel(CORBA::ORB_var orb, PortableServer::POA_var poa); 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 1a346c32385..b36fce844bf 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp @@ -187,7 +187,6 @@ TAO_FTEC_Event_Channel_Impl::TAO_FTEC_Event_Channel_Impl( CORBA::Object::_duplicate (attributes.scheduler); this->create_strategies (); - } TAO_FTEC_Event_Channel_Impl::~TAO_FTEC_Event_Channel_Impl() @@ -210,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(); @@ -221,7 +219,6 @@ TAO_FTEC_Event_Channel_Impl::activate_object ( } - // = The RtecEventChannelAdmin::EventChannel methods... /// The default implementation is: /// this->consumer_admin ()->_this (); @@ -414,7 +411,6 @@ void TAO_FTEC_Event_Channel_Impl::set_update (const FTRT::State & s) } (update_table[op->param._d()])(this, *op); - } } 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/FT_ProxyAdmin_Base.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h index 6b2201c1c7d..ee21cd18f36 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h @@ -36,7 +36,6 @@ public: CORBA::Object_var reference() const; protected: - PortableServer::ServantBase* servant_; /// Store the default POA. PortableServer::POA_var poa_; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h index a7e4893d49e..533295d0a34 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h @@ -42,7 +42,6 @@ private: virtual int parse_conf(int argc, ACE_TCHAR** argv); protected: - class ReactorTask : public ACE_Task_Base { public: diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp index 7a7ea02de09..376a16b4004 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp @@ -122,7 +122,6 @@ FT::ObjectGroupRefVersion get_ft_group_version(IOP::ServiceContext_var service_c } - void ForwardCtrlServerInterceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) { IOP::ServiceContext_var service_context; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp index aa5763720eb..9cb1ef8e12c 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp @@ -33,7 +33,6 @@ CachedRequestTable::update(const ACE_CString& client_id, } - CORBA::Any CachedRequestTable::get_result(const ACE_CString& client_id) { @@ -97,7 +96,6 @@ retrieve_ft_request_context( if ((cdr >> ft_request_service_context) == 0) throw CORBA::BAD_PARAM (); - } FTRT::TransactionDepth @@ -227,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/GroupInfoPublisher.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp index 4e757109620..b9355cbcd72 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp @@ -15,7 +15,6 @@ GroupInfoPublisherBase::GroupInfoPublisherBase() } - void GroupInfoPublisherBase::subscribe(TAO_FTEC_Become_Primary_Listener* listener) { @@ -46,7 +45,6 @@ GroupInfoPublisherBase::successor() const } - const GroupInfoPublisherBase::BackupList& GroupInfoPublisherBase::backups() const { @@ -54,7 +52,6 @@ GroupInfoPublisherBase::backups() const } - GroupInfoPublisherBase::Info* GroupInfoPublisherBase::setup_info(const FTRT::ManagerInfoList & info_list, int my_position, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp index f3cc27ee85e..cda7e49566e 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. @@ -234,7 +233,6 @@ IOGR_Maker::set_tag_components( iorm_->set_property (&prop, merged); - } TAO_END_VERSIONED_NAMESPACE_DECL 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/EventChannel/Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h index eb3548f0770..ca15f2614cf 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h @@ -63,7 +63,6 @@ public: virtual int acquire_read (void)=0; virtual int acquire_write (void)=0; virtual int release (void)=0; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp index f146aa999f0..6308a9fb6ed 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp @@ -104,7 +104,6 @@ Request_Context_Repository::get_object_id( CORBA::Any_var a = ri->get_slot(object_id_slot); return ::get_object_id(a); - } void @@ -235,7 +234,6 @@ Request_Context_Repository::get_transaction_depth( FTRT::TransactionDepth result=0; a >>= result; return result; - } FTRT::TransactionDepth @@ -249,7 +247,6 @@ Request_Context_Repository::get_transaction_depth() FTRT::TransactionDepth result=0; a >>= result; return result; - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h index 9bd5e7faa23..f271278148e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h @@ -45,7 +45,6 @@ namespace PortableInterceptor class Request_Context_Repository { public: - void init(CORBA::ORB_ptr orb); /** diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp index c62bf2a1164..6321701e459 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp @@ -31,7 +31,6 @@ FTRT::AMI_UpdateableHandler_ptr UpdateableHandler::activate( } - void UpdateableHandler::dispatch(UpdateableHandler::Handler handler) { PortableServer::Current_var current = 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.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp index 56e8a2fb68c..92fd6806139 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp @@ -456,7 +456,6 @@ TAO::HTIOP::Acceptor::open_default (TAO_ORB_Core *orb_core, ACE_Auto_Array_Ptr<ACE_TCHAR> guard (htid); this->addrs_[0] = ACE_TEXT_ALWAYS_CHAR (htid); return 0; - } // Check for multiple network interfaces. diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h index 8065b6d832a..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 /** @@ -131,7 +130,6 @@ namespace TAO char *&host); protected: - /** * Implement the common part of the open*() methods. This method is * virtual to allow a derived class implementation to be invoked @@ -172,7 +170,6 @@ namespace TAO protected: - /// Array of ACE::HTBP::Addr instances, each one corresponding to a /// given network interface. ACE::HTBP::Addr *addrs_; @@ -206,7 +203,6 @@ namespace TAO TAO_ORB_Core *orb_core_; private: - /// the concrete acceptor, as a pointer to it's base class. BASE_ACCEPTOR base_acceptor_; diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h index d1a51e63f52..d9bda41fe65 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h @@ -102,7 +102,6 @@ namespace TAO /// Pointer to the ORB Core. TAO_ORB_Core *orb_core_; }; - } } 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 e887ac94801..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 * @@ -47,9 +46,7 @@ namespace TAO class HTIOP_Export Connection_Handler : public SVC_HANDLER, public TAO_Connection_Handler { - public: - Connection_Handler (ACE_Thread_Manager* t = 0); /// Constructor. diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp index abe63a47620..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 @@ -311,7 +310,6 @@ TAO::HTIOP::Connector::cancel_svc_handler ( return 0; return -1; - } diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h index 1e9bfc1fcb7..456347e10e1 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h @@ -91,7 +91,6 @@ namespace TAO /// @} protected: - // = The TAO_Connector methods, please check the documentation on // Transport_Connector.h int set_validate_endpoint (TAO_Endpoint *ep); @@ -111,7 +110,6 @@ namespace TAO virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler); private: - /// Return the remote endpoint, a helper function Endpoint *remote_endpoint (TAO_Endpoint *ep); 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 507990b5ffd..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; /** @@ -45,7 +44,6 @@ namespace TAO class HTIOP_Export Endpoint : public TAO_Endpoint { public: - friend class Profile; friend class TAO_SSLIOP_Profile; @@ -121,7 +119,6 @@ namespace TAO // Access to our <hint_>. private: - /// Helper method for setting INET_Addr. int set (const ACE::HTBP::Addr &addr, int use_dotted_decimal_addresses); 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 624829ef98d..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 @@ -316,7 +315,6 @@ TAO::HTIOP::Profile::to_string () const } - const char * TAO::HTIOP::Profile::prefix () { diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h index 86f83a5222e..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 @@ -112,7 +111,6 @@ namespace TAO virtual CORBA::ULong hash (CORBA::ULong max); protected: - /// Template methods. Please see Profile.h for the documentation. virtual int decode_profile (TAO_InputCDR &cdr); virtual int decode_endpoints (void); @@ -121,7 +119,6 @@ namespace TAO virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile); protected: - /** * Head of this profile's list of endpoints. This endpoint is not * dynamically allocated because a profile always contains at least 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 90944576a3a..887a15d272b 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h @@ -59,7 +59,6 @@ namespace TAO class HTIOP_Export Transport : public TAO_Transport { public: - /// Constructor. Transport (Connection_Handler *handler, TAO_ORB_Core *orb_core); @@ -68,14 +67,12 @@ namespace TAO ~Transport (void); protected: - /** @name Overridden Template Methods * * Please check the documentation in "tao/Transport.h" for more * details. */ //@{ - virtual ACE_Event_Handler * event_handler_i (void); virtual TAO_Connection_Handler * invalidate_event_handler_i (void); @@ -113,7 +110,6 @@ namespace TAO //@} private: - /// Set the Bidirectional context info in the service context list void set_bidir_context_info (TAO_Operation_Details &opdetails); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h index f7b5e715e7a..d7149023ae1 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h @@ -158,4 +158,3 @@ TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_COMPONENTDEF_I_H */ - diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h index c07c5684322..fe780666b2f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h @@ -75,7 +75,6 @@ public: virtual PortableServer::POA_ptr select_poa (CORBA::DefinitionKind def_kind) const; protected: - #ifdef CONCRETE_IR_OBJECT_TYPES #undef CONCRETE_IR_OBJECT_TYPES #endif diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h index de362c0991a..5ecd8df21b4 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h @@ -30,7 +30,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_IFRService_Export TAO_IFR_Service_Loader : public TAO_Object_Loader { public: - // Constructor TAO_IFR_Service_Loader (void); @@ -51,17 +50,14 @@ public: int argc, ACE_TCHAR *argv[]); - protected: TAO_IFR_Server ifr_server_; // Instance of the TAO_IFR_Server private: - // Disallowing copying/assignment. TAO_IFR_Service_Loader (const TAO_IFR_Service_Loader &); TAO_IFR_Service_Loader & operator= (const TAO_IFR_Service_Loader &); - }; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h index b43dd6ac43a..3f1c8b891e3 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h @@ -62,7 +62,6 @@ public: ~TAO_IFR_Server (void); protected: - /// Two persistent POAs, one using a servant locator. int create_poa (void); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp index 074abf69614..d194744b79a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp @@ -595,7 +595,6 @@ TAO_Repository_i::create_sections () this->config_->set_integer_value (key, "pkind", i); - } } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h index f9b5317e35a..54be900c98c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h @@ -306,7 +306,6 @@ private: /// Return the number of entries in the CORBA::PrimitiveKind enum. u_int num_pkinds () const; - }; TAO_END_VERSIONED_NAMESPACE_DECL 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 144f7c2c62c..bf350e62991 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h @@ -41,7 +41,6 @@ class TAO_LoadBalancing_Export TAO_LB_CPU_Load_Average_Monitor : public virtual POA_CosLoadBalancing::LoadMonitor { public: - /// Constructor /** * If no location is supplied the hostname or IP address is used by @@ -56,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. @@ -75,7 +73,6 @@ public: //@} protected: - /// Destructor /** * Protected destructor to enforce proper memory management through @@ -84,10 +81,8 @@ protected: ~TAO_LB_CPU_Load_Average_Monitor (void); private: - /// The name of the location at which this LoadMonitor resides. CosLoadBalancing::Location location_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h index 3b747934960..e0c97f22a96 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h @@ -38,7 +38,6 @@ class TAO_LoadBalancing_Export TAO_LB_CPU_Utilization_Monitor : public virtual POA_CosLoadBalancing::LoadMonitor { public: - /// Constructor /** * If no location is supplied the hostname or IP address is used by @@ -53,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. @@ -72,7 +70,6 @@ public: //@} protected: - /// Destructor /** * Protected destructor to enforce proper memory management through @@ -81,10 +78,8 @@ protected: ~TAO_LB_CPU_Utilization_Monitor (void); private: - /// The name of the location at which this LoadMonitor resides. CosLoadBalancing::Location location_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h index 1c26fd1104d..1a3ad48e1ed 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h @@ -55,7 +55,6 @@ class TAO_LB_ClientRequestInterceptor public virtual ::CORBA::LocalObject { public: - /** * @name Methods Required by the Client Request Interceptor * Interface @@ -85,7 +84,6 @@ public: virtual void receive_other ( PortableInterceptor::ClientRequestInfo_ptr ri); //@} - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h index 1212d11d11d..e1f9c2874fb 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h @@ -40,7 +40,6 @@ class TAO_LoadBalancing_Export TAO_LB_Component : public ACE_Service_Object { public: - /// Initializes object when dynamic linking occurs. virtual int init (int argc, ACE_TCHAR *argv[]); @@ -48,12 +47,10 @@ public: virtual int fini (); protected: - /// Register the LB_Component's ORBInitializer. int register_orb_initializer (const CORBA::StringSeq & object_groups, const CORBA::StringSeq & repository_ids, const char * location); - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp index 91e605558eb..6efd82a4aa6 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp @@ -417,7 +417,6 @@ TAO_LB_LeastLoaded::get_location ( // ORBSVCS_DEBUG ((LM_DEBUG, "^^^^^ PREVIOUS LOCATION\n")); // else // ORBSVCS_DEBUG ((LM_DEBUG, "^^^^^ CURRENT LOCATION\n")); - } else { diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h index 9dd963d8549..a1c56aaee6e 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h @@ -138,7 +138,6 @@ protected: CORBA::Float & value); private: - /// This servant's default POA. PortableServer::POA_var poa_; @@ -158,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 @@ -190,7 +188,6 @@ private: CORBA::Float per_balance_load_; //@} - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h index b95446f33db..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); @@ -52,7 +51,6 @@ public: CORBA::Boolean alerted () const; // protected: - /// Destructor. /** * Protected destructor to enforce correct memory management via diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp index 65b656bdee4..de0490e2bac 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp @@ -305,7 +305,6 @@ TAO_LB_LoadAverage::analyze_loads ( */ load_manager->enable_alert (loc); - } } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h index a714607aeda..1013d609f8d 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h @@ -57,7 +57,6 @@ class TAO_LB_LoadAverage : public virtual POA_CosLoadBalancing::Strategy { public: - /// Constructor. TAO_LB_LoadAverage (PortableServer::POA_ptr poa); @@ -96,7 +95,6 @@ public: void init (const PortableGroup::Properties & props); protected: - /// Destructor. ~TAO_LB_LoadAverage (void); @@ -117,7 +115,6 @@ protected: CORBA::Float & value); private: - /// This servant's default POA. PortableServer::POA_var poa_; @@ -137,7 +134,6 @@ private: * Cached LoadAverage load balancing strategy property values. */ //@{ - /// CORBA::Float tolerance_; @@ -150,7 +146,6 @@ private: //@} CosLoadBalancing::LoadList current_loads_; - }; TAO_END_VERSIONED_NAMESPACE_DECL 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 c49ca438234..fd862cb98c7 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h @@ -42,7 +42,6 @@ class TAO_LoadBalancing_Export TAO_LB_LoadManager public ACE_Task_Base { public: - /// Constructor. TAO_LB_LoadManager (int ping_timeout, int ping_interval); @@ -55,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); @@ -108,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); @@ -168,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 ( @@ -228,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 @@ -263,7 +258,6 @@ public: CORBA::Object_ptr next_member (const PortableServer::ObjectId & oid); public: - /// Initialize the load balancer. This will cause a child POA to be /// created with the appropriate policies to support ServantLocators /// (i.e. for the MemberLocator). @@ -272,7 +266,6 @@ public: PortableServer::POA_ptr root_poa); protected: - /// Destructor. /** * Destructor is protected to enforce correct memory management @@ -281,7 +274,6 @@ protected: ~TAO_LB_LoadManager (void); private: - /// Extract the value of the InitialNumberReplicas property from /// the_criteria. int get_initial_number_replicas ( @@ -315,7 +307,6 @@ private: const CosLoadBalancing::StrategyInfo * info); private: - CORBA::ORB_var orb_; /// Reactor used when pulling loads from registered load monitors. diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp index 3f09e937742..da1c32d6dbb 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)) { /* @@ -469,7 +467,6 @@ TAO_LB_LoadMinimum::get_location ( // ORBSVCS_DEBUG ((LM_DEBUG, "^^^^^ PREVIOUS LOCATION\n")); // else // ORBSVCS_DEBUG ((LM_DEBUG, "^^^^^ CURRENT LOCATION\n")); - } else { 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 773554be4ad..fe2a5bb6bbd 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h @@ -41,7 +41,6 @@ class TAO_LB_MemberLocator public virtual ::CORBA::LocalObject { public: - /// Constructor TAO_LB_MemberLocator (TAO_LB_LoadManager * load_balancer); @@ -52,7 +51,6 @@ public: * interface. */ //@{ - /// Clients requests are forwarded via the /// PortableServer::ForwardRequest exception thrown in this method. virtual PortableServer::Servant preinvoke ( @@ -72,10 +70,8 @@ public: //@} private: - /// The load balancer/manager implementation. TAO_LB_LoadManager * load_manager_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h index d99c2b30926..2d1e544e496 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h @@ -53,7 +53,6 @@ class TAO_LB_ORBInitializer public virtual ::CORBA::LocalObject { public: - /// Constructor. TAO_LB_ORBInitializer (const CORBA::StringSeq & object_groups, const CORBA::StringSeq & repository_ids, @@ -72,7 +71,6 @@ public: //@} private: - /// List of stringified object group references. const CORBA::StringSeq object_groups_; @@ -90,7 +88,6 @@ private: * used out of convencience. */ TAO_LB_LoadAlert load_alert_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp index 31b974fd655..4446ff28eb2 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp @@ -132,7 +132,6 @@ TAO_LB_ObjectReferenceFactory::make_object ( "TAO_LB_ObjectReferenceFactory::""make_object"); throw CORBA::BAD_INV_ORDER (); - } catch (const PortableGroup::ObjectNotAdded& ex) { diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h index 5bcb61e1235..fe9337e0c91 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.h @@ -41,7 +41,6 @@ class TAO_LB_LoadManager; class TAO_LB_Pull_Handler : public ACE_Event_Handler { public: - /// Constructor TAO_LB_Pull_Handler (void); @@ -54,14 +53,12 @@ public: TAO_LB_LoadManager * load_manager); private: - /// The table that contains all load monitors registered with the /// load balancer. TAO_LB_MonitorMap * monitor_map_; /// Pointer to the LoadManager servant. TAO_LB_LoadManager * load_manager_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h index 3ed1d705db3..6cb33d83633 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h @@ -35,7 +35,6 @@ class TAO_LB_Random : public virtual POA_CosLoadBalancing::Strategy { public: - /// Constructor. /** * Seeds the OS' random number generator. @@ -88,10 +87,8 @@ public: static void init (void); private: - /// This servant's default POA. PortableServer::POA_var poa_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h index cc3b966efb5..0e4996392a0 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h @@ -40,7 +40,6 @@ class TAO_LB_RoundRobin : public virtual POA_CosLoadBalancing::Strategy { public: - /// Constructor. TAO_LB_RoundRobin (PortableServer::POA_ptr poa); @@ -76,12 +75,10 @@ public: ); protected: - /// Destructor ~TAO_LB_RoundRobin (void); private: - /// Keep a copy of location list for verify if the list is changed /// in next next_member() call. void copy_locations (PortableGroup::Locations_var& locations); @@ -107,7 +104,6 @@ private: /// Locations list retrieved in last next_member() call. ACE_Vector <PortableGroup::Location> last_locations_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h index e6efc1c2dfa..66ce21238ba 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h @@ -46,7 +46,6 @@ class TAO_Log_Serv_Export TAO_BasicLogFactory_i : public TAO_LogMgr_i { public: - //= Initialization and termination code. /// Constructor. diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp index b0b30c1bf4b..7db2db3649d 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp @@ -34,7 +34,6 @@ TAO_BasicLog_i::copy (DsLogAdmin::LogId &id) this->copy_attributes (log.in ()); return log._retn (); - } DsLogAdmin::Log_ptr @@ -50,7 +49,6 @@ TAO_BasicLog_i::copy_with_id (DsLogAdmin::LogId id) this->copy_attributes (log.in ()); return log._retn (); - } void diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h index 9c523b70323..46be5ab995a 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h @@ -50,7 +50,6 @@ class TAO_Log_Serv_Export TAO_BasicLog_i : public POA_DsLogAdmin::BasicLog { public: - /// Constructor. TAO_BasicLog_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, @@ -68,7 +67,6 @@ public: void destroy (void); protected: - /// Destructor. /** * Protected destructor to enforce proper memory management through @@ -77,7 +75,6 @@ protected: ~TAO_BasicLog_i (void); private: - /// POA. PortableServer::POA_var poa_; }; diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h index abceed0cea7..885363c084a 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h @@ -50,7 +50,6 @@ class TAO_EventLog_Serv_Export TAO_EventLogFactory_i : { public: - //= Initialization and termination code. /// Constructor. diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp index 6ede219f2e6..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()); @@ -48,7 +47,6 @@ TAO_EventLog_i::copy (DsLogAdmin::LogId &id) this->copy_attributes (log.in ()); return log._retn (); - } DsLogAdmin::Log_ptr @@ -64,7 +62,6 @@ TAO_EventLog_i::copy_with_id (DsLogAdmin::LogId id) this->copy_attributes (log.in ()); return log._retn (); - } diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h index cd0a25b6d27..0c759a05278 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h @@ -87,7 +87,6 @@ public: for_suppliers (void); protected: - /// Destructor /** * Protected destructor to enforce proper memory management through @@ -96,7 +95,6 @@ protected: ~TAO_EventLog_i (); private: - /// The Event Channel that the log uses. TAO_CEC_EventChannel *event_channel_; diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp index 93c5607b08d..dde3268fe83 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp @@ -627,7 +627,6 @@ TAO_Hash_LogRecordStore::set_capacity_alarm_thresholds (const DsLogAdmin::Capaci } - DsLogAdmin::ForwardingState TAO_Hash_LogRecordStore::get_forwarding_state () const { 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 a1d439676bb..819a27257f6 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h @@ -37,9 +37,7 @@ 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_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h index b1a15532092..6057d5822b9 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h @@ -47,7 +47,6 @@ class TAO_Log_Serv_Export TAO_Log_Constraint_Visitor : public ETCL_Constraint_Visitor { public: - /// Constructor. TAO_Log_Constraint_Visitor (const DsLogAdmin::LogRecord &rec); diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.h b/TAO/orbsvcs/orbsvcs/Log/Log_i.h index 2acd7118833..5ae33dc3a19 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.h @@ -46,9 +46,7 @@ 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, TAO_LogMgr_i& logmgr_i, diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp index 9d46942ca69..ef709e6d6c9 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp @@ -34,7 +34,6 @@ TAO_Notify_LogConsumer::connect ( ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ())); proxy_supplier_->connect_any_push_consumer (objref.in ()); - } void diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp index 2b444c1a68b..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; @@ -256,7 +255,6 @@ TAO_NotifyLogFactory_i::obtain_push_supplier ( } - CosEventChannelAdmin::ProxyPullSupplier_ptr TAO_NotifyLogFactory_i::obtain_pull_supplier ( ) 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/RTEventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp index a20179e0a89..f6ae27f78d8 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp @@ -48,7 +48,6 @@ TAO_Rtec_LogConsumer::push (const RtecEventComm::EventSet& events) this->log_->write_recordlist (recList); - } void 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..8d86516f2a9 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); } @@ -464,7 +461,6 @@ TAO_FT_Naming_Manager::add_member ( } result = group->reference (); - } else { @@ -567,7 +563,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 +656,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 +737,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..91496594ddd 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; @@ -322,7 +321,6 @@ TAO_FT_Naming_Server::init_naming_manager_with_orb (int, ACE_TCHAR *[], CORBA::O this->naming_manager_.initialize (this->orb_.in (), this->naming_manager_poa_.in ()); - } catch (const CORBA::Exception& ex) { @@ -412,7 +410,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 +928,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_Persistent_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h index 8a6251771c0..4d793870ecb 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h @@ -60,7 +60,6 @@ public: protected: static TAO_FT_Naming_Manager *naming_manager_impl_; - }; TAO_END_VERSIONED_NAMESPACE_DECL 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/FT_Storable_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h index cbd60eff80a..572b5251d65 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h @@ -96,11 +96,9 @@ public: virtual bool is_obsolete (time_t stored_time); protected: - static TAO_FT_Naming_Manager *naming_manager_; bool stale_; TAO_FT_Naming_Replication_Manager *replicator_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp index 3bd9059c4ca..800b09cbb2f 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)); @@ -254,7 +250,6 @@ NS_group_svc::group_bind (const ACE_TCHAR* group_name, CosNaming::Name_var name = this->name_service_->to_name ( str.in() ); this->name_service_->rebind (name.in(), group_var.in()); - } catch (const CosNaming::NamingContextExt::InvalidName& ) { @@ -370,7 +365,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 +384,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 +428,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]); @@ -621,7 +613,6 @@ NS_group_svc::member_add (const ACE_TCHAR* group_name, group_var = this->naming_manager_->add_member (group_var.in(), location_name, ior_var.in()); - } catch (const PortableGroup::ObjectGroupNotFound&) { @@ -841,7 +832,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 100612561c0..ca66d6f9fd6 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h @@ -48,9 +48,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL */ class TAO_Naming_Serv_Export TAO_Bindings_Map { - public: - /// Destructor. virtual ~TAO_Bindings_Map (void); @@ -94,7 +92,6 @@ public: const char * kind, CORBA::Object_ptr & obj, CosNaming::BindingType &type) = 0; - }; /** 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_Context_Interface.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h index 3a89382918a..b4a98572a2a 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h @@ -226,7 +226,6 @@ private: const char *sn); protected: - /// A concrete implementor of the NamingContext functions. TAO_Naming_Context_Impl *impl_; }; @@ -242,9 +241,7 @@ protected: */ class TAO_Naming_Serv_Export TAO_Naming_Context_Impl { - public: - /// Destructor. virtual ~TAO_Naming_Context_Impl (void); 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 d6017c77eea..c6634e80d49 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 = @@ -608,7 +607,6 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, TAO_ROOT_NAMING_CONTEXT, context_size); this->assign (size_t(ROOT), false, new_context.in()); - } #if !defined (CORBA_E_MICRO) @@ -787,7 +785,6 @@ TAO_Naming_Server::fini () { if (!CORBA::is_nil (this->ns_poa_.in ())) this->ns_poa_->destroy (1, 1); - } catch (const CORBA::Exception&) { @@ -908,7 +905,6 @@ TAO_Naming_Server::bundle_at(size_t ndx) const } - int TAO_Naming_Server::write(size_t ndx) const { diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp index 896f31bc96f..d042436d088 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, @@ -222,7 +221,6 @@ TAO_Persistent_Context_Index::recreate_all () // If this is the root Naming Context, take a note of it. if (context_impl->root ()) this->root_context_= result._retn (); - } while (index_iter->advance ()); return 0; 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.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h index 62735014be3..420fd723648 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h @@ -107,7 +107,6 @@ public: const char * id (void); const char * kind (void); - }; @@ -188,7 +187,6 @@ public: CosNaming::BindingType &type); private: - /// Helper: factors common code from <bind> and <rebind>. int shared_bind (const char *id, const char *kind, @@ -200,7 +198,6 @@ private: HASH_MAP map_; CORBA::ORB_var orb_; - }; /** @@ -348,7 +345,6 @@ public: virtual void destroy (void); protected: - /** * A helper function to ensure the current object was not destroyed by raising * an exception if it was. Uses the lock as a Reader. @@ -433,7 +429,6 @@ class TAO_Naming_Serv_Export File_Open_Lock_and_Check : public TAO::Storable_File_Guard { public: - /// Constructor File_Open_Lock_and_Check (TAO_Storable_Naming_Context * context, Method_Type method_type, @@ -442,7 +437,6 @@ public: ~File_Open_Lock_and_Check (); protected: - /// Check if the guarded object is current with the last /// update which could have been performed independently of /// the owner of this object. @@ -470,7 +464,6 @@ private: File_Open_Lock_and_Check(void); TAO_Storable_Naming_Context * context_; - }; // end of embedded class File_Open_Lock_and_Check friend class File_Open_Lock_and_Check; 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/Naming/Storable_Naming_Context_ReaderWriter.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.cpp index 05a80e20651..ec3195f1a1f 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.cpp @@ -274,7 +274,6 @@ TAO_Storable_Naming_Context_ReaderWriter::read_global (TAO_NS_Persistence_Global } global.counter(counter); - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.h index b2f20ec58af..5bd4a7ebc8a 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.h @@ -36,7 +36,6 @@ class TAO_NS_Persistence_Global; class TAO_Storable_Naming_Context_ReaderWriter { public: - TAO_Storable_Naming_Context_ReaderWriter (TAO::Storable_Base & stream); int read (TAO_Storable_Naming_Context & context); @@ -47,7 +46,6 @@ public: void read_global (TAO_NS_Persistence_Global & global); private: - void write_header (const TAO_NS_Persistence_Header & header); void read_header (TAO_NS_Persistence_Header & header); diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp index 0836bd43139..4f725cbb11e 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp @@ -12,7 +12,6 @@ #include "ace/OS_NS_stdio.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL int diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h index b3f7fa3db5b..585b4a3f9fd 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h @@ -100,7 +100,6 @@ public: CosNaming::BindingType &type); private: - /// Helper: factors common code from <bind> and <rebind>. int shared_bind (const char *id, const char *kind, @@ -172,7 +171,6 @@ public: CosNaming::BindingIterator_out &bi); protected: - /// Counter used for generation of POA ids for children Naming /// Contexts. ACE_UINT32 counter_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp index 0ad5f026dc3..d369a3af82e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp @@ -62,7 +62,6 @@ TAO_Notify_Admin::init (TAO_Notify::Topology_Parent* parent) this->proxy_container_.reset (proxy_container); this->proxy_container().init (); - } void @@ -223,5 +222,4 @@ TAO_Notify_Admin::validate () } - TAO_END_VERSIONED_NAMESPACE_DECL 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/AnyEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h index a0877cc5bee..c3cdf00cbbc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h @@ -77,7 +77,6 @@ protected: virtual TAO_Notify_Event * copy () const; protected: - // This must be a pointer rather than a reference, because the derived // class needs to redirect it to a new copy const CORBA::Any* event_; 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/Any/ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp index a20b22359f3..2ac03308b09 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp @@ -110,5 +110,4 @@ TAO_Notify_ProxyPushSupplier::configure( } - TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h index 6af79236b79..9db5444ab0a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h @@ -55,7 +55,6 @@ public: TAO_Notify_Consumer* old_consumer); protected: - virtual CORBA::Object_ptr get_consumer (void); /// The Consumer diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h index ccb3d90c259..419477ac468 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h @@ -43,7 +43,6 @@ public: virtual ACE_CString get_ior () const; protected: - virtual CORBA::Object_ptr get_supplier (void); /// The Supplier 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 2408b2e918f..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. @@ -43,7 +42,6 @@ class TAO_Notify_Serv_Export Bit_Vector BPW_LOG_2 = 5 }; public: - /// The constructor. Bit_Vector(); /// The destructor. @@ -70,7 +68,6 @@ private: size_t first_set_bit_; size_t first_cleared_bit_; }; - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp index 8721836d7e6..d92430161ad 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp @@ -361,5 +361,4 @@ TAO_Notify_Buffering_Strategy::discard (TAO_Notify_Method_Request_Queueable* met } - TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h index e3c51285da5..3389f7ca2b3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h @@ -85,7 +85,6 @@ public: void set_tracker (Tracker* tracker); private: - /// Apply the Order Policy and queue. return -1 on error. int queue (TAO_Notify_Method_Request_Queueable* method_request); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp index 4ba1ea9207d..f7071a9edf3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp @@ -90,7 +90,6 @@ public: return proxy; } - }; // define the ProxyConsumer Builders. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h index 3df0b425864..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 { @@ -52,7 +51,6 @@ public: }; public: - typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Consumer > Ptr; /// Constructor @@ -123,7 +121,6 @@ typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Consumer > Ptr; size_t pending_count (void); protected: - /// This method is called by the is_alive() method. It should provide /// the connected consumer or nil if there is none. virtual CORBA::Object_ptr get_consumer (void) = 0; diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp index 56b93b5206f..881d397d4ca 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp @@ -43,7 +43,6 @@ TAO_Notify_ConsumerAdmin::get_admin_type_name () const } - TAO_Notify_ConsumerAdmin::~TAO_Notify_ConsumerAdmin () { } diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h index dbc7ab8725b..5a3bd59b491 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h @@ -133,7 +133,6 @@ protected: virtual ::CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier (void); private: - /// Release this object. virtual void release (void); }; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h index 54b6bd38fb5..812058573c8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h @@ -31,7 +31,6 @@ class TAO_Notify_Serv_Export TAO_Notify_Container_T { typedef TAO_ESF_Proxy_Collection<TYPE> COLLECTION; public: - /// Constructor TAO_Notify_Container_T (void); diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp index f5e9f05863e..a73425037ab 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp @@ -331,7 +331,6 @@ TAO_CosNotify_Service::init_service (CORBA::ORB_ptr orb) } this->init_i2 (orb, TAO_Notify_PROPERTIES::instance()->dispatching_orb()); - } else { diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h index f1c0781b4c8..42f31efcd2c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h @@ -68,7 +68,6 @@ protected: virtual void init_i2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_orb); private: - /// Create the Factory for Notify objects. virtual TAO_Notify_Factory* create_factory (void); 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 1117bda47e9..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; @@ -120,7 +119,6 @@ private: ACE_CDR::Octet delivery_type_; IdVec destination_id_; }; - } // namespace TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp index 63a375d9120..417c6ae8d87 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp @@ -93,7 +93,6 @@ TAO_Notify_Constraint_Expr::release () } - TAO_Notify_ETCL_Filter::TAO_Notify_ETCL_Filter (PortableServer::POA_ptr poa, const char *constraint_grammar, const TAO_Notify_Object::ID& id) diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h index 9f48f5d8031..962cb6a2b84 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h @@ -35,7 +35,6 @@ class TAO_Notify_ETCL_Filter; class TAO_Notify_Constraint_Expr : public TAO_Notify::Topology_Object { public: - friend class TAO_Notify_ETCL_Filter; TAO_Notify_Constraint_Expr (void); @@ -120,7 +119,6 @@ protected: virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (void); private: - /// Release this object. virtual void release (void); diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp index a5daa3611b9..7040b2eb878 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp @@ -29,7 +29,6 @@ TAO_Notify_ETCL_FilterFactory::~TAO_Notify_ETCL_FilterFactory () } this->filters_.unbind_all (); - } CosNotifyFilter::FilterFactory_ptr @@ -320,5 +319,4 @@ TAO_Notify_ETCL_FilterFactory::find_filter_id (CosNotifyFilter::Filter_ptr filte } - ACE_FACTORY_DEFINE (TAO_Notify_Serv, TAO_Notify_ETCL_FilterFactory) diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h index 9cbe025e225..428407a1c58 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h @@ -82,7 +82,6 @@ public: protected: - CosNotifyFilter::Filter_ptr create_filter (const char *constraint_grammar, const TAO_Notify_Object::ID& id, @@ -106,7 +105,6 @@ protected: FILTERMAP filters_; TAO_SYNCH_MUTEX mtx_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp index 35445ee3fcf..4301182362c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp @@ -627,5 +627,4 @@ TAO_Notify_EventChannel::validate () } - TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h index d14af24693c..3469c666ef3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h @@ -120,7 +120,6 @@ public: virtual TAO_Notify_Object::ID get_id () const; private: - /// = Data Members /// = NotifyExt methods diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp index cb8d189001d..6dfd2180884 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp @@ -140,7 +140,6 @@ bool TAO_Notify_EventType::init(const TAO_Notify::NVPList& attrs) result = true; } return result; - } // TAO_Notify::Topology_Object diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.h b/TAO/orbsvcs/orbsvcs/Notify/EventType.h index b91b3fae433..5527fd3bf04 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventType.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.h @@ -77,7 +77,6 @@ public: virtual void save_persistent (TAO_Notify::Topology_Saver& saver); protected: - friend class TAO_Notify_Constraint_Interpreter; /// Init this object. diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h index 5ecbd009ffc..1fc01794e2b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h @@ -73,7 +73,6 @@ public: const TAO_Notify::NVPList& attrs); private: - virtual void release (void); }; 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/Event_Persistence_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h index dd2c770b435..c2207438b3f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h @@ -33,14 +33,12 @@ namespace TAO_Notify class TAO_Notify_Serv_Export Event_Persistence_Strategy: public ACE_Service_Object { public: - // get the current factory, creating it if necessary virtual Event_Persistence_Factory * get_factory () = 0; // release the current factory so a new one can be created virtual void reset () = 0; }; - } // namespace TAO_Notify TAO_END_VERSIONED_NAMESPACE_DECL 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/FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h index d6652dd1526..1050a38de69 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h @@ -32,7 +32,6 @@ class TAO_Notify_Serv_Export TAO_Notify_FilterFactory : public ACE_Service_Object, public TAO_Notify::Topology_Object { public: - /// Factory method to create a FilterFactory reference /// The Factory is activated in the default POA. The filters created are activated in the <filter_poa>. virtual CosNotifyFilter::FilterFactory_ptr create ( diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h index 5d52cc0334e..a3f251c2fdc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h @@ -55,7 +55,6 @@ public: bool should_retry (); protected: - /// The Event const TAO_Notify_Event * event_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp index 264f4ede97c..30af7a40e46 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp @@ -155,7 +155,6 @@ TAO_Notify_Method_Request_Lookup::unmarshal ( } } return result; - } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h index 60ed941594e..1acdba32f1b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h @@ -39,7 +39,6 @@ class TAO_Notify_Serv_Export TAO_Notify_Method_Request_Lookup , public TAO_Notify_Method_Request_Event { public: - /// an arbitrary code (Octet) to identify this type of request in persistent storage enum {persistence_code = 2}; @@ -66,7 +65,6 @@ protected: virtual void work (TAO_Notify_ProxySupplier* proxy_supplier); protected: - /// The Proxy TAO_Notify_ProxyConsumer* proxy_consumer_; }; diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp index 5d9275a1412..e599a5491cc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp @@ -247,7 +247,6 @@ TAO_MonitorConsumerAdmin::remove () } - TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h index 37ef14ab0b6..536b7dc6006 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h @@ -75,7 +75,6 @@ public: virtual void destroy (void); private: - virtual void remove (void); ACE_CString stat_name_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h index 894fd60a041..c5c47737ad5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h @@ -35,7 +35,6 @@ public: /// Helper function to register the default factory into the service /// configurator. static int init_svc (void); - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h index 3bfa6e95452..c25728ba2d6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h @@ -31,7 +31,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Notify_Serv_Export TAO_Notify_Default_Collection_Factory { public: - /// Helper function to register the default factory into the service /// configurator. static int init_svc (void); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.h b/TAO/orbsvcs/orbsvcs/Notify/Object.h index 8f5b994ecb4..25dd6fc3d4d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Object.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Object.h @@ -173,12 +173,10 @@ private: void destroy_poa (void); protected: - /// The mutex to serialize access to state variables. TAO_SYNCH_MUTEX lock_; private: - /// The POA in which the object is activated. TAO_Notify_POA_Helper* poa_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp index 316f93a140a..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() { } @@ -29,7 +28,6 @@ Persistent_Storage_Block::Persistent_Storage_Block(const size_t block_number, { ACE_NEW(this->data_, unsigned char[this->block_size_]); ACE_OS::memset(this->data_, 0, this->block_size_); - } Persistent_Storage_Block::Persistent_Storage_Block( diff --git a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h index d6b32f7d70c..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 @@ -197,7 +196,6 @@ private: bool thread_active_; ACE_SYNCH_CONDITION wake_up_thread_; }; - } /* namespace TAO_Notify */ TAO_END_VERSIONED_NAMESPACE_DECL 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/Proxy.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h index 9a2ab7a4e8c..35ab6008e32 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h @@ -106,7 +106,6 @@ public: virtual void validate () = 0; protected: - /// Filter Administration TAO_Notify_FilterAdmin filter_admin_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h index ca388ef578c..dfcb7abf227 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h @@ -92,7 +92,6 @@ private: /// Access our Peer. virtual TAO_Notify_Peer* peer (void); - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h index 1da12d3d681..c775c7634b3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h @@ -50,7 +50,6 @@ public: const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ); - }; TAO_END_VERSIONED_NAMESPACE_DECL 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 4eefacf39be..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. * @@ -83,7 +82,6 @@ private: size_t block_size_; mutable TAO_SYNCH_MUTEX lock_; }; - } /* namespace TAO_Notify */ TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h index 230f7432641..8872e8aa555 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h @@ -48,7 +48,6 @@ namespace TAO_Notify ACE_SYNCH_NULL_MUTEX> Reconnection_Registry_Type; public: - /// Constructor Reconnection_Registry (Topology_Parent & parent); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h index e32670b14f3..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 @@ -232,7 +231,6 @@ private: static Routing_Slip_Queue persistent_queue_; }; - } // namespace TAO_END_VERSIONED_NAMESPACE_DECL 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/Routing_Slip_Persistence_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h index c458f30d069..8354304bef2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h @@ -255,7 +255,6 @@ private: ACE_Message_Block * event_mb_; ACE_Message_Block * routing_slip_mb_; }; - } /* namespace TAO_Notify */ TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h index 754cd9c72cd..9e02aa5add3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h @@ -84,7 +84,6 @@ namespace TAO_Notify TAO_SYNCH_MUTEX internals_; size_t active_; Queue queue_; - }; } // namespace diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp index 8b394884503..8f26f9e0280 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp @@ -27,7 +27,6 @@ TAO_Notify_Seq_Worker_T<TYPE>::create (CONTAINER &container) container.collection ()->for_each (this); return this->seq_._retn (); - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h index 1d5b3a70076..fff559dd144 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h @@ -71,7 +71,6 @@ public: virtual void reconnect_from_consumer (TAO_Notify_Consumer* old_consumer); protected: - virtual CORBA::Object_ptr get_consumer (void); /// The Consumer diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h index 26bdd19cb1e..bde60ff622b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h @@ -46,7 +46,6 @@ public: virtual ACE_CString get_ior () const; protected: - virtual CORBA::Object_ptr get_supplier (void); /// The Supplier 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/Structured/StructuredProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp index 8836af68ee3..420f6bce869 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp @@ -132,5 +132,4 @@ TAO_Notify_StructuredProxyPushConsumer::configure( } - TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h index 21ac1c2cd3b..9f65de14594 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h @@ -51,7 +51,6 @@ public: virtual void configure(TAO_Notify_SupplierAdmin & admin, CosNotifyChannelAdmin::ProxyID_out proxy_id); protected: - // = interface methods virtual CosNotifyChannelAdmin::ProxyType MyType (void); @@ -70,7 +69,6 @@ protected: private: - /// Release virtual void release (void); }; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h index 2df948724bb..b2fcf7a7705 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h @@ -71,7 +71,6 @@ public: virtual void configure(TAO_Notify_ConsumerAdmin & admin, CosNotifyChannelAdmin::ProxyID_out proxy_id); private: - /// Release virtual void release (void); }; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h index 5d34c6a6043..3b372b4be1d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h @@ -61,7 +61,6 @@ public: protected: - virtual CORBA::Object_ptr get_consumer (void); /// The Consumer diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h index dceff67a466..157357ab0fd 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h @@ -43,7 +43,6 @@ public: virtual ACE_CString get_ior () const; protected: - virtual CORBA::Object_ptr get_supplier (void); /// The Supplier diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h index 880df5e42ed..a6a7fcd0db0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h @@ -49,7 +49,6 @@ public: bool is_alive (bool allow_nil_supplier); protected: - /// Dispatch updates implementation. virtual void dispatch_updates_i (const CosNotification::EventTypeSeq& added, const CosNotification::EventTypeSeq& removed); diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h index bb23585e87c..0d6514f04e6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h @@ -69,7 +69,6 @@ public: virtual void destroy (void); protected: - TAO_Notify::Topology_Object *load_proxy ( CORBA::Long id, CosNotifyChannelAdmin::ClientType ctype, diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h index def15cc2749..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; @@ -71,7 +70,6 @@ public: */ virtual void close (void); }; - } // namespace TAO_Notify TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h index de3803bc12b..dd89b16e07b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h @@ -93,7 +93,6 @@ namespace TAO_Notify /// call the reconnect() method on all of our children to give them /// the chance to do the same. virtual void reconnect (void); - }; /// \brief Base class for Persistent Topology Objects. @@ -200,7 +199,6 @@ namespace TAO_Notify /// \return false if save will never happen bool child_change (void); }; - } // namespace TAO_Notify TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h index 93707f71c00..6a8ab89d4cb 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h @@ -34,7 +34,6 @@ namespace TAO_Notify class TAO_Notify_Serv_Export Topology_Saver { public: - /// The destructor. virtual ~Topology_Saver (); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h index 62739cd5965..10094b7a653 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h @@ -43,7 +43,6 @@ class TAO_Notify_Serv_Export TAO_Notify_validate_client_Task : public ACE_Task<ACE_NULL_SYNCH> { public: - typedef TAO_Condition<TAO_SYNCH_MUTEX> CONDITION; /// Constructor. It does not assume ownership of the <event_channel> diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h index 76094b30928..b4d535c045e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h @@ -71,7 +71,6 @@ private: /// If false, then we're just checking syntax of topology file. bool live_; }; - } // namespace TAO_Notify TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h index 71ee9911ba1..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. */ @@ -72,9 +71,7 @@ private: /// A string consisting of spaces that is our current indentation level. ACE_CString indent_; - }; - } // namespace TAO_Notify TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h index a567b11a3ac..952862c35a7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h @@ -72,7 +72,6 @@ namespace TAO_Notify size_t backup_count_; bool timestamp_; }; - } // namespace TAO_Notify TAO_END_VERSIONED_NAMESPACE_DECL 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 adec27c6573..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 * @@ -99,7 +98,6 @@ namespace TAO_PG virtual void cleanup (TAO_UIPMC_Mcast_Transport::Packets_Map &packets); }; - } // namespace TAO_PG TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h index 0c03bdcdea3..151f99ebc1f 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h @@ -167,7 +167,6 @@ public: static int Initializer (void); protected: - /// Template method for creating new POA's of this type. virtual TAO_Root_POA *new_POA (const String &name, PortableServer::POAManager_ptr poa_manager, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h index fc271b1cbb5..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: @@ -34,7 +33,6 @@ namespace TAO static int Requires_MIOP_Initializer = MIOP_Loader::Initializer (); - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h index 9a221e91879..d3f0b87766b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h @@ -34,7 +34,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_PortableGroup_Export TAO_PG_Default_Property_Validator { public: - /// Constructor. TAO_PG_Default_Property_Validator (void); @@ -52,7 +51,6 @@ public: virtual void validate_criteria (const PortableGroup::Properties & criteria); private: - /** * @name Pre-initialize property Names. * @@ -66,7 +64,6 @@ private: PortableGroup::Name membership_; PortableGroup::Name factories_; //@} - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp index f5c57843388..4f46abd4cfc 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp @@ -169,7 +169,6 @@ void TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb, PortableServer::POA_ptr // and create a ior string this->ior_ = this->orb_->object_to_string (this->this_obj_.in ()); - } int TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb) @@ -505,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_FactoryRegistry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h index 042cb69528b..9b1b2dc7fb3 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h @@ -159,7 +159,6 @@ namespace TAO /////////////// // Data Members private: - /** * A human-readable string to distinguish this from other Notifiers. */ @@ -217,7 +216,6 @@ namespace TAO int linger_; RegistryType registry_; - }; } // namespace TAO diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h index 9d4edb7506a..c37ddad820b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h @@ -44,7 +44,6 @@ struct TAO_PG_Factory_Node /// FactoryCreationId assigned to the member. PortableGroup::GenericFactory::FactoryCreationId_var factory_creation_id; - }; typedef ACE_Array_Base<TAO_PG_Factory_Node> TAO_PG_Factory_Set; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp index 78225419532..2d5ed961376 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; @@ -134,7 +133,6 @@ TAO_PG_GenericFactory::create_object ( if (this->factory_map_.bind (fcid, factory_set) != 0) throw PortableGroup::ObjectNotCreated (); - } // Allocate a new FactoryCreationId for use as an "out" parameter. diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h index efa4adb6c07..1eaf3e2409c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h @@ -49,7 +49,6 @@ class TAO_PortableGroup_Export TAO_PG_GenericFactory : public virtual PortableGroup::GenericFactory { public: - /// Constructor. TAO_PG_GenericFactory (TAO_PG_ObjectGroupManager & object_group_map, TAO_PG_PropertyManager & property_manager); @@ -61,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 @@ -135,7 +133,6 @@ public: const CORBA::Boolean propagate_member_already_present); private: - /// Populate the object group being created. Called when the /// infrastructure-controlled membership style is used for the /// object group being created. @@ -176,7 +173,6 @@ private: PortableGroup::MinimumNumberMembersValue & minimum_number_members); private: - /// Reference to the POA used to create object group references. PortableServer::POA_var poa_; @@ -213,7 +209,6 @@ private: /// Lock used to synchronize access to the factory creation id /// index (i.e. next_fcid_). TAO_SYNCH_MUTEX lock_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp index 7d9d138d90e..f7eb0d328f4 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp @@ -293,7 +293,6 @@ int TAO::PG_Group_Factory::destroy_group (PortableGroup::ObjectGroup_ptr object_ } - PortableGroup::ObjectGroups * TAO::PG_Group_Factory::groups_at_location ( const PortableGroup::Location & the_location) @@ -359,7 +358,6 @@ TAO::PG_Group_Factory::set_object_group_storable_factory ( ACE_NEW_THROW_EX (this->list_store_, TAO::PG_Group_List_Store (*this->storable_factory_), CORBA::NO_MEMORY ()); - } TAO::PG_Group_Factory::Group_Map & @@ -430,7 +428,6 @@ TAO::PG_Group_Factory::get_group_map () } this->groups_read_ = true; - } } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h index 1882b79b9b8..92c6ece137b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h @@ -73,7 +73,6 @@ namespace TAO TAO_SYNCH_MUTEX> Group_Map_Iterator; public: - /// Constructor. PG_Group_Factory (); @@ -167,7 +166,6 @@ namespace TAO void set_object_group_storable_factory (TAO::Storable_Factory * factory); protected: - /** * Factory function to create a storable object object from * scratch. @@ -199,7 +197,6 @@ namespace TAO PG_Group_List_Store * list_store_; private: - CORBA::ORB_var orb_; /// Reference to the POA used to create object group references. @@ -225,7 +222,6 @@ namespace TAO // Lazily read groups from store bool groups_read_; Storable_Factory * storable_factory_; - }; } // namespace TAO diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h index d92406e9595..eaa37bdee45 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h @@ -46,7 +46,6 @@ class TAO_PG_ObjectGroupManager; class TAO_PG_Group_Guard { public: - /// Constructor. TAO_PG_Group_Guard (TAO_PG_GenericFactory & generic_factory, TAO_PG_Factory_Set & factory_set, @@ -60,7 +59,6 @@ public: void release (void); private: - /// Reference to the infrastructure TAO_PG_GenericFactory that /// created the below TAO_PG_Factory_Set. TAO_PG_GenericFactory & generic_factory_; @@ -81,7 +79,6 @@ private: /// Flag that dictates whether or not the destructor will perform /// cleanup. bool released_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h index af459a00a11..f4f4e138bfb 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h @@ -38,12 +38,10 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_PortableGroup_Export TAO_PG_Location_Equal_To { public: - /// Perform a string comparison on each of the sequence elements in /// the given locations. int operator() (const PortableGroup::Location &lhs, const PortableGroup::Location &rhs) const; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h index a30b2ed2389..85da0670930 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h @@ -33,9 +33,7 @@ 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_MemberInfo.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h index 2cf15e7146c..97f2b4e1894 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h @@ -53,7 +53,6 @@ struct TAO_PG_MemberInfo * given location, this equality operator will return true. */ bool operator== (const TAO_PG_MemberInfo & rhs) const; - }; typedef ACE_Unbounded_Set<TAO_PG_MemberInfo> TAO_PG_MemberInfo_Set; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h index 4e6a370c829..6c4d6bf4503 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h @@ -33,7 +33,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_PortableGroup_Export TAO_PG_Null_Property_Validator { public: - /// Validate the given properties. /** * This particular implementation performs no validation @@ -47,7 +46,6 @@ public: * whatsoever. */ void validate_criteria (const PortableGroup::Properties & criteria); - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp index 72065e982b1..b1ffb6120b6 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp @@ -74,7 +74,6 @@ TAO_PG_ObjectGroupManager::add_member ( the_location, member, check_type_id); - } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h index 6d664195c25..6848d53a3e1 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h @@ -46,7 +46,6 @@ class TAO_PortableGroup_Export TAO_PG_ObjectGroupManager : public virtual POA_PortableGroup::ObjectGroupManager { public: - /// Constructor. TAO_PG_ObjectGroupManager (void); @@ -60,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, @@ -199,7 +197,6 @@ public: void validate_members (CORBA::ORB_ptr orb, const TimeBase::TimeT& timeout); protected: - /// Underlying and non-locking implementation of the add_member() /// and _tao_add_member() methods in this class. PortableGroup::ObjectGroup_ptr add_member_i ( @@ -249,7 +246,6 @@ protected: TAO_PG_ObjectGroup_Array * groups); private: - /// Help function to get active or inactive member infos. TAO_PG_MemberInfo_Set get_members (bool is_alive); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h index 628d75e9fa2..38e929f385f 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h @@ -40,7 +40,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL struct TAO_PG_ObjectGroup_Map_Entry { public: - /// The RepositoryId corresponding to all Members in the /// ObjectGroup. CORBA::String_var type_id; @@ -64,7 +63,6 @@ public: /// Properties used when creating this object group, in addition to /// those set dynamically after the creation. PortableGroup::Properties properties; - }; /// ObjectId hash map typedef. diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h index 0e72012e8a1..90fb7f9e5dc 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h @@ -55,9 +55,7 @@ namespace TAO */ class TAO_PortableGroup_Export PG_Object_Group { - protected: - // Information about an object group member struct MemberInfo { @@ -177,7 +175,6 @@ namespace TAO PortableGroup::InitialNumberMembersValue get_initial_number_members () const; - /** * @@TODO DOC */ @@ -271,7 +268,6 @@ namespace TAO ///////////////////////// // Implementation methods private: - int increment_version (); void distribute_iogr (void); @@ -279,7 +275,6 @@ namespace TAO void create_members (size_t count); protected: - virtual PortableGroup::ObjectGroup_ptr add_member_to_iogr(CORBA::Object_ptr member); void clear_members_map (void); @@ -295,15 +290,12 @@ namespace TAO ///////////////// // Static Methods public: - /////////////// // Static Data private: - /////////////// // Data Members private: - /** * Protect internal state. */ @@ -313,12 +305,10 @@ namespace TAO CORBA::ORB_var orb_; private: - /// Where to find the factories for replicas. PortableGroup::FactoryRegistry_var factory_registry_; protected: - // The object group manipulator TAO::PG_Object_Group_Manipulator & manipulator_; @@ -373,7 +363,6 @@ namespace TAO PortableGroup::InitialNumberMembersValue initial_number_members_; PortableGroup::MinimumNumberMembersValue minimum_number_members_; PortableGroup::FactoryInfos group_specific_factories_; - }; } // namespace TAO diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h index 7096e29d64c..8ac98a4ba32 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 * @@ -40,7 +39,6 @@ namespace TAO class TAO_PortableGroup_Export PG_Object_Group_Manipulator { public: - /// Constructor. PG_Object_Group_Manipulator (); @@ -87,7 +85,6 @@ namespace TAO PortableGroup::ObjectGroup_ptr member) const; private: - /** * Allocate an ogid for a new object group */ @@ -100,7 +97,6 @@ namespace TAO convert_ogid_to_oid (PortableGroup::ObjectGroupId ogid) const; private: - /// The orb CORBA::ORB_var orb_; @@ -115,7 +111,6 @@ namespace TAO /// Next ogid to be allocated. PortableGroup::ObjectGroupId next_ogid_; - }; } //namespace TAO diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp index 8d3ebffb5ae..21953ce8621 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp @@ -37,11 +37,9 @@ namespace namespace TAO { - class Object_Group_File_Guard : public TAO::Storable_File_Guard { public: - Object_Group_File_Guard ( TAO::PG_Object_Group_Storable & object_group, Method_Type method_type); @@ -67,10 +65,8 @@ namespace TAO virtual TAO::Storable_Base * create_stream (const char * mode); private: - TAO::PG_Object_Group_Storable & object_group_; }; - } TAO::Object_Group_File_Guard::Object_Group_File_Guard ( @@ -153,7 +149,6 @@ TAO::Object_Group_File_Guard::~Object_Group_File_Guard () // Notify if persistent store was updated. if (object_group_.write_occurred_) object_group_.state_written (); - } catch (const TAO::Storable_Exception &se) { diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.h index a526b1e52f6..fcd44cac08a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.h @@ -46,11 +46,9 @@ namespace TAO class TAO_PortableGroup_Export PG_Object_Group_Storable : public PG_Object_Group { - ///////////////////// // Construct/Destruct public: - /** * This constructor is suitable for creating an object group from * scratch. @@ -82,9 +80,7 @@ namespace TAO ///////////////// // public methods - public: - /** * Indicate that this object group is to be permanently * destroyed. During destruction the persistent store @@ -139,7 +135,6 @@ namespace TAO virtual PortableGroup::ObjectGroupId get_object_group_id () const; private: - ///////////////////////// // Forbidden methods PG_Object_Group_Storable (); @@ -160,7 +155,6 @@ namespace TAO time_t last_changed_; protected: - bool loaded_from_stream_; bool destroyed_; @@ -185,7 +179,6 @@ namespace TAO TAO_SYNCH_MUTEX lock_; friend class Object_Group_File_Guard; - }; } // namespace TAO diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h index 9c8cb300bca..e40ce9263d4 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h @@ -83,7 +83,6 @@ namespace TAO_PG private: NamedValueVec values_; }; - } //namespace TAO_PG TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h index ac1236795b9..b6b7bc593b1 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h @@ -49,7 +49,6 @@ class TAO_PortableGroup_Export TAO_PG_PropertyManager : public virtual POA_PortableGroup::PropertyManager { public: - /// Constructor. TAO_PG_PropertyManager (TAO_PG_ObjectGroupManager & object_group_manager); @@ -60,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); @@ -122,14 +120,12 @@ public: ACE_Null_Mutex> Type_Prop_Table; private: - /// Remove properties "to_be_removed" from the given list of /// properties. void remove_properties (const PortableGroup::Properties & to_be_removed, PortableGroup::Properties &properties); private: - /// Table that maps ObjectId to Object Group related information. TAO_PG_ObjectGroupManager & object_group_manager_; @@ -148,7 +144,6 @@ private: * @todo Strategize the validator, or use template policies. */ TAO_PG_Default_Property_Validator property_validator_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp index bf18a767a8a..4554afdc793 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp @@ -164,7 +164,6 @@ void TAO::PG_Property_Set::set_property ( } - void TAO::PG_Property_Set::export_properties(PortableGroup::Properties & property_set) const { ValueMap merged_values; @@ -211,7 +210,6 @@ void TAO::PG_Property_Set::merge_properties (ValueMap & merged_values) const } - int TAO::PG_Property_Set::find ( const ACE_CString & key, const PortableGroup::Value *& pValue) const diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h index 9eb1f8647da..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; @@ -62,7 +61,6 @@ namespace TAO ACE_SYNCH_NULL_MUTEX> ValueMapIterator; public: - /** * constructor: empty set with no defaults. */ @@ -155,7 +153,6 @@ namespace TAO /////////////// // Data Members private: - /** * Protect internal state. */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h index 5df8e585c27..c4d6577eabc 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h @@ -46,7 +46,6 @@ namespace TAO_PG TAO_PortableGroup_Export void override_properties ( const PortableGroup::Properties & overrides, PortableGroup::Properties &properties); - } TAO_END_VERSIONED_NAMESPACE_DECL 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/PG_Utils.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h index 8a948085fef..654de5311de 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h @@ -33,7 +33,6 @@ namespace TAO class TAO_PortableGroup_Export PG_Utils { public: - /// Set tagged component for the object group static CORBA::Boolean set_tagged_component ( PortableGroup::ObjectGroup *ior, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h index 81e171a7f58..b63011fe697 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h @@ -45,7 +45,6 @@ namespace CORBA class TAO_PortableGroup_Export TAO_PortableGroup_Acceptor_Registry { public: - /** * @struct Entry * @@ -79,7 +78,6 @@ public: typedef ACE_Unbounded_Queue_Iterator<Entry> Acceptor_Registry_Iterator; protected: - /// Helper function to open a group acceptor. void open_i (const TAO_Profile* profile, TAO_ORB_Core &orb_core, @@ -90,7 +88,6 @@ protected: Entry *&entry); private: - // The acceptor registry should not be copied. TAO_PortableGroup_Acceptor_Registry ( const TAO_PortableGroup_Acceptor_Registry&); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h index 3cd596fe5f1..0ac17fb12cb 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h @@ -41,7 +41,6 @@ public: virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h index 2b8e1988ef0..632e3c0aa14 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h @@ -38,7 +38,6 @@ class TAO_PortableGroup_Export PortableGroup_Request_Dispatcher friend class TAO_GOA; public: - /// Destructor. virtual ~PortableGroup_Request_Dispatcher (void); @@ -50,13 +49,11 @@ public: CORBA::Object_out forward_to); private: - /// Hash map containing the GroupId->ObjectKey mappings. TAO_Portable_Group_Map group_map_; /// Registry for all of the group (multicast) acceptors. TAO_PortableGroup_Acceptor_Registry acceptor_registry_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h index ce80324fe64..59657e554b9 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h @@ -40,7 +40,6 @@ class TAO_ServerRequest; class TAO_PortableGroup_Export TAO_GroupId_Hash { public: - /// Returns hash value. u_long operator () (const PortableGroup::TagGroupTaggedComponent *id) const; }; @@ -55,7 +54,6 @@ public: class TAO_PortableGroup_Export TAO_GroupId_Equal_To { public: - /// Returns 1 if equal. int operator () (const PortableGroup::TagGroupTaggedComponent *lhs, const PortableGroup::TagGroupTaggedComponent *rhs) const; @@ -69,7 +67,6 @@ public: class TAO_PortableGroup_Export TAO_Portable_Group_Map { public: - /** * @struct Map_Entry * diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h index da7ae5f6567..ab40b91faef 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h @@ -104,7 +104,6 @@ public: char *&host); protected: - /** * Implement the common part of the open*() methods. This method is * virtual to allow a derived class implementation to be invoked diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h index a0992d8de03..20b45315b43 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.h @@ -50,9 +50,7 @@ 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); /// Constructor. arg parameter is used by the Acceptor to pass the @@ -106,7 +104,6 @@ public: // UIPMC Additions - End protected: - // UIPMC Additions - Begin // This is always the remote address @@ -130,7 +127,6 @@ protected: int set_tos (int tos); private: - /// Stores the type of service value. int dscp_codepoint_; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h index 81aab15f534..914b80c6f61 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h @@ -105,7 +105,6 @@ public: const char *preferred_if () const; private: - /// Helper methods for getting and setting the IP address. @@ Vadym - deprecate these. ACE_UINT32 uint_ip_addr () const; void uint_ip_addr (ACE_UINT32 ip_addr); 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 821082e9cda..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 * @@ -97,7 +96,6 @@ namespace TAO_PG ACE_SYNCH_NULL_MUTEX> Fragments_Map; Fragments_Map fragments_; }; - } // namespace TAO_PG TAO_END_VERSIONED_NAMESPACE_DECL 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/PortableGroup/miop_resource.h b/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.h index ed8084de762..f872dd5c504 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.h @@ -48,7 +48,6 @@ class TAO_PortableGroup_Export TAO_MIOP_Resource_Factory : public ACE_Service_Object { public: - /// Constructor. TAO_MIOP_Resource_Factory (void); diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp index dacf841dea0..44597e3f600 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp @@ -15,7 +15,6 @@ #include "ace/OS_NS_string.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // = Methods to deal with ACE_Hash_Map_Manager. @@ -491,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/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h index e057cbf5925..53d03738806 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h @@ -64,7 +64,6 @@ public: // The function that computes a hash value. // private: - CosPropertyService::PropertyName_var pname_; // Storage pointer. }; @@ -89,7 +88,6 @@ public: // Destructor. //private: - CORBA::Any pvalue_; // property value. diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h index 4c300069df1..7879eab0f76 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 * @@ -47,14 +46,12 @@ namespace TAO class IIOP_SSL_Connection_Handler : public TAO_IIOP_Connection_Handler { public: - /// Constructor. IIOP_SSL_Connection_Handler (ACE_Thread_Manager* t = 0); IIOP_SSL_Connection_Handler (TAO_ORB_Core *orb_core); /// Destructor. ~IIOP_SSL_Connection_Handler (void); - }; // **************************************************************** @@ -78,7 +75,6 @@ namespace TAO class Null_SSL_State_Guard { public: - /// Constructor that sets up the null TSS SSL state. Null_SSL_State_Guard (TAO::SSLIOP::Current_ptr current, int &result); @@ -87,7 +83,6 @@ namespace TAO ~Null_SSL_State_Guard (void); private: - /// The SSLIOP::Current implementation that was previously /// associated with the current thread and invocation. /** @@ -102,9 +97,7 @@ namespace TAO /// Flag that specifies whether or not setup of the SSLIOP::Current /// object completed for the current thread and invocation. bool setup_done_; - }; - } // End TAO namespace. TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h index 3c06e02904e..e788d7e538d 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h @@ -41,7 +41,6 @@ namespace TAO class IIOP_SSL_Connector : public TAO_IIOP_Connector { public: - /// Constructor. IIOP_SSL_Connector (void); @@ -52,7 +51,6 @@ namespace TAO int close (void); public: - typedef TAO_Connect_Concurrency_Strategy<IIOP_SSL_Connection_Handler> CONNECT_CONCURRENCY_STRATEGY; @@ -68,7 +66,6 @@ namespace TAO BASE_CONNECTOR; protected: - /** * @name The TAO_Connector Methods * @@ -85,14 +82,12 @@ namespace TAO //@} private: - /// Our connect strategy CONNECT_STRATEGY connect_strategy_; /// The connector initiating connection requests for IIOP_SSL. BASE_CONNECTOR base_connector_; }; - } // End TAO namespace. TAO_END_VERSIONED_NAMESPACE_DECL 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_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp index 7d212d7f033..9aec1e2df1f 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp @@ -626,7 +626,6 @@ TAO::SSLIOP::Acceptor::parse_options_i (int &argc, ACE_CString ** argv) for (int j = i; j <= argc-1; j++) argv[j] = argv[j+1]; argv[argc] = temp; - } return 0; } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp index 458198a14c7..50a2d07f3fd 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp @@ -257,7 +257,6 @@ TAO::SSLIOP::Connector::make_secure_profile () } - TAO_Profile * TAO::SSLIOP::Connector::corbaloc_scan (const char *endpoint, size_t &len) { @@ -513,13 +512,11 @@ TAO::SSLIOP::Connector::ssliop_connect ( ORBSVCS_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - SSLIOP_Connector::ssliop_connect,") ACE_TEXT ("wait for completion failed\n"))); - } } } else { - bool make_new_connection = (found == TAO::Transport_Cache_Manager::CACHE_FOUND_NONE) || (found == TAO::Transport_Cache_Manager::CACHE_FOUND_BUSY @@ -527,7 +524,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, ") @@ -764,7 +760,6 @@ TAO::SSLIOP::Connector::ssliop_connect ( } svc_handler_auto_ptr.release (); - } else // not making new connection { diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h index b3e99fdb0a1..188de270816 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h @@ -68,7 +68,6 @@ namespace TAO }; typedef OpenSSL_st_var< ::EVP_PKEY > EVP_PKEY_var; - } // End SSLIOP namespace. } // End TAO namespace. diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp index ac09e5b1cab..bb1747d0efd 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp @@ -293,7 +293,6 @@ TAO_SSLIOP_Endpoint::set_sec_attrs (::Security::QOP q, - TAO_SSLIOP_Synthetic_Endpoint::~TAO_SSLIOP_Synthetic_Endpoint () { } 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 aa19cfd95f4..cd5d30e77c1 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 * @@ -53,7 +52,6 @@ namespace TAO : public TAO_Protocol_Factory { public: - /// Constructor. Protocol_Factory (void); @@ -80,7 +78,6 @@ namespace TAO virtual int requires_explicit_endpoint () const; private: - /// Parse an X509 file path, which is expected to looks like: /// <X509Path> ::= <Prefix> ':' <Path> /// <Prefix> ::= 'PEM' | 'ASN1' @@ -118,7 +115,6 @@ namespace TAO ACE_Time_Value timeout_; bool check_host_; - }; } // End SSLIOP namespace. } // End TAO namespace. diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h index 24dbbc2d4eb..d0c5057b00a 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h @@ -69,7 +69,6 @@ namespace TAO class OpenSSL_st_var { public: - /** * @name Constructors * @@ -109,10 +108,8 @@ namespace TAO T* ptr () const; private: - /// The OpenSSL structure whose reference count is managed. T * st_; - }; } // End SSLIOP namespace. } // End TAO namespace. diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp index be7540ea0a6..35b27ccfeb3 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp @@ -31,7 +31,6 @@ TAO::SSLIOP::OwnCredentials_ptr TAO::SSLIOP::OwnCredentials::_nil () { return (OwnCredentials *) 0; - } SecurityLevel3::CredentialsType 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/SSLIOP/SSLIOP_SSL.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h index edd3480a24f..78f6dfd8ce8 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h @@ -74,7 +74,6 @@ namespace TAO }; typedef OpenSSL_st_var< ::SSL > SSL_var; - } // End SSLIOP namespace. } // End TAO namespace. diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp index e9df6979bb0..966da1897ca 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp @@ -188,7 +188,6 @@ TAO::SSLIOP::Transport::tear_listen_point_list (TAO_InputCDR &cdr) } - void TAO::SSLIOP::Transport::set_bidir_context_info ( TAO_Operation_Details &opdetails) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h index 0b3250f7468..30f60e14961 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h @@ -72,7 +72,6 @@ namespace TAO }; typedef OpenSSL_st_var< ::X509 > X509_var; - } // End SSLIOP namespace. } // End TAO namespace. diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp index f80cd66be75..debf6832652 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp @@ -8,7 +8,6 @@ #include "orbsvcs/Sched/Config_Scheduler.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Config_Scheduler::ACE_Config_Scheduler () @@ -161,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, @@ -185,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)) { @@ -220,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); @@ -425,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, @@ -440,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/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h index 38aab1e781d..164c534ac38 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h @@ -33,7 +33,6 @@ class TAO_RTSched_Export ACE_Config_Scheduler // distributed with the EC. { public: - ACE_Config_Scheduler (void); virtual ~ACE_Config_Scheduler (void); @@ -161,7 +160,6 @@ public: private: - #if defined (TAO_USES_STRATEGY_SCHEDULER) // trait for the scheduler implementation base class @@ -210,7 +208,6 @@ private: // implementation base class pointer BaseSchedImplType* impl; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp index f1844bed135..a7b0e2bf5f0 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp @@ -19,7 +19,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL ////////////////////// @@ -308,7 +307,6 @@ ACE_DynScheduler::register_task (RT_Info *rt_info, handle_t &handle) // = registers a task. - ACE_DynScheduler::status_t ACE_DynScheduler::get_rt_info (Object_Name name, RT_Info* &rtinfo) @@ -357,7 +355,6 @@ ACE_DynScheduler::get_rt_info (Object_Name name, - int ACE_DynScheduler::priority ( const RtecScheduler::handle_t handle, RtecScheduler::OS_Priority &priority, @@ -487,14 +484,12 @@ void ACE_DynScheduler::export_to_file (RT_Info& info, FILE* file) (void) ACE_OS::fprintf (file, "%s, %d\n", (const char*)tmp.entry_point, info.dependencies[i].number_of_calls); - } (void) ACE_OS::fprintf (file, "# end calls\n%d\n%d\n\n", info.priority, info.preemption_subpriority); - } @@ -1286,7 +1281,6 @@ ACE_DynScheduler::calculate_utilization_params () } - void ACE_DynScheduler::update_priority_level_params () { @@ -1412,7 +1406,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) @@ -1827,7 +1820,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; @@ -1916,7 +1908,6 @@ ACE_DynScheduler::create_timeline () // Create a timeline. - ACE_DynScheduler::status_t ACE_DynScheduler::output_dispatch_priorities (const char *filename) { @@ -1944,7 +1935,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/DynSched.h b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h index d5b383829f8..375bbbebaec 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h +++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h @@ -41,7 +41,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_RTSched_Export ACE_DynScheduler { public: - ////////////////////////////// // public type declarations // ////////////////////////////// @@ -107,7 +106,6 @@ public: }; - ///////////////////////////// // public member functions // ///////////////////////////// @@ -264,7 +262,6 @@ public: Dispatching_Type & d_type); protected: - //////////////////////////////// // protected member functions // //////////////////////////////// @@ -380,7 +377,6 @@ protected: ACE_Ordered_MultiSet <TimeLine_Entry_Link> *timeline_; private: - /////////////////////////////// // private type declarations // /////////////////////////////// @@ -538,7 +534,6 @@ private: u_long min_dispatch_id_; u_long max_dispatch_id_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp index b50d9381218..09c2cb01284 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp @@ -19,7 +19,6 @@ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL /////////////////////////// @@ -168,7 +167,6 @@ TAO_RT_Info_Ex::enabled_state () } - ////////////////////////////// // struct TAO_RT_Info_Tuple // ////////////////////////////// @@ -444,7 +442,6 @@ register_tuples (TAO_RT_Info_Tuple ** tuple_ptr_array, - // Accessor for original RT_Info data. TAO_RT_Info_Ex & @@ -582,7 +579,6 @@ fwd_dfs_status (TAO_Reconfig_Scheduler_Entry::DFS_Status ds) } - // Accessor for DFS traversal status of the node. TAO_Reconfig_Scheduler_Entry::DFS_Status @@ -1196,7 +1192,6 @@ TAO_MUF_FAIR_Reconfig_Sched_Strategy::total_admission_comp (const void *s, } - // Compares two RT_Info entries by priority alone. Returns -1 if the // first one is higher, 0 if they're the same, and 1 if the second one is higher. diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h index 8986356c541..f780aa82ba9 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h @@ -111,7 +111,6 @@ struct TAO_RTSched_Export TAO_RT_Info_Tuple class TAO_RTSched_Export TAO_Reconfig_Scheduler_Entry { public: - // Info for DFS traversal, topological sort of call graph. enum DFS_Status {NOT_VISITED, VISITED, FINISHED}; @@ -305,7 +304,6 @@ public: */ private: - /** * Stores the values of operation characteristics as they were specified * in the most recent call to the Reconfig_Scheduler's set () method. @@ -402,13 +400,11 @@ private: class TAO_RTSched_Export TAO_Reconfig_Sched_Entry_Visitor { public: - /// Destructor. virtual ~TAO_Reconfig_Sched_Entry_Visitor (void); /// Visit a Reconfig Scheduler Entry. virtual int visit (TAO_Reconfig_Scheduler_Entry &) = 0; - }; @@ -422,7 +418,6 @@ class TAO_RTSched_Export TAO_RSE_Reset_Visitor : // prior to the first DFS traversal for topological sorting. { public: - /// Constructor. TAO_RSE_Reset_Visitor (); @@ -446,13 +441,11 @@ public: class TAO_RTSched_Export TAO_RT_Info_Tuple_Visitor { public: - /// Destructor. virtual ~TAO_RT_Info_Tuple_Visitor (void); /// Visit a RT_Info tuple. virtual int visit (TAO_RT_Info_Tuple &) = 0; - }; /** @@ -466,7 +459,6 @@ public: class TAO_RTSched_Export TAO_Reconfig_Sched_Strategy_Base { public: - /// Ordering function to compare the DFS finish times of /// two RT_Info_Tuples static int comp_tuple_finish_times (const void *first, const void *second); @@ -509,7 +501,6 @@ class TAO_RTSched_Export TAO_MUF_FAIR_Reconfig_Sched_Strategy // has index 0, the next higher rate has index 1, etc. { public: - /** * Ordering function used to qsort an array of RT_Info_Tuple * pointers into a total <priority, subpriority> ordering. Returns @@ -566,7 +557,6 @@ class TAO_RTSched_Export TAO_RMS_FAIR_Reconfig_Sched_Strategy // order. { public: - /** * Ordering function used to qsort an array of RT_Info_Tuple * pointers into a total <priority, subpriority> ordering. Returns @@ -638,7 +628,6 @@ class TAO_RTSched_Export TAO_RMS_MLF_Reconfig_Sched_Strategy // order. { public: - /** * Ordering function used to qsort an array of RT_Info_Tuple * pointers into a total <priority, subpriority> ordering. Returns diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp index 61ec21234da..a02b5821535 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp @@ -226,7 +226,6 @@ postfix_action (TAO_Reconfig_Scheduler_Entry & /* rse */) } - ///////////////////////// // TAO_RSE_DFS_Visitor // ///////////////////////// diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h index 7fcaaa9797a..d55095ca06d 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h @@ -40,7 +40,6 @@ class TAO_RSE_Dependency_Visitor : // derived classes may call to pass them in. { public: - /// Type of map used for O(1) lookup of RT_Info /// dependency sets by caller or called handle. typedef ACE_Hash_Map_Manager_Ex<RtecScheduler::handle_t, @@ -102,11 +101,9 @@ protected: /// Map of handles into RT_Infos. RT_INFO_MAP & rt_info_map_; - }; - template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> class TAO_RSE_DFS_Visitor : public TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK> @@ -119,7 +116,6 @@ class TAO_RSE_DFS_Visitor : // as appropriate according to DFS state markers. { public: - /// Constructor. TAO_RSE_DFS_Visitor (typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map, @@ -156,7 +152,6 @@ protected: private: /// Keeps track of DFS start and finish times. int DFS_time_; - }; @@ -172,7 +167,6 @@ class TAO_RSE_SCC_Visitor : // flag cycles in the graph. { public: - /// Constructor. TAO_RSE_SCC_Visitor (typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map, @@ -259,14 +253,12 @@ class TAO_RSE_Reverse_Propagation_Visitor : // and its dependants, according to its dependencies. { public: - /// Constructor. TAO_RSE_Reverse_Propagation_Visitor (typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map, typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map); protected: - /** * Propagates aggregate execution time from successor to calling * entry. Returns 1 on success (to prevent recursion on the @@ -275,7 +267,6 @@ protected: virtual int pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry, TAO_Reconfig_Scheduler_Entry &successor, const RtecScheduler::Dependency_Info &di); - }; @@ -292,7 +283,6 @@ class TAO_RSE_Forward_Propagation_Visitor : // its dependencies, and the period and threads it specifies. { public: - /// Constructor. TAO_RSE_Forward_Propagation_Visitor (typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map, @@ -336,7 +326,6 @@ protected: const RtecScheduler::Dependency_Info &di); private: - /// Number of nodes with unresolved local dependencies. int unresolved_locals_; @@ -360,7 +349,6 @@ class TAO_RSE_Priority_Visitor : // priority and subpriority boundaries. { public: - /// Constructor. TAO_RSE_Priority_Visitor (RtecScheduler::handle_t handles, TAO_Reconfig_Scheduler_Entry ** entry_ptr_array); @@ -382,7 +370,6 @@ public: int finish (); private: - /// Pointer to previous tuple in the iteration. TAO_Reconfig_Scheduler_Entry *previous_entry_; @@ -421,7 +408,6 @@ class TAO_Tuple_Admission_Visitor : // whether or not a given operation is critical. { public: - /// Constructor. TAO_Tuple_Admission_Visitor (const CORBA::Double & critical_utilization_threshold, const CORBA::Double & noncritical_utilization_threshold); @@ -453,7 +439,6 @@ public: CORBA::Double total_noncritical_utilization (); private: - /// Utilization by critical operations. CORBA::Double critical_utilization_; @@ -486,14 +471,12 @@ class TAO_RSE_Criticality_Propagation_Visitor : // and its dependants, according to its dependencies. { public: - /// Constructor. TAO_RSE_Criticality_Propagation_Visitor (typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::DEPENDENCY_SET_MAP & dependency_map, typename TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::RT_INFO_MAP & rt_info_map); protected: - /** * Propagates criticality from successor to calling * entry. Returns 1 on success (to prevent recursion on the @@ -502,7 +485,6 @@ protected: virtual int pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry, TAO_Reconfig_Scheduler_Entry &successor, const RtecScheduler::Dependency_Info &di); - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp index f5735cdb6ee..4f36228d52f 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp @@ -626,7 +626,6 @@ reset (RtecScheduler::handle_t handle, } - template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: @@ -1159,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), @@ -1173,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_, @@ -1857,7 +1854,6 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende number_of_calls, dependency_type, enabled); - } @@ -2209,7 +2205,6 @@ dfs_traverse_i (void) } - // Sorts an array of RT_info handles in topological order, then // checks for loops, marks unresolved remote dependencies. template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h index 96758db6f26..cb3cdf44ac6 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h @@ -42,7 +42,6 @@ class TAO_Reconfig_Scheduler : // { public: - /// Type of map used for O(1) lookup of RT_Infos by their handles. typedef ACE_Hash_Map_Manager_Ex<RtecScheduler::handle_t, TAO_RT_Info_Ex *, @@ -308,7 +307,6 @@ public: void critical_utilization_threshold (const CORBA::Double &); protected: - // @@ TO DO: use a memento to save and restore scheduler state without // breaking encapsulation, particularly of these flags. diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp index 9cfb8e0b5da..28898481921 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp @@ -18,7 +18,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL Task_Entry::Task_Entry () @@ -211,7 +210,6 @@ Task_Entry::disjunctive_merge (Dependency_Type dt, (const char*) this->rt_info ()->entry_point); unresolved_remotes += ACE_CString (string_buffer); - } // Check for and warn about unresolved local dependencies in diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h index 0033bc0613a..bb29121d49d 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h +++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h @@ -43,7 +43,6 @@ class Dispatch_Proxy_Iterator; class TAO_RTSched_Export Dispatch_Entry_Link { public: - typedef RtecScheduler::handle_t handle_t; typedef RtecScheduler::Dependency_Info Dependency_Info; typedef RtecScheduler::Preemption_Priority_t Preemption_Priority; @@ -71,13 +70,11 @@ public: Dispatch_Entry &dispatch_entry () const; private: - /// Dispatch entry to which the smart pointer refers. Dispatch_Entry &dispatch_entry_; }; - /** * @class Task_Entry * @@ -88,7 +85,6 @@ private: class TAO_RTSched_Export Task_Entry { public: - typedef RtecScheduler::handle_t handle_t; typedef RtecScheduler::Dependency_Info Dependency_Info; typedef RtecScheduler::Preemption_Priority_t Preemption_Priority; @@ -188,7 +184,6 @@ public: u_long effective_execution_time () const; private: - // Prohibits calls of the given type: currently used to enforce // the notion that two-way calls to disjunctive or conjunctive // RT_Infos do not have any defined meaning, and thus should be @@ -280,7 +275,6 @@ private: // Set of links to Task Entries which call this entry. ACE_Unbounded_Set <Task_Entry_Link *> callers_; - }; @@ -288,7 +282,6 @@ private: class TAO_RTSched_Export Task_Entry_Link { public: - typedef RtecScheduler::handle_t handle_t; typedef RtecScheduler::Dependency_Info Dependency_Info; typedef RtecScheduler::Preemption_Priority_t Preemption_Priority; @@ -319,7 +312,6 @@ public: Task_Entry &called () const; private: - // the number of calls of the operation CORBA::Long number_of_calls_; @@ -344,7 +336,6 @@ private: class TAO_RTSched_Export Dispatch_Entry { public: - typedef RtecScheduler::handle_t handle_t; typedef RtecScheduler::Dependency_Info Dependency_Info; typedef RtecScheduler::Preemption_Priority_t Preemption_Priority; @@ -440,7 +431,6 @@ private: // stores a pointer to the original dispatch entry if this // is a dispatch generated by expanding the original frame Dispatch_Entry *original_dispatch_; - }; /** @@ -458,7 +448,6 @@ private: class TAO_RTSched_Export Dispatch_Proxy_Iterator { public: - typedef RtecScheduler::handle_t handle_t; typedef RtecScheduler::Dependency_Info Dependency_Info; typedef RtecScheduler::Preemption_Priority_t Preemption_Priority; @@ -530,7 +519,6 @@ public: private: - /// the number of calls corresponding to each actual dispatch u_long number_of_calls_; @@ -551,11 +539,9 @@ private: }; - class TAO_RTSched_Export TimeLine_Entry { public: - typedef RtecScheduler::handle_t handle_t; typedef RtecScheduler::Dependency_Info Dependency_Info; typedef RtecScheduler::Preemption_Priority_t Preemption_Priority; @@ -594,7 +580,6 @@ public: bool operator < (const TimeLine_Entry&) const; private: - // the dispatch entry to which the time slice corresponds Dispatch_Entry &dispatch_entry_; @@ -607,13 +592,11 @@ private: // next and previous priority time slices for this dispatch entry TimeLine_Entry *next_; TimeLine_Entry *prev_; - }; class TAO_RTSched_Export TimeLine_Entry_Link { public: - typedef RtecScheduler::handle_t handle_t; typedef RtecScheduler::Dependency_Info Dependency_Info; typedef RtecScheduler::Preemption_Priority_t Preemption_Priority; @@ -635,10 +618,8 @@ public: bool operator < (const TimeLine_Entry_Link&) const; private: - /// the underlying entry TimeLine_Entry &entry_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp index 456d98d885d..8c5718ea40a 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp @@ -16,7 +16,6 @@ #include "ace/Lock_Adapter_T.h" - /////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// // class Scheduler static members @@ -229,14 +228,12 @@ void ACE_Scheduler::export_to_file (RT_Info& info, FILE* file) (void) ACE_OS::fprintf (file, "%s, %d\n", (const char*)tmp.entry_point, info.dependencies[i].number_of_calls); - } (void) ACE_OS::fprintf (file, "# end dependencies\n%d\n%d\n\n", info.priority, info.preemption_subpriority); - } int diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h index cb64989590c..9ffced104f8 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h @@ -167,7 +167,6 @@ public: Config_Info* &config_info) = 0; - // = Computes the schedule. /// This actually generates the files. virtual status_t diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp index eb2db77c5e9..eaa44622deb 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp @@ -13,7 +13,6 @@ #include "ace/OS_NS_stdio.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL /////////////////////////////////////////////////////////////////////////////// diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp index c1bb16f71c5..74e5d01c316 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp @@ -578,7 +578,6 @@ ACE_Strategy_Scheduler::schedule_timeline_entry ( } - //////////////////////////////////////////////////////////////////// // class template ACE_Strategy_Scheduler_Factory member functions // //////////////////////////////////////////////////////////////////// @@ -600,7 +599,6 @@ ACE_Strategy_Scheduler_Factory<STRATEGY>::create (RtecScheduler::Preemption_Prio } - ///////////////////////////////////////////////////////////////// // abstract base class ACE_Scheduler_Strategy member functions // ///////////////////////////////////////////////////////////////// @@ -697,7 +695,6 @@ ACE_Scheduler_Strategy::minimum_critical_priority () } - ///////////////////////////////////////////////////////////////////////// // class ACE_MUF_Scheduler_Strategy static data member initializations // ///////////////////////////////////////////////////////////////////////// @@ -857,7 +854,6 @@ ACE_MUF_Scheduler_Strategy::dispatch_type (const Dispatch_Entry & /* entry */) - ///////////////////////////////////////////////////////////////////////// // class ACE_RMS_Scheduler_Strategy static data member initializations // ///////////////////////////////////////////////////////////////////////// @@ -989,7 +985,6 @@ ACE_RMS_Scheduler_Strategy::dispatch_type (const Dispatch_Entry & /* entry */) } - ///////////////////////////////////////////////////////////////////////// // class ACE_MLF_Scheduler_Strategy static data member initializations // ///////////////////////////////////////////////////////////////////////// @@ -1123,7 +1118,6 @@ ACE_MLF_Scheduler_Strategy::dispatch_type (const Dispatch_Entry & /* entry */) } - ///////////////////////////////////////////////////////////////////////// // class ACE_EDF_Scheduler_Strategy static data member initializations // ///////////////////////////////////////////////////////////////////////// diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h index e6976130dc9..2db996da3d6 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h @@ -37,7 +37,6 @@ class TAO_RTSched_Export ACE_Strategy_Scheduler : public ACE_DynScheduler { // public interface public: - /// = Constructor. ACE_Strategy_Scheduler (ACE_Scheduler_Strategy &strategy); @@ -60,7 +59,6 @@ public: virtual Preemption_Priority minimum_critical_priority (); private: - /// = Schedules a dispatch entry into the timeline being created. virtual status_t schedule_timeline_entry (Dispatch_Entry &dispatch_entry, ACE_Unbounded_Queue <Dispatch_Entry *> @@ -77,7 +75,6 @@ private: }; - //////////////////////////////////////// // Factory for strategized schedulers // //////////////////////////////////////// @@ -94,7 +91,6 @@ template <class STRATEGY> class ACE_Strategy_Scheduler_Factory { public: - /// = Constructs and returns a scheduler strategized with /// an instance of the the parameterized strategy type. static ACE_Strategy_Scheduler * create (RtecScheduler::Preemption_Priority_t minimum_critical_priority); @@ -117,7 +113,6 @@ public: class TAO_RTSched_Export ACE_Scheduler_Strategy { public: - /// = Constructor. ACE_Scheduler_Strategy (ACE_DynScheduler::Preemption_Priority minimum_critical_priority = 0); @@ -168,7 +163,6 @@ public: dispatch_type (const Dispatch_Entry &entry) = 0; protected: - /** * = Compares two dispatch entries using the specific priority, dynamic * subpriority, and static subpriority method definitions provided by @@ -188,7 +182,6 @@ protected: }; - /** * @class ACE_MUF_Scheduler_Strategy * @@ -200,7 +193,6 @@ protected: class TAO_RTSched_Export ACE_MUF_Scheduler_Strategy : public ACE_Scheduler_Strategy { public: - /// = Constructor. ACE_MUF_Scheduler_Strategy (ACE_DynScheduler::Preemption_Priority minimum_critical_priority = 0); @@ -231,7 +223,6 @@ public: dispatch_type (const Dispatch_Entry &entry); protected: - /** * = Returns a dynamic subpriority value at the current time for * the given timeline entry: if the operation has @@ -252,7 +243,6 @@ protected: const Dispatch_Entry &second_entry); private: - // = Comparison function to pass to qsort: calls instance ()->sort_comp (). #if defined (ACE_HAS_WINCE) static int _cdecl sort_function (void *arg1, void *arg2); @@ -276,7 +266,6 @@ private: class TAO_RTSched_Export ACE_RMS_Scheduler_Strategy : public ACE_Scheduler_Strategy { public: - /// = Constructor. ACE_RMS_Scheduler_Strategy (ACE_DynScheduler::Preemption_Priority minimum_critical_priority = 0); @@ -307,7 +296,6 @@ public: dispatch_type (const Dispatch_Entry &entry); protected: - /// = Just returns 0: all operations have /// the same dynamic subpriority value. virtual long dynamic_subpriority (Dispatch_Entry &entry, @@ -320,17 +308,14 @@ protected: const Dispatch_Entry &second_entry); private: - /// = Comparison function to pass to qsort: calls instance ()->sort_comp (). static int sort_function (void *arg1, void *arg2); /// = Instance of the strategy. static ACE_RMS_Scheduler_Strategy *instance_; - }; - /** * @class ACE_MLF_Scheduler_Strategy * @@ -342,7 +327,6 @@ private: class TAO_RTSched_Export ACE_MLF_Scheduler_Strategy : public ACE_Scheduler_Strategy { public: - /// = Constructor. ACE_MLF_Scheduler_Strategy (ACE_DynScheduler::Preemption_Priority minimum_critical_priority = 0); @@ -366,7 +350,6 @@ public: dispatch_type (const Dispatch_Entry &entry); protected: - /** * = Returns a dynamic subpriority value at the current time for * the given timeline entry: if the operation has @@ -387,13 +370,11 @@ protected: const Dispatch_Entry &second_entry); private: - /// = Comparison function to pass to qsort: calls instance ()->sort_comp (). static int sort_function (void *arg1, void *arg2); /// = Instance of the strategy static ACE_MLF_Scheduler_Strategy *instance_; - }; @@ -408,7 +389,6 @@ private: class TAO_RTSched_Export ACE_EDF_Scheduler_Strategy : public ACE_Scheduler_Strategy { public: - /// = Default constructor. ACE_EDF_Scheduler_Strategy (ACE_DynScheduler::Preemption_Priority minimum_critical_priority = 0); @@ -433,7 +413,6 @@ public: dispatch_type (const Dispatch_Entry &entry); protected: - /** * = Returns a dynamic subpriority value at the current time for the * given timeline entry: if the operation has non-negative @@ -455,13 +434,11 @@ protected: const Dispatch_Entry &second_entry); private: - /// = Comparison function to pass to qsort: calls instance ()->sort_comp (). static int sort_function (void *arg1, void *arg2); /// = Instance of the strategy. static ACE_EDF_Scheduler_Strategy *instance_; - }; @@ -476,7 +453,6 @@ private: class TAO_RTSched_Export ACE_Criticality_Scheduler_Strategy : public ACE_Scheduler_Strategy { public: - /// = Constructor. ACE_Criticality_Scheduler_Strategy (ACE_DynScheduler::Preemption_Priority minimum_critical_priority = 0); @@ -507,7 +483,6 @@ public: dispatch_type (const Dispatch_Entry &entry); protected: - /// = Just returns 0: all operations have /// the same dynamic subpriority value. virtual long dynamic_subpriority (Dispatch_Entry &entry, @@ -520,13 +495,11 @@ protected: const Dispatch_Entry &second_entry); private: - /// = Comparison function to pass to qsort: calls instance ()->sort_comp (). static int sort_function (void *arg1, void *arg2); /// = Instance of the strategy. static ACE_Criticality_Scheduler_Strategy *instance_; - }; diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp index 7c990e8f968..c1d0f295880 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"); @@ -596,7 +595,6 @@ void ACE_Scheduler_Factory::log_scheduling_entry(TAO_Reconfig_Scheduler_Entry * log_tuple_subset(entry->prop_tuple_subset(), file); ACE_OS::fprintf(file, "\n }\n}"); - } void ACE_Scheduler_Factory::log_tuple_subset(TUPLE_SET & tuple_subset, @@ -630,7 +628,6 @@ void ACE_Scheduler_Factory::log_tuple_subset(TUPLE_SET & tuple_subset, } else { - ACE_OS::fprintf (file, subset_tuple_format, (*tuple_ptr_ptr)->handle, @@ -670,14 +667,11 @@ ACE_Scheduler_Factory::log_scheduling_entries(TAO_Reconfig_Scheduler_Entry ** en TAO_Reconfig_Scheduler_Entry * entry = entry_ptr_array[index]; log_scheduling_entry(entry, file); - - } ACE_OS::fclose (file); return 0; - } void diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h index 53ed18ce61c..cc6d0633dc1 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; @@ -83,7 +82,6 @@ public: RtecScheduler::Preemption_Priority_t preemption_priority; CORBA::Long info_type; RtecScheduler::RT_Info_Enabled_Type_t enabled; - }; @@ -244,7 +242,6 @@ public: static void rt_info_enable_state_default(RtecScheduler::RT_Info_Enabled_Type_t rt_info_enable_state_default); protected: - /** * By default this factory assumes we are runnning a config * run. Calling this method disables that. Since the methods @@ -271,7 +268,6 @@ private: /// Default rt_info enabled state. (Boeing Extension) static RtecScheduler::RT_Info_Enabled_Type_t rt_info_enable_state_default_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h index 8da232ed62b..693e3a9db4d 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h @@ -36,7 +36,6 @@ class TAO_RTSched_Export ACE_RT_Info : public RtecScheduler::RT_Info { public: - /// Construct a helper class instance from values for /// the fields of the IDL struct it wraps. ACE_RT_Info (const char* entry_point, @@ -54,7 +53,6 @@ public: /// Add a dependency of one RT_Info upon another. int add_dependency(RtecScheduler::handle_t dep, int number_of_calls = 1); - }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h index 547502dfee2..f0972555b06 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 * @@ -54,7 +53,6 @@ namespace TAO public virtual ::CORBA::LocalObject { public: - /// Constructor EstablishTrustPolicy (const ::Security::EstablishTrust &trust); @@ -74,7 +72,6 @@ namespace TAO virtual ::Security::EstablishTrust trust (void); protected: - /// Destructor /** * Protected destructor to enforce proper memory management @@ -83,13 +80,10 @@ namespace TAO ~EstablishTrustPolicy (void); private: - /// Quality of protection which can be specified for an object /// reference and used to protect messages. ::Security::EstablishTrust const trust_; - }; - } // End Security namespace } // End TAO namespace diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h index 3f1b5bc7ee8..08595155c0d 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h @@ -51,7 +51,6 @@ namespace TAO public virtual ::CORBA::LocalObject { public: - /// Constructor QOPPolicy (::Security::QOP qop); @@ -71,7 +70,6 @@ namespace TAO virtual ::Security::QOP qop (void); protected: - /// Destructor /** * Protected destructor to enforce proper memory management @@ -80,13 +78,10 @@ namespace TAO ~QOPPolicy (void); private: - /// Quality of protection which can be specified for an object /// reference and used to protect messages. ::Security::QOP const qop_; - }; - } // End Security namespace } // End TAO namespace diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp index 2f20367d331..ec1cd67695e 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp @@ -177,7 +177,6 @@ TAO::Security::AccessDecision::access_allowed_i (OBJECT_KEY &key, // For now we just return the default. return access_decision; - } CORBA::Boolean diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.h b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.h index 8aab5b872ca..1eb5c216138 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.h @@ -163,7 +163,6 @@ namespace TAO ::CORBA::Boolean access_allowed_i (OBJECT_KEY& key, const char *operation_name, CORBA::Boolean collocated = false); - }; /** @@ -177,7 +176,6 @@ namespace TAO public virtual ::CORBA::LocalObject { public: - /// Constructor SecurityManager (/* not sure what's needed yet */); @@ -200,7 +198,6 @@ namespace TAO //@} protected: - /// Destructor /** * Protected destructor to enforce proper memory management @@ -209,7 +206,6 @@ namespace TAO virtual ~SecurityManager (void); private: - /// The ORB-specific SecurityLevel2::PrincipalAuthenticator /// reference. // Except we're not going to have one of these right now @@ -218,7 +214,6 @@ namespace TAO // AccessDecision instance SecurityLevel2::AccessDecision_var access_decision_; }; - } // End SL3 namespace } // End TAO namespace diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h index 264096a34e5..19523a409b2 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h @@ -46,7 +46,6 @@ namespace TAO public virtual ::CORBA::LocalObject { public: - /// Constructor ContextEstablishmentPolicy ( SecurityLevel3::CredsDirective creds_directive, @@ -83,7 +82,6 @@ namespace TAO //@} protected: - /// Destructor /** * Protected destructor to enforce proper memory management @@ -92,16 +90,13 @@ namespace TAO ~ContextEstablishmentPolicy (void); private: - SecurityLevel3::CredsDirective creds_directive_; SecurityLevel3::OwnCredentialsList creds_list_; SecurityLevel3::FeatureDirective use_client_auth_; SecurityLevel3::FeatureDirective use_target_auth_; SecurityLevel3::FeatureDirective use_confidentiality_; SecurityLevel3::FeatureDirective use_integrity_; - }; - } // End SL3 namespace } // End TAO namespace diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h index 3b37c920a29..fa53a20768d 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 * @@ -43,7 +42,6 @@ namespace TAO class TAO_Security_Export CredentialsAcquirerFactory { public: - /// Destructor. virtual ~CredentialsAcquirerFactory (void); @@ -51,9 +49,7 @@ namespace TAO virtual SecurityLevel3::CredentialsAcquirer_ptr make ( TAO::SL3::CredentialsCurator_ptr curator, const CORBA::Any & acquisition_arguments) = 0; - }; - } // End SL3 namespace } // End TAO namespace diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp index a1f9556ebb6..001dd340523 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp @@ -111,7 +111,6 @@ TAO::SL3::CredentialsCurator::acquire_credentials ( } throw CORBA::BAD_PARAM (); - } SecurityLevel3::OwnCredentialsList * diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h index 2238cb76330..3b052972d9e 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h @@ -125,7 +125,6 @@ namespace TAO SecurityLevel3::OwnCredentials_ptr credentials); protected: - /// Destructor /** * Protected destructor to enforce proper memory management @@ -134,7 +133,6 @@ namespace TAO ~CredentialsCurator (void); private: - /// Lock used to synchronize access to underlying tables. TAO_SYNCH_MUTEX lock_; diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h index 315e25f6ac1..8771e870726 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h @@ -51,7 +51,6 @@ namespace TAO public virtual ::CORBA::LocalObject { public: - /// Constructor ObjectCredentialsPolicy ( const SecurityLevel3::OwnCredentialsList & creds); @@ -73,7 +72,6 @@ namespace TAO //@} protected: - /// Destructor /** * Protected destructor to enforce proper memory management @@ -82,12 +80,9 @@ namespace TAO ~ObjectCredentialsPolicy (void); private: - /// List of POA-specific OwnCredentials. SecurityLevel3::OwnCredentialsList creds_list_; - }; - } // End SL3 namespace } // End TAO namespace diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h index 62dccfbe615..f8930836857 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 * @@ -46,7 +45,6 @@ namespace TAO public virtual ::CORBA::LocalObject { public: - /** * @name Methods Required by the PolicyFactory Interface * @@ -56,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); @@ -64,7 +61,6 @@ namespace TAO //@} }; - } // End SL3 namespace. } // End TAO namespace. diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h index 4d7d76cb14b..0f88e7e2863 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h @@ -56,7 +56,6 @@ namespace TAO public virtual ::CORBA::LocalObject { public: - /// Constructor SecurityCurrent (size_t tss_slot, TAO_ORB_Core * oc); @@ -81,7 +80,6 @@ namespace TAO size_t tss_slot () const; protected: - /// Destructor /** * Protected destructor to enforce proper memory management @@ -90,7 +88,6 @@ namespace TAO ~SecurityCurrent (void); private: - /// Set the thread-specific storage /// SecurityLevel3::SecurityCurrent implementation. /** @@ -106,7 +103,6 @@ namespace TAO SecurityCurrent_Impl * implementation (void); private: - /** * @name Retricted Copying and Assignment * @@ -119,16 +115,13 @@ namespace TAO //@} private: - /// Thread-specific storage slot assigned to this object. const size_t tss_slot_; /// Pointer to the ORB Core corresponding to the ORB with which /// this object is registered. TAO_ORB_Core * const orb_core_; - }; - } // End SL3 namespace } // End TAO namespace diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h index a8427985509..1290e329877 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h @@ -66,7 +66,6 @@ namespace TAO /// Return the unique tag that identifies the concrete subclass. virtual CORBA::ULong tag () const = 0; }; - } // End Security namespace. } // End TAO namespace. diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h index 29be6b8bf09..8c301266429 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h @@ -46,7 +46,6 @@ namespace TAO public virtual ::CORBA::LocalObject { public: - /// Constructor SecurityManager (SecurityLevel3::CredentialsCurator_ptr cc); @@ -77,7 +76,6 @@ namespace TAO //@} protected: - /// Destructor /** * Protected destructor to enforce proper memory management @@ -86,13 +84,10 @@ namespace TAO virtual ~SecurityManager (void); private: - /// The ORB-specific SecurityLevel3::CredentialsCurator /// reference. SecurityLevel3::CredentialsCurator_var credentials_curator_; - }; - } // End SL3 namespace } // End TAO namespace diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h index fad2ea9eeb6..4c5c82673d9 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h @@ -44,7 +44,6 @@ namespace TAO class TAO_Security_Export Current_Impl { public: - /// Destructor. virtual ~Current_Impl (void); @@ -76,9 +75,7 @@ namespace TAO /// Return the unique tag that identifies the concrete subclass. virtual CORBA::ULong tag () const = 0; - }; - } // End Security namespace. } // End TAO namespace. diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h index 9dd11a96518..acea74c9755 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 * @@ -49,11 +48,9 @@ namespace TAO public ::CORBA::LocalObject { public: - virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any & value); }; - } // End Security namespace } // End TAO namespace 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/TAO_UTO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp index 73007d9845b..449fec195b3 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp @@ -152,7 +152,6 @@ TAO_UTO::time_to_interval (CosTime::UTO_ptr uto) TAO_TIO (uto_time, this->time ()), CORBA::NO_MEMORY ()); - } else { @@ -160,7 +159,6 @@ TAO_UTO::time_to_interval (CosTime::UTO_ptr uto) TAO_TIO (this->time (), uto_time), CORBA::NO_MEMORY ()); - } } catch (const CORBA::Exception& ex) diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp index 2dfdaaf37df..40415cb1e31 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 () @@ -74,7 +73,6 @@ Timer_Helper::handle_timeout (const ACE_Time_Value &, // Set the lowest time to the smallest time seen so far. if (curr_server_time < lowest_time) lowest_time = curr_server_time; - } if (TAO_debug_level > 0) diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp index aa6bc96b982..07fa0725ad3 100644 --- a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp +++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp @@ -5,7 +5,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Number of nanoseconds between CORBA and POSIX epochs. diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp index 3d20afdd2bd..f7c3fe02985 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp @@ -605,7 +605,6 @@ operator== (const TAO_Literal_Constraint& left, } - bool operator< (const TAO_Literal_Constraint& left, const TAO_Literal_Constraint& right) diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h index e87b992b6a9..b01598e7b01 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h @@ -392,7 +392,6 @@ public: /// uses the appropriate form of equals comparison. int operator () (TAO_DynSequence_i& dyn_any, CORBA::ULong element) const; - }; template<> diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp index 9d0429b6b46..8bbbced6a32 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp @@ -10,7 +10,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL - #define YY_INT_ALIGNED short int /* A lexical scanner generated by flex */ @@ -22,9 +21,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 6 @@ -53,13 +49,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - - - - - /* First, we deal with platform-specific or compiler-specific issues. */ /* begin standard C headers. */ @@ -176,13 +165,6 @@ typedef unsigned int flex_uint32_t; - - - - - - - /* Enter a start condition. This macro really ought to take a parameter, * but we do it the disgusting crufty way forced on us by the ()-less * definition of BEGIN. @@ -220,7 +202,6 @@ typedef unsigned int flex_uint32_t; #define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type)) - #ifndef YY_TYPEDEF_YY_BUFFER_STATE #define YY_TYPEDEF_YY_BUFFER_STATE typedef struct yy_buffer_state *YY_BUFFER_STATE; @@ -266,7 +247,6 @@ struct yy_buffer_state FILE *yy_input_file; - char *yy_ch_buf; /* input buffer */ char *yy_buf_pos; /* current position in input buffer */ @@ -334,7 +314,6 @@ static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ - /* We provide macros for accessing buffer states in case in the * future we want to put the buffer states in a more general * "scanner state". @@ -350,7 +329,6 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ #define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)] - /* yy_hold_char holds the character lost when yytext is formed. */ static char yy_hold_char; static int yy_n_chars; /* number of characters read into yy_ch_buf */ @@ -434,7 +412,6 @@ extern char *yytext; - static yy_state_type yy_get_previous_state ( ); static yy_state_type yy_try_NUL_trans ( yy_state_type current_state ); static int yy_get_next_buffer ( ); @@ -442,7 +419,6 @@ static void yynoreturn yy_fatal_error ( const char* msg ); - /* Done after the current pattern has been matched and before the * corresponding action - sets up yytext. */ @@ -629,12 +605,10 @@ static CORBA::ULongLong trader_strtoull(const char* str, unsigned int base); - #define INITIAL 0 - #ifndef YY_NO_UNISTD_H /* Special case for "unistd.h", since it is non-ANSI. We include it way * down here because we want the user's section 1 to have been scanned first. @@ -643,14 +617,12 @@ static CORBA::ULongLong trader_strtoull(const char* str, unsigned int base); #endif - #ifndef YY_EXTRA_TYPE #define YY_EXTRA_TYPE void * #endif - static int yy_init_globals ( ); @@ -661,59 +633,45 @@ static int yy_init_globals ( ); int yylex_destroy ( ); - int yyget_debug ( ); - void yyset_debug ( int debug_flag ); - YY_EXTRA_TYPE yyget_extra ( ); - void yyset_extra ( YY_EXTRA_TYPE user_defined ); - FILE *yyget_in ( ); - void yyset_in ( FILE * _in_str ); - FILE *yyget_out ( ); - void yyset_out ( FILE * _out_str ); - int yyget_leng ( ); - char *yyget_text ( ); - int yyget_lineno ( ); - void yyset_lineno ( int _line_number ); - - /* Macros after this point can all be overridden by user definitions in * section 1. */ @@ -755,8 +713,6 @@ static int input ( void ); - - /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE #ifdef __ia64__ @@ -777,7 +733,6 @@ static int input ( void ); #endif - /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, * is returned in "result". */ @@ -815,7 +770,6 @@ static int input ( void ); #endif - /* No semi-colon after return; correct usage is to write "yyterminate();" - * we don't want an extra ';' after the "return" because that will cause * some compilers to complain about unreachable statements. @@ -837,11 +791,9 @@ static int input ( void ); #endif - /* end tables serialization structures and prototypes */ - /* Default declaration of generated scanner - a define so the user can * easily add parameters. */ @@ -854,8 +806,6 @@ static int input ( void ); - - extern int yylex (); #define YY_DECL int yylex (void) @@ -870,14 +820,12 @@ extern int yylex (); #endif - /* Code executed at the end of each rule. */ #ifndef YY_BREAK #define YY_BREAK /*LINTED*/break; #endif - #define YY_RULE_SETUP \ YY_USER_ACTION @@ -897,8 +845,6 @@ YY_DECL - - if ( !(yy_init) ) { (yy_init) = 1; @@ -908,7 +854,6 @@ YY_DECL #endif - if ( ! (yy_start) ) (yy_start) = 1; /* first start state */ @@ -928,9 +873,6 @@ YY_DECL } { - - - while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { yy_cp = (yy_c_buf_p); @@ -976,7 +918,6 @@ yy_find_action: YY_DO_BEFORE_ACTION; - do_action: /* This label is used only to access EOF actions. */ @@ -1290,7 +1231,6 @@ case YY_STATE_EOF(INITIAL): - /* yy_get_next_buffer - try to read in a new buffer * * Returns a code representing an action: @@ -1382,7 +1322,6 @@ static int yy_get_next_buffer () num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; - } if ( num_to_read > YY_READ_BUF_SIZE ) @@ -1529,7 +1468,6 @@ static int yy_get_next_buffer () *--yy_cp = (char) c; - (yytext_ptr) = yy_bp; (yy_hold_char) = *yy_cp; (yy_c_buf_p) = yy_cp; @@ -1619,7 +1557,6 @@ static int yy_get_next_buffer () */ void yyrestart (FILE * input_file ) { - if ( ! YY_CURRENT_BUFFER ){ yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = @@ -1637,7 +1574,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(); @@ -1712,7 +1648,6 @@ static void yy_load_buffer_state () */ void yy_delete_buffer (YY_BUFFER_STATE b ) { - if ( ! b ) return; @@ -1750,7 +1685,6 @@ static void yy_load_buffer_state () } - b->yy_is_interactive = file ? (ACE_OS::isatty( fileno(file) ) > 0) : 0; @@ -1846,7 +1780,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. @@ -1867,7 +1800,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 */; @@ -1888,7 +1820,6 @@ static void yyensure_buffer_stack () - /** Setup the input buffer state to scan directly from a user-specified character buffer. * @param base the character buffer * @param size the size in bytes of the character buffer @@ -1926,7 +1857,6 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) - /** Setup the input buffer state to scan a string. The next call to yylex() will * scan from a @e copy of @a str. * @param yystr a NUL-terminated string to scan @@ -1937,13 +1867,11 @@ 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) ); } - /** Setup the input buffer state to scan the given bytes. The next call to yylex() will * scan from a @e copy of @a bytes. * @param yybytes the byte buffer to scan @@ -1988,9 +1916,6 @@ YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len ) - - - #ifndef YY_EXIT_FAILURE #define YY_EXIT_FAILURE 2 #endif @@ -2019,25 +1944,20 @@ static void yynoreturn yy_fatal_error (const char* msg ) while ( 0 ) - /* Accessor methods (get/set functions) to struct members. */ - /** Get the current line number. * */ int yyget_lineno () { - - return yylineno; } - /** Get the input stream. * */ @@ -2047,7 +1967,6 @@ FILE *yyget_in () } - /** Get the output stream. * */ @@ -2057,7 +1976,6 @@ FILE *yyget_out () } - /** Get the length of the current token. * */ @@ -2078,15 +1996,12 @@ char *yyget_text () - /** Set the current line number. * @param _line_number line number * */ void yyset_lineno (int _line_number ) { - - yylineno = _line_number; } @@ -2094,7 +2009,6 @@ void yyset_lineno (int _line_number ) - /** Set the input stream. This does not discard the current * input buffer. * @param _in_str A readable stream. @@ -2107,7 +2021,6 @@ void yyset_in (FILE * _in_str ) } - void yyset_out (FILE * _out_str ) { yyout = _out_str ; @@ -2115,21 +2028,18 @@ void yyset_out (FILE * _out_str ) - int yyget_debug () { return yy_flex_debug; } - void yyset_debug (int _bdebug ) { yy_flex_debug = _bdebug ; } - static int yy_init_globals () { /* Initialization is the same as for the non-reentrant scanner. @@ -2148,8 +2058,6 @@ static int yy_init_globals () - - /* Defined in main.c */ #ifdef YY_STDINIT yyin = stdin; @@ -2169,7 +2077,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 ); @@ -2184,7 +2091,6 @@ int yylex_destroy () - /* Reset the globals. This is important in a non-reentrant scanner so the next time * yylex() is called, initialization will occur. */ yy_init_globals( ); @@ -2193,17 +2099,14 @@ int yylex_destroy () } - /* * Internal utility routines. */ - #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]; @@ -2211,7 +2114,6 @@ static void yy_flex_strncpy (char* s1, const char * s2, int n ) #endif - #ifdef YY_NEED_STRLEN static int yy_flex_strlen (const char * s ) { @@ -2224,17 +2126,14 @@ static int yy_flex_strlen (const char * s ) #endif - void *yyalloc (yy_size_t size ) { return malloc(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 @@ -2246,7 +2145,6 @@ void *yyrealloc (void * ptr, yy_size_t size ) } - void yyfree (void * ptr ) { free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ @@ -2260,8 +2158,6 @@ void yyfree (void * ptr ) - - TAO_Literal_Constraint* extract_string(const char* total) { diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp index d44d126c578..f3a9f0daf72 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, @@ -359,7 +358,6 @@ static const char *const yyrule[] = { "factor : TAO_MINUS TAO_NUMBER", "factor : TAO_STRING", "factor : TAO_BOOLEAN", - }; #endif @@ -766,11 +764,9 @@ yyloop: ctry = save->ctry; if (save->state != yystate) YYABORT; yyFreeState(save); - } else { - /* Unresolved conflict - start/continue trial parse */ YYParseState *save; #if YYDEBUG diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h index f5d8691fdd6..9c07d2de9aa 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h @@ -81,7 +81,6 @@ public: static int copy_into (char* buf, int max_size); private: - /// Pointers to keep track of the input string. static char* string_; static char* current_; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h index c6929ec2c1b..5c9920b52d9 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h @@ -83,7 +83,6 @@ class TAO_Sequence_Extracter_Base // Static methods used by the TAO_Sequence_Extracter class. { public: - static CORBA::TCKind sequence_type (CORBA::TypeCode* code); // Return the sequence element type for the sequence whose typecode // is <code>. diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h index 2d056734fcc..f2aff058875 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h @@ -50,7 +50,6 @@ class TAO_Offer_Database { friend class TAO_Service_Offer_Iterator<LOCK_TYPE>; public: - // Traits typedef TAO_Service_Offer_Iterator<LOCK_TYPE> offer_iterator; 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/Offer_Iterators.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h index 9ae6c26fd71..3b666b1647b 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h @@ -131,7 +131,6 @@ public: const CosTrading::Offer* offer); private: - TAO_Query_Only_Offer_Iterator (const TAO_Query_Only_Offer_Iterator&); TAO_Query_Only_Offer_Iterator& operator=(const TAO_Query_Only_Offer_Iterator&); @@ -162,7 +161,6 @@ class TAO_Offer_Iterator_Collection : // the trader graph is deep enough. { public: - // = Constructors. TAO_Offer_Iterator_Collection (void); @@ -183,7 +181,6 @@ public: void add_offer_iterator (CosTrading::OfferIterator_ptr offer_iter); private: - TAO_Offer_Iterator_Collection (const TAO_Offer_Iterator_Collection&); TAO_Offer_Iterator_Collection& operator= (const TAO_Offer_Iterator_Collection&); @@ -214,7 +211,6 @@ class TAO_Offer_Id_Iterator : // END SPEC { public: - /// No op constructor TAO_Offer_Id_Iterator(void); @@ -255,7 +251,6 @@ class TAO_Offer_Id_Iterator : void insert_id(CosTrading::OfferId new_id); private: - TAO_Offer_Id_Iterator (const TAO_Offer_Id_Iterator&); TAO_Offer_Id_Iterator& operator= (TAO_Offer_Id_Iterator&); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h index 8cf9d872641..56781cb073f 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h @@ -65,7 +65,6 @@ public: const CosTrading::Offer *); private: - /// A reference to the trader is needed for access to the map of offers. TAO_Offer_Database<MAP_LOCK_TYPE> &db_; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h index ed02cdd2173..c8fac5d4ee5 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h @@ -178,7 +178,6 @@ public: virtual void unmask_type (const char *name); private: - /** * @class Type_Info * 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_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h index fc5e9b84792..de440bd108a 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h @@ -37,7 +37,6 @@ class TAO_Trading_Serv_Export TAO_Trader_Constraint_Validator /// Desctructor. virtual ~TAO_Trader_Constraint_Validator (); - }; class TAO_Trading_Serv_Export TAO_Trader_Constraint_Evaluator : public TAO_Constraint_Evaluator diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h index 084af6df4fd..f4841634760 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h @@ -509,7 +509,6 @@ class TAO_Admin : public TAO_Link_Attributes <POA_CosTrading::Admin> { public: - TAO_Admin (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader); ~TAO_Admin (void); @@ -618,7 +617,6 @@ class TAO_Link : public TAO_Link_Attributes <POA_CosTrading::Link> { public: - TAO_Link (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader); ~TAO_Link (void); 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/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h index b5efbed8b0e..5d59d850685 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h @@ -40,7 +40,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Trading_Serv_Export TAO_Property_Evaluator { public: - TAO_Property_Evaluator(const CosTrading::PropertySeq& properties, CORBA::Boolean supports_dp = 1); @@ -121,7 +120,6 @@ private: class TAO_Trading_Serv_Export TAO_Property_Evaluator_By_Name : public TAO_Property_Evaluator { public: - TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties , CORBA::Boolean supports_dp = 1); @@ -158,7 +156,6 @@ public: const CosTrading::Property* get_property (const char* property_name); private: - TAO_Property_Evaluator_By_Name (const TAO_Property_Evaluator_By_Name&); TAO_Property_Evaluator_By_Name& operator= (const TAO_Property_Evaluator_By_Name&); @@ -428,7 +425,6 @@ public: const CosTrading::Link::LinkInfo& link_info) const; private: - /// Reconclile a ULong property with its default. CORBA::ULong ulong_prop (POLICY_TYPE pol) const; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp index a8f06ab62e0..446b5354008 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp @@ -94,7 +94,6 @@ TAO_Trading_Loader::init (int argc, ACE_TCHAR *argv[]) // Initializes and sets up the Trading Service CORBA::Object_var object = this->create_object (orb.in (), command_line.get_argc(), command_line.get_TCHAR_argv()); - } catch (const CORBA::Exception&) { diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp index 1a3227e308a..de2cf0f85be 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; @@ -141,7 +140,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_hrtime_t now = ACE_OS::gethrtime (); history.sample (now - start); - } ACE_hrtime_t test_end = ACE_OS::gethrtime (); diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp index d3e59a5cb51..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; @@ -236,7 +235,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } - try { ORBInitializer *initializer = 0; 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 895f4baa45a..484d20cc47c 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h @@ -32,7 +32,6 @@ class RPS_Monitor : public virtual POA_CosLoadBalancing::LoadMonitor { public: - /// Constructor RPS_Monitor (ServerRequestInterceptor * interceptor); @@ -42,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. @@ -61,7 +59,6 @@ public: //@} protected: - /// Destructor /** * Protected destructor to enforce proper memory management through @@ -70,7 +67,6 @@ protected: ~RPS_Monitor (void); private: - /// The name of the location at which this LoadMonitor resides. CosLoadBalancing::Location location_; 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/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp index d9339f79429..b6de5b57c68 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp @@ -141,7 +141,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_hrtime_t now = ACE_OS::gethrtime (); history.sample (now - start); - } ACE_hrtime_t test_end = ACE_OS::gethrtime (); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp index 77f774eeef6..b9b51ce7053 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp @@ -29,7 +29,6 @@ #include "ace/Barrier.h" - int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { const CORBA::Long experiment_id = 1; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp index 1720871c44f..93af9abe2dd 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp @@ -27,7 +27,6 @@ #include "ace/Barrier.h" - const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); int nthreads = 0; int high_priority_period = 0; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp index 44cc2c67df1..45bea32dbde 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp @@ -81,7 +81,6 @@ public: ACE_hrtime_t elapsed = ACE_OS::gethrtime () - start; this->sample_history.sample (elapsed); - } catch (const CORBA::Exception&) { } } @@ -134,7 +133,6 @@ public: CORBA::ULongLong dummy = 0; (void) this->roundtrip_->test_method (dummy, this->workload_); - } catch (const CORBA::Exception&) { } } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp index 76ac8596c38..2f1082f663d 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp @@ -158,7 +158,6 @@ public: try{ CORBA::ULongLong dummy = 0; (void) session->sample (dummy); - } catch (const CORBA::Exception&) { } } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp index d29ccb9964f..58f8003d5dc 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp @@ -26,7 +26,6 @@ #include "ace/Barrier.h" - int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { const CORBA::Long experiment_id = 1; diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp index e04a1d22fcd..15a3da0fa7a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp @@ -583,7 +583,6 @@ Connection_Manager::destroy (const ACE_CString &flowname) this->receivers_.unbind (flowname); this->streamctrls_.unbind (flowname ); - } Connection_Manager::Receivers & diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h index 654488b0b08..4288e5cc846 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h @@ -36,7 +36,6 @@ class Endpoint_Addresses class Connection_Manager { public: - /// Constructor Connection_Manager (void); @@ -85,7 +84,6 @@ public: Protocol_Objects; - // Map of streamctrl. typedef ACE_Hash_Map_Manager<ACE_CString, AVStreams::StreamCtrl_var, @@ -106,9 +104,6 @@ public: void load_ep_addr (const char* file_name); protected: - - - void find_receivers (void); void add_to_receivers (CosNaming::BindingList &binding_list); diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h index 687d48db000..498a2d37b03 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h @@ -27,7 +27,6 @@ class Distributer_Receiver_Callback : public TAO_AV_Callback { public: - /// Constructor. Distributer_Receiver_Callback (void); diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp index 768ec577f22..8cf78960834 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp @@ -70,7 +70,6 @@ Receiver_Callback::handle_destroy (void) { ex._tao_print_exception ("Receiver_Callback::handle_destroy Failed\n"); return -1; - } return 0; @@ -230,7 +229,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // Hack for now.... ACE_OS::sleep (1); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h index 32dd67bdff7..cdc2308ac61 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h @@ -27,7 +27,6 @@ class Receiver_Callback : public TAO_AV_Callback { public: - /// Constructor. Receiver_Callback (void); diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp index eda4570e7eb..03e265cdfe4 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp @@ -101,7 +101,6 @@ Sender::init (int argc, ACE_TCHAR *argv[]) return result; - // Parse the command line arguments result = this->parse_args (argc, argv); @@ -257,7 +256,6 @@ Sender::pace_data (void) // Reset the message block. this->mb_.reset (); - } // end while } catch (const CORBA::Exception& ex) @@ -306,7 +304,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) "client::init failed\n"), -1); SENDER::instance ()->pace_data (); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp index 87785bb6e65..531173b6d4f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp @@ -123,7 +123,6 @@ Receiver_Callback::handle_destroy (void) ex._tao_print_exception ( "Receiver_Callback::handle_destroy Failed\n"); return -1; - } } diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h index cabbbcc2e92..257c20d783f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h @@ -28,7 +28,6 @@ class Receiver_Callback : public TAO_AV_Callback { public: - /// Constructor. Receiver_Callback (void); @@ -135,5 +134,4 @@ protected: /// Message block into which data is read from a file and then sent. ACE_Message_Block mb_; - }; diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp index 4ab1e54dc56..da72c56164b 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp @@ -382,7 +382,6 @@ Sender::pace_data (void) // Reset the message block. this->mb_.reset (); - } // end while // File reading is complete, destroy the stream. diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h index bf531089d2b..785eb117420 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h @@ -27,7 +27,6 @@ class Sender_Callback : public TAO_AV_Callback { public: - /// Constructor. Sender_Callback (void); diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h index 587edfb50fa..34d8269cb04 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h @@ -32,7 +32,6 @@ class Connection_Manager { public: - /// Constructor Connection_Manager (void); @@ -98,7 +97,6 @@ public: StreamCtrls &streamctrls (void); protected: - void find_receivers (void); void add_to_receivers (CosNaming::BindingList &binding_list); diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp index 535b16c0b06..fbe163dff5c 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp @@ -23,7 +23,6 @@ Signal_Handler::handle_signal (int signum, siginfo_t *, ucontext_t*) "In the signal handler\n")); DISTRIBUTER::instance ()->done (1); - } return 0; } @@ -119,15 +118,12 @@ Distributer_Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flo ///Destroy old stream with the same flowname. connection_manager.destroy (flowname); - } /// Store the related streamctrl. connection_manager.add_streamctrl (flowname.c_str (), this); - } return true; - } @@ -391,7 +387,6 @@ Distributer::shut_down (void) sender_mmdevice.in ()); // DISTRIBUTER::instance ()->connection_manager ().destroy (); - } catch (const CORBA::Exception& ex) { @@ -439,14 +434,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (wp) { orb->perform_work (); - } } DISTRIBUTER::instance ()->shut_down (); // orb->shutdown(true); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h index 1a4a1038377..7e7bdc750a6 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h @@ -25,14 +25,11 @@ */ class Signal_Handler : public ACE_Event_Handler { - public: - Signal_Handler (void); /// Override this method to implement graceful shutdown. int handle_signal(int signum, siginfo_t*,ucontext_t*); - }; @@ -46,7 +43,6 @@ public: class Distributer_Receiver_Callback : public TAO_AV_Callback { public: - //// Constructor. Distributer_Receiver_Callback (void); @@ -83,9 +79,7 @@ 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. int handle_destroy (void); @@ -95,9 +89,7 @@ public: void flowname (const ACE_CString &flowname); private: - ACE_CString flowname_; - }; /** diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp index 49d8fc18d9b..b6a113c5e18 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp @@ -68,10 +68,8 @@ Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &flows /// Store the related streamctrl. connection_manager->add_streamctrl (flowname.c_str (), this); - } return 1; - } Receiver_Callback::Receiver_Callback (void) @@ -146,7 +144,6 @@ Receiver::Receiver (void) Receiver::~Receiver (void) { - } ACE_CString @@ -264,8 +261,6 @@ Receiver::shut_down (void) this->connection_manager_.unbind_receiver (this->sender_name_, this->receiver_name_, mmdevice_obj.in ()); - - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h index 681b8c7ebc9..87407f68ad3 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h @@ -25,14 +25,11 @@ */ class Signal_Handler : public ACE_Event_Handler { - public: - Signal_Handler (void); /// Override this method to implement graceful shutdown. int handle_signal(int signum, siginfo_t*,ucontext_t*); - }; /** @@ -45,7 +42,6 @@ public: class Receiver_Callback : public TAO_AV_Callback { public: - //// Constructor. Receiver_Callback (void); diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp index b7b47d1a487..e2958400895 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp @@ -31,7 +31,6 @@ Signal_Handler::handle_signal (int signum, siginfo_t *, ucontext_t*) "In the signal handler\n")); g_shutdown = 1; - } return 0; } @@ -157,7 +156,6 @@ Sender::shut_down (void) SENDER::instance ()->connection_manager ().unbind_sender (this->sender_name_, mmdevice.in ()); - } catch (const CORBA::Exception& ex) { @@ -296,7 +294,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, @@ -327,7 +324,6 @@ Sender::pace_data (void) this->shut_down (); break; - } this->mb_.wr_ptr (n); @@ -366,7 +362,6 @@ Sender::pace_data (void) /// Run the orb for the wait time so the sender can /// continue other orb requests. TAO_AV_CORE::instance ()->orb ()->run (wait_time); - } } @@ -397,7 +392,6 @@ Sender::pace_data (void) /// Reset the message block. this->mb_.reset (); - } /// end while } diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h index c179a105c2b..624cf488220 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h @@ -25,14 +25,11 @@ */ class Signal_Handler : public ACE_Event_Handler { - public: - Signal_Handler (void); /// Override this method to implement graceful shutdown. int handle_signal(int signum, siginfo_t*,ucontext_t*); - }; @@ -46,9 +43,7 @@ public: */ class Sender_Callback : public TAO_AV_Callback { - public: - /** * Called when the sender has finished reading the file and wants * to close down the connection. Also called when the distributer diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp index 505e18eb11c..0bd805403cb 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 (); @@ -314,7 +313,6 @@ Client::run (void) this->orb_->run (tv); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - } catch (const CORBA::Exception& ex) { @@ -354,7 +352,6 @@ ACE_TMAIN (int argc, if (result < 0) ACE_ERROR_RETURN ((LM_ERROR,"client::run failed\n"),1); - } catch (const CORBA::Exception& ex) diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp index 808d78b1227..74090d97812 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp @@ -136,8 +136,6 @@ Server::init (int argc, // Register the video control object with the naming server. this->my_naming_client_->rebind (server_sep_b_name, sep_b_.in ()); - - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp index 793325b735d..183dca390a0 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp @@ -148,7 +148,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // flow_spec.length (0); // stream_control->stop (flow_spec); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp index b538a2695fa..72d5d0e4b7f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp @@ -172,7 +172,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "done %d\n", gsf)); recv_latency.dump_results (ACE_TEXT("Receive"), gsf); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.h b/TAO/orbsvcs/tests/AVStreams/Latency/ping.h index b5623956b53..d291d427f57 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.h +++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.h @@ -45,7 +45,6 @@ private: class Pong_Send_Callback : public TAO_AV_Callback { public: - /// Ad-hoc method to send a response outside the context of a /// handle_timeout. int send_response (ACE_hrtime_t stamp); diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp index 9911cbb775a..c636d9d9977 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp @@ -190,7 +190,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) recv_latency.dump_results (ACE_TEXT("Receive"), gsf); send_latency.dump_results (ACE_TEXT("Send"), gsf); - } catch (const CORBA::Exception& ex) { @@ -303,7 +302,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/Latency/pong.h b/TAO/orbsvcs/tests/AVStreams/Latency/pong.h index 637140564ed..042874c5726 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.h +++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.h @@ -54,7 +54,6 @@ private: /// Pre-allocate the message block to send... ACE_Message_Block frame_; int count_; - }; class Ping_Send : public TAO_FlowProducer diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp index 829afe4ed37..fa2b9a8bb5c 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp @@ -140,7 +140,6 @@ Receiver_Callback::handle_destroy (void) { ex._tao_print_exception ("Receiver_Callback::handle_destroy Failed\n"); return -1; - } return 0; @@ -156,7 +155,6 @@ Receiver::~Receiver (void) } - int Receiver::init (int, ACE_TCHAR *[]) diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h index 6d15aa43d28..e7e42a437dd 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h @@ -18,7 +18,6 @@ class Receiver_Callback : public TAO_AV_Callback { public: - Receiver_Callback (void); /// Constructor. @@ -41,13 +40,11 @@ private: /// Related stream control. AVStreams::StreamCtrl_ptr streamctrl_; - }; // = 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..f5f5ac9169a 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_); @@ -331,7 +329,6 @@ Sender::pace_data (void) // Reset the message block. this->mb_.reset (); - } // end while // File reading is complete, destroy the stream. @@ -386,7 +383,6 @@ ACE_TMAIN (int argc, // Start sending data. result = SENDER::instance ()->pace_data (); - } catch (const CORBA::Exception& ex) { 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/Multicast_Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp index 2a384f91291..c07f8cc9356 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp @@ -125,7 +125,6 @@ Client::parse_args (int argc, ACE_TCHAR *argv[]) default: ACE_DEBUG ((LM_DEBUG,"Unknown option\n")); return -1; - } } return 0; @@ -181,7 +180,6 @@ Client::Client (void) protocol_ (ACE_OS::strdup ("UDP")) { endpoint_strategy_.init (TAO_AV_CORE::instance ()->orb (), TAO_AV_CORE::instance ()->poa ()); - } diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp index 15f68fb1acb..6ee1789465a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp @@ -66,7 +66,6 @@ Receiver_Callback::flowname (const char* flow_name) "%C File Opened Successfully\n", this->flowname_.c_str ())); - } int diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h index 83448da9579..f77e96f88d9 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h @@ -28,7 +28,6 @@ class Receiver_Callback : public TAO_AV_Callback { public: - /// Constructor. Receiver_Callback (void); @@ -55,7 +54,6 @@ private: /// File handle of the file into which received data is written. FILE *output_file_; - }; /** @@ -133,5 +131,4 @@ protected: /// Message block into which data is read from a file and then sent. ACE_Message_Block mb_; - }; diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp index 805b34997c8..887f61024ab 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp @@ -60,7 +60,6 @@ Sender::shutdown (void) // Shut the orb down. TAO_AV_CORE::instance ()->orb ()->shutdown (0); - } int @@ -335,7 +334,6 @@ Sender::pace_data (void) // Reset the message block. this->mb_.reset (); - } // end while ACE_OS::sleep (1); diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h index e26e31aa300..0c24070105d 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h @@ -117,5 +117,4 @@ private: /// Protocol object corresponding to the transport protocol selected. ProtocolObject_Set protocol_object_; - }; diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp index 4767b8cb342..2062fc50c38 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) { @@ -377,7 +375,6 @@ Client::pace_data (void) // Reset the mb. this->mb.reset (); - } // end while // Since the file is read stop the stream. @@ -386,7 +383,6 @@ Client::pace_data (void) // Shut the orb down. TAO_AV_CORE::instance ()->orb ()->shutdown (0); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h index bc2d2f3a855..b3075bfe36a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h @@ -11,7 +11,6 @@ //============================================================================= - #ifndef TAO_AV_FTP_H #define TAO_AV_FTP_H @@ -51,7 +50,6 @@ public: */ class FTP_Client_StreamEndPoint : public TAO_Client_StreamEndPoint { - public: /// Constructor FTP_Client_StreamEndPoint (void); @@ -163,7 +161,6 @@ private: /// Protocol object corresponding to the transport protocol selected. TAO_AV_Protocol_Object* protocol_object_; - }; typedef ACE_Unmanaged_Singleton<Client,ACE_Null_Mutex> CLIENT; diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h index 9e79d0ccaea..c0d90d7c4a5 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h @@ -26,9 +26,7 @@ */ 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, TAO_AV_frame_info *frame_info, diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp index fd8a2e09260..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)); @@ -237,5 +236,3 @@ ACE_STATIC_SVC_DEFINE (TimeStamp_Protocol_Factory, - - diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h index 1d8ccea084b..565824238c0 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h @@ -27,7 +27,6 @@ class Receiver_Callback : public TAO_AV_Callback { public: - /// Constructor. Receiver_Callback (void); diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp index ec3f5548c13..7e567f8abf3 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp @@ -305,7 +305,6 @@ Sender::pace_data (void) // Reset the message block. this->mb_.reset (); - } // end while // File reading is complete, destroy the stream. diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h index 071fc07d339..cb035503a16 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h @@ -27,7 +27,6 @@ class Distributer_Receiver_Callback : public TAO_AV_Callback { public: - /// Constructor. Distributer_Receiver_Callback (void); diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp index c5d8103778f..db2f5ae960b 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp @@ -70,7 +70,6 @@ Receiver_Callback::handle_destroy (void) { ex._tao_print_exception ("Receiver_Callback::handle_destroy Failed\n"); return -1; - } return 0; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h index 1d8ccea084b..565824238c0 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h @@ -27,7 +27,6 @@ class Receiver_Callback : public TAO_AV_Callback { public: - /// Constructor. Receiver_Callback (void); diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp index 740430dec90..53cb840518c 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp @@ -280,7 +280,6 @@ Sender::pace_data (void) // Reset the message block. this->mb_.reset (); - } // end while // If a stream was setup, destroy it. diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp index 26ad37fdce5..83dfc47aa97 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp @@ -7,7 +7,6 @@ #endif /* __ACE_INLINE__ */ - void Receiver_Stats::accumulate (const Receiver_Stats &rhs) { diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp index d1ee8185118..403c5ac0893 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp @@ -131,7 +131,6 @@ Receiver_Callback::handle_destroy (void) { ex._tao_print_exception ("Receiver_Callback::handle_destroy Failed\n"); return -1; - } return 0; @@ -279,8 +278,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_OS::sleep (1); orb->destroy (); - - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h index 21a7eece79a..562a0c7b7f3 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h @@ -28,7 +28,6 @@ class Receiver_Callback : public TAO_AV_Callback { public: - /// Constructor. Receiver_Callback (void); @@ -49,7 +48,6 @@ private: int frame_count_; Receiver_Stats stats_; - }; /** @@ -69,7 +67,6 @@ public: private: /// Receiver application callback. Receiver_Callback callback_; - }; /** @@ -104,6 +101,4 @@ protected: /// Receiver MMDevice. TAO_MMDevice *mmdevice_; - - }; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp index 48b4b51d641..f1ad51fba21 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp @@ -396,7 +396,6 @@ Sender::pace_data (void) // Reset the message block. this->mb_.reset (); - } // end while // File reading is complete, destroy the stream. diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h index 54c3a285e89..672880fdae1 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h @@ -129,5 +129,4 @@ private: int num_peer_sec_addrs_; long max_frame_count_; - }; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp index a4b8f17c4d0..222c21eaaf0 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp @@ -71,7 +71,6 @@ Receiver_Callback::handle_destroy (void) { ex._tao_print_exception ("Receiver_Callback::handle_destroy Failed\n"); return -1; - } return 0; @@ -87,7 +86,6 @@ Receiver::~Receiver (void) } - int Receiver::init (int, ACE_TCHAR *[]) diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h index 89a97c1a1cd..79df05554f7 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h @@ -28,7 +28,6 @@ class Receiver_Callback : public TAO_AV_Callback { public: - /// Constructor. Receiver_Callback (void); 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..0936a4361c2 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_); @@ -466,7 +464,6 @@ Sender::pace_data (void) // Shut the orb down. TAO_AV_CORE::instance ()->orb ()->shutdown (0); - } catch (const CORBA::Exception& ex) { 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_1630_Regression/testclient.cpp b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp index 402016611d7..1303aa8587a 100644 --- a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp +++ b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp @@ -115,7 +115,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) contextIds) ; - // Create operation list. // CORBA::NVList_var opList ; diff --git a/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp b/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp index c3e99f7402e..296091f8adf 100644 --- a/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp +++ b/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp @@ -8,7 +8,6 @@ #include "orbsvcs/CosNamingC.h" - ORB_Task::ORB_Task (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h b/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h index 511c16107ea..8114d09b443 100644 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h @@ -20,7 +20,6 @@ public: private: CORBA::ORB_var orb_; - }; #include /**/ "ace/post.h" 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_2247_Regression/Manager.h b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h index 540af93a4ae..faf7974845d 100644 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h @@ -13,7 +13,6 @@ class Manager { public: - Manager (void); // Ctor diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp index 7b1749f6094..f61cada2e74 100644 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp @@ -107,7 +107,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) poa_manager->activate (); orb->run (); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h b/TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h index 59a997ec94b..1c6cbd957a5 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h @@ -30,7 +30,6 @@ public: private: CORBA::ORB_var orb_; - }; #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h index ed531adfc9e..9ef8038e345 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h @@ -39,7 +39,6 @@ class Server_ORBInitializer : public virtual ::CORBA::LocalObject { public: - /// Constructor. Server_ORBInitializer (void); @@ -52,7 +51,6 @@ public: PortableInterceptor::ServerRequestInterceptor_ptr server_interceptor (void); private: - /// Pointer to the server request interceptor. ORB is responsible /// for storage. PortableInterceptor::ServerRequestInterceptor_var server_interceptor_; 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_Request_Interceptor.h b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h index 38b1816f083..0ca097fd5e4 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h @@ -33,7 +33,6 @@ class Server_Request_Interceptor public virtual ::CORBA::LocalObject { public: - /// Constructor. Server_Request_Interceptor (void); @@ -74,7 +73,6 @@ public: //@} private: - /// References to the two objects used in this test. CORBA::String_var iorstr_; int request_forwarded_; diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.h b/TAO/orbsvcs/tests/Bug_2248_Regression/client.h index f8241ccd2f4..ef85b83dc8a 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.h +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.h @@ -12,7 +12,6 @@ class Manager { public: - Manager (void); // Ctor @@ -34,7 +33,6 @@ public: CORBA::ORB_ptr orb (void); private: - /// Write the merged IOGRs to a file int write_to_file (CORBA::Object_ptr ior, const ACE_TCHAR* ior_output_file); 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/ServerORBInitializer.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h index 407a3fbf348..2e0996ae463 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h @@ -23,17 +23,14 @@ class Server_ORBInitializer : public virtual ::CORBA::LocalObject { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: - /// Register the necessary interceptors. void register_server_request_interceptors ( PortableInterceptor::ORBInitInfo_ptr info); - }; #include /**/ "ace/post.h" 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_2285_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h index f129227aee5..370c4c2d481 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h @@ -23,17 +23,14 @@ class Server_ORBInitializer2 : public virtual ::CORBA::LocalObject { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: - /// Register the necessary interceptors. void register_server_request_interceptors ( PortableInterceptor::ORBInitInfo_ptr info); - }; #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h index 2377c6e4250..8089136cce8 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h @@ -22,7 +22,6 @@ class TAO249_ServerRequest_Interceptor public virtual ::CORBA::LocalObject { public: - /// Constructor. TAO249_ServerRequest_Interceptor (void); @@ -59,7 +58,6 @@ virtual void send_other ( PortableInterceptor::ServerRequestInfo_ptr ri); //@} private: - CORBA::ORB_var orb_; CORBA:: Long client_id_; diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h index 11dedcb34eb..f1816a2676c 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h @@ -23,7 +23,6 @@ class TAO249_ServerRequest_Interceptor2 public virtual ::CORBA::LocalObject { public: - /// Constructor. TAO249_ServerRequest_Interceptor2 (void); @@ -64,7 +63,6 @@ protected: TimeBase::TimeT get_now (void); private: - CORBA::ORB_var orb_; CORBA::Long client_id_; diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp index ead055e510d..a0b18143cae 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp @@ -6,7 +6,6 @@ #include "Hello.h" - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp index 949c7fe30e2..caa1748ee64 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp @@ -8,7 +8,6 @@ #include "ace/Auto_Ptr.h" - //const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); TAO_IOP::TAO_IOR_Manipulation_var iorm = 0; CORBA::ULong number_of_servers = 0; diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp index 23ba5d49388..042ec8802dd 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp @@ -44,7 +44,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) } - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp index b5d6d3241fd..7a8b89da632 100644 --- a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp +++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp @@ -1,7 +1,6 @@ #include "Hello.h" - Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h index 4bafa4e0a52..9abb165e2f1 100644 --- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h +++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h @@ -25,7 +25,6 @@ class Server_ORBInitializer2 : public virtual ::CORBA::LocalObject { public: - Server_ORBInitializer2 (void); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); @@ -35,7 +34,6 @@ public: void set_server_iogr (CORBA::Object_ptr obj); private: - /// Register the necessary interceptors. void register_server_request_interceptors (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h index 22e5cc5d3a7..9582c2fc71e 100644 --- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h +++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h @@ -23,7 +23,6 @@ class TAO249_ServerRequest_Interceptor2 public virtual ::CORBA::LocalObject { public: - /// Constructor. TAO249_ServerRequest_Interceptor2 (void); @@ -71,7 +70,6 @@ protected: TimeBase::TimeT get_now (void); private: - CORBA::ORB_var orb_; CORBA::Boolean expired_; diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp index 43d8a6a7c1e..240fd36b5a8 100644 --- a/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp @@ -6,7 +6,6 @@ #include "Hello.h" - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp index daf613de7ad..822aec3cc9f 100644 --- a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp +++ b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp @@ -3,7 +3,6 @@ #include "Hello.h" - Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong) : orb_ (CORBA::ORB::_duplicate (orb)) { 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_2615_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h index f129227aee5..370c4c2d481 100644 --- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h +++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerORBInitializer2.h @@ -23,17 +23,14 @@ class Server_ORBInitializer2 : public virtual ::CORBA::LocalObject { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: - /// Register the necessary interceptors. void register_server_request_interceptors ( PortableInterceptor::ORBInitInfo_ptr info); - }; #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h index 4a114e34de9..90e7b28be04 100644 --- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h +++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h @@ -22,7 +22,6 @@ class ServerRequest_Interceptor2 public virtual ::CORBA::LocalObject { public: - /// Constructor. ServerRequest_Interceptor2 (void); @@ -62,7 +61,6 @@ virtual void send_other ( static CORBA::Boolean has_ft_request_sc_; private: - CORBA::ORB_var orb_; }; diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp index a70b3b6b156..03c2aec6dab 100644 --- a/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp @@ -6,7 +6,6 @@ #include "Hello.h" - const ACE_TCHAR *ior = ACE_TEXT("file://ior.ior"); const ACE_TCHAR *iogr = ACE_TEXT("file://iogr.ior"); diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h index fdaebf1da66..adf9b07397b 100644 --- a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h +++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h @@ -7,7 +7,6 @@ class Client_Task : public ACE_Task_Base { public: - /// Constructor Client_Task (CORBA::ORB_ptr corb, ACE_Thread_Manager *thr_mgr, diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp index 5b23d33f306..4efc517a981 100644 --- a/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp +++ b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp @@ -1,7 +1,6 @@ #include "Hello.h" - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp index fe585143468..133eb6a7e0e 100644 --- a/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp @@ -3,7 +3,6 @@ #include "ace/Get_Opt.h" - const ACE_TCHAR *ior = ACE_TEXT("file://shutdown.ior"); bool shutdown_nsmain = false; 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_3215_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.cpp index 81d7d7081fe..ec960286654 100644 --- a/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.cpp +++ b/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.cpp @@ -1,7 +1,6 @@ #include "Hello.h" - Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h index 4bafa4e0a52..9abb165e2f1 100644 --- a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h +++ b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h @@ -25,7 +25,6 @@ class Server_ORBInitializer2 : public virtual ::CORBA::LocalObject { public: - Server_ORBInitializer2 (void); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); @@ -35,7 +34,6 @@ public: void set_server_iogr (CORBA::Object_ptr obj); private: - /// Register the necessary interceptors. void register_server_request_interceptors (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h index 22e5cc5d3a7..9582c2fc71e 100644 --- a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h +++ b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h @@ -23,7 +23,6 @@ class TAO249_ServerRequest_Interceptor2 public virtual ::CORBA::LocalObject { public: - /// Constructor. TAO249_ServerRequest_Interceptor2 (void); @@ -71,7 +70,6 @@ protected: TimeBase::TimeT get_now (void); private: - CORBA::ORB_var orb_; CORBA::Boolean expired_; diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp index 9bb5cb60097..e98c6b869be 100644 --- a/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp @@ -6,7 +6,6 @@ #include "Hello.h" - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -86,7 +85,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) orb->destroy (); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp index b602f5839d3..dcb138f4d1d 100644 --- a/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp @@ -151,7 +151,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { CORBA::Policy_ptr policy = policies[i]; policy->destroy (); - } diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.cpp index d8c46266d98..d3c150a24b6 100644 --- a/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.cpp +++ b/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.cpp @@ -1,7 +1,6 @@ #include "Hello.h" - CORBA::Boolean Hello::normal_context_ok_ = 0; diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp index 9c9670f5b46..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 @@ -20,7 +19,6 @@ Server_ORBInitializer::post_init ( { this->register_server_request_interceptors (info ); - } void @@ -40,7 +38,6 @@ Server_ORBInitializer::register_server_request_interceptors ( info->add_server_request_interceptor (server_interceptor.in () ); - } diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.h b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.h index 4903df3c1c3..d7be192bce8 100644 --- a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.h +++ b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.h @@ -23,7 +23,6 @@ class Server_ORBInitializer : public virtual ::CORBA::LocalObject { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info ); @@ -31,12 +30,10 @@ public: ); private: - /// Register the necessary interceptors. void register_server_request_interceptors ( PortableInterceptor::ORBInitInfo_ptr info ); - }; #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp index e2c58cf865d..fa4b6386745 100644 --- a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp +++ b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp @@ -91,7 +91,6 @@ catch (const CORBA::Exception& ex) } - } void diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h index aa0aee92ea5..d499c499f0b 100644 --- a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h +++ b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h @@ -22,7 +22,6 @@ class TAO249_ServerRequest_Interceptor public virtual ::CORBA::LocalObject { public: - /// Constructor. TAO249_ServerRequest_Interceptor (void); @@ -64,7 +63,6 @@ virtual void send_other ( ); //@} private: - CORBA::ORB_var orb_; CORBA:: Long client_id_; diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp index 04aab458c3c..5affa4bc4c1 100644 --- a/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp @@ -6,7 +6,6 @@ #include "Hello.h" - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp index 281c701abdd..4fdbd6572c2 100644 --- a/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp @@ -149,7 +149,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { CORBA::Policy_ptr policy = policies[i]; policy->destroy (); - } diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerConsumer.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerConsumer.cpp index a6575d05a1e..7ff5461dfcb 100644 --- a/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerConsumer.cpp +++ b/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerConsumer.cpp @@ -98,7 +98,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) - CosNotification::EventTypeSeq added (1); CosNotification::EventTypeSeq removed (1); added.length (1); @@ -115,7 +114,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) - PortableServer::POAManager_var poa_manager = poa->the_POAManager(); poa_manager->activate(); diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerServer.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerServer.cpp index 5095a179afd..632ebfabf87 100644 --- a/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerServer.cpp +++ b/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerServer.cpp @@ -69,7 +69,6 @@ ACE_TMAIN(int argc, ACE_TCHAR * argv[]) } return 0; - } @@ -78,5 +77,3 @@ ACE_TMAIN(int argc, ACE_TCHAR * argv[]) - - diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp index d17f53abbe8..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; @@ -121,6 +119,5 @@ CORBA::Boolean Messenger_i::send_message ( consumer_proxy_->push_structured_event(event); return 1; - } diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h index 561676e19d7..ad99b055f31 100644 --- a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h +++ b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h @@ -26,4 +26,3 @@ class Messenger_i : public POA_Messenger - diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp index b11df7abb34..75ebbf9449a 100644 --- a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp @@ -9,14 +9,12 @@ 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()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp b/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp index d1a4c81904f..d59755cc7ce 100644 --- a/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp +++ b/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp @@ -1,7 +1,6 @@ #include "Test_impl.h" - Server_impl::Server_impl (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/TAO/orbsvcs/tests/Bug_3444_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3444_Regression/client.cpp index 34e9ae8b7a4..ff97ec813f6 100644 --- a/TAO/orbsvcs/tests/Bug_3444_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_3444_Regression/client.cpp @@ -3,7 +3,6 @@ #include "TestC.h" - const ACE_TCHAR *ior_server = 0; int diff --git a/TAO/orbsvcs/tests/Bug_3444_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3444_Regression/server.cpp index db1b3a6a5ea..4eb878ed19e 100644 --- a/TAO/orbsvcs/tests/Bug_3444_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_3444_Regression/server.cpp @@ -4,7 +4,6 @@ #include "orbsvcs/PortableGroup/GOA.h" - const ACE_TCHAR *uipmc_url = 0; const ACE_TCHAR *ior_output_file = 0; diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.cpp index 45d43b27eca..04d12398ace 100644 --- a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.cpp +++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.cpp @@ -21,5 +21,4 @@ ClientORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) client_interceptor = cri; info->add_client_request_interceptor (client_interceptor.in ()); - } diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.h b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.h index 55063792acd..346b31b2b5a 100644 --- a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.h +++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.h @@ -33,7 +33,6 @@ class ClientORBInitializer : public virtual ::CORBA::LocalObject { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.h b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.h index 53d5ad3bed2..36235e54b3a 100644 --- a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.h +++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.h @@ -28,7 +28,6 @@ class ClientRequest_Interceptor public virtual ::CORBA::LocalObject { public: - ClientRequest_Interceptor (void); ~ClientRequest_Interceptor (void); @@ -52,10 +51,8 @@ virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri); static CORBA::Boolean success_flag_; private: - /// Name of the interceptor const char *name_; - }; #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp index 15d7b298abc..7f74ae1d075 100644 --- a/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp +++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp @@ -1,7 +1,6 @@ #include "Hello.h" - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3598b_Regression/client.cpp index c214c911fcc..6ad127f255f 100644 --- a/TAO/orbsvcs/tests/Bug_3598b_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/client.cpp @@ -6,7 +6,6 @@ #include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h" - const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); int diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp index 5b23d33f306..4efc517a981 100644 --- a/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp +++ b/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp @@ -1,7 +1,6 @@ #include "Hello.h" - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/client.cpp index cc4ea47298a..10d56888f1a 100644 --- a/TAO/orbsvcs/tests/Bug_3673_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_3673_Regression/client.cpp @@ -3,7 +3,6 @@ #include "ace/Get_Opt.h" - const ACE_TCHAR *ior = ACE_TEXT("file://shutdown.ior"); bool shutdown_nsmain = false; int test_count = 10; 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/COIOP_Naming_Test/Client_Task.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp index d299fbe0924..d1ee5370765 100644 --- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp +++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp @@ -4,7 +4,6 @@ #include "TestC.h" - Client_Task::Client_Task (CosNaming::NamingContext_ptr root_context, CORBA::ORB_ptr corb, ACE_Thread_Manager *thr_mgr, @@ -71,5 +70,4 @@ Client_Task::svc (void) } return 0; - } diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.h b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.h index 0f02aee45e9..6148938a66b 100644 --- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.h +++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.h @@ -15,7 +15,6 @@ class Client_Task : public ACE_Task_Base { public: - /// Constructor Client_Task (CosNaming::NamingContext_ptr root_context, CORBA::ORB_ptr corb, diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp index d12a6c3eba5..f047a361bee 100644 --- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp +++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp @@ -4,7 +4,6 @@ #include "tao/Strategies/advanced_resource.h" - Hello::Hello (CORBA::ORB_ptr orb, ACE_thread_t thrid) : orb_ (CORBA::ORB::_duplicate (orb)) diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp index d1be2fba532..1f02ddec574 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp @@ -24,7 +24,6 @@ #include "ace/OS_NS_fcntl.h" - // Constructor. CC_Client::CC_Client (void) : naming_service_ (0), @@ -423,7 +422,6 @@ CC_Client::init (int argc, ACE_TCHAR **argv) ACE_DEBUG ((LM_DEBUG, "Factory received OK\n")); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp index 01abae4bab0..02c06d83899 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp @@ -244,7 +244,6 @@ int CC_UnLock_Cmd::execute(void) CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_); ccls->unlock (mode_); - } catch (const CORBA::Exception& ex) { @@ -347,7 +346,6 @@ int CC_ChangeMode_Cmd::execute(void) CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_); ccls->change_mode (held_mode_, new_mode_); - } catch (const CORBA::Exception& ex) { @@ -540,7 +538,6 @@ CC_Lookup_Cmd::execute(void) CosConcurrencyControl::LockSet::_narrow (ccls_obj.in ()); cc_lockset_ = ccls; - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.h b/TAO/orbsvcs/tests/Concurrency/CC_command.h index f9ef4ad6875..91f2299127d 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.h +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.h @@ -430,7 +430,6 @@ public: private: /// The name to look up in the naming service. char *name_; - }; /** diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp index a4844b9edba..9ca80305f9e 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp @@ -54,7 +54,6 @@ typedef union { #endif - #define ACE_CC_YYFINAL 66 #define ACE_CC_YYFLAG -32768 #define ACE_CC_YYNTBASE 24 @@ -413,7 +412,6 @@ __ace_cc_yy_memcpy (char *to, char *from, unsigned int count) #endif - /* The user can define ACE_CC_YYPARSE_PARAM as the name of an argument to be passed into ace_cc_yyparse. The argument should have type void *. It should actually point to an object. @@ -739,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/Concurrency/CC_naming_service.cpp b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp index f0b111d5ec7..573e991246f 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp @@ -16,7 +16,6 @@ #include "ace/Log_Msg.h" - CC_naming_service::CC_naming_service (CORBA::ORB_var orb) : cc_factory_key_ (0), orb_ (0), diff --git a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp index ff947dd64eb..5073a4f2aab 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp @@ -209,7 +209,6 @@ Test_Use_Already_Created_LockSet::run (int /* times_to_run */) CosConcurrencyControl::LockSet::_narrow (ccls_obj.in ()); ccls->lock (CosConcurrencyControl::read); - } catch (const CORBA::Exception& ex) { @@ -312,7 +311,6 @@ Test_Release_Not_Held_Lock::run (int /* times_to_run */) ACE_DEBUG ((LM_DEBUG, "attemptet to release %s lock\n", get_lock_mode_name (mode_))); - } catch (const CosConcurrencyControl::LockNotHeld& userex) { diff --git a/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp index ac1562263fb..a4b68b98b73 100644 --- a/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp +++ b/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp @@ -610,7 +610,6 @@ ACE_CC_YY_DECL - if ( ace_cc_yy_init ) { ace_cc_yy_init = 0; @@ -1372,7 +1371,6 @@ ACE_CC_YY_BUFFER_STATE b; } - #ifdef ACE_CC_YY_USE_PROTOS void ace_cc_yy_init_buffer( ACE_CC_YY_BUFFER_STATE b, FILE *file ) #else @@ -1592,7 +1590,6 @@ char msg[]; } - /* Redefine ace_cc_yyless() so it works in section 3 code. */ #undef ace_cc_yyless diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp index 91776012695..7be8a6b6ed0 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp @@ -38,7 +38,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) poa->destroy (true, true); orb->destroy (); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp index d8d9bc52d97..9ad047ca96e 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp @@ -38,7 +38,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) poa->destroy (true, true); orb->destroy (); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp index 6032d54f33a..f097d4e47e4 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp +++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp @@ -2,7 +2,6 @@ #include "ace/OS_NS_unistd.h" - CEC_Counting_Supplier::CEC_Counting_Supplier (void) : event_count (0), disconnect_count (0) diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp index 685fcba8db5..9473b645f16 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp @@ -380,7 +380,6 @@ Test_Consumer::connect (int event_a, this->supplier_proxy_->connect_push_consumer (objref.in (), qos.get_ConsumerQOS ()); - } void diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp index d44792d6a43..3a946c12854 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp @@ -2,7 +2,6 @@ #include "tao/CDR.h" - CORBA::Boolean operator<< (TAO_OutputCDR& cdr, ECM_Data& x) { diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp index 587936448f3..316116add8d 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp @@ -15,7 +15,6 @@ #include "ace/OS_NS_errno.h" - ECMS_Driver::ECMS_Driver (void) : n_suppliers_ (1), event_count_ (100), 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..37fa4b842c3 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", @@ -172,7 +171,6 @@ ECM_Driver::run (int argc, ACE_TCHAR* argv[]) ACE_DEBUG ((LM_DEBUG, "EC_Mcast: shutdown the EC\n")); ec_impl.shutdown (); - } catch (const CORBA::SystemException& sys_ex) { @@ -1013,7 +1011,6 @@ ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec, qos.get_SupplierQOS (); this->receiver_->connect (qos_copy); - } void diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp index 39213e5582f..4ae2fb8e539 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp @@ -352,7 +352,6 @@ Test_ECG::run (int argc, ACE_TCHAR* argv[]) scheduler = scheduler_impl->_this (); } break; - } // We use this buffer to generate the names of the local @@ -904,7 +903,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/EC_Multiple/EC_Multiple.h b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h index 57c4b31dc6e..1ed57831bdc 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h @@ -96,7 +96,6 @@ private: RtecEventChannelAdmin::ProxyPushSupplier_var supplier_proxy_; // We talk to the EC (as a supplier) using this proxy. - }; class Test_Consumer : public POA_RtecEventComm::PushConsumer diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp index 20d679e4bd2..2e088db72f5 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp @@ -2,7 +2,6 @@ #include "ace/High_Res_Timer.h" - ECT_Driver::~ECT_Driver (void) { } diff --git a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp index 5e21504ad0a..36399a21d1e 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp @@ -39,7 +39,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) poa->destroy (true, true); orb->destroy (); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp index ffc8063c080..727ab33817c 100644 --- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp @@ -40,7 +40,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) poa->destroy (true, true); orb->destroy (); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp index f39d36996f4..dc00e890387 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp @@ -273,7 +273,6 @@ EC_Observer::execute_test (void) rmt_ec->append_observer (obs.in ()); this->gwys_[i].observer_handle (h); - } if (this->allocate_tasks () == -1) diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp index b7662e40b11..4723d3c58b0 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp @@ -10,7 +10,6 @@ #include "ace/Sched_Params.h" - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { @@ -103,7 +102,6 @@ EC_Schedule::execute_test (void) if (this->verbose ()) ACE_DEBUG ((LM_DEBUG, "EC_Schedule (%P|%t) schedule dumped\n")); - } void diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp index 960ee33ee13..c8248e4d06a 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp @@ -3,7 +3,6 @@ #include "Supplier.h" - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp index a741f4f6c52..e52e0ae8490 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp @@ -4,7 +4,6 @@ #include "ace/OS_NS_strings.h" - const ACE_TCHAR *ior = ACE_TEXT("file://as.ior"); int diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp index 73657253981..645816641d2 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp @@ -8,7 +8,6 @@ class EC_Consumer: public POA_RtecEventComm::PushConsumer { public: - /// Constructor. EC_Consumer (CORBA::ORB_var orb, RtecEventChannelAdmin::EventChannel_var ec); @@ -23,7 +22,6 @@ public: virtual void disconnect_push_consumer (void); private: - /// Helper - destroys EC, shutdowns the ORB and prints number of /// events received. void disconnect (void); diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp index b57aa1d2c18..8b530e70ecc 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp @@ -99,7 +99,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) orb->destroy(); return 0; - } catch (const CORBA::Exception& exc) { diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp index aecce1812e7..62aaa088c5a 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp @@ -8,7 +8,6 @@ class EC_Consumer: public POA_RtecEventComm::PushConsumer { public: - /// Constructor. EC_Consumer (CORBA::ORB_var orb, RtecEventChannelAdmin::EventChannel_var ec); @@ -22,7 +21,6 @@ public: //@} private: - /// Helper - destroys EC, shutdowns the ORB and prints number of /// events received. void disconnect (void); diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp index 68b0f6af7f7..c810cb37229 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp @@ -39,7 +39,6 @@ class Heartbeat_Application : public TAO_EC_Deactivated_Object { public: - /// Constructor. Heartbeat_Application (void); @@ -78,7 +77,6 @@ public: //@} private: - /** * @class Timeout_Handler * diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp index d44f1be20cd..0ea6cd2f969 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp @@ -12,7 +12,6 @@ #include "ace/OS_NS_errno.h" - int iterations = 1000; int do_dump_history = 0; const ACE_TCHAR *ec_ior = ACE_TEXT("file://ec.ior"); diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp index 156656a53a9..91415ec499c 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp @@ -11,7 +11,6 @@ #include "ace/OS_NS_errno.h" - const ACE_TCHAR *ior_file_name = ACE_TEXT("ec.ior"); /// Parse the arguments. diff --git a/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp b/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp index 8c904867a3a..13319a2d586 100644 --- a/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp +++ b/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp @@ -8,7 +8,6 @@ #include "ace/OS_NS_strings.h" - /* Here are the scenarios we need to test: @@ -55,7 +54,6 @@ struct ThreadFlagsTest How assign_; ExpectedValues expected_values_; ExpectedValues which_results_to_check_; - }; ThreadFlagsTest::ThreadFlagsTest (const char* sym, diff --git a/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp b/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp index e6dc0eababf..389dcea940a 100644 --- a/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp +++ b/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp @@ -2,7 +2,6 @@ #include "tao/SystemException.h" - AddrServer::AddrServer (const ACE_INET_Addr& addr) { this->addr_ = addr; diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp index 2c28ecdda5e..939f3218210 100644 --- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp @@ -1,7 +1,6 @@ #include "Counting_Consumer.h" - EC_Counting_Consumer::EC_Counting_Consumer (const char* name) : event_count (0), disconnect_count (0), @@ -48,7 +47,6 @@ EC_Counting_Consumer::deactivate (void) PortableServer::ObjectId_var consumer_id = consumer_poa->servant_to_id (this); consumer_poa->deactivate_object (consumer_id.in ()); - } void diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp index ea034f0539b..086662e4d48 100644 --- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp @@ -25,7 +25,6 @@ #endif /* __ACE_INLINE__ */ - EC_Driver::EC_Driver (void) : n_consumers_ (1), consumers_ (0), @@ -332,7 +331,6 @@ EC_Driver::deactivate_ec (void) if (this->verbose ()) ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) EC deactivated\n")); - } void diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.h b/TAO/orbsvcs/tests/Event/lib/Driver.h index 833a401925b..cfbf9e1d21b 100644 --- a/TAO/orbsvcs/tests/Event/lib/Driver.h +++ b/TAO/orbsvcs/tests/Event/lib/Driver.h @@ -308,7 +308,6 @@ protected: /// The event channel object reference RtecEventChannelAdmin::EventChannel_var event_channel_; - }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp index a1877edb197..a2e74436ef0 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_); @@ -234,7 +233,6 @@ EC_Supplier_Task::svc (void) // ACE_DEBUG ((LM_DEBUG, "(%t) supplier push event\n")); this->supplier_->send_event (event); - } catch (const CORBA::SystemException& sys_ex) { diff --git a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp index 9572565a286..bfee692bb08 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp @@ -49,7 +49,6 @@ private: //////////////// // Data members private: - CORBA::ORB_var orb_; int argc_; @@ -296,7 +295,6 @@ int FTClientMain::pass ( } echo = 0; break; - } case '>': { diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp index 6251fb5b9f8..60150e30990 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp @@ -129,7 +129,6 @@ void FTAPP::FT_Creator::usage(FILE* out)const } - int FTAPP::FT_Creator::init (CORBA::ORB_ptr orb) { int result = 0; @@ -226,7 +225,6 @@ int FTAPP::FT_Creator::run (void) } iogr_seq_ += 1; - } typeCount = this->unregister_roles_.size(); diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.h b/TAO/orbsvcs/tests/FT_App/FT_Creator.h index 45bb89e0370..91241cb64c4 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Creator.h +++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.h @@ -64,7 +64,6 @@ namespace FTAPP //////////////// // Data members private: - TAO::Object_Group_Creator creator_; CORBA::ORB_var orb_; const ACE_TCHAR * registry_ior_; @@ -104,10 +103,7 @@ namespace FTAPP * prefix for names */ ACE_CString prefix_; - - }; - } // namespace TAO #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp index 798c79a9e82..02e9480704c 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp @@ -287,7 +287,6 @@ int FT_ReplicaFactory_i::idle (int & result) } - int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb) { int result = 0; diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h index c050b32ea8c..174083fbcfe 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h @@ -149,7 +149,6 @@ private: /////////////// // Data Members private: - /** * Protect internal state. * Mutex should be locked by corba methods, or by @@ -272,7 +271,6 @@ private: * A file that use by FT_TestReplica_i object */ const ACE_TCHAR* name_persistent_file_; - }; #endif /* FT_REPLICAFACTORY_H_ */ diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp index cb90f1cdc6e..987f3814c90 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp @@ -39,7 +39,6 @@ private: FT::ReplicationManager_var replication_manager_; const ACE_TCHAR *rm_ior_; int shutdown_; - }; TAO_FT_ReplicationManagerController::TAO_FT_ReplicationManagerController () diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp index 1fcbb23dda1..67ad778a036 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp @@ -146,11 +146,9 @@ void FT_TestReplica_i::suicide(const char * note) // class FT_TestReplica_i public, non-CORBA interface - //static const char * FT_TestReplica_i::repository_id() { - const char * id = FT_TEST::_tc_TestReplica->id(); @@ -246,7 +244,6 @@ int FT_TestReplica_i::fini (void) } - ///////////////////////////////////////////////////// // class FT_TestReplica_i: PullMonitorable interface CORBA::Boolean FT_TestReplica_i::is_alive (void) diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h index 65030cbdecb..f32830750e2 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h +++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h @@ -197,7 +197,6 @@ private: */ const ACE_TCHAR* name_persistent_storage; - }; #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h index 68a21e1c5ef..f398412eb02 100644 --- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h +++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h @@ -66,7 +66,6 @@ public: ///////////////// // Implementation private: - //////////////////// // Forbidden methods private: @@ -78,7 +77,6 @@ private: ///////////////////////// // Implementation methods private: - /////////////// // Data Members private: @@ -142,7 +140,6 @@ private: */ TAO::FT_FaultConsumer* p_fault_consumer_; PortableServer::ServantBase_var consumer_servant_; - }; #include /**/ <ace/post.h> diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h index aedc1a399cb..0c7debe7178 100644 --- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h +++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h @@ -68,7 +68,6 @@ public: public: - //////////////// // CORBA methods @@ -93,7 +92,6 @@ private: ///////////////////////// // Implementation methods private: - /////////////// // Data Members private: diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h index 424ca9315b1..2fafcdbbc7b 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h +++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h @@ -123,7 +123,6 @@ private: StubFaultConsumer faultConsumer_; StubBatchConsumer batchConsumer_; - }; #include /**/ <ace/post.h> diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h index 9845df441d0..4fe4d38f9b8 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h +++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h @@ -72,7 +72,6 @@ public: size_t notifications() const; public: - //////////////// // CORBA methods virtual void push_structured_event( @@ -95,7 +94,6 @@ private: ///////////////////////// // Implementation methods private: - /////////////// // Data Members private: @@ -136,7 +134,6 @@ private: ::FT::FaultNotifier::ConsumerId consumer_id_; size_t notifications_; - }; #include /**/ <ace/post.h> 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 129f92fe1ca..105cfa6298c 100644 --- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp +++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp @@ -116,7 +116,6 @@ int TAO::Object_Group_Creator::unregister_role (const char * role) } - int TAO::Object_Group_Creator::create_detector_for_replica ( CORBA::Object_ptr replica, const char * role, @@ -263,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. @@ -298,7 +296,6 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_group ( //@@ this is a bit of a hack creation_id >>= group_id; - } const PortableGroup::Location * first_location = 0; diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h index 4a2acdef8fc..3c5a3bab53d 100644 --- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h +++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h @@ -96,7 +96,6 @@ namespace TAO */ int have_replication_manager_; }; - } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp index 50ae2d24637..e1d7fa6888f 100644 --- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp @@ -33,7 +33,6 @@ Basic::remove_member (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) - Removed Member at Location <%s>\n"), this->location_.in ())); - } catch (const PortableGroup::ObjectNotFound& ex) { diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.h b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.h index bbb473fe9c7..81a4eb6052f 100644 --- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.h +++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.h @@ -31,7 +31,6 @@ public: virtual void remove_member (void); private: - const char* object_group_name_; /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp index b2a7b5e77dd..06e69c84b12 100644 --- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp @@ -29,7 +29,6 @@ LB_server::destroy (void) return -1; } return 0; - } CORBA::ORB_ptr @@ -136,7 +135,6 @@ LB_server::start_orb_and_poa (void) ACE_TEXT (" (%P|%t) Unable to get Naming Manager ") ACE_TEXT ("Reference.\n")), -1); - } catch (const CORBA::Exception& ex) { @@ -146,7 +144,6 @@ LB_server::start_orb_and_poa (void) } return 0; - } int @@ -200,7 +197,6 @@ LB_server::create_object_group (const char *group_name) } return 0; - } int @@ -265,7 +261,6 @@ LB_server::remove_servant (const char *loc) } return 0; - } TAO_Naming_Client& diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.h b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.h index a86e95279db..be73d008cc6 100644 --- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.h +++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.h @@ -35,7 +35,6 @@ class Basic; class LB_server { public: - /// Constructor LB_server (int argc, ACE_TCHAR **argv); @@ -73,11 +72,9 @@ public: FT_Naming::NamingManager_ptr naming_manager (void); private: - int parse_args (int, ACE_TCHAR **); private: - /// Load Manager FT_Naming::NamingManager_var naming_manager_; diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp index 25323e14cad..dffc347a8ba 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 (), @@ -473,7 +471,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return rc; - } //============================================================================== @@ -494,7 +491,6 @@ do_failover_name_test ( int i; try { - CORBA::ORB_var orb = CORBA::ORB::_duplicate(theOrb); if (CORBA::is_nil (orb.in ())) @@ -582,7 +578,6 @@ do_failover_name_test ( // Try again... try { - CORBA::Object_var obj1_on_replica = root_context_1->resolve (level1); @@ -1019,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 ())) { @@ -1124,7 +1118,6 @@ do_persistence_name_test ( int i; try { - CORBA::ORB_var orb = CORBA::ORB::_duplicate(theOrb); if (CORBA::is_nil (orb.in () )) @@ -1281,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); @@ -1324,7 +1316,6 @@ do_persistence_name_test ( } return RC_SUCCESS; - } @@ -1348,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 ())) @@ -1429,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()); @@ -1465,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(), @@ -1535,7 +1522,6 @@ do_persistence_objectgroup_test ( out << num_locations << std::endl; out << loc[0].id.in () << std::endl; out << member_str.in() << std::endl; - } catch (const PortableGroup::ObjectGroupNotFound&) { @@ -1667,7 +1653,6 @@ do_equivalence_name_test ( int i; try { - CORBA::ORB_var orb = CORBA::ORB::_duplicate(theOrb); if (CORBA::is_nil (orb.in ())) @@ -1754,7 +1739,6 @@ do_equivalence_name_test ( ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("INFO: ns2ref profile count: %d\n"), ns2_count)); - } catch (const CORBA::Exception& ex) { @@ -1885,7 +1869,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); @@ -2247,7 +2230,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/FaultTolerant/server.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/server.cpp index 5e509d5c117..640888ebb9e 100644 --- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/server.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/server.cpp @@ -124,7 +124,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (lb_server.destroy () == -1) return 1; - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.cpp b/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.cpp index 5b23d33f306..4efc517a981 100644 --- a/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.cpp @@ -1,7 +1,6 @@ #include "Hello.h" - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { 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/Basic.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp index 4fad32a961d..1270f07d131 100644 --- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp @@ -33,7 +33,6 @@ Basic::remove_member (void) ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Removed Member at Location <%C>\n", this->location_.in ())); - } catch (const PortableGroup::ObjectNotFound& ex) { diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.h b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.h index 81884559d55..cb4984a2b90 100644 --- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.h +++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.h @@ -31,7 +31,6 @@ public: virtual void remove_member (void); private: - const char* object_group_name_; /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp index 603eb0086e8..a05c3ae676d 100644 --- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp @@ -29,7 +29,6 @@ LB_server::destroy (void) return -1; } return 0; - } CORBA::ORB_ptr @@ -134,7 +133,6 @@ LB_server::start_orb_and_poa (void) ACE_TEXT (" (%P|%t) Unable to get Naming ") ACE_TEXT ("Manager Reference\n")), -1); - } catch (const CORBA::Exception& ex) { @@ -144,7 +142,6 @@ LB_server::start_orb_and_poa (void) } return 0; - } int @@ -186,7 +183,6 @@ LB_server::create_object_group (void) } return 0; - } int diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.h b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.h index 6dea520507e..125072fcc40 100644 --- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.h +++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.h @@ -35,7 +35,6 @@ class Basic; class LB_server { public: - /// Constructor LB_server (int argc, ACE_TCHAR **argv); @@ -67,11 +66,9 @@ public: FT_Naming::NamingManager_ptr naming_manager (void); private: - int parse_args (int, ACE_TCHAR **); private: - /// Load Manager FT_Naming::NamingManager_var naming_manager_; diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp index 370be8a05a1..42bb126e69d 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); @@ -82,7 +80,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // Narrow it to a Basic object basic = Test::Basic::_narrow (tmp.in ()); - } catch (const CORBA::Exception& ex) { @@ -106,7 +103,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_TEXT ("(%P|%t) - Client request handled ") ACE_TEXT ("by object at <%C>\n"), the_string.in ())); - } catch (const CORBA::Exception& ex) { @@ -133,7 +129,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } try { - basic->shutdown (); ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/server.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/server.cpp index 36cb74661c1..2e3d9e03177 100644 --- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/server.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/server.cpp @@ -105,7 +105,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (lb_server.destroy () == -1) return 1; - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp b/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp index 88418d36e0c..036456550b7 100644 --- a/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp @@ -177,7 +177,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ns2ref), -1); root_context_2 = CosNaming::NamingContext::_narrow (ns2obj.in ()); - } catch (const CORBA::Exception& ex) { @@ -665,8 +664,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Unbound %i objects in %.2f secs\n"), test_runs, secs)); - - } catch (const CORBA::Exception& ex) { @@ -676,5 +673,4 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return 0; - } diff --git a/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.cpp b/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.cpp index 4fad32a961d..1270f07d131 100644 --- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.cpp @@ -33,7 +33,6 @@ Basic::remove_member (void) ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Removed Member at Location <%C>\n", this->location_.in ())); - } catch (const PortableGroup::ObjectNotFound& ex) { diff --git a/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.h b/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.h index d052bf92c73..61554fac305 100644 --- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.h +++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.h @@ -33,7 +33,6 @@ public: virtual void remove_member (void); private: - const char* object_group_name_; /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.cpp b/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.cpp index 2e9fb65c602..ca0b3a3b68e 100644 --- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.cpp @@ -27,7 +27,6 @@ LB_server::destroy (void) return -1; } return 0; - } CORBA::ORB_ptr @@ -132,7 +131,6 @@ LB_server::start_orb_and_poa (void) ACE_TEXT (" (%P|%t) Unable to get Naming ") ACE_TEXT ("Manager Reference\n")), -1); - } catch (const CORBA::Exception& ex) { @@ -142,7 +140,6 @@ LB_server::start_orb_and_poa (void) } return 0; - } int @@ -217,7 +214,6 @@ LB_server::create_object_group (void) } return 0; - } int diff --git a/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.h b/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.h index 6dea520507e..125072fcc40 100644 --- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.h +++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.h @@ -35,7 +35,6 @@ class Basic; class LB_server { public: - /// Constructor LB_server (int argc, ACE_TCHAR **argv); @@ -67,11 +66,9 @@ public: FT_Naming::NamingManager_ptr naming_manager (void); private: - int parse_args (int, ACE_TCHAR **); private: - /// Load Manager FT_Naming::NamingManager_var naming_manager_; diff --git a/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp b/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp index d0732208090..b589a527aaf 100644 --- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp @@ -51,7 +51,6 @@ public: return 0; } - }; const ACE_TCHAR *ior = ACE_TEXT("file://obj.ior"); @@ -106,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, @@ -145,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); @@ -153,7 +150,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // Narrow it to a Basic object basic = Test::Basic::_narrow (tmp.in ()); - } catch (CORBA::Exception& ex) { @@ -177,7 +173,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_TEXT ("(%P|%t) - Client request handled ") ACE_TEXT ("by object at <%C>\n"), the_string.in ())); - } catch (CORBA::Exception& ex) { @@ -206,7 +201,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) hammer.wait (); try { - basic->shutdown (); ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/tests/FT_Naming/stress_storable/server.cpp b/TAO/orbsvcs/tests/FT_Naming/stress_storable/server.cpp index 36cb74661c1..2e3d9e03177 100644 --- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/server.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/server.cpp @@ -105,7 +105,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (lb_server.destroy () == -1) return 1; - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h index 10532f09969..725f58fbc41 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h @@ -42,7 +42,6 @@ class Server_ORBInitializer : public virtual ::CORBA::LocalObject { public: - /// Constructor. Server_ORBInitializer (void); @@ -55,7 +54,6 @@ public: PortableInterceptor::ServerRequestInterceptor_ptr server_interceptor (void); private: - /// Pointer to the server request interceptor. ORB is responsible /// for storage. PortableInterceptor::ServerRequestInterceptor_var server_interceptor_; diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h index 8fcedfd7426..403a2cba25a 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h @@ -38,7 +38,6 @@ class Server_Request_Interceptor public virtual ::CORBA::LocalObject { public: - /// Constructor. Server_Request_Interceptor (void); @@ -84,7 +83,6 @@ public: //@} private: - /// The number of requests intercepted by this interceptor. CORBA::ULong request_count_; diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp index ada224e6656..b57c464b174 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp @@ -81,9 +81,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_INFO, "CLIENT: Number %d .\n", number)); - - - } if (number < 250) diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp index 2b04f3871d1..548e0defdf7 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp @@ -186,7 +186,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) policies); - PortableServer::ObjectId_var oid1 = first_poa->activate_object (&servant1); diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h index e85e9f5706b..abfc96d7ae0 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h @@ -22,7 +22,6 @@ class test_i : public virtual POA_ForwardRequestTest::test { public: - /// Constructor. test_i (CORBA::Short num, CORBA::ORB_ptr orb); @@ -37,13 +36,11 @@ public: virtual void shutdown (void); private: - /// The number assigned to this object. CORBA::Short number_; /// Pseudo-reference to the ORB. CORBA::ORB_var orb_; - }; #endif /* TEST_I_H */ diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h index a699a349ac6..fcd636e7b95 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h @@ -32,7 +32,6 @@ public: private: CORBA::ORB_var orb_; - }; #include /**/ "ace/post.h" 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..80d77f6fbed 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 = @@ -83,7 +81,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) poa_manager->activate (); orb->run (); - } catch (const CORBA::Exception& ex) { 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 802d415e6b4..0bcf5bc7894 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp @@ -26,7 +26,6 @@ PushSupplier_impl::ReactorTask::svc (void) } - PushSupplier_impl::PushSupplier_impl(CORBA::ORB_ptr orb) : orb_(orb), seq_no_(0), reactor_task_(this) { @@ -39,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(); @@ -49,7 +47,6 @@ int PushSupplier_impl::init(RtecEventChannelAdmin::EventChannel_ptr channel) supplier_admin->obtain_push_consumer(); - ACE_DEBUG((LM_DEBUG, "got push_consumer with %d profiles\n", consumer_->_stubobj ()->base_profiles ().profile_count ())); @@ -76,15 +73,12 @@ int PushSupplier_impl::init(RtecEventChannelAdmin::EventChannel_ptr channel) -1); return 0; - } - void PushSupplier_impl::disconnect_push_supplier ( ) { - reactor_task_.reactor_->end_reactor_event_loop(); PortableServer::Current_var current = diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h index f6a3779ea06..0179d7bcf06 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h +++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h @@ -30,7 +30,6 @@ public: virtual void disconnect_push_supplier ( ); private: - class ReactorTask : public ACE_Task_Base { public: diff --git a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp index 27a190e1702..24aa27c21e4 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp @@ -51,7 +51,6 @@ get_event_channel(int argc, ACE_TCHAR** argv) ACE_TEXT("\n"), argv[0])); return 0; - } } diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp index 7e306372e07..b10ab7bc453 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp @@ -15,7 +15,6 @@ #include "tao/debug.h" - AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)), number_ ((CORBA::Long) 931232), @@ -47,7 +46,6 @@ AMI_Test_i::foo (CORBA::Long_out out_l, } - void AMI_Test_i::shutdown (void) { diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp index 8e9f9941fa2..c824b918e68 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp @@ -18,7 +18,6 @@ #include "ami_testS.h" - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int nthreads = 5; int niterations = 5; @@ -110,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/server.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp index 8a9784588c9..94a895e8151 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp @@ -18,7 +18,6 @@ #include "ace/OS_NS_sys_socket.h" - const ACE_TCHAR *ior_output_file = 0; int diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp index 1c7a118a818..1f516996caa 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp @@ -21,7 +21,6 @@ #include "ami_testS.h" - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 5; int shutdown_flag = 0; @@ -86,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")); @@ -131,7 +129,6 @@ public: ACE_DEBUG ((LM_DEBUG, "Callback method <set_yadda_excep> called:\n")); }; - }; int diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp index d763b3045f3..59accd8e387 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp @@ -4,7 +4,6 @@ #include "tao/AnyTypeCode/Any.h" - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); void do_nothing (void) @@ -130,7 +129,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->run (); root_poa->destroy (true, true); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp index f9e6a88977e..890e6c4631a 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp @@ -5,7 +5,6 @@ #include "tao/AnyTypeCode/Any.h" - const ACE_TCHAR *ior_output_file = 0; int no_iterations = 10; diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp index 32b64d17de5..1c26209df03 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp @@ -10,7 +10,6 @@ #endif /* __ACE_INLINE__ */ - void Callback_i::shutdown (void) { diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h index 7536e63f0d6..f7a40ffbf10 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h @@ -36,7 +36,6 @@ public: private: /// The orb CORBA::ORB_var orb_; - }; /** diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp index 060bd693cc1..731abb310fe 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp +++ b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp @@ -1,7 +1,6 @@ #include "Hello.h" - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp index 8b1b5de842f..420120eb148 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp @@ -3,7 +3,6 @@ - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -37,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/IOR_MCast/ior_mcast_client_i.h b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h index 67829f3be31..129dd3d0354 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h +++ b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h @@ -28,7 +28,6 @@ class ior_mcast_Client_i private: // mcast_ior ACE_CString mcast_url_; - }; #endif /* IOR_MCAST_CLIENT_I_H */ diff --git a/TAO/orbsvcs/tests/IOR_MCast/server.cpp b/TAO/orbsvcs/tests/IOR_MCast/server.cpp index d12401d49a9..487d61009a4 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/server.cpp +++ b/TAO/orbsvcs/tests/IOR_MCast/server.cpp @@ -10,7 +10,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (init_result != 0) return 1; - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.h b/TAO/orbsvcs/tests/IOR_MCast/server_i.h index 278511cb33f..b7e381a6189 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/server_i.h +++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.h @@ -21,7 +21,6 @@ public: // Initialize the server multicast. private: - /// Sets the IOR_Multicast class to listen for multicast requests // for this server. int enable_multicast (const char *ior); @@ -30,7 +29,6 @@ private: int parse_args (int argc, ACE_TCHAR *argv[]); private: - int argc_; // # of arguments on the command line. @@ -50,7 +48,6 @@ private: // Address of the multicast address where to listen for requests for */ // the server. */ - }; #endif /* SERVER_I_H */ diff --git a/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.cpp index 197bb9e42d3..82931fecd4a 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(); } @@ -174,7 +173,6 @@ Server_i::run (void) } this->orb_->run (); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp index 1c0b135a7e4..3fa4c48d90d 100644 --- a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp @@ -66,7 +66,6 @@ public: } return 0; } - }; @@ -102,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_); @@ -141,7 +139,6 @@ public: private: TAO_SYNCH_MUTEX lock_; PortableInterceptor::Current_var pic_; - }; class ORB_Initializer : public virtual PortableInterceptor::ORBInitializer, @@ -170,7 +167,6 @@ public: client_interceptor = interceptor; info->add_client_request_interceptor (client_interceptor.in ()); - } }; diff --git a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Terminator.h b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Terminator.h index 9bbc2dee9c0..e29f2e4a6c3 100644 --- a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Terminator.h +++ b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Terminator.h @@ -5,7 +5,6 @@ class Terminator : public ACE_Task<ACE_MT_SYNCH> { public: - virtual int open(void*); virtual int svc(); diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp index a3292254a97..1fb635fa185 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp @@ -5,7 +5,6 @@ #include "ace/ACE.h" - // Constructor. Airplane_Client_i::Airplane_Client_i (void) : argc_ (0), diff --git a/TAO/orbsvcs/tests/ImplRepo/double_start/server.cpp b/TAO/orbsvcs/tests/ImplRepo/double_start/server.cpp index 5e4a71ad7b6..af5c3fe8a64 100644 --- a/TAO/orbsvcs/tests/ImplRepo/double_start/server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/double_start/server.cpp @@ -171,7 +171,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) orb->destroy(); // ACE_OS::unlink (pid_file.c_str ()); - } catch(const CORBA::Exception& ex) { ex._tao_print_exception (ACE_TEXT ("Server main()")); diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/Terminator.h b/TAO/orbsvcs/tests/ImplRepo/kill_server/Terminator.h index 41134bedca9..ac6dc51db01 100644 --- a/TAO/orbsvcs/tests/ImplRepo/kill_server/Terminator.h +++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/Terminator.h @@ -5,7 +5,6 @@ class Terminator : public ACE_Task<ACE_MT_SYNCH> { public: - virtual int open(void*); virtual int svc(); diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.cpp index 29c74f751b2..f21f9e4d9af 100644 --- a/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.cpp @@ -32,4 +32,3 @@ Test_i::get_server_num (void) } - diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp index 415978bcc12..d460ac4f087 100644 --- a/TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp @@ -169,7 +169,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) orb->run(); root_poa->destroy(1,1); orb->destroy(); - } catch(const CORBA::Exception& ex) { ex._tao_print_exception ("Server main()"); diff --git a/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.cpp index db7abc4244c..72c61382265 100644 --- a/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.cpp @@ -11,4 +11,3 @@ Test_i::server_pid (void) } - diff --git a/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.h index 1bbfb1e7c7b..77af1927e0d 100644 --- a/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.h @@ -13,7 +13,6 @@ class Test_i : public virtual POA_Test { public: virtual CORBA::Long server_pid (void); - }; #endif /* TEST_I_H_ */ diff --git a/TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp b/TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp index 0f1ea1a0118..68068af2900 100644 --- a/TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp @@ -149,7 +149,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) orb->run(); root_poa->destroy(1,1); orb->destroy(); - } catch(const CORBA::Exception& ex) { ex._tao_print_exception ("Server main()"); 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/nestea_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp index 406f52b8c10..b755dbd223c 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp @@ -5,7 +5,6 @@ #include "ace/ACE.h" - // Constructor. Nestea_Client_i::Nestea_Client_i (void) : argc_ (0) diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp index 4c8b2fde791..bfc07642af8 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp @@ -10,7 +10,6 @@ const size_t MAX_UINT32_STR_LEN = 11; // Largest UINT32 is 8589934591 + NUL is 11 characters - Nestea_i::Nestea_i (CORBA::ORB_ptr orb, const ACE_TCHAR *filename) : cans_ (0) { diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp index f950bfcc84e..82f97385c72 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp @@ -1,7 +1,6 @@ #include "nestea_server_i.h" - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp index 5e81ec83a88..5499a7b070d 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp @@ -10,7 +10,6 @@ #include "ace/OS_NS_stdio.h" - // The file to save the persistent state to. const ACE_TCHAR NESTEA_DATA_FILENAME[] = ACE_TEXT("nestea.dat"); diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.cpp index ad5344fbc6f..069f2f15399 100644 --- a/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.cpp @@ -28,4 +28,3 @@ Test_i::get_call_count (void) } - diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.h index 65889da6a57..0745ee56fd7 100644 --- a/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.h @@ -26,7 +26,6 @@ public: private: CORBA::Short count_; - }; #endif /* TEST_I_H_ */ diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/client.cpp b/TAO/orbsvcs/tests/ImplRepo/oneway/client.cpp index d65dd22c22e..ad7d8f3511f 100644 --- a/TAO/orbsvcs/tests/ImplRepo/oneway/client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/oneway/client.cpp @@ -77,7 +77,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) n)); return n != 1; - } catch(const CORBA::Exception& ex) { ex._tao_print_exception ("client:"); diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/client_ds.cpp b/TAO/orbsvcs/tests/ImplRepo/oneway/client_ds.cpp index 2d05c7b556d..0833f106602 100644 --- a/TAO/orbsvcs/tests/ImplRepo/oneway/client_ds.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/oneway/client_ds.cpp @@ -61,7 +61,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) n)); return n != 1; - } catch(const CORBA::Exception& ex) { ex._tao_print_exception ("client:"); diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp b/TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp index fea63bc3cae..954d2d8c587 100644 --- a/TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp @@ -161,7 +161,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) orb->run(); root_poa->destroy(1,1); orb->destroy(); - } catch(const CORBA::Exception& ex) { ex._tao_print_exception ("Server main()"); diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp index 9bf0ef6eb77..c0c61e5e462 100644 --- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp @@ -144,7 +144,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) root_poa->destroy(1,1); orb->destroy(); - } catch(const CORBA::Exception& ex) { ex._tao_print_exception (ACE_TEXT("Server main()")); diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp index 8c8247294ea..283eaaf36c0 100644 --- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp @@ -63,7 +63,6 @@ Ping_Death_Request_Interceptor::receive_request_service_contexts ( throw ::CORBA::TRANSIENT ( CORBA::SystemException::_tao_minor_code (TAO_POA_HOLDING, 1), CORBA::COMPLETED_NO); - } void 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/ImplRepo/scale_clients/client.cpp b/TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp index d94bbe5cf91..5ed5aae5ca3 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp @@ -147,7 +147,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) orb->destroy (); return 0; - } catch(const CORBA::Exception& ex) { ex._tao_print_exception ("Client:"); diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp index b3a046998c2..9161b4765f4 100644 --- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp @@ -84,7 +84,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } } return 0; - } catch(const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp index 2a6ad20a2de..909e7e6d129 100644 --- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp @@ -196,7 +196,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t|%T) Server %d ending serving of %C\n"), server_num, poa_name.c_str ())); - } catch(const CORBA::Exception& ex) { ex._tao_print_exception (ACE_TEXT ("Server main()")); diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_list/Terminator.h b/TAO/orbsvcs/tests/ImplRepo/servers_list/Terminator.h index 41134bedca9..ac6dc51db01 100644 --- a/TAO/orbsvcs/tests/ImplRepo/servers_list/Terminator.h +++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/Terminator.h @@ -5,7 +5,6 @@ class Terminator : public ACE_Task<ACE_MT_SYNCH> { public: - virtual int open(void*); virtual int svc(); diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_list/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_list/Test_i.cpp index 524455780c1..2d6e14f416a 100644 --- a/TAO/orbsvcs/tests/ImplRepo/servers_list/Test_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/Test_i.cpp @@ -34,5 +34,4 @@ Test_i::abort (CORBA::Short delay_secs) ACE_NEW(mb, ACE_Message_Block(2)); ACE_OS::sprintf(mb->wr_ptr (), "%d", delay_secs); terminator_.putq(mb); - } diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp index 1aca6cf2a07..6577003664a 100644 --- a/TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp @@ -67,7 +67,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) orb->destroy (); return 0; - } catch(const CORBA::Exception& ex) { ex._tao_print_exception ("client:"); diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_list/server.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_list/server.cpp index 1ac34448543..a0508df2a31 100644 --- a/TAO/orbsvcs/tests/ImplRepo/servers_list/server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/server.cpp @@ -147,7 +147,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) root_poa->destroy(1,1); orb->destroy(); - } catch(const CORBA::Exception& ex) { ex._tao_print_exception ("Server main()"); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp index 7c1e0cec61c..dd9704490df 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp @@ -5,7 +5,6 @@ #include "ace/Get_Opt.h" - static const ACE_TCHAR *ior_output_file = ACE_TEXT("iorfile"); int diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp index 87e04510f2d..1be39a461dd 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp @@ -6,7 +6,6 @@ - const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); int @@ -40,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 d2ab16ff3a5..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) @@ -138,13 +135,11 @@ NContextExt_Client_i::get_name () *name_componentPtr = '\0'; return name_component; - } int NContextExt_Client_i::run (void) { - try { CosNaming::Name name; @@ -291,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,") @@ -321,5 +315,4 @@ NContextExt_Client_i::print_values (CosNaming::Name name, ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("The URL form of the string is \n %C\n"), url_string.in ())); - } diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h index de86e533635..02f2196c4a5 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h +++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h @@ -13,7 +13,6 @@ //============================================================================= - #if !defined (NCONTEXTEXT_CLIENT_I_H) #define NCONTEXTEXT_CLIENT_I_H @@ -27,7 +26,6 @@ */ class NContextExt_Client_i { - public: // = COnstructor and destructor. NContextExt_Client_i (void); @@ -40,7 +38,6 @@ class NContextExt_Client_i int init (int argc, ACE_TCHAR *argv[]); private: - /// Parses the arguments passed on the command line. int parse_args (void); @@ -71,7 +68,6 @@ class NContextExt_Client_i /// Flag to check if '-v' option is set. CORBA::Boolean view_; - }; #endif /* NCONTEXTEXT_CLIENT_I_H */ diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp index ec6d7aa3de6..ea50ccb7ab0 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp @@ -31,7 +31,6 @@ Basic::remove_member (void) ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Removed Member at Location <%s>\n", this->location_.in ())); - } catch (const PortableGroup::ObjectNotFound& ex) { diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp index b269b4cd18a..56445e5a102 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp @@ -29,7 +29,6 @@ LB_server::destroy (void) return -1; } return 1; - } CORBA::ORB_ptr @@ -126,7 +125,6 @@ LB_server::start_orb_and_poa (void) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to get Load Manager Reference\n"), 1); - } catch (const CORBA::Exception& ex) { @@ -135,7 +133,6 @@ LB_server::start_orb_and_poa (void) } return 1; - } int @@ -178,7 +175,6 @@ LB_server::create_object_group (void) } return 1; - } int diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.h index 74d2c03effc..f7a77cfc2d5 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.h @@ -33,7 +33,6 @@ class Basic; class LB_server { public: - /// Constructor LB_server (int argc, ACE_TCHAR **argv); @@ -62,11 +61,9 @@ public: CosLoadBalancing::LoadManager_ptr load_manager (void); private: - int parse_args (int, ACE_TCHAR **); private: - /// Load Manager CosLoadBalancing::LoadManager_var lm_; diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp index 60136341346..aaf95413fbf 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp @@ -93,7 +93,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (lb_server.destroy () == -1) return 1; - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp index d83119bbc0f..c0e4eea6316 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp @@ -58,7 +58,6 @@ Basic::remove_member (void) ACE_DEBUG ((LM_DEBUG, "(%P|%t)%T - Removed Member at Location <%s>\n", this->location_.in ())); - } catch (const PortableGroup::ObjectNotFound& ex) { diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp index 86eb6d82c58..1734d796f93 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp @@ -36,7 +36,6 @@ LB_server::destroy (void) return -1; } return 1; - } CORBA::ORB_ptr @@ -108,7 +107,6 @@ LB_server::start_orb_and_poa (void) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to get Load Manager Reference\n"), 1); - } catch (const CORBA::Exception& ex) { @@ -117,7 +115,6 @@ LB_server::start_orb_and_poa (void) } return 1; - } int @@ -157,7 +154,6 @@ LB_server::create_object_group (void) } return 1; - } @@ -176,7 +172,6 @@ LB_server::get_object_group (void) } return 1; - } diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.h index fe62e9245c4..8449b9b62f2 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.h @@ -32,7 +32,6 @@ class Basic; class LB_server { public: - /// Constructor LB_server (int& argc, ACE_TCHAR **& argv); @@ -62,7 +61,6 @@ public: CosLoadBalancing::LoadManager_ptr load_manager (void); private: - /// Load Manager CosLoadBalancing::LoadManager_var lm_; diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp index de52cba81eb..2da14281231 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp @@ -48,7 +48,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) } - int dead_member_rr_test (CORBA::ORB_ptr orb, const ACE_TCHAR *group_ior, Test::Basic_ptr direct_basic) diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp index 74fe151c85a..151c37b379e 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp @@ -155,7 +155,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (lb_server.destroy () == -1) return 1; - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.h index d0191e7f336..3b24162f5dd 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.h @@ -15,7 +15,6 @@ class Factory : public virtual POA_PortableGroup::GenericFactory { public: - /// Constructor Factory (int id); /// creates a Test::Simple servant reference. @@ -41,7 +40,6 @@ public: CORBA::Object_ptr get_object () const; private: - /// The factory creation id. CORBA::ULong fcid_; 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 0835d37f395..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,10 +19,8 @@ struct Factory_Node { - /// FactoryCreationId assigned to the member. PortableGroup::GenericFactory::FactoryCreationId_var factory_creation_id; - }; typedef ACE_Array_Base<Factory_Node> Factory_Struct; diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp index cef4b099a21..5a9c2c5027b 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp @@ -44,7 +44,6 @@ LB_Factory_Server::run (void) return -1; } return 1; - } @@ -66,7 +65,6 @@ LB_Factory_Server::destroy (void) return -1; } return 1; - } int @@ -195,6 +193,5 @@ LB_Factory_Server::init (void) } return 1; - } diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.h index 55fecad901d..4e93acb9ec7 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.h @@ -28,7 +28,6 @@ class LB_Factory_Server { public: - /// Constructor LB_Factory_Server (int argc, ACE_TCHAR ** argv); @@ -47,14 +46,12 @@ public: CORBA::ORB_ptr orb (void); private: - /// Create the Object Group using the Load Manager Reference. int create_object_group (const char *loc_1, const char *loc_2, const char *loc_3); int write_ior_to_file (const char * ior, const char * ior_file); private: - /// Load Manager CosLoadBalancing::LoadManager_var lm_; diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp index 6febfc8546c..53262b5b65e 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp @@ -45,7 +45,6 @@ LB_server::run (void) return -1; } return 1; - } @@ -67,7 +66,6 @@ LB_server::destroy (void) return -1; } return 1; - } int @@ -169,7 +167,6 @@ LB_server::init (void) } return 1; - } int @@ -270,5 +267,4 @@ LB_server::create_object_group (const char *loc_1, const char *loc_2, const char } return 1; - } diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.h index bc0b5157865..b2223eab9e9 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.h @@ -28,7 +28,6 @@ class LB_server { public: - /// Constructor LB_server (int argc, ACE_TCHAR ** argv); @@ -47,14 +46,12 @@ public: CORBA::ORB_ptr orb (void); private: - /// Create the Object Group using the Load Manager Reference. int create_object_group (const char *loc_1, const char *loc_2, const char *loc_3); int write_ior_to_file (const char * ior, const char * ior_file); private: - /// Load Manager CosLoadBalancing::LoadManager_var lm_; diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.h index 0e79be4b7c6..e97dfbec054 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.h @@ -14,7 +14,6 @@ class Simple : public virtual POA_Test::Simple { public: - Simple (int server_id); /// Constructor @@ -26,9 +25,7 @@ public: virtual void exit (void); private: - int server_id_; - }; #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp index 8c7b5ca40c2..135e228f1ef 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp @@ -51,7 +51,6 @@ Factory::create_object ( this->oid_ = this->poa_->servant_to_id (servant); return servant->_this (); - } void diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h index 075283b4610..0d226e1e2b5 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h @@ -15,7 +15,6 @@ class Factory : public virtual POA_PortableGroup::GenericFactory { public: - /// Constructor Factory (void); /// creates a Test::Simple servant reference. @@ -52,7 +51,6 @@ private: /// Lock used to synchronize access to the factory creation id TAO_SYNCH_MUTEX lock_; - }; #if defined(_MSC_VER) 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 0835d37f395..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,10 +19,8 @@ struct Factory_Node { - /// FactoryCreationId assigned to the member. PortableGroup::GenericFactory::FactoryCreationId_var factory_creation_id; - }; typedef ACE_Array_Base<Factory_Node> Factory_Struct; diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp index 6150e701400..56cc9b4a95f 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp @@ -35,7 +35,6 @@ LB_server::run (void) return -1; } return 1; - } @@ -57,7 +56,6 @@ LB_server::destroy (void) return -1; } return 1; - } int @@ -137,7 +135,6 @@ LB_server::start_orb_and_poa (void) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to get Load Manager Reference\n"), 1); - } catch (const CORBA::Exception& ex) { @@ -146,7 +143,6 @@ LB_server::start_orb_and_poa (void) } return 1; - } int @@ -232,7 +228,6 @@ LB_server::create_object_group (const char *loc_1, const char *loc_2) this->orb_->object_to_string (this->object_group_.in ()); this->write_ior_to_file (ior.in ()); - } catch (const CORBA::Exception& ex) { @@ -242,5 +237,4 @@ LB_server::create_object_group (const char *loc_1, const char *loc_2) } return 1; - } diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.h index 42039b742b7..daab36a02e1 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.h @@ -30,7 +30,6 @@ class LB_server { public: - /// Constructor LB_server (int argc, ACE_TCHAR **argv); @@ -50,12 +49,10 @@ public: CORBA::ORB_ptr orb (void); private: - int write_ior_to_file (const char *); int parse_args (int, ACE_TCHAR **); private: - /// Load Manager CosLoadBalancing::LoadManager_var lm_; diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h index 129c11dc3c1..018f734ebe2 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h @@ -13,12 +13,10 @@ class Simple : public virtual POA_Test::Simple { public: - Simple (void); /// Constructor virtual char * get_string (void); - }; #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp index db548b84149..7fccc189e41 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp @@ -61,7 +61,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) the_string.in ())); orb->destroy (); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp index 8ec4ef7c08c..17c16dba3cd 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp @@ -39,7 +39,6 @@ Basic::remove_member (void) ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Removed Member at Location <%s>\n", this->location_)); - } catch (const PortableGroup::ObjectNotFound& ex) { diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp index ea93044934d..59db1435e5e 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp @@ -31,7 +31,6 @@ LB_server::destroy (void) return -1; } return 1; - } CORBA::ORB_ptr @@ -91,7 +90,6 @@ LB_server::start_orb_and_poa (void) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to get Load Manager Reference\n"), 1); - } catch (const CORBA::Exception& ex) { @@ -100,7 +98,6 @@ LB_server::start_orb_and_poa (void) } return 1; - } int @@ -129,7 +126,6 @@ LB_server::create_basic_object_group (void) CORBA::String_var ior = this->orb_->object_to_string (this->basic_object_group_.in ()); - } catch (const CORBA::Exception& ex) { @@ -139,7 +135,6 @@ LB_server::create_basic_object_group (void) } return 1; - } int @@ -168,7 +163,6 @@ LB_server::create_simple_object_group (void) CORBA::String_var ior = this->orb_->object_to_string (this->simple_object_group_.in ()); - } catch (const CORBA::Exception& ex) { @@ -178,7 +172,6 @@ LB_server::create_simple_object_group (void) } return 1; - } int diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.h index eb3021df306..ada83c1af24 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.h @@ -33,7 +33,6 @@ class Simple; class LB_server { public: - /// Constructor LB_server (int argc, ACE_TCHAR **argv); @@ -77,7 +76,6 @@ public: CosLoadBalancing::LoadManager_ptr load_manager (void); private: - /// Load Manager CosLoadBalancing::LoadManager_var lm_; diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp index 3f97b2c8979..8de7c1e58d5 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp @@ -39,7 +39,6 @@ Simple::remove_member (void) ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Removed Member at Location <%s>\n", this->location_)); - } catch (const PortableGroup::ObjectNotFound& ex) { diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp index 1fef2a2c27f..86835aaa178 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp @@ -113,7 +113,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (lb_server.destroy () == -1) return 1; - } catch (const CORBA::Exception& ex) { 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 e86fd5b0413..de1ef2e5ce5 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 @@ -55,13 +55,11 @@ BasicLog_Test::init (int argc, ACE_TCHAR *argv[]) } ACE_RETURN(0); - } int BasicLog_Test::init_factory (void) { - // Assumpting INS for finding LogServie //CORBA::Object_var logging_obj = orb_->resolve_initial_references ("BasicLogFactory", @@ -114,7 +112,6 @@ BasicLog_Test::init_factory (void) int BasicLog_Test::test_CreateLog (CORBA::ULongLong maxSize) { - try { DsLogAdmin::LogId id; @@ -249,7 +246,6 @@ int BasicLog_Test::display_records () rec_list[j].id, rec_list[j].time)); return 0; - } */ int BasicLog_Test::write_records (CORBA::ULongLong numberOfRecords) @@ -303,7 +299,6 @@ int BasicLog_Test::write_records (CORBA::ULongLong numberOfRecords) CORBA::String_var t(str.c_str ()); record[0] <<= t.in (); basicLog_->write_records(record); - } } @@ -321,14 +316,12 @@ int BasicLog_Test::write_records (CORBA::ULongLong numberOfRecords) int BasicLog_Test::test_adminState() { - basicLog_->set_administrative_state(DsLogAdmin::locked); try { this->write_records(0); ACE_ERROR_RETURN((LM_ERROR,"Setting administrative state to lock failed. DsLogAdmin::LogLocked not thrown.\n"),-1); - } catch (const DsLogAdmin::LogLocked&) { @@ -347,7 +340,6 @@ BasicLog_Test::test_adminState() this->write_records(0); ACE_DEBUG ((LM_DEBUG,"Setting administrative state to succeeded. DsLogAdmin::LogLocked not thrown.\n")); ACE_RETURN(0); - } catch (const DsLogAdmin::LogLocked&) { @@ -360,7 +352,6 @@ BasicLog_Test::test_adminState() int BasicLog_Test::test_logSize (void) { - try { basicLog_->set_max_size (1); @@ -403,7 +394,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) { @@ -472,7 +462,6 @@ BasicLog_Test::test_retrieval (CORBA::ULong /* numberOfRecordsToWrite */) } - int BasicLog_Test::test_query(CORBA::ULong numberOfRecordsToWrite) { @@ -558,7 +547,6 @@ BasicLog_Test::destroy_log() int BasicLog_Test::test_log_destroy (void) { - ACE_DEBUG ((LM_ERROR, "Testing destroy log\n")); this->basicLog_->destroy (); @@ -651,7 +639,6 @@ return 0; int BasicLog_Test::test_capacity_alarm_threshold (void) { - //basicLog_->set_log_full_action(DsLogAdmin::halt); DsLogAdmin::CapacityAlarmThresholdList list; @@ -712,5 +699,4 @@ BasicLog_Test::test_capacity_alarm_threshold (void) this->write_records (0); return 0; - } diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h index fc2db452560..9765e04e5d6 100644 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h @@ -24,8 +24,6 @@ class BasicLog_Test // This class exercises various methods of the DsLogAdmin::BasicLog // interface. public: - - enum { MAX_LOG_SIZE = 8192 }; @@ -150,7 +148,6 @@ private: static const char* naming_service_name_; // strings for log factory and naming service - }; #endif /* TAO_BASIC_LOG_TEST_H */ diff --git a/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.cpp b/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.cpp index 5c49bf752c7..2ef95fa4f05 100644 --- a/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.cpp +++ b/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.cpp @@ -1,7 +1,6 @@ #include "McastHello.h" - McastHello::McastHello (CORBA::ORB_ptr orb, int instance) : orb_ (CORBA::ORB::_duplicate (orb)), diff --git a/TAO/orbsvcs/tests/Miop/McastLocal/client.cpp b/TAO/orbsvcs/tests/Miop/McastLocal/client.cpp index 64678a3a6e4..82ce5ecd2aa 100644 --- a/TAO/orbsvcs/tests/Miop/McastLocal/client.cpp +++ b/TAO/orbsvcs/tests/Miop/McastLocal/client.cpp @@ -4,7 +4,6 @@ #include "orbsvcs/PortableGroup/MIOP.h" - #define MAX_MIOP_OCTET_SEQUENCE (ACE_MAX_DGRAM_SIZE - 272 /* MIOP_MAX_HEADER_SIZE */) const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); diff --git a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test_impl.cpp b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test_impl.cpp index d1a4c81904f..d59755cc7ce 100644 --- a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test_impl.cpp +++ b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test_impl.cpp @@ -1,7 +1,6 @@ #include "Test_impl.h" - Server_impl::Server_impl (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/client.cpp b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/client.cpp index 34e9ae8b7a4..ff97ec813f6 100644 --- a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/client.cpp +++ b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/client.cpp @@ -3,7 +3,6 @@ #include "TestC.h" - const ACE_TCHAR *ior_server = 0; int diff --git a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/server.cpp b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/server.cpp index db1b3a6a5ea..4eb878ed19e 100644 --- a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/server.cpp +++ b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/server.cpp @@ -4,7 +4,6 @@ #include "orbsvcs/PortableGroup/GOA.h" - const ACE_TCHAR *uipmc_url = 0; const ACE_TCHAR *ior_output_file = 0; diff --git a/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.cpp b/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.cpp index a32eb6127e1..2e60841de9b 100644 --- a/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.cpp +++ b/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.cpp @@ -1,7 +1,6 @@ #include "McastHello.h" - McastHello::McastHello (CORBA::ORB_ptr orb, int instance) : orb_ (CORBA::ORB::_duplicate (orb)), 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/ConnectDisconnect.cpp b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp index 56a3172182b..f5390872c18 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp @@ -4,7 +4,6 @@ #include "ConnectDisconnect.h" - #define CD_IMPLEMENT_ENTITY(X)\ \ CD_##X::CD_##X (ConnectDisconnect* cd, int id) \ diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp index 6dfcd5110ac..a4471ffefbb 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp @@ -4,7 +4,6 @@ #include "Events.h" - /***************************************************************************/ Event_StructuredPushConsumer::Event_StructuredPushConsumer (Events *test_client) @@ -131,7 +130,6 @@ Events::parse_args (int argc, { this->use_default_admin_ = 1; arg_shifter.consume_arg (); - } else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-events")))) { diff --git a/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp b/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp index 13953088e6a..7d2504daf97 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp @@ -5,7 +5,6 @@ #include "orbsvcs/CosNotifyFilterExtC.h" - ExtendedFilter::ExtendedFilter (void) : event_count_ (5) { diff --git a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp index 6014d6c7aaf..e10e796bc8f 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp @@ -4,7 +4,6 @@ #include "Filter.h" - Filter::Filter (void) : event_count_ (5) { diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp index 26893522ce8..7eded75b6ef 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp @@ -86,7 +86,6 @@ IdAssignment::init (int argc, ACE_ERROR ((LM_ERROR, " (%P|%t) Unable to resolve naming service !\n")); return; - } CosNaming::NamingContext_var rootNC = CosNaming::NamingContext::_narrow (rootObj.in ()); @@ -108,7 +107,6 @@ IdAssignment::init (int argc, CosNotifyChannelAdmin::EventChannelFactory::_narrow ( obj.in() ); - } CosNotifyChannelAdmin::ChannelID diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp index e65237bdb92..f772230f01b 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp @@ -4,7 +4,6 @@ #include "MultiTypes.h" - //***************************************************************************************************** MultiTypes_PushConsumer::MultiTypes_PushConsumer (MultiTypes* client) @@ -63,7 +62,6 @@ MultiTypes::MultiTypes (void) seq_event_count_ (0), disconnect_on_last_event_ (0) { - } MultiTypes::~MultiTypes () diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp index f61f6e17edd..942d4dcdaf3 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp @@ -5,7 +5,6 @@ #include "Sequence.h" - /***************************************************************************/ SequencePushConsumer::SequencePushConsumer (Sequence *test_client) diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp index ddd0ad8f9ac..add5a5317b6 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp @@ -4,7 +4,6 @@ #include "Simple.h" - //*************************************************************************** Event_AnyPushConsumer::Event_AnyPushConsumer (Simple_Test *test_client) diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp index a3326305bcb..612deae2d2f 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp @@ -4,7 +4,6 @@ #include "Updates.h" - Updates_StructuredPushConsumer::Updates_StructuredPushConsumer (Updates *test_client) : test_client_ (test_client) { diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp index e1b15e1fc3c..21bd1c6aae9 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp @@ -24,7 +24,6 @@ namespace CosNotifyCommImpl{ std::cout << "event.header.fixed_header.event_type.type_name = " << event.header.fixed_header.event_type.type_name << std::endl; - }; void disconnect_structured_push_consumer() diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp index 6f110389e8b..1e2ee3809d3 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp @@ -16,7 +16,6 @@ get_event_channel(CORBA::ORB_ptr orb) CosNotification::AdminProperties init_admin(0); - std::cout << "Get CosNotifyChannelAdmin::EventChannelFactory" << std::endl; std::cout << "IorEventChannelFactory=" << ior << std::endl; CORBA::Object_var obj = orb->string_to_object(ior); @@ -51,7 +50,6 @@ get_event_channel(CORBA::ORB_ptr orb) if( channelIdSeq->length() == 0 ) { - try { ec = factory->create_channel( init_qos, init_admin, id); @@ -229,7 +227,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) match_structure_test (filter, event, expected_result); orb->shutdown(); - } catch(...) { diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp index b9e1fd75cab..172a6306ad4 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp @@ -9,7 +9,6 @@ namespace CosNotifyCommImpl{ void subscription_change( const CosNotification::EventTypeSeq&, const CosNotification::EventTypeSeq&) {}; - }; } diff --git a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp index f5939a0a146..22e031184df 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp @@ -162,7 +162,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) status = consumer_1->messages_received() == 1 ? 0 : 1; ACE_DEBUG((LM_DEBUG, "Test status is %s.\n", status == 1 ? "fail" : "pass")); - } } } 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/Bug_3252_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp index 96fe82eb761..23a8719f783 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp @@ -136,7 +136,6 @@ int loadOrb(ACE_Service_Config & service_config) } - int ACE_TMAIN(int, ACE_TCHAR **argv) { diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp index 78ac583c59a..caf8ef284ac 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp @@ -98,7 +98,6 @@ return 0; } - void loadunloadcycle() { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp index 78440bec547..ad34e9cfa75 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp @@ -11,7 +11,6 @@ namespace CosNotifyCommImpl{ void subscription_change( const CosNotification::EventTypeSeq&, const CosNotification::EventTypeSeq&) {}; - }; } diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.h b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.h index 7c743cbcbd7..3438aff5c43 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.h +++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/TestBroadcaster.h @@ -31,11 +31,9 @@ class bug3688_Export TestBroadcaster // protected types and methods protected: - // private methods and instance variables private: CosNotifyChannelAdmin::SequenceProxyPushConsumer_var mv_sequenceProxyPushConsumer; - }; /* end of TestBroadcaster */ diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp index 9c61a834f92..b60ec30150f 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp @@ -43,7 +43,6 @@ ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_VERSIONED_SERVICE_D ACE_TCHAR const * const scpc_unloadNotifyService = ACE_REMOVE_SERVICE_DIRECTIVE("testNotifyService"); - int publish() { int result = 0; diff --git a/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp b/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp index 6f3a741ea98..2224260849d 100644 --- a/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp +++ b/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp @@ -18,7 +18,6 @@ sorter (const void* a, const void* b) } - // It's reasonable to assume that there is only one event channel // factory and that we know its name. class MonitorTestInterface_i: public virtual POA_MonitorTestInterface @@ -280,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/Persistent_Filter/Filter.h b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h index 7e3d933ffdd..14947118533 100644 --- a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h +++ b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h @@ -55,7 +55,6 @@ class FilterClient void done (void); protected: - int parse_args (int argc, ACE_TCHAR *argv[]); diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp index 02f9125570c..1fc535fc299 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp @@ -1,7 +1,6 @@ #include "RT_Application_Command.h" - #include "../lib/LookupManager.h" #include "RT_Priority_Mapping.h" diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp index e1f9c3d1a34..5622466deed 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp +++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp @@ -1,7 +1,6 @@ #include "../lib/Factories_Define.h" - #include "rt_notify_test_export.h" #include "../lib/Name.h" #include "../lib/Command_Factory_T.h" diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp index 88cda77d7ec..9672f19024d 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp @@ -1,7 +1,6 @@ #include "RT_POA_Command.h" - #include "tao/debug.h" #include "../lib/LookupManager.h" #include "../lib/Name.h" @@ -270,7 +269,6 @@ TAO_Notify_Tests_RT_POA_Command::create (RTCORBA::RTORB_ptr rt_orb, PortableServ // Create a thread-pool policy. lanes_policy = rt_orb->create_threadpool_policy (threadpool_id); - } else if (thread_pool_static_threads_ > 0) { diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp index 10a8b6ba093..4545dc048f5 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp +++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp @@ -1,7 +1,6 @@ #include "RT_Priority_Mapping.h" - #include "../lib/LookupManager.h" TAO_Notify_Tests_RT_Priority_Mapping::~TAO_Notify_Tests_RT_Priority_Mapping (void) diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.h b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.h index 10adc098929..a8e7f5f2b2a 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.h +++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.h @@ -40,7 +40,6 @@ public: CORBA::Short &corba_priority); protected: - /// The Priority Mapping helper. RTCORBA::PriorityMapping *priority_mapping_; }; diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp index 4b43325d224..b6583729658 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp @@ -7,7 +7,6 @@ #include "tao/AnyTypeCode/Any.h" - static const char NOTIFY_FACTORY_NAME[] = "NotifyEventChannelFactory"; static const char NAMING_SERVICE_NAME[] = "NameService"; @@ -1561,7 +1560,6 @@ Consumer_Main::init_sequence_proxy_supplier (void) this->sequence_proxy_push_supplier_->connect_sequence_push_consumer ( this->sequence_push_consumer_ref_.in ()); this->sequence_push_consumer_.set_connected(true); - } @@ -1680,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/Consumer.h b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h index 26f4b891391..46491df04be 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h @@ -202,7 +202,6 @@ class Consumer_Main //////////////// // Data members private: - // set by command line parameters bool verbose_; // -v make a glorious noise enum Mode_T{ diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp index c550f4178fe..c94aaef6509 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp @@ -7,7 +7,6 @@ #include "ace/OS_NS_strings.h" - static const char NOTIFY_FACTORY_NAME[] = "NotifyEventChannelFactory"; static const char NAMING_SERVICE_NAME[] = "NameService"; @@ -168,7 +167,6 @@ ReconnectionCallback_i::init ( } - ///////////////// // Supplier_Main @@ -368,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/Reconnecting/Supplier.h b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h index 485055ef799..fa0a3988c89 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h @@ -124,7 +124,6 @@ class Supplier_Main //////////////// // Data members private: - // set by command line parameters bool verbose_; // -v make a glorious noise enum Mode_T { @@ -171,5 +170,4 @@ class Supplier_Main }; - #endif /* RECONNECTNG_SUPPLIER_H */ diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp index 102a6760b16..1cb8deed507 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp @@ -163,7 +163,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) sig->done (); return 0; - } catch (const CORBA::Exception& e) { diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h index 11fca2d5a0c..dba718ad1d0 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h @@ -66,7 +66,6 @@ protected: virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (void); protected: - /// Lock to serialize access to data members. TAO_SYNCH_MUTEX lock_; diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp index ff86d67b4e7..b5299870f68 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp @@ -1,7 +1,6 @@ #include "RT_Test_FilterFactory.h" - #include "RT_Test_Filter.h" #include "tao/debug.h" #include "ace/OS_NS_string.h" diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp index c80efafa937..b8c8f6c45bb 100644 --- a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp +++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp @@ -291,12 +291,10 @@ int ACE_TMAIN (int ac, ACE_TCHAR *av[]) //////////////////////////////// // TODO make this not hardcoded ACE_OS::rename ("abc.xml", "loadtest.xml"); - } // end of pass 1 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/lib/Application_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp index 3ebb4709a2d..071e9000daf 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp @@ -1,7 +1,6 @@ #include "Application_Command.h" - #include "tao/PortableServer/PortableServer.h" #include "LookupManager.h" #include "Name.h" @@ -127,7 +126,6 @@ TAO_Notify_Tests_Application_Command::handle_shutdown (void) LOOKUP_MANAGER->resolve (driver); driver->shutdown (); - } void diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Command.cpp index 96dff4a1d34..4b7de8fcb56 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Command.cpp @@ -6,7 +6,6 @@ #include "ace/Log_Msg.h" - TAO_Notify_Tests_Command::TAO_Notify_Tests_Command (void) :next_ (0), command_ (INVALID) { diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp index 94c10a875ba..9b76abd6578 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp @@ -6,7 +6,6 @@ #include "Name.h" - TAO_Notify_Tests_Command_Builder::TAO_Notify_Tests_Command_Builder (void) : start_command_ (0), last_command_ (0) diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp index ecb1789c077..b9e7c2e70c3 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp @@ -2,7 +2,6 @@ #include "Command_Factory.h" - TAO_Notify_Tests_Command_Factory::TAO_Notify_Tests_Command_Factory (void) { } diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp index ad72f569edc..f4b2ebdf7b7 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp @@ -4,7 +4,6 @@ #include "Command_Factory_T.h" - #include "ace/Dynamic_Service.h" #include "tao/debug.h" #include "Command_Builder.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp index f64c5988d5f..7aa1dac3b08 100644 --- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp @@ -1,7 +1,6 @@ #include "ConsumerAdmin_Command.h" - #include "LookupManager.h" #include "Name.h" #include "Options_Parser.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h index c211128edf0..221c3eceafb 100644 --- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h @@ -44,7 +44,6 @@ public: static const char* name (void); protected: - /// = Data Members #ifdef HPUX_11 // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp index 615acf230fe..ab4ea2c7edf 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp @@ -4,7 +4,6 @@ #include "Consumer_T.h" - template <class Consumer_Traits> TAO_Notify_Tests_Consumer_T<Consumer_Traits>::TAO_Notify_Tests_Consumer_T (void) { diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp index 7d967fc85e2..4c356f12e5d 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp @@ -1,7 +1,6 @@ #include "Direct_Consumer.h" - #include "LookupManager.h" TAO_Notify_Tests_Direct_Consumer::TAO_Notify_Tests_Direct_Consumer (void) diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp index e9c66c60d25..d45f244a88b 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp @@ -5,7 +5,6 @@ #endif /* __ACE_INLINE__ */ - #include "LookupManager.h" TAO_Notify_Tests_Direct_Supplier::TAO_Notify_Tests_Direct_Supplier (ACE_CString& target) diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp index 45850fbc5e2..32d9d5675a8 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp @@ -1,7 +1,6 @@ #include "Driver.h" - #include "ace/Dynamic_Service.h" #include "ace/Thread_Manager.h" #include "ace/Arg_Shifter.h" @@ -152,7 +151,6 @@ TAO_Notify_Tests_ORB_Run_Worker::svc (void) ACE_DEBUG ((LM_ERROR, "Running ORB, timeout in %d sec\n", this->run_period_.sec ())); this->orb_->run (); - } catch (const CORBA::Exception&) { diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.h b/TAO/orbsvcs/tests/Notify/lib/Driver.h index 054eba9e8f9..babb998dd5a 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Driver.h +++ b/TAO/orbsvcs/tests/Notify/lib/Driver.h @@ -50,7 +50,6 @@ private: }; - /** * Run a server thread * diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp index 16745bb20e5..7e23a78a5bb 100644 --- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp @@ -2,7 +2,6 @@ #include "ace/Log_Msg.h" - #include "LookupManager.h" #include "Name.h" #include "Options_Parser.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp b/TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp index 1822f47896d..9311312b506 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp @@ -1,7 +1,6 @@ #include "Factories_Define.h" - #include "Name.h" #include "Command_Factory_T.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp index 93fe8e5af33..64a1003095c 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp @@ -2,7 +2,6 @@ #include "ace/Log_Msg.h" - #include "LookupManager.h" #include "Name.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h index 3389c9b0186..5b774ff10bd 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h @@ -44,7 +44,6 @@ public: static const char* name (void); protected: - #ifdef HPUX_11 // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h #undef COMMAND diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp index 492a6a2f2bf..d2cbf162200 100644 --- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp @@ -2,7 +2,6 @@ #include "ace/OS_NS_string.h" - #include "Name.h" TAO_Notify_Tests_LookupManager::TAO_Notify_Tests_LookupManager (void) diff --git a/TAO/orbsvcs/tests/Notify/lib/Name.cpp b/TAO/orbsvcs/tests/Notify/lib/Name.cpp index f86ec08f39e..e0594607bd6 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Name.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Name.cpp @@ -1,7 +1,6 @@ #include "Name.h" - #define TAO_Notify_Tests_DECLARE_NAME(target, name) \ const char* const TAO_Notify_Tests_Name::target = name; diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp index 42a2d0a676d..1f5f98fb996 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp @@ -95,7 +95,6 @@ TAO_Notify_Tests_Options_Parser::execute (CosNotification::QoSProperties& qos, A qos.length (1); qos[0].name = CORBA::string_dup (NotifyExt::ThreadPool); qos[0].value <<= tp_params; - } /* ThreadPool */ else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-Lanes")) == 0) // -Lanes lane_count -Lane prio static_thr dy_thr { @@ -149,6 +148,5 @@ TAO_Notify_Tests_Options_Parser::execute (CosNotification::QoSProperties& qos, A qos.length (1); qos[0].name = CORBA::string_dup (NotifyExt::ThreadPoolLanes); qos[0].value <<= tpl_params; - } /* ThreadPoolLane */ } diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.h b/TAO/orbsvcs/tests/Notify/lib/Peer.h index d4ee7d05813..35e8c0c23c7 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Peer.h +++ b/TAO/orbsvcs/tests/Notify/lib/Peer.h @@ -48,7 +48,6 @@ public: const ACE_CString& get_name (void); protected: - /// My name. ACE_CString name_; diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h index 3ce0155662e..2dec98e86d7 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h @@ -49,7 +49,6 @@ public: void dump_stats (ACE_TCHAR* msg, int dump_samples); protected: - virtual void push_structured_event ( const CosNotification::StructuredEvent & notification); diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp index d3971798566..fabecb84dc7 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp @@ -83,7 +83,6 @@ TAO_Notify_Tests_Periodic_Consumer_Command::init (ACE_Arg_Shifter& arg_shifter) } consumer->init_state (arg_shifter); - } /* -Create */ else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-Subscription")) == 0) // -Subscription admin_name +added_type1 +-added_type2 ... -added_type3 -added_type4.. { diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h index 77000e7abd5..f8d3ee9a8c4 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h @@ -57,7 +57,6 @@ public: const char* proxy_name (void); protected: - /// svc method. void handle_svc (void); diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h index 8d2be6a6a5b..7f91d2ecff8 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h @@ -46,7 +46,6 @@ public: static const char* name (void); protected: - #ifdef HPUX_11 // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h #undef COMMAND diff --git a/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp b/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp index 19e60fa7c72..5b65827eef4 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp @@ -1,7 +1,6 @@ #include "Priority_Mapping.h" - TAO_Notify_Tests_Priority_Mapping::~TAO_Notify_Tests_Priority_Mapping (void) { } diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp index 9358f2326ba..21b198b5164 100644 --- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp @@ -5,7 +5,6 @@ #endif /* __ACE_INLINE__ */ - TAO_Notify_Tests_PushConsumer_Traits::TAO_Notify_Tests_PushConsumer_Traits (void) :type_ (CosNotifyChannelAdmin::ANY_EVENT) { diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp index e32616ff243..c06dc8c17a7 100644 --- a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp @@ -5,7 +5,6 @@ #endif /* __ACE_INLINE__ */ - TAO_Notify_Tests_PushSupplier_Traits::TAO_Notify_Tests_PushSupplier_Traits (void) :type_ (CosNotifyChannelAdmin::ANY_EVENT) { diff --git a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp index 4e6aeca4a33..5341b868cdc 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp @@ -1,7 +1,6 @@ #include "Relay_Consumer.h" - #include "LookupManager.h" TAO_Notify_Tests_Relay_Consumer::TAO_Notify_Tests_Relay_Consumer (ACE_CString& destination) diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp index a9d59c40b55..69f1580fac4 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp @@ -5,7 +5,6 @@ #endif /* __ACE_INLINE__ */ - TAO_Notify_Tests_SequencePushConsumer_Traits::TAO_Notify_Tests_SequencePushConsumer_Traits (void) :type_ (CosNotifyChannelAdmin::SEQUENCE_EVENT) { diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp index bdb78afc0d3..7898a9101fb 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp @@ -5,7 +5,6 @@ #endif /* __ACE_INLINE__ */ - TAO_Notify_Tests_SequencePushSupplier_Traits::TAO_Notify_Tests_SequencePushSupplier_Traits (void) :type_ (CosNotifyChannelAdmin::SEQUENCE_EVENT) { diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp index 45d6bd1add4..9ef61bfdd45 100644 --- a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp @@ -1,7 +1,6 @@ #include "StructuredEvent.h" - TAO_Notify_Tests_StructuredEvent::TAO_Notify_Tests_StructuredEvent (void) { } diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp index 3c47d0c1201..acd8e77f3d1 100644 --- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp @@ -5,7 +5,6 @@ #endif /* __ACE_INLINE__ */ - TAO_Notify_Tests_StructuredPushConsumer_Traits::TAO_Notify_Tests_StructuredPushConsumer_Traits (void) :type_ (CosNotifyChannelAdmin::STRUCTURED_EVENT) { diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp index b5ef2bfc9f6..02d9fae6808 100644 --- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp @@ -5,7 +5,6 @@ #endif /* __ACE_INLINE__ */ - TAO_Notify_Tests_StructuredPushSupplier_Traits::TAO_Notify_Tests_StructuredPushSupplier_Traits (void) :type_ (CosNotifyChannelAdmin::STRUCTURED_EVENT) { diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp index 5735508d687..b3b91fae728 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp @@ -1,7 +1,6 @@ #include "SupplierAdmin_Command.h" - #include "LookupManager.h" #include "Name.h" #include "Options_Parser.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h index aa4119f149d..5652a2d05c8 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h @@ -44,7 +44,6 @@ public: static const char* name (void); protected: - #ifdef HPUX_11 // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h #undef COMMAND diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp index 33fb119d383..75e2ce86f1b 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp @@ -4,7 +4,6 @@ #include "Supplier_T.h" - template <class Supplier_Traits> TAO_Notify_Tests_Supplier_T<Supplier_Traits>::TAO_Notify_Tests_Supplier_T (void) { 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..d1aa014c192 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, " @@ -563,7 +562,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) events.dump_results(); ACE_DEBUG ((LM_DEBUG, "ending main...\n")); - } catch (const CORBA::Exception& se) { diff --git a/TAO/orbsvcs/tests/Property/client.cpp b/TAO/orbsvcs/tests/Property/client.cpp index 02c8642afea..9641e4f164f 100644 --- a/TAO/orbsvcs/tests/Property/client.cpp +++ b/TAO/orbsvcs/tests/Property/client.cpp @@ -14,7 +14,6 @@ #include "tao/debug.h" - Client::Client (void) { } @@ -651,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/main.cpp b/TAO/orbsvcs/tests/Property/main.cpp index 261b126d520..3dec33abd9a 100644 --- a/TAO/orbsvcs/tests/Property/main.cpp +++ b/TAO/orbsvcs/tests/Property/main.cpp @@ -17,7 +17,6 @@ #include "orbsvcs/Property/CosPropertyService_i.h" - class TAO_PropertySet_Tester { // = TITLE diff --git a/TAO/orbsvcs/tests/Property/server.cpp b/TAO/orbsvcs/tests/Property/server.cpp index 8e65a4fe98d..7b73e2d140b 100644 --- a/TAO/orbsvcs/tests/Property/server.cpp +++ b/TAO/orbsvcs/tests/Property/server.cpp @@ -13,13 +13,11 @@ #include "server.h" - // Main program int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); diff --git a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp index 6d6c95ac717..f583e10c785 100644 --- a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp @@ -164,7 +164,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ns2ref), -1); root_context_2 = CosNaming::NamingContext::_narrow (ns2obj.in ()); - } catch (const CORBA::Exception& ex) { @@ -295,7 +294,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) -1); result_object->destroy(); root_context_1->unbind (deep); - } catch (const CORBA::Exception& ex) { @@ -435,8 +433,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_TEXT ("Problems with resolving deep context from ") ACE_TEXT ("redundant server - nil object ref.\n")), -1); - - } catch (const CORBA::Exception& ex) { @@ -536,5 +532,4 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // All tests have passed up to this point return 0; - } diff --git a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp index e18ea654f85..965ebf7746b 100644 --- a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp +++ b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp @@ -17,7 +17,6 @@ class DynSched_Test // Wraps static functions for test { public: - static void setup_rt_info (RtecScheduler::RT_Info &info, const char *entry_point, u_long period, @@ -47,7 +46,6 @@ public: const char *output_filename, const char *heading); // Creates the schedule, runs timelines. - }; diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp index fcaf868bf25..f3fc41ea831 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp +++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp @@ -10,7 +10,6 @@ #include "orbsvcs/Naming/Naming_Server.h" - const char* service_name = "ScheduleService"; const char* format_string = "{%-12s, %d, %d, %d, %d, %8d, " diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies_Runtime.h b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies_Runtime.h index 1be4a63169b..6da2cf94406 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies_Runtime.h +++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies_Runtime.h @@ -20,7 +20,6 @@ ERROR: The following entry points have unresolved local dependencies: // both_unresolved_consumer_2 - static ACE_Scheduler_Factory::POD_RT_Info infos[] = { {"good_supplier", 1, 5000, 5000, 5000, 500000, (RtecScheduler::Criticality_t) 3, (RtecScheduler::Importance_t) 1, 0, 1, 15, 0, 0, (RtecScheduler::Info_Type_t) 0} , @@ -37,7 +36,6 @@ static ACE_Scheduler_Factory::POD_RT_Info infos[] = { {"both_unresolved_consumer_1", 7, 5000, 5000, 5000, 0, (RtecScheduler::Criticality_t) 3, (RtecScheduler::Importance_t) 1, 0, 0, 0, 0, 0, (RtecScheduler::Info_Type_t) 0} , {"both_unresolved_consumer_2", 8, 5000, 5000, 5000, 0, (RtecScheduler::Criticality_t) 3, (RtecScheduler::Importance_t) 1, 0, 0, 0, 0, 0, (RtecScheduler::Info_Type_t) 0} - }; static int infos_size = sizeof(infos)/sizeof(infos[0]); diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp index 55ef7703736..f720fdbabb9 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp +++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp @@ -15,7 +15,6 @@ - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { @@ -141,7 +140,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_ASSERT (priority == configs [j].thread_priority); ACE_ASSERT (dispatching_type == configs [j].dispatching_type); - } } catch (const CORBA::Exception& ex) diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h index 73b37fffaff..1239114260f 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h +++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h @@ -39,7 +39,6 @@ static ACE_Scheduler_Factory::POD_RT_Info infos[] = { {"high_01_C" , 15, 0, 0, 0, 0, static_cast<RtecScheduler::Criticality_t> (3), static_cast<RtecScheduler::Importance_t> (1), 0, 0, 15, 0, 0, static_cast<RtecScheduler::Info_Type_t> (0)} , {"low_01_C" , 16, 0, 0, 0, 0, static_cast<RtecScheduler::Criticality_t> (1), static_cast<RtecScheduler::Importance_t> (3), 0, 0, 2, 0, 1, static_cast<RtecScheduler::Info_Type_t> (0)} - }; static int infos_size = sizeof(infos)/sizeof(infos[0]); diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp index 9c81e257b95..21be335d766 100644 --- a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp +++ b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp @@ -8,7 +8,6 @@ #include "tao/Thread_Lane_Resources.h" - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); void do_nothing (void) diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp index 0b3a484f806..66d184ba1be 100644 --- a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp +++ b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp @@ -5,7 +5,6 @@ #include "tao/AnyTypeCode/Any.h" - const ACE_TCHAR *ior_output_file = 0; int no_iterations = 10; diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp index 0fd0602b0b4..6d40115b9ea 100644 --- a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp +++ b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp @@ -10,7 +10,6 @@ #endif /* __ACE_INLINE__ */ - void Callback_i::shutdown (void) { diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h index 7536e63f0d6..f7a40ffbf10 100644 --- a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h +++ b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h @@ -36,7 +36,6 @@ public: private: /// The orb CORBA::ORB_var orb_; - }; /** diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.h b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.h index b1b539d8812..d8b35af56e5 100644 --- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.h +++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.h @@ -19,7 +19,6 @@ class Foo_i : public virtual POA_Foo::Bar { public: - /// Constructor. Foo_i (CORBA::ORB_ptr, SecurityLevel3::SecurityCurrent_ptr current); @@ -30,13 +29,11 @@ public: virtual void shutdown (void); private: - /// Reference to the ORB. CORBA::ORB_var orb_; /// Reference to the "SecurityCurrent" object. SecurityLevel3::SecurityCurrent_var current_; - }; #endif /* SECURE_INVOCATION_FOO_I_H */ diff --git a/TAO/orbsvcs/tests/Security/Callback/client_i.h b/TAO/orbsvcs/tests/Security/Callback/client_i.h index c359db5051a..6cbcbb68d82 100644 --- a/TAO/orbsvcs/tests/Security/Callback/client_i.h +++ b/TAO/orbsvcs/tests/Security/Callback/client_i.h @@ -26,16 +26,13 @@ class client_i : public virtual POA_client { public: - client_i (server_ptr s); virtual ~client_i (void); virtual void test_reply (const char *msg); private: - server_var server_; - }; #endif /* CLIENT_I_H */ diff --git a/TAO/orbsvcs/tests/Security/Callback/server_i.h b/TAO/orbsvcs/tests/Security/Callback/server_i.h index 81e804e754a..5d674c48ca3 100644 --- a/TAO/orbsvcs/tests/Security/Callback/server_i.h +++ b/TAO/orbsvcs/tests/Security/Callback/server_i.h @@ -24,7 +24,6 @@ class server_i : public virtual POA_server { public: - server_i (CORBA::ORB_ptr orb); virtual ~server_i (void); @@ -35,11 +34,9 @@ public: virtual void shutdown (void); private: - CORBA::ORB_var orb_; client_var client_; - }; #endif /* SERVER_I_H */ 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/InsecureReferences/test.cpp b/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp index 3e18c075205..e4039ce6ef1 100644 --- a/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp +++ b/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp @@ -99,7 +99,6 @@ gen_objref (int argc, ACE_TCHAR *argv[]) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Panic: nil RootPOA\n"), 1); - } catch (const CORBA::Exception &ex) { @@ -165,5 +164,4 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return gen_objref(argc, argv); return parse_objref(argc, argv); - } diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp index 27649c77a50..64c5acf73df 100644 --- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp +++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp @@ -23,7 +23,6 @@ Client_Task::svc (void) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("(%P|%t) Client_Task::svc exception!!!\n"); - } ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client task finished\n")); diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp index c2919011234..e6b3d3e6fcc 100644 --- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp +++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp @@ -30,7 +30,6 @@ Server_Task::svc (void) this->event_.wait (); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Start doing some work....\n")); 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/Server_Worker.h b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.h index 8094a5cc390..5aef7649ee1 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.h +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.h @@ -31,7 +31,6 @@ class Server_Worker : public ACE_Task_Base { public: - /// Constructor Server_Worker (CORBA::ORB_ptr orb); @@ -42,7 +41,6 @@ public: private: /// The ORB CORBA::ORB_var orb_; - }; #if defined(_MSC_VER) 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/Server_Worker.h b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.h index 8094a5cc390..5aef7649ee1 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.h +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.h @@ -31,7 +31,6 @@ class Server_Worker : public ACE_Task_Base { public: - /// Constructor Server_Worker (CORBA::ORB_ptr orb); @@ -42,7 +41,6 @@ public: private: /// The ORB CORBA::ORB_var orb_; - }; #if defined(_MSC_VER) 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/Null_Cipher/Foo_i.h b/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.h index 79c342ac8aa..9dc19ba4a7c 100644 --- a/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.h +++ b/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.h @@ -18,17 +18,14 @@ class Foo_i : public virtual POA_Foo { public: - /// Constructor. Foo_i (CORBA::ORB_ptr); virtual void shutdown (void); private: - /// Reference to the ORB. CORBA::ORB_var orb_; - }; #endif /* NULL_CIPHER_FOO_I_H */ diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/client.cpp b/TAO/orbsvcs/tests/Security/Null_Cipher/client.cpp index 2f05d6995eb..f43e1449881 100644 --- a/TAO/orbsvcs/tests/Security/Null_Cipher/client.cpp +++ b/TAO/orbsvcs/tests/Security/Null_Cipher/client.cpp @@ -59,7 +59,6 @@ null_cipher_test (CORBA::ORB_ptr orb, ACE_DEBUG ((LM_INFO, "(%P|%t) Received CORBA::NO_PERMISSION from " "server\n")); - } } diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h index 7048d75aa8a..186ec8f7df6 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h @@ -19,7 +19,6 @@ class Foo_i : public virtual POA_Foo::Bar { public: - /// Constructor. Foo_i (CORBA::ORB_ptr, SecurityLevel3::SecurityCurrent_ptr current); @@ -30,13 +29,11 @@ public: virtual void shutdown (void); private: - /// Reference to the ORB. CORBA::ORB_var orb_; /// Reference to the "SecurityCurrent" object. SecurityLevel3::SecurityCurrent_var current_; - }; #endif /* SECURE_INVOCATION_FOO_I_H */ diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.h b/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.h index 64b1564a5e2..39b242a8ce8 100644 --- a/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.h +++ b/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.h @@ -19,7 +19,6 @@ class Foo_i : public virtual POA_Foo::Bar { public: - /// Constructor. Foo_i (CORBA::ORB_ptr, SecurityLevel3::SecurityCurrent_ptr); @@ -30,13 +29,11 @@ public: virtual void shutdown (void); private: - /// Reference to the ORB. CORBA::ORB_var orb_; /// Reference to the "SecurityCurrent" object. SecurityLevel3::SecurityCurrent_var current_; - }; #endif /* SECURE_INVOCATION_FOO_I_H */ diff --git a/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.h b/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.h index 22c3e57f6aa..cee6e0f4872 100644 --- a/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.h +++ b/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.h @@ -24,7 +24,6 @@ virtual CORBA::Boolean send_message ( const char * subject, char *& message ); - }; diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp index c07ac6145d3..a41ad93f439 100644 --- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp +++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp @@ -368,7 +368,6 @@ MT_Test::execute (TAO_Naming_Client &root_context) name_service_ior_ = orb_->object_to_string (context.in ()); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h index 5d130b9aa5c..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. @@ -99,7 +98,6 @@ private: /// Holds object to be registered with the Naming Service by each thread. Test_Object_var test_ref_; - }; /** @@ -233,7 +231,6 @@ public: virtual int execute (TAO_Naming_Client &root_context); private: - /// A pointer to our ORB (needed for object/string conversion). CORBA::ORB_var orb_; @@ -268,7 +265,6 @@ public: virtual int execute (TAO_Naming_Client &root_context); private: - /// A pointer to our ORB (used for string/object conversion). CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp index ddde0038875..b0929b688a6 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Simple_Naming/client.cpp @@ -384,7 +384,6 @@ MT_Test::execute (TAO_Naming_Client &root_context) name_service_ior_ = orb_->object_to_string (context.in ()); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.h b/TAO/orbsvcs/tests/Simple_Naming/client.h index 2c3189ce019..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. @@ -107,7 +106,6 @@ private: /// Holds object to be registered with the Naming Service by each thread. Test_Object_var test_ref_; - }; /** @@ -246,7 +244,6 @@ public: virtual int execute (TAO_Naming_Client &root_context); private: - /// A pointer to our ORB (needed for object/string conversion). CORBA::ORB_var orb_; @@ -282,7 +279,6 @@ public: virtual int execute (TAO_Naming_Client &root_context); private: - /// A pointer to our ORB (used for string/object conversion). CORBA::ORB_var orb_; @@ -314,7 +310,6 @@ public: virtual int execute (TAO_Naming_Client &root_context); private: - /// A pointer to our ORB (used for string/object conversion). CORBA::ORB_var orb_; }; diff --git a/TAO/orbsvcs/tests/Time/Client_i.cpp b/TAO/orbsvcs/tests/Time/Client_i.cpp index b6a9fc776d9..0fc088ab8d4 100644 --- a/TAO/orbsvcs/tests/Time/Client_i.cpp +++ b/TAO/orbsvcs/tests/Time/Client_i.cpp @@ -10,7 +10,6 @@ #include "ace/os_include/os_netdb.h" - // Constructor. Client_i::Client_i (void) @@ -35,7 +34,6 @@ Client_i::test_for_secure_universal_time (void) { CosTime::UTO_var UTO_server = this->clerk_->secure_universal_time (); - } catch (const CORBA::SystemException& sysex) { @@ -100,7 +98,6 @@ Client_i::test_for_new_universal_time (void) ACE_ASSERT ((UTO_server->utc_time ()).inacchi == 0); ACE_ASSERT ((UTO_server->utc_time ()).inacclo == 9999); ACE_ASSERT ((UTO_server->utc_time ()).tdf == 99); - } catch (const CORBA::Exception& ex) { @@ -138,7 +135,6 @@ Client_i::test_for_uto_from_utc (void) ACE_ASSERT ((UTO_server->utc_time ()).inacclo == 50); ACE_ASSERT ((UTO_server->utc_time ()).inacchi == 50); ACE_ASSERT ((UTO_server->utc_time ()).tdf == 99); - } catch (const CORBA::Exception& ex) { @@ -164,7 +160,6 @@ Client_i::test_for_new_interval (void) ACE_ASSERT ((TIO_server->time_interval ()).lower_bound == 666666666); ACE_ASSERT ((TIO_server->time_interval ()).upper_bound == 999999999); - } catch (const CORBA::Exception& ex) { @@ -291,7 +286,6 @@ Client_i::~Client_i (void) int Client_i::obtain_initial_references (void) { - try { // Initialize the naming services. @@ -385,7 +379,6 @@ Client_i::init (int argc, ACE_TCHAR **argv) if (this->obtain_initial_references () == -1) return -1; - } } catch (const CORBA::Exception& ex) diff --git a/TAO/orbsvcs/tests/Time/Client_i.h b/TAO/orbsvcs/tests/Time/Client_i.h index ba1b6b252bb..5c062491e9a 100644 --- a/TAO/orbsvcs/tests/Time/Client_i.h +++ b/TAO/orbsvcs/tests/Time/Client_i.h @@ -92,5 +92,4 @@ private: /// Remember our orb. CORBA::ORB_var orb_; - }; diff --git a/TAO/orbsvcs/tests/Time/client.cpp b/TAO/orbsvcs/tests/Time/client.cpp index b5ba042c043..4ea33d6dda6 100644 --- a/TAO/orbsvcs/tests/Time/client.cpp +++ b/TAO/orbsvcs/tests/Time/client.cpp @@ -2,7 +2,6 @@ #include "ace/Log_Msg.h" - // This function runs the Time Service client test. int diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h index 6cd1847283d..30e4de33131 100644 --- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h +++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h @@ -21,7 +21,6 @@ class TAO_TTest_Export TAO_Offer_Exporter { public: - TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if, CORBA::Boolean verbose); @@ -47,7 +46,6 @@ public: // Withdraw a number of offers based on a constraint string. private: - CosTrading::OfferIdSeq* grab_offerids (void); void create_offers (void); diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.h b/TAO/orbsvcs/tests/Trading/Offer_Importer.h index 65ff201dcc6..2e7c7ac76cd 100644 --- a/TAO/orbsvcs/tests/Trading/Offer_Importer.h +++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.h @@ -27,7 +27,6 @@ class TAO_TTest_Export TAO_Offer_Importer { public: - TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if, CORBA::Boolean verbose = 1); @@ -39,7 +38,6 @@ public: // bootstrapped-to trader. private: - void perform_queries_with_policies (const TAO_Policy_Creator& policy_manager); // Perform a query on the bootstrapped-to trader given the policies // pass in <policy_manager>. diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp index b7d1d806e47..2ddafeff55d 100644 --- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp +++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp @@ -98,7 +98,6 @@ TAO_Service_Type_Exporter::add_all_types_to_all (void) str = CosTradingRepos::ServiceTypeRepository::_narrow (remote_repos.in ()); - } catch (const CORBA::Exception& e) { diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h index 559833192f0..b522791e59f 100644 --- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h +++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h @@ -20,7 +20,6 @@ class TAO_TTest_Export TAO_Service_Type_Exporter { public: - TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if, CORBA::Boolean verbose); @@ -50,7 +49,6 @@ public: // inherits from. private: - void create_types (void); // Generate the service type description structures. diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp index fbd6b915254..92811ca9285 100644 --- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp +++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp @@ -4,7 +4,6 @@ #include "Simple_Dynamic.h" - template <class T> TAO_Simple_Dynamic_Property<T>::TAO_Simple_Dynamic_Property (const T& dp) : dp_ (dp) diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.cpp b/TAO/orbsvcs/tests/Trading/TT_Info.cpp index 329f3d8c86a..1442190a726 100644 --- a/TAO/orbsvcs/tests/Trading/TT_Info.cpp +++ b/TAO/orbsvcs/tests/Trading/TT_Info.cpp @@ -4,7 +4,6 @@ #include "ace/OS_NS_string.h" - const char* TT_Info::INTERFACE_NAMES[] = { "TAO_Trader_Test::Remote_IO", diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.h b/TAO/orbsvcs/tests/Trading/TT_Info.h index eccaeed01c8..5ddbcae8a1f 100644 --- a/TAO/orbsvcs/tests/Trading/TT_Info.h +++ b/TAO/orbsvcs/tests/Trading/TT_Info.h @@ -12,7 +12,6 @@ class TAO_TTest_Export TT_Info { public: - static void dump_properties (const CosTrading::PropertySeq& prop_seq, CORBA::Boolean print_dynamic = 1); // Dump the contents of this property sequence. @@ -32,7 +31,6 @@ public: public POA_TAO_Trader_Test::Remote_Output { public: - Remote_Output (void) {} virtual void confirm (void) @@ -45,7 +43,6 @@ public: public POA_TAO_Trader_Test::Printer { public: - Printer (void) {} virtual void confirm (void) @@ -179,7 +176,6 @@ class TAO_TTest_Export TT_Parse_Args // Utility to parse the command-line arguments to the trading service tests. { public: - TT_Parse_Args (int& argc, ACE_TCHAR** argv); ~TT_Parse_Args (); @@ -195,7 +191,6 @@ class TAO_TTest_Export TT_Parse_Args // Not null if the test user supplied an explicit ior. private: - int federated_, quiet_; char* ior_; }; diff --git a/TAO/orbsvcs/tests/Trading/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp index 7367ccf75f7..1b00b7efc57 100644 --- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp +++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp @@ -121,7 +121,6 @@ int failure = 0; TAO_Offer_Importer offer_importer(lookup_if.in(), verbose); offer_importer.perform_queries (); - }; // End of Trading service scope. //----------------------------------------------------------------------- ACE_DEBUG ((LM_DEBUG, "*** Shutting down.\n")); 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..7b553031a5c 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); @@ -116,7 +115,6 @@ IOR_corbaname_Client_i::init (int argc, ACE_TCHAR **argv) "%s: Address of naming context not specified\n", this->argv_[0]), -1); - } catch (const CORBA::Exception& ex) { 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 58cf5b28299..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); @@ -39,7 +38,6 @@ class IOR_corbaname_Client_i int init (int argc, ACE_TCHAR **argv); private: - /// # of arguments on the command line. int argc_; diff --git a/TAO/orbsvcs/tests/ior_corbaname/server.cpp b/TAO/orbsvcs/tests/ior_corbaname/server.cpp index cafd991d555..d446e57b198 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/server.cpp +++ b/TAO/orbsvcs/tests/ior_corbaname/server.cpp @@ -49,7 +49,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // Destroy the POA, waiting until the destruction terminates poa->destroy (true, true); orb->destroy (); - } catch (const CORBA::SystemException& ex) { diff --git a/TAO/orbsvcs/tests/ior_corbaname/status_i.h b/TAO/orbsvcs/tests/ior_corbaname/status_i.h index 1f709d09964..1ca8ba13f7c 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/status_i.h +++ b/TAO/orbsvcs/tests/ior_corbaname/status_i.h @@ -9,7 +9,6 @@ public: corbaname_Status_i (void); CORBA::Boolean print_status (void); - }; #endif /* STATUS_I_H */ 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 2aa73b80583..816486a8d6c 100644 --- a/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h +++ b/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h @@ -64,12 +64,10 @@ struct RefHelper return t_obj._retn(); } - }; 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/CSD_Strategy/TestInf/AppShutdown.h b/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.h index 03e04037a86..41baeabb066 100644 --- a/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.h +++ b/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.h @@ -8,7 +8,6 @@ class CSD_PT_TestInf_Export AppShutdown { public: - AppShutdown(); virtual ~AppShutdown(); diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h b/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h index f7f5c727648..be09dae14cd 100644 --- a/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h +++ b/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h @@ -11,7 +11,6 @@ template <class T> class ServantList { public: - typedef typename T::_stub_type T_stub; typedef typename T::_stub_ptr_type T_stub_ptr; typedef typename T::_stub_var_type T_stub_var; @@ -38,7 +37,6 @@ class ServantList private: - struct ServantRecord { T* servant_; diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.h b/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.h index a3e2d64be32..f92e3b8e849 100644 --- a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.h +++ b/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.h @@ -10,7 +10,6 @@ class CSD_PT_TestInf_Export TestAppBase { public: - virtual ~TestAppBase(); // Returns 0 for success, and -1 for failure. @@ -20,7 +19,6 @@ class CSD_PT_TestInf_Export TestAppBase protected: - TestAppBase(const char* name); // Returns -1 for failure, 0 for success @@ -28,7 +26,6 @@ class CSD_PT_TestInf_Export TestAppBase private: - ACE_CString name_; }; diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.h b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.h index 8dd569d1543..287fb68ab80 100644 --- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.h +++ b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.h @@ -7,7 +7,6 @@ class CSD_PT_TestServant_Export Foo_Statistics { public: - Foo_Statistics(); virtual ~Foo_Statistics(); @@ -22,7 +21,6 @@ class CSD_PT_TestServant_Export Foo_Statistics private: - unsigned num_clients_; unsigned num_loops_; unsigned expected_[5]; diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h index 476b9e238cb..1b65a61007c 100644 --- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h +++ b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h @@ -9,7 +9,6 @@ class CSD_PT_TestServant_Export Foo_i : public virtual POA_Foo { public: - Foo_i(); virtual ~Foo_i(); @@ -30,7 +29,6 @@ class CSD_PT_TestServant_Export Foo_i : public virtual POA_Foo private: - unsigned op_count_[5]; }; diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp index c64c7a5b63a..04e8bd1fd79 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp @@ -1513,7 +1513,6 @@ Cubit_Client::run () for (i = 0; i < this->loop_count_; ++i) { this->cube_any_struct (i); - } timer.stop (); diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp index 80f56b7c9f8..3236d8087c4 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp @@ -241,7 +241,6 @@ Cubit_i::cube_union (const Cubit::oneof &values) temp.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o; temp.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s; temp.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l; - } return temp; } 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/Cubit/TAO/MT_Cubit/Task_Client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp index 10da30b572c..8d6474f51ca 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp @@ -367,7 +367,6 @@ Client::get_high_priority_jitter (void) if (stats.sample (ACE_round (*latency)) == -1) ACE_DEBUG ((LM_DEBUG, "Error: stats.sample returned -1\n")); - } // Return the square root of the sum of the differences computed diff --git a/TAO/performance-tests/Latency/AMI/client.cpp b/TAO/performance-tests/Latency/AMI/client.cpp index adefa42bb66..fffeb23c96d 100644 --- a/TAO/performance-tests/Latency/AMI/client.cpp +++ b/TAO/performance-tests/Latency/AMI/client.cpp @@ -129,7 +129,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_OS::gethrtime ()); if (orb->work_pending ()) orb->perform_work (); - } ACE_Time_Value tv (0, 2000); diff --git a/TAO/performance-tests/Latency/Collocation/Client_Task.cpp b/TAO/performance-tests/Latency/Collocation/Client_Task.cpp index 0667989e650..716791e92cf 100644 --- a/TAO/performance-tests/Latency/Collocation/Client_Task.cpp +++ b/TAO/performance-tests/Latency/Collocation/Client_Task.cpp @@ -77,5 +77,4 @@ Client_Task::svc (void) } return 0; - } diff --git a/TAO/performance-tests/Latency/Collocation/Client_Task.h b/TAO/performance-tests/Latency/Collocation/Client_Task.h index ab015903554..d78367ea0c5 100644 --- a/TAO/performance-tests/Latency/Collocation/Client_Task.h +++ b/TAO/performance-tests/Latency/Collocation/Client_Task.h @@ -15,7 +15,6 @@ class Client_Task : public ACE_Task_Base { public: - /// Constructor Client_Task (Test::Roundtrip_ptr reference, int iterations, @@ -25,10 +24,8 @@ public: int svc (void); private: - const int niterations; Test::Roundtrip_var remote_ref_; - }; #include /**/ "ace/post.h" diff --git a/TAO/performance-tests/Latency/Collocation/Server_Task.h b/TAO/performance-tests/Latency/Collocation/Server_Task.h index 0fa23d8b529..86c8428ce3b 100644 --- a/TAO/performance-tests/Latency/Collocation/Server_Task.h +++ b/TAO/performance-tests/Latency/Collocation/Server_Task.h @@ -29,7 +29,6 @@ public: Test::Roundtrip * get_reference (); private: - ACE_Manual_Event &cond_; /// Manual event to wake up the main thread to create a client /// thread. diff --git a/TAO/performance-tests/Latency/DII/client.cpp b/TAO/performance-tests/Latency/DII/client.cpp index 2273992983e..918af48016c 100644 --- a/TAO/performance-tests/Latency/DII/client.cpp +++ b/TAO/performance-tests/Latency/DII/client.cpp @@ -158,7 +158,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) object->_request ("shutdown"); request->invoke (); - } } catch (const CORBA::Exception& ex) diff --git a/TAO/performance-tests/POA/Demux/client.cpp b/TAO/performance-tests/POA/Demux/client.cpp index afb4acfe869..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; @@ -41,5 +40,4 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } return 0; - } diff --git a/TAO/performance-tests/POA/Demux/demux_stats.cpp b/TAO/performance-tests/POA/Demux/demux_stats.cpp index 2cea585ce4c..cf9e8bbdebc 100644 --- a/TAO/performance-tests/POA/Demux/demux_stats.cpp +++ b/TAO/performance-tests/POA/Demux/demux_stats.cpp @@ -14,9 +14,7 @@ class Demux_Stats { - public: - /// Calculates the average latency and Standard deviation. /// Expects the input data in my_results.dat. int @@ -39,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; @@ -59,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]; @@ -98,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++; } @@ -317,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 5d4a632fc5a..9eea75d6280 100644 --- a/TAO/performance-tests/POA/Demux/demux_test_client.cpp +++ b/TAO/performance-tests/POA/Demux/demux_test_client.cpp @@ -118,14 +118,12 @@ Demux_Test_Client::init (int argc, ACE_TCHAR *argv []) // success return 0; - } // parse command line arguments (if any). 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_client.h b/TAO/performance-tests/POA/Demux/demux_test_client.h index 8612a173f20..1943d47556d 100644 --- a/TAO/performance-tests/POA/Demux/demux_test_client.h +++ b/TAO/performance-tests/POA/Demux/demux_test_client.h @@ -23,7 +23,6 @@ class Demux_Test_Client { public: - // Request invocation strategies enum INVOKE_STRATEGY { @@ -53,7 +52,6 @@ public: int run (void); private: - /// parse command line arguments int parse_args (void); @@ -119,7 +117,6 @@ private: /// database of operations Operation_DB_Entry op_db_[TAO_DEMUX_TEST_MAX_OPS]; - }; diff --git a/TAO/performance-tests/POA/Demux/demux_test_i.h b/TAO/performance-tests/POA/Demux/demux_test_i.h index 505e86ef220..7bc57c5ab5f 100644 --- a/TAO/performance-tests/POA/Demux/demux_test_i.h +++ b/TAO/performance-tests/POA/Demux/demux_test_i.h @@ -8,7 +8,6 @@ class Demux_Test_i : public POA_Demux_Test { public: - Demux_Test_i (void); //ctor. @@ -34,7 +33,6 @@ public: private: PortableServer::POA_var poa_; // Implement a different _default_POA() - }; #endif /* TAO_DEMUX_TEST_I_H */ diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.cpp b/TAO/performance-tests/POA/Demux/demux_test_server.cpp index 7f8ee4a8c99..2d189d83ab7 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 (); } @@ -285,7 +284,6 @@ Demux_Test_Server::init (int argc, ACE_TCHAR *argv []) ACE_OS::fprintf (this->ior_fp_, "%s\n", ior.in ()); - } catch (const CORBA::Exception& ex) { @@ -298,7 +296,6 @@ Demux_Test_Server::init (int argc, ACE_TCHAR *argv []) } // j loop prev_poa = this->child_poa_[i].in (); - } // i loop ACE_OS::fclose (this->ior_fp_); @@ -310,7 +307,6 @@ Demux_Test_Server::init (int argc, ACE_TCHAR *argv []) try { this->poa_mgr_->activate (); - } catch (const CORBA::Exception& ex) { @@ -320,14 +316,12 @@ Demux_Test_Server::init (int argc, ACE_TCHAR *argv []) // success return 0; - } // parse command line arguments (if any). 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/demux_test_server.h b/TAO/performance-tests/POA/Demux/demux_test_server.h index 8fbf653f604..a6fd3f11c62 100644 --- a/TAO/performance-tests/POA/Demux/demux_test_server.h +++ b/TAO/performance-tests/POA/Demux/demux_test_server.h @@ -43,7 +43,6 @@ public: int calculate_avg_latency (void); private: - /// parse command line arguments (if any) int parse_args (void); @@ -97,7 +96,6 @@ private: /// Use the Transient POAs for servant activation as opposed /// to persistent POAs. int use_transient_poas_; - }; 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 e10826b6e00..50a81ae6430 100644 --- a/TAO/performance-tests/Protocols/sender.cpp +++ b/TAO/performance-tests/Protocols/sender.cpp @@ -190,7 +190,6 @@ public: void setup (void); private: - ACE_hrtime_t deadline_for_current_call (CORBA::ULong i); void missed_start_deadline (CORBA::ULong invocation); void missed_end_deadline (CORBA::ULong invocation); @@ -465,7 +464,6 @@ Worker::setup (void) // for a few times before giving up. for (int j = 0;;) { - test_protocol_setup: try @@ -503,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/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp index 958b597b92b..783d3beb11f 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp @@ -253,7 +253,6 @@ Server::svc (void) poa_manager->activate (); orb->run (); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp index a0046475528..2689271ca8c 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp @@ -217,7 +217,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) throughput.dump_results (ACE_TEXT("Aggregated"), gsf); server->shutdown (""); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp index 9e835b90b7f..79167eeecfb 100644 --- a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp +++ b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp @@ -863,14 +863,12 @@ Continuous_Worker::svc (void) class Task : public ACE_Task_Base { public: - Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); int svc (void); CORBA::ORB_var orb_; - }; Task::Task (ACE_Thread_Manager &thread_manager, diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp index 31ef0cbc69b..e30f3b816c9 100644 --- a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp +++ b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp @@ -186,14 +186,12 @@ write_ior_to_file (const ACE_TCHAR *ior_file, class Task : public ACE_Task_Base { public: - Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); int svc (void); CORBA::ORB_var orb_; - }; Task::Task (ACE_Thread_Manager &thread_manager, diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h index e2b64b3ddc1..e2f09f0b197 100644 --- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h +++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h @@ -47,7 +47,6 @@ public: Test::Timestamp send_time); - void shutdown (Test::AMH_RoundtripResponseHandler_ptr _tao_rh); private: diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp index 7af03422198..64c44e0d706 100644 --- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp @@ -335,7 +335,6 @@ test_double_seq (Test::Roundtrip_ptr roundtrip) } - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h index 7c2cf869732..fe58d00e939 100644 --- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h +++ b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h @@ -15,7 +15,6 @@ class Roundtrip : public virtual POA_Test::Roundtrip { public: - /// Constructor Roundtrip (CORBA::ORB_ptr orb); diff --git a/TAO/performance-tests/Sequence_Latency/AMI/client.cpp b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp index 80a86a84e5b..d5d1921e003 100644 --- a/TAO/performance-tests/Sequence_Latency/AMI/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp @@ -90,7 +90,6 @@ void test_octet_seq (Test::Roundtrip_ptr roundtrip, ACE_OS::gethrtime ()); if (orb->work_pending ()) orb->perform_work (); - } ACE_Time_Value tv (0, 2000); @@ -136,7 +135,6 @@ void test_char_seq (Test::Roundtrip_ptr roundtrip, ACE_OS::gethrtime ()); if (orb->work_pending ()) orb->perform_work (); - } ACE_Time_Value tv (0, 2000); @@ -182,7 +180,6 @@ void test_long_seq (Test::Roundtrip_ptr roundtrip, ACE_OS::gethrtime ()); if (orb->work_pending ()) orb->perform_work (); - } ACE_Time_Value tv (0, 2000); @@ -228,7 +225,6 @@ void test_short_seq (Test::Roundtrip_ptr roundtrip, ACE_OS::gethrtime ()); if (orb->work_pending ()) orb->perform_work (); - } ACE_Time_Value tv (0, 2000); @@ -274,7 +270,6 @@ void test_double_seq (Test::Roundtrip_ptr roundtrip, ACE_OS::gethrtime ()); if (orb->work_pending ()) orb->perform_work (); - } ACE_Time_Value tv (0, 2000); @@ -320,7 +315,6 @@ void test_longlong_seq (Test::Roundtrip_ptr roundtrip, ACE_OS::gethrtime ()); if (orb->work_pending ()) orb->perform_work (); - } ACE_Time_Value tv (0, 2000); diff --git a/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h index 7c2cf869732..fe58d00e939 100644 --- a/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h +++ b/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h @@ -15,7 +15,6 @@ class Roundtrip : public virtual POA_Test::Roundtrip { public: - /// Constructor Roundtrip (CORBA::ORB_ptr orb); diff --git a/TAO/performance-tests/Sequence_Latency/DSI/client.cpp b/TAO/performance-tests/Sequence_Latency/DSI/client.cpp index a399d56df78..54ec9a64dde 100644 --- a/TAO/performance-tests/Sequence_Latency/DSI/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/DSI/client.cpp @@ -337,7 +337,6 @@ test_double_seq (Test::Roundtrip_ptr roundtrip) } - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h index 7c2cf869732..fe58d00e939 100644 --- a/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h +++ b/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h @@ -15,7 +15,6 @@ class Roundtrip : public virtual POA_Test::Roundtrip { public: - /// Constructor Roundtrip (CORBA::ORB_ptr orb); diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp index 098776142d6..b159411c7d5 100644 --- a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp @@ -89,7 +89,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) } - int test_octet_seq (Test::Roundtrip_ptr roundtrip) { @@ -510,7 +509,6 @@ test_double_seq (Test::Roundtrip_ptr roundtrip) } - // The main() function starts here int 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..0c274c3aa5c 100644 --- a/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp +++ b/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp @@ -153,7 +153,6 @@ void big_time_test (CORBA::ULong num_list_loops, str_len = list.strs.first_str.length(); list.strs.first_str.length(str_len + 1); list.strs.first_str[str_len] = use_long_str ? long_str : short_str; - } // end of str loop } // end of seq loop @@ -187,7 +186,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/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h index 7c2cf869732..fe58d00e939 100644 --- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h +++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h @@ -15,7 +15,6 @@ class Roundtrip : public virtual POA_Test::Roundtrip { public: - /// Constructor Roundtrip (CORBA::ORB_ptr orb); diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp index d39fd5283a9..b2caa8cbd73 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp +++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp @@ -91,7 +91,6 @@ Client_Task::test_octet_seq (void) ACE_hrtime_t now = ACE_OS::gethrtime (); this->latency_.sample (now - start); - } } @@ -109,7 +108,6 @@ Client_Task::test_long_seq (void) ACE_hrtime_t now = ACE_OS::gethrtime (); this->latency_.sample (now - start); - } } @@ -128,7 +126,6 @@ Client_Task::test_short_seq (void) ACE_hrtime_t now = ACE_OS::gethrtime (); this->latency_.sample (now - start); - } } @@ -146,7 +143,6 @@ Client_Task::test_char_seq (void) ACE_hrtime_t now = ACE_OS::gethrtime (); this->latency_.sample (now - start); - } } @@ -164,7 +160,6 @@ Client_Task::test_longlong_seq (void) ACE_hrtime_t now = ACE_OS::gethrtime (); this->latency_.sample (now - start); - } } @@ -182,6 +177,5 @@ Client_Task::test_double_seq (void) ACE_hrtime_t now = ACE_OS::gethrtime (); this->latency_.sample (now - start); - } } diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp index 66b9d153715..3d41025d07c 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp +++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp @@ -91,7 +91,6 @@ Client_Task::test_octet_seq (void) ACE_hrtime_t now = ACE_OS::gethrtime (); this->latency_.sample (now - start); - } } @@ -109,7 +108,6 @@ Client_Task::test_long_seq (void) ACE_hrtime_t now = ACE_OS::gethrtime (); this->latency_.sample (now - start); - } } @@ -128,7 +126,6 @@ Client_Task::test_short_seq (void) ACE_hrtime_t now = ACE_OS::gethrtime (); this->latency_.sample (now - start); - } } @@ -146,7 +143,6 @@ Client_Task::test_char_seq (void) ACE_hrtime_t now = ACE_OS::gethrtime (); this->latency_.sample (now - start); - } } @@ -164,7 +160,6 @@ Client_Task::test_longlong_seq (void) ACE_hrtime_t now = ACE_OS::gethrtime (); this->latency_.sample (now - start); - } } @@ -182,6 +177,5 @@ Client_Task::test_double_seq (void) ACE_hrtime_t now = ACE_OS::gethrtime (); this->latency_.sample (now - start); - } } diff --git a/TAO/tao/Acceptor_Impl.h b/TAO/tao/Acceptor_Impl.h index 2027ef75cd3..00cdf060c87 100644 --- a/TAO/tao/Acceptor_Impl.h +++ b/TAO/tao/Acceptor_Impl.h @@ -79,7 +79,6 @@ template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> class TAO_Accept_Strategy : public ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2> { public: - /// Constructor. TAO_Accept_Strategy (TAO_ORB_Core *orb_core); diff --git a/TAO/tao/Allocator.h b/TAO/tao/Allocator.h index 6209d77710e..c4d7436e2d9 100644 --- a/TAO/tao/Allocator.h +++ b/TAO/tao/Allocator.h @@ -34,7 +34,6 @@ namespace TAO class TAO_Allocator { public: - virtual ~TAO_Allocator () {} virtual handler_type *allocate () = 0; diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode.h b/TAO/tao/AnyTypeCode/Alias_TypeCode.h index 4b525902eb6..43156baa098 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.h @@ -48,7 +48,6 @@ namespace TAO private RefCountPolicy { public: - /// Constructor. Alias (CORBA::TCKind kind, char const * id, @@ -105,9 +104,7 @@ namespace TAO * @c TypeCode::Alias. */ TypeCodeType const content_type_; - }; - } // End namespace TypeCode } // End namespace TAO diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h index 96c9bac0238..ce692d0f5e8 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h @@ -52,7 +52,6 @@ namespace TAO private TAO::Null_RefCount_Policy { public: - /// Constructor. Alias (CORBA::TCKind kind, char const * id, @@ -108,9 +107,7 @@ namespace TAO * @c TypeCode::Alias. */ CORBA::TypeCode_ptr const * content_type_; - }; - } // End namespace TypeCode } // End namespace TAO 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..807aea527bb 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 * @@ -78,7 +77,6 @@ namespace TAO virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; }; - } // End namespace TypeCode } // End namespace TAO diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.h b/TAO/tao/AnyTypeCode/Enum_TypeCode.h index 245bb43c630..66946b70841 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.h @@ -46,7 +46,6 @@ namespace TAO private RefCountPolicy { public: - /// Constructor. Enum (char const * id, char const * name, @@ -97,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_; @@ -108,9 +106,7 @@ namespace TAO /// Array of @c TAO::TypeCode enumerators representing /// enumerators in the OMG IDL defined @c enum. EnumeratorArrayType const enumerators_; - }; - } // End namespace TypeCode } // End namespace TAO diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h index 4e35dc18586..ffdd07fbd74 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h @@ -51,7 +51,6 @@ namespace TAO private TAO::Null_RefCount_Policy { public: - /// Constructor. Enum (char const * id, char const * name, @@ -103,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_; @@ -114,9 +112,7 @@ namespace TAO /// Array of @c TAO::TypeCode enumerators representing /// enumerators in the OMG IDL defined @c enum. char const * const * const enumerators_; - }; - } // End namespace TypeCode } // End namespace TAO 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/ExceptionA.h b/TAO/tao/AnyTypeCode/ExceptionA.h index 8a36f21990e..91ffbc797db 100644 --- a/TAO/tao/AnyTypeCode/ExceptionA.h +++ b/TAO/tao/AnyTypeCode/ExceptionA.h @@ -35,7 +35,6 @@ namespace CORBA TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, const CORBA::Exception &); TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::Exception *); - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h index e84730b2469..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 * @@ -43,7 +42,6 @@ namespace TAO , private RefCountPolicy { public: - /// Constructor. Fixed (CORBA::UShort digits, CORBA::UShort scale); diff --git a/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h b/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h index 4d810a4150a..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 * @@ -45,7 +44,6 @@ namespace TAO : public CORBA::TypeCode { public: - /// Constructor. Indirected_Type (CORBA::TCKind kind, char const * id); @@ -121,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/NVList.h b/TAO/tao/AnyTypeCode/NVList.h index 989df82cd99..5afbb1f776e 100644 --- a/TAO/tao/AnyTypeCode/NVList.h +++ b/TAO/tao/AnyTypeCode/NVList.h @@ -155,7 +155,6 @@ namespace CORBA friend class Request; public: - /// return the current number of elements in the list ULong count () const; diff --git a/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h b/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h index 6dd3b5e1fa0..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 * @@ -64,7 +63,6 @@ namespace TAO class TAO_AnyTypeCode_Export Null_RefCount_Policy { public: - /// No-op reference increment. void add_ref () { } @@ -72,7 +70,6 @@ namespace TAO void remove_ref () { } }; - } // End namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp b/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp index 2b803184a4c..4751fd397d3 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp @@ -106,7 +106,6 @@ TAO::TypeCode::Objref<StringType, { return adapter->create_local_interface_tc (this->attributes_.id (), "" /* empty name */); - } else if (this->kind_ == CORBA::tk_native) { diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.h b/TAO/tao/AnyTypeCode/Objref_TypeCode.h index c9a287ce992..900ba64df0d 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.h @@ -93,7 +93,6 @@ namespace TAO /// Base attributes (@c id and @c name). Base_Attributes<StringType> attributes_; }; - } // End namespace TypeCode } // End namespace TAO diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp index c3edfaa1ab3..70ebaebc80a 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp @@ -100,7 +100,6 @@ TAO::TypeCode::Objref<char const *, { return adapter->create_local_interface_tc (this->attributes_.id (), "" /* empty name */); - } else if (this->kind_ == CORBA::tk_native) { diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h index 8166b24edbe..cc967a1251a 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h @@ -56,7 +56,6 @@ namespace TAO private TAO::Null_RefCount_Policy { public: - /// Constructor. Objref (CORBA::TCKind kind, char const * id, @@ -97,9 +96,7 @@ namespace TAO protected: /// Base attributes (@c id and @c name). Base_Attributes<char const *> attributes_; - }; - } // End namespace TypeCode } // End namespace TAO diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h index c28969137c4..42eda17ed6a 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 * @@ -161,7 +160,6 @@ namespace TAO /// Track whether data has been initialized. bool data_initialized_; }; - } // End namespace TypeCode } // End namespace TAO diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h index 154a4d41742..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 * @@ -44,7 +43,6 @@ namespace TAO , private RefCountPolicy { public: - /// Constructor. Sequence (CORBA::TCKind kind, TypeCodeType const & content_type, diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h index 1760d8d49f4..06451b2081f 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h @@ -48,7 +48,6 @@ namespace TAO , private TAO::Null_RefCount_Policy { public: - /// Constructor. Sequence (CORBA::TCKind kind, CORBA::TypeCode_ptr const * content_type, diff --git a/TAO/tao/AnyTypeCode/String_TypeCode.h b/TAO/tao/AnyTypeCode/String_TypeCode.h index 8ca53f95e6e..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 * @@ -44,7 +43,6 @@ namespace TAO private RefCountPolicy { public: - /// Constructor. String (CORBA::TCKind kind, CORBA::ULong length); diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Static.h b/TAO/tao/AnyTypeCode/String_TypeCode_Static.h index 388644be81b..7097666d3fb 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.h @@ -47,7 +47,6 @@ namespace TAO private TAO::Null_RefCount_Policy { public: - /// Constructor. String (CORBA::TCKind kind, CORBA::ULong length); diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Traits.h b/TAO/tao/AnyTypeCode/String_TypeCode_Traits.h index 4d4fc40f1ad..a8d2deab6f7 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode_Traits.h +++ b/TAO/tao/AnyTypeCode/String_TypeCode_Traits.h @@ -69,7 +69,6 @@ namespace TAO return tc; } }; - } // End namespace TypeCodeFactory } // End namespace TAO diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.h b/TAO/tao/AnyTypeCode/Struct_TypeCode.h index 4e5fb375edf..a8911809dfc 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.h @@ -51,7 +51,6 @@ namespace TAO private RefCountPolicy { public: - /// Constructor. Struct (CORBA::TCKind kind, char const * id, @@ -111,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_; @@ -126,7 +124,6 @@ namespace TAO //@} }; - } // End namespace TypeCode } // End namespace TAO diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h index e07b1e54e43..f335deba01d 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_; @@ -126,7 +125,6 @@ namespace TAO CORBA::TypeCode_ptr const *> const * const fields_; //@} }; - } // End namespace TypeCode } // End namespace TAO diff --git a/TAO/tao/AnyTypeCode/True_RefCount_Policy.h b/TAO/tao/AnyTypeCode/True_RefCount_Policy.h index 257032630fc..45b27e67042 100644 --- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.h +++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.h @@ -69,7 +69,6 @@ namespace TAO class TAO_AnyTypeCode_Export True_RefCount_Policy { public: - /// Increase the reference count on this object. void add_ref (); @@ -102,7 +101,6 @@ namespace TAO /// Reference counter. std::atomic<uint32_t> refcount_; }; - } // End namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TypeCode.h b/TAO/tao/AnyTypeCode/TypeCode.h index 9a21085a314..284ce5c576f 100644 --- a/TAO/tao/AnyTypeCode/TypeCode.h +++ b/TAO/tao/AnyTypeCode/TypeCode.h @@ -55,7 +55,6 @@ namespace CORBA class TAO_AnyTypeCode_Export TypeCode { public: - /** * @class Bounds * @@ -68,7 +67,6 @@ namespace CORBA class TAO_AnyTypeCode_Export Bounds : public UserException { public: - /// Constructor. Bounds (); @@ -95,7 +93,6 @@ namespace CORBA class TAO_AnyTypeCode_Export BadKind : public CORBA::UserException { public: - BadKind (); static BadKind * _downcast (CORBA::Exception * ex); diff --git a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h index 193de495ea3..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 * @@ -42,7 +41,6 @@ namespace TAO class Base_Attributes { public: - /// Constructor. Base_Attributes (char const * id, char const * name); diff --git a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.h b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.h index f47fff4f8ef..4ba49fe0b94 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.h +++ b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.h @@ -225,7 +225,6 @@ namespace TAO CORBA::TypeCode_ptr & tc, TC_Info_List & indirect_infos, TC_Info_List & direct_infos); - } // End namespace TypeCodeFactory } // End namespace TAO diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h index ccf178f9ed6..87de72be46e 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 * @@ -146,7 +145,6 @@ namespace TAO }; typedef Case<CORBA::String_var, CORBA::TypeCode_var> Case_Dynamic; - } // End namespace TypeCode } // End namespace TAO @@ -169,7 +167,6 @@ namespace ACE return p->clone (); } }; - } // End namespace ACE. ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h index b44435db95f..d23aaa6b247 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h @@ -47,7 +47,6 @@ namespace TAO class Case_Enum_T : public Case<StringType, TypeCodeType> { public: - /// Constructor. Case_Enum_T (CORBA::TypeCode_ptr discriminator_tc, CORBA::ULong member_label, @@ -85,7 +84,6 @@ namespace TAO /// IDL @c union discriminator typecode. CORBA::TypeCode_var discriminator_tc_; }; - } // End namespace TypeCode } // End namespace TAO diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp index 7bee7becd9a..640b057fbfc 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp @@ -63,7 +63,6 @@ namespace TAO return CORBA::Any::to_char (v); } }; - } // End TypeCode namespace } // End TAO namespace diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h index 973edcffb32..f859e06ff04 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h @@ -86,7 +86,6 @@ namespace TAO class Case_T : public Case<StringType, TypeCodeType> { public: - /// Constructor. Case_T (DiscriminatorType member_label, char const * member_name, diff --git a/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp b/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp index da113fb0934..ae503abbf8c 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp @@ -101,7 +101,6 @@ namespace CORBA TypeCode_ptr const _tc_Object = &TAO::TypeCode::tc_Object; TypeCode_ptr const _tc_Component = &TAO::TypeCode::tc_Component; TypeCode_ptr const _tc_Home = &TAO::TypeCode::tc_Home; - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TypeCode_Struct_Field.h b/TAO/tao/AnyTypeCode/TypeCode_Struct_Field.h index dfe60630445..aabcba87c2e 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Struct_Field.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Struct_Field.h @@ -78,9 +78,7 @@ namespace TAO /// The @c CORBA::TypeCode of the field. TypeCodeType type; - }; - } // End namespace TypeCode } // End namespace TAO diff --git a/TAO/tao/AnyTypeCode/TypeCode_Traits.h b/TAO/tao/AnyTypeCode/TypeCode_Traits.h index 803fbc1e472..09ff1a79480 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; @@ -113,7 +112,6 @@ namespace TAO } }; - } // End namespace TypeCode } // End namespace TAO diff --git a/TAO/tao/AnyTypeCode/TypeCode_Value_Field.h b/TAO/tao/AnyTypeCode/TypeCode_Value_Field.h index 1d7b5d7a96c..98152b0fde2 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Value_Field.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Value_Field.h @@ -82,9 +82,7 @@ namespace TAO /// The visibility of the field. CORBA::Visibility visibility; - }; - } // End namespace TypeCode } // End namespace TAO diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.h b/TAO/tao/AnyTypeCode/Union_TypeCode.h index 99cc7cf771a..83077b06840 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Union_TypeCode.h @@ -49,7 +49,6 @@ namespace TAO private RefCountPolicy { public: - /// @typedef Type of individual case array element, not the /// array itself. typedef TAO::TypeCode::Case<StringType, TypeCodeType> case_type; @@ -117,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_; @@ -143,7 +141,6 @@ namespace TAO //@} }; - } // End namespace TypeCode } // End namespace TAO diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h index e624fcbece0..998cbd61959 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h @@ -54,7 +54,6 @@ namespace TAO private TAO::Null_RefCount_Policy { public: - /// @typedef Type of individual case array element, not the /// array itself. typedef TAO::TypeCode::Case<char const *, @@ -118,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_; @@ -144,7 +142,6 @@ namespace TAO //@} }; - } // End namespace TypeCode } // End namespace TAO diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.h b/TAO/tao/AnyTypeCode/Value_TypeCode.h index 836403fd08d..ebbfa261946 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Value_TypeCode.h @@ -52,7 +52,6 @@ namespace TAO private RefCountPolicy { public: - /// Constructor. Value (CORBA::TCKind kind, char const * id, @@ -121,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_; @@ -144,7 +142,6 @@ namespace TAO //@} }; - } // End namespace TypeCode } // End namespace TAO diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h index e269498b648..06a7d9f77d5 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h @@ -58,7 +58,6 @@ namespace TAO private TAO::Null_RefCount_Policy { public: - /// Constructor. Value (CORBA::TCKind kind, char const * id, @@ -118,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_; @@ -142,7 +140,6 @@ namespace TAO //@} }; - } // End namespace TypeCode } // End namespace TAO diff --git a/TAO/tao/AnyTypeCode/WrongTransactionA.cpp b/TAO/tao/AnyTypeCode/WrongTransactionA.cpp index 43e2a8f8836..ffe6064f675 100644 --- a/TAO/tao/AnyTypeCode/WrongTransactionA.cpp +++ b/TAO/tao/AnyTypeCode/WrongTransactionA.cpp @@ -56,7 +56,6 @@ namespace CORBA } - // TAO_IDL - Generated from // be\be_visitor_exception/any_op_cs.cpp:50 @@ -89,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 ea41d49874c..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,12 +76,10 @@ 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 TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::WrongTransaction *&); - } // TAO_IDL - Generated from // be\be_codegen.cpp:955 diff --git a/TAO/tao/Any_Insert_Policy_T.h b/TAO/tao/Any_Insert_Policy_T.h index a4c47d3f137..8fb65948311 100644 --- a/TAO/tao/Any_Insert_Policy_T.h +++ b/TAO/tao/Any_Insert_Policy_T.h @@ -36,7 +36,6 @@ namespace TAO class Any_Insert_Policy_Stream { public: - static inline void any_insert (CORBA::Any* p, S const & x) { (*p) <<= x; @@ -47,7 +46,6 @@ namespace TAO class Any_Insert_Policy_AnyTypeCode_Adapter { public: - static inline void any_insert (CORBA::Any* p, S const & x) { TAO_AnyTypeCode_Adapter *adapter = @@ -71,7 +69,6 @@ namespace TAO class Any_Insert_Policy_IFR_Client_Adapter { public: - static inline void any_insert (CORBA::Any* p, S const & x) { TAO_IFR_Client_Adapter *adapter = @@ -95,7 +92,6 @@ namespace TAO class Any_Insert_Policy_CORBA_Object { public: - static inline void any_insert (CORBA::Any* , S const &) { if (TAO_debug_level > 2) diff --git a/TAO/tao/Argument.h b/TAO/tao/Argument.h index f47baa2a74f..39740bb5230 100644 --- a/TAO/tao/Argument.h +++ b/TAO/tao/Argument.h @@ -49,7 +49,6 @@ namespace TAO class TAO_Export Argument { public: - /// Destructor. virtual ~Argument (); @@ -90,7 +89,6 @@ namespace TAO //@} #endif /* TAO_HAS_INTERCEPTORS == 1 */ - }; #if TAO_HAS_INTERCEPTORS == 1 diff --git a/TAO/tao/Array_Traits_T.h b/TAO/tao/Array_Traits_T.h index 33a79646a44..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 { @@ -87,7 +86,6 @@ struct array_traits copy_range(begin, end, dst); } }; - } // namespace details } // namespace CORBA diff --git a/TAO/tao/Asynch_Queued_Message.cpp b/TAO/tao/Asynch_Queued_Message.cpp index e2952ff3569..cb519752e1d 100644 --- a/TAO/tao/Asynch_Queued_Message.cpp +++ b/TAO/tao/Asynch_Queued_Message.cpp @@ -179,7 +179,6 @@ TAO_Asynch_Queued_Message::destroy () { ACE_DES_FREE_THIS (this->allocator_->free, TAO_Asynch_Queued_Message); - } else // global release.. { diff --git a/TAO/tao/Asynch_Queued_Message.h b/TAO/tao/Asynch_Queued_Message.h index b782fb89cea..10b75b1662a 100644 --- a/TAO/tao/Asynch_Queued_Message.h +++ b/TAO/tao/Asynch_Queued_Message.h @@ -120,7 +120,6 @@ private: // Expiration time ACE_Time_Value abs_timeout_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.h b/TAO/tao/Asynch_Reply_Dispatcher_Base.h index ada4e29eacb..5d2c3fd03fa 100644 --- a/TAO/tao/Asynch_Reply_Dispatcher_Base.h +++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.h @@ -134,7 +134,6 @@ namespace TAO public: void operator() (TAO_Asynch_Reply_Dispatcher_Base *ardb) throw (); }; - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Base_Transport_Property.h b/TAO/tao/Base_Transport_Property.h index b499969a3df..095223d6d2d 100644 --- a/TAO/tao/Base_Transport_Property.h +++ b/TAO/tao/Base_Transport_Property.h @@ -35,7 +35,6 @@ class TAO_Export TAO_Base_Transport_Property : public TAO_Transport_Descriptor_Interface { public: - /// Default constructor TAO_Base_Transport_Property (void); diff --git a/TAO/tao/BiDir_Adapter.h b/TAO/tao/BiDir_Adapter.h index 9566337d585..2fa9990b390 100644 --- a/TAO/tao/BiDir_Adapter.h +++ b/TAO/tao/BiDir_Adapter.h @@ -35,7 +35,6 @@ class TAO_Policy_Validator; class TAO_Export TAO_BiDir_Adapter : public ACE_Service_Object { public: - /// The virtual destructor virtual ~TAO_BiDir_Adapter (void); diff --git a/TAO/tao/Bounded_Array_Allocation_Traits_T.h b/TAO/tao/Bounded_Array_Allocation_Traits_T.h index 67c7178021c..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 { @@ -48,7 +47,6 @@ struct bounded_array_allocation_traits delete[] buffer; } }; - } // namespace details } // namespace TAO 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 1f3c7d0d577..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 { @@ -111,7 +110,6 @@ public: private: implementation_type impl_; }; - } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Bounded_Reference_Allocation_Traits_T.h b/TAO/tao/Bounded_Reference_Allocation_Traits_T.h index 444258197ac..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 { @@ -63,7 +62,6 @@ struct bounded_reference_allocation_traits return MAX; } }; - } // namespace details } // namespace TAO diff --git a/TAO/tao/Bounded_Value_Allocation_Traits_T.h b/TAO/tao/Bounded_Value_Allocation_Traits_T.h index 05ac63153a0..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 { @@ -54,7 +53,6 @@ struct bounded_value_allocation_traits } /* static CORBA::ULong const MAXIMUM = MAX; */ }; - } // namespace details } // namespace TAO diff --git a/TAO/tao/Bounded_Value_Sequence_T.h b/TAO/tao/Bounded_Value_Sequence_T.h index a9e620aa42a..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 { @@ -102,7 +101,6 @@ public: private: implementation_type impl_; }; - } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp index 79835eacf2c..c0c383ae746 100644 --- a/TAO/tao/CDR.cpp +++ b/TAO/tao/CDR.cpp @@ -226,7 +226,6 @@ TAO_OutputCDR::throw_skel_exception (int error_num ) default : throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_YES); - } } @@ -245,7 +244,6 @@ TAO_OutputCDR::fragment_stream (ACE_CDR::ULong pending_alignment, } - int TAO_OutputCDR::offset (char* pos) { @@ -346,7 +344,6 @@ TAO_InputCDR::throw_skel_exception (int error_num ) default : throw ::CORBA::MARSHAL(); - } } 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 055654f0c90..a61ad5f52a3 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 * @@ -58,7 +57,6 @@ namespace TAO class TAO_CSD_FW_Export FW_Server_Request_Wrapper { public: - /// Constructor. FW_Server_Request_Wrapper(TAO_ServerRequest& server_request); @@ -111,7 +109,6 @@ namespace TAO /// Pointer to the underlying TAO_ServerRequest object. TAO_ServerRequest* request_; }; - } } 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_Object_Adapter.h b/TAO/tao/CSD_Framework/CSD_Object_Adapter.h index 7d42cea101e..8aab6d1f13a 100644 --- a/TAO/tao/CSD_Framework/CSD_Object_Adapter.h +++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter.h @@ -34,7 +34,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_CSD_FW_Export TAO_CSD_Object_Adapter : public TAO_Object_Adapter { public: - /// Constructor TAO_CSD_Object_Adapter (const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters, TAO_ORB_Core &orb_core); diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.h b/TAO/tao/CSD_Framework/CSD_Strategy_Base.h index 879f86b08cd..be497e17970 100644 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.h +++ b/TAO/tao/CSD_Framework/CSD_Strategy_Base.h @@ -56,7 +56,6 @@ namespace TAO public ::CORBA::LocalObject { public: - /// Result Type for dispatching method(s). enum DispatchResult { diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h index 2a96f39256d..37a56cbd633 100644 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h +++ b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h @@ -44,7 +44,6 @@ namespace TAO class TAO_CSD_FW_Export Strategy_Proxy { public: - /// Default Constructor. Strategy_Proxy(); 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_Framework/CSD_Strategy_Repository.h b/TAO/tao/CSD_Framework/CSD_Strategy_Repository.h index ac5643bb538..ed993fb8c17 100644 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.h +++ b/TAO/tao/CSD_Framework/CSD_Strategy_Repository.h @@ -36,7 +36,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_CSD_FW_Export TAO_CSD_Strategy_Repository : public ACE_Service_Object { public: - /// Constructor. TAO_CSD_Strategy_Repository(); diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h index 3fd5f1d7be0..7bd8aa02349 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h @@ -47,7 +47,6 @@ namespace TAO class TAO_CSD_TP_Export TP_Cancel_Visitor : public TP_Queue_Visitor { public: - /// Default Constructor - cancel *all* requests. TP_Cancel_Visitor(); @@ -69,7 +68,6 @@ namespace TAO /// servant if only requests targeting that servant should be cancelled. PortableServer::ServantBase_var servant_; }; - } } 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..6cfd276f2ea 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; @@ -71,7 +70,6 @@ namespace TAO /// Cancel the request. virtual void cancel_i(); }; - } } 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 cf23ffa4d26..2dfc943df14 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; @@ -49,7 +48,6 @@ namespace TAO : public TP_Corba_Request { public: - /// Constructor. TP_Collocated_Synch_Request (TAO_ServerRequest& server_request, @@ -88,7 +86,6 @@ namespace TAO /// exception is raised from the dispatch() call on the server_request_. CORBA::Exception* exception_; }; - } } 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 06dde1e04af..531298490e5 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> @@ -50,7 +49,6 @@ namespace TAO : public TP_Corba_Request { public: - /// Constructor. TP_Collocated_Synch_With_Server_Request (TAO_ServerRequest& server_request, @@ -89,7 +87,6 @@ namespace TAO /// wait() method. TP_Synch_Helper synch_helper_; }; - } } diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h index 6162d4cf682..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; @@ -47,7 +46,6 @@ namespace TAO class TAO_CSD_TP_Export TP_Corba_Request : public TP_Request { public: - /// Virtual Destructor. virtual ~TP_Corba_Request(); 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..1711dca3987 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; @@ -59,7 +58,6 @@ namespace TAO /// Cancel the request. virtual void cancel_i(); }; - } } diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h index beaf7decfa3..ec4d201178b 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; @@ -59,7 +58,6 @@ namespace TAO private: TP_Custom_Request_Operation_Handle op_; }; - } } 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 cc25a814a2e..d3a644e3c24 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; @@ -52,7 +51,6 @@ namespace TAO : public TAO_Intrusive_Ref_Count_Base<TAO_SYNCH_MUTEX> { public: - /// Virtual Destructor. virtual ~TP_Custom_Request_Operation(); @@ -78,7 +76,6 @@ namespace TAO private: PortableServer::ServantBase_var servant_; }; - } } 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..81847c58d25 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; @@ -59,7 +58,6 @@ namespace TAO /// Default Constructor. TP_Queue_Visitor(); }; - } } diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.h index ee275c8dfd4..29079cf5ff3 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; @@ -83,7 +82,6 @@ namespace TAO /// Cancel the request. virtual void cancel_i(); }; - } } diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h index 70d51f26fc9..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; @@ -50,7 +49,6 @@ namespace TAO : public TAO_Intrusive_Ref_Count_Base<TAO_SYNCH_MUTEX> { public: - /// Virtual Destructor. virtual ~TP_Request(); @@ -116,7 +114,6 @@ namespace TAO /// Reference to the servant "state" object (contains the busy flag). TP_Servant_State::HandleType servant_state_; }; - } } diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h index 0b16cea7c4c..f1db7dc6309 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 * @@ -74,7 +73,6 @@ namespace TAO /// The servant's current "busy" state (true == busy, false == not busy) bool busy_flag_; }; - } } 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..c36802cd071 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 * @@ -72,7 +71,6 @@ namespace TAO /// The underlying map of servant state objects. MapType map_; }; - } } diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp index 84627c4375f..c91f7ef99b3 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp @@ -19,7 +19,6 @@ TAO::CSD::TP_Strategy::~TP_Strategy() } - TAO::CSD::TP_Strategy::CustomRequestOutcome TAO::CSD::TP_Strategy::custom_synch_request(TP_Custom_Request_Operation* op) { diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h index 703d074893a..857d4da528e 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; @@ -56,7 +55,6 @@ namespace TAO : public Strategy_Base { public: - /// Constructor. TP_Strategy(Thread_Counter num_threads = 1, bool serialize_servants = true); @@ -182,7 +180,6 @@ namespace TAO /// "serialize servants" flag is set to true. TP_Servant_State_Map servant_state_map_; }; - } } diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp index c2d08d1542a..f23ff0fa9eb 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp @@ -103,7 +103,6 @@ TAO::CSD::TP_Strategy_Factory::init (int argc, -1); CSD_Framework::Strategy_var objref = strategy; repo->add_strategy (poa_name, strategy); - } else { diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.h index 8773ce30f15..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 * @@ -41,7 +40,6 @@ namespace TAO class TAO_CSD_TP_Export TP_Strategy_Factory : public ACE_Service_Object { public: - /// Constructor. 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/CSD_ThreadPool/CSD_TP_Task.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp index 9e714f9e4b9..378ea9e05af 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp @@ -278,7 +278,6 @@ TAO::CSD::TP_Task::close(u_long flag) } - void TAO::CSD::TP_Task::cancel_servant (PortableServer::Servant servant) { diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h index 1365350c168..c80121e2641 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h @@ -75,7 +75,6 @@ namespace TAO class TAO_CSD_TP_Export TP_Task : public ACE_Task_Base { public: - /// Default Constructor. TP_Task(); @@ -149,7 +148,6 @@ namespace TAO enum { MAX_THREADPOOL_TASK_WORKER_THREADS = 50 }; }; - } } diff --git a/TAO/tao/CodecFactory/CodecFactory_impl.cpp b/TAO/tao/CodecFactory/CodecFactory_impl.cpp index 70af066d3d2..b4c843e436b 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. @@ -115,7 +114,6 @@ TAO_CodecFactory::create_codec_i (CORBA::Octet major, default: throw IOP::CodecFactory::UnknownEncoding (); - } return codec; diff --git a/TAO/tao/CodecFactory/CodecFactory_impl.h b/TAO/tao/CodecFactory/CodecFactory_impl.h index 120478f0b2e..03e7a88fcbe 100644 --- a/TAO/tao/CodecFactory/CodecFactory_impl.h +++ b/TAO/tao/CodecFactory/CodecFactory_impl.h @@ -70,7 +70,6 @@ private: * which they are associated. */ TAO_ORB_Core * const orb_core_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Codeset/Codeset_Manager_Factory.h b/TAO/tao/Codeset/Codeset_Manager_Factory.h index 46df928a484..6fc3745df46 100644 --- a/TAO/tao/Codeset/Codeset_Manager_Factory.h +++ b/TAO/tao/Codeset/Codeset_Manager_Factory.h @@ -42,7 +42,6 @@ public: virtual ~TAO_Codeset_Manager_Factory (); virtual TAO_Codeset_Manager *create(void); virtual bool is_default() const; - }; diff --git a/TAO/tao/Codeset/UTF16_BOM_Translator.cpp b/TAO/tao/Codeset/UTF16_BOM_Translator.cpp index 16f3cd0d2ac..4f47a615460 100644 --- a/TAO/tao/Codeset/UTF16_BOM_Translator.cpp +++ b/TAO/tao/Codeset/UTF16_BOM_Translator.cpp @@ -470,7 +470,6 @@ TAO_UTF16_BOM_Translator::write_wchar_array_i (ACE_OutputCDR & cdr, sb[i] = static_cast<ACE_UTF16_T> (x[i]); } return 1; - } ACE_CDR::Boolean diff --git a/TAO/tao/Codeset_Manager_Factory_Base.cpp b/TAO/tao/Codeset_Manager_Factory_Base.cpp index 7da0ba9288a..f616c6bb4cf 100644 --- a/TAO/tao/Codeset_Manager_Factory_Base.cpp +++ b/TAO/tao/Codeset_Manager_Factory_Base.cpp @@ -15,7 +15,6 @@ TAO_Codeset_Manager * TAO_Codeset_Manager_Factory_Base::create () { return nullptr; - } int 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/rle/RLECompressor.h b/TAO/tao/Compression/rle/RLECompressor.h index 741f8f5810c..948b744a405 100644 --- a/TAO/tao/Compression/rle/RLECompressor.h +++ b/TAO/tao/Compression/rle/RLECompressor.h @@ -29,7 +29,6 @@ namespace TAO class TAO_RLECOMPRESSOR_Export RLECompressor : public ::TAO::BaseCompressor { public: - RLECompressor(::Compression::CompressorFactory_ptr); virtual void compress ( diff --git a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp index 213f37cb44e..95bd5e40504 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) { @@ -39,7 +38,6 @@ Zlib_CompressorFactory::get_compressor ( } compressor = (*it).second.in(); - } catch (...) { TAOLIB_ERROR_RETURN((LM_ERROR, ACE_TEXT("(%P | %t) ERROR: ZlibCompressor - Unable to create Zlib Compressor at level [%d].\n"), diff --git a/TAO/tao/Connection_Handler.h b/TAO/tao/Connection_Handler.h index 80dc152804b..eaff5c13032 100644 --- a/TAO/tao/Connection_Handler.h +++ b/TAO/tao/Connection_Handler.h @@ -47,7 +47,6 @@ class TAO_Transport; class TAO_Export TAO_Connection_Handler : public TAO_LF_CH_Event { public: - /// Constructor explicit TAO_Connection_Handler (TAO_ORB_Core *orb_core); 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/Connector_Impl.h b/TAO/tao/Connector_Impl.h index e220cb83212..42ca96486ec 100644 --- a/TAO/tao/Connector_Impl.h +++ b/TAO/tao/Connector_Impl.h @@ -58,7 +58,6 @@ private: }; - /** * @class TAO_Connect_Concurrency_Strategy * diff --git a/TAO/tao/Default_Endpoint_Selector_Factory.h b/TAO/tao/Default_Endpoint_Selector_Factory.h index e460006dc2b..ee7777cfc10 100644 --- a/TAO/tao/Default_Endpoint_Selector_Factory.h +++ b/TAO/tao/Default_Endpoint_Selector_Factory.h @@ -70,7 +70,6 @@ protected: /// The possible endpoint selector strategies that can be /// returned by this factory TAO_Default_Endpoint_Selector * const default_endpoint_selector_; - }; ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Endpoint_Selector_Factory) diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.h b/TAO/tao/Default_Thread_Lane_Resources_Manager.h index 5df53e6209e..3ef57863ba0 100644 --- a/TAO/tao/Default_Thread_Lane_Resources_Manager.h +++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.h @@ -35,7 +35,6 @@ class TAO_Export TAO_Default_Thread_Lane_Resources_Manager : public TAO_Thread_Lane_Resources_Manager { public: - /// Constructor. TAO_Default_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core); @@ -59,7 +58,6 @@ public: /// @name Accessors // @{ - TAO_Thread_Lane_Resources &lane_resources (void); TAO_Thread_Lane_Resources &default_lane_resources (void); @@ -73,7 +71,6 @@ private: protected: /// Default lane resources. TAO_Thread_Lane_Resources * const lane_resources_; - }; /** @@ -88,13 +85,11 @@ class TAO_Export TAO_Default_Thread_Lane_Resources_Manager_Factory : public TAO_Thread_Lane_Resources_Manager_Factory { public: - /// Destructor. virtual ~TAO_Default_Thread_Lane_Resources_Manager_Factory (void); /// Factory method. TAO_Thread_Lane_Resources_Manager *create_thread_lane_resources_manager (TAO_ORB_Core &core); - }; ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Thread_Lane_Resources_Manager_Factory) diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy.h b/TAO/tao/DiffServPolicy/DiffServPolicy.h index 1f88da59fef..2aa89367bb6 100644 --- a/TAO/tao/DiffServPolicy/DiffServPolicy.h +++ b/TAO/tao/DiffServPolicy/DiffServPolicy.h @@ -42,7 +42,6 @@ TAO_Requires_DiffServPolicy_Initializer = TAO_DiffServPolicy_Initializer::static_init (); - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_DiffServPolicy, TAO_DiffServPolicy_Initializer) ACE_FACTORY_DECLARE (TAO_DiffServPolicy, TAO_DiffServPolicy_Initializer) TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy_Factory.h b/TAO/tao/DiffServPolicy/DiffServPolicy_Factory.h index f195cd99ee2..10949423533 100644 --- a/TAO/tao/DiffServPolicy/DiffServPolicy_Factory.h +++ b/TAO/tao/DiffServPolicy/DiffServPolicy_Factory.h @@ -40,7 +40,6 @@ class TAO_DiffServPolicy_Export TAO_DiffServ_PolicyFactory public virtual ::CORBA::LocalObject { public: - CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any &value); diff --git a/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.h b/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.h index 740e9ef2c29..8abe42e4877 100644 --- a/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.h +++ b/TAO/tao/DiffServPolicy/DiffServ_Protocols_Hooks.h @@ -30,7 +30,6 @@ class TAO_DiffServPolicy_Export TAO_DS_Network_Priority_Protocols_Hooks : public TAO_Network_Priority_Protocols_Hooks { public: - /// Constructor TAO_DS_Network_Priority_Protocols_Hooks (void); diff --git a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h index fd8eb16f60a..10b54b40582 100644 --- a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h +++ b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h @@ -44,7 +44,6 @@ class TAO_DiffServPolicy_Export TAO_Server_Network_Priority_Policy public ::CORBA::LocalObject { public: - /// default constructor. TAO_Server_Network_Priority_Policy (void); diff --git a/TAO/tao/DynamicAny/DynValueBox_i.cpp b/TAO/tao/DynamicAny/DynValueBox_i.cpp index 4b522011808..cfa81bd3bea 100644 --- a/TAO/tao/DynamicAny/DynValueBox_i.cpp +++ b/TAO/tao/DynamicAny/DynValueBox_i.cpp @@ -66,7 +66,6 @@ TAO_DynValueBox_i::init (CORBA::TypeCode_ptr tc) this->init_common (); this->set_to_null (); - } void diff --git a/TAO/tao/Dynamic_TP/DTP_ORBInitializer.cpp b/TAO/tao/Dynamic_TP/DTP_ORBInitializer.cpp index 63273b603f7..76997783c04 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 @@ -72,7 +71,6 @@ TAO_DTP_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info) "DTP_Thread_Lane_Resources_Manager_Factory"); ACE_Service_Config::process_directive ( ace_svc_desc_TAO_DTP_Thread_Lane_Resources_Manager_Factory); - } void @@ -122,7 +120,6 @@ TAO_DTP_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) dtp_tlrm.tp_manager().create_threadpool (def); tao_info->orb_core ()->leader_follower ().set_avoid_client_leader (); - } 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 053ac1bba8b..ea0088f136c 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. @@ -95,7 +93,6 @@ TAO_DTP_POA_Strategy::poa_activated_event_i (TAO_ORB_Core& orb_core) ACE_TEXT ("TAO (%P|%t) - DTP_POA_Strategy - ") ACE_TEXT ("warning: config not found...using ") ACE_TEXT ("defaults!\n"))); - } this->set_dtp_config (config_entry); //this->dtp_task_.set_init_pool_threads(config_entry.init_threads_); @@ -107,10 +104,8 @@ TAO_DTP_POA_Strategy::poa_activated_event_i (TAO_ORB_Core& orb_core) } - } return (this->dtp_task_.open () == 0); - } void @@ -181,8 +176,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); @@ -218,7 +211,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_POA_Strategy.h b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.h index 3b9acd43681..aeb0359a025 100644 --- a/TAO/tao/Dynamic_TP/DTP_POA_Strategy.h +++ b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.h @@ -201,7 +201,6 @@ class TAO_Dynamic_TP_Export TAO_DTP_POA_Strategy: }; - TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) diff --git a/TAO/tao/Dynamic_TP/DTP_Task.h b/TAO/tao/Dynamic_TP/DTP_Task.h index c39e3b57772..71c513a87da 100644 --- a/TAO/tao/Dynamic_TP/DTP_Task.h +++ b/TAO/tao/Dynamic_TP/DTP_Task.h @@ -62,7 +62,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Dynamic_TP_Export TAO_DTP_Task : public ACE_Task_Base { public: - /// Default Constructor. TAO_DTP_Task(); diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.cpp b/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.cpp index 636c345d7da..4fcd243675b 100644 --- a/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.cpp +++ b/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.cpp @@ -25,7 +25,6 @@ TAO_DTP_Thread_Lane_Resources_Manager::TAO_DTP_Thread_Lane_Resources_Manager // Create the thread-pool manager. ACE_NEW (this->tp_manager_, TAO_DTP_Thread_Pool_Manager (orb_core)); - } TAO_DTP_Thread_Lane_Resources_Manager::~TAO_DTP_Thread_Lane_Resources_Manager (void) 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 13d90d8b5f5..a0558483913 100644 --- a/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.h +++ b/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.h @@ -40,7 +40,6 @@ class TAO_Dynamic_TP_Export TAO_DTP_Thread_Lane_Resources_Manager : public TAO_Thread_Lane_Resources_Manager { public: - /// Constructor. TAO_DTP_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core); @@ -65,7 +64,6 @@ public: /// @name Accessors // @{ - TAO_Thread_Lane_Resources &lane_resources (void); TAO_Thread_Lane_Resources &default_lane_resources (void); @@ -98,15 +96,12 @@ class TAO_Dynamic_TP_Export TAO_DTP_Thread_Lane_Resources_Manager_Factory : public TAO_Thread_Lane_Resources_Manager_Factory { public: - /// Factory method. TAO_Thread_Lane_Resources_Manager *create_thread_lane_resources_manager ( TAO_ORB_Core &core); - }; - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Dynamic_TP, TAO_DTP_Thread_Lane_Resources_Manager_Factory) ACE_FACTORY_DECLARE (TAO_Dynamic_TP, diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp index 852e4862245..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, @@ -496,7 +495,6 @@ TAO_DTP_Thread_Pool_Manager::destroy_threadpool (CORBA::ULong threadpool) // Delete the thread pool. delete tao_thread_pool; - } CORBA::ULong diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h index 6789f78a869..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; @@ -173,7 +172,6 @@ public: // @} private: - int create_threads_i (size_t count); TAO_DTP_Thread_Pool_Manager &manager_; @@ -215,7 +213,6 @@ private: class TAO_Dynamic_TP_Export TAO_DTP_Thread_Pool_Manager { public: - /// Constructor. TAO_DTP_Thread_Pool_Manager (TAO_ORB_Core &orb_core); @@ -243,7 +240,6 @@ public: private: /// @name Helpers // @{ - CORBA::ULong create_threadpool_i (TAO_DTP_Definition &def); diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy.h b/TAO/tao/EndpointPolicy/EndpointPolicy.h index 6895190df68..3bbc84610a9 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicy.h +++ b/TAO/tao/EndpointPolicy/EndpointPolicy.h @@ -40,7 +40,6 @@ static int TAO_Requires_EndpointPolicy_Initializer = TAO_EndpointPolicy_Initializer::static_init (); - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_EndpointPolicy, TAO_EndpointPolicy_Initializer) ACE_FACTORY_DECLARE (TAO_EndpointPolicy, TAO_EndpointPolicy_Initializer) diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h b/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h index b9474320f07..0a93de48150 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h +++ b/TAO/tao/EndpointPolicy/EndpointPolicy_Factory.h @@ -46,7 +46,6 @@ public: virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any & value); private: - TAO_ORB_Core * orb_core_; }; diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_i.h b/TAO/tao/EndpointPolicy/EndpointPolicy_i.h index 5fe59a50bb5..cbcf802228e 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicy_i.h +++ b/TAO/tao/EndpointPolicy/EndpointPolicy_i.h @@ -74,7 +74,6 @@ private: }; - TAO_END_VERSIONED_NAMESPACE_DECL #if defined(_MSC_VER) diff --git a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp index 197b7e26192..5237c0d7261 100644 --- a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp +++ b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp @@ -55,7 +55,6 @@ TAO_Endpoint_Acceptor_Filter_Factory::~TAO_Endpoint_Acceptor_Filter_Factory(void } - ACE_FACTORY_DEFINE (TAO_EndpointPolicy, TAO_Endpoint_Acceptor_Filter_Factory) ACE_STATIC_SVC_DEFINE (TAO_Endpoint_Acceptor_Filter_Factory, ACE_TEXT ("TAO_Acceptor_Filter_Factory"), diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index b9cbb138b42..226ce19e108 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -97,7 +97,6 @@ namespace CORBA class TAO_Export Exception { public: - /// Copy constructor. /** * @note This constructor should be protected, but VC7.1 at 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 584bb6adef1..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; @@ -57,7 +56,6 @@ private: TAO_Fault_Tolerance_Service (const TAO_Fault_Tolerance_Service &); private: - /// hook to callback on to the service TAO_Service_Callbacks *ft_service_callback_ {}; }; 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/FoxResource/FoxResource_Loader.h b/TAO/tao/FoxResource/FoxResource_Loader.h index 06d1a7dd11b..9ad1e75ee50 100644 --- a/TAO/tao/FoxResource/FoxResource_Loader.h +++ b/TAO/tao/FoxResource/FoxResource_Loader.h @@ -45,11 +45,9 @@ namespace TAO class TAO_FoxResource_Export FoxResource_Loader { public: - FoxResource_Loader (FXApp *app); virtual ~FoxResource_Loader (void); - }; } diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp index 6e3caeaaa8b..5b8b99b641d 100644 --- a/TAO/tao/GIOP_Message_Base.cpp +++ b/TAO/tao/GIOP_Message_Base.cpp @@ -141,7 +141,6 @@ TAO_GIOP_Message_Base::generate_locate_request_header ( return -1; - } return 0; @@ -580,7 +579,6 @@ TAO_GIOP_Message_Base::consolidate_node (TAO_Queued_Data *qd, // Set the <rd_ptr> of the <incoming>.. qd->msg_block ()->rd_ptr (copy_len); - } return 0; diff --git a/TAO/tao/GIOP_Message_Generator_Parser.cpp b/TAO/tao/GIOP_Message_Generator_Parser.cpp index 3d5efa6a49d..6243f4ae2e5 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser.cpp @@ -86,7 +86,6 @@ TAO_GIOP_Message_Generator_Parser::parse_locate_reply ( params.locate_reply_status (static_cast <GIOP::LocateStatusType> (locate_reply_status)); return 0; - } bool 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/HTTP_Client.cpp b/TAO/tao/HTTP_Client.cpp index 80938aac971..d353a5a5820 100644 --- a/TAO/tao/HTTP_Client.cpp +++ b/TAO/tao/HTTP_Client.cpp @@ -43,7 +43,6 @@ TAO_HTTP_Client::read (ACE_Message_Block *mb) } return ACE_Utils::truncate_cast<int> (HTTP_reader.byte_count ()); - } int diff --git a/TAO/tao/HTTP_Client.h b/TAO/tao/HTTP_Client.h index b836e33e806..8fd7d51e238 100644 --- a/TAO/tao/HTTP_Client.h +++ b/TAO/tao/HTTP_Client.h @@ -75,7 +75,6 @@ private: /// The connector endpoint to initiate the client connection ACE_Connector<TAO_HTTP_Handler, ACE_SOCK_CONNECTOR> connector_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/HTTP_Handler.cpp b/TAO/tao/HTTP_Handler.cpp index 87d6184c7a2..a2b9b3a2c10 100644 --- a/TAO/tao/HTTP_Handler.cpp +++ b/TAO/tao/HTTP_Handler.cpp @@ -43,7 +43,6 @@ TAO_HTTP_Handler::open (void *) if (this->receive_reply () != 0) TAOLIB_ERROR_RETURN ((LM_ERROR, "TAO (%P|%t) - HTTP_Handler::open, receive_reply failed\n"), -1); return 0; - } int @@ -134,7 +133,6 @@ TAO_HTTP_Reader::receive_reply () // Determine number of data bytes read. This is equal to the // total bytes read minus number of header bytes. bytes_read = num_recvd - (buf_ptr - buf); - } else { @@ -183,7 +181,6 @@ TAO_HTTP_Reader::receive_reply () // Increment bytes_read bytes_read += num_recvd; - } else { diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp index 5129206e778..4f171c079f8 100644 --- a/TAO/tao/IIOP_Connection_Handler.cpp +++ b/TAO/tao/IIOP_Connection_Handler.cpp @@ -34,7 +34,6 @@ TAO_IIOP_Connection_Handler::add_reference (void) rc)); } return rc; - } ACE_Event_Handler::Reference_Count diff --git a/TAO/tao/IIOP_Connection_Handler.h b/TAO/tao/IIOP_Connection_Handler.h index 3a0f5e9c1e9..55c110e86f9 100644 --- a/TAO/tao/IIOP_Connection_Handler.h +++ b/TAO/tao/IIOP_Connection_Handler.h @@ -56,9 +56,7 @@ namespace IIOP class TAO_Export TAO_IIOP_Connection_Handler : public TAO_IIOP_SVC_HANDLER, public TAO_Connection_Handler { - public: - #ifdef TAO_LOG_CH_REF_COUNTS Reference_Count add_reference (void); Reference_Count remove_reference (void); @@ -113,7 +111,6 @@ public: void abort (void); protected: - //@{ /** * @name TAO_Connection Handler overloads diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h index 7012aac3152..8b4cc5dd7b3 100644 --- a/TAO/tao/IIOP_Connector.h +++ b/TAO/tao/IIOP_Connector.h @@ -131,7 +131,6 @@ private: ACE_Time_Value *timeout = 0); - /// Return the remote endpoint, a helper function TAO_IIOP_Endpoint *remote_endpoint (TAO_Endpoint *ep); diff --git a/TAO/tao/IIOP_Endpoint.h b/TAO/tao/IIOP_Endpoint.h index d8f7647c6a5..7c4729f6a0f 100644 --- a/TAO/tao/IIOP_Endpoint.h +++ b/TAO/tao/IIOP_Endpoint.h @@ -183,7 +183,6 @@ private: TAO_IIOP_Endpoint (const TAO_IIOP_Endpoint &); private: - /// String representing the host name. CORBA::String_var host_; diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp index 64358da1313..fd9528b3c6b 100644 --- a/TAO/tao/IIOP_Profile.cpp +++ b/TAO/tao/IIOP_Profile.cpp @@ -546,7 +546,6 @@ TAO_IIOP_Profile::to_string () const digits [this->version_.minor], endp->host (), endp->port () ); - } ACE_OS::sprintf (buf + std::strlen(buf), "%c%s", 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/IORManipulation/IORManipulation.h b/TAO/tao/IORManipulation/IORManipulation.h index 11b0c62e4ca..4b5d6f9c017 100644 --- a/TAO/tao/IORManipulation/IORManipulation.h +++ b/TAO/tao/IORManipulation/IORManipulation.h @@ -37,7 +37,6 @@ class TAO_IOR_Manipulation_impl public ::CORBA::LocalObject { public: - /// Constructor TAO_IOR_Manipulation_impl (void); diff --git a/TAO/tao/IORTable/Locate_ResponseHandler.h b/TAO/tao/IORTable/Locate_ResponseHandler.h index f07c884b168..7f9a2a053fc 100644 --- a/TAO/tao/IORTable/Locate_ResponseHandler.h +++ b/TAO/tao/IORTable/Locate_ResponseHandler.h @@ -134,7 +134,6 @@ namespace IORTable { // satisfy the native type requirement for the asnyc locate interface typedef const TAO_AMH_Locate_ResponseHandler_var &Locate_ResponseHandler; - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORTable/Table_Adapter.cpp b/TAO/tao/IORTable/Table_Adapter.cpp index f6240e35da4..5c466630ad7 100644 --- a/TAO/tao/IORTable/Table_Adapter.cpp +++ b/TAO/tao/IORTable/Table_Adapter.cpp @@ -117,7 +117,6 @@ TAO_Table_Adapter::create_collocated_object (TAO_Stub *stub, stub->is_collocated (), stub->collocated_servant ()), CORBA::Object::_nil ()); - } return result; diff --git a/TAO/tao/IORTable/Table_Adapter.h b/TAO/tao/IORTable/Table_Adapter.h index 6b0e775a3b3..920ac96b0f9 100644 --- a/TAO/tao/IORTable/Table_Adapter.h +++ b/TAO/tao/IORTable/Table_Adapter.h @@ -32,7 +32,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_IORTable_Export TAO_Table_Adapter : public TAO_Adapter { public: - /// Constructor TAO_Table_Adapter (TAO_ORB_Core &orb_core); diff --git a/TAO/tao/Incoming_Message_Queue.h b/TAO/tao/Incoming_Message_Queue.h index fd128efea0c..523b212c8f5 100644 --- a/TAO/tao/Incoming_Message_Queue.h +++ b/TAO/tao/Incoming_Message_Queue.h @@ -50,7 +50,6 @@ class TAO_Transport; class TAO_Export TAO_Incoming_Message_Queue { public: - /// Constructor. TAO_Incoming_Message_Queue (TAO_ORB_Core *orb_core); @@ -66,7 +65,6 @@ public: CORBA::ULong queue_length () const; private: - friend class TAO_Transport; private: diff --git a/TAO/tao/Intrusive_Ref_Count_Handle_T.h b/TAO/tao/Intrusive_Ref_Count_Handle_T.h index 2b293e14b47..df2fb310c3c 100644 --- a/TAO/tao/Intrusive_Ref_Count_Handle_T.h +++ b/TAO/tao/Intrusive_Ref_Count_Handle_T.h @@ -63,7 +63,6 @@ template <typename T> class TAO_Intrusive_Ref_Count_Handle { public: - /// Default Constructor - enters the "nil" state. TAO_Intrusive_Ref_Count_Handle (); @@ -120,7 +119,6 @@ public: bool operator== (const TAO_Intrusive_Ref_Count_Handle& h) const; private: - /// Claim a "copy" of the reference-counted object by adding /// one to its reference counter. Do nothing if this smart pointer /// object is currently in the "nil" state. diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp index 78b9eaafbfd..ca07272ecba 100644 --- a/TAO/tao/Invocation_Adapter.cpp +++ b/TAO/tao/Invocation_Adapter.cpp @@ -277,7 +277,6 @@ namespace TAO resolver, max_wait_time, retry_state); - } } return TAO_INVOKE_FAILURE; 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_Endpoint_Selectors.h b/TAO/tao/Invocation_Endpoint_Selectors.h index 79d117e335a..b719d52c40f 100644 --- a/TAO/tao/Invocation_Endpoint_Selectors.h +++ b/TAO/tao/Invocation_Endpoint_Selectors.h @@ -58,14 +58,12 @@ namespace CORBA class TAO_Export TAO_Invocation_Endpoint_Selector { public: - /// Destructor. virtual ~TAO_Invocation_Endpoint_Selector (void); /// Select the endpoint and set @a r's @c profile_ virtual void select_endpoint (TAO::Profile_Transport_Resolver *r, ACE_Time_Value *val) = 0; - }; // **************************************************************** @@ -86,7 +84,6 @@ class TAO_Export TAO_Default_Endpoint_Selector : public TAO_Invocation_Endpoint_Selector { public: - /// Destructor. virtual ~TAO_Default_Endpoint_Selector (void); diff --git a/TAO/tao/Invocation_Retry_State.cpp b/TAO/tao/Invocation_Retry_State.cpp index 4c62c4e9d80..3c2564db0eb 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_) @@ -70,7 +69,6 @@ namespace command_line_params, client_factory_params, result); - } } diff --git a/TAO/tao/LF_Event.h b/TAO/tao/LF_Event.h index 6d661658616..4655577b34d 100644 --- a/TAO/tao/LF_Event.h +++ b/TAO/tao/LF_Event.h @@ -47,7 +47,6 @@ class TAO_Leader_Follower; class TAO_Export TAO_LF_Event { public: - friend class TAO_Leader_Follower; /// Constructor @@ -139,7 +138,6 @@ protected: virtual bool is_state_final () const = 0; private: - /// Set the state irrespective of anything. virtual void set_state (LFS_STATE new_state); diff --git a/TAO/tao/LF_Multi_Event.h b/TAO/tao/LF_Multi_Event.h index bb8497e3df1..ca59e7a4134 100644 --- a/TAO/tao/LF_Multi_Event.h +++ b/TAO/tao/LF_Multi_Event.h @@ -81,7 +81,6 @@ protected: virtual bool error_detected_i () const; private: - struct Event_Node { TAO_Connection_Handler * ptr_; Event_Node *next_; diff --git a/TAO/tao/LocalObject.h b/TAO/tao/LocalObject.h index a8a8d72c103..cb8c2a4b501 100644 --- a/TAO/tao/LocalObject.h +++ b/TAO/tao/LocalObject.h @@ -44,7 +44,6 @@ namespace CORBA class TAO_Export LocalObject : public virtual CORBA::Object { public: - /// Destructor virtual ~LocalObject (); diff --git a/TAO/tao/LocateRequest_Invocation_Adapter.h b/TAO/tao/LocateRequest_Invocation_Adapter.h index 60770a6f8e5..e2fc26b31d1 100644 --- a/TAO/tao/LocateRequest_Invocation_Adapter.h +++ b/TAO/tao/LocateRequest_Invocation_Adapter.h @@ -65,7 +65,6 @@ namespace TAO CORBA::PolicyList *get_inconsistent_policies (void); private: - bool get_timeout (ACE_Time_Value &val); /// Helper method that takes care of setting the profiles within diff --git a/TAO/tao/MCAST_Parser.h b/TAO/tao/MCAST_Parser.h index 82b0fb48d3b..fc999cceccf 100644 --- a/TAO/tao/MCAST_Parser.h +++ b/TAO/tao/MCAST_Parser.h @@ -54,7 +54,6 @@ public: CORBA::ORB_ptr orb); private: - CORBA::Object_ptr multicast_to_service (const char *service_name, unsigned short port, const char *mcast_address, @@ -77,7 +76,6 @@ private: void assign_to_variables (char const * mcast_name_ptr); private: - CORBA::String_var mcast_address_; /// Default multicast port (currently Name Service mcast port). @@ -91,7 +89,6 @@ private: /// Multicast service name CORBA::String_var service_name_; - }; ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_MCAST_Parser) diff --git a/TAO/tao/MProfile.h b/TAO/tao/MProfile.h index d00ce8384b7..882306374e3 100644 --- a/TAO/tao/MProfile.h +++ b/TAO/tao/MProfile.h @@ -214,7 +214,6 @@ private: int give_shared_profile (TAO_Profile *pfile); private: - /** * Used for chaning references when the current profile is * forwarded. Note, this will only be valid for an MProfile which diff --git a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp index ff0302be5d1..79ed9106ddf 100644 --- a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp +++ b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp @@ -127,7 +127,6 @@ TAO_AMI_Arguments_Converter_Impl::Initializer () } - ACE_STATIC_SVC_DEFINE ( TAO_AMI_Arguments_Converter_Impl, ACE_TEXT ("AMI_Arguments_Converter"), 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/Asynch_Invocation_Adapter.h b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h index 052dcd75da7..88bfcfc8c3c 100644 --- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h +++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h @@ -96,7 +96,6 @@ namespace TAO Asynch_Invocation_Adapter () = delete; Asynch_Invocation_Adapter (const Asynch_Invocation_Adapter &) = delete; Asynch_Invocation_Adapter & operator= (const Asynch_Invocation_Adapter &) = delete; - }; } // End namespace TAO 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/ExceptionHolder_i.h b/TAO/tao/Messaging/ExceptionHolder_i.h index 0a1bda88ebb..827388228e7 100644 --- a/TAO/tao/Messaging/ExceptionHolder_i.h +++ b/TAO/tao/Messaging/ExceptionHolder_i.h @@ -67,7 +67,6 @@ namespace TAO virtual CORBA::ValueBase* _copy_value (); protected: - virtual ~ExceptionHolder (); private: @@ -90,7 +89,6 @@ namespace TAO public: virtual CORBA::ValueBase * create_for_unmarshal (); }; - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Messaging_ORBInitializer.h b/TAO/tao/Messaging/Messaging_ORBInitializer.h index 07124b67568..0e549725264 100644 --- a/TAO/tao/Messaging/Messaging_ORBInitializer.h +++ b/TAO/tao/Messaging/Messaging_ORBInitializer.h @@ -38,7 +38,6 @@ class TAO_Messaging_ORBInitializer public virtual ::CORBA::LocalObject { public: - /** * @name PortableInterceptor::ORBInitializer Methods * @@ -46,7 +45,6 @@ public: * PortableInterceptor::ORBInitializer interface. */ //@{ - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); @@ -54,7 +52,6 @@ public: //@} private: - /// Register Messaging policy factories. void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/tao/Messaging/Messaging_Policy_i.h b/TAO/tao/Messaging/Messaging_Policy_i.h index 27901cb7115..4c963aa57ed 100644 --- a/TAO/tao/Messaging/Messaging_Policy_i.h +++ b/TAO/tao/Messaging/Messaging_Policy_i.h @@ -37,7 +37,6 @@ class TAO_RelativeRoundtripTimeoutPolicy : public Messaging::RelativeRoundtripTimeoutPolicy, public ::CORBA::LocalObject { - public: /// Constructor. TAO_RelativeRoundtripTimeoutPolicy (const TimeBase::TimeT& relative_expiry); @@ -97,7 +96,6 @@ class TAO_Messaging_Export TAO_Sync_Scope_Policy : public Messaging::SyncScopePolicy, public ::CORBA::LocalObject { - public: /// Constructor. TAO_Sync_Scope_Policy (Messaging::SyncScope synchronization); @@ -134,7 +132,6 @@ public: // Return the cached policy type for this policy. virtual TAO_Cached_Policy_Type _tao_cached_type () const; private: - /// The attribute Messaging::SyncScope synchronization_; }; 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..3596704e008 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 = @@ -3515,7 +3511,6 @@ TAO_ORB_Core::add_interceptor ( this->client_request_interceptor_adapter_->add_interceptor ( interceptor, policies); - } else { @@ -3539,7 +3534,6 @@ TAO_ORB_Core::add_interceptor ( this->server_request_interceptor_adapter_->add_interceptor ( interceptor, policies); - } else { diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index 35b2b599763..84f2af9e925 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -162,7 +162,6 @@ class TAO_Export TAO_ORB_Core ACE_TCHAR *argv[], const char *); public: - /// Constructor. TAO_ORB_Core (const char* id, ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> g); @@ -911,7 +910,6 @@ public: #endif protected: - /// Destructor is protected since the ORB Core is a reference /// counted object. ~TAO_ORB_Core (); @@ -993,7 +991,6 @@ protected: const TAO_MProfile& mprofile); private: - /// The ORB Core should not be copied. //@{ TAO_ORB_Core(const TAO_ORB_Core&); @@ -1014,7 +1011,6 @@ private: bool use_local_memory_pool_; protected: - /// Synchronize internal state... TAO_SYNCH_MUTEX lock_; @@ -1116,7 +1112,6 @@ protected: * @name Service Level Hooks */ //@{ - /// Fault Tolerant service hook. TAO_Fault_Tolerance_Service ft_service_; @@ -1296,7 +1291,6 @@ protected: class TAO_Export TAO_ORB_Core_Static_Resources : public ACE_Service_Object { public: - /// Return the context-specific singleton instance. static TAO_ORB_Core_Static_Resources* instance (); @@ -1366,14 +1360,12 @@ public: TAO_ORB_Core::Timeout_Hook alt_connection_timeout_hook_; //private: - /// Constructor. TAO_ORB_Core_Static_Resources (); TAO_ORB_Core_Static_Resources& operator= (const TAO_ORB_Core_Static_Resources&); private: - /// Mostly unused variable whose sole purpose is to enforce /// the instantiation of a TAO_ORB_Core_Static_Resources instance /// at initialization time. diff --git a/TAO/tao/ORB_Core_TSS_Resources.h b/TAO/tao/ORB_Core_TSS_Resources.h index 01e5a60de9c..922b827db7f 100644 --- a/TAO/tao/ORB_Core_TSS_Resources.h +++ b/TAO/tao/ORB_Core_TSS_Resources.h @@ -39,7 +39,6 @@ class TAO_ORB_Core; class TAO_Export TAO_ORB_Core_TSS_Resources { public: - /// Constructor TAO_ORB_Core_TSS_Resources (); @@ -50,13 +49,11 @@ public: void fini (); private: - /// The ORB Core TSS resources should not be copied TAO_ORB_Core_TSS_Resources (const TAO_ORB_Core_TSS_Resources&); void operator= (const TAO_ORB_Core_TSS_Resources&); public: - /** * @todo * The rest of the resources are not currently in use, just a plan diff --git a/TAO/tao/ORB_Table.h b/TAO/tao/ORB_Table.h index 8841c8d34a3..3d5b0415120 100644 --- a/TAO/tao/ORB_Table.h +++ b/TAO/tao/ORB_Table.h @@ -61,7 +61,6 @@ namespace TAO class TAO_Export ORB_Table { public: - /// Constructor /** * @note See the note in the class description for an explanation @@ -119,7 +118,6 @@ namespace TAO TAO_SYNCH_MUTEX & lock (); private: - // Prevent copying ORB_Table (const ORB_Table &); void operator= (const ORB_Table &); @@ -129,7 +127,6 @@ namespace TAO ::TAO_ORB_Core * find_i (char const * orb_id); private: - /// Lock used to synchronize access to the internal state. ::TAO_SYNCH_MUTEX lock_; @@ -156,7 +153,6 @@ namespace TAO class ORB_Core_Ref_Counter { public: - /// Constructor. ORB_Core_Ref_Counter (); @@ -178,7 +174,6 @@ namespace TAO private: ::TAO_ORB_Core * core_; }; - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ORB_Time_Policy.h b/TAO/tao/ORB_Time_Policy.h index 9c8a8ee4fe7..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 * @@ -52,7 +51,6 @@ namespace TAO // Declare a countdown timer type based on ORB time policy typedef ACE_Countdown_Time_T<ORB_Time_Policy> ORB_Countdown_Time; - } // TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h index 76ed5d7908f..a50ebd49468 100644 --- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h +++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h @@ -83,7 +83,6 @@ namespace TAO //@} private: - /// The ORT Template, this is the factory and its identity. PortableInterceptor::ObjectReferenceTemplate_var ort_template_; 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_Argument_T.h b/TAO/tao/Object_Argument_T.h index a2e2937c869..bfb8af789da 100644 --- a/TAO/tao/Object_Argument_T.h +++ b/TAO/tao/Object_Argument_T.h @@ -136,7 +136,6 @@ namespace TAO class Ret_Object_Argument_T : public RetArgument { public: - Ret_Object_Argument_T (); virtual CORBA::Boolean demarshal (TAO_InputCDR &); 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 31f3aa3226e..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 { @@ -75,7 +74,6 @@ private: value_type const * const element_; CORBA::Boolean const release_; }; - } // namespace details } // namespace CORBA diff --git a/TAO/tao/Object_Reference_Sequence_Element_T.h b/TAO/tao/Object_Reference_Sequence_Element_T.h index 08e283e91e7..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 { @@ -126,7 +125,6 @@ private: value_type * element_; CORBA::Boolean release_; }; - } // namespace details } // namespace CORBA diff --git a/TAO/tao/Object_Reference_Traits_Base_T.h b/TAO/tao/Object_Reference_Traits_Base_T.h index 74b1f4dd490..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 { @@ -45,7 +44,6 @@ struct object_reference_traits_base return nil(); } }; - } // namespace details } // namespace TAO diff --git a/TAO/tao/Object_Reference_Traits_T.h b/TAO/tao/Object_Reference_Traits_T.h index 8e30e2ed591..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 { @@ -83,7 +82,6 @@ struct object_reference_traits typedef object_type const * const_value_type; typedef object_t_var object_type_var; }; - } // namespace details } // namespace CORBA diff --git a/TAO/tao/PI/DLL_Resident_ORB_Initializer.h b/TAO/tao/PI/DLL_Resident_ORB_Initializer.h index 306e088b265..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 * @@ -76,4 +75,3 @@ TAO_END_VERSIONED_NAMESPACE_DECL - diff --git a/TAO/tao/PI/ORBInitInfo.h b/TAO/tao/PI/ORBInitInfo.h index 9e64004cea7..f8bf10cca54 100644 --- a/TAO/tao/PI/ORBInitInfo.h +++ b/TAO/tao/PI/ORBInitInfo.h @@ -55,7 +55,6 @@ class TAO_PI_Export TAO_ORBInitInfo public virtual ::CORBA::LocalObject { public: - /// Constructor. TAO_ORBInitInfo (TAO_ORB_Core *orb_core, int argc, @@ -241,7 +240,6 @@ private: /// The number of allocated slots. PortableInterceptor::SlotId slot_count_; - }; // Traits specializations. diff --git a/TAO/tao/PI/PI.h b/TAO/tao/PI/PI.h index addfd85df07..51460d65a4c 100644 --- a/TAO/tao/PI/PI.h +++ b/TAO/tao/PI/PI.h @@ -29,7 +29,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_PI_Export TAO_PI_Init { public: - /// Used to force the initialization of the ORB code. static int 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 f97f52df981..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 @@ -112,7 +111,6 @@ namespace PortableInterceptor } - // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -166,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/PICurrent_Guard.h b/TAO/tao/PI_Server/PICurrent_Guard.h index 16014c78dca..3f26e0f8604 100644 --- a/TAO/tao/PI_Server/PICurrent_Guard.h +++ b/TAO/tao/PI_Server/PICurrent_Guard.h @@ -48,7 +48,6 @@ namespace TAO class PICurrent_Guard { public: - /// Constructor /** * This constructor sets up this guard to copy the data held in a @@ -75,7 +74,6 @@ namespace TAO ~PICurrent_Guard (); private: - /// The PICurrent implementation whose slot table will be copied. PICurrent_Impl *src_; diff --git a/TAO/tao/PI_Server/PI_Server.h b/TAO/tao/PI_Server/PI_Server.h index f38922a5209..b7f7d0985e9 100644 --- a/TAO/tao/PI_Server/PI_Server.h +++ b/TAO/tao/PI_Server/PI_Server.h @@ -29,7 +29,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_PI_Server_Export TAO_PI_Server_Init { public: - /// Used to force the initialization of the ORB code. static int Initializer (); }; diff --git a/TAO/tao/PI_Server/ServerRequestInfo.h b/TAO/tao/PI_Server/ServerRequestInfo.h index f2948962121..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. @@ -239,7 +238,6 @@ namespace TAO /// The number of elements in the @c exceptions_ array. CORBA::ULong const nexceptions_; }; - } // End namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL 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 4dce9d6cc6a..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 @@ -137,7 +136,6 @@ namespace PortableInterceptor } - // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -232,7 +230,6 @@ namespace PortableInterceptor // Traits specializations. namespace TAO { - #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_) #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_ diff --git a/TAO/tao/Parser_Registry.h b/TAO/tao/Parser_Registry.h index 10495530423..bb7e02348b2 100644 --- a/TAO/tao/Parser_Registry.h +++ b/TAO/tao/Parser_Registry.h @@ -60,19 +60,16 @@ public: Parser_Iterator end () const; private: - // The parser registry should not be copied. TAO_Parser_Registry (const TAO_Parser_Registry&); void operator= (const TAO_Parser_Registry&); private: - /// List of parsers TAO_IOR_Parser **parsers_; /// Number of parsers size_t size_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Policy_Current_Impl.h b/TAO/tao/Policy_Current_Impl.h index d370f8a7255..dcf99e5e5ed 100644 --- a/TAO/tao/Policy_Current_Impl.h +++ b/TAO/tao/Policy_Current_Impl.h @@ -35,7 +35,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Policy_Current_Impl { public: - TAO_Policy_Current_Impl (); /// Obtain a single policy. diff --git a/TAO/tao/Policy_Set.h b/TAO/tao/Policy_Set.h index 1e415564ecd..04cf7bd28db 100644 --- a/TAO/tao/Policy_Set.h +++ b/TAO/tao/Policy_Set.h @@ -37,7 +37,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Export TAO_Policy_Set { public: - /** Creates a TAO_Policy_Set that has a given scope. The * scope is used to determinate whether or not a given policy can * be set for the given Policy Manager Implementation. diff --git a/TAO/tao/PortableServer/Active_Object_Map.h b/TAO/tao/PortableServer/Active_Object_Map.h index d2b688d7dd6..b4eb5ef21ea 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.h +++ b/TAO/tao/PortableServer/Active_Object_Map.h @@ -48,7 +48,6 @@ struct TAO_Active_Object_Map_Entry; class TAO_Active_Object_Map { public: - /// Constructor. TAO_Active_Object_Map ( int user_id_policy, @@ -321,7 +320,6 @@ public: set_active_object_map (TAO_Active_Object_Map *active_object_map); protected: - /// Pointer to the active map. TAO_Active_Object_Map *active_object_map_; }; @@ -336,7 +334,6 @@ protected: class TAO_Unique_Id_Strategy : public TAO_Id_Uniqueness_Strategy { public: - /// Must be used with UNIQUE_ID policy. virtual int is_servant_in_map (PortableServer::Servant servant, @@ -385,7 +382,6 @@ public: class TAO_Multiple_Id_Strategy : public TAO_Id_Uniqueness_Strategy { public: - /// Must be used with UNIQUE_ID policy. virtual int is_servant_in_map (PortableServer::Servant servant, @@ -435,7 +431,6 @@ public: class TAO_Lifespan_Strategy { public: - /// Virtual destructor. virtual ~TAO_Lifespan_Strategy (); @@ -452,7 +447,6 @@ public: set_active_object_map (TAO_Active_Object_Map *active_object_map); protected: - /// Pointer to the active map. TAO_Active_Object_Map *active_object_map_; }; @@ -522,7 +516,6 @@ public: set_active_object_map (TAO_Active_Object_Map *active_object_map); protected: - /// Pointer to the active map. TAO_Active_Object_Map *active_object_map_; }; 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/Basic_SArguments.h b/TAO/tao/PortableServer/Basic_SArguments.h index fedd66c3afc..f916b637c00 100644 --- a/TAO/tao/PortableServer/Basic_SArguments.h +++ b/TAO/tao/PortableServer/Basic_SArguments.h @@ -36,10 +36,8 @@ namespace TAO class TAO_PortableServer_Export SArg_Traits<void> { public: - typedef void ret_type; typedef RetArgument ret_val; - }; /** 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/Collocated_Arguments_Converter.h b/TAO/tao/PortableServer/Collocated_Arguments_Converter.h index 656de9a53d2..84a8e0e7e78 100644 --- a/TAO/tao/PortableServer/Collocated_Arguments_Converter.h +++ b/TAO/tao/PortableServer/Collocated_Arguments_Converter.h @@ -40,7 +40,6 @@ class TAO_PortableServer_Export Collocated_Arguments_Converter : public ACE_Service_Object { public: - virtual ~Collocated_Arguments_Converter (); virtual void convert_request (TAO_ServerRequest & server_request, diff --git a/TAO/tao/PortableServer/Creation_Time.h b/TAO/tao/PortableServer/Creation_Time.h index 4b13c32be55..a3bfc8e440a 100644 --- a/TAO/tao/PortableServer/Creation_Time.h +++ b/TAO/tao/PortableServer/Creation_Time.h @@ -52,7 +52,6 @@ namespace TAO bool operator!= (const Temporary_Creation_Time &rhs) const; protected: - enum { SEC_FIELD = 0, @@ -61,7 +60,6 @@ namespace TAO /// Timestamp CORBA::ULong time_stamp_[2]; - }; /** @@ -75,7 +73,6 @@ namespace TAO class Temporary_Creation_Time { public: - Temporary_Creation_Time (); void creation_time (const void *creation_time); @@ -85,7 +82,6 @@ namespace TAO bool operator!= (const Creation_Time &rhs) const; protected: - void *time_stamp_; }; } diff --git a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h index 7d80c642ebf..2cec9553697 100644 --- a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h +++ b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h @@ -60,7 +60,6 @@ namespace TAO size_t op_len, TAO::Collocation_Strategy strategy); }; - } // End namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h index 44889cf37be..575c22be156 100644 --- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h +++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h @@ -38,7 +38,6 @@ namespace TAO class In_Fixed_Size_SArgument_T : public InArgument { public: - /** * @name @c TAO::Argument Method Overrides * @@ -59,10 +58,8 @@ namespace TAO S const & arg () const; private: - /// Reference to the "IN" argument. S x_; - }; // ------------------------------------------------------------ @@ -77,7 +74,6 @@ namespace TAO class Inout_Fixed_Size_SArgument_T : public InoutArgument { public: - /// Constructor. Inout_Fixed_Size_SArgument_T (); @@ -100,7 +96,6 @@ namespace TAO S & arg (); private: - S x_; }; @@ -116,7 +111,6 @@ namespace TAO class Out_Fixed_Size_SArgument_T : public OutArgument { public: - /// Constructor. Out_Fixed_Size_SArgument_T (); @@ -138,9 +132,7 @@ namespace TAO S & arg (); private: - S x_; - }; // ------------------------------------------------------------ @@ -155,7 +147,6 @@ namespace TAO class Ret_Fixed_Size_SArgument_T : public RetArgument { public: - /// Constructor. Ret_Fixed_Size_SArgument_T (); @@ -177,9 +168,7 @@ namespace TAO S & arg (); private: - S x_; - }; // ------------------------------------------------------------ diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h index 5b1c7ba96eb..15e212c64ab 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h @@ -43,7 +43,6 @@ namespace TAO virtual ::PortableServer::IdUniquenessPolicyValue type() const; }; - } } diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h index ba910f7dc0f..26450fc1f6f 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h @@ -48,7 +48,6 @@ namespace TAO private: TAO_Root_POA* poa_; }; - } } diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h index d02e0060b4f..f5dfc25b016 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h @@ -36,7 +36,6 @@ namespace TAO virtual void destroy (IdUniquenessStrategy *strategy); }; - } } diff --git a/TAO/tao/PortableServer/Key_Adapters.h b/TAO/tao/PortableServer/Key_Adapters.h index 9bbc42e51ea..5c6e9fbfd45 100644 --- a/TAO/tao/PortableServer/Key_Adapters.h +++ b/TAO/tao/PortableServer/Key_Adapters.h @@ -39,13 +39,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Incremental_Key_Generator { public: - TAO_Incremental_Key_Generator (); int operator() (PortableServer::ObjectId &id); protected: - CORBA::ULong counter_; }; @@ -61,7 +59,6 @@ protected: class TAO_PortableServer_Export TAO_ObjectId_Hash { public: - /// Returns hash value. u_long operator () (const PortableServer::ObjectId &id) const; }; @@ -80,7 +77,6 @@ public: class TAO_Ignore_Original_Key_Adapter { public: - int encode (const PortableServer::ObjectId &original_key, const ACE_Active_Map_Manager_Key &active_key, PortableServer::ObjectId &modified_key); @@ -106,7 +102,6 @@ public: class TAO_Preserve_Original_Key_Adapter { public: - int encode (const PortableServer::ObjectId &original_key, const ACE_Active_Map_Manager_Key &active_key, PortableServer::ObjectId &modified_key); diff --git a/TAO/tao/PortableServer/LifespanStrategy.h b/TAO/tao/PortableServer/LifespanStrategy.h index 6aaa52a0bdf..01a9a150dbd 100644 --- a/TAO/tao/PortableServer/LifespanStrategy.h +++ b/TAO/tao/PortableServer/LifespanStrategy.h @@ -81,7 +81,6 @@ namespace TAO protected: TAO_Root_POA *poa_; }; - } /* namespace Portable_Server */ } /* namespace TAO */ diff --git a/TAO/tao/PortableServer/Network_Priority_Hook.h b/TAO/tao/PortableServer/Network_Priority_Hook.h index 29e4cfb2834..7145904a1c5 100644 --- a/TAO/tao/PortableServer/Network_Priority_Hook.h +++ b/TAO/tao/PortableServer/Network_Priority_Hook.h @@ -50,7 +50,6 @@ public: /// Static initializer ensures the factory is loaded static int initialize (); - }; diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.h b/TAO/tao/PortableServer/Non_Servant_Upcall.h index 75041660593..3bf8925033f 100644 --- a/TAO/tao/PortableServer/Non_Servant_Upcall.h +++ b/TAO/tao/PortableServer/Non_Servant_Upcall.h @@ -48,7 +48,6 @@ namespace TAO class TAO_PortableServer_Export Non_Servant_Upcall { public: - /// Constructor. Non_Servant_Upcall (::TAO_Root_POA &poa); @@ -58,7 +57,6 @@ namespace TAO ::TAO_Root_POA &poa () const; protected: - TAO_Object_Adapter &object_adapter_; TAO_Root_POA &poa_; Non_Servant_Upcall *previous_; diff --git a/TAO/tao/PortableServer/ORT_Adapter.h b/TAO/tao/PortableServer/ORT_Adapter.h index ed4e5f5d052..181c9ef5102 100644 --- a/TAO/tao/PortableServer/ORT_Adapter.h +++ b/TAO/tao/PortableServer/ORT_Adapter.h @@ -93,7 +93,6 @@ namespace TAO typedef ACE_Array_Base<PortableInterceptor::ObjectReferenceTemplate*> ORT_Array; - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ORT_Adapter_Factory.h b/TAO/tao/PortableServer/ORT_Adapter_Factory.h index d2d1df23f1e..1d4a1e5a1d5 100644 --- a/TAO/tao/PortableServer/ORT_Adapter_Factory.h +++ b/TAO/tao/PortableServer/ORT_Adapter_Factory.h @@ -46,7 +46,6 @@ namespace TAO : public ACE_Service_Object { public: - /// Destructor. /** * @note Even though this class only defines an interface, a diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h index 62415aefec9..c041333d425 100644 --- a/TAO/tao/PortableServer/Object_Adapter.h +++ b/TAO/tao/PortableServer/Object_Adapter.h @@ -73,7 +73,6 @@ class TAO_PortableServer_Export TAO_Object_Adapter : public TAO_Adapter { public: - friend class TAO_Root_POA; typedef PortableServer::ObjectId poa_name; @@ -164,7 +163,6 @@ public: virtual CORBA::Long initialize_collocated_object (TAO_Stub *); protected: - int locate_servant_i (const TAO::ObjectKey &key); TAO_SERVANT_LOCATION find_servant_i (const TAO::ObjectKey &key, @@ -202,7 +200,6 @@ protected: TAO::Portable_Server::Servant_Upcall& upcall); public: - /** * @class Hint_Strategy * @@ -214,7 +211,6 @@ public: class TAO_PortableServer_Export Hint_Strategy { public: - virtual ~Hint_Strategy (); virtual int find_persistent_poa (const poa_name &system_name, @@ -230,7 +226,6 @@ public: void object_adapter (TAO_Object_Adapter *oa); protected: - TAO_Object_Adapter *object_adapter_; }; @@ -246,7 +241,6 @@ public: class TAO_PortableServer_Export Active_Hint_Strategy : public Hint_Strategy { public: - Active_Hint_Strategy (CORBA::ULong map_size); virtual ~Active_Hint_Strategy (); @@ -262,7 +256,6 @@ public: const poa_name &system_name); protected: - typedef ACE_Active_Map_Manager_Adapter< poa_name, TAO_Root_POA *, @@ -285,7 +278,6 @@ public: class TAO_PortableServer_Export No_Hint_Strategy : public Hint_Strategy { public: - virtual ~No_Hint_Strategy (); virtual int find_persistent_poa (const poa_name &system_name, @@ -297,13 +289,11 @@ public: virtual int unbind_persistent_poa (const poa_name &folded_name, const poa_name &system_name); - }; friend class No_Hint_Strategy; protected: - Hint_Strategy *hint_strategy_; /// Base class of the id map. @@ -366,7 +356,6 @@ protected: transient_poa_map *transient_poa_map_; protected: - static CORBA::ULong transient_poa_name_size_; static void set_transient_poa_name_size (const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters); @@ -380,7 +369,6 @@ protected: ACE_Reverse_Lock<ACE_Lock> reverse_lock_; public: - /** * @class poa_name_iterator * @@ -389,7 +377,6 @@ public: class poa_name_iterator { public: - /// Constructor. poa_name_iterator (int begin, CORBA::ULong size, @@ -406,7 +393,6 @@ public: poa_name_iterator &operator++ (); protected: - CORBA::ULong size_; CORBA::ULong position_; const CORBA::Octet *folded_buffer_; @@ -421,7 +407,6 @@ public: class iteratable_poa_name { public: - typedef poa_name_iterator iterator; iteratable_poa_name (const poa_name &folded_name); @@ -430,7 +415,6 @@ public: iterator end () const; protected: - const poa_name &folded_name_; }; @@ -439,13 +423,11 @@ public: friend class TAO::Portable_Server::Servant_Upcall; public: - /// Pointer to the non-servant upcall in progress. If no non-servant /// upcall is in progress, this pointer is zero. TAO::Portable_Server::Non_Servant_Upcall *non_servant_upcall_in_progress () const; private: - /// Helper method to get collocated servant TAO_ServantBase *get_collocated_servant (const TAO_MProfile &mp); @@ -453,7 +435,6 @@ private: static void release_poa_manager_factory (TAO_POAManager_Factory *factory); #endif private: - /// Condition variable for waiting on non-servant upcalls to end. TAO_SYNCH_CONDITION non_servant_upcall_condition_; diff --git a/TAO/tao/PortableServer/Object_Adapter_Factory.h b/TAO/tao/PortableServer/Object_Adapter_Factory.h index e496c9e79de..80e05802d96 100644 --- a/TAO/tao/PortableServer/Object_Adapter_Factory.h +++ b/TAO/tao/PortableServer/Object_Adapter_Factory.h @@ -28,7 +28,6 @@ class TAO_PortableServer_Export TAO_Object_Adapter_Factory : public TAO_Adapter_Factory { public: - // = The TAO_Adapter_Factory methods, please read tao/Adapter.h for // details. virtual TAO_Adapter *create (TAO_ORB_Core *orb_core); diff --git a/TAO/tao/PortableServer/Object_SArgument_T.h b/TAO/tao/PortableServer/Object_SArgument_T.h index 56563f63655..a11c4181d79 100644 --- a/TAO/tao/PortableServer/Object_SArgument_T.h +++ b/TAO/tao/PortableServer/Object_SArgument_T.h @@ -41,7 +41,6 @@ namespace TAO class In_Object_SArgument_T : public InArgument { public: - virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; diff --git a/TAO/tao/PortableServer/Operation_Table_Binary_Search.h b/TAO/tao/PortableServer/Operation_Table_Binary_Search.h index fa04e2fd156..0d45423ff0d 100644 --- a/TAO/tao/PortableServer/Operation_Table_Binary_Search.h +++ b/TAO/tao/PortableServer/Operation_Table_Binary_Search.h @@ -38,7 +38,6 @@ class TAO_PortableServer_Export TAO_Binary_Search_OpTable : public TAO_Operation_Table { public: - /// Do nothing destructor. virtual ~TAO_Binary_Search_OpTable (); diff --git a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h index 60979b541f7..76c883f72f4 100644 --- a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h +++ b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h @@ -39,7 +39,6 @@ class TAO_PortableServer_Export TAO_Perfect_Hash_OpTable : public TAO_Operation_Table { public: - /// Do nothing destructor. virtual ~TAO_Perfect_Hash_OpTable (); 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/POA_Cached_Policies.h b/TAO/tao/PortableServer/POA_Cached_Policies.h index 491b9833d83..3465c355dc4 100644 --- a/TAO/tao/PortableServer/POA_Cached_Policies.h +++ b/TAO/tao/PortableServer/POA_Cached_Policies.h @@ -40,7 +40,6 @@ namespace TAO class TAO_PortableServer_Export Cached_Policies { public: - enum PriorityModel { CLIENT_PROPAGATED, @@ -113,7 +112,6 @@ namespace TAO //@} protected: - /// Helper method to update a particular policy. void update_policy (const CORBA::Policy_ptr policy); diff --git a/TAO/tao/PortableServer/POA_Current_Factory.h b/TAO/tao/PortableServer/POA_Current_Factory.h index 11b84f83535..13948e1eca9 100644 --- a/TAO/tao/PortableServer/POA_Current_Factory.h +++ b/TAO/tao/PortableServer/POA_Current_Factory.h @@ -28,7 +28,6 @@ class TAO_PortableServer_Export TAO_POA_Current_Factory : public TAO_Object_Loader { public: - /// Creates a PICurrent and returns it. virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, 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..a2ea413e806 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); @@ -1972,7 +1971,6 @@ TAO_Root_POA::key_to_object (const TAO::ObjectKey &key, collocated, servant), CORBA::INTERNAL ()); - } else { diff --git a/TAO/tao/PortableServer/Root_POA.h b/TAO/tao/PortableServer/Root_POA.h index 37521aad56c..317e4ce67f5 100644 --- a/TAO/tao/PortableServer/Root_POA.h +++ b/TAO/tao/PortableServer/Root_POA.h @@ -467,7 +467,6 @@ public: const PortableServer::ObjectId& oid); protected: - #if (TAO_HAS_MINIMUM_POA == 0) int enter (); @@ -637,7 +636,6 @@ public: invoke_key_to_object_helper_i (const char * repository_id, const PortableServer::ObjectId & id); protected: - /// Get the ORT adapter, in case there is no adapter yet, this method will /// try to create one and hold the POA lock TAO::ORT_Adapter *ORT_adapter (); @@ -795,7 +793,6 @@ public: class TAO_PortableServer_Export TAO_POA_Static_Resources { public: - /// Return the singleton instance. static TAO_POA_Static_Resources* instance (); @@ -803,7 +800,6 @@ public: static void fini () ACE_GCC_DESTRUCTOR_ATTRIBUTE; public: - /** * Name of the factory object used to adapt function calls on the * PortableInterceptor interfaces ORT. The default value is diff --git a/TAO/tao/PortableServer/ServantRetentionStrategy.h b/TAO/tao/PortableServer/ServantRetentionStrategy.h index eb54dc6520a..6873a3b8028 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategy.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategy.h @@ -115,7 +115,6 @@ namespace TAO virtual ::PortableServer::ServantRetentionPolicyValue type() const = 0; virtual TAO_Active_Object_Map * get_active_object_map() const = 0; - }; } } diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp index 531be3b10f4..54d5cff2d9d 100644 --- a/TAO/tao/PortableServer/Servant_Base.cpp +++ b/TAO/tao/PortableServer/Servant_Base.cpp @@ -350,7 +350,6 @@ TAO_ServantBase::_component_thru_poa_skel (TAO_ServerRequest & server_request, # endif /* !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ - void TAO_ServantBase::_repository_id_skel (TAO_ServerRequest & server_request, TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall), diff --git a/TAO/tao/PortableServer/Servant_Upcall.cpp b/TAO/tao/PortableServer/Servant_Upcall.cpp index db903e39819..ecad0576c2e 100644 --- a/TAO/tao/PortableServer/Servant_Upcall.cpp +++ b/TAO/tao/PortableServer/Servant_Upcall.cpp @@ -352,7 +352,6 @@ namespace TAO this->poa_->cleanup_servant ( this->active_object_map_entry_->servant_, this->active_object_map_entry_->user_id_); - } catch (...) { diff --git a/TAO/tao/PortableServer/Servant_Upcall.h b/TAO/tao/PortableServer/Servant_Upcall.h index 319a6074389..1f28b6d106e 100644 --- a/TAO/tao/PortableServer/Servant_Upcall.h +++ b/TAO/tao/PortableServer/Servant_Upcall.h @@ -179,7 +179,6 @@ namespace TAO void increment_servant_refcount (); protected: - void post_invoke_servant_cleanup (); void single_threaded_poa_setup (); void single_threaded_poa_cleanup (); @@ -190,7 +189,6 @@ namespace TAO void upcall_cleanup (); protected: - TAO_Object_Adapter *object_adapter_; ::TAO_Root_POA *poa_; diff --git a/TAO/tao/PortableServer/Servant_var.h b/TAO/tao/PortableServer/Servant_var.h index 24f66407de2..ae34add8165 100644 --- a/TAO/tao/PortableServer/Servant_var.h +++ b/TAO/tao/PortableServer/Servant_var.h @@ -118,7 +118,6 @@ namespace PortableServer /// Compare two Servant_vars for non-equivalence. template <class X, class Y> bool operator!=(Servant_var<X> const & x, Servant_var<Y> const & y); - } // namespace PortableServer TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.h b/TAO/tao/PortableServer/Special_Basic_SArgument_T.h index 3e217820af9..d8ea769573f 100644 --- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.h +++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.h @@ -152,7 +152,6 @@ namespace TAO typedef inout_type inout_arg_type; typedef out_type out_arg_type; typedef out_type ret_arg_type; - }; } diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.h b/TAO/tao/PortableServer/UB_String_SArgument_T.h index 457e761bf06..89792b2d9e7 100644 --- a/TAO/tao/PortableServer/UB_String_SArgument_T.h +++ b/TAO/tao/PortableServer/UB_String_SArgument_T.h @@ -137,7 +137,6 @@ namespace TAO typedef inout_type inout_arg_type; typedef inout_type out_arg_type; typedef inout_type ret_arg_type; - }; } diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.h b/TAO/tao/PortableServer/Upcall_Wrapper.h index afcc4f5b253..d2585c5ba66 100644 --- a/TAO/tao/PortableServer/Upcall_Wrapper.h +++ b/TAO/tao/PortableServer/Upcall_Wrapper.h @@ -55,7 +55,6 @@ namespace TAO class TAO_PortableServer_Export Upcall_Wrapper { public: - /** * @note The TAO::Argument corresponding to the return value is * always the first element in the array, regardless of @@ -90,8 +89,6 @@ namespace TAO ); private: - - /// Perform pre-upcall operations. /** * Perform pre-upcall operations, including operation @c IN and diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.h b/TAO/tao/PortableServer/Var_Array_SArgument_T.h index 0242a21f24a..2f501c27f54 100644 --- a/TAO/tao/PortableServer/Var_Array_SArgument_T.h +++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.h @@ -34,7 +34,6 @@ namespace TAO class In_Var_Array_SArgument_T : public InArgument { public: - In_Var_Array_SArgument_T (); virtual CORBA::Boolean demarshal (TAO_InputCDR &); diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.h b/TAO/tao/PortableServer/Var_Size_SArgument_T.h index 07773260e03..d86ccc57770 100644 --- a/TAO/tao/PortableServer/Var_Size_SArgument_T.h +++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.h @@ -33,7 +33,6 @@ namespace TAO class In_Var_Size_SArgument_T : public InArgument { public: - virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; diff --git a/TAO/tao/Principal.h b/TAO/tao/Principal.h index 0b7fe0cc9cc..3c7194de2ec 100644 --- a/TAO/tao/Principal.h +++ b/TAO/tao/Principal.h @@ -74,7 +74,6 @@ namespace CORBA typedef Principal_var _var_type; protected: - /// Destructor /** * Protected destructor to enforce proper memory management @@ -83,7 +82,6 @@ namespace CORBA ~Principal (void); private: - // = Prevent copying Principal &operator = (const CORBA::Principal_ptr &); Principal (const CORBA::Principal_ptr &); diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp index 45de2e87c27..9bc48cb6352 100644 --- a/TAO/tao/Profile.cpp +++ b/TAO/tao/Profile.cpp @@ -868,7 +868,6 @@ TAO_Unknown_Profile::create_profile_body (TAO_OutputCDR &) const } - // ************************************************************* // Operators for TAO_opaque encoding and decoding // ************************************************************* diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h index 8bb9ccdcdcc..86486eab854 100644 --- a/TAO/tao/Profile.h +++ b/TAO/tao/Profile.h @@ -325,7 +325,6 @@ protected: CORBA::ULong hash_service_i (CORBA::ULong m); private: - /// This object keeps ownership of this object TAO_MProfile *forward_to_i (); 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/Profile_Transport_Resolver.h b/TAO/tao/Profile_Transport_Resolver.h index 8af90de85c9..39f619dcb60 100644 --- a/TAO/tao/Profile_Transport_Resolver.h +++ b/TAO/tao/Profile_Transport_Resolver.h @@ -149,7 +149,6 @@ namespace TAO CORBA::PolicyList *steal_inconsistent_policies (); private: - /// Helper method to access get the connection timeout from the /// ORB. bool get_connection_timeout (ACE_Time_Value &max_wait_time); diff --git a/TAO/tao/Protocol_Factory.h b/TAO/tao/Protocol_Factory.h index 9a54afb1e17..64ebaa20966 100644 --- a/TAO/tao/Protocol_Factory.h +++ b/TAO/tao/Protocol_Factory.h @@ -69,10 +69,8 @@ public: virtual int requires_explicit_endpoint () const = 0; private: - /// IOP protocol tag. CORBA::ULong const tag_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Protocols_Hooks.h b/TAO/tao/Protocols_Hooks.h index 3a8c76a844f..d629e049354 100644 --- a/TAO/tao/Protocols_Hooks.h +++ b/TAO/tao/Protocols_Hooks.h @@ -39,7 +39,6 @@ class TAO_Stub; class TAO_Export TAO_IIOP_Protocol_Properties { public: - TAO_IIOP_Protocol_Properties (); CORBA::Long send_buffer_size_; @@ -54,7 +53,6 @@ public: class TAO_Export TAO_UIOP_Protocol_Properties { public: - TAO_UIOP_Protocol_Properties (); CORBA::Long send_buffer_size_; @@ -64,7 +62,6 @@ public: class TAO_Export TAO_SHMIOP_Protocol_Properties { public: - TAO_SHMIOP_Protocol_Properties (); CORBA::Long send_buffer_size_; @@ -80,7 +77,6 @@ public: class TAO_Export TAO_DIOP_Protocol_Properties { public: - TAO_DIOP_Protocol_Properties (); CORBA::Long send_buffer_size_; @@ -93,7 +89,6 @@ public: class TAO_Export TAO_SCIOP_Protocol_Properties { public: - TAO_SCIOP_Protocol_Properties (); CORBA::Long send_buffer_size_; diff --git a/TAO/tao/Pseudo_VarOut_T.h b/TAO/tao/Pseudo_VarOut_T.h index 92d2bc07ca1..761414716cb 100644 --- a/TAO/tao/Pseudo_VarOut_T.h +++ b/TAO/tao/Pseudo_VarOut_T.h @@ -80,7 +80,6 @@ public: // TAO extension. _retn_type ptr () const; private: - // Unimplemented - prevents widening assignment. TAO_Pseudo_Var_T (const TAO_Base_var &); void operator= (const TAO_Base_var &); diff --git a/TAO/tao/Queued_Data.cpp b/TAO/tao/Queued_Data.cpp index d7c86459964..9d4de42386f 100644 --- a/TAO/tao/Queued_Data.cpp +++ b/TAO/tao/Queued_Data.cpp @@ -86,7 +86,6 @@ TAO_Queued_Data::make_queued_data (ACE_Allocator *message_buffer_alloc, message_buffer_alloc->malloc (sizeof (TAO_Queued_Data))), TAO_Queued_Data (message_buffer_alloc), nullptr); - } else { 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/Multi_Priority_Mapping.h b/TAO/tao/RTCORBA/Multi_Priority_Mapping.h index f45eec78ef2..13293774a73 100644 --- a/TAO/tao/RTCORBA/Multi_Priority_Mapping.h +++ b/TAO/tao/RTCORBA/Multi_Priority_Mapping.h @@ -69,7 +69,6 @@ public: RTCORBA::Priority &corba_priority); private: - /// The base settings int base_native_priority_; int base_corba_priority_; diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping.h b/TAO/tao/RTCORBA/Network_Priority_Mapping.h index cfd886b6fe6..94ac1a3df4d 100644 --- a/TAO/tao/RTCORBA/Network_Priority_Mapping.h +++ b/TAO/tao/RTCORBA/Network_Priority_Mapping.h @@ -58,4 +58,3 @@ TAO_END_VERSIONED_NAMESPACE_DECL - diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h index 31ad3d13eaa..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); @@ -74,18 +73,15 @@ public: virtual const char* _interface_repository_id () const; protected: - /// Protected destructor to enforce proper memory management of this /// reference counted object. ~TAO_Network_Priority_Mapping_Manager (void); private: - TAO_Network_Priority_Mapping_Manager (const TAO_Network_Priority_Mapping_Manager &); void operator= (const TAO_Network_Priority_Mapping_Manager &); private: - TAO_Network_Priority_Mapping *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_Current.h b/TAO/tao/RTCORBA/RT_Current.h index 299777e0af8..db2fec18854 100644 --- a/TAO/tao/RTCORBA/RT_Current.h +++ b/TAO/tao/RTCORBA/RT_Current.h @@ -43,7 +43,6 @@ class TAO_RTCORBA_Export TAO_RT_Current , public ::CORBA::LocalObject { public: - /// Default constructor. TAO_RT_Current (TAO_ORB_Core *orb_core); @@ -52,16 +51,13 @@ public: virtual void the_priority (RTCORBA::Priority the_priority); protected: - /// Protected destructor to enforce proper memory management of this /// reference counted object. virtual ~TAO_RT_Current (void); private: - /// ORB Core that owns us. TAO_ORB_Core * const orb_core_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp index ece8bd20950..7ae293e3450 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 ()); } @@ -228,13 +226,11 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile ( "Unable to access RT CORBA Priority in client thread " "accessing object with CLIENT_PROPAGATED priority model.\n")); throw CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO); - } // 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_Invocation_Endpoint_Selectors.h b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h index 8a4bd965ddb..9be25588f29 100644 --- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h +++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h @@ -45,7 +45,6 @@ class TAO_RTCORBA_Export TAO_RT_Invocation_Endpoint_Selector : public TAO_Invocation_Endpoint_Selector { public: - virtual void select_endpoint (TAO::Profile_Transport_Resolver *r, ACE_Time_Value *val); diff --git a/TAO/tao/RTCORBA/RT_Mutex.h b/TAO/tao/RTCORBA/RT_Mutex.h index b17cf860b16..14e431e57fd 100644 --- a/TAO/tao/RTCORBA/RT_Mutex.h +++ b/TAO/tao/RTCORBA/RT_Mutex.h @@ -50,7 +50,6 @@ class TAO_RTCORBA_Export TAO_RT_Mutex public ::CORBA::LocalObject { public: - /// Acquire the lock. virtual void lock (void); @@ -92,7 +91,6 @@ public: virtual const char *name () const; protected: - /// My name. ACE_CString name_; }; diff --git a/TAO/tao/RTCORBA/RT_ORB.h b/TAO/tao/RTCORBA/RT_ORB.h index 12fd4afb9ec..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); @@ -64,7 +63,6 @@ public: RTCORBA::Mutex_ptr open_named_mutex (const char * name); private: - #if (TAO_HAS_NAMED_RT_MUTEXES == 1) /// Hash map for named RT Mutexes ACE_Hash_Map_Manager_Ex< @@ -92,7 +90,6 @@ class TAO_RTCORBA_Export TAO_RT_ORB public ::CORBA::LocalObject { public: - /// Constructor. TAO_RT_ORB (TAO_ORB_Core *orb_core, TAO_RT_ORBInitializer::TAO_RTCORBA_DT_LifeSpan lifespan, @@ -251,13 +248,11 @@ public: static int modify_thread_scheduling_policy (CORBA::ORB_ptr orb); protected: - /// Protected destructor to enforce proper memory management of this /// reference counted object. virtual ~TAO_RT_ORB (void); protected: - /// Reference to our creating ORB Core. TAO_ORB_Core * const orb_core_; diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.h b/TAO/tao/RTCORBA/RT_ORBInitializer.h index 73d9c8e4196..6f1e3d9208e 100644 --- a/TAO/tao/RTCORBA/RT_ORBInitializer.h +++ b/TAO/tao/RTCORBA/RT_ORBInitializer.h @@ -84,7 +84,6 @@ public: virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: - /// Register RTCORBA policy factories. void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.h b/TAO/tao/RTCORBA/RT_ORB_Loader.h index e4b9f3db0c8..45a1fce61cc 100644 --- a/TAO/tao/RTCORBA/RT_ORB_Loader.h +++ b/TAO/tao/RTCORBA/RT_ORB_Loader.h @@ -33,7 +33,6 @@ class TAO_ORB_Core; class TAO_RTCORBA_Export TAO_RT_ORB_Loader : public ACE_Service_Object { public: - /// Constructor. TAO_RT_ORB_Loader (void); diff --git a/TAO/tao/RTCORBA/RT_Policy_i.cpp b/TAO/tao/RTCORBA/RT_Policy_i.cpp index 453572829f9..5616f392b75 100644 --- a/TAO/tao/RTCORBA/RT_Policy_i.cpp +++ b/TAO/tao/RTCORBA/RT_Policy_i.cpp @@ -630,7 +630,6 @@ TAO_ClientProtocolPolicy::_tao_decode (TAO_InputCDR &in_cdr) && (this->protocols_[i].transport_protocol_properties.ptr () != 0)) is_read_ok = this->protocols_[i].transport_protocol_properties->_tao_decode (in_cdr); - } return is_read_ok; diff --git a/TAO/tao/RTCORBA/RT_Policy_i.h b/TAO/tao/RTCORBA/RT_Policy_i.h index b145bb51e29..85312df3585 100644 --- a/TAO/tao/RTCORBA/RT_Policy_i.h +++ b/TAO/tao/RTCORBA/RT_Policy_i.h @@ -89,7 +89,6 @@ public: static CORBA::Policy_ptr create (const CORBA::Any &val); protected: - /// Protected destructor to enforce proper memory management of this /// reference counted object. virtual ~TAO_PriorityModelPolicy (void); @@ -100,7 +99,6 @@ protected: TAO_PriorityModelPolicy (void); private: - /// Attributes. RTCORBA::PriorityModel priority_model_; RTCORBA::Priority server_priority_; @@ -145,13 +143,11 @@ public: static CORBA::Policy_ptr create (const CORBA::Any &val); protected: - /// Protected destructor to enforce proper memory management of this /// reference counted object. virtual ~TAO_ThreadpoolPolicy (void); private: - /// Attribute. RTCORBA::ThreadpoolId id_; }; @@ -195,11 +191,9 @@ public: static CORBA::Policy_ptr create (const CORBA::Any &val); protected: - /// Protected destructor to enforce proper memory management of this /// reference counted object. virtual ~TAO_PrivateConnectionPolicy (void); - }; //************************************************************************* @@ -258,7 +252,6 @@ public: static CORBA::Policy_ptr create (const CORBA::Any &val); protected: - /// Protected destructor to enforce proper memory management of this /// reference counted object. virtual ~TAO_PriorityBandedConnectionPolicy (void); @@ -269,7 +262,6 @@ protected: TAO_PriorityBandedConnectionPolicy (void); private: - /// Attribute. RTCORBA::PriorityBands priority_bands_; }; @@ -321,13 +313,11 @@ public: static CORBA::Policy_ptr create (const CORBA::Any &val); protected: - /// Protected destructor to enforce proper memory management of this /// reference counted object. virtual ~TAO_ServerProtocolPolicy (void); private: - /// Attribute. RTCORBA::ProtocolList protocols_; }; @@ -387,7 +377,6 @@ public: static CORBA::Policy_ptr create (const CORBA::Any &val); protected: - /// Protected destructor to enforce proper memory management of this /// reference counted object. virtual ~TAO_ClientProtocolPolicy (void); @@ -398,7 +387,6 @@ protected: TAO_ClientProtocolPolicy (void); private: - /// Attribute. RTCORBA::ProtocolList protocols_; }; @@ -456,7 +444,6 @@ public: CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr); protected: - /// Protected destructor to enforce proper memory management of this /// reference counted object. virtual ~TAO_TCP_Protocol_Properties (void); @@ -487,7 +474,6 @@ class TAO_RTCORBA_Export TAO_UnixDomain_Protocol_Properties public ::CORBA::LocalObject { public: - /// Constructor TAO_UnixDomain_Protocol_Properties (CORBA::Long send_buffer_size, CORBA::Long recv_buffer_size); @@ -520,13 +506,11 @@ public: CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr); protected: - /// Protected destructor to enforce proper memory management of this /// reference counted object. virtual ~TAO_UnixDomain_Protocol_Properties (void); private: - // = Attributes. CORBA::Long send_buffer_size_; CORBA::Long recv_buffer_size_; @@ -612,13 +596,11 @@ public: CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr); protected: - /// Protected destructor to enforce proper memory management of this /// reference counted object. virtual ~TAO_SharedMemory_Protocol_Properties (void); private: - // = Attributes. CORBA::Long send_buffer_size_; CORBA::Long recv_buffer_size_; @@ -668,7 +650,6 @@ public: CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr); protected: - /// Protected destructor to enforce proper memory management of this /// reference counted object. virtual ~TAO_UserDatagram_Protocol_Properties (void); @@ -734,7 +715,6 @@ public: CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr); protected: - /// Protected destructor to enforce proper memory management of this /// reference counted object. virtual ~TAO_StreamControl_Protocol_Properties (void); @@ -757,13 +737,11 @@ class TAO_RTCORBA_Export TAO_GIOP_Protocol_Properties public ::CORBA::LocalObject { public: - // = CDR encoding methods CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr); CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr); protected: - /// Protected destructor to enforce proper memory management of this /// reference counted object. virtual ~TAO_GIOP_Protocol_Properties (); @@ -777,7 +755,6 @@ protected: class TAO_RTCORBA_Export TAO_Protocol_Properties_Factory { public: - /** * Creates the proper transport ProtocolProperties subclass that matches * the IOP::ProfileId. @@ -799,7 +776,6 @@ public: static RTCORBA::ProtocolProperties *create_orb_protocol_property (IOP::ProfileId id); private: - TAO_Protocol_Properties_Factory (void); }; diff --git a/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.cpp b/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.cpp index 1b08b74c125..bbb61423afd 100644 --- a/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.cpp +++ b/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.cpp @@ -34,7 +34,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 @@ -52,7 +51,6 @@ namespace RTCORBA } - // TAO_IDL - Generated from // be\be_visitor_interface/any_op_cs.cpp:51 @@ -88,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 01d9fe52e01..cbe34fe82c0 100644 --- a/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.h +++ b/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.h @@ -39,13 +39,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 namespace RTCORBA { - // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 @@ -61,7 +59,6 @@ namespace RTCORBA // be\be_visitor_interface/any_op_ch.cpp:54 - namespace CORBA { TAO_RTCORBA_Export void operator<<= (::CORBA::Any &, RTCORBA::ProtocolProperties_ptr); // copying TAO_RTCORBA_Export void operator<<= (::CORBA::Any &, RTCORBA::ProtocolProperties_ptr *); // non-copying @@ -70,7 +67,6 @@ TAO_RTCORBA_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, RTCORBA:: TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.cpp b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.cpp index c7ae47b6ab6..ad4ac56622d 100644 --- a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.cpp +++ b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.cpp @@ -33,7 +33,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:72 @@ -56,7 +55,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_interface/interface_cs.cpp:60 diff --git a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h index f32303eb9ba..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_ @@ -177,7 +175,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_codegen.cpp:1209 diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp index 9902218d076..3506b34c9a8 100644 --- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp +++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp @@ -63,7 +63,6 @@ TAO_RT_Protocols_Hooks::init_hooks (TAO_ORB_Core *orb_core) TAO_OBJID_RTCURRENT); this->current_ = RTCORBA::Current::_narrow (object.in ()); - } RTCORBA::ProtocolProperties_ptr diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h index 6ed16be8b33..debe07866be 100644 --- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h +++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h @@ -34,7 +34,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_RTCORBA_Export TAO_RT_Protocols_Hooks : public TAO_Protocols_Hooks { public: - /// Constructor TAO_RT_Protocols_Hooks (void); @@ -137,7 +136,6 @@ protected: RTCORBA::ProtocolProperties_ptr protocol_properties); protected: - TAO_ORB_Core *orb_core_; // Save a reference to the priority mapping manager. diff --git a/TAO/tao/RTCORBA/RT_Stub.h b/TAO/tao/RTCORBA/RT_Stub.h index fe819b14900..9003aea8ad0 100644 --- a/TAO/tao/RTCORBA/RT_Stub.h +++ b/TAO/tao/RTCORBA/RT_Stub.h @@ -45,7 +45,6 @@ class TAO_PrivateConnectionPolicy; class TAO_RTCORBA_Export TAO_RT_Stub : public TAO_Stub { public: - TAO_RT_Stub (const char *repository_id, const TAO_MProfile &profiles, TAO_ORB_Core *orb_core); @@ -70,7 +69,6 @@ public: #endif /* TAO_HAS_CORBA_MESSAGING */ private: - /// Helper method used to parse the policies. void parse_policies (void); @@ -122,7 +120,6 @@ private: // = Disallow copying and assignment. TAO_RT_Stub (const TAO_RT_Stub &); TAO_RT_Stub &operator = (const TAO_RT_Stub &); - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp index fa7a572ad1f..59fc11aec4f 100644 --- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp +++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp @@ -24,7 +24,6 @@ TAO_RT_Thread_Lane_Resources_Manager::TAO_RT_Thread_Lane_Resources_Manager (TAO_ // Create the thread-pool manager. ACE_NEW (this->tp_manager_, TAO_Thread_Pool_Manager (orb_core)); - } TAO_RT_Thread_Lane_Resources_Manager::~TAO_RT_Thread_Lane_Resources_Manager (void) diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h index c5e88fbbcf1..913a5e11ae7 100644 --- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h +++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h @@ -40,7 +40,6 @@ class TAO_RTCORBA_Export TAO_RT_Thread_Lane_Resources_Manager : public TAO_Thread_Lane_Resources_Manager { public: - /// Constructor. TAO_RT_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core); @@ -65,7 +64,6 @@ public: /// @name Accessors // @{ - TAO_Thread_Lane_Resources &lane_resources (void); TAO_Thread_Lane_Resources &default_lane_resources (void); @@ -79,7 +77,6 @@ private: TAO_RT_Thread_Lane_Resources_Manager (const TAO_RT_Thread_Lane_Resources_Manager &); protected: - /// Default lane resources. TAO_Thread_Lane_Resources *default_lane_resources_; @@ -99,14 +96,11 @@ class TAO_RTCORBA_Export TAO_RT_Thread_Lane_Resources_Manager_Factory : public TAO_Thread_Lane_Resources_Manager_Factory { public: - /// Factory method. TAO_Thread_Lane_Resources_Manager *create_thread_lane_resources_manager (TAO_ORB_Core &core); - }; - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTCORBA, TAO_RT_Thread_Lane_Resources_Manager_Factory) ACE_FACTORY_DECLARE (TAO_RTCORBA, TAO_RT_Thread_Lane_Resources_Manager_Factory) diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h index a43e0d6398e..2d960bc4659 100644 --- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h +++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h @@ -87,7 +87,6 @@ private: * @c object_id_ is the @c TAO_Stub* of the object. */ long object_id_; - }; /*****************************************************************************/ diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp index 241f24e2501..4f7653dc8fd 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.cpp +++ b/TAO/tao/RTCORBA/Thread_Pool.cpp @@ -819,7 +819,6 @@ TAO_Thread_Pool_Manager::destroy_threadpool (RTCORBA::ThreadpoolId threadpool) // Delete the thread pool. delete tao_thread_pool; - } RTCORBA::ThreadpoolId diff --git a/TAO/tao/RTCORBA/Thread_Pool.h b/TAO/tao/RTCORBA/Thread_Pool.h index 1ce347b00e6..55058e5c6ae 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.h +++ b/TAO/tao/RTCORBA/Thread_Pool.h @@ -45,7 +45,6 @@ class TAO_RTCORBA_Export TAO_RT_New_Leader_Generator : public TAO_New_Leader_Generator { public: - /// Constructor. TAO_RT_New_Leader_Generator (TAO_Thread_Lane &lane); @@ -54,7 +53,6 @@ public: bool no_leaders_available (void); private: - /// Lane associated with this leader generator. TAO_Thread_Lane &lane_; }; @@ -70,7 +68,6 @@ private: class TAO_Thread_Pool_Threads : public ACE_Task_Base { public: - /// Constructor. TAO_Thread_Pool_Threads (TAO_Thread_Lane &lane); @@ -192,7 +189,6 @@ public: // @} private: - /// Validate lane's priority and map it to a native value. void validate_and_map_priority (void); @@ -256,7 +252,6 @@ class TAO_Thread_Pool_Manager; class TAO_RTCORBA_Export TAO_Thread_Pool { public: - /// Constructor (for pools without lanes). TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager, CORBA::ULong id, @@ -311,7 +306,6 @@ public: /// @name Accessors // @{ - TAO_Thread_Pool_Manager &manager () const; CORBA::ULong id () const; @@ -326,7 +320,6 @@ public: // @} private: - TAO_Thread_Pool_Manager &manager_; CORBA::ULong id_; @@ -355,7 +348,6 @@ class TAO_ORB_Core; class TAO_RTCORBA_Export TAO_Thread_Pool_Manager { public: - /// Constructor. TAO_Thread_Pool_Manager (TAO_ORB_Core &orb_core); @@ -411,10 +403,8 @@ public: // @} private: - /// @name Helpers // @{ - RTCORBA::ThreadpoolId create_threadpool_i (CORBA::ULong stacksize, CORBA::ULong static_threads, @@ -441,7 +431,6 @@ private: // @} private: - TAO_ORB_Core &orb_core_; THREAD_POOLS thread_pools_; diff --git a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h index 5acaf9a65c0..2709e4d3ec6 100644 --- a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h +++ b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h @@ -31,7 +31,6 @@ class TAO_RTPortableServer_Export TAO_RT_Object_Adapter_Factory : public TAO_Adapter_Factory { public: - /// Create adapter. virtual TAO_Adapter *create (TAO_ORB_Core *orb_core); }; diff --git a/TAO/tao/RTPortableServer/RT_POA.h b/TAO/tao/RTPortableServer/RT_POA.h index 97662624749..e173b82479a 100644 --- a/TAO/tao/RTPortableServer/RT_POA.h +++ b/TAO/tao/RTPortableServer/RT_POA.h @@ -48,7 +48,6 @@ class TAO_RTPortableServer_Export TAO_RT_POA , public virtual TAO_Regular_POA { public: - // RTCORBA specific methods CORBA::Object_ptr create_reference_with_priority (const char * intf, RTCORBA::Priority priority); @@ -189,7 +188,6 @@ public: void *thread_pool () const; protected: - /// Template method for creating new POA's of this type. virtual TAO_Root_POA *new_POA (const String &name, PortableServer::POAManager_ptr poa_manager, diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.h b/TAO/tao/RTPortableServer/RT_Policy_Validator.h index aa20a40f0d4..49e445e4dca 100644 --- a/TAO/tao/RTPortableServer/RT_Policy_Validator.h +++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.h @@ -55,7 +55,6 @@ public: TAO_Policy_Set &policies); protected: - /** * Validate that the policies in the specified set * are consistent and legal. Throw an appropriate exception 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..3bcdb7faf13 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) @@ -341,7 +340,6 @@ TAO_RTScheduler_Current_i::begin_scheduling_segment( this->name_ = CORBA::string_dup (name); this->sched_param_ = CORBA::Policy::_duplicate (sched_param); this->implicit_sched_param_ = CORBA::Policy::_duplicate (implicit_sched_param); - } else //Nested segment { @@ -427,7 +425,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 +572,6 @@ DTTask::svc () { try { - TAO_TSS_Resources *tss = TAO_TSS_Resources::instance (); @@ -602,7 +598,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/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp index a69afc6dccc..498863bed1b 100644 --- a/TAO/tao/RTScheduling/Request_Interceptor.cpp +++ b/TAO/tao/RTScheduling/Request_Interceptor.cpp @@ -66,7 +66,6 @@ Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri) TAOLIB_DEBUG ((LM_DEBUG, "No Scheduling Segment Context\n")); throw ::CORBA::INTERNAL (); - } // @@ Store implicit_sched_param in a var @@ -90,7 +89,6 @@ Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri) // Install new current in the ORB. //current->implementation (new_current); tss->rtscheduler_current_impl_ = new_current; - } // Scheduler populates the service context with @@ -407,7 +405,6 @@ Server_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) // Reset the previous current pointer. tss->rtscheduler_previous_current_impl_ = 0; - } else TAOLIB_DEBUG ((LM_DEBUG, "Send Reply Current is 0\n")); diff --git a/TAO/tao/Range_Checking_T.h b/TAO/tao/Range_Checking_T.h index 31eead48256..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 * @@ -143,7 +142,6 @@ struct range_checking throw CORBA::BAD_PARAM (); } }; - } // namespace details } // namespace TAO diff --git a/TAO/tao/Reactive_Connect_Strategy.h b/TAO/tao/Reactive_Connect_Strategy.h index ab5ea5c050f..9205b5c7db0 100644 --- a/TAO/tao/Reactive_Connect_Strategy.h +++ b/TAO/tao/Reactive_Connect_Strategy.h @@ -50,7 +50,6 @@ public: protected: virtual int wait_i (TAO_LF_Event *ch, TAO_Transport *, ACE_Time_Value *val); - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Remote_Invocation.h b/TAO/tao/Remote_Invocation.h index 708d217e811..8c5861f0dd2 100644 --- a/TAO/tao/Remote_Invocation.h +++ b/TAO/tao/Remote_Invocation.h @@ -77,7 +77,6 @@ namespace TAO int _tao_byte_order (); protected: - /// Initialize the @a spec. void init_target_spec (TAO_Target_Specification &spec, TAO_OutputCDR& output); 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/Resource_Factory.h b/TAO/tao/Resource_Factory.h index ab672ad3aec..afc7bf8d1eb 100644 --- a/TAO/tao/Resource_Factory.h +++ b/TAO/tao/Resource_Factory.h @@ -108,7 +108,6 @@ typedef ACE_Unbounded_Set_Iterator<TAO_Protocol_Item*> class TAO_Export TAO_Resource_Factory : public ACE_Service_Object { public: - enum Purging_Strategy { /// Least Recently Used @@ -262,7 +261,6 @@ protected: * without calling unnecessary functions. */ virtual int load_default_protocols (); - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Resume_Handle.h b/TAO/tao/Resume_Handle.h index 34ce7fd63d9..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, @@ -75,7 +74,6 @@ public: void handle_input_return_value_hook (int& return_value); private: - /// Our ORB Core. TAO_ORB_Core *orb_core_; diff --git a/TAO/tao/Server_Strategy_Factory.h b/TAO/tao/Server_Strategy_Factory.h index 88a4491ffa6..e2ada048d39 100644 --- a/TAO/tao/Server_Strategy_Factory.h +++ b/TAO/tao/Server_Strategy_Factory.h @@ -45,7 +45,6 @@ enum TAO_Demux_Strategy class TAO_Export TAO_Server_Strategy_Factory : public ACE_Service_Object { public: - struct Active_Object_Map_Creation_Parameters { /// Constructor. diff --git a/TAO/tao/Service_Callbacks.h b/TAO/tao/Service_Callbacks.h index 5eddb99847f..99bf850fa48 100644 --- a/TAO/tao/Service_Callbacks.h +++ b/TAO/tao/Service_Callbacks.h @@ -58,7 +58,6 @@ namespace IOP class TAO_Export TAO_Service_Callbacks { public: - enum Profile_Equivalence { EQUIVALENT, 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/Storable_FlatFileStream.h b/TAO/tao/Storable_FlatFileStream.h index 9083f558ffc..6c85aa0308c 100644 --- a/TAO/tao/Storable_FlatFileStream.h +++ b/TAO/tao/Storable_FlatFileStream.h @@ -33,7 +33,6 @@ namespace TAO class TAO_Export Storable_FlatFileStream : public Storable_Base { public: - Storable_FlatFileStream(const ACE_CString & file, const char * mode, bool use_backup = Storable_Base::use_backup_default, bool retry_on_ebadf = Storable_Base::retry_on_ebadf_default); diff --git a/TAO/tao/Strategies/COIOP_Acceptor.h b/TAO/tao/Strategies/COIOP_Acceptor.h index 97be5c0184f..ce27fb3d841 100644 --- a/TAO/tao/Strategies/COIOP_Acceptor.h +++ b/TAO/tao/Strategies/COIOP_Acceptor.h @@ -79,7 +79,6 @@ public: //@} protected: - /// Parse protocol specific options. virtual int parse_options (const char *options); @@ -95,7 +94,6 @@ protected: TAO_MProfile &mprofile, CORBA::Short priority); protected: - /** * Cache the information about the endpoints serviced by this * acceptor. diff --git a/TAO/tao/Strategies/COIOP_Connector.h b/TAO/tao/Strategies/COIOP_Connector.h index 9873329de74..03502b6bcd3 100644 --- a/TAO/tao/Strategies/COIOP_Connector.h +++ b/TAO/tao/Strategies/COIOP_Connector.h @@ -68,7 +68,6 @@ public: //@} protected: - /** * @name More TAO_Connector Methods * @@ -88,7 +87,6 @@ protected: int cancel_svc_handler (TAO_Connection_Handler * svc_handler); private: - /// Return the remote endpoint, a helper function TAO_COIOP_Endpoint *remote_endpoint (TAO_Endpoint *ep); }; diff --git a/TAO/tao/Strategies/COIOP_Profile.h b/TAO/tao/Strategies/COIOP_Profile.h index 85038ff65b5..0aabff5005c 100644 --- a/TAO/tao/Strategies/COIOP_Profile.h +++ b/TAO/tao/Strategies/COIOP_Profile.h @@ -76,7 +76,6 @@ public: void add_endpoint (TAO_COIOP_Endpoint *endp); protected: - /// Template methods. Please see tao/Profile.h for documentation. virtual int decode_profile (TAO_InputCDR& cdr); virtual void parse_string_i (const char *string); @@ -85,7 +84,6 @@ protected: virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile); protected: - /** * Head of this profile's list of endpoints. This endpoint is not * dynamically allocated because a profile always contains at least diff --git a/TAO/tao/Strategies/COIOP_Transport.h b/TAO/tao/Strategies/COIOP_Transport.h index a4d76e3b278..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); @@ -101,7 +100,6 @@ public: ACE_Time_Value *max_time_wait = 0); private: - /// The connection service handler used for accessing lower layer /// communication protocols. TAO_COIOP_Connection_Handler *connection_handler_; diff --git a/TAO/tao/Strategies/DIOP_Acceptor.h b/TAO/tao/Strategies/DIOP_Acceptor.h index bd64aee4f6d..41d02ece9d6 100644 --- a/TAO/tao/Strategies/DIOP_Acceptor.h +++ b/TAO/tao/Strategies/DIOP_Acceptor.h @@ -112,7 +112,6 @@ public: char *&host); protected: - /** * Helper method * Clear out 'addr' & 'specified_hostname' and initialize them based @@ -173,7 +172,6 @@ protected: TAO_MProfile &mprofile, CORBA::Short priority); protected: - /// Array of ACE_INET_Addr instances, each one corresponding to a /// given network interface. ACE_INET_Addr *addrs_; @@ -214,7 +212,6 @@ protected: private: // @@ Frank: From DIOP_Acceptor.h TAO_DIOP_Connection_Handler *connection_handler_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/DIOP_Endpoint.h b/TAO/tao/Strategies/DIOP_Endpoint.h index a4513c1dc8c..b902b1f1b6e 100644 --- a/TAO/tao/Strategies/DIOP_Endpoint.h +++ b/TAO/tao/Strategies/DIOP_Endpoint.h @@ -107,7 +107,6 @@ public: CORBA::UShort port (CORBA::UShort p); private: - /// Helper method for setting INET_Addr. int set (const ACE_INET_Addr &addr, int use_dotted_decimal_addresses); diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp index b362e145a27..d72faabb28b 100644 --- a/TAO/tao/Strategies/DIOP_Profile.cpp +++ b/TAO/tao/Strategies/DIOP_Profile.cpp @@ -438,7 +438,6 @@ TAO_DIOP_Profile::to_string () const digits [this->version_.minor], endp->host (), endp->port ()); - } ACE_OS::sprintf (buf + ACE_OS::strlen (buf), "%c%s", diff --git a/TAO/tao/Strategies/DIOP_Profile.h b/TAO/tao/Strategies/DIOP_Profile.h index 1946349b1e8..a9541717e1a 100644 --- a/TAO/tao/Strategies/DIOP_Profile.h +++ b/TAO/tao/Strategies/DIOP_Profile.h @@ -87,7 +87,6 @@ public: void add_endpoint (TAO_DIOP_Endpoint *endp); protected: - /// Template methods. Please see tao/Profile.h for documentation. virtual int decode_profile (TAO_InputCDR& cdr); virtual void parse_string_i (const char *string); @@ -96,7 +95,6 @@ protected: virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile); protected: - /** * Head of this profile's list of endpoints. This endpoint is not * dynamically allocated because a profile always contains at least diff --git a/TAO/tao/Strategies/DIOP_Transport.h b/TAO/tao/Strategies/DIOP_Transport.h index bce523006bb..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); @@ -100,7 +99,6 @@ public: ACE_Time_Value *max_time_wait = 0); private: - /// The connection service handler used for accessing lower layer /// communication protocols. TAO_DIOP_Connection_Handler *connection_handler_; diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h index 279a6783848..d95d4108d6f 100644 --- a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h +++ b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h @@ -72,7 +72,6 @@ protected: - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Strategies, TAO_OC_Endpoint_Selector_Factory) ACE_FACTORY_DECLARE (TAO_Strategies, TAO_OC_Endpoint_Selector_Factory) diff --git a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp index 656d238970b..1f1a862d93e 100644 --- a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp +++ b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp @@ -125,7 +125,6 @@ TAO_Optimized_Connection_Endpoint_Selector::select_endpoint } - // at this point, we do not have an existing transport, so we must // reset the profile list and try establishing connections via the // connector(s). diff --git a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h index ddff6b17932..7a01714c86f 100644 --- a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h +++ b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h @@ -60,7 +60,6 @@ public: virtual void select_endpoint (TAO::Profile_Transport_Resolver *, ACE_Time_Value *max_wait_time); private: - int check_profile (TAO_Profile *, TAO::Profile_Transport_Resolver *); diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.cpp b/TAO/tao/Strategies/SCIOP_Acceptor.cpp index c5264f5d01e..49819d0f4eb 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; @@ -297,9 +295,7 @@ TAO_SCIOP_Acceptor::open (TAO_ORB_Core *orb_core, // Set the length of the hostname 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 +355,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 +403,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 +800,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 +821,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_Acceptor.h b/TAO/tao/Strategies/SCIOP_Acceptor.h index 43aa383c072..6bf3e96aeca 100644 --- a/TAO/tao/Strategies/SCIOP_Acceptor.h +++ b/TAO/tao/Strategies/SCIOP_Acceptor.h @@ -161,7 +161,6 @@ protected: CORBA::Short priority); protected: - /// Array of ACE_INET_Addr instances, each one corresponding to a /// given network interface. ACE_INET_Addr *addrs_; diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp index c538040a969..463ca2f9dc0 100644 --- a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp @@ -421,7 +421,6 @@ TAO_SCIOP_Connection_Handler::set_tos (int tos) // On successful setting of TOS field. if (result == 0) this->dscp_codepoint_ = tos; - } return 0; diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.h b/TAO/tao/Strategies/SCIOP_Connection_Handler.h index 450c9c1abc3..0871585888b 100644 --- a/TAO/tao/Strategies/SCIOP_Connection_Handler.h +++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.h @@ -57,9 +57,7 @@ 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); /// Constructor. @@ -106,7 +104,6 @@ public: int set_dscp_codepoint (CORBA::Long dscp); protected: - /// Helper method needed by the set_dscp_codepoint () methods int set_tos (int tos); @@ -120,7 +117,6 @@ protected: //@} private: - /// Stores the type of service value. int dscp_codepoint_; }; diff --git a/TAO/tao/Strategies/SCIOP_Connector.h b/TAO/tao/Strategies/SCIOP_Connector.h index ee026db87bc..d3da4648cec 100644 --- a/TAO/tao/Strategies/SCIOP_Connector.h +++ b/TAO/tao/Strategies/SCIOP_Connector.h @@ -64,7 +64,6 @@ public: virtual char object_key_delimiter () const; public: - typedef TAO_Connect_Concurrency_Strategy<TAO_SCIOP_Connection_Handler> TAO_SCIOP_CONNECT_CONCURRENCY_STRATEGY; @@ -80,7 +79,6 @@ public: TAO_SCIOP_BASE_CONNECTOR; protected: - // = The TAO_Connector methods, please check the documentation on // Transport_Connector.h int set_validate_endpoint (TAO_Endpoint *ep); @@ -97,7 +95,6 @@ protected: int cancel_svc_handler (TAO_Connection_Handler * svc_handler); private: - /// Return the remote endpoint, a helper function TAO_SCIOP_Endpoint *remote_endpoint (TAO_Endpoint *ep); @@ -108,7 +105,6 @@ private: TAO_SCIOP_Endpoint *sciop_endpoint); private: - /// Our connect strategy TAO_SCIOP_CONNECT_STRATEGY connect_strategy_; diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.h b/TAO/tao/Strategies/SCIOP_Endpoint.h index 6bfe2f751fc..b4498b45e7f 100644 --- a/TAO/tao/Strategies/SCIOP_Endpoint.h +++ b/TAO/tao/Strategies/SCIOP_Endpoint.h @@ -110,7 +110,6 @@ public: const char *preferred_network () const; private: - /// Helper method for setting INET_Addr. int set (const ACE_INET_Addr &addr, int use_dotted_decimal_addresses); diff --git a/TAO/tao/Strategies/SCIOP_Profile.h b/TAO/tao/Strategies/SCIOP_Profile.h index d644f758d3b..c13e6606563 100644 --- a/TAO/tao/Strategies/SCIOP_Profile.h +++ b/TAO/tao/Strategies/SCIOP_Profile.h @@ -84,7 +84,6 @@ public: void add_endpoint (TAO_SCIOP_Endpoint *endp); protected: - /// Template methods. Please see Profile.h for the documentation. virtual int decode_profile (TAO_InputCDR &cdr); virtual int decode_endpoints (void); @@ -93,7 +92,6 @@ protected: virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile); protected: - /** * Head of this profile's list of endpoints. This endpoint is not * dynamically allocated because a profile always contains at least diff --git a/TAO/tao/Strategies/SCIOP_Transport.h b/TAO/tao/Strategies/SCIOP_Transport.h index 6b954f83bce..29258a9b221 100644 --- a/TAO/tao/Strategies/SCIOP_Transport.h +++ b/TAO/tao/Strategies/SCIOP_Transport.h @@ -46,13 +46,11 @@ class TAO_Acceptor; class TAO_Strategies_Export TAO_SCIOP_Transport : public TAO_Transport { public: - /// Constructor. TAO_SCIOP_Transport (TAO_SCIOP_Connection_Handler *handler, TAO_ORB_Core *orb_core); protected: - /// Destructor /** * Protected destructor to enforce proper memory management through @@ -66,7 +64,6 @@ protected: * details. */ //@{ - virtual ACE_Event_Handler * event_handler_i (void); virtual ssize_t send (iovec *iov, int iovcnt, @@ -103,7 +100,6 @@ public: //@} private: - /// Set the Bidirectional context info in the service context list void set_bidir_context_info (TAO_Operation_Details &opdetails); @@ -113,7 +109,6 @@ private: int get_listen_point (IIOP::ListenPointList &listen_point_list, TAO_Acceptor *acceptor); private: - /// The connection service handler used for accessing lower layer /// communication protocols. TAO_SCIOP_Connection_Handler *connection_handler_; diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h index b8d6247b732..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); @@ -85,7 +84,6 @@ public: int add_transport_to_cache (void); protected: - //@{ /** * @name TAO_Connection Handler overloads @@ -93,7 +91,6 @@ protected: virtual int release_os_resources (void); virtual int handle_write_ready (const ACE_Time_Value *timeout); //@} - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/SHMIOP_Connector.h b/TAO/tao/Strategies/SHMIOP_Connector.h index b2d802d7dc7..f9e42ff4e95 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.h +++ b/TAO/tao/Strategies/SHMIOP_Connector.h @@ -72,7 +72,6 @@ public: //@} public: - typedef TAO_Connect_Concurrency_Strategy<TAO_SHMIOP_Connection_Handler> TAO_SHMIOP_CONNECT_CONCURRENCY_STRATEGY; @@ -107,12 +106,10 @@ protected: //@} private: - /// Return the remote endpoint, a helper function TAO_SHMIOP_Endpoint *remote_endpoint (TAO_Endpoint *ep); private: - /// Local address. ACE_MEM_Addr address_; diff --git a/TAO/tao/Strategies/SHMIOP_Profile.h b/TAO/tao/Strategies/SHMIOP_Profile.h index fdf1f24a4b7..84294c9b455 100644 --- a/TAO/tao/Strategies/SHMIOP_Profile.h +++ b/TAO/tao/Strategies/SHMIOP_Profile.h @@ -87,7 +87,6 @@ public: void add_endpoint (TAO_SHMIOP_Endpoint *endp); protected: - /// Template methods. Please see tao/Profile.h for documentation. virtual int decode_profile (TAO_InputCDR& cdr); virtual void parse_string_i (const char *string); @@ -96,7 +95,6 @@ protected: virtual CORBA::Boolean do_is_equivalent (const TAO_Profile *other_profile); private: - /** * Head of this profile's list of endpoints. This endpoint is not * dynamically allocated because a profile always contains at least diff --git a/TAO/tao/Strategies/SHMIOP_Transport.cpp b/TAO/tao/Strategies/SHMIOP_Transport.cpp index 70834ff1af1..c75de9b6f65 100644 --- a/TAO/tao/Strategies/SHMIOP_Transport.cpp +++ b/TAO/tao/Strategies/SHMIOP_Transport.cpp @@ -263,7 +263,6 @@ TAO_SHMIOP_Transport::handle_input (TAO_Resume_Handle &rh, } - int TAO_SHMIOP_Transport::send_request (TAO_Stub *stub, TAO_ORB_Core *orb_core, diff --git a/TAO/tao/Strategies/SHMIOP_Transport.h b/TAO/tao/Strategies/SHMIOP_Transport.h index a03ed6361c4..eb52a8f8a7e 100644 --- a/TAO/tao/Strategies/SHMIOP_Transport.h +++ b/TAO/tao/Strategies/SHMIOP_Transport.h @@ -50,7 +50,6 @@ typedef ACE_Svc_Handler<ACE_MEM_STREAM, ACE_NULL_SYNCH> class TAO_Strategies_Export TAO_SHMIOP_Transport : public TAO_Transport { public: - /// Constructor. TAO_SHMIOP_Transport (TAO_SHMIOP_Connection_Handler *handler, TAO_ORB_Core *orb_core); diff --git a/TAO/tao/Strategies/UIOP_Acceptor.cpp b/TAO/tao/Strategies/UIOP_Acceptor.cpp index 2216712d8a4..c2b7cb5287b 100644 --- a/TAO/tao/Strategies/UIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/UIOP_Acceptor.cpp @@ -55,7 +55,6 @@ TAO_UIOP_Acceptor::create_profile (const TAO::ObjectKey &object_key, return this->create_shared_profile (object_key, mprofile, priority); - } int diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.h b/TAO/tao/Strategies/UIOP_Connection_Handler.h index fd8079e5121..8e0b92a8e9c 100644 --- a/TAO/tao/Strategies/UIOP_Connection_Handler.h +++ b/TAO/tao/Strategies/UIOP_Connection_Handler.h @@ -43,9 +43,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Strategies_Export TAO_UIOP_Connection_Handler : public TAO_UIOP_SVC_HANDLER, public TAO_Connection_Handler { - public: - TAO_UIOP_Connection_Handler (ACE_Thread_Manager* t = 0); /// Constructor. @@ -82,7 +80,6 @@ public: int add_transport_to_cache (void); protected: - //@{ /** * @name TAO_Connection Handler overloads diff --git a/TAO/tao/Strategies/UIOP_Connector.h b/TAO/tao/Strategies/UIOP_Connector.h index c16b3a412fb..88be6638ccd 100644 --- a/TAO/tao/Strategies/UIOP_Connector.h +++ b/TAO/tao/Strategies/UIOP_Connector.h @@ -45,7 +45,6 @@ class TAO_Endpoint; class TAO_Strategies_Export TAO_UIOP_Connector : public TAO_Connector { public: - /** * Constructor. * @@ Do we want to pass in the tag here or should it be statically @@ -78,7 +77,6 @@ public: //@} public: - typedef TAO_Connect_Concurrency_Strategy<TAO_UIOP_Connection_Handler> TAO_UIOP_CONNECT_CONCURRENCY_STRATEGY; @@ -94,7 +92,6 @@ public: TAO_UIOP_BASE_CONNECTOR; protected: - /** * @name More TAO_Connector methods * @@ -112,12 +109,10 @@ protected: //@} private: - /// Return the remote endpoint, a helper function TAO_UIOP_Endpoint *remote_endpoint (TAO_Endpoint *ep); private: - /// Our connect strategy TAO_UIOP_CONNECT_STRATEGY connect_strategy_; diff --git a/TAO/tao/Strategies/UIOP_Endpoint.h b/TAO/tao/Strategies/UIOP_Endpoint.h index f1d99a76ec7..72cc3e777f8 100644 --- a/TAO/tao/Strategies/UIOP_Endpoint.h +++ b/TAO/tao/Strategies/UIOP_Endpoint.h @@ -78,7 +78,6 @@ public: const char *rendezvous_point () const; private: - /// Cached instance of <ACE_UNIX_Addr> for use in making /// invocations, etc. ACE_UNIX_Addr object_addr_; diff --git a/TAO/tao/Strategies/UIOP_Profile.h b/TAO/tao/Strategies/UIOP_Profile.h index baa42e7b683..645fb892ee7 100644 --- a/TAO/tao/Strategies/UIOP_Profile.h +++ b/TAO/tao/Strategies/UIOP_Profile.h @@ -86,7 +86,6 @@ public: void add_endpoint (TAO_UIOP_Endpoint *endp); protected: - /// Protected template methods. Please see documentation in /// Profile.h for details. virtual int decode_profile (TAO_InputCDR& cdr); diff --git a/TAO/tao/Strategies/UIOP_Transport.h b/TAO/tao/Strategies/UIOP_Transport.h index 9e1454efb2f..8441cb44d95 100644 --- a/TAO/tao/Strategies/UIOP_Transport.h +++ b/TAO/tao/Strategies/UIOP_Transport.h @@ -48,7 +48,6 @@ typedef ACE_Svc_Handler<ACE_LSOCK_STREAM, ACE_NULL_SYNCH> class TAO_Strategies_Export TAO_UIOP_Transport : public TAO_Transport { public: - /// Constructor. TAO_UIOP_Transport (TAO_UIOP_Connection_Handler *handler, TAO_ORB_Core *orb_core); @@ -62,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); @@ -93,7 +91,6 @@ public: //@} private: - /// The connection service handler used for accessing lower layer /// communication protocols. TAO_UIOP_Connection_Handler *connection_handler_; diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp index 0abba74c236..3dc066cece3 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); @@ -134,7 +133,6 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv) ACE_TEXT("TAO_Advanced_Resource_Factory::init - ") ACE_TEXT("-ORBReactorRegistry no longer supported\n")), -1); - } else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBReactorLock")))) @@ -377,7 +375,6 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void) #endif /* TAO_HAS_COIOP && TAO_HAS_COIOP != 0 */ return 0; - } for (; factory != end; factory++) @@ -406,7 +403,6 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void) } - TAO_ProtocolFactorySet * TAO_Advanced_Resource_Factory::get_protocol_factories (void) { diff --git a/TAO/tao/Strategies/advanced_resource.h b/TAO/tao/Strategies/advanced_resource.h index e09dd3c0038..cd4bc8ba001 100644 --- a/TAO/tao/Strategies/advanced_resource.h +++ b/TAO/tao/Strategies/advanced_resource.h @@ -98,7 +98,6 @@ public: virtual TAO_LF_Strategy *create_lf_strategy (void); protected: - /// Obtain the reactor implementation virtual ACE_Reactor_Impl *allocate_reactor_impl () const; @@ -127,7 +126,6 @@ protected: Allocator_Lock_Type ami_response_handler_allocator_lock_type_; virtual int load_default_protocols (void); - }; static TAO_Resource_Factory_Changer TAO_changer; diff --git a/TAO/tao/String_Const_Sequence_Element_T.h b/TAO/tao/String_Const_Sequence_Element_T.h index d0a2d3c9f1d..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 { @@ -70,7 +69,6 @@ private: const_value_type const * element_; CORBA::Boolean const release_; }; - } // namespace details } // namespace CORBA diff --git a/TAO/tao/String_Sequence_Element_T.h b/TAO/tao/String_Sequence_Element_T.h index 1905bba57ad..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_); @@ -139,7 +137,6 @@ private: value_type * element_; CORBA::Boolean release_; }; - } // namespace details } // namespace CORBA diff --git a/TAO/tao/String_Traits_Base_T.h b/TAO/tao/String_Traits_Base_T.h index 3f6b63454e1..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 { @@ -101,7 +100,6 @@ struct string_traits_base<CORBA::WChar> return CORBA::wstring_alloc (len); } }; - } // namespace details } // namespace TAO diff --git a/TAO/tao/String_Traits_T.h b/TAO/tao/String_Traits_T.h index d34fb03b959..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 { @@ -77,7 +76,6 @@ struct string_traits , public string_traits_decorator<charT,string_traits<charT,dummy> > { }; - } // namespace details } // namespace CORBA diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h index feaf10c6ce2..79f061727a7 100644 --- a/TAO/tao/Stub.h +++ b/TAO/tao/Stub.h @@ -271,7 +271,6 @@ public: bool forwarded_on_exception () const; protected: - /// Destructor is to be called only through _decr_refcnt() to /// enforce proper reference counting. virtual ~TAO_Stub (); @@ -306,7 +305,6 @@ private: int get_profile_ior_info (TAO_MProfile &profile, IOP::IOR *&ior_info); private: - // = Disallow copy construction and assignment. TAO_Stub (const TAO_Stub &); TAO_Stub &operator = (const TAO_Stub &); diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp index ee073e085d3..1d838b88888 100644 --- a/TAO/tao/Synch_Invocation.cpp +++ b/TAO/tao/Synch_Invocation.cpp @@ -394,7 +394,6 @@ namespace TAO this->stub()->orb_core ()->service_raise_comm_failure ( this->details_.request_service_context ().service_info (), this->resolver_.profile ()); - } catch (const ::CORBA::Exception&) { diff --git a/TAO/tao/Synch_Invocation.h b/TAO/tao/Synch_Invocation.h index d7fdc168986..2bbabd9ddc0 100644 --- a/TAO/tao/Synch_Invocation.h +++ b/TAO/tao/Synch_Invocation.h @@ -118,7 +118,6 @@ namespace TAO * This method returns an exception when there is an error. */ Invocation_Status check_reply_status (TAO_Synch_Reply_Dispatcher &rd); - }; /** @@ -186,7 +185,6 @@ namespace TAO Invocation_Base * const invocation_; Invocation_Status status_; }; - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Synch_Queued_Message.cpp b/TAO/tao/Synch_Queued_Message.cpp index fb5122c0aea..4357b01f644 100644 --- a/TAO/tao/Synch_Queued_Message.cpp +++ b/TAO/tao/Synch_Queued_Message.cpp @@ -160,7 +160,6 @@ TAO_Synch_Queued_Message::destroy () { ACE_DES_FREE_THIS (this->allocator_->free, TAO_Synch_Queued_Message); - } else // global release.. { 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/SystemException.h b/TAO/tao/SystemException.h index 70ce210ec9a..21909c5383b 100644 --- a/TAO/tao/SystemException.h +++ b/TAO/tao/SystemException.h @@ -80,7 +80,6 @@ namespace CORBA class TAO_Export SystemException : public Exception { public: - /// Copy constructor. /** * @note This constructor should be protected, but VC7.1 at @@ -140,7 +139,6 @@ namespace CORBA virtual CORBA::Exception *_tao_duplicate () const; protected: - /// Default constructor. SystemException (); diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp index 2bdb10bdcbe..fe76c2aec9b 100644 --- a/TAO/tao/TAO_Internal.cpp +++ b/TAO/tao/TAO_Internal.cpp @@ -408,7 +408,6 @@ TAO::ORB::open_services (ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> pcfg, ACE_TEXT ("TAO (%P|%t) - The default ") ACE_TEXT ("ORB must have completed the global ") ACE_TEXT ("initialization...\n"))); - } else { @@ -572,7 +571,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_Server_Request.cpp b/TAO/tao/TAO_Server_Request.cpp index 6a3853353e3..8f5ba8ab4c7 100644 --- a/TAO/tao/TAO_Server_Request.cpp +++ b/TAO/tao/TAO_Server_Request.cpp @@ -533,7 +533,6 @@ TAO_ServerRequest::send_cached_reply (CORBA::OctetSeq &s) TAOLIB_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ServerRequest::send_cached_reply, ") ACE_TEXT ("could not make cached reply\n"))); - } /// Append reply here.... diff --git a/TAO/tao/TAO_Server_Request.h b/TAO/tao/TAO_Server_Request.h index db1720972d3..b29202db42d 100644 --- a/TAO/tao/TAO_Server_Request.h +++ b/TAO/tao/TAO_Server_Request.h @@ -80,7 +80,6 @@ class TAO_Operation_Details; class TAO_Export TAO_ServerRequest { public: - /// Declare FW_Server_Request_Wrapper a friend /// This friendship makes the FW_Server_Request_Wrapper be able to /// clone the TAO_ServerRequest. 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/TAO_Singleton_Manager.h b/TAO/tao/TAO_Singleton_Manager.h index e00a42fc9b8..a3b1ed59802 100644 --- a/TAO/tao/TAO_Singleton_Manager.h +++ b/TAO/tao/TAO_Singleton_Manager.h @@ -117,7 +117,6 @@ public: const char* name); protected: - /// Force allocation on the heap. //@{ TAO_Singleton_Manager (void); @@ -152,7 +151,6 @@ private: /// Lock that is used to guard internal structures. TAO_SYNCH_RECURSIVE_MUTEX *internal_lock_; #endif /* ACE_MT_SAFE */ - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/TSS_Resources.h b/TAO/tao/TSS_Resources.h index 645a612fe9c..eb2b7950d44 100644 --- a/TAO/tao/TSS_Resources.h +++ b/TAO/tao/TSS_Resources.h @@ -45,7 +45,6 @@ namespace TAO class TAO_Export TAO_TSS_Resources { public: - /// Constructor TAO_TSS_Resources (); @@ -56,7 +55,6 @@ public: static TAO_TSS_Resources * instance (); private: - /// Do not copy TSS resources //@{ TAO_TSS_Resources (const TAO_TSS_Resources&); @@ -64,7 +62,6 @@ private: //@} public: - /** * Points to structure containing state for the current upcall * context in this thread. Note that it does not come from the diff --git a/TAO/tao/Tagged_Profile.h b/TAO/tao/Tagged_Profile.h index 0b41fc1ec9c..978c87d8bff 100644 --- a/TAO/tao/Tagged_Profile.h +++ b/TAO/tao/Tagged_Profile.h @@ -42,7 +42,6 @@ namespace TAO class TAO_Export TAO_Tagged_Profile { public: - /// Declare FW_Server_Request_Wrapper a friend /// This friendship makes the FW_Server_Request_Wrapper be able to /// clone the TAO_Tagged_Profile data member in TAO_ServerRequest. diff --git a/TAO/tao/Thread_Lane_Resources.h b/TAO/tao/Thread_Lane_Resources.h index eed52ccf519..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 (); /** @@ -147,7 +146,6 @@ public: //@} private: - /// Checks if the acceptor registry has been created. int has_acceptor_registry_been_created () const; diff --git a/TAO/tao/Thread_Lane_Resources_Manager.h b/TAO/tao/Thread_Lane_Resources_Manager.h index eb9f72a05f6..2f509154f6d 100644 --- a/TAO/tao/Thread_Lane_Resources_Manager.h +++ b/TAO/tao/Thread_Lane_Resources_Manager.h @@ -99,7 +99,6 @@ public: /// Factory method. virtual TAO_Thread_Lane_Resources_Manager * create_thread_lane_resources_manager (TAO_ORB_Core &core) = 0; - }; TAO_END_VERSIONED_NAMESPACE_DECL 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 b3a75bc27cb..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 * @@ -38,11 +37,9 @@ namespace TAO class TAO_TkResource_Export TkResource_Factory : public GUIResource_Factory { public: - TkResource_Factory (); protected: - /// Create or obtain current reactor implementation virtual ACE_Reactor_Impl *reactor_impl (void); diff --git a/TAO/tao/TkResource/TkResource_Loader.h b/TAO/tao/TkResource/TkResource_Loader.h index a62e74d2435..bb2dfecb152 100644 --- a/TAO/tao/TkResource/TkResource_Loader.h +++ b/TAO/tao/TkResource/TkResource_Loader.h @@ -43,11 +43,9 @@ namespace TAO class TAO_TkResource_Export TkResource_Loader { public: - TkResource_Loader (void); virtual ~TkResource_Loader (void); - }; } diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp index 8fbeea0093d..a63904aef9f 100644 --- a/TAO/tao/Transport.cpp +++ b/TAO/tao/Transport.cpp @@ -1696,7 +1696,6 @@ TAO_Transport::handle_input (TAO_Resume_Handle &rh, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input, ") ACE_TEXT ("error while parsing the head of the queue\n"), this->id())); - } return -1; } @@ -1827,7 +1826,6 @@ TAO_Transport::consolidate_process_message (TAO_Queued_Data *q_data, } TAO_Queued_Data::release (q_data); - } return 0; @@ -2109,7 +2107,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..7f40300e128 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; @@ -90,7 +89,6 @@ namespace TAO // The ORB's TSS slot id for the Transport ptr size_t tss_slot_id_; }; - } } diff --git a/TAO/tao/TransportCurrent/Current_Loader.h b/TAO/tao/TransportCurrent/Current_Loader.h index 58ee8590810..b2470e88e70 100644 --- a/TAO/tao/TransportCurrent/Current_Loader.h +++ b/TAO/tao/TransportCurrent/Current_Loader.h @@ -43,7 +43,6 @@ namespace TAO /// Protected destructor to enforce reference counting discipline virtual ~Current_Loader (void); }; - } } 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/Current_ORBInitializer_Base.h b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h index f47317b4790..8e78130a616 100644 --- a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h +++ b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h @@ -51,7 +51,6 @@ namespace TAO Current_ORBInitializer_Base (const Current_ORBInitializer_Base &) = delete; Current_ORBInitializer_Base &operator = (const Current_ORBInitializer_Base &) = delete; }; - } /* namespace Transport */ } /* namespace TAO */ 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/Transport_Connector.h b/TAO/tao/Transport_Connector.h index f0600e15df1..d4e426753a0 100644 --- a/TAO/tao/Transport_Connector.h +++ b/TAO/tao/Transport_Connector.h @@ -55,7 +55,6 @@ namespace TAO class TAO_Export TAO_Connector { public: - /// Default constructor. TAO_Connector (CORBA::ULong tag); diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp index ee4e1641e7e..d6bc8c45860 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp @@ -52,7 +52,6 @@ namespace TCF CORBA::TypeCode_var, field_array_type> recursive_typecode_type; - } // End namespace Struct namespace Union @@ -567,7 +566,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 16d9c9a8382..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 { @@ -48,7 +47,6 @@ struct unbounded_array_allocation_traits delete[] buffer; } }; - } // namespace details } // namespace TAO 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 cbbb8a59336..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 { @@ -109,7 +108,6 @@ public: private: implementation_type impl_; }; - } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Unbounded_Octet_Sequence_T.h b/TAO/tao/Unbounded_Octet_Sequence_T.h index 5784b3b30c8..dc7a3bf1053 100644 --- a/TAO/tao/Unbounded_Octet_Sequence_T.h +++ b/TAO/tao/Unbounded_Octet_Sequence_T.h @@ -311,7 +311,6 @@ private: mutable CORBA::Boolean release_; ACE_Message_Block* mb_; }; - } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Unbounded_Reference_Allocation_Traits_T.h b/TAO/tao/Unbounded_Reference_Allocation_Traits_T.h index 518e876a26a..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 { @@ -77,7 +76,6 @@ struct unbounded_reference_allocation_traits delete[] buffer; } }; - } // namespace details } // namespace TAO diff --git a/TAO/tao/Unbounded_Value_Allocation_Traits_T.h b/TAO/tao/Unbounded_Value_Allocation_Traits_T.h index ac23b74cad0..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 { @@ -48,7 +47,6 @@ struct unbounded_value_allocation_traits delete[] buffer; } }; - } // namespace details } // namespace TAO diff --git a/TAO/tao/Unbounded_Value_Sequence_T.h b/TAO/tao/Unbounded_Value_Sequence_T.h index 3d6893254a3..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 { @@ -91,7 +90,6 @@ public: private: implementation_type impl_; }; - } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/UserException.h b/TAO/tao/UserException.h index 6869abd5a47..ee49bb2298d 100644 --- a/TAO/tao/UserException.h +++ b/TAO/tao/UserException.h @@ -39,7 +39,6 @@ namespace CORBA class TAO_Export UserException : public Exception { public: - /// Copy constructor. UserException (UserException const &rhs); @@ -72,7 +71,6 @@ namespace CORBA /// Default constructor. UserException (); }; - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Utils/Encodable.h b/TAO/tao/Utils/Encodable.h index ab69d949ca1..33b18e28585 100644 --- a/TAO/tao/Utils/Encodable.h +++ b/TAO/tao/Utils/Encodable.h @@ -41,7 +41,6 @@ class TAO_InputCDR; class TAO_UTILS_Export TAO_Encodable { public: - virtual ~TAO_Encodable (void); /// Encodes the object implementing this method into a CDR stream. 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..2a7f9d4e763 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 * @@ -50,7 +49,6 @@ namespace TAO PortableServer::ServantBase, Implicit_Deactivation_Functor> Implicit_Deactivator; - } // namespace Utils } // namespace TAO diff --git a/TAO/tao/Utils/ORB_Destroyer.h b/TAO/tao/Utils/ORB_Destroyer.h index f58ac29d3c3..e6febb40611 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 * @@ -49,7 +48,6 @@ namespace TAO CORBA::ORB, ORB_Destroyer_Functor> ORB_Destroyer; - } // namespace Utils } // namespace TAO diff --git a/TAO/tao/Utils/PolicyList_Destroyer.h b/TAO/tao/Utils/PolicyList_Destroyer.h index 4c0bb923ff5..821ba11dbb7 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 * @@ -37,7 +36,6 @@ namespace TAO PolicyList_Destroyer(CORBA::ULong length_hint); ~PolicyList_Destroyer() throw (); }; - } // namespace Utils } // namespace TAO diff --git a/TAO/tao/Utils/RIR_Narrow.h b/TAO/tao/Utils/RIR_Narrow.h index 7e1911c0dd4..be31d6efa04 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 * @@ -53,7 +52,6 @@ namespace TAO private: static _ptr_type narrow_object (CORBA::Object_ptr object); }; - } // namespace Utils } // namespace TAO diff --git a/TAO/tao/Value_Traits_T.h b/TAO/tao/Value_Traits_T.h index 91a253774ca..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 { @@ -60,7 +59,6 @@ struct value_traits copy_range(begin, end, dst); } }; - } // namespace details } // namespace CORBA diff --git a/TAO/tao/Valuetype/Bounded_Valuetype_Allocation_Traits_T.h b/TAO/tao/Valuetype/Bounded_Valuetype_Allocation_Traits_T.h index 9a5027d8624..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 { @@ -63,7 +62,6 @@ struct bounded_valuetype_allocation_traits return MAX; } }; - } // namespace details } // namespace TAO 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 e080b743554..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 { @@ -69,7 +68,6 @@ struct unbounded_valuetype_allocation_traits delete[] buffer; } }; - } // namespace details } // namespace TAO 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/ValueFactory.h b/TAO/tao/Valuetype/ValueFactory.h index ddfafde6f4c..3c59c8b833d 100644 --- a/TAO/tao/Valuetype/ValueFactory.h +++ b/TAO/tao/Valuetype/ValueFactory.h @@ -70,7 +70,6 @@ namespace CORBA /// Reference counter. std::atomic<uint32_t> refcount_; }; - } // End CORBA namespace namespace TAO diff --git a/TAO/tao/Valuetype/ValueFactory_Map.h b/TAO/tao/Valuetype/ValueFactory_Map.h index b604207f16a..f034accba9f 100644 --- a/TAO/tao/Valuetype/ValueFactory_Map.h +++ b/TAO/tao/Valuetype/ValueFactory_Map.h @@ -68,7 +68,6 @@ public: static TAO_ValueFactory_Map * instance (void); private: - /// The hash table data structure. typedef ACE_Hash_Map_Manager_Ex<const char *, CORBA::ValueFactory, diff --git a/TAO/tao/Valuetype/Value_VarOut_T.h b/TAO/tao/Valuetype/Value_VarOut_T.h index 0a5e67ec072..b4eba819bb8 100644 --- a/TAO/tao/Valuetype/Value_VarOut_T.h +++ b/TAO/tao/Valuetype/Value_VarOut_T.h @@ -74,7 +74,6 @@ public: T * ptr () const; private: - // Prevent widening assignment. TAO_Value_Var_T (const TAO_Base_var &); void operator= (const TAO_Base_var &); diff --git a/TAO/tao/Valuetype/Valuetype_Sequence_Element_T.h b/TAO/tao/Valuetype/Valuetype_Sequence_Element_T.h index b51a05f0770..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 { @@ -116,7 +115,6 @@ private: value_type * element_; CORBA::Boolean release_; }; - } // namespace details } // namespace CORBA diff --git a/TAO/tao/Valuetype/Valuetype_Traits_Base_T.h b/TAO/tao/Valuetype/Valuetype_Traits_Base_T.h index 6cceaca1a26..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 { @@ -46,7 +45,6 @@ struct valuetype_traits_base return nil(); } }; - } // namespace details } // namespace TAO diff --git a/TAO/tao/Valuetype/Valuetype_Traits_T.h b/TAO/tao/Valuetype/Valuetype_Traits_T.h index 2e9e581b4b6..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 { @@ -82,7 +81,6 @@ struct valuetype_traits typedef object_type const * const_value_type; typedef object_t_var object_type_var; }; - } // namespace details } // namespace CORBA diff --git a/TAO/tao/Wait_On_LF_No_Upcall.h b/TAO/tao/Wait_On_LF_No_Upcall.h index 5741902c931..bbfcbeb0073 100644 --- a/TAO/tao/Wait_On_LF_No_Upcall.h +++ b/TAO/tao/Wait_On_LF_No_Upcall.h @@ -55,7 +55,6 @@ namespace TAO /*! @copydoc TAO_Wait_Strategy::defer_upcall() */ virtual int defer_upcall (ACE_Event_Handler*); - }; } diff --git a/TAO/tao/Wait_On_Leader_Follower.h b/TAO/tao/Wait_On_Leader_Follower.h index cca3a7fb3d0..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); @@ -60,7 +59,6 @@ public: /*! @copydoc TAO_Wait_Strategy::can_process_upcalls() */ virtual bool can_process_upcalls () const; - }; TAO_END_VERSIONED_NAMESPACE_DECL 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 43a1f850746..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 @@ -62,7 +61,6 @@ namespace CORBA class TAO_Export WrongTransaction : public CORBA::UserException { public: - WrongTransaction (); WrongTransaction (const WrongTransaction &); ~WrongTransaction (); 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 5043ca039fd..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 * @@ -45,7 +44,6 @@ namespace TAO virtual ACE_Reactor_Impl *reactor_impl (void); private: - /// Reactor created by this factory. ACE_XtReactor *reactor_impl_; 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/ZIOP/ZIOP.h b/TAO/tao/ZIOP/ZIOP.h index 31d5078710e..0b49352c961 100644 --- a/TAO/tao/ZIOP/ZIOP.h +++ b/TAO/tao/ZIOP/ZIOP.h @@ -39,7 +39,6 @@ class TAO_ServerRequest; class TAO_ZIOP_Export TAO_ZIOP_Loader : public TAO_ZIOP_Adapter { public: - /// Constructor TAO_ZIOP_Loader (void); @@ -64,7 +63,6 @@ public: static const char * ziop_compressorid_name (::Compression::CompressorId st); private: - /// Set to true after init is called. bool initialized_; diff --git a/TAO/tao/ZIOP/ZIOP_ORBInitializer.h b/TAO/tao/ZIOP/ZIOP_ORBInitializer.h index 87fcff4fbde..1f723f86404 100644 --- a/TAO/tao/ZIOP/ZIOP_ORBInitializer.h +++ b/TAO/tao/ZIOP/ZIOP_ORBInitializer.h @@ -58,7 +58,6 @@ public: //@} private: - /// Register policy factories. void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/tao/ZIOP/ZIOP_Policy_i.h b/TAO/tao/ZIOP/ZIOP_Policy_i.h index 433926cf9c9..8c6e3cba148 100644 --- a/TAO/tao/ZIOP/ZIOP_Policy_i.h +++ b/TAO/tao/ZIOP/ZIOP_Policy_i.h @@ -116,7 +116,6 @@ public: CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr); private: - /// The attribute ::CORBA::Boolean value_; }; @@ -131,7 +130,6 @@ class CompressionLowValuePolicy , public virtual ::CORBA::LocalObject { public: - /// Constructor. CompressionLowValuePolicy (const ::CORBA::ULong val); @@ -153,7 +151,6 @@ public: virtual TAO_Cached_Policy_Type _tao_cached_type () const; private: - /// The attribute ::CORBA::ULong value_; }; @@ -168,7 +165,6 @@ class CompressionMinRatioPolicy , public virtual ::CORBA::LocalObject { public: - /// Constructor. CompressionMinRatioPolicy (const ::Compression::CompressionRatio val); @@ -189,7 +185,6 @@ public: virtual TAO_Cached_Policy_Type _tao_cached_type () const; private: - /// The attribute ::Compression::CompressionRatio value_; }; diff --git a/TAO/tao/ZIOP/ZIOP_Stub.h b/TAO/tao/ZIOP/ZIOP_Stub.h index 97c454197f8..a5693bc532b 100644 --- a/TAO/tao/ZIOP/ZIOP_Stub.h +++ b/TAO/tao/ZIOP/ZIOP_Stub.h @@ -45,7 +45,6 @@ namespace TAO class TAO_ZIOP_Export TAO_ZIOP_Stub : public TAO_Stub { public: - TAO_ZIOP_Stub (const char *repository_id, const TAO_MProfile &profiles, TAO_ORB_Core *orb_core); @@ -62,7 +61,6 @@ public: CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type); private: - /// Helper method used to parse the policies. void parse_policies (void); diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index e51280730e5..c702393d69c 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -1129,7 +1129,6 @@ TAO_Default_Resource_Factory::create_fragmentation_strategy ( ACE_NEW_RETURN (strategy, TAO_Null_Fragmentation_Strategy, strategy); - } else { 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/tao/params.h b/TAO/tao/params.h index 8e85b937e0f..13b01526c74 100644 --- a/TAO/tao/params.h +++ b/TAO/tao/params.h @@ -51,7 +51,6 @@ typedef ACE_Unbounded_Queue_Const_Iterator<ACE_CString> TAO_EndpointSetIterator; class TAO_Export TAO_ORB_Parameters { public: - typedef ACE_Array_Map<ACE_CString, ACE_CString> endpoints_map_type; /// Constructor. diff --git a/TAO/tao/target_specification.h b/TAO/tao/target_specification.h index b4dc72e825b..398ef5c1064 100644 --- a/TAO/tao/target_specification.h +++ b/TAO/tao/target_specification.h @@ -54,7 +54,6 @@ namespace TAO class TAO_Export TAO_Target_Specification { public: - /// Ctor TAO_Target_Specification (); enum TAO_Target_Address diff --git a/TAO/tao/varbase.h b/TAO/tao/varbase.h index 6cb0b769609..300ac7e1fcd 100644 --- a/TAO/tao/varbase.h +++ b/TAO/tao/varbase.h @@ -34,10 +34,8 @@ public: TAO_Base_var () {} private: - TAO_Base_var (const TAO_Base_var &); TAO_Base_var & operator= (const TAO_Base_var &); - }; TAO_END_VERSIONED_NAMESPACE_DECL 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/AMI_Timeouts/client.cpp b/TAO/tests/AMI_Timeouts/client.cpp index 0a9b2bf4c59..401f345bb5a 100644 --- a/TAO/tests/AMI_Timeouts/client.cpp +++ b/TAO/tests/AMI_Timeouts/client.cpp @@ -127,7 +127,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->destroy (); ACE_DEBUG ((LM_DEBUG, "ORB finished\n")); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/AMI_Timeouts/timeout_client.cpp b/TAO/tests/AMI_Timeouts/timeout_client.cpp index 1afcd61030d..d9416804bc3 100644 --- a/TAO/tests/AMI_Timeouts/timeout_client.cpp +++ b/TAO/tests/AMI_Timeouts/timeout_client.cpp @@ -161,7 +161,6 @@ TimeoutClient::send (CORBA::Boolean async, // Trap this exception and continue... ACE_DEBUG ((LM_DEBUG, " timeout ")); - } // get rid of the policy, you created before. diff --git a/TAO/tests/Alt_Mapping/client.cpp b/TAO/tests/Alt_Mapping/client.cpp index 681c105de4f..b7751a8c753 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, @@ -106,7 +105,6 @@ Alt_Mapping_Client<T>::run_sii_test (void) "run_sii_test exception in iteration %d", i)); goto loop_around; - } if (!this->test_object_->check_validity ()) diff --git a/TAO/tests/Alt_Mapping/driver.cpp b/TAO/tests/Alt_Mapping/driver.cpp index da6e7f6e0ff..829a8834d05 100644 --- a/TAO/tests/Alt_Mapping/driver.cpp +++ b/TAO/tests/Alt_Mapping/driver.cpp @@ -91,7 +91,6 @@ Driver::init (int argc, ACE_TCHAR **argv) ACE_OS::strcpy (exception_string,"Param_Test::_narrow () failed."); this->objref_ = Alt_Mapping::_narrow (temp.in()); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/Alt_Mapping/ub_struct_seq.cpp b/TAO/tests/Alt_Mapping/ub_struct_seq.cpp index 95673f39d4b..771849b9cd3 100644 --- a/TAO/tests/Alt_Mapping/ub_struct_seq.cpp +++ b/TAO/tests/Alt_Mapping/ub_struct_seq.cpp @@ -87,7 +87,6 @@ Test_Unbounded_Struct_Sequence::run_sii_test ( catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_Struct_Sequence::run_sii_test\n"); - } return -1; } diff --git a/TAO/tests/Any/Recursive/Hello.h b/TAO/tests/Any/Recursive/Hello.h index a5a13ea2723..d8ef497e2e9 100644 --- a/TAO/tests/Any/Recursive/Hello.h +++ b/TAO/tests/Any/Recursive/Hello.h @@ -20,7 +20,6 @@ class Hello : public virtual POA_Test::Hello { public: - /// Constructor Hello (CORBA::ORB_ptr orb); @@ -30,10 +29,8 @@ public: virtual void shutdown (void); private: - /// The ORB which will be shutdown by Hello::shutdown(). CORBA::ORB_var orb_; - }; #endif /* HELLO_H */ diff --git a/TAO/tests/BiDirectional/client.cpp b/TAO/tests/BiDirectional/client.cpp index 8a333958ed6..8ea1c79868a 100644 --- a/TAO/tests/BiDirectional/client.cpp +++ b/TAO/tests/BiDirectional/client.cpp @@ -129,7 +129,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->run (); root_poa->destroy (true, true); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/BiDirectional/test_i.h b/TAO/tests/BiDirectional/test_i.h index 7536e63f0d6..f7a40ffbf10 100644 --- a/TAO/tests/BiDirectional/test_i.h +++ b/TAO/tests/BiDirectional/test_i.h @@ -36,7 +36,6 @@ public: private: /// The orb CORBA::ORB_var orb_; - }; /** diff --git a/TAO/tests/BiDirectional_MultipleORB/destroy.cpp b/TAO/tests/BiDirectional_MultipleORB/destroy.cpp index f3446e8b98c..bdbc66000a2 100644 --- a/TAO/tests/BiDirectional_MultipleORB/destroy.cpp +++ b/TAO/tests/BiDirectional_MultipleORB/destroy.cpp @@ -16,14 +16,12 @@ #include "tao/BiDir_GIOP/BiDirGIOP.h" - int test_with_bidir_poa (int argc, ACE_TCHAR **argv, const char *orb_name, int destroy_orb) { - try { CORBA::ORB_var orb = diff --git a/TAO/tests/BiDirectional_NestedUpcall/client.cpp b/TAO/tests/BiDirectional_NestedUpcall/client.cpp index 7e84160fe48..7c14fc00199 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/client.cpp +++ b/TAO/tests/BiDirectional_NestedUpcall/client.cpp @@ -137,7 +137,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) server->shutdown (); root_poa->destroy (true, true); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/Big_Oneways/server.cpp b/TAO/tests/Big_Oneways/server.cpp index 088b74d2433..6730ae08be9 100644 --- a/TAO/tests/Big_Oneways/server.cpp +++ b/TAO/tests/Big_Oneways/server.cpp @@ -171,7 +171,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } session_list[j]->start (other_sessions); - } ACE_DEBUG ((LM_DEBUG ,"done\n")); @@ -196,7 +195,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) for (j = 0; j != peer_count; ++j) { session_list[j]->destroy (); - } ACE_DEBUG ((LM_DEBUG, "Shutdown all peers . . .\n")); diff --git a/TAO/tests/Big_Reply/Big_Reply_i.h b/TAO/tests/Big_Reply/Big_Reply_i.h index 2139368bea6..46d1209bbf3 100644 --- a/TAO/tests/Big_Reply/Big_Reply_i.h +++ b/TAO/tests/Big_Reply/Big_Reply_i.h @@ -44,7 +44,6 @@ private: /// The reply message Test::Octet_Seq_var reply_message_; - }; #include /**/ "ace/post.h" diff --git a/TAO/tests/Big_Reply/Client_Task.cpp b/TAO/tests/Big_Reply/Client_Task.cpp index 36a76b6f73b..d0732cf60f8 100644 --- a/TAO/tests/Big_Reply/Client_Task.cpp +++ b/TAO/tests/Big_Reply/Client_Task.cpp @@ -2,7 +2,6 @@ #include "Client_Task.h" - Client_Task::Client_Task (Test::Big_Reply_ptr reply_gen, int event_count, ACE_Thread_Manager *thr_mgr) diff --git a/TAO/tests/Big_Reply/Client_Task.h b/TAO/tests/Big_Reply/Client_Task.h index 993a98cc4b9..d19e1b48d64 100644 --- a/TAO/tests/Big_Reply/Client_Task.h +++ b/TAO/tests/Big_Reply/Client_Task.h @@ -23,12 +23,10 @@ public: int svc (void); private: - /// Validate the connection void validate_connection (void); private: - /// Reference to the test interface Test::Big_Reply_var reply_gen_; diff --git a/TAO/tests/Big_Reply/client.cpp b/TAO/tests/Big_Reply/client.cpp index 3ddf68ada38..2889ffc3928 100644 --- a/TAO/tests/Big_Reply/client.cpp +++ b/TAO/tests/Big_Reply/client.cpp @@ -2,7 +2,6 @@ #include "ace/Get_Opt.h" - const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); bool server_shutdown = false; diff --git a/TAO/tests/Big_Reply/server.cpp b/TAO/tests/Big_Reply/server.cpp index f9518505a01..020e73d2120 100644 --- a/TAO/tests/Big_Reply/server.cpp +++ b/TAO/tests/Big_Reply/server.cpp @@ -4,7 +4,6 @@ #include "ace/Task.h" - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); // We can change this value if wanted.. diff --git a/TAO/tests/Big_Twoways/server.cpp b/TAO/tests/Big_Twoways/server.cpp index 29ee60a3bdf..845bf6af72c 100644 --- a/TAO/tests/Big_Twoways/server.cpp +++ b/TAO/tests/Big_Twoways/server.cpp @@ -192,7 +192,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) for (j = 0; j != peer_count; ++j) { session_list[j]->destroy (); - } ACE_DEBUG ((LM_DEBUG, "Shutdown all peers . . .\n")); 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_Basic_Regression/Client_Task.h b/TAO/tests/Bug_1020_Basic_Regression/Client_Task.h index 80a2c49f14a..40b44ee5757 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/Client_Task.h +++ b/TAO/tests/Bug_1020_Basic_Regression/Client_Task.h @@ -21,7 +21,6 @@ public: int svc (void); private: - CORBA::ORB_var orb_; }; diff --git a/TAO/tests/Bug_1020_Basic_Regression/Echo.h b/TAO/tests/Bug_1020_Basic_Regression/Echo.h index cfdcab13d97..a5e49ee9bde 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/Echo.h +++ b/TAO/tests/Bug_1020_Basic_Regression/Echo.h @@ -11,7 +11,6 @@ class Echo : public POA_Test::Echo { public: - Echo (CORBA::ORB_ptr orb, int abort_counter); diff --git a/TAO/tests/Bug_1020_Basic_Regression/Server_Task.h b/TAO/tests/Bug_1020_Basic_Regression/Server_Task.h index 0207ca3ae3d..0a173ded745 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/Server_Task.h +++ b/TAO/tests/Bug_1020_Basic_Regression/Server_Task.h @@ -17,7 +17,6 @@ class Server_Task : public ACE_Task_Base { public: - /// Constructor Server_Task (Test::Echo_ptr echo, size_t sz); diff --git a/TAO/tests/Bug_1020_Regression/Echo.cpp b/TAO/tests/Bug_1020_Regression/Echo.cpp index 049b77c94c8..f46204005cc 100644 --- a/TAO/tests/Bug_1020_Regression/Echo.cpp +++ b/TAO/tests/Bug_1020_Regression/Echo.cpp @@ -6,7 +6,6 @@ #include "Echo.h" - Echo::Echo(CORBA::ORB_ptr orb) : orb_(CORBA::ORB::_duplicate(orb)) { diff --git a/TAO/tests/Bug_1020_Regression/ORB_Task.cpp b/TAO/tests/Bug_1020_Regression/ORB_Task.cpp index 72b42ee6a30..cb379028636 100644 --- a/TAO/tests/Bug_1020_Regression/ORB_Task.cpp +++ b/TAO/tests/Bug_1020_Regression/ORB_Task.cpp @@ -7,7 +7,6 @@ #include "tao/Environment.h" - ORB_Task::ORB_Task(CORBA::ORB_ptr orb) : orb_(CORBA::ORB::_duplicate(orb)) { diff --git a/TAO/tests/Bug_1020_Regression/Server_Task.cpp b/TAO/tests/Bug_1020_Regression/Server_Task.cpp index 550ddb0c070..cb93da3a251 100644 --- a/TAO/tests/Bug_1020_Regression/Server_Task.cpp +++ b/TAO/tests/Bug_1020_Regression/Server_Task.cpp @@ -6,7 +6,6 @@ #include "Server_Task.h" - Server_Task::Server_Task(Test::Echo_ptr echo) : echo_(Test::Echo::_duplicate(echo)) { @@ -15,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_1361_Regression/Server_Thread_Pool.cpp b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp index 873e414d900..e3e80c625f6 100644 --- a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp +++ b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp @@ -150,7 +150,6 @@ Thread_Pool::svc (void) pload.length (10); ACE_OS::memset (pload.get_buffer(), pload.length(), 0); echo->echo_payload (pload); - } else #endif /*if 0*/ diff --git a/TAO/tests/Bug_1476_Regression/Client_Task.h b/TAO/tests/Bug_1476_Regression/Client_Task.h index 7e31b950196..86427d8a6fa 100644 --- a/TAO/tests/Bug_1476_Regression/Client_Task.h +++ b/TAO/tests/Bug_1476_Regression/Client_Task.h @@ -24,7 +24,6 @@ public: int svc (void); private: - /// Reference to the test interface Test::Sender_var sender_; 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_1482_Regression/Reply_Handler.h b/TAO/tests/Bug_1482_Regression/Reply_Handler.h index b491aa754fe..6dec7bc07fc 100644 --- a/TAO/tests/Bug_1482_Regression/Reply_Handler.h +++ b/TAO/tests/Bug_1482_Regression/Reply_Handler.h @@ -18,7 +18,6 @@ public: void next_prime_excep (::Messaging::ExceptionHolder * excep_holder); private: - CORBA::ORB_var orb_; }; 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_1495_Regression/test_i.h b/TAO/tests/Bug_1495_Regression/test_i.h index ce694224731..f9a97ecee65 100644 --- a/TAO/tests/Bug_1495_Regression/test_i.h +++ b/TAO/tests/Bug_1495_Regression/test_i.h @@ -37,7 +37,6 @@ class Bug1495_i : public virtual POA_Bug1495_Regression::Bug1495 { public: - Bug1495_i (CORBA::ORB_ptr orb); //Destructor @@ -47,9 +46,7 @@ public: virtual void shutdown (void); private: - CORBA::ORB_var orb_; - }; diff --git a/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp b/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp index a0d3ff9494b..3b55807be47 100644 --- a/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp +++ b/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp @@ -149,7 +149,6 @@ test_no_implicit_activation ( // Implicit activation should fail Test_var myservant = myhello._this (); - } catch (const PortableServer::POA::WrongPolicy& ) { 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_1693_Test/client.cpp b/TAO/tests/Bug_1693_Test/client.cpp index bde40aa87ad..6ce82f6dbf0 100644 --- a/TAO/tests/Bug_1693_Test/client.cpp +++ b/TAO/tests/Bug_1693_Test/client.cpp @@ -64,7 +64,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) "ERROR: Extracted value not equal " "to the encoded value\n"), -1); - } ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Bug_1869_Regression/client.cpp b/TAO/tests/Bug_1869_Regression/client.cpp index e3282dc75c7..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)) { @@ -37,7 +36,6 @@ class AdderCallback } CORBA::ORB_var orb; - }; int @@ -71,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) @@ -122,4 +118,3 @@ ACE_TCHAR address_servant[1000]; } - 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_2084_Regression/Client_Task.cpp b/TAO/tests/Bug_2084_Regression/Client_Task.cpp index 0d9904744fc..19d263e57b2 100644 --- a/TAO/tests/Bug_2084_Regression/Client_Task.cpp +++ b/TAO/tests/Bug_2084_Regression/Client_Task.cpp @@ -81,5 +81,4 @@ Client_Task::svc (void) } return 0; - } diff --git a/TAO/tests/Bug_2084_Regression/Client_Task.h b/TAO/tests/Bug_2084_Regression/Client_Task.h index cc58f128c58..b6ea6957134 100644 --- a/TAO/tests/Bug_2084_Regression/Client_Task.h +++ b/TAO/tests/Bug_2084_Regression/Client_Task.h @@ -14,7 +14,6 @@ class Client_Task : public ACE_Task_Base { public: - /// Constructor Client_Task (const ACE_TCHAR *input, CORBA::ORB_ptr corb, @@ -27,7 +26,6 @@ private: const ACE_TCHAR *input_; CORBA::ORB_var corb_; - }; #include /**/ "ace/post.h" 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_2188_Regression/broken_i.cpp b/TAO/tests/Bug_2188_Regression/broken_i.cpp index 0045d9c8970..f3b4230cd4c 100644 --- a/TAO/tests/Bug_2188_Regression/broken_i.cpp +++ b/TAO/tests/Bug_2188_Regression/broken_i.cpp @@ -28,7 +28,6 @@ #include "broken_i.h" - ServerAdmin_i::ServerAdmin_i (ArrayTest_ptr target) :target_ (ArrayTest::_duplicate(target)) { @@ -143,7 +142,6 @@ ArrayTest_i::~ArrayTest_i (void) // Add your implementation here ::CharArray_copy(p3,p2); return CharArray_dup(p1); - } ::OctetArray_slice * ArrayTest_i::octetArrayOp ( diff --git a/TAO/tests/Bug_2188_Regression/broken_i.h b/TAO/tests/Bug_2188_Regression/broken_i.h index 4df02de9d58..4ecaf93f43d 100644 --- a/TAO/tests/Bug_2188_Regression/broken_i.h +++ b/TAO/tests/Bug_2188_Regression/broken_i.h @@ -44,7 +44,6 @@ public: void shutdown (void); private: ArrayTest_var target_; - }; class ArrayTest_i : public virtual POA_ArrayTest diff --git a/TAO/tests/Bug_2188_Regression/client.cpp b/TAO/tests/Bug_2188_Regression/client.cpp index 760e604f85c..172238de6b5 100644 --- a/TAO/tests/Bug_2188_Regression/client.cpp +++ b/TAO/tests/Bug_2188_Regression/client.cpp @@ -63,7 +63,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) atobj->a_charArray (char_array.in ()); ACE_DEBUG ((LM_DEBUG, "a_charArray worked OK.\n")); - } catch (const CORBA::Exception& ex) { 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_2241_Regression/Client_Task.cpp b/TAO/tests/Bug_2241_Regression/Client_Task.cpp index 419c8e44bbb..511b3d75bac 100644 --- a/TAO/tests/Bug_2241_Regression/Client_Task.cpp +++ b/TAO/tests/Bug_2241_Regression/Client_Task.cpp @@ -57,5 +57,4 @@ Client_Task::svc (void) ACE_ERROR ((LM_ERROR, "(ERROR: Client_Task::svc Expected exception not received\n")); } return 0; - } diff --git a/TAO/tests/Bug_2241_Regression/Client_Task.h b/TAO/tests/Bug_2241_Regression/Client_Task.h index cc58f128c58..b6ea6957134 100644 --- a/TAO/tests/Bug_2241_Regression/Client_Task.h +++ b/TAO/tests/Bug_2241_Regression/Client_Task.h @@ -14,7 +14,6 @@ class Client_Task : public ACE_Task_Base { public: - /// Constructor Client_Task (const ACE_TCHAR *input, CORBA::ORB_ptr corb, @@ -27,7 +26,6 @@ private: const ACE_TCHAR *input_; CORBA::ORB_var corb_; - }; #include /**/ "ace/post.h" diff --git a/TAO/tests/Bug_2319_Regression/server.cpp b/TAO/tests/Bug_2319_Regression/server.cpp index 6cad968abdb..ce6a65d029a 100644 --- a/TAO/tests/Bug_2319_Regression/server.cpp +++ b/TAO/tests/Bug_2319_Regression/server.cpp @@ -56,7 +56,6 @@ public: virtual void run_event_loop (); public: - protected: CORBA::ORB_ptr orb_; PortableServer::POA_var root_poa_; 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..bdce1f67b07 100644 --- a/TAO/tests/Bug_2429_Regression/client.cpp +++ b/TAO/tests/Bug_2429_Regression/client.cpp @@ -37,7 +37,6 @@ class Reply_Handler ACE_DEBUG ((LM_DEBUG, "client: parentMethod reply %d @ %T\n", ++parentMethod_count)); - } virtual void @@ -99,7 +98,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 31ee3c945c9..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)) { @@ -89,7 +88,6 @@ struct Worker : ACE_Task_Base } return 0; } - }; int 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_2560_Regression/client.cpp b/TAO/tests/Bug_2560_Regression/client.cpp index 183a0b9f114..60590fba8fb 100644 --- a/TAO/tests/Bug_2560_Regression/client.cpp +++ b/TAO/tests/Bug_2560_Regression/client.cpp @@ -42,7 +42,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) cout << "The price of a stock in \"" << full_name.in () << "\" is $" << price << endl; cout << " history: " << history[0] << " " << history[1] << " ... " << history[history->length()-1] << endl ; - } catch (Quoter::Invalid_Stock_Symbol &) { cerr << "Invalid stock symbol <" << argv[i] << ">" << endl; } diff --git a/TAO/tests/Bug_2654_Regression/client.cpp b/TAO/tests/Bug_2654_Regression/client.cpp index b01a90b4eee..22b5f692ac5 100644 --- a/TAO/tests/Bug_2654_Regression/client.cpp +++ b/TAO/tests/Bug_2654_Regression/client.cpp @@ -95,7 +95,6 @@ Worker::svc() ACE_Time_Value udelay(0,400); struct timespec ts = udelay; ACE_OS::nanosleep (&ts); - } catch (const CORBA::Exception &ex) { @@ -280,7 +279,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } init_callback(worker); - } catch (const CORBA::Exception &ex) { diff --git a/TAO/tests/Bug_2669_Regression/client.cpp b/TAO/tests/Bug_2669_Regression/client.cpp index 8171f77019c..009ca878c1e 100644 --- a/TAO/tests/Bug_2669_Regression/client.cpp +++ b/TAO/tests/Bug_2669_Regression/client.cpp @@ -145,7 +145,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) poa_var->destroy (1,0); orb->destroy (); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/Bug_2678_Regression/server.cpp b/TAO/tests/Bug_2678_Regression/server.cpp index 1a40df86114..da4ec179b1e 100644 --- a/TAO/tests/Bug_2678_Regression/server.cpp +++ b/TAO/tests/Bug_2678_Regression/server.cpp @@ -117,5 +117,3 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) - - diff --git a/TAO/tests/Bug_2683_Regression/client.cpp b/TAO/tests/Bug_2683_Regression/client.cpp index f14e73c7679..cdba93ea310 100644 --- a/TAO/tests/Bug_2683_Regression/client.cpp +++ b/TAO/tests/Bug_2683_Regression/client.cpp @@ -63,7 +63,6 @@ public: { stop_ = true; } - }; int port = 0; @@ -132,7 +131,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) pinger.wait(); ACE_DEBUG ((LM_DEBUG,"(%P|%t) client done\n")); - } catch (const CORBA::Exception &ex) { diff --git a/TAO/tests/Bug_2683_Regression/server.cpp b/TAO/tests/Bug_2683_Regression/server.cpp index a6104342c1c..8115009818b 100644 --- a/TAO/tests/Bug_2683_Regression/server.cpp +++ b/TAO/tests/Bug_2683_Regression/server.cpp @@ -58,7 +58,6 @@ public: } return 0; } - }; int 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_2791_Regression/MessageFactory.h b/TAO/tests/Bug_2791_Regression/MessageFactory.h index f2d862c99eb..26de1758006 100644 --- a/TAO/tests/Bug_2791_Regression/MessageFactory.h +++ b/TAO/tests/Bug_2791_Regression/MessageFactory.h @@ -5,7 +5,6 @@ class MessageFactory : public virtual CORBA::ValueFactoryBase { public: - static int destructorInvoked_; ~MessageFactory (); diff --git a/TAO/tests/Bug_2804_Regression/Hello.h b/TAO/tests/Bug_2804_Regression/Hello.h index a5a13ea2723..d8ef497e2e9 100644 --- a/TAO/tests/Bug_2804_Regression/Hello.h +++ b/TAO/tests/Bug_2804_Regression/Hello.h @@ -20,7 +20,6 @@ class Hello : public virtual POA_Test::Hello { public: - /// Constructor Hello (CORBA::ORB_ptr orb); @@ -30,10 +29,8 @@ public: virtual void shutdown (void); private: - /// The ORB which will be shutdown by Hello::shutdown(). CORBA::ORB_var orb_; - }; #endif /* HELLO_H */ diff --git a/TAO/tests/Bug_2804_Regression/client.cpp b/TAO/tests/Bug_2804_Regression/client.cpp index 9cdf85c1e6f..d852e043aa6 100644 --- a/TAO/tests/Bug_2804_Regression/client.cpp +++ b/TAO/tests/Bug_2804_Regression/client.cpp @@ -87,7 +87,6 @@ recursive_union_test (CORBA::ORB_ptr /* orb */, ::perform_invocation<Test::NonRecursiveUnionWithStringStruct3> (hello, the_any); - } /** 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_2844_Regression/Hello.h b/TAO/tests/Bug_2844_Regression/Hello.h index a5a13ea2723..d8ef497e2e9 100644 --- a/TAO/tests/Bug_2844_Regression/Hello.h +++ b/TAO/tests/Bug_2844_Regression/Hello.h @@ -20,7 +20,6 @@ class Hello : public virtual POA_Test::Hello { public: - /// Constructor Hello (CORBA::ORB_ptr orb); @@ -30,10 +29,8 @@ public: virtual void shutdown (void); private: - /// The ORB which will be shutdown by Hello::shutdown(). CORBA::ORB_var orb_; - }; #endif /* HELLO_H */ diff --git a/TAO/tests/Bug_2844_Regression/client.cpp b/TAO/tests/Bug_2844_Regression/client.cpp index f845a6894e5..29fe9fa32c2 100644 --- a/TAO/tests/Bug_2844_Regression/client.cpp +++ b/TAO/tests/Bug_2844_Regression/client.cpp @@ -86,7 +86,6 @@ nested_recursive_struct_test (CORBA::ORB_ptr /* orb */, the_any <<= foo5; ::perform_invocation<Test::NestedRecursiveStruct5> (hello, the_any); - } /** diff --git a/TAO/tests/Bug_2918_Regression/Hello.h b/TAO/tests/Bug_2918_Regression/Hello.h index a5a13ea2723..d8ef497e2e9 100644 --- a/TAO/tests/Bug_2918_Regression/Hello.h +++ b/TAO/tests/Bug_2918_Regression/Hello.h @@ -20,7 +20,6 @@ class Hello : public virtual POA_Test::Hello { public: - /// Constructor Hello (CORBA::ORB_ptr orb); @@ -30,10 +29,8 @@ public: virtual void shutdown (void); private: - /// The ORB which will be shutdown by Hello::shutdown(). CORBA::ORB_var orb_; - }; #endif /* HELLO_H */ diff --git a/TAO/tests/Bug_2935_Regression/source.cpp b/TAO/tests/Bug_2935_Regression/source.cpp index 2c47c3ebe47..8b688662a21 100644 --- a/TAO/tests/Bug_2935_Regression/source.cpp +++ b/TAO/tests/Bug_2935_Regression/source.cpp @@ -47,7 +47,6 @@ bool parse_args (int & argc, ACE_TCHAR *argv[]) return false; } return true; - } diff --git a/TAO/tests/Bug_2935_Regression/source_i.cpp b/TAO/tests/Bug_2935_Regression/source_i.cpp index dec6db49ea3..e70de79322a 100644 --- a/TAO/tests/Bug_2935_Regression/source_i.cpp +++ b/TAO/tests/Bug_2935_Regression/source_i.cpp @@ -38,7 +38,6 @@ Source_i::run () (int)tickCount, (int)tockCount)); target_->shutdown (); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/Bug_2935_Regression/source_i.h b/TAO/tests/Bug_2935_Regression/source_i.h index 203664e4ae3..35785b21bf7 100644 --- a/TAO/tests/Bug_2935_Regression/source_i.h +++ b/TAO/tests/Bug_2935_Regression/source_i.h @@ -41,7 +41,6 @@ private: // Number of messages to send (make this configurable) unsigned long counter_; - }; diff --git a/TAO/tests/Bug_3000_Regression/Service.h b/TAO/tests/Bug_3000_Regression/Service.h index c34f4c98f46..c34df5a9f97 100644 --- a/TAO/tests/Bug_3000_Regression/Service.h +++ b/TAO/tests/Bug_3000_Regression/Service.h @@ -19,7 +19,6 @@ public: virtual void shutdown (void); private: - /// Use an ORB reference to shutdown the application. CORBA::ORB_var orb_; }; diff --git a/TAO/tests/Bug_3068_Regression/test_i.h b/TAO/tests/Bug_3068_Regression/test_i.h index c64bc84d507..7558a4fae86 100644 --- a/TAO/tests/Bug_3068_Regression/test_i.h +++ b/TAO/tests/Bug_3068_Regression/test_i.h @@ -58,7 +58,6 @@ public: private: /// The orb CORBA::ORB_var orb_; - }; /** @@ -71,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_3171_Regression/server.cpp b/TAO/tests/Bug_3171_Regression/server.cpp index 92c4e1532bb..dbdebb13338 100644 --- a/TAO/tests/Bug_3171_Regression/server.cpp +++ b/TAO/tests/Bug_3171_Regression/server.cpp @@ -119,7 +119,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) 1); worker.thr_mgr ()->wait (); - } ACE_DEBUG ((LM_DEBUG, "Event loop finished\n")); } diff --git a/TAO/tests/Bug_3198_Regression/bug_3198_regression.cpp b/TAO/tests/Bug_3198_Regression/bug_3198_regression.cpp index b4c93c1b20b..40e905106ff 100644 --- a/TAO/tests/Bug_3198_Regression/bug_3198_regression.cpp +++ b/TAO/tests/Bug_3198_Regression/bug_3198_regression.cpp @@ -94,13 +94,3 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) - - - - - - - - - - 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_3506_Regression/client.cpp b/TAO/tests/Bug_3506_Regression/client.cpp index 3367db61380..5f91c4258e6 100644 --- a/TAO/tests/Bug_3506_Regression/client.cpp +++ b/TAO/tests/Bug_3506_Regression/client.cpp @@ -97,7 +97,6 @@ public: ACE_ERROR_RETURN ((LM_DEBUG, "Reference is not of type IF_EXE_M_R::IF_ExeCtrlData\n"), 1); - } client->foo (ts); if (shutdown) diff --git a/TAO/tests/Bug_3506_Regression/server.cpp b/TAO/tests/Bug_3506_Regression/server.cpp index 7ca7b21c08a..e16cafeb09e 100644 --- a/TAO/tests/Bug_3506_Regression/server.cpp +++ b/TAO/tests/Bug_3506_Regression/server.cpp @@ -52,7 +52,6 @@ public: ts.whatEver._tao_get_typecode()->id(), ts.whatEver._tao_get_typecode()->name(), ts.whatEver._tao_get_typecode()->kind())); - } else { diff --git a/TAO/tests/Bug_3524_Regression/test_i.h b/TAO/tests/Bug_3524_Regression/test_i.h index 3dce672a4b6..9b098d0579c 100644 --- a/TAO/tests/Bug_3524_Regression/test_i.h +++ b/TAO/tests/Bug_3524_Regression/test_i.h @@ -68,7 +68,6 @@ public: void shutdown (); private: - /// The ORB pseudo-reference (for shutdown). CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_3531_Regression/test_i.cpp b/TAO/tests/Bug_3531_Regression/test_i.cpp index 5748d90de35..7e05d4d9de1 100644 --- a/TAO/tests/Bug_3531_Regression/test_i.cpp +++ b/TAO/tests/Bug_3531_Regression/test_i.cpp @@ -35,7 +35,6 @@ Simple_Server_i::test_method (Simple_Server_ptr objref) "which will sleep for 3 seconds\n")); CORBA::String_var str = objref->test_method (_this()); ACE_DEBUG ((LM_DEBUG, "(%P|%t) Received \"%C\"\n", str.in ())); - } catch (...) { diff --git a/TAO/tests/Bug_3531b_Regression/server.cpp b/TAO/tests/Bug_3531b_Regression/server.cpp index 44221124f40..490190d3a57 100644 --- a/TAO/tests/Bug_3531b_Regression/server.cpp +++ b/TAO/tests/Bug_3531b_Regression/server.cpp @@ -329,7 +329,6 @@ protected: { return 0; } - }; class Shutdown: public Command @@ -342,7 +341,6 @@ public: worker->shutdown (true); return 0; } - }; class TSS_Assert: public Command 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_3598a_Regression/ClientORBInitializer.cpp b/TAO/tests/Bug_3598a_Regression/ClientORBInitializer.cpp index 45d43b27eca..04d12398ace 100644 --- a/TAO/tests/Bug_3598a_Regression/ClientORBInitializer.cpp +++ b/TAO/tests/Bug_3598a_Regression/ClientORBInitializer.cpp @@ -21,5 +21,4 @@ ClientORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) client_interceptor = cri; info->add_client_request_interceptor (client_interceptor.in ()); - } diff --git a/TAO/tests/Bug_3598a_Regression/ClientORBInitializer.h b/TAO/tests/Bug_3598a_Regression/ClientORBInitializer.h index 55063792acd..346b31b2b5a 100644 --- a/TAO/tests/Bug_3598a_Regression/ClientORBInitializer.h +++ b/TAO/tests/Bug_3598a_Regression/ClientORBInitializer.h @@ -33,7 +33,6 @@ class ClientORBInitializer : public virtual ::CORBA::LocalObject { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.h b/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.h index 53d5ad3bed2..36235e54b3a 100644 --- a/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.h +++ b/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.h @@ -28,7 +28,6 @@ class ClientRequest_Interceptor public virtual ::CORBA::LocalObject { public: - ClientRequest_Interceptor (void); ~ClientRequest_Interceptor (void); @@ -52,10 +51,8 @@ virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri); static CORBA::Boolean success_flag_; private: - /// Name of the interceptor const char *name_; - }; #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tests/Bug_3647_Regression/Backend_Impl.h b/TAO/tests/Bug_3647_Regression/Backend_Impl.h index 9593832e0de..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 * @@ -30,7 +29,6 @@ private: /// Use this flag to decide if the program should produce any output. bool verbose_; }; - } // namespace Bug_3647_Regression #endif // Bug_3647_Regression_Backend_h diff --git a/TAO/tests/Bug_3647_Regression/Middle_Impl.h b/TAO/tests/Bug_3647_Regression/Middle_Impl.h index 57fa2ec799a..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 * @@ -39,7 +38,6 @@ private: /// Control the freeze time based on the timeout time long timeout_; }; - } // namespace Bug_3647_Regression #endif // Bug_3647_Regression_Middle_hpp diff --git a/TAO/tests/Bug_3672_Regression/client.cpp b/TAO/tests/Bug_3672_Regression/client.cpp index 6e604fc1de7..8f83f1a53d4 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 @@ -271,7 +270,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { ex._tao_print_exception ("Caught exception:"); return 1; - } return parameter_corruption; diff --git a/TAO/tests/Bug_3683_Regression/Simple_util.cpp b/TAO/tests/Bug_3683_Regression/Simple_util.cpp index 85475c11224..8ecb7692921 100644 --- a/TAO/tests/Bug_3683_Regression/Simple_util.cpp +++ b/TAO/tests/Bug_3683_Regression/Simple_util.cpp @@ -309,8 +309,6 @@ Client<ServerInterface>::init (const char *, ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("no ior or naming options specified\n")), -1); - - } catch (const CORBA::Exception& ex) { 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/Bug_3919_Regression/Hello.h b/TAO/tests/Bug_3919_Regression/Hello.h index a5a13ea2723..d8ef497e2e9 100644 --- a/TAO/tests/Bug_3919_Regression/Hello.h +++ b/TAO/tests/Bug_3919_Regression/Hello.h @@ -20,7 +20,6 @@ class Hello : public virtual POA_Test::Hello { public: - /// Constructor Hello (CORBA::ORB_ptr orb); @@ -30,10 +29,8 @@ public: virtual void shutdown (void); private: - /// The ORB which will be shutdown by Hello::shutdown(). CORBA::ORB_var orb_; - }; #endif /* HELLO_H */ diff --git a/TAO/tests/Bug_3919_Regression/client.cpp b/TAO/tests/Bug_3919_Regression/client.cpp index c618a9c16f3..959d9b79f01 100644 --- a/TAO/tests/Bug_3919_Regression/client.cpp +++ b/TAO/tests/Bug_3919_Regression/client.cpp @@ -114,7 +114,6 @@ recursive_typecode_test (CORBA::ORB_ptr /* orb */, the_any <<= test; ::perform_invocation<Test::MyAttRefSequence> (hello, the_any); - } void @@ -159,7 +158,6 @@ nested_recursive_typecode_test (CORBA::ORB_ptr /* orb */, the_any <<= test; ::perform_invocation<Test2::MyAttRefSeqStruct> (hello, the_any); - } /** diff --git a/TAO/tests/Bug_3926_Regression/Client_ORBInitializer.h b/TAO/tests/Bug_3926_Regression/Client_ORBInitializer.h index 7e908d06d22..1366294fcb8 100644 --- a/TAO/tests/Bug_3926_Regression/Client_ORBInitializer.h +++ b/TAO/tests/Bug_3926_Regression/Client_ORBInitializer.h @@ -16,7 +16,6 @@ class Client_ORBInitializer : public virtual CORBA::LocalObject { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.h b/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.h index eca718ce32a..1a9705658c9 100644 --- a/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.h +++ b/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.h @@ -19,7 +19,6 @@ class Client_Request_Interceptor public virtual CORBA::LocalObject { public: - /// Constructor. Client_Request_Interceptor (const char *orb_id, const char *forward_str); @@ -55,7 +54,6 @@ public: //@} private: - ///The ID of the ORB this interceptor is registered with. CORBA::String_var orb_id_; @@ -69,7 +67,6 @@ private: /// Stringified reference to the object the initial request will be /// forwarded to by this interceptor. CORBA::String_var forward_str_; - }; #endif /* CLIENT_REQUEST_INTERCEPTOR_H */ diff --git a/TAO/tests/Bug_3926_Regression/test_i.h b/TAO/tests/Bug_3926_Regression/test_i.h index b906f280e9e..9012612ca85 100644 --- a/TAO/tests/Bug_3926_Regression/test_i.h +++ b/TAO/tests/Bug_3926_Regression/test_i.h @@ -26,7 +26,6 @@ class test_i : public virtual POA_hello::GoodDay { public: - /// Constructor. test_i (CORBA::Short num, CORBA::ORB_ptr orb); @@ -41,13 +40,11 @@ public: virtual void shutdown (void); private: - /// The number assigned to this object. CORBA::Short number_; /// Pseudo-reference to the ORB. CORBA::ORB_var orb_; - }; #endif /* TEST_I_H */ diff --git a/TAO/tests/Bug_3953_Regression/server.cpp b/TAO/tests/Bug_3953_Regression/server.cpp index fc00327e5f5..61e4e94f853 100644 --- a/TAO/tests/Bug_3953_Regression/server.cpp +++ b/TAO/tests/Bug_3953_Regression/server.cpp @@ -187,7 +187,6 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv) ++result; orb->destroy (); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/Bug_4010_Regression/client.cpp b/TAO/tests/Bug_4010_Regression/client.cpp index d54634333dd..ad27bb0f31c 100644 --- a/TAO/tests/Bug_4010_Regression/client.cpp +++ b/TAO/tests/Bug_4010_Regression/client.cpp @@ -45,7 +45,6 @@ ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:i:t:")); class PeriodicTask : public ACE_Event_Handler { public: - explicit PeriodicTask(CORBA::ORB_var orbIn) : ACE_Event_Handler(), orb(orbIn), @@ -106,9 +105,7 @@ public: } protected: - private: - PeriodicTask(const PeriodicTask &); PeriodicTask & operator=(const PeriodicTask &); CORBA::ORB_var orb; diff --git a/TAO/tests/Bug_933_Regression/Messenger_i.h b/TAO/tests/Bug_933_Regression/Messenger_i.h index 3736ecb672e..d68b1b52673 100644 --- a/TAO/tests/Bug_933_Regression/Messenger_i.h +++ b/TAO/tests/Bug_933_Regression/Messenger_i.h @@ -22,7 +22,6 @@ private: /// Use an ORB reference to convert strings to objects and shutdown /// the application. CORBA::ORB_var orb_; - }; diff --git a/TAO/tests/CDR/allocator.cpp b/TAO/tests/CDR/allocator.cpp index 52446b05ebc..5ff11f23e7b 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. @@ -192,7 +191,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (!quiet) ACE_OS::printf ("AVE: %d %f\n", i, average); - } } catch (const CORBA::Exception& ex) diff --git a/TAO/tests/COIOP/Client_Task.cpp b/TAO/tests/COIOP/Client_Task.cpp index 37c5c9a9a99..820404f4721 100644 --- a/TAO/tests/COIOP/Client_Task.cpp +++ b/TAO/tests/COIOP/Client_Task.cpp @@ -68,5 +68,4 @@ Client_Task::svc (void) } return 0; - } diff --git a/TAO/tests/COIOP/Client_Task.h b/TAO/tests/COIOP/Client_Task.h index 1f3fa76b019..6246c8e12c6 100644 --- a/TAO/tests/COIOP/Client_Task.h +++ b/TAO/tests/COIOP/Client_Task.h @@ -14,7 +14,6 @@ class Client_Task : public ACE_Task_Base { public: - /// Constructor Client_Task (const ACE_TCHAR *input, CORBA::ORB_ptr corb, diff --git a/TAO/tests/CSD_Collocation/Collocation_Tester.cpp b/TAO/tests/CSD_Collocation/Collocation_Tester.cpp index 76f15b8057c..6220eeda46c 100644 --- a/TAO/tests/CSD_Collocation/Collocation_Tester.cpp +++ b/TAO/tests/CSD_Collocation/Collocation_Tester.cpp @@ -92,7 +92,6 @@ Collocation_Test::init (int argc, ACE_TCHAR *argv[]) return 0; - } int diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h index fa005fdda5c..f6945669a44 100644 --- a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h +++ b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h @@ -14,17 +14,14 @@ class ClientApp : public TestAppBase { public: - ClientApp(); virtual ~ClientApp(); protected: - virtual int run_i(int argc, ACE_TCHAR* argv[]); private: - // These are all called, in order, by the run_i() method. int init(int argc, ACE_TCHAR* argv[]); void poa_setup(void); diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h index 3141df7fde7..ea516b3b6c7 100644 --- a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h +++ b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h @@ -13,18 +13,15 @@ class ServerApp : public TestAppBase { public: - ServerApp(); virtual ~ServerApp(); protected: - virtual int run_i(int argc, ACE_TCHAR* argv[]); private: - // These are all called, in order, by the run_i() method. int init(int argc, ACE_TCHAR* argv[]); void poa_setup(void); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h index 1d9c9cbc332..bf55c5cbdda 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h @@ -65,7 +65,6 @@ struct RefHelper return t_obj._retn(); } - }; struct CSD_TP_Test_Export AppHelper diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp index c98bd78c21b..95115803f11 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp @@ -84,4 +84,3 @@ Foo_A_Statistics::actual_vs_expected() } - diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h index f2b979cea57..e7ca7be5c4a 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h @@ -8,7 +8,6 @@ class CSD_TP_Foo_A_Export Foo_A_Statistics { public: - Foo_A_Statistics(unsigned num_clients); virtual ~Foo_A_Statistics(); @@ -21,7 +20,6 @@ class CSD_TP_Foo_A_Export Foo_A_Statistics private: - unsigned num_clients_; unsigned expected_[5]; diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h index 8f5bde6d947..f8e23bf4d2f 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h @@ -9,7 +9,6 @@ class CSD_TP_Foo_A_Export Foo_A_i : public virtual POA_Foo_A { public: - Foo_A_i(); virtual ~Foo_A_i(); @@ -28,7 +27,6 @@ class CSD_TP_Foo_A_Export Foo_A_i : public virtual POA_Foo_A void gather_stats (Foo_A_Statistics& stats) ; private: - LongVector in_values_ [5]; unsigned op_count_ [5]; }; diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h index 04b2d94c5d2..5c71583bdd4 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h @@ -10,7 +10,6 @@ class CSD_TP_Foo_B_Export Callback_i : public virtual POA_Callback { public: - Callback_i(); virtual ~Callback_i(); @@ -21,7 +20,6 @@ class CSD_TP_Foo_B_Export Callback_i private: - unsigned num_callbacks_; }; diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h index 6dadbe4d564..3a76bff1327 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h @@ -8,7 +8,6 @@ class CSD_TP_Foo_B_Export Foo_B_Statistics { public: - enum In_Value_Type { FOO_B_STAT_NONE, @@ -33,7 +32,6 @@ class CSD_TP_Foo_B_Export Foo_B_Statistics bool actual_vs_expected(); private: - unsigned num_clients_; unsigned num_collcated_clients_; diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h index 6ad53b221ff..e2b37b7f0c8 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h @@ -9,7 +9,6 @@ class CSD_TP_Foo_B_Export Foo_B_i : public virtual POA_Foo_B { public: - Foo_B_i(); virtual ~Foo_B_i(); @@ -52,7 +51,6 @@ class CSD_TP_Foo_B_Export Foo_B_i : public virtual POA_Foo_B void gather_stats (Foo_B_Statistics& stats); private: - LongVector in_long_ [16]; StringVector in_string_ [16]; unsigned op_count_ [16]; diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp index 6f314f493a4..1f4f3850a74 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp @@ -107,4 +107,3 @@ Foo_C_Statistics::actual_vs_expected() } - diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h index 79de17967ee..69fdc56d3b8 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h @@ -8,7 +8,6 @@ class CSD_TP_Foo_C_Export Foo_C_Statistics { public: - Foo_C_Statistics(unsigned num_remote_clients, unsigned num_collocated_clients); @@ -22,7 +21,6 @@ class CSD_TP_Foo_C_Export Foo_C_Statistics private: - unsigned num_remote_clients_; unsigned num_collocated_clients_; unsigned expected_[10]; diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h index cd858e9c49f..d1150f29886 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h @@ -9,7 +9,6 @@ class CSD_TP_Foo_C_Export Foo_C_i : public virtual POA_Foo_C { public: - Foo_C_i(); virtual ~Foo_C_i(); @@ -37,7 +36,6 @@ class CSD_TP_Foo_C_Export Foo_C_i : public virtual POA_Foo_C private: - LongVector in_values_ [10]; unsigned count_[10]; }; diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h index eeddb17762a..40ff9ea636f 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h @@ -8,17 +8,14 @@ class ClientApp : public TestAppBase { public: - ClientApp(); virtual ~ClientApp(); protected: - virtual int run_i(int argc, ACE_TCHAR* argv[]); private: - int parse_args(int argc, ACE_TCHAR* argv[]); ACE_TString ior_; diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h index b0056a179c3..a370109406b 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h @@ -8,18 +8,15 @@ class ServerApp : public TestAppBase { public: - ServerApp(); virtual ~ServerApp(); protected: - virtual int run_i(int argc, ACE_TCHAR* argv[]); private: - int parse_args(int argc, ACE_TCHAR* argv[]); ACE_TString ior_filename_; diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h index 1afc33c0b6e..b688eeb9700 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h @@ -10,16 +10,13 @@ class ClientApp : public TestAppBase { public: - ClientApp(); virtual ~ClientApp(); protected: - virtual int run_i(int argc, ACE_TCHAR* argv[]); private: - // These are all called, in order, by the run_i() method. int init(int argc, ACE_TCHAR* argv[]); void client_setup(void); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h index 32f98b91403..bf9d6e80fad 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h @@ -12,18 +12,15 @@ class ServerApp : public TestAppBase { public: - ServerApp(); virtual ~ServerApp(); protected: - virtual int run_i(int argc, ACE_TCHAR* argv[]); private: - // These are all called, in order, by the run_i() method. int init(int argc, ACE_TCHAR* argv[]); void poa_setup(void); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h index e4b0a709066..8d8bf95dcd7 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h @@ -14,17 +14,14 @@ class ClientApp : public TestAppBase { public: - ClientApp(); virtual ~ClientApp(); protected: - virtual int run_i(int argc, ACE_TCHAR* argv[]); private: - // These are all called, in order, by the run_i() method. int init(int argc, ACE_TCHAR* argv[]); void poa_setup(void); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h index 1be5ea37097..9b6ff34b863 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h @@ -13,18 +13,15 @@ class ServerApp : public TestAppBase { public: - ServerApp(); virtual ~ServerApp(); protected: - virtual int run_i(int argc, ACE_TCHAR* argv[]); private: - // These are all called, in order, by the run_i() method. int init(int argc, ACE_TCHAR* argv[]); void poa_setup(void); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h index f89df26d866..14691ecad41 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h @@ -10,17 +10,14 @@ class ClientApp : public TestAppBase { public: - ClientApp(); virtual ~ClientApp(); protected: - virtual int run_i(int argc, ACE_TCHAR* argv[]); private: - // These are all called, in order, by the run_i() method. int init(int argc, ACE_TCHAR* argv[]); void client_setup(void); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h index 8628996fce9..cdf9226c804 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h @@ -12,18 +12,15 @@ class ServerApp : public TestAppBase { public: - ServerApp(); virtual ~ServerApp(); protected: - virtual int run_i(int argc, ACE_TCHAR* argv[]); private: - // These are all called, in order, by the run_i() method. int init(int argc, ACE_TCHAR* argv[]); void poa_setup(void); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h index eeddb17762a..40ff9ea636f 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h @@ -8,17 +8,14 @@ class ClientApp : public TestAppBase { public: - ClientApp(); virtual ~ClientApp(); protected: - virtual int run_i(int argc, ACE_TCHAR* argv[]); private: - int parse_args(int argc, ACE_TCHAR* argv[]); ACE_TString ior_; diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h index 4c2cf169f29..7440a8de40e 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h @@ -7,16 +7,13 @@ class ServerApp : public TestAppBase { public: - ServerApp(); virtual ~ServerApp(); protected: - virtual int run_i (int argc, ACE_TCHAR *argv[]); private: - int parse_args (int argc, ACE_TCHAR *argv[]); ACE_TString ior_filename_; 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 e58988ba545..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 @@ -390,7 +388,6 @@ WUCS4_UTF16::read_wchar_array_i (ACE_InputCDR & cdr, return 1; } return 0; - } diff --git a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.h b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.h index 539a54522d8..6fae5536a5f 100644 --- a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.h +++ b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.h @@ -81,7 +81,6 @@ private: const ACE_CDR::WChar *x, ACE_CDR::ULong length, ACE_CDR::ULong transmission_length); - }; #include /**/ "ace/post.h" diff --git a/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.h b/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.h index ccf22aabf88..db90c70cd8a 100644 --- a/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.h +++ b/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.h @@ -84,8 +84,6 @@ private: private: CONV_FRAME::CodeSetId tcs_; - - }; #include /**/ "ace/post.h" diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.cpp b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.cpp index 94c6a6a242a..6fc065e8f78 100644 --- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.cpp +++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.cpp @@ -56,5 +56,4 @@ Client_Task::svc (void) } return status; - } diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.h b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.h index cc58f128c58..b6ea6957134 100644 --- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.h +++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.h @@ -14,7 +14,6 @@ class Client_Task : public ACE_Task_Base { public: - /// Constructor Client_Task (const ACE_TCHAR *input, CORBA::ORB_ptr corb, @@ -27,7 +26,6 @@ private: const ACE_TCHAR *input_; CORBA::ORB_var corb_; - }; #include /**/ "ace/post.h" diff --git a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.cpp b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.cpp index 990e1564d52..ee66cf2ba35 100644 --- a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.cpp +++ b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.cpp @@ -55,5 +55,4 @@ Client_Task::svc (void) } return status; - } diff --git a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.h b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.h index cc58f128c58..b6ea6957134 100644 --- a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.h +++ b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.h @@ -14,7 +14,6 @@ class Client_Task : public ACE_Task_Base { public: - /// Constructor Client_Task (const ACE_TCHAR *input, CORBA::ORB_ptr corb, @@ -27,7 +26,6 @@ private: const ACE_TCHAR *input_; CORBA::ORB_var corb_; - }; #include /**/ "ace/post.h" diff --git a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.cpp b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.cpp index 998b8a31cb0..8a3948e0e22 100644 --- a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.cpp +++ b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.cpp @@ -56,5 +56,4 @@ Client_Task::svc (void) } return status; - } diff --git a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.h b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.h index cc58f128c58..b6ea6957134 100644 --- a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.h +++ b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.h @@ -14,7 +14,6 @@ class Client_Task : public ACE_Task_Base { public: - /// Constructor Client_Task (const ACE_TCHAR *input, CORBA::ORB_ptr corb, @@ -27,7 +26,6 @@ private: const ACE_TCHAR *input_; CORBA::ORB_var corb_; - }; #include /**/ "ace/post.h" diff --git a/TAO/tests/Collocated_DerivedIF/Client_Task.cpp b/TAO/tests/Collocated_DerivedIF/Client_Task.cpp index bbd3d5aa183..6bc6a75556b 100644 --- a/TAO/tests/Collocated_DerivedIF/Client_Task.cpp +++ b/TAO/tests/Collocated_DerivedIF/Client_Task.cpp @@ -62,5 +62,4 @@ Client_Task::svc (void) } return status; - } diff --git a/TAO/tests/Collocated_DerivedIF/Client_Task.h b/TAO/tests/Collocated_DerivedIF/Client_Task.h index cc58f128c58..b6ea6957134 100644 --- a/TAO/tests/Collocated_DerivedIF/Client_Task.h +++ b/TAO/tests/Collocated_DerivedIF/Client_Task.h @@ -14,7 +14,6 @@ class Client_Task : public ACE_Task_Base { public: - /// Constructor Client_Task (const ACE_TCHAR *input, CORBA::ORB_ptr corb, @@ -27,7 +26,6 @@ private: const ACE_TCHAR *input_; CORBA::ORB_var corb_; - }; #include /**/ "ace/post.h" diff --git a/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.h b/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.h index 082deef36ee..9fecb7bef81 100644 --- a/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.h +++ b/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.h @@ -30,7 +30,6 @@ class Server_ORBInitializer : public virtual ::CORBA::LocalObject { public: - /// Constructor. Server_ORBInitializer (CORBA::ULong request_pass_count); @@ -43,7 +42,6 @@ public: PortableInterceptor::ServerRequestInterceptor_ptr server_interceptor (void); private: - /// How much requests to pass thru before forwarding. CORBA::ULong request_pass_count_; diff --git a/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.h b/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.h index 78116481ce8..d7924879e43 100644 --- a/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.h +++ b/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.h @@ -26,7 +26,6 @@ class Server_Request_Interceptor public virtual ::CORBA::LocalObject { public: - /// Constructor. Server_Request_Interceptor (CORBA::ULong request_pass_count); @@ -64,7 +63,6 @@ public: //@} private: - /// How much requests to pass thru before forwarding. CORBA::ULong request_pass_count_; diff --git a/TAO/tests/Collocated_Forwarding/test_i.h b/TAO/tests/Collocated_Forwarding/test_i.h index 847217953d8..7cc54392e8a 100644 --- a/TAO/tests/Collocated_Forwarding/test_i.h +++ b/TAO/tests/Collocated_Forwarding/test_i.h @@ -14,7 +14,6 @@ class test_i : public virtual POA_Collocated_ForwardRequestTest::test { public: - /// Constructor. test_i (CORBA::Short id, bool direct, @@ -28,7 +27,6 @@ public: virtual CORBA::Short collocated_call (void); private: - /// Id of this instance. CORBA::Short id_; diff --git a/TAO/tests/Collocated_NoColl/Client_Task.cpp b/TAO/tests/Collocated_NoColl/Client_Task.cpp index 990e1564d52..ee66cf2ba35 100644 --- a/TAO/tests/Collocated_NoColl/Client_Task.cpp +++ b/TAO/tests/Collocated_NoColl/Client_Task.cpp @@ -55,5 +55,4 @@ Client_Task::svc (void) } return status; - } diff --git a/TAO/tests/Collocated_NoColl/Client_Task.h b/TAO/tests/Collocated_NoColl/Client_Task.h index cc58f128c58..b6ea6957134 100644 --- a/TAO/tests/Collocated_NoColl/Client_Task.h +++ b/TAO/tests/Collocated_NoColl/Client_Task.h @@ -14,7 +14,6 @@ class Client_Task : public ACE_Task_Base { public: - /// Constructor Client_Task (const ACE_TCHAR *input, CORBA::ORB_ptr corb, @@ -27,7 +26,6 @@ private: const ACE_TCHAR *input_; CORBA::ORB_var corb_; - }; #include /**/ "ace/post.h" diff --git a/TAO/tests/Collocated_ThruP_Sp/Client_Task.h b/TAO/tests/Collocated_ThruP_Sp/Client_Task.h index cc58f128c58..b6ea6957134 100644 --- a/TAO/tests/Collocated_ThruP_Sp/Client_Task.h +++ b/TAO/tests/Collocated_ThruP_Sp/Client_Task.h @@ -14,7 +14,6 @@ class Client_Task : public ACE_Task_Base { public: - /// Constructor Client_Task (const ACE_TCHAR *input, CORBA::ORB_ptr corb, @@ -27,7 +26,6 @@ private: const ACE_TCHAR *input_; CORBA::ORB_var corb_; - }; #include /**/ "ace/post.h" diff --git a/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.h b/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.h index cc58f128c58..b6ea6957134 100644 --- a/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.h +++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.h @@ -14,7 +14,6 @@ class Client_Task : public ACE_Task_Base { public: - /// Constructor Client_Task (const ACE_TCHAR *input, CORBA::ORB_ptr corb, @@ -27,7 +26,6 @@ private: const ACE_TCHAR *input_; CORBA::ORB_var corb_; - }; #include /**/ "ace/post.h" diff --git a/TAO/tests/Collocation/Collocation_Tester.cpp b/TAO/tests/Collocation/Collocation_Tester.cpp index 9aaf7b50507..86f0234cdc4 100644 --- a/TAO/tests/Collocation/Collocation_Tester.cpp +++ b/TAO/tests/Collocation/Collocation_Tester.cpp @@ -73,7 +73,6 @@ Collocation_Test::init (int argc, ACE_TCHAR *argv[]) return 0; - } int diff --git a/TAO/tests/CollocationLockup/SimpleNamingService.cpp b/TAO/tests/CollocationLockup/SimpleNamingService.cpp index 97aab729a41..f7709a3f02a 100644 --- a/TAO/tests/CollocationLockup/SimpleNamingService.cpp +++ b/TAO/tests/CollocationLockup/SimpleNamingService.cpp @@ -57,7 +57,6 @@ namespace class SimpleNamingService_i : public virtual POA_SimpleNamingService { public: - //FUZZ: disable check_for_lack_ACE_OS virtual void bind (CORBA::Object_ptr obj) { @@ -72,9 +71,7 @@ public: } private: - CORBA::Object_var obj_; - }; int diff --git a/TAO/tests/Collocation_Exception_Test/Client_Task.cpp b/TAO/tests/Collocation_Exception_Test/Client_Task.cpp index 52ce918d128..f7603965ef6 100644 --- a/TAO/tests/Collocation_Exception_Test/Client_Task.cpp +++ b/TAO/tests/Collocation_Exception_Test/Client_Task.cpp @@ -119,5 +119,4 @@ Client_Task::svc (void) } return 0; - } diff --git a/TAO/tests/Collocation_Exception_Test/Client_Task.h b/TAO/tests/Collocation_Exception_Test/Client_Task.h index 0e094e55f62..3cb45fa2d24 100644 --- a/TAO/tests/Collocation_Exception_Test/Client_Task.h +++ b/TAO/tests/Collocation_Exception_Test/Client_Task.h @@ -15,7 +15,6 @@ class Client_Task : public ACE_Task_Base { public: - /// Constructor Client_Task (const ACE_TCHAR *input, CORBA::ORB_ptr corb, diff --git a/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp b/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp index ecb276fa6cb..4c61af68844 100644 --- a/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp +++ b/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp @@ -96,5 +96,4 @@ Client_Task::svc (void) } return 0; - } diff --git a/TAO/tests/Collocation_Oneway_Tests/Client_Task.h b/TAO/tests/Collocation_Oneway_Tests/Client_Task.h index accef8a3c76..6d5980db093 100644 --- a/TAO/tests/Collocation_Oneway_Tests/Client_Task.h +++ b/TAO/tests/Collocation_Oneway_Tests/Client_Task.h @@ -14,7 +14,6 @@ class Client_Task : public ACE_Task_Base { public: - enum ClientSyncModeEnum { MODE_NONE, MODE_TRANSPORT, diff --git a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp index b2075321033..3b3324b9e81 100644 --- a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp +++ b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp @@ -8,7 +8,6 @@ class test_i : public POA_test { public: - test_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa); @@ -91,13 +90,11 @@ test_i::_default_POA (void) class Task : public ACE_Task_Base { public: - Task (CORBA::ORB_ptr orb); int svc (void); CORBA::ORB_var orb_; - }; Task::Task (CORBA::ORB_ptr orb) diff --git a/TAO/tests/Collocation_Tests/Client_Task.cpp b/TAO/tests/Collocation_Tests/Client_Task.cpp index e99d68887d7..5ca5e2cfa3f 100644 --- a/TAO/tests/Collocation_Tests/Client_Task.cpp +++ b/TAO/tests/Collocation_Tests/Client_Task.cpp @@ -46,5 +46,4 @@ Client_Task::svc (void) } return 0; - } diff --git a/TAO/tests/Collocation_Tests/Client_Task.h b/TAO/tests/Collocation_Tests/Client_Task.h index cc58f128c58..b6ea6957134 100644 --- a/TAO/tests/Collocation_Tests/Client_Task.h +++ b/TAO/tests/Collocation_Tests/Client_Task.h @@ -14,7 +14,6 @@ class Client_Task : public ACE_Task_Base { public: - /// Constructor Client_Task (const ACE_TCHAR *input, CORBA::ORB_ptr corb, @@ -27,7 +26,6 @@ private: const ACE_TCHAR *input_; CORBA::ORB_var corb_; - }; #include /**/ "ace/post.h" diff --git a/TAO/tests/Compression/RLECompressorTest.cpp b/TAO/tests/Compression/RLECompressorTest.cpp index 085f655f79e..8de90b314a4 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); @@ -197,7 +196,6 @@ static int init_compressor(::CORBA::ORB_ptr orb) Compression::CompressorFactory_var compr_fact = compressor_factory; manager->register_factory (compr_fact.in ()); - } catch (...) { ACE_ERROR_RETURN((LM_ERROR, ACE_TEXT("ERROR: Unable to initialise RLE compressor manager.\n")),-1); @@ -296,7 +294,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 +523,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) { @@ -571,7 +567,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_DEBUG((LM_INFO, ACE_TEXT("TAO::RLECompression Ratio = %f : 1\n"), tao_ratio)); orb->shutdown (); - } catch (const CORBA::Exception& ex) { ex._tao_print_exception ("RLECompressorTest: UNEXPECTED exception - "); return -1; diff --git a/TAO/tests/Crashed_Callback/Service.h b/TAO/tests/Crashed_Callback/Service.h index 709dfb318db..4630e164764 100644 --- a/TAO/tests/Crashed_Callback/Service.h +++ b/TAO/tests/Crashed_Callback/Service.h @@ -40,7 +40,6 @@ private: private: /// Count the number of tests executed int test_count_; - }; #include /**/ "ace/post.h" diff --git a/TAO/tests/DII_AMI_Forward/DII_ReplyHandler.cpp b/TAO/tests/DII_AMI_Forward/DII_ReplyHandler.cpp index a7ec401629a..467676c1830 100644 --- a/TAO/tests/DII_AMI_Forward/DII_ReplyHandler.cpp +++ b/TAO/tests/DII_AMI_Forward/DII_ReplyHandler.cpp @@ -118,6 +118,4 @@ DII_ReplyHandler::handle_location_forward (TAO_InputCDR &incoming, req->add_in_arg ("text") <<= CORBA::Any::from_string(test_string.in(),30); req->sendc(this); - - } 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/DII_Collocation_Tests/oneway/Client_Task.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp index ca5c1aa295a..f1cfbec1038 100644 --- a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp +++ b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp @@ -203,8 +203,6 @@ Client_Task::svc (void) req = obj->_request ("shutdown"); req->send_oneway (); - - } catch (const CORBA::Exception& ex) { @@ -220,7 +218,6 @@ Client_Task::svc (void) } return 0; - } CORBA::ULong diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.h b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.h index cb4e4fdb7e6..265b6596721 100644 --- a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.h +++ b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.h @@ -14,7 +14,6 @@ class Client_Task : public ACE_Task_Base { public: - /// Constructor Client_Task (const ACE_TCHAR *input, const ACE_TCHAR *simple_test_ior, diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp index 628c447dbe2..8e525bb5aaa 100644 --- a/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp +++ b/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp @@ -339,4 +339,3 @@ CORBA::ULong Hello::error_count () const } - diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp index 1459ceae8b7..340f5d9b3a2 100644 --- a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp +++ b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp @@ -275,8 +275,6 @@ Client_Task::svc (void) req = obj->_request ("shutdown"); req->send_oneway (); - - } catch (const CORBA::Exception& ex) { @@ -292,7 +290,6 @@ Client_Task::svc (void) } return 0; - } CORBA::ULong diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.h b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.h index cb4e4fdb7e6..265b6596721 100644 --- a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.h +++ b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.h @@ -14,7 +14,6 @@ class Client_Task : public ACE_Task_Base { public: - /// Constructor Client_Task (const ACE_TCHAR *input, const ACE_TCHAR *simple_test_ior, diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp index 7d1ea2c57a1..2dbe25a3b22 100644 --- a/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp +++ b/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp @@ -356,4 +356,3 @@ CORBA::ULong Hello::error_count () const } - diff --git a/TAO/tests/DIOP/UDP_Client_i.cpp b/TAO/tests/DIOP/UDP_Client_i.cpp index ec477c40297..eda5079b763 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. @@ -70,7 +69,6 @@ UDP_Client_i::svc (void) // Shut down local ORB, trigger the end of the ORB event loop // in the main thread. orb_->shutdown (); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/DIOP/server.cpp b/TAO/tests/DIOP/server.cpp index e1ba8b5ff02..ed556905685 100644 --- a/TAO/tests/DIOP/server.cpp +++ b/TAO/tests/DIOP/server.cpp @@ -10,7 +10,6 @@ //============================================================================= - #include "UDP_i.h" #include "tao/debug.h" diff --git a/TAO/tests/DLL_ORB/Test_Client_Module.cpp b/TAO/tests/DLL_ORB/Test_Client_Module.cpp index 8d54d570503..b93e888e36c 100644 --- a/TAO/tests/DLL_ORB/Test_Client_Module.cpp +++ b/TAO/tests/DLL_ORB/Test_Client_Module.cpp @@ -179,7 +179,6 @@ Test_Client_Module::svc (void) // is used, i.e. one isn't explicitly loaded prior to initializing // the ORB. (void) this->test_.out (); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/DLL_ORB/Test_Client_Module.h b/TAO/tests/DLL_ORB/Test_Client_Module.h index d2757f8128e..dd3b144c3b5 100644 --- a/TAO/tests/DLL_ORB/Test_Client_Module.h +++ b/TAO/tests/DLL_ORB/Test_Client_Module.h @@ -36,7 +36,6 @@ class Test_Client_Module_Export Test_Client_Module : public ACE_Task_Base { public: - /// Initializes object when dynamic linking occurs. virtual int init (int argc, ACE_TCHAR *argv[]); @@ -47,13 +46,11 @@ public: virtual int svc (); private: - /// Reference to the ORB. CORBA::ORB_var orb_; /// Reference to the test object. Test_var test_; - }; ACE_FACTORY_DECLARE (Test_Client_Module, Test_Client_Module) diff --git a/TAO/tests/DLL_ORB/Test_Server_Module.h b/TAO/tests/DLL_ORB/Test_Server_Module.h index a741049c4ad..7554d491117 100644 --- a/TAO/tests/DLL_ORB/Test_Server_Module.h +++ b/TAO/tests/DLL_ORB/Test_Server_Module.h @@ -36,7 +36,6 @@ class Test_Server_Module_Export Test_Server_Module : public ACE_Task_Base { public: - /// Initializes object when dynamic linking occurs. virtual int init (int argc, ACE_TCHAR *argv[]); @@ -49,7 +48,6 @@ public: virtual ~Test_Server_Module (void); private: - /// Reference to the ORB. CORBA::ORB_var orb_; @@ -61,7 +59,6 @@ private: /// The servant that implements the "Test" object. Test_i servant_; - }; ACE_FACTORY_DECLARE (Test_Server_Module, Test_Server_Module) diff --git a/TAO/tests/DLL_ORB/Test_i.h b/TAO/tests/DLL_ORB/Test_i.h index ba47c75c875..4ad2c2af555 100644 --- a/TAO/tests/DLL_ORB/Test_i.h +++ b/TAO/tests/DLL_ORB/Test_i.h @@ -26,7 +26,6 @@ class Test_i : public virtual POA_Test { public: - /// Constructor. Test_i (void); @@ -42,10 +41,8 @@ public: void orb (CORBA::ORB_ptr orb); private: - /// Pseudo-reference to the ORB. CORBA::ORB_var orb_; - }; #endif /* TEST_I_H */ 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/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp b/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp index fa74efaad3d..5e56a562068 100644 --- a/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp +++ b/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp @@ -77,5 +77,4 @@ My_DII_Reply_Handler::handle_excep (TAO_InputCDR &incoming, ACE_DEBUG((LM_DEBUG, "calling My_DII_Reply_Handler::handle_excep()\n")); this->response_handler_->gateway_exception_reply (reply_status, incoming); - } diff --git a/TAO/tests/DynAny_Test/driver.cpp b/TAO/tests/DynAny_Test/driver.cpp index 22f195a7961..0ea3edfc135 100644 --- a/TAO/tests/DynAny_Test/driver.cpp +++ b/TAO/tests/DynAny_Test/driver.cpp @@ -89,7 +89,6 @@ Driver::init (int argc, ACE_TCHAR *argv[]) "(%N:%l) driver.cpp - " "parse_args failed\n"), -1); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp index 441ded57aca..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, @@ -230,7 +229,6 @@ Test_DynSequence::run_test (void) } - if (this->error_count_ == 0) { ACE_DEBUG ((LM_DEBUG, 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/Dynamic_TP/ORB_ThreadPool/Test_i.h b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.h index ac0847222d2..1aeb8f5a8fd 100644 --- a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.h +++ b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.h @@ -21,7 +21,6 @@ public: private: CORBA::ORB_var orb_; - }; @@ -43,7 +42,6 @@ private: TAO_SYNCH_MUTEX lock_; ACE_Unbounded_Set<ACE_hthread_t> threads_; - }; #include /**/ "ace/post.h" diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/client.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/client.cpp index d658510f4e1..a1650ddd85f 100644 --- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/client.cpp +++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/client.cpp @@ -77,7 +77,6 @@ public: int exs_; private: - ACE_Mutex lock_; Test::Hello_var target_; }; diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/server.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/server.cpp index e31abbae306..1361b7cfd31 100644 --- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/server.cpp +++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/server.cpp @@ -112,8 +112,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) root_poa->destroy (true, true); orb->destroy (); - - } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/client.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/client.cpp index d658510f4e1..a1650ddd85f 100644 --- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/client.cpp +++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/client.cpp @@ -77,7 +77,6 @@ public: int exs_; private: - ACE_Mutex lock_; Test::Hello_var target_; }; diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp index 8a860e19ad8..57f789cdc5f 100644 --- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp +++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp @@ -190,8 +190,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) root_poa->destroy (true, true); orb->destroy (); - - } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/Exposed_Policies/Counter_i.h b/TAO/tests/Exposed_Policies/Counter_i.h index c884f597b83..19464ebc6ff 100644 --- a/TAO/tests/Exposed_Policies/Counter_i.h +++ b/TAO/tests/Exposed_Policies/Counter_i.h @@ -21,7 +21,6 @@ class Counter_Servant : public POA_Counter { public: - // = Ctor-Dtor Declaration Counter_Servant (Policy_Tester *policy_tester); diff --git a/TAO/tests/Exposed_Policies/Policy_Tester.h b/TAO/tests/Exposed_Policies/Policy_Tester.h index 3d4df2b6460..106e2b94dd4 100644 --- a/TAO/tests/Exposed_Policies/Policy_Tester.h +++ b/TAO/tests/Exposed_Policies/Policy_Tester.h @@ -43,7 +43,6 @@ private: const char *msg); private: - int is_initialized_; RTCORBA::RTORB_var rt_orb_; diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp index 81c07d0e08c..be292821e7f 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 = @@ -195,7 +192,6 @@ Policy_Verifier::verify_reference (Counter_ptr object, (pb[i].high != rt_properties->priority_bands ()[i].high))) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Mismatching Priority Band Range!\n"))); - } } } @@ -214,7 +210,6 @@ Policy_Verifier::verify_reference (Counter_ptr object, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nThe Client Protocol Type: %d\n"), protocol_list[i].protocol_type)); - } } diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.h b/TAO/tests/Exposed_Policies/Policy_Verifier.h index d46afcd8962..99ae21b2ab5 100644 --- a/TAO/tests/Exposed_Policies/Policy_Verifier.h +++ b/TAO/tests/Exposed_Policies/Policy_Verifier.h @@ -28,7 +28,6 @@ class Policy_Verifier { public: - // -- Ctor/Dtor -- Policy_Verifier (void); ~Policy_Verifier (void); @@ -46,7 +45,6 @@ private: const char *msg); private: - CORBA::ORB_var orb_; RT_Properties *rt_object_properties_; diff --git a/TAO/tests/Exposed_Policies/RT_Properties.cpp b/TAO/tests/Exposed_Policies/RT_Properties.cpp index 8f90aef7cfc..350a5a8a7ca 100644 --- a/TAO/tests/Exposed_Policies/RT_Properties.cpp +++ b/TAO/tests/Exposed_Policies/RT_Properties.cpp @@ -49,7 +49,6 @@ RT_Properties::read_from (const ACE_TCHAR *file_name) ACE_UNUSED_ARG (n_matched); rt_properties->priority_bands_.length (int_field); - } else if (ACE_OS::strcmp (string_field, "Priority_Range") == 0) { diff --git a/TAO/tests/Exposed_Policies/RT_Properties.h b/TAO/tests/Exposed_Policies/RT_Properties.h index 4f50b96945b..bda1697cd83 100644 --- a/TAO/tests/Exposed_Policies/RT_Properties.h +++ b/TAO/tests/Exposed_Policies/RT_Properties.h @@ -35,7 +35,6 @@ public: const ACE_TCHAR* ior_source (void); private: - RTCORBA::Priority priority_; RTCORBA::PriorityBands priority_bands_; ACE_TString ior_source_; 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/Faults/client.cpp b/TAO/tests/Faults/client.cpp index 8d12a41c115..e935a3990ef 100644 --- a/TAO/tests/Faults/client.cpp +++ b/TAO/tests/Faults/client.cpp @@ -168,7 +168,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } root_poa->destroy (true, true); - } catch (const CORBA::COMM_FAILURE& x) { diff --git a/TAO/tests/Faults/middle.cpp b/TAO/tests/Faults/middle.cpp index ae995dcc6c6..bf9df187fbc 100644 --- a/TAO/tests/Faults/middle.cpp +++ b/TAO/tests/Faults/middle.cpp @@ -122,7 +122,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "middle - event loop finished\n")); root_poa->destroy (true, true); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/File_IO/File_i.h b/TAO/tests/File_IO/File_i.h index 44c7bedce18..62327714b82 100644 --- a/TAO/tests/File_IO/File_i.h +++ b/TAO/tests/File_IO/File_i.h @@ -53,7 +53,6 @@ public: virtual void destroy (void); private: - /// Extracts the ACE_HANDLE from the objectID ACE_HANDLE fd (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/ForwardOnceUponException/client.cpp b/TAO/tests/ForwardOnceUponException/client.cpp index 3ebab564f83..c087183bf73 100644 --- a/TAO/tests/ForwardOnceUponException/client.cpp +++ b/TAO/tests/ForwardOnceUponException/client.cpp @@ -83,7 +83,6 @@ public: void done (); private: - // The ORB reference CORBA::ORB_var orb_; // The exceptions caught. @@ -208,7 +207,6 @@ Worker::svc (void) ACE_DEBUG ((LM_DEBUG, "(%P|%t) unexpected result = %d\n", r)); - } catch (const CORBA::OBJECT_NOT_EXIST &) { diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.h b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.h index 995a5646e39..ca33c1b6446 100644 --- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.h +++ b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.h @@ -23,7 +23,6 @@ public: int svc (void); private: - /// Reference to the test interface Test::Big_Reply_var reply_gen_; diff --git a/TAO/tests/Hang_Shutdown/client.cpp b/TAO/tests/Hang_Shutdown/client.cpp index d5f0e3a45c2..2aa6f4a118b 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 = @@ -212,7 +209,6 @@ namespace Test ACE_Thread_Manager::instance ()->wait (); orb->destroy (); - } catch (const CORBA::Exception& ex) { 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/ICMG_Any_Bug/Hello.h b/TAO/tests/ICMG_Any_Bug/Hello.h index 319f621a6e9..dd62206cfef 100644 --- a/TAO/tests/ICMG_Any_Bug/Hello.h +++ b/TAO/tests/ICMG_Any_Bug/Hello.h @@ -12,7 +12,6 @@ class Hello : public virtual POA_Test::Hello { public: - /// Constructor Hello (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa); @@ -21,7 +20,6 @@ public: virtual void shutdown (void); private: - PortableServer::POA_var poa_; CORBA::ORB_var orb_; diff --git a/TAO/tests/ICMG_Any_Bug/HelloWorld.h b/TAO/tests/ICMG_Any_Bug/HelloWorld.h index 9b4de135534..670eeee37d7 100644 --- a/TAO/tests/ICMG_Any_Bug/HelloWorld.h +++ b/TAO/tests/ICMG_Any_Bug/HelloWorld.h @@ -11,12 +11,10 @@ class HelloWorld : public virtual POA_Test::HelloWorld { public: - HelloWorld (void); /// Constructor virtual char * get_string (void); - }; #include /**/ "ace/post.h" 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/IORManipulation/IORTest.cpp b/TAO/tests/IORManipulation/IORTest.cpp index 581666b8b26..0ae36756d03 100644 --- a/TAO/tests/IORManipulation/IORTest.cpp +++ b/TAO/tests/IORManipulation/IORTest.cpp @@ -201,7 +201,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // Finally generate an exception and quit. // This will generate a NotFound exception. in_count = iorm->is_in_ior (just2.in (), name1.in ()); - } catch (const TAO_IOP::EmptyProfileList& userex) { diff --git a/TAO/tests/IORManipulation/filter/server.cpp b/TAO/tests/IORManipulation/filter/server.cpp index a27a528d62a..7f564a0f61d 100644 --- a/TAO/tests/IORManipulation/filter/server.cpp +++ b/TAO/tests/IORManipulation/filter/server.cpp @@ -7,7 +7,6 @@ class Filter_Localhost: public TAO_IORManip_IIOP_Filter public: virtual CORBA::Boolean profile_info_matches ( const TAO_IORManip_IIOP_Filter::Profile_Info& pinfo); - }; CORBA::Boolean diff --git a/TAO/tests/InterOp-Naming/INS_i.h b/TAO/tests/InterOp-Naming/INS_i.h index 20046dac245..5065310f172 100644 --- a/TAO/tests/InterOp-Naming/INS_i.h +++ b/TAO/tests/InterOp-Naming/INS_i.h @@ -34,7 +34,6 @@ public: private: /// ORB pointer. CORBA::ORB_var orb_; - }; #endif /* INS_I_H */ 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/InterOp-Naming/Server_i.h b/TAO/tests/InterOp-Naming/Server_i.h index 96dca55b8e1..69ce69d0084 100644 --- a/TAO/tests/InterOp-Naming/Server_i.h +++ b/TAO/tests/InterOp-Naming/Server_i.h @@ -38,7 +38,6 @@ public: int run (void); protected: - /// Servant class INS_i servant_; 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/test_i.h b/TAO/tests/MProfile/test_i.h index fd1ccf73069..4b9dad413fb 100644 --- a/TAO/tests/MProfile/test_i.h +++ b/TAO/tests/MProfile/test_i.h @@ -38,7 +38,6 @@ private: CORBA::ORB_var orb_; CORBA::Long val_; - }; #endif /* TAO_MPROFILE_TEST_I_H */ 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_Connection_Timeout/test_i.h b/TAO/tests/MProfile_Connection_Timeout/test_i.h index 4f2b57a5b4d..8882fd2c91b 100644 --- a/TAO/tests/MProfile_Connection_Timeout/test_i.h +++ b/TAO/tests/MProfile_Connection_Timeout/test_i.h @@ -38,7 +38,6 @@ private: CORBA::ORB_var orb_; CORBA::Long val_; - }; #endif /* TAO_MPROFILE_CONNECTION_TIMEOUT_TEST_I_H */ 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/Manager.h b/TAO/tests/MProfile_Forwarding/Manager.h index 7f6aa4f24a7..e1700fbaeb6 100644 --- a/TAO/tests/MProfile_Forwarding/Manager.h +++ b/TAO/tests/MProfile_Forwarding/Manager.h @@ -6,7 +6,6 @@ class Manager { public: - Manager (void); // Ctor diff --git a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp index a16d400c48c..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, @@ -55,7 +54,6 @@ Servant_Locator::preinvoke (const PortableServer::ObjectId &oid, throw PortableServer::ForwardRequest ( CORBA::Object::_duplicate ( server.in ())); - } void 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/MProfile_Forwarding/test_i.h b/TAO/tests/MProfile_Forwarding/test_i.h index d4c5fd07536..e42de5db9fb 100644 --- a/TAO/tests/MProfile_Forwarding/test_i.h +++ b/TAO/tests/MProfile_Forwarding/test_i.h @@ -37,7 +37,6 @@ public: private: CORBA::ORB_var orb_; - }; #if defined(__ACE_INLINE__) diff --git a/TAO/tests/MT_BiDir/Client_Task.cpp b/TAO/tests/MT_BiDir/Client_Task.cpp index 27649c77a50..64c5acf73df 100644 --- a/TAO/tests/MT_BiDir/Client_Task.cpp +++ b/TAO/tests/MT_BiDir/Client_Task.cpp @@ -23,7 +23,6 @@ Client_Task::svc (void) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("(%P|%t) Client_Task::svc exception!!!\n"); - } ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client task finished\n")); diff --git a/TAO/tests/MT_BiDir/Server_Task.cpp b/TAO/tests/MT_BiDir/Server_Task.cpp index c2919011234..e6b3d3e6fcc 100644 --- a/TAO/tests/MT_BiDir/Server_Task.cpp +++ b/TAO/tests/MT_BiDir/Server_Task.cpp @@ -30,7 +30,6 @@ Server_Task::svc (void) this->event_.wait (); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Start doing some work....\n")); 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_NoUpcall_Client_Leader/SharedIntf_i.h b/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.h index 1eca1fcea5e..f2e376eef0d 100644 --- a/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.h +++ b/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.h @@ -10,7 +10,6 @@ class Test_Idl_SharedIntf_i : public virtual POA_Test_Idl::SharedIntf { public: - Test_Idl_SharedIntf_i (CORBA::ORB_ptr orb); virtual ~Test_Idl_SharedIntf_i (void); diff --git a/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.h b/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.h index cd7cde57f25..a304d41726a 100644 --- a/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.h +++ b/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.h @@ -10,7 +10,6 @@ class Test_Idl_SharedIntf_i : public virtual POA_Test_Idl::SharedIntf { public: - Test_Idl_SharedIntf_i (CORBA::ORB_ptr orb); virtual ~Test_Idl_SharedIntf_i (void); void set_upper (const char * ior); diff --git a/TAO/tests/MT_NoUpcall_Connect/client.cpp b/TAO/tests/MT_NoUpcall_Connect/client.cpp index 78d2941f6f4..e954f4735bf 100644 --- a/TAO/tests/MT_NoUpcall_Connect/client.cpp +++ b/TAO/tests/MT_NoUpcall_Connect/client.cpp @@ -47,7 +47,6 @@ public: ACE_DEBUG ((LM_DEBUG, "exception caught on upcall req\n")); upcall_end = upcall_end.now (); } - }; diff --git a/TAO/tests/MT_NoUpcall_Connect/server.cpp b/TAO/tests/MT_NoUpcall_Connect/server.cpp index f691ae823f2..d750cb09e83 100644 --- a/TAO/tests/MT_NoUpcall_Connect/server.cpp +++ b/TAO/tests/MT_NoUpcall_Connect/server.cpp @@ -25,7 +25,6 @@ public: } return 0; } - }; int 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/MT_Timeout/client.cpp b/TAO/tests/MT_Timeout/client.cpp index a1a9569a78b..21e9291f016 100644 --- a/TAO/tests/MT_Timeout/client.cpp +++ b/TAO/tests/MT_Timeout/client.cpp @@ -154,5 +154,3 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) - - diff --git a/TAO/tests/Mixed_Sync_ASync_Events/test_i.h b/TAO/tests/Mixed_Sync_ASync_Events/test_i.h index ef96d582596..2afce180a26 100644 --- a/TAO/tests/Mixed_Sync_ASync_Events/test_i.h +++ b/TAO/tests/Mixed_Sync_ASync_Events/test_i.h @@ -117,6 +117,5 @@ private: }; - #endif /* TAO_MSAE_TEST_I_H */ diff --git a/TAO/tests/Multiple/Collocation_Tester.h b/TAO/tests/Multiple/Collocation_Tester.h index 891f02233f7..fc250810992 100644 --- a/TAO/tests/Multiple/Collocation_Tester.h +++ b/TAO/tests/Multiple/Collocation_Tester.h @@ -27,7 +27,6 @@ struct Quote class Collocation_Tester { public: - // -- Constructor/Destructors -- Collocation_Tester (CORBA::Object_ptr object); @@ -39,7 +38,6 @@ public: private: - // -- Helper Methods -- /// Tests the method accessible thru the diff --git a/TAO/tests/Multiple/Multiple_Impl.h b/TAO/tests/Multiple/Multiple_Impl.h index 5b1ac326083..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,9 +56,7 @@ private: */ class Delegated_Bottom_Impl : public virtual POA_Multiple::Bottom { - public: - // Ctor-Dtor Delegated_Bottom_Impl (Multiple::Bottom_ptr delegate, CORBA::ORB_ptr orb); virtual ~Delegated_Bottom_Impl (void); @@ -76,6 +73,5 @@ private: Multiple::Bottom_var delegate_; CORBA::ORB_var orb_; - }; #endif /* TAO_MULTIPLE_IMPL_H_ */ diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp index 33cdd24ad25..362d4ab9cb3 100644 --- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp +++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp @@ -70,7 +70,6 @@ public: void done (); private: - // The ORB reference CORBA::ORB_var orb_; // The exceptions caught. @@ -202,7 +201,6 @@ Worker::svc (void) ACE_DEBUG ((LM_DEBUG, "(%P|%t) unexpected result = %d\n", r)); - } catch (const CORBA::OBJECT_NOT_EXIST &) { diff --git a/TAO/tests/Muxed_GIOP_Versions/server.cpp b/TAO/tests/Muxed_GIOP_Versions/server.cpp index 3b27ff909d3..5005fe0a71a 100644 --- a/TAO/tests/Muxed_GIOP_Versions/server.cpp +++ b/TAO/tests/Muxed_GIOP_Versions/server.cpp @@ -72,7 +72,6 @@ public: virtual int svc (); private: - /// The orb CORBA::ORB_var orb_; }; @@ -98,7 +97,6 @@ private: // Validate the connection private: - /// The server. Simple_Server_var server_; @@ -280,7 +278,6 @@ SelfClient::svc (void) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Not found it\n")); - } else { @@ -297,7 +294,6 @@ SelfClient::svc (void) // Just make a call this->server_->test_method (i); - } } catch (const CORBA::Exception& ex) 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 9f7bc2f1d3f..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); @@ -77,7 +76,6 @@ private: /// number of loops unsigned long iterations_; - }; /** diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp index 0b8ef63068c..e166bfcfe90 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp @@ -75,7 +75,6 @@ MT_Server::read_ior (ACE_TCHAR *filename) } - int MT_Server::parse_args (void) { diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h index 35d8be77869..ac9b5e5db30 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h +++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h @@ -36,9 +36,7 @@ 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 69fd2f6ef20..b1d934cfa9c 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/server.h +++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.h @@ -33,9 +33,7 @@ */ class MT_Object_Server { - public: - /// Default constructor MT_Object_Server (void); diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp index 787932e6aed..41d91c21896 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp @@ -27,7 +27,6 @@ Object_A_i::~Object_A_i (void) } - void Object_A_i::foo (Initiator_ptr theInitiator_ptr) { @@ -49,7 +48,6 @@ void Object_A_i::finish (void) { this->finish_two_way_call_ = 1; - } void diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp index 0651d0b96d2..826349cd30e 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp @@ -26,13 +26,11 @@ Object_B_i::~Object_B_i (void) } - void 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")); @@ -44,7 +42,6 @@ Object_B_i::foo (Object_A_ptr theObject_A_ptr) ACE_Time_Value pause(0, usecs); ACE_OS::sleep(pause); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h index ad059a2ddcc..23324226af3 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h @@ -33,9 +33,7 @@ */ 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 b645947bffe..b4f312cad07 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h @@ -33,9 +33,7 @@ */ 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 c82d92c6a5e..43cfdb100b7 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h @@ -33,9 +33,7 @@ */ 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/Collocated/Forward/Client_Task.cpp b/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp index 00417759359..41808959dc7 100644 --- a/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp +++ b/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp @@ -179,7 +179,6 @@ Client_Task::svc (void) } return result; - } int diff --git a/TAO/tests/OBV/Collocated/Forward/Client_Task.h b/TAO/tests/OBV/Collocated/Forward/Client_Task.h index 773795e328a..7239ed526b1 100644 --- a/TAO/tests/OBV/Collocated/Forward/Client_Task.h +++ b/TAO/tests/OBV/Collocated/Forward/Client_Task.h @@ -17,7 +17,6 @@ class Client_Task : public ACE_Task_Base { public: - /// Constructor Client_Task (const ACE_TCHAR *input, CORBA::ORB_ptr corb, @@ -38,7 +37,6 @@ private: const ACE_TCHAR *input_; CORBA::ORB_var corb_; - }; #include /**/ "ace/post.h" diff --git a/TAO/tests/OBV/Factory/FactoryC_impl.h b/TAO/tests/OBV/Factory/FactoryC_impl.h index 787054cd7c1..2eb16242ff3 100644 --- a/TAO/tests/OBV/Factory/FactoryC_impl.h +++ b/TAO/tests/OBV/Factory/FactoryC_impl.h @@ -37,7 +37,6 @@ class Value2_impl : public virtual OBV_OBV_FactoryTest::Value2, class Value2_init_impl : public OBV_FactoryTest::Value2_init { public: - virtual OBV_FactoryTest::Value2* create_default ( CORBA::ULong id ); @@ -48,9 +47,7 @@ public: ); public: - virtual CORBA::ValueBase * create_for_unmarshal (void); - }; #endif /* TAO_FACTORY_FACTORY_C_IMPL_H */ diff --git a/TAO/tests/OBV/Forward/client.cpp b/TAO/tests/OBV/Forward/client.cpp index ab5273dcd11..cf08b7f0dee 100644 --- a/TAO/tests/OBV/Forward/client.cpp +++ b/TAO/tests/OBV/Forward/client.cpp @@ -187,7 +187,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test finished\n")); orb->destroy (); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/OBV/Indirection/MessengerClient.cpp b/TAO/tests/OBV/Indirection/MessengerClient.cpp index 226a4cfd028..78b97b1efd8 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()); @@ -88,7 +86,6 @@ int ACE_TMAIN (int ac, ACE_TCHAR* av[]) { } orb->destroy(); - } catch(const CORBA::Exception& e) { std::cerr << e << std::endl; return 1; diff --git a/TAO/tests/OBV/Indirection/Messenger_i.h b/TAO/tests/OBV/Indirection/Messenger_i.h index 14736adccb8..31c99744931 100644 --- a/TAO/tests/OBV/Indirection/Messenger_i.h +++ b/TAO/tests/OBV/Indirection/Messenger_i.h @@ -36,7 +36,6 @@ protected: - //class NodeImpl : public virtual POA_demo::value::idl::Node //class NodeFactory // : public virtual CORBA::ValueFactoryBase diff --git a/TAO/tests/OBV/Simple/Simple_util.cpp b/TAO/tests/OBV/Simple/Simple_util.cpp index 8d9a697ed1e..4f75ce7bbad 100644 --- a/TAO/tests/OBV/Simple/Simple_util.cpp +++ b/TAO/tests/OBV/Simple/Simple_util.cpp @@ -231,7 +231,6 @@ Client<InterfaceObj, Var>::init (const char *name, this->argv_ = argv; - try { // Retrieve the ORB. @@ -260,8 +259,6 @@ Client<InterfaceObj, Var>::init (const char *name, ACE_ERROR_RETURN ((LM_ERROR, "no ior or naming options specified\n"), -1); - - } catch (const CORBA::Exception& ex) { @@ -277,7 +274,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/Simple/Simple_util.h b/TAO/tests/OBV/Simple/Simple_util.h index 6087bf3bd9d..68abbdb1a4f 100644 --- a/TAO/tests/OBV/Simple/Simple_util.h +++ b/TAO/tests/OBV/Simple/Simple_util.h @@ -144,7 +144,6 @@ protected: /// Flag for shutting down the server int shutdown_; - }; #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/tests/OBV/Simple/client.cpp b/TAO/tests/OBV/Simple/client.cpp index 8b8114307c8..78142594b76 100644 --- a/TAO/tests/OBV/Simple/client.cpp +++ b/TAO/tests/OBV/Simple/client.cpp @@ -16,5 +16,4 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return -1; else return 0; - } diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp index 9a2e94ade95..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; @@ -126,14 +125,12 @@ test_impl::pass_vt_graph_out ( ACE_ASSERT (vt_graph_param->size () == 4); vt_graph_param->add_node ("NEW1"); ACE_ASSERT (vt_graph_param->size () == 5); - } 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); @@ -143,11 +140,9 @@ 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); - } void diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.h b/TAO/tests/OBV/Supports/Supports_Test_impl.h index d17bf34b556..590eaca9269 100644 --- a/TAO/tests/OBV/Supports/Supports_Test_impl.h +++ b/TAO/tests/OBV/Supports/Supports_Test_impl.h @@ -11,9 +11,7 @@ class node_impl : public virtual OBV_Supports_Test::Node, public virtual CORBA::DefaultValueRefCountBase { - public: - node_impl (void); node_impl (const char * name); @@ -25,14 +23,11 @@ public: void change_weight (CORBA::Long new_weight); void print (void); - }; class node_init_impl : public Supports_Test::Node_init { - public: - virtual Supports_Test::Node * create (void); virtual CORBA::ValueBase * create_for_unmarshal (void); @@ -44,9 +39,7 @@ class vt_graph_impl : public virtual POA_Supports_Test::vt_graph, public virtual CORBA::DefaultValueRefCountBase { - public: - vt_graph_impl (void); vt_graph_impl (int num_nodes); @@ -61,21 +54,16 @@ class vt_graph_impl : class vt_graph_init_impl : public Supports_Test::vt_graph_init { - public: - virtual Supports_Test::vt_graph * create (void); virtual CORBA::ValueBase * create_for_unmarshal (void); - }; class test_impl : public virtual POA_Supports_Test::test { - public: - test_impl (CORBA::ORB_ptr orb); virtual ~test_impl (void); @@ -97,9 +85,7 @@ class test_impl : virtual void finish (void); private: - CORBA::ORB_var orb_; - }; #endif /* TAO_SUPPORTS_TEST_IMPL_H */ diff --git a/TAO/tests/OBV/Supports/client.cpp b/TAO/tests/OBV/Supports/client.cpp index de74c2e2f51..bce89aa4c2b 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 @@ -177,7 +175,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_ASSERT (test_graph->size () == 6); my_test->pass_obj_graph_inout (test_graph.inout ()); ACE_ASSERT (test_graph->size () == 7); - } my_test->finish (); @@ -187,7 +184,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->destroy (); ACE_DEBUG ((LM_DEBUG, "Client (%P.%t) completed test successfully\n", id)); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/OBV/ValueBox/Test_impl.cpp b/TAO/tests/OBV/ValueBox/Test_impl.cpp index b3b1d97c0e1..9d87012b6b1 100644 --- a/TAO/tests/OBV/ValueBox/Test_impl.cpp +++ b/TAO/tests/OBV/ValueBox/Test_impl.cpp @@ -326,7 +326,6 @@ Test_impl::array_op4 (const ::StringArray p1, } p3 = sa; - } diff --git a/TAO/tests/OBV/ValueBox/Test_impl.h b/TAO/tests/OBV/ValueBox/Test_impl.h index c1895e13793..95b9d4af8e5 100644 --- a/TAO/tests/OBV/ValueBox/Test_impl.h +++ b/TAO/tests/OBV/ValueBox/Test_impl.h @@ -8,7 +8,6 @@ //============================================================================= - #ifndef TAO_TEST_IMPL_H #define TAO_TEST_IMPL_H diff --git a/TAO/tests/OBV/ValueBox/client.cpp b/TAO/tests/OBV/ValueBox/client.cpp index 506cd15686c..c82ad1d6853 100644 --- a/TAO/tests/OBV/ValueBox/client.cpp +++ b/TAO/tests/OBV/ValueBox/client.cpp @@ -125,7 +125,6 @@ int simple_box_test () CORBA::remove_ref (p); return fail; - } // @@ -273,7 +272,6 @@ int test_basic_invocations (Test * test_object) try { - //============================================================ // Test method invocation with boxed value //============================================================ @@ -465,7 +463,6 @@ int test_boxed_string_invocations (Test * test_object) try { - //============================================================ // Test method invocation with boxed value //============================================================ @@ -612,7 +609,6 @@ int test_boxed_sequence (void) } - int test_boxed_sequence_invocations (Test * test_object) { int fail = 0; @@ -622,7 +618,6 @@ int test_boxed_sequence_invocations (Test * test_object) try { - //============================================================ // Test method invocation with boxed value //============================================================ @@ -802,14 +797,12 @@ int test_boxed_struct (void) } - int test_boxed_struct_invocations (Test * test_object) { int fail = 0; try { - //============================================================ // Fixed struct // Test method invocation with boxed value @@ -1026,7 +1019,6 @@ int test_boxed_array() } - int test_boxed_array_invocations (Test * test_object) { int fail = 0; @@ -1173,7 +1165,6 @@ int test_boxed_array_invocations (Test * test_object) p4->_remove_ref (); p5->_remove_ref (); p6->_remove_ref (); - } catch (const CORBA::Exception& ex) { @@ -1273,7 +1264,6 @@ int test_boxed_union() - int test_boxed_union_invocations (Test * test_object) { int fail = 0; @@ -1404,7 +1394,6 @@ int test_boxed_union_invocations (Test * test_object) p4->_remove_ref (); p5->_remove_ref (); p6->_remove_ref (); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/OBV/ValueBox/server.cpp b/TAO/tests/OBV/ValueBox/server.cpp index 31572c07431..927002b4744 100644 --- a/TAO/tests/OBV/ValueBox/server.cpp +++ b/TAO/tests/OBV/ValueBox/server.cpp @@ -100,5 +100,4 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } return 0; - } diff --git a/TAO/tests/ORB_Local_Config/Bug_3049/Test.cpp b/TAO/tests/ORB_Local_Config/Bug_3049/Test.cpp index 168021f9f20..d33a9071f03 100644 --- a/TAO/tests/ORB_Local_Config/Bug_3049/Test.cpp +++ b/TAO/tests/ORB_Local_Config/Bug_3049/Test.cpp @@ -67,7 +67,6 @@ testBug3049 (int , ACE_TCHAR *[]) if (error > 0) return -1; - } catch(const CORBA::Exception& ex) { diff --git a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.h b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.h index 535972f7a3e..4b260fa48c6 100644 --- a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.h +++ b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.h @@ -33,7 +33,6 @@ class Service_Config_DLL_Export Service_Config_DLL : public ACE_Task_Base { public: - /// Constructor. Service_Config_DLL (void); @@ -51,11 +50,9 @@ public: virtual int svc (); private: - /// Directives to be passed to be processed by the Service /// Configurator in separate threads. ACE_TCHAR directive_[2][BUFSIZ]; - }; diff --git a/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp b/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp index a738fa1f230..969d2a7a1ad 100644 --- a/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp +++ b/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp @@ -99,7 +99,6 @@ testOpenDynamicServices (int , ACE_TCHAR *[]) - // @brief Try loading the ORBInitializer_Registry locally int @@ -270,7 +269,6 @@ testORBInitializer_Registry (int , ACE_TCHAR *[]) } - // @brief ... diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h index ec627e5e18e..b6950577a5a 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h @@ -78,7 +78,6 @@ class Service_Config_ORB_DLL_Export Service_Config_ORB_DLL : public ACE_Task_Base { public: - /// Constructor. Service_Config_ORB_DLL (void); ~Service_Config_ORB_DLL (void); 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/ORB_shutdown/server.cpp b/TAO/tests/ORB_shutdown/server.cpp index 22d0339e8ec..a58a78a46f1 100644 --- a/TAO/tests/ORB_shutdown/server.cpp +++ b/TAO/tests/ORB_shutdown/server.cpp @@ -63,7 +63,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) root_poa->destroy (true, true); orb->destroy (); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor.h b/TAO/tests/ORT/ORT_test_IORInterceptor.h index af32bbf24e9..b1ddb06e524 100644 --- a/TAO/tests/ORT/ORT_test_IORInterceptor.h +++ b/TAO/tests/ORT/ORT_test_IORInterceptor.h @@ -33,7 +33,6 @@ class ORT_test_IORInterceptor public virtual ::CORBA::LocalObject { public: - ORT_test_IORInterceptor (void); /** @@ -68,11 +67,9 @@ public: //@} private: - CORBA::Long establish_count_; CORBA::Long components_establish_count_; - }; #if defined(_MSC_VER) diff --git a/TAO/tests/ORT/ORT_test_i.h b/TAO/tests/ORT/ORT_test_i.h index 59e81fb7bbd..41857c1a258 100644 --- a/TAO/tests/ORT/ORT_test_i.h +++ b/TAO/tests/ORT/ORT_test_i.h @@ -21,7 +21,6 @@ class ORT_test_i : public virtual POA_ObjectReferenceTemplate::ORT_test { public: - ORT_test_i (CORBA::ORB_ptr orb); virtual CORBA::Boolean request_server (void); @@ -29,9 +28,7 @@ public: virtual void shutdown (void); private: - 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/ORT/ServerORBInitializer.h b/TAO/tests/ORT/ServerORBInitializer.h index b5584a4c926..c3fc9ea5c28 100644 --- a/TAO/tests/ORT/ServerORBInitializer.h +++ b/TAO/tests/ORT/ServerORBInitializer.h @@ -38,7 +38,6 @@ class ServerORBInitializer : public virtual ::CORBA::LocalObject { public: - /** * @name Methods Required by the ORBInitializer Interface * @@ -55,7 +54,6 @@ public: virtual void post_init ( PortableInterceptor::ORBInitInfo_ptr info); //@} - }; diff --git a/TAO/tests/ORT/ServerRequestInterceptor.h b/TAO/tests/ORT/ServerRequestInterceptor.h index 0c80776ebed..7158157b429 100644 --- a/TAO/tests/ORT/ServerRequestInterceptor.h +++ b/TAO/tests/ORT/ServerRequestInterceptor.h @@ -48,7 +48,6 @@ class ServerRequestInterceptor public virtual ::CORBA::LocalObject { public: - /// Constructor. ServerRequestInterceptor (const char * orb_id, PortableServer::Current_ptr poa_current); @@ -84,7 +83,6 @@ public: //@} private: - /// The ORBid of the ORB with which this interceptor is registered. CORBA::String_var orb_id_; @@ -95,7 +93,6 @@ private: * a child POA, and not the RootPOA. */ PortableServer::Current_var poa_current_; - }; diff --git a/TAO/tests/Objref_Sequence_Test/client.cpp b/TAO/tests/Objref_Sequence_Test/client.cpp index 27798aeba9b..65ad651ab78 100644 --- a/TAO/tests/Objref_Sequence_Test/client.cpp +++ b/TAO/tests/Objref_Sequence_Test/client.cpp @@ -33,9 +33,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - - - try { CORBA::ORB_var orb = @@ -106,7 +103,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t) Calling shutdown\n")); server->shutdown (); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/Objref_Sequence_Test/server.cpp b/TAO/tests/Objref_Sequence_Test/server.cpp index 9dc656d6d0b..027c3d6683b 100644 --- a/TAO/tests/Objref_Sequence_Test/server.cpp +++ b/TAO/tests/Objref_Sequence_Test/server.cpp @@ -73,7 +73,6 @@ ServerServant::CreateExtra (CORBA::ULong len, } - void ServerServant::DeleteExtra (const ServerSequence &seq) { diff --git a/TAO/tests/Oneway_Send_Timeouts/Client.cpp b/TAO/tests/Oneway_Send_Timeouts/Client.cpp index 5bcafb48a2a..47e8bdf21fe 100644 --- a/TAO/tests/Oneway_Send_Timeouts/Client.cpp +++ b/TAO/tests/Oneway_Send_Timeouts/Client.cpp @@ -67,7 +67,6 @@ Client::init (int argc, ACE_TCHAR* argv[]) policy_list[1]->destroy (); - // Timeout with SYNC_SCOPE SYNC_NONE Messaging::SyncScope sync_none = Messaging::SYNC_NONE; CORBA::Any sync_none_any; @@ -132,7 +131,6 @@ Client::init (int argc, ACE_TCHAR* argv[]) policy_list[0]->destroy (); policy_list[1]->destroy (); policy_list.length(0); - } catch( CORBA::Exception& ex) { ACE_ERROR ((LM_ERROR, "(%P|%t) Client::Init> Caught CORBA::Exception %s" diff --git a/TAO/tests/Oneway_Send_Timeouts/Server.cpp b/TAO/tests/Oneway_Send_Timeouts/Server.cpp index d4757949f57..86caa6f0a56 100644 --- a/TAO/tests/Oneway_Send_Timeouts/Server.cpp +++ b/TAO/tests/Oneway_Send_Timeouts/Server.cpp @@ -201,7 +201,6 @@ Server::shutdown () catch( CORBA::Exception& ex) { ACE_ERROR ((LM_ERROR, "(%P|%t) Server::run> Caught CORBA::Exception %s" , ex._info().c_str())); - } shutdown_ = true; diff --git a/TAO/tests/Oneway_Timeouts/client.cpp b/TAO/tests/Oneway_Timeouts/client.cpp index a834bb31de2..355fce05a34 100644 --- a/TAO/tests/Oneway_Timeouts/client.cpp +++ b/TAO/tests/Oneway_Timeouts/client.cpp @@ -301,7 +301,6 @@ namespace } - void reset_buffering (ORB_ptr orb) { Object_var obj = orb->resolve_initial_references ("PolicyCurrent"); @@ -321,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/Oneways_Invoking_Twoways/Client_Task.h b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.h index 33681d004e0..838aee7e9e7 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Client_Task.h +++ b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.h @@ -25,7 +25,6 @@ public: int svc (void); private: - /// Reference to the test interface Test::Sender_var sender_; diff --git a/TAO/tests/POA/Adapter_Activator/server.cpp b/TAO/tests/POA/Adapter_Activator/server.cpp index c3402e28182..7fcbd0d07f0 100644 --- a/TAO/tests/POA/Adapter_Activator/server.cpp +++ b/TAO/tests/POA/Adapter_Activator/server.cpp @@ -47,7 +47,6 @@ reference_counted_test_i::reference_counted_test_i (CORBA::ORB_ptr orb, class Adapter_Activator : public PortableServer::AdapterActivator { public: - Adapter_Activator (PortableServer::POAManager_ptr poa_manager, CORBA::ORB_ptr orb); @@ -58,7 +57,6 @@ public: CORBA::PolicyList second_poa_policies_; private: - PortableServer::POAManager_var poa_manager_; CORBA::ORB_var orb_; }; @@ -238,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/Bug_1592_Regression/ServantLocator.h b/TAO/tests/POA/Bug_1592_Regression/ServantLocator.h index a07b49a3a7b..38caae26934 100644 --- a/TAO/tests/POA/Bug_1592_Regression/ServantLocator.h +++ b/TAO/tests/POA/Bug_1592_Regression/ServantLocator.h @@ -43,7 +43,6 @@ class ServantLocator public virtual ::CORBA::LocalObject { public: - /// Constructor. ServantLocator (CORBA::ORB_ptr orb); @@ -62,18 +61,15 @@ public: bool error_status_; protected: - /// Destructor. ~ServantLocator (void); private: - /// Pseudo-reference to the ORB. CORBA::ORB_var orb_; /// Pointer to the test servant. PortableServer::ServantBase_var servant_; - }; #if defined(_MSC_VER) diff --git a/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.h b/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.h index 0d3727d732e..15846c31dd9 100644 --- a/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.h +++ b/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.h @@ -35,14 +35,12 @@ class Server_ORBInitializer : public virtual ::CORBA::LocalObject { public: - /// Constructor. Server_ORBInitializer (void); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); - }; #if defined(_MSC_VER) diff --git a/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.h b/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.h index ef2db8c3735..df2471c7a8f 100644 --- a/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.h +++ b/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.h @@ -42,7 +42,6 @@ class Server_Request_Interceptor public virtual ::CORBA::LocalObject { public: - /// Constructor. Server_Request_Interceptor (void); @@ -77,10 +76,8 @@ public: //@} protected: - /// Destructor. ~Server_Request_Interceptor (void); - }; #if defined(_MSC_VER) diff --git a/TAO/tests/POA/Bug_1592_Regression/test_i.h b/TAO/tests/POA/Bug_1592_Regression/test_i.h index fbf26abe348..215f5fc1fa3 100644 --- a/TAO/tests/POA/Bug_1592_Regression/test_i.h +++ b/TAO/tests/POA/Bug_1592_Regression/test_i.h @@ -27,7 +27,6 @@ class test_i : public virtual POA_test { public: - /// Constructor. test_i (CORBA::ORB_ptr orb); @@ -37,15 +36,12 @@ public: virtual void shutdown (void); protected: - /// Destructor. ~test_i (void); private: - /// Pseudo-reference to the ORB. CORBA::ORB_var orb_; - }; #endif /* TEST_I_H */ diff --git a/TAO/tests/POA/Bug_2511_Regression/server.cpp b/TAO/tests/POA/Bug_2511_Regression/server.cpp index a0a1aa657cf..7c406cdb756 100644 --- a/TAO/tests/POA/Bug_2511_Regression/server.cpp +++ b/TAO/tests/POA/Bug_2511_Regression/server.cpp @@ -22,7 +22,6 @@ class test_i : public virtual POA_test { public: - test_i (PortableServer::POA_ptr poa); void normal (void); @@ -61,7 +60,6 @@ class Servant_Locator : public PortableServer::ServantLocator { public: - Servant_Locator (PortableServer::POA_ptr poa); ::PortableServer::Servant preinvoke (const PortableServer::ObjectId &, @@ -133,7 +131,6 @@ Servant_Locator::postinvoke (const PortableServer::ObjectId &oid, ACE_DEBUG ((LM_DEBUG, "Servant_Locator::postinvoke for %C.%C\n", name.in (), op )); - } int 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/Database_i.h b/TAO/tests/POA/DSI/Database_i.h index 309adea7bbd..93623274c11 100644 --- a/TAO/tests/POA/DSI/Database_i.h +++ b/TAO/tests/POA/DSI/Database_i.h @@ -14,7 +14,6 @@ class DatabaseImpl { public: - //typedef ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex> DATABASE_MALLOC; typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_Null_Mutex> DATABASE_MALLOC; 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/File_i.h b/TAO/tests/POA/Default_Servant2/File_i.h index e7b2c350ee7..df1e8a47aa9 100644 --- a/TAO/tests/POA/Default_Servant2/File_i.h +++ b/TAO/tests/POA/Default_Servant2/File_i.h @@ -53,7 +53,6 @@ public: virtual void destroy (void); private: - /// Extracts the ACE_HANDLE from the objectID ACE_HANDLE fd (void); 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 00f53cac6ce..2f82d6b08ac 100644 --- a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp +++ b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp @@ -94,7 +94,6 @@ test_object_deactivation (PortableServer::POA_ptr poa, ACE_ASSERT (expected_exception_raised); - poa->activate_object_with_id (id, &servant); @@ -140,13 +139,11 @@ test_object_deactivation (PortableServer::POA_ptr poa, // ACE_ASSERT dissappears in non-debug builds ACE_UNUSED_ARG (expected_exception_raised); - } 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 63e6e97bcdc..5755fb27a36 100644 --- a/TAO/tests/POA/Identity/Identity.cpp +++ b/TAO/tests/POA/Identity/Identity.cpp @@ -18,7 +18,6 @@ class test_i : public POA_test { public: - test_i (PortableServer::POA_ptr poa) : poa_ (PortableServer::POA::_duplicate (poa)) { @@ -30,7 +29,6 @@ public: } protected: - PortableServer::POA_var poa_; }; @@ -483,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/Servant_Activator.cpp b/TAO/tests/POA/Loader/Servant_Activator.cpp index e567d06fb06..4fea526b473 100644 --- a/TAO/tests/POA/Loader/Servant_Activator.cpp +++ b/TAO/tests/POA/Loader/Servant_Activator.cpp @@ -94,5 +94,4 @@ ServantActivator::etherealize (const PortableServer::ObjectId &oid, (*servant_garbage_collector_) (oid, poa, servant); - } diff --git a/TAO/tests/POA/Loader/Server_Manager.cpp b/TAO/tests/POA/Loader/Server_Manager.cpp index 02631843c12..c08515ff8ad 100644 --- a/TAO/tests/POA/Loader/Server_Manager.cpp +++ b/TAO/tests/POA/Loader/Server_Manager.cpp @@ -121,7 +121,6 @@ Server_i::init (int argc, ACE_TCHAR **argv) // Get the POAManager of RootPOA poa_manager_ = root_poa_->the_POAManager (); - } catch (const CORBA::Exception& ex) { @@ -209,7 +208,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 +255,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 +304,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/MT_Servant_Locator/MT_Servant_Locator.cpp b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp index 01f8679bc66..85ccbdeda82 100644 --- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp +++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp @@ -21,7 +21,6 @@ class test_i : public virtual POA_test { public: - test_i (PortableServer::POA_ptr poa); void method (void); @@ -42,7 +41,6 @@ test_i::method (void) class Task : public ACE_Task_Base { public: - void object (test_ptr test); int svc (void); @@ -76,7 +74,6 @@ class Servant_Locator : public PortableServer::ServantLocator { public: - Servant_Locator (PortableServer::POA_ptr poa); ::PortableServer::Servant preinvoke (const PortableServer::ObjectId &, diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp index a3eefb3750b..b2280398638 100644 --- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp +++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp @@ -20,7 +20,6 @@ class test_i : public virtual POA_test { public: - test_i (PortableServer::POA_ptr poa); ~test_i (void); @@ -28,7 +27,6 @@ public: void method (void); PortableServer::POA_var poa_; - }; test_i::test_i (PortableServer::POA_ptr poa) @@ -54,7 +52,6 @@ test_i::method (void) class Object_Activator : public ACE_Task_Base { public: - Object_Activator (ACE_Thread_Manager &thread_manager, PortableServer::POA_ptr poa); @@ -63,7 +60,6 @@ public: ACE_Auto_Event object_activated_; PortableServer::POA_var poa_; - }; @@ -107,7 +103,6 @@ class Servant_Activator : public PortableServer::ServantActivator { public: - Servant_Activator (PortableServer::POA_ptr poa); PortableServer::Servant incarnate (const PortableServer::ObjectId &oid, @@ -122,7 +117,6 @@ public: PortableServer::POA_var poa_; PortableServer::ObjectId_var id_; - }; Servant_Activator::Servant_Activator (PortableServer::POA_ptr poa) 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/Client_Task.cpp b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp index 5a99021e652..a5658c56d49 100644 --- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp +++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp @@ -79,5 +79,4 @@ Client_Task::svc (void) } corb_->destroy (); return status; - } diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.h b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.h index 92a8355c179..a57c7bee437 100644 --- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.h +++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.h @@ -14,7 +14,6 @@ class Client_Task : public ACE_Task_Base { public: - /// Constructor Client_Task (const ACE_TCHAR *input, CORBA::ORB_ptr corb, @@ -29,7 +28,6 @@ private: CORBA::ORB_var corb_; CORBA::Boolean except_; - }; #include /**/ "ace/post.h" 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_Act_Direct_Coll/Server_Task.cpp b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.cpp index 8d7e87ee689..da78afe52c6 100644 --- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.cpp +++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.cpp @@ -90,7 +90,6 @@ Server_Task::svc (void) first_poa = root_poa->create_POA (name.c_str (), poa_manager.in (), policies); - } // Destroy the policy objects as they have been passed to diff --git a/TAO/tests/POA/On_Demand_Activation/server.cpp b/TAO/tests/POA/On_Demand_Activation/server.cpp index 252da700f7b..0d892a9bcc6 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. @@ -149,7 +148,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) first_poa = root_poa->create_POA (name.c_str (), poa_manager.in (), policies); - } PortableServer::POA_var second_poa; @@ -166,7 +164,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) second_poa = root_poa->create_POA (name.c_str (), poa_manager.in (), policies); - } // Destroy the policy objects as they have been passed to diff --git a/TAO/tests/POA/On_Demand_Loading/Servant_Manager.h b/TAO/tests/POA/On_Demand_Loading/Servant_Manager.h index 16aa0032bc6..16b8cdb3228 100644 --- a/TAO/tests/POA/On_Demand_Loading/Servant_Manager.h +++ b/TAO/tests/POA/On_Demand_Loading/Servant_Manager.h @@ -108,6 +108,5 @@ public: * using the unique ObjectId as key. */ SERVANT_MAP servant_map_; - }; #endif /* SERVANT_MANAGER_H */ diff --git a/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp b/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp index b920ffbfda4..897aab72173 100644 --- a/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp +++ b/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp @@ -126,7 +126,6 @@ Server_i::init (int argc, ACE_TCHAR **argv) // Get the POAManager of RootPOA poa_manager_ = root_poa_->the_POAManager (); - } catch (const CORBA::Exception& ex) { 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/POA/TIE/test_i.h b/TAO/tests/POA/TIE/test_i.h index d79a1ebcd1d..498d3620db1 100644 --- a/TAO/tests/POA/TIE/test_i.h +++ b/TAO/tests/POA/TIE/test_i.h @@ -26,7 +26,6 @@ public: virtual CORBA::Long doit (void); protected: - CORBA::Long value_; }; @@ -44,7 +43,6 @@ public: virtual PortableServer::POA_ptr _default_POA (void); protected: - CORBA::Long value_; /// Default poa associated with this servant @@ -54,7 +52,6 @@ protected: class Outer_i { public: - class B_i : public POA_Outer::B { public: @@ -69,7 +66,6 @@ public: virtual PortableServer::POA_ptr _default_POA (void); protected: - CORBA::Long value_; /// Default poa associated with this servant @@ -79,7 +75,6 @@ public: class Inner_i { public: - class C_i : public POA_Outer::Inner::C { public: @@ -94,7 +89,6 @@ public: virtual PortableServer::POA_ptr _default_POA (void); protected: - CORBA::Long value_; /// Default poa associated with this servant diff --git a/TAO/tests/Param_Test/bd_array_seq.cpp b/TAO/tests/Param_Test/bd_array_seq.cpp index 665479c78e3..8616f65d5e4 100644 --- a/TAO/tests/Param_Test/bd_array_seq.cpp +++ b/TAO/tests/Param_Test/bd_array_seq.cpp @@ -128,7 +128,6 @@ Test_Bounded_Array_Sequence::run_sii_test (Param_Test_ptr objref) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_Bounded_Array_Sequence::run_sii_test\n"); - } return -1; } diff --git a/TAO/tests/Param_Test/bd_long_seq.cpp b/TAO/tests/Param_Test/bd_long_seq.cpp index 7354e5c44b6..1e7190fd7ea 100644 --- a/TAO/tests/Param_Test/bd_long_seq.cpp +++ b/TAO/tests/Param_Test/bd_long_seq.cpp @@ -115,7 +115,6 @@ Test_Bounded_Long_Sequence::run_sii_test (Param_Test_ptr objref) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_Bounded_Long_Sequence::run_sii_test\n"); - } return -1; } diff --git a/TAO/tests/Param_Test/bd_short_seq.cpp b/TAO/tests/Param_Test/bd_short_seq.cpp index 4e0a2cf1bbd..a87ad18369c 100644 --- a/TAO/tests/Param_Test/bd_short_seq.cpp +++ b/TAO/tests/Param_Test/bd_short_seq.cpp @@ -121,7 +121,6 @@ Test_Bounded_Short_Sequence::run_sii_test (Param_Test_ptr objref) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_Bounded_Short_Sequence::run_sii_test\n"); - } return -1; } diff --git a/TAO/tests/Param_Test/bd_str_seq.cpp b/TAO/tests/Param_Test/bd_str_seq.cpp index a8f73b80538..fadfb85b3e4 100644 --- a/TAO/tests/Param_Test/bd_str_seq.cpp +++ b/TAO/tests/Param_Test/bd_str_seq.cpp @@ -113,7 +113,6 @@ Test_Bounded_String_Sequence::run_sii_test (Param_Test_ptr objref) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_Bounded_String_Sequence::run_sii_test\n"); - } return -1; } diff --git a/TAO/tests/Param_Test/bd_string.cpp b/TAO/tests/Param_Test/bd_string.cpp index 4295ab113cb..c9062c29397 100644 --- a/TAO/tests/Param_Test/bd_string.cpp +++ b/TAO/tests/Param_Test/bd_string.cpp @@ -126,7 +126,6 @@ Test_Bounded_String::run_sii_test (Param_Test_ptr objref) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_Bounded_String::run_sii_test\n"); - } return -1; } diff --git a/TAO/tests/Param_Test/bd_struct_seq.cpp b/TAO/tests/Param_Test/bd_struct_seq.cpp index c91122d68ab..76456620945 100644 --- a/TAO/tests/Param_Test/bd_struct_seq.cpp +++ b/TAO/tests/Param_Test/bd_struct_seq.cpp @@ -119,7 +119,6 @@ Test_Bounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_Bounded_Struct_Sequence::run_sii_test\n"); - } return -1; } diff --git a/TAO/tests/Param_Test/bd_wstr_seq.cpp b/TAO/tests/Param_Test/bd_wstr_seq.cpp index 544840dd110..6b52e20bf89 100644 --- a/TAO/tests/Param_Test/bd_wstr_seq.cpp +++ b/TAO/tests/Param_Test/bd_wstr_seq.cpp @@ -113,7 +113,6 @@ Test_Bounded_WString_Sequence::run_sii_test (Param_Test_ptr objref) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_Bounded_WString_Sequence::run_sii_test\n"); - } return -1; } diff --git a/TAO/tests/Param_Test/bd_wstring.cpp b/TAO/tests/Param_Test/bd_wstring.cpp index eab4463dedc..904158bd400 100644 --- a/TAO/tests/Param_Test/bd_wstring.cpp +++ b/TAO/tests/Param_Test/bd_wstring.cpp @@ -127,7 +127,6 @@ Test_Bounded_WString::run_sii_test (Param_Test_ptr objref) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_Bounded_WString::run_sii_test\n"); - } return -1; } diff --git a/TAO/tests/Param_Test/big_union.cpp b/TAO/tests/Param_Test/big_union.cpp index 044f92400d0..edaac0d77f3 100644 --- a/TAO/tests/Param_Test/big_union.cpp +++ b/TAO/tests/Param_Test/big_union.cpp @@ -228,7 +228,6 @@ Test_Big_Union::run_sii_test (Param_Test_ptr objref) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_Big_Union::run_sii_test\n"); - } return -1; } diff --git a/TAO/tests/Param_Test/client.cpp b/TAO/tests/Param_Test/client.cpp index 08f1dd6303b..6fa43b8100d 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, @@ -106,7 +105,6 @@ Param_Test_Client<T>::run_sii_test (void) "run_sii_test exception in iteration %d", i)); goto loop_around; - } if (!this->test_object_->check_validity ()) diff --git a/TAO/tests/Param_Test/driver.cpp b/TAO/tests/Param_Test/driver.cpp index 4679ef3e155..c8f09c69933 100644 --- a/TAO/tests/Param_Test/driver.cpp +++ b/TAO/tests/Param_Test/driver.cpp @@ -100,7 +100,6 @@ Driver::init (int argc, ACE_TCHAR **argv) ACE_OS::strcpy (exception_string,"Param_Test::_narrow () failed."); this->objref_ = Param_Test::_narrow (temp.in()); - } catch (const CORBA::Exception& ex) { @@ -616,7 +615,6 @@ Driver::run (void) this->objref_ = Param_Test::_nil (); this->orb_->destroy (); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/Param_Test/fixed_array.cpp b/TAO/tests/Param_Test/fixed_array.cpp index b4e9cf443e7..61f5c079118 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; @@ -107,7 +106,6 @@ Test_Fixed_Array::run_sii_test (Param_Test_ptr objref) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_Fixed_Array::run_sii_test\n"); - } return -1; } diff --git a/TAO/tests/Param_Test/fixed_struct.cpp b/TAO/tests/Param_Test/fixed_struct.cpp index ad71a5f7a03..15c7488bdca 100644 --- a/TAO/tests/Param_Test/fixed_struct.cpp +++ b/TAO/tests/Param_Test/fixed_struct.cpp @@ -106,7 +106,6 @@ Test_Fixed_Struct::run_sii_test (Param_Test_ptr objref) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_Fixed_Struct::run_sii_test\n"); - } return -1; } diff --git a/TAO/tests/Param_Test/nested_struct.cpp b/TAO/tests/Param_Test/nested_struct.cpp index 77402115ff3..c12b5d945c3 100644 --- a/TAO/tests/Param_Test/nested_struct.cpp +++ b/TAO/tests/Param_Test/nested_struct.cpp @@ -132,7 +132,6 @@ Test_Nested_Struct::run_sii_test (Param_Test_ptr objref) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_Nested_Struct::run_sii_test\n"); - } return -1; } diff --git a/TAO/tests/Param_Test/objref.cpp b/TAO/tests/Param_Test/objref.cpp index 469c812224a..74dad5fa189 100644 --- a/TAO/tests/Param_Test/objref.cpp +++ b/TAO/tests/Param_Test/objref.cpp @@ -149,7 +149,6 @@ Test_ObjRef::run_sii_test (Param_Test_ptr objref) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_ObjRef::run_sii_test\n"); - } return -1; } @@ -259,7 +258,6 @@ Test_ObjRef::print_values (void) } - ACE_DEBUG ((LM_DEBUG, "\n=*=*=*=*=*=*" "in = %C, " diff --git a/TAO/tests/Param_Test/objref_struct.cpp b/TAO/tests/Param_Test/objref_struct.cpp index 7f67712e794..188a7011a87 100644 --- a/TAO/tests/Param_Test/objref_struct.cpp +++ b/TAO/tests/Param_Test/objref_struct.cpp @@ -94,7 +94,6 @@ Test_Objref_Struct::init_parameters (Param_Test_ptr objref) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_Objref_Struct::init_parameters\n"); - } return -1; } @@ -132,7 +131,6 @@ Test_Objref_Struct::run_sii_test (Param_Test_ptr objref) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_Objref_Struct::run_sii_test\n"); - } return -1; } @@ -176,7 +174,6 @@ Test_Objref_Struct::check_validity (void) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_Objref_Struct::check_validity\n"); - } return 0; } diff --git a/TAO/tests/Param_Test/recursive_struct.cpp b/TAO/tests/Param_Test/recursive_struct.cpp index 83f03893c24..328bed47e5a 100644 --- a/TAO/tests/Param_Test/recursive_struct.cpp +++ b/TAO/tests/Param_Test/recursive_struct.cpp @@ -119,7 +119,6 @@ Test_Recursive_Struct::run_sii_test (Param_Test_ptr objref) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_Recursive_Struct::run_sii_test\n"); - } return -1; } diff --git a/TAO/tests/Param_Test/recursive_union.cpp b/TAO/tests/Param_Test/recursive_union.cpp index 3b19bc3033e..a6500e251e9 100644 --- a/TAO/tests/Param_Test/recursive_union.cpp +++ b/TAO/tests/Param_Test/recursive_union.cpp @@ -120,7 +120,6 @@ Test_Recursive_Union::run_sii_test (Param_Test_ptr objref) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_Recursive_Union::run_sii_test\n"); - } return -1; } diff --git a/TAO/tests/Param_Test/short.cpp b/TAO/tests/Param_Test/short.cpp index 3cf8c0d1d84..f2b36b8d046 100644 --- a/TAO/tests/Param_Test/short.cpp +++ b/TAO/tests/Param_Test/short.cpp @@ -89,7 +89,6 @@ Test_Short::run_sii_test (Param_Test_ptr objref) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_Short::run_sii_test\n"); - } return -1; } diff --git a/TAO/tests/Param_Test/small_union.cpp b/TAO/tests/Param_Test/small_union.cpp index a1f64a7c57c..a3f799d1576 100644 --- a/TAO/tests/Param_Test/small_union.cpp +++ b/TAO/tests/Param_Test/small_union.cpp @@ -128,7 +128,6 @@ Test_Small_Union::run_sii_test (Param_Test_ptr objref) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_Small_Union::run_sii_test\n"); - } return -1; } diff --git a/TAO/tests/Param_Test/typecode.cpp b/TAO/tests/Param_Test/typecode.cpp index 0e478e64972..edad685cef6 100644 --- a/TAO/tests/Param_Test/typecode.cpp +++ b/TAO/tests/Param_Test/typecode.cpp @@ -119,7 +119,6 @@ Test_TypeCode::run_sii_test (Param_Test_ptr objref) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_TypeCode::run_sii_test\n"); - } return -1; } @@ -127,7 +126,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_any_seq.cpp b/TAO/tests/Param_Test/ub_any_seq.cpp index 07aab1ddf1c..f1e3064a337 100644 --- a/TAO/tests/Param_Test/ub_any_seq.cpp +++ b/TAO/tests/Param_Test/ub_any_seq.cpp @@ -198,7 +198,6 @@ Test_AnySeq::run_sii_test (Param_Test_ptr objref) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_AnySeq::run_sii_test\n"); - } return -1; } diff --git a/TAO/tests/Param_Test/ub_array_seq.cpp b/TAO/tests/Param_Test/ub_array_seq.cpp index f899067802b..b6bc5487c9a 100644 --- a/TAO/tests/Param_Test/ub_array_seq.cpp +++ b/TAO/tests/Param_Test/ub_array_seq.cpp @@ -129,7 +129,6 @@ Test_Array_Sequence::run_sii_test (Param_Test_ptr objref) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_Array_Sequence::run_sii_test\n"); - } return -1; } diff --git a/TAO/tests/Param_Test/ub_long_seq.cpp b/TAO/tests/Param_Test/ub_long_seq.cpp index 21992565ad6..ace32631e54 100644 --- a/TAO/tests/Param_Test/ub_long_seq.cpp +++ b/TAO/tests/Param_Test/ub_long_seq.cpp @@ -109,7 +109,6 @@ Test_Long_Sequence::run_sii_test (Param_Test_ptr objref) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_Long_Sequence::run_sii_test\n"); - } return -1; } diff --git a/TAO/tests/Param_Test/ub_objref_seq.cpp b/TAO/tests/Param_Test/ub_objref_seq.cpp index aabd1d7835a..a0984f2250a 100644 --- a/TAO/tests/Param_Test/ub_objref_seq.cpp +++ b/TAO/tests/Param_Test/ub_objref_seq.cpp @@ -110,7 +110,6 @@ Test_ObjRef_Sequence::init_parameters (Param_Test_ptr objref) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_ObjRef_Sequence::init_parameters\n"); - } return -1; } @@ -140,7 +139,6 @@ Test_ObjRef_Sequence::run_sii_test (Param_Test_ptr objref) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_ObjRef_Sequence::run_sii_test\n"); - } return -1; } @@ -148,7 +146,6 @@ Test_ObjRef_Sequence::run_sii_test (Param_Test_ptr objref) CORBA::Boolean Test_ObjRef_Sequence::check_validity (void) { - try { this->compare (this->in_, @@ -165,7 +162,6 @@ Test_ObjRef_Sequence::check_validity (void) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_ObjRef_Sequence::check_validity"); - } return 0; } @@ -247,7 +243,6 @@ Test_ObjRef_Sequence::compare (const Param_Test::Coffee_Mix &s1, catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_ObjRef_Sequence::compare"); - } return 0; } diff --git a/TAO/tests/Param_Test/ub_short_seq.cpp b/TAO/tests/Param_Test/ub_short_seq.cpp index 9138a7f0acf..c0d44106fe3 100644 --- a/TAO/tests/Param_Test/ub_short_seq.cpp +++ b/TAO/tests/Param_Test/ub_short_seq.cpp @@ -111,7 +111,6 @@ Test_Short_Sequence::run_sii_test (Param_Test_ptr objref) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_Short_Sequence::run_sii_test\n"); - } return -1; } diff --git a/TAO/tests/Param_Test/ub_str_seq.cpp b/TAO/tests/Param_Test/ub_str_seq.cpp index 918bba998e5..42059a4cc16 100644 --- a/TAO/tests/Param_Test/ub_str_seq.cpp +++ b/TAO/tests/Param_Test/ub_str_seq.cpp @@ -115,7 +115,6 @@ Test_String_Sequence::run_sii_test (Param_Test_ptr objref) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_String_Sequence::run_sii_test\n"); - } return -1; } diff --git a/TAO/tests/Param_Test/ub_string.cpp b/TAO/tests/Param_Test/ub_string.cpp index a302f8c7036..c155a65bf85 100644 --- a/TAO/tests/Param_Test/ub_string.cpp +++ b/TAO/tests/Param_Test/ub_string.cpp @@ -127,7 +127,6 @@ Test_Unbounded_String::run_sii_test (Param_Test_ptr objref) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_Unbounded_String::run_sii_test\n"); - } return -1; } diff --git a/TAO/tests/Param_Test/ub_struct_seq.cpp b/TAO/tests/Param_Test/ub_struct_seq.cpp index 17d73b4423c..694796a5990 100644 --- a/TAO/tests/Param_Test/ub_struct_seq.cpp +++ b/TAO/tests/Param_Test/ub_struct_seq.cpp @@ -113,7 +113,6 @@ Test_Struct_Sequence::run_sii_test (Param_Test_ptr objref) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_Struct_Sequence::run_sii_test\n"); - } return -1; } diff --git a/TAO/tests/Param_Test/ub_struct_seq.h b/TAO/tests/Param_Test/ub_struct_seq.h index 4c3ac7ea6db..22c18764a05 100644 --- a/TAO/tests/Param_Test/ub_struct_seq.h +++ b/TAO/tests/Param_Test/ub_struct_seq.h @@ -79,7 +79,6 @@ private: }; - class Test_Unbounded_Struct_Sequence { public: diff --git a/TAO/tests/Param_Test/ub_wstr_seq.cpp b/TAO/tests/Param_Test/ub_wstr_seq.cpp index 5a8a760fa44..c2777d6a899 100644 --- a/TAO/tests/Param_Test/ub_wstr_seq.cpp +++ b/TAO/tests/Param_Test/ub_wstr_seq.cpp @@ -111,7 +111,6 @@ Test_WString_Sequence::run_sii_test (Param_Test_ptr objref) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_WString_Sequence::run_sii_test\n"); - } return -1; } diff --git a/TAO/tests/Param_Test/ub_wstring.cpp b/TAO/tests/Param_Test/ub_wstring.cpp index 2ac6eb0a5f7..0c29105ecc3 100644 --- a/TAO/tests/Param_Test/ub_wstring.cpp +++ b/TAO/tests/Param_Test/ub_wstring.cpp @@ -127,7 +127,6 @@ Test_Unbounded_WString::run_sii_test (Param_Test_ptr objref) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_Unbounded_WString::run_sii_test\n"); - } return -1; } diff --git a/TAO/tests/Param_Test/ulonglong.cpp b/TAO/tests/Param_Test/ulonglong.cpp index 6f17cb122cd..241323e65f2 100644 --- a/TAO/tests/Param_Test/ulonglong.cpp +++ b/TAO/tests/Param_Test/ulonglong.cpp @@ -86,7 +86,6 @@ Test_ULongLong::run_sii_test (Param_Test_ptr objref) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_ULongLong::run_sii_test\n"); - } return -1; } diff --git a/TAO/tests/Param_Test/var_array.cpp b/TAO/tests/Param_Test/var_array.cpp index 845bdeafa58..21b03d99ff2 100644 --- a/TAO/tests/Param_Test/var_array.cpp +++ b/TAO/tests/Param_Test/var_array.cpp @@ -104,7 +104,6 @@ Test_Var_Array::run_sii_test (Param_Test_ptr objref) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_Var_Array::run_sii_test\n"); - } return -1; } diff --git a/TAO/tests/Param_Test/var_struct.cpp b/TAO/tests/Param_Test/var_struct.cpp index 5ff52e1d467..f574a260093 100644 --- a/TAO/tests/Param_Test/var_struct.cpp +++ b/TAO/tests/Param_Test/var_struct.cpp @@ -134,7 +134,6 @@ Test_Var_Struct::run_sii_test (Param_Test_ptr objref) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Test_Var_Struct::run_sii_test\n"); - } return -1; } diff --git a/TAO/tests/Portable_Interceptors/AdvSlotExt/client.cpp b/TAO/tests/Portable_Interceptors/AdvSlotExt/client.cpp index 78f43124d85..4d413d9859a 100644 --- a/TAO/tests/Portable_Interceptors/AdvSlotExt/client.cpp +++ b/TAO/tests/Portable_Interceptors/AdvSlotExt/client.cpp @@ -22,7 +22,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_ERROR, "Got number %d\n", n)); server->shutdown (); - } catch (const ::CORBA::Exception &ex) { 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.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp index 758467497be..bd10a07913b 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp @@ -43,7 +43,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) } - void run_test (Test_Interceptors::Secure_Vault_ptr server) { @@ -136,7 +135,6 @@ run_test (Test_Interceptors::Secure_Vault_ptr server) if (TAO_debug_level > 0 && i % 100 == 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i)); - } marker.dump_stats (ACE_TEXT ("update records method "), gsf, 3); 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/marker.h b/TAO/tests/Portable_Interceptors/Benchmark/marker.h index 032e5d1771a..8d506979e33 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/marker.h +++ b/TAO/tests/Portable_Interceptors/Benchmark/marker.h @@ -6,7 +6,6 @@ class Marker { public: - void accumulate_into (ACE_Throughput_Stats &throughput, int which_method) const; // Accumulate the throughput statistics into <throughput> 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.cpp b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp index 3494d7b5565..292c6e6a067 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp @@ -19,7 +19,6 @@ Secure_Vault_i::authenticate (const char * user) { if (ACE_OS::strcmp (user, "root") != 0) throw Test_Interceptors::Invalid (); - } CORBA::Long 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 b3bc101f5c0..f53eeb2cb07 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h +++ b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h @@ -21,9 +21,7 @@ */ class Visual_i : public POA_Test_Interceptors::Visual { - public: - Visual_i (CORBA::ORB_ptr orb); void normal (CORBA::Long arg); @@ -37,10 +35,8 @@ public: void shutdown (void); private: - /// The ORB pseudo-reference (for shutdown). CORBA::ORB_var orb_; - }; #endif /* TAO_INTERCEPTOR_TEST_I_H */ diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.cpp index 45d43b27eca..04d12398ace 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.cpp @@ -21,5 +21,4 @@ ClientORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) client_interceptor = cri; info->add_client_request_interceptor (client_interceptor.in ()); - } diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.h index 55063792acd..346b31b2b5a 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.h @@ -33,7 +33,6 @@ class ClientORBInitializer : public virtual ::CORBA::LocalObject { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.h b/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.h index 53d5ad3bed2..36235e54b3a 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.h @@ -28,7 +28,6 @@ class ClientRequest_Interceptor public virtual ::CORBA::LocalObject { public: - ClientRequest_Interceptor (void); ~ClientRequest_Interceptor (void); @@ -52,10 +51,8 @@ virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri); static CORBA::Boolean success_flag_; private: - /// Name of the interceptor const char *name_; - }; #if defined(_MSC_VER) #pragma warning(pop) 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 7d4b75dbc4d..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,19 +21,15 @@ */ class Visual_i : public POA_Test_Interceptors::Visual { - public: - Visual_i (CORBA::ORB_ptr orb); void normal (CORBA::Long arg); void shutdown (void); private: - /// The ORB pseudo-reference (for shutdown). CORBA::ORB_var orb_; - }; #endif /* TAO_INTERCEPTOR_TEST_I_H */ diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.cpp index 8b78e2b5f97..b744352dca6 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.cpp @@ -59,7 +59,6 @@ Client_ORBInitializer::post_init ( client_interceptor = interceptor; info->add_client_request_interceptor (client_interceptor.in ()); - } #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.h index 93609cf3607..0d450a559b7 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.h @@ -27,7 +27,6 @@ class Client_ORBInitializer : public virtual ::CORBA::LocalObject { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.h index 6a7adb205d8..f9b84bd9681 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.h @@ -27,7 +27,6 @@ class Client_Request_Interceptor public virtual ::CORBA::LocalObject { public: - /// Constructor. Client_Request_Interceptor (const char *orb_id, const char *first_forward_str, @@ -64,7 +63,6 @@ public: //@} private: - ///The ID of the ORB this interceptor is registered with. CORBA::String_var orb_id_; @@ -80,7 +78,6 @@ private: CORBA::String_var first_forward_str_; CORBA::String_var second_forward_str_; - }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.h index 1f2abcbc24b..5907543ac8b 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.h @@ -26,7 +26,6 @@ class Server_Request_Interceptor public virtual ::CORBA::LocalObject { public: - /// Constructor. Server_Request_Interceptor (void); @@ -61,15 +60,12 @@ public: //@} protected: - /// Destructor. ~Server_Request_Interceptor (void); private: - /// The number of requests intercepted by this interceptor. CORBA::ULong request_count_; - }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/test_i.h b/TAO/tests/Portable_Interceptors/Bug_3079/test_i.h index 6f1099729ed..64c03e24b9f 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3079/test_i.h +++ b/TAO/tests/Portable_Interceptors/Bug_3079/test_i.h @@ -15,7 +15,6 @@ class test_i : public virtual POA_RedirectionTest::test { public: - /// Constructor. test_i (CORBA::Short num, CORBA::ORB_ptr orb); @@ -30,13 +29,11 @@ public: virtual void shutdown (void); private: - /// The number assigned to this object. CORBA::Short number_; /// Pseudo-reference to the ORB. CORBA::ORB_var orb_; - }; #endif /* TEST_I_H */ diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.h index 3d1aedf4e24..965ca540dbb 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.h @@ -29,7 +29,6 @@ class Client_ORBInitializer : public virtual ::CORBA::LocalObject { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h index 143f7b9f0c6..cb3426d1ee7 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h @@ -27,7 +27,6 @@ class Client_Request_Interceptor public virtual ::CORBA::LocalObject { public: - /// Constructor. Client_Request_Interceptor (void); diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/test_i.h b/TAO/tests/Portable_Interceptors/Bug_3080/test_i.h index 6f1099729ed..64c03e24b9f 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3080/test_i.h +++ b/TAO/tests/Portable_Interceptors/Bug_3080/test_i.h @@ -15,7 +15,6 @@ class test_i : public virtual POA_RedirectionTest::test { public: - /// Constructor. test_i (CORBA::Short num, CORBA::ORB_ptr orb); @@ -30,13 +29,11 @@ public: virtual void shutdown (void); private: - /// The number assigned to this object. CORBA::Short number_; /// Pseudo-reference to the ORB. CORBA::ORB_var orb_; - }; #endif /* TEST_I_H */ diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.cpp index ee3dd1054dc..85d6db42080 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.cpp @@ -48,7 +48,6 @@ Client_ORBInitializer::post_init ( client_interceptor = interceptor; info->add_client_request_interceptor (client_interceptor.in ()); - } #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.h index 93609cf3607..0d450a559b7 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.h @@ -27,7 +27,6 @@ class Client_ORBInitializer : public virtual ::CORBA::LocalObject { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/test_i.h b/TAO/tests/Portable_Interceptors/Bug_3582/test_i.h index 8757a4d19ab..04dd1446685 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3582/test_i.h +++ b/TAO/tests/Portable_Interceptors/Bug_3582/test_i.h @@ -16,7 +16,6 @@ class test_i : public virtual POA_RTTest::test { public: - /// Constructor. test_i (CORBA::Short num, CORBA::ORB_ptr orb); @@ -31,7 +30,6 @@ public: virtual void shutdown (void); private: - /// The number assigned to this object. CORBA::Short number_; diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp index 33dbd1eff79..7c427559c30 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp @@ -42,7 +42,6 @@ Client_Task::svc (void) } return 0; - } diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h index a50d948a0a2..b72e0b2835b 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h @@ -15,7 +15,6 @@ class Client_Task : public ACE_Task_Base { public: - /// Constructor Client_Task (const ACE_TCHAR *input, CORBA::ORB_ptr corb, @@ -30,7 +29,6 @@ private: const ACE_TCHAR *input_; CORBA::ORB_var corb_; - }; #include /**/ "ace/post.h" diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h index bfe8918012a..ef18249f61e 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h @@ -25,7 +25,6 @@ class Echo_Collocated_ORBInitializer : public virtual ::CORBA::LocalObject { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); 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/interceptors.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp index fb93e7ba264..948d7cbffa9 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp @@ -116,7 +116,6 @@ Echo_Client_Request_Interceptor::receive_reply ( CORBA::ULong i = 0; // index -- explicitly used to avoid // overloaded operator ambiguity. paramlist[i].argument >>= param; - } else if (ACE_OS::strcmp (op.in (), "calculate") == 0) { @@ -218,7 +217,6 @@ Echo_Server_Request_Interceptor::receive_request ( ACE_DEBUG ((LM_DEBUG, "The arg is %d\n", param)); - } CORBA::String_var tmdi = diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h index 27ee8755b50..84d7fffcbd4 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h @@ -24,7 +24,6 @@ class Echo_Client_Request_Interceptor { // = Client-side echo interceptor. For checking interceptor visually only. public: - Echo_Client_Request_Interceptor (void); // ctor. virtual ~Echo_Client_Request_Interceptor (); 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/Client_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h index bc2ed90101e..45ea7e8eeb8 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h @@ -17,7 +17,6 @@ class Client_Task : public ACE_Task_Base { public: - /// Constructor Client_Task (const ACE_TCHAR *input, CORBA::ORB_ptr corb, @@ -32,7 +31,6 @@ private: const ACE_TCHAR *input_; CORBA::ORB_var corb_; - }; #include /**/ "ace/post.h" 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 5be947e1c67..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,9 +19,7 @@ */ class Visual_i : public virtual POA_Test_Interceptors::Visual { - public: - Visual_i (CORBA::ORB_ptr orb); void normal (CORBA::Long arg); @@ -35,10 +33,8 @@ public: void shutdown (void); private: - /// The ORB pseudo-reference (for shutdown). CORBA::ORB_var orb_; - }; #endif /* SERVICE_CONTEXT_MANIPULATION_COLLOCATED_TEST_I_H */ 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 f50e351c6f2..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 (); @@ -32,7 +31,6 @@ Echo_Server_ORBInitializer::post_init ( server_interceptor = interceptor; info->add_server_request_interceptor (server_interceptor.in ()); - } #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp index 5249375a979..e42b70344ca 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp @@ -135,7 +135,6 @@ Echo_Client_Request_Interceptor::receive_reply (PortableInterceptor::ClientReque { ACE_ERROR ((LM_ERROR, "(%P|%t) All parameters not available\n")); - } CORBA::ULong first = 0, second = 1; // If you dont understand diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp index d852f17e999..36ee9800e63 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp @@ -49,7 +49,6 @@ Client_ORBInitializer::post_init ( client_interceptor = interceptor; info->add_client_request_interceptor (client_interceptor.in ()); - } #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h index b5fdc3533d4..aeb353b6d47 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h @@ -39,7 +39,6 @@ class Client_ORBInitializer : public virtual ::CORBA::LocalObject { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); 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/ForwardRequest/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h index d114eaad4a2..de10ccbcdaf 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h @@ -42,7 +42,6 @@ class Server_ORBInitializer : public virtual ::CORBA::LocalObject { public: - /// Constructor. Server_ORBInitializer (void); @@ -55,7 +54,6 @@ public: PortableInterceptor::ServerRequestInterceptor_ptr server_interceptor (void); private: - /// Pointer to the server request interceptor. ORB is responsible /// for storage. PortableInterceptor::ServerRequestInterceptor_var server_interceptor_; diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp index abb69742827..961fea9f416 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp @@ -154,7 +154,6 @@ Server_Request_Interceptor::send_exception ( this->request_count_ - 2)); throw PortableInterceptor::ForwardRequest (this->obj_[0]); - } } diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h index 7b39129e39c..9d7bb209a90 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h @@ -57,7 +57,6 @@ class Server_Request_Interceptor public virtual ::CORBA::LocalObject { public: - /// Constructor. Server_Request_Interceptor (void); @@ -96,18 +95,15 @@ public: //@} protected: - /// Destructor. ~Server_Request_Interceptor (void); private: - /// The number of requests intercepted by this interceptor. CORBA::ULong request_count_; /// References to the two objects used in this test. CORBA::Object_ptr obj_[2]; - }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h index b090101f442..036615df073 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h @@ -26,7 +26,6 @@ class test_i : public virtual POA_ForwardRequestTest::test { public: - /// Constructor. test_i (CORBA::Short num, CORBA::ORB_ptr orb); @@ -41,13 +40,11 @@ public: virtual void shutdown (void); private: - /// The number assigned to this object. CORBA::Short number_; /// Pseudo-reference to the ORB. CORBA::ORB_var orb_; - }; #endif /* TEST_I_H */ diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h index 98d52470874..b1a2370b447 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h @@ -44,7 +44,6 @@ class FOO_ClientRequestInterceptor public virtual ::CORBA::LocalObject { public: - /// Constructor FOO_ClientRequestInterceptor (IOP::Codec_ptr codec); @@ -79,11 +78,9 @@ public: //@} private: - /// The CDR encapsulation coder/decoder used to retrieve data /// from the CDR encapsulation in the tagged component. IOP::Codec_var codec_; - }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h index b0133e9c020..e3683bcaba5 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h @@ -41,7 +41,6 @@ class FOO_Client_ORBInitializer : public virtual ::CORBA::LocalObject { public: - /** * @name Methods Required by the ORBInitializer Interface * @@ -58,7 +57,6 @@ public: virtual void post_init ( PortableInterceptor::ORBInitInfo_ptr info); //@} - }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h index 9a1a9d29007..2ec40862839 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h @@ -44,7 +44,6 @@ class FOO_IORInterceptor public virtual ::CORBA::LocalObject { public: - /// Constructor FOO_IORInterceptor (IOP::Codec_ptr codec); @@ -80,11 +79,9 @@ public: //@} private: - /// The CDR encapsulation coder/decoder used to encapsulate data /// into a CDR encapsulation. IOP::Codec_var codec_; - }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h index 3b18ab97d9f..e113ae0c8ff 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h @@ -41,7 +41,6 @@ class FOO_IORInterceptor_ORBInitializer : public virtual ::CORBA::LocalObject { public: - /** * @name Methods Required by the ORBInitializer Interface * @@ -58,7 +57,6 @@ public: virtual void post_init ( PortableInterceptor::ORBInitInfo_ptr info); //@} - }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h index 8fac6acd218..2f80d63adc2 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h @@ -27,7 +27,6 @@ class test_i : public virtual POA_FOO::test { public: - /// Constructor. test_i (CORBA::ORB_ptr orb); @@ -35,10 +34,8 @@ public: virtual void shutdown (void); private: - /// Pseudo-reference to the ORB. CORBA::ORB_var orb_; - }; #endif /* TEST_I_H */ diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h index 3d40a03806b..b0153e132fd 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h @@ -40,7 +40,6 @@ class Server_ORBInitializer public virtual ::CORBA::LocalObject { public: - /// Constructor. Server_ORBInitializer (bool & destroy_called); @@ -49,11 +48,9 @@ public: virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: - /// Flag that states whether this interceptor's @c destroy() method /// was called. bool & destroy_called_; - }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h index 5ff49c29e94..3b9097ced24 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h @@ -44,7 +44,6 @@ class Server_Request_Interceptor public virtual ::CORBA::LocalObject { public: - /// Constructor. Server_Request_Interceptor (bool & destroy_called); @@ -79,16 +78,13 @@ public: //@} protected: - /// Destructor. ~Server_Request_Interceptor (void); private: - /// Flag that states whether this interceptor's @c destroy() method /// was called. bool & destroy_called_; - }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.h b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.h index 4c92469bd14..cc9433132db 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.h +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.h @@ -26,7 +26,6 @@ class test_i : public virtual POA_test { public: - /// Constructor. test_i (CORBA::ORB_ptr orb); @@ -40,10 +39,8 @@ public: virtual void shutdown (void); private: - /// Pseudo-reference to the ORB. CORBA::ORB_var orb_; - }; #endif /* TEST_I_H */ diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp index 74b6a11a33f..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) @@ -105,14 +104,12 @@ ServerRequestInterceptor::receive_request ( ACE_DEBUG ((LM_INFO, "(%P|%t) Server side RSC/TSC semantics appear " "to be correct.\n")); - } 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/IORInterceptor.h b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h index 8645f7923fd..8e804293690 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h @@ -43,7 +43,6 @@ class IORInterceptor public virtual ::CORBA::LocalObject { public: - /// Constructor IORInterceptor (void); @@ -67,7 +66,6 @@ public: //@} protected: - /// Destructor. /** * Protected destructor to enforce proper memory management through @@ -76,10 +74,8 @@ protected: ~IORInterceptor (void); private: - /// IORInterceptor successfully called and executed. bool success_; - }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h index 13dbb42bc94..94ac029b363 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h @@ -29,7 +29,6 @@ class Policy public virtual ::CORBA::LocalObject { public: - /// Constructor. Policy (CORBA::ULong val); @@ -43,7 +42,6 @@ public: virtual void destroy (void); protected: - /// Destructor. /** * Protected destructor to enforce proper memory management through @@ -52,10 +50,8 @@ protected: ~Policy (void); private: - /// Pseudo-reference to the ORB. const CORBA::ULong value_; - }; #endif /* POLICY_H */ diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h index e9ae6e787d8..e09da0fda7b 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h @@ -40,7 +40,6 @@ class PolicyFactory public virtual ::CORBA::LocalObject { public: - /** * @name Methods Required by the PolicyFactory Interface * @@ -49,13 +48,11 @@ 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); //@} - }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h index 6abfc989558..0ef06a407d1 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h @@ -41,7 +41,6 @@ class Server_ORBInitializer public virtual ::CORBA::LocalObject { public: - /** * @name Methods Required by the ORBInitializer Interface * @@ -58,7 +57,6 @@ public: virtual void post_init ( PortableInterceptor::ORBInitInfo_ptr info); //@} - }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp index 545aac08305..3136185327b 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp @@ -42,7 +42,6 @@ Client_Task::svc (void) } return 0; - } diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h index 617fef26373..adfccc8b685 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h @@ -15,7 +15,6 @@ class Client_Task : public ACE_Task_Base { public: - /// Constructor Client_Task (const ACE_TCHAR *input, CORBA::ORB_ptr corb, diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h index 9fc120bc16b..f84549feba5 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h @@ -27,7 +27,6 @@ class Echo_Collocated_ORBInitializer : public virtual ::CORBA::LocalObject { public: - Echo_Collocated_ORBInitializer (PortableInterceptor::ProcessingMode server_proc_mode, PortableInterceptor::ProcessingMode client_proc_mode); @@ -37,7 +36,6 @@ public: virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: - PortableInterceptor::ProcessingMode server_processing_mode_; PortableInterceptor::ProcessingMode client_processing_mode_; }; 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..c5c6b00ecc7 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 @@ -122,7 +120,6 @@ Echo_Client_Request_Interceptor::receive_reply ( CORBA::ULong i = 0; // index -- explicitly used to avoid // overloaded operator ambiguity. paramlist[i].argument >>= param; - } else if (ACE_OS::strcmp (op.in (), "calculate") == 0) { @@ -151,7 +148,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 +199,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 @@ -232,7 +227,6 @@ Echo_Server_Request_Interceptor::receive_request ( ACE_DEBUG ((LM_DEBUG, "The arg is %d\n", param)); - } CORBA::String_var tmdi = @@ -247,7 +241,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 +294,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/interceptors.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h index e7a1e47c1ab..db6e103987b 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h @@ -23,7 +23,6 @@ class Echo_Client_Request_Interceptor { // = Client-side echo interceptor. For checking interceptor visually only. public: - Echo_Client_Request_Interceptor (void); // ctor. virtual ~Echo_Client_Request_Interceptor (); 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 c7e728d43c4..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_); @@ -43,7 +42,6 @@ Client_Task::svc (void) } return 0; - } diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h index 6490e7cd1c6..ca32199d1a5 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h @@ -15,7 +15,6 @@ class Client_Task : public ACE_Task_Base { public: - /// Constructor Client_Task (const ACE_TCHAR *input, CORBA::ORB_ptr corb, diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h index 51fdd6e6f9f..1cd1106af9c 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h @@ -28,7 +28,6 @@ class Echo_Client_ORBInitializer : public virtual ::CORBA::LocalObject { public: - Echo_Client_ORBInitializer (PortableInterceptor::ProcessingMode proc_mode); @@ -37,7 +36,6 @@ public: virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: - PortableInterceptor::ProcessingMode processing_mode_; }; diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h index 1918eb4f31f..45b01980a1c 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h @@ -27,7 +27,6 @@ class Echo_Server_ORBInitializer : public virtual ::CORBA::LocalObject { public: - Echo_Server_ORBInitializer (PortableInterceptor::ProcessingMode proc_mode); @@ -36,7 +35,6 @@ public: virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: - PortableInterceptor::ProcessingMode processing_mode_; }; 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/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp index 226dee9377a..911540c26a0 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp @@ -106,7 +106,6 @@ Echo_Client_Request_Interceptor::receive_reply ( CORBA::ULong i = 0; // index -- explicitly used to avoid // overloaded operator ambiguity. paramlist[i].argument >>= param; - } else if (ACE_OS::strcmp (op.in (), "calculate") == 0) { diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h index a62acd3012d..25f0157d033 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h @@ -22,7 +22,6 @@ class Echo_Client_Request_Interceptor { // = Client-side echo interceptor. For checking interceptor visually only. public: - Echo_Client_Request_Interceptor (void); // ctor. virtual ~Echo_Client_Request_Interceptor (); diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp index 955feb9d110..4abd69de234 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp @@ -63,7 +63,6 @@ Echo_Server_Request_Interceptor::receive_request ( ACE_DEBUG ((LM_DEBUG, "The arg is %d\n", param)); - } CORBA::String_var tmdi = 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/Redirection/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp index ee3dd1054dc..85d6db42080 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp @@ -48,7 +48,6 @@ Client_ORBInitializer::post_init ( client_interceptor = interceptor; info->add_client_request_interceptor (client_interceptor.in ()); - } #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h index 93609cf3607..0d450a559b7 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h @@ -27,7 +27,6 @@ class Client_ORBInitializer : public virtual ::CORBA::LocalObject { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h index 6ca5ef7f4b1..116752a998e 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h @@ -30,14 +30,12 @@ class Server_ORBInitializer : public virtual ::CORBA::LocalObject { public: - /// Constructor. Server_ORBInitializer (void); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); - }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/Redirection/test_i.h b/TAO/tests/Portable_Interceptors/Redirection/test_i.h index 6f1099729ed..64c03e24b9f 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/test_i.h +++ b/TAO/tests/Portable_Interceptors/Redirection/test_i.h @@ -15,7 +15,6 @@ class test_i : public virtual POA_RedirectionTest::test { public: - /// Constructor. test_i (CORBA::Short num, CORBA::ORB_ptr orb); @@ -30,13 +29,11 @@ public: virtual void shutdown (void); private: - /// The number assigned to this object. CORBA::Short number_; /// Pseudo-reference to the ORB. CORBA::ORB_var orb_; - }; #endif /* TEST_I_H */ diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.h b/TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.h index 8ea04fa1591..c0f1bb4811f 100644 --- a/TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.h +++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.h @@ -23,7 +23,6 @@ class test_i : public virtual POA_TestModule::test { public: - /// Constructor. test_i (void); 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 b33f1b1692b..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; @@ -67,7 +66,6 @@ Echo_Client_Request_Interceptor::send_request ( #endif /*if 0*/ - // Populate target member of the ClientRequestInfo. // Make the context to send the context to the target @@ -105,7 +103,6 @@ void Echo_Client_Request_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri) { - if (CORBA::is_nil (this->orb_.in ())) { int argc = 0; @@ -180,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..ae3c8de8034 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); @@ -131,7 +130,6 @@ Client::create_widgets (/**/) this->mainwindow_.setLayout(&box_); - } void diff --git a/TAO/tests/QtTests/client.h b/TAO/tests/QtTests/client.h index 838779141b0..c610cb064c2 100644 --- a/TAO/tests/QtTests/client.h +++ b/TAO/tests/QtTests/client.h @@ -22,7 +22,6 @@ class Client : public QObject { Q_OBJECT public: - /// ctor Client (CORBA::ORB_ptr orb, QApplication &app); @@ -47,7 +46,6 @@ public: void shutdown_call (void); private: - /// A push button QPushButton *push_button_; diff --git a/TAO/tests/QtTests/server.cpp b/TAO/tests/QtTests/server.cpp index 18c3b4a3e72..8f9b685715f 100644 --- a/TAO/tests/QtTests/server.cpp +++ b/TAO/tests/QtTests/server.cpp @@ -131,7 +131,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // We choose to run the main Qt event loop.. app.exec (); - } catch (const CORBA::Exception& ex) { 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/Banded_Connections/client.cpp b/TAO/tests/RTCORBA/Banded_Connections/client.cpp index 6942d174cd2..f5bd2732d29 100644 --- a/TAO/tests/RTCORBA/Banded_Connections/client.cpp +++ b/TAO/tests/RTCORBA/Banded_Connections/client.cpp @@ -94,14 +94,12 @@ invocation_exception_test (Test_ptr obj, class Task : public ACE_Task_Base { public: - Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); int svc (void); CORBA::ORB_var orb_; - }; Task::Task (ACE_Thread_Manager &thread_manager, 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 671d565d4b8..679816520a7 100644 --- a/TAO/tests/RTCORBA/Bug_3382_Regression/client.cpp +++ b/TAO/tests/RTCORBA/Bug_3382_Regression/client.cpp @@ -38,7 +38,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) class Task : public ACE_Task_Base { public: - Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); @@ -57,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/Bug_3382_Regression/server.cpp b/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp index 5429782ab61..a98367c6f83 100644 --- a/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp +++ b/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp @@ -100,14 +100,12 @@ parse_args (int argc, ACE_TCHAR *argv[]) class Task : public ACE_Task_Base { public: - Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); int svc (void); CORBA::ORB_var orb_; - }; Task::Task (ACE_Thread_Manager &thread_manager, @@ -213,7 +211,6 @@ Task::svc (void) ACE_DEBUG ((LM_DEBUG, "Final priority of the servant thread" " == its initial priority\n")); - } catch (const ::CORBA::Exception & ex) { diff --git a/TAO/tests/RTCORBA/Bug_3643_Regression/client.cpp b/TAO/tests/RTCORBA/Bug_3643_Regression/client.cpp index 7e0342f40b4..10bad3ad070 100644 --- a/TAO/tests/RTCORBA/Bug_3643_Regression/client.cpp +++ b/TAO/tests/RTCORBA/Bug_3643_Regression/client.cpp @@ -72,14 +72,12 @@ parse_args (int argc, ACE_TCHAR *argv[]) class Task : public ACE_Task_Base { public: - Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); int svc (void); CORBA::ORB_var orb_; - }; Task::Task (ACE_Thread_Manager &thread_manager, diff --git a/TAO/tests/RTCORBA/Bug_3643_Regression/server.cpp b/TAO/tests/RTCORBA/Bug_3643_Regression/server.cpp index e981333a51e..ca3a5bb3ae0 100644 --- a/TAO/tests/RTCORBA/Bug_3643_Regression/server.cpp +++ b/TAO/tests/RTCORBA/Bug_3643_Regression/server.cpp @@ -150,14 +150,12 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, class Task : public ACE_Task_Base { public: - Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); int svc (void); CORBA::ORB_var orb_; - }; Task::Task (ACE_Thread_Manager &thread_manager, 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/client.cpp b/TAO/tests/RTCORBA/Client_Propagated/client.cpp index f6c5804dff7..4241267540d 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/client.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/client.cpp @@ -38,14 +38,12 @@ parse_args (int argc, ACE_TCHAR *argv[]) class Task : public ACE_Task_Base { public: - Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); int svc (void); CORBA::ORB_var orb_; - }; Task::Task (ACE_Thread_Manager &thread_manager, 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/Client_Propagated/server.cpp b/TAO/tests/RTCORBA/Client_Propagated/server.cpp index bbb4f8a5a7d..dade2a7d8d1 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/server.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/server.cpp @@ -102,14 +102,12 @@ parse_args (int argc, ACE_TCHAR *argv[]) class Task : public ACE_Task_Base { public: - Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); int svc (void); CORBA::ORB_var orb_; - }; Task::Task (ACE_Thread_Manager &thread_manager, @@ -213,7 +211,6 @@ Task::svc (void) ACE_DEBUG ((LM_DEBUG, "Final priority of the servant thread" " = its initial priority\n")); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/RTCORBA/Collocation/Collocation.cpp b/TAO/tests/RTCORBA/Collocation/Collocation.cpp index e164eda6df7..5c82afa47e1 100644 --- a/TAO/tests/RTCORBA/Collocation/Collocation.cpp +++ b/TAO/tests/RTCORBA/Collocation/Collocation.cpp @@ -71,7 +71,6 @@ public: void invocation_priority (RTCORBA::Priority); private: - CORBA::ORB_var orb_; PortableServer::POA_var poa_; Tests &tests_; @@ -750,14 +749,12 @@ Server::shutdown (void) class Task : public ACE_Task_Base { public: - Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); int svc (void); CORBA::ORB_var orb_; - }; Task::Task (ACE_Thread_Manager &thread_manager, diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp index c18442452a1..8139491449d 100644 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp +++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp @@ -51,14 +51,12 @@ parse_args (int argc, ACE_TCHAR *argv[]) class Task : public ACE_Task_Base { public: - Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); int svc (void); CORBA::ORB_var orb_; - }; Task::Task (ACE_Thread_Manager &thread_manager, @@ -175,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/Dynamic_Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp index 3de5fa0d2bb..47fb7f623b8 100644 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp +++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp @@ -156,7 +156,6 @@ public: int svc (void); CORBA::ORB_var orb_; - }; Task::Task (ACE_Thread_Manager &thread_manager, diff --git a/TAO/tests/RTCORBA/Linear_Priority/client.cpp b/TAO/tests/RTCORBA/Linear_Priority/client.cpp index 8267d9a2e70..163e344ee67 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/client.cpp +++ b/TAO/tests/RTCORBA/Linear_Priority/client.cpp @@ -154,14 +154,12 @@ Worker_Thread::svc (void) class Task : public ACE_Task_Base { public: - Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); int svc (void); CORBA::ORB_var orb_; - }; Task::Task (ACE_Thread_Manager &thread_manager, diff --git a/TAO/tests/RTCORBA/Linear_Priority/server.cpp b/TAO/tests/RTCORBA/Linear_Priority/server.cpp index 5a6a921115a..5bb397b130c 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/server.cpp +++ b/TAO/tests/RTCORBA/Linear_Priority/server.cpp @@ -22,7 +22,6 @@ public: PortableServer::POA_ptr _default_POA (void); private: - CORBA::ORB_var orb_; PortableServer::POA_var poa_; }; @@ -138,14 +137,12 @@ write_iors_to_file (CORBA::Object_ptr object, class Task : public ACE_Task_Base { public: - Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); int svc (void); CORBA::ORB_var orb_; - }; Task::Task (ACE_Thread_Manager &thread_manager, diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp index bdb4d340acc..778f3d3fda0 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp @@ -143,14 +143,12 @@ check_for_nil (CORBA::Object_ptr obj, const char *msg) class Task : public ACE_Task_Base { public: - Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); int svc (void); CORBA::ORB_var orb_; - }; Task::Task (ACE_Thread_Manager &thread_manager, diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp index 9eb297af4a4..05a61616ea5 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp @@ -90,14 +90,12 @@ check_for_nil (CORBA::Object_ptr obj, const char *msg) class Task : public ACE_Task_Base { public: - Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); int svc (void); CORBA::ORB_var orb_; - }; Task::Task (ACE_Thread_Manager &thread_manager, diff --git a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp index e3e9ce72fac..c9d95704910 100644 --- a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp +++ b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp @@ -22,7 +22,6 @@ public: PortableServer::POA_ptr _default_POA (void); private: - CORBA::ORB_var orb_; PortableServer::POA_var poa_; }; 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/Policy_Combinations/client.cpp b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp index a078e62bc71..345973de395 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp +++ b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp @@ -54,14 +54,12 @@ parse_args (int argc, ACE_TCHAR **argv) class Task : public ACE_Task_Base { public: - Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); int svc (void); CORBA::ORB_var orb_; - }; Task::Task (ACE_Thread_Manager &thread_manager, diff --git a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp index 58ba9bb2226..16e648b1800 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp +++ b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp @@ -25,7 +25,6 @@ public: PortableServer::POA_ptr _default_POA (void); private: - CORBA::ORB_var orb_; PortableServer::POA_var poa_; CORBA::Short server_priority_; @@ -236,7 +235,6 @@ public: void test_lanes_bands_server_declared_poa (void); private: - CORBA::ORB_var orb_; RTCORBA::RTORB_var rt_orb_; PortableServer::POA_var root_poa_; @@ -533,7 +531,6 @@ server::test_lanes_bands_client_propagated_poa (void) ::client_priority + 1, &server::test_bands_client_propagated_poa, "lanes_bands_client_propagated"); - } void @@ -647,14 +644,12 @@ server::test_lanes_bands_server_declared_poa (void) class Task : public ACE_Task_Base { public: - Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); int svc (void); CORBA::ORB_var orb_; - }; Task::Task (ACE_Thread_Manager &thread_manager, diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp index bb1ff6f6332..88bff55664a 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp @@ -59,7 +59,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) class Task : public ACE_Task_Base { public: - Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp index 75130ee1850..1f0ed9048e6 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp @@ -151,14 +151,12 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, class Task : public ACE_Task_Base { public: - Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); int svc (void); CORBA::ORB_var orb_; - }; Task::Task (ACE_Thread_Manager &thread_manager, 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 3477cd371a2..3d0a3128e24 100644 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp @@ -91,9 +91,7 @@ parse_args (int argc, ACE_TCHAR **argv) class Client { - public: - Client (test_ptr test, CORBA::ORB_ptr orb, RTCORBA::Current_ptr current, @@ -114,13 +112,11 @@ public: private: - test_var test_; CORBA::ORB_var orb_; RTCORBA::Current_var current_; RTCORBA::RTORB_var rt_orb_; CORBA::PolicyManager_var policy_manager_; - }; class Worker_Thread : public ACE_Task_Base @@ -367,14 +363,12 @@ Client::reset_policies (void) class Task : public ACE_Task_Base { public: - Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); int svc (void); CORBA::ORB_var orb_; - }; Task::Task (ACE_Thread_Manager &thread_manager, @@ -478,7 +472,6 @@ Task::svc (void) int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { - try { CORBA::ORB_var orb = diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp index 644a7c9ea5b..33c297afc84 100644 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp @@ -37,7 +37,6 @@ public: PortableServer::POA_ptr _default_POA (void); private: - CORBA::ORB_var orb_; PortableServer::POA_var poa_; }; @@ -288,14 +287,12 @@ rt_poa (CORBA::ORB_ptr orb, class Task : public ACE_Task_Base { public: - Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); int svc (void); CORBA::ORB_var orb_; - }; Task::Task (ACE_Thread_Manager &thread_manager, diff --git a/TAO/tests/RTCORBA/RTMutex/server.cpp b/TAO/tests/RTCORBA/RTMutex/server.cpp index f1fb70b5967..6253d484e70 100644 --- a/TAO/tests/RTCORBA/RTMutex/server.cpp +++ b/TAO/tests/RTCORBA/RTMutex/server.cpp @@ -76,7 +76,6 @@ test_mutex_simple (RTCORBA::RTORB_ptr rt_orb) my_mutex->unlock (); rt_orb->destroy_mutex (my_mutex.in ()); - } catch (const CORBA::Exception& ex) { @@ -321,7 +320,6 @@ test_mutex_threads (RTCORBA::RTORB_ptr rt_orb) ACE_Thread_Manager::instance ()->wait (); CORBA::release (mutex); - } catch (const CORBA::Exception& ex) { @@ -443,7 +441,6 @@ test_mutex_try_lock (RTCORBA::RTORB_ptr rt_orb) mutex->unlock (); CORBA::release (mutex); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/RTCORBA/Server_Declared/client.cpp b/TAO/tests/RTCORBA/Server_Declared/client.cpp index 94011da03fe..1a580973dc6 100644 --- a/TAO/tests/RTCORBA/Server_Declared/client.cpp +++ b/TAO/tests/RTCORBA/Server_Declared/client.cpp @@ -125,7 +125,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // Testing over. Shut down Server ORB. server1->shutdown (); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/RTCORBA/Server_Declared/server.cpp b/TAO/tests/RTCORBA/Server_Declared/server.cpp index 78bade30931..4419abc930c 100644 --- a/TAO/tests/RTCORBA/Server_Declared/server.cpp +++ b/TAO/tests/RTCORBA/Server_Declared/server.cpp @@ -192,14 +192,12 @@ create_object (RTPortableServer::POA_ptr poa, class Task : public ACE_Task_Base { public: - Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); int svc (void); CORBA::ORB_var orb_; - }; Task::Task (ACE_Thread_Manager &thread_manager, diff --git a/TAO/tests/RTCORBA/Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Thread_Pool/client.cpp index 6b3ab9377b1..fe8a0c032dd 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/client.cpp +++ b/TAO/tests/RTCORBA/Thread_Pool/client.cpp @@ -50,14 +50,12 @@ parse_args (int argc, ACE_TCHAR *argv[]) class Task : public ACE_Task_Base { public: - Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); int svc (void); CORBA::ORB_var orb_; - }; Task::Task (ACE_Thread_Manager &thread_manager, diff --git a/TAO/tests/RTCORBA/Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Thread_Pool/server.cpp index 93f3a714a7a..2c3b05e739e 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/server.cpp +++ b/TAO/tests/RTCORBA/Thread_Pool/server.cpp @@ -147,14 +147,12 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, class Task : public ACE_Task_Base { public: - Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); int svc (void); CORBA::ORB_var orb_; - }; Task::Task (ACE_Thread_Manager &thread_manager, 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/Scheduler.h b/TAO/tests/RTScheduling/Scheduler.h index 20bab1d2c17..5ab7fd1358a 100644 --- a/TAO/tests/RTScheduling/Scheduler.h +++ b/TAO/tests/RTScheduling/Scheduler.h @@ -9,7 +9,6 @@ public RTScheduling::Scheduler, public ::CORBA::LocalObject { public: - TAO_Scheduler (CORBA::ORB_ptr orb); ~TAO_Scheduler (void); diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp index 292b1e7ba73..346fb25315e 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) @@ -98,7 +97,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) server->two_way (ACE_TEXT_ALWAYS_CHAR(ior.c_str ())); current->end_scheduling_segment (name); - } catch (const CORBA::THREAD_CANCELLED& ) { diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp index 689176c7dc2..a5017e013b7 100644 --- a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp +++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp @@ -9,7 +9,6 @@ const ACE_TCHAR* filename = ACE_TEXT("test.ior"); class test_impl : public POA_test { public: - test_impl (CORBA::ORB_ptr orb, RTScheduling::Current_ptr current) : orb_ (orb), diff --git a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp index 8791b9e4fad..52ed109973a 100644 --- a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp +++ b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp @@ -100,13 +100,10 @@ Thread_Task::svc (void) // End - Nested Scheduling Segment - this->current_->end_scheduling_segment (name); // End - Nested Scheduling Segment this->current_->end_scheduling_segment (name); - - } catch (const CORBA::THREAD_CANCELLED& ) { diff --git a/TAO/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp b/TAO/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp index 4c890461983..f57f9a70e15 100644 --- a/TAO/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp +++ b/TAO/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp @@ -69,7 +69,6 @@ int ACE_TMAIN (int, ACE_TCHAR *[]) Foo_sequence u; Foo_sequence v(u); u = v; - } catch (const ::CORBA::Exception &) { diff --git a/TAO/tests/Sequence_Unit_Tests/string_sequence_element_ut.cpp b/TAO/tests/Sequence_Unit_Tests/string_sequence_element_ut.cpp index 56985021e43..4ae6b243b72 100644 --- a/TAO/tests/Sequence_Unit_Tests/string_sequence_element_ut.cpp +++ b/TAO/tests/Sequence_Unit_Tests/string_sequence_element_ut.cpp @@ -19,7 +19,6 @@ using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO::details; - template<typename charT> struct helper { diff --git a/TAO/tests/Sequence_Unit_Tests/testing_allocation_traits_ut.cpp b/TAO/tests/Sequence_Unit_Tests/testing_allocation_traits_ut.cpp index 51fe07bb213..00be9a2f8e1 100644 --- a/TAO/tests/Sequence_Unit_Tests/testing_allocation_traits_ut.cpp +++ b/TAO/tests/Sequence_Unit_Tests/testing_allocation_traits_ut.cpp @@ -17,7 +17,6 @@ try { statement; } catch(...) { \ using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO::details; - CORBA::ULong const MAXIMUM = 32; template<class value_type> 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/client.cpp b/TAO/tests/Server_Connection_Purging/client.cpp index c0e49323d01..ff54e484019 100644 --- a/TAO/tests/Server_Connection_Purging/client.cpp +++ b/TAO/tests/Server_Connection_Purging/client.cpp @@ -116,7 +116,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // ACE_Time_Value tv (1); // while (singleton->handle_events (&tv) >= 1); - } // Handle events moved to here to prevent this test taking best part 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/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp index 9af4c84e1ce..b8974757c1e 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp +++ b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp @@ -15,7 +15,6 @@ Smart_Test_Factory::create_proxy (Test_ptr proxy) ACE_NEW_RETURN (proxy, Smart_Test_Proxy (proxy), 0); return proxy; - } Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy) diff --git a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h index af205ea5619..3bd7df13a74 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h +++ b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h @@ -2,7 +2,6 @@ class Smart_Test_Factory : public virtual TAO_Test_Default_Proxy_Factory { public: - Smart_Test_Factory (void); virtual Test_ptr create_proxy (Test_ptr proxy); diff --git a/TAO/tests/Smart_Proxies/Benchmark/client.cpp b/TAO/tests/Smart_Proxies/Benchmark/client.cpp index 57c559330aa..8ec4f0bf503 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/client.cpp +++ b/TAO/tests/Smart_Proxies/Benchmark/client.cpp @@ -28,7 +28,6 @@ int register_smart_proxy = 1; class Marker { public: - void accumulate_into (ACE_Throughput_Stats &throughput) const { // Accumulate the throughput statistics into <throughput> @@ -46,7 +45,6 @@ class Marker // get the sample. this->throughput_.sample (throughput_diff, latency_diff); - } private: /// Keep throughput statistics on a per-thread basis diff --git a/TAO/tests/Smart_Proxies/Benchmark/server.cpp b/TAO/tests/Smart_Proxies/Benchmark/server.cpp index c6c407c2e99..4b9bab49faf 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/server.cpp +++ b/TAO/tests/Smart_Proxies/Benchmark/server.cpp @@ -31,7 +31,6 @@ public: private: CORBA::ORB_var orb_; - }; Test_i::Test_i (CORBA::ORB_ptr orb) @@ -87,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/Collocation/Coll_Tester.cpp b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp index 6ea80855fc1..9b5a1e94d74 100644 --- a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp +++ b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp @@ -67,7 +67,6 @@ Collocation_Test::init (int argc, ACE_TCHAR *argv[]) return 0; - } int diff --git a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp index bcda296ad7f..47ae1744758 100644 --- a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp +++ b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp @@ -18,7 +18,6 @@ Smart_Diamond_Top_Factory::create_proxy (Diamond::Top_ptr proxy Smart_Diamond_Top_Proxy (proxy), 0); return proxy; - } Smart_Diamond_Top_Proxy::Smart_Diamond_Top_Proxy (Diamond::Top_ptr proxy) diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp index da799a02038..fc0bbd9672a 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp +++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp @@ -17,7 +17,6 @@ Smart_Test_Factory::create_proxy (Test_ptr proxy) ACE_NEW_RETURN (proxy, Smart_Test_Proxy (proxy), 0); return proxy; - } // The following Factory is used by the <ACE_Service_Config> to diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h index c982fedccc3..04df6b50990 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h +++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h @@ -8,7 +8,6 @@ class ACE_Svc_Export Smart_Test_Factory { public: - Smart_Test_Factory (void); // This method will create the smart_proxy. diff --git a/TAO/tests/Smart_Proxies/On_Demand/server.cpp b/TAO/tests/Smart_Proxies/On_Demand/server.cpp index e6cc247edf7..82be6239c97 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/server.cpp +++ b/TAO/tests/Smart_Proxies/On_Demand/server.cpp @@ -29,7 +29,6 @@ public: private: CORBA::ORB_var orb_; - }; Test_i::Test_i (CORBA::ORB_ptr orb) @@ -84,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/Policy/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp index 4eb3378faa4..f287b8ec477 100644 --- a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp +++ b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp @@ -17,7 +17,6 @@ Smart_Test_Factory::create_proxy (Test_ptr proxy) ACE_NEW_RETURN (proxy, Smart_Test_Proxy (proxy), 0); return proxy; - } Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy) diff --git a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h index 2f64d451b43..99d2d90ad89 100644 --- a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h +++ b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h @@ -3,7 +3,6 @@ class Smart_Test_Factory : public virtual TAO_Test_Default_Proxy_Factory { public: - Smart_Test_Factory (int one_shot_factory = 1); virtual Test_ptr create_proxy (Test_ptr proxy); diff --git a/TAO/tests/Smart_Proxies/Policy/server.cpp b/TAO/tests/Smart_Proxies/Policy/server.cpp index 4e1e4c1fa73..2ea587ee534 100644 --- a/TAO/tests/Smart_Proxies/Policy/server.cpp +++ b/TAO/tests/Smart_Proxies/Policy/server.cpp @@ -29,7 +29,6 @@ public: private: CORBA::ORB_var orb_; - }; Test_i::Test_i (CORBA::ORB_ptr orb) diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp index 097c5217a69..b8a035f4eab 100644 --- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp +++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp @@ -18,7 +18,6 @@ Smart_Test_Factory::create_proxy (Test_ptr proxy) ACE_NEW_RETURN (proxy, Smart_Test_Proxy (proxy), 0); return proxy; - } Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy) 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 00b5e43f2c9..1f358d45de9 100644 --- a/TAO/tests/Smart_Proxies/server.cpp +++ b/TAO/tests/Smart_Proxies/server.cpp @@ -29,7 +29,6 @@ public: private: CORBA::ORB_var orb_; - }; Test_i::Test_i (CORBA::ORB_ptr orb) @@ -84,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/Stack_Recursion/Client_Task.cpp b/TAO/tests/Stack_Recursion/Client_Task.cpp index 25f130a5545..21f5d613490 100644 --- a/TAO/tests/Stack_Recursion/Client_Task.cpp +++ b/TAO/tests/Stack_Recursion/Client_Task.cpp @@ -50,7 +50,6 @@ Client_Task::validate_connections (void) try { this->sender_->ping (); - } catch (const CORBA::Exception&){} } diff --git a/TAO/tests/Stack_Recursion/Client_Task.h b/TAO/tests/Stack_Recursion/Client_Task.h index 85ca7e45a0c..4e3cc6b3dfe 100644 --- a/TAO/tests/Stack_Recursion/Client_Task.h +++ b/TAO/tests/Stack_Recursion/Client_Task.h @@ -25,7 +25,6 @@ public: int svc (void); private: - /// Simple pings to prune up the connections void validate_connections (void); diff --git a/TAO/tests/Stack_Recursion/client.cpp b/TAO/tests/Stack_Recursion/client.cpp index 8b5fd8d0389..65f0e90bdc4 100644 --- a/TAO/tests/Stack_Recursion/client.cpp +++ b/TAO/tests/Stack_Recursion/client.cpp @@ -79,7 +79,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) sender->shutdown (); - orb->destroy (); } catch (const CORBA::Exception& ex) diff --git a/TAO/tests/Storable/Savable.cpp b/TAO/tests/Storable/Savable.cpp index 2bc0a00d7f1..ee4667f0fb8 100644 --- a/TAO/tests/Storable/Savable.cpp +++ b/TAO/tests/Storable/Savable.cpp @@ -10,7 +10,6 @@ const int Savable::bytes_size_max = 128; class Savable_File_Guard: public TAO::Storable_File_Guard { public: - Savable_File_Guard (Savable & savable, Method_Type method_type); ~Savable_File_Guard (); @@ -91,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/Strategies/client.cpp b/TAO/tests/Strategies/client.cpp index 1ef663928e2..a236a8e1d9f 100644 --- a/TAO/tests/Strategies/client.cpp +++ b/TAO/tests/Strategies/client.cpp @@ -48,7 +48,6 @@ class Client public: Client (); // ctor - }; // **************************************************************** 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/Timeout/client.cpp b/TAO/tests/Timeout/client.cpp index 6faa56e1516..463a4e63837 100644 --- a/TAO/tests/Timeout/client.cpp +++ b/TAO/tests/Timeout/client.cpp @@ -165,7 +165,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) - ACE_DEBUG ((LM_DEBUG, "client(%P) Set the ORB policies\n")); @@ -185,8 +184,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) - - ACE_DEBUG ((LM_DEBUG, "client(%P) Set the thread policies\n")); @@ -206,8 +203,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) - - ACE_DEBUG ((LM_DEBUG, "client(%P) Use the object policies\n")); send_echo (object1, orb.in (), timeout_server.in (), t); 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..99eac9cedc2 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 @@ -205,7 +204,6 @@ server_main (int argc, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Server (%P|%t) Invoking orb->destroy ()\n"))); orb->destroy (); - } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/TransportCurrent/Framework/simple.cpp b/TAO/tests/TransportCurrent/Framework/simple.cpp index 5c9f92d54b9..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", @@ -70,7 +68,6 @@ testCurrentLoader (int, char *[]) // ACE_ASSERT (factory != 0); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("testCurrentLoader: OK\n"))); return 0; - } diff --git a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp index 08bcc61a7ed..5fe338c57c1 100644 --- a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp +++ b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp @@ -58,7 +58,6 @@ Current_Test_Impl::test_transport_current (void) } - void Current_Test_Impl::invoked_by_client (void) { diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp index 4e1a630dd06..875a435d594 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) @@ -74,7 +73,6 @@ namespace Test { ACE_TEXT ("push_request_info: Can't track that many requests %d\n"), name.in (), requestID)); - } void @@ -226,7 +224,6 @@ namespace Test { } Server_Request_Interceptor::receive_request_service_contexts (ri); - } void @@ -235,7 +232,6 @@ namespace Test { try { outbound_process_context (ri); - } catch (const CORBA::Exception&) { @@ -247,7 +243,6 @@ namespace Test { } Server_Request_Interceptor::send_reply (ri); - } void @@ -256,8 +251,6 @@ namespace Test { try { outbound_process_context (ri); - - } catch (const CORBA::Exception&) { @@ -266,7 +259,6 @@ namespace Test { ACE_TEXT("%C (%P|%t) Outbound_process_context failed in ") ACE_TEXT("send_exception.\n"), name.in ())); - } Server_Request_Interceptor::send_exception (ri); diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h index 1470c9348f3..01942ade9e3 100644 --- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h +++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h @@ -27,13 +27,11 @@ namespace Test { - class IIOP_Server_Request_Interceptor : public virtual Test::Server_Request_Interceptor , public virtual ::CORBA::LocalObject { public: - /// Constructor. IIOP_Server_Request_Interceptor (const char* orbid, TEST test); @@ -69,7 +67,6 @@ namespace Test //@} protected: - /// process incomming requests context void inbound_process_context (PortableInterceptor::ServerRequestInfo_ptr ri); @@ -87,7 +84,6 @@ namespace Test TAO::Transport::IIOP::Current_ptr resolve_iiop_transport_current (const char* orbid); private: - /// transport ID dtata structure typedef struct EP { CORBA::UShort port_; @@ -112,11 +108,9 @@ namespace Test { return !(this->operator== (ep)); }; - } EndPoint; private: - /// IIOPTraits test status bool iiop_test_successful_; @@ -126,7 +120,6 @@ namespace Test /// Endpoints hash table EndPoint endPoints_[1001]; }; - } // namespace Test #endif /* ISERVER_REQUEST_INTERCEPTOR_H */ 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 b7c0e769a28..56d431e9226 100644 --- a/TAO/tests/TransportCurrent/IIOP/server.cpp +++ b/TAO/tests/TransportCurrent/IIOP/server.cpp @@ -85,7 +85,6 @@ Worker::svc (void) } - /// Main driver int @@ -93,7 +92,6 @@ server_main (int argc, ACE_TCHAR *argv[], Test::Server_Request_Interceptor *cri) { - #if TAO_HAS_TRANSPORT_CURRENT == 1 try @@ -195,7 +193,6 @@ server_main (int argc, server->shutdown (); orb->destroy (); - } catch (const CORBA::Exception& ex) { 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 985ee093b60..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 @@ -41,7 +40,6 @@ namespace Test private: PortableInterceptor::ClientRequestInterceptor_var interceptor_; }; - } #include /**/ "ace/post.h" @@ -49,4 +47,3 @@ namespace Test #endif /* CLIENT_ORBINITIALIZER_T_H */ - 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 5ec9300d868..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); @@ -52,7 +51,6 @@ namespace Test public virtual ::CORBA::LocalObject { public: - /// Constructor. Client_Request_Interceptor (const char *orb_id, TEST test); @@ -113,7 +111,6 @@ namespace Test /// Test function TEST test_; }; - } // namespace Test #endif /* CLIENT_REQUEST_INTERCEPTOR_H */ diff --git a/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h b/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h index 07b0831456d..8339d211416 100644 --- a/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h +++ b/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h @@ -27,7 +27,6 @@ class Current_Test_Impl : public virtual POA_Test::Transport::CurrentTest { public: - /// Constructor. Current_Test_Impl (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, int do_collocated_calls = 1); 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 d90aa84936f..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 @@ -40,7 +39,6 @@ namespace Test private: PortableInterceptor::ServerRequestInterceptor_var interceptor_; }; - } #include /**/ "ace/post.h" 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/Transport_Cache_Manager/Bug_3549_Regression.cpp b/TAO/tests/Transport_Cache_Manager/Bug_3549_Regression.cpp index 77e6554d86c..1c81ed980bb 100644 --- a/TAO/tests/Transport_Cache_Manager/Bug_3549_Regression.cpp +++ b/TAO/tests/Transport_Cache_Manager/Bug_3549_Regression.cpp @@ -73,7 +73,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } orb->destroy (); - } catch (const CORBA::Exception&) { diff --git a/TAO/tests/Transport_Cache_Manager/Bug_3558_Regression.cpp b/TAO/tests/Transport_Cache_Manager/Bug_3558_Regression.cpp index 27c5a224c32..7b3dce3e8bf 100644 --- a/TAO/tests/Transport_Cache_Manager/Bug_3558_Regression.cpp +++ b/TAO/tests/Transport_Cache_Manager/Bug_3558_Regression.cpp @@ -53,7 +53,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } orb->destroy (); - } catch (const CORBA::Exception&) { diff --git a/TAO/tests/Transport_Cache_Manager/mock_tdi.h b/TAO/tests/Transport_Cache_Manager/mock_tdi.h index 91e4b79d78e..a77c0161dcd 100644 --- a/TAO/tests/Transport_Cache_Manager/mock_tdi.h +++ b/TAO/tests/Transport_Cache_Manager/mock_tdi.h @@ -5,6 +5,5 @@ public: u_long hash (void) {return static_cast<u_long> (reinterpret_cast<ptrdiff_t> (this));} mock_tdi *duplicate (void) {return 0;} CORBA::Boolean is_equivalent (const mock_tdi *) {return true;} - }; diff --git a/TAO/tests/Two_Objects/First_i.h b/TAO/tests/Two_Objects/First_i.h index 0d15b14b8d1..9b6f53cc0a1 100644 --- a/TAO/tests/Two_Objects/First_i.h +++ b/TAO/tests/Two_Objects/First_i.h @@ -14,7 +14,6 @@ class First_i : public virtual POA_Two_Objects_Test::First { public: - // Ctor.. First_i (CORBA::ORB_ptr orb, ACE_Auto_Event &two_way_done); @@ -22,7 +21,6 @@ public: void oneway_method (void); private: - /// Use an ORB reference to convert strings to objects and shutdown /// the application. CORBA::ORB_var orb_; diff --git a/TAO/tests/Two_Objects/Object_Factory_i.h b/TAO/tests/Two_Objects/Object_Factory_i.h index 5d7c6f53d26..701a4bfb1df 100644 --- a/TAO/tests/Two_Objects/Object_Factory_i.h +++ b/TAO/tests/Two_Objects/Object_Factory_i.h @@ -14,7 +14,6 @@ class Object_Factory_i : public virtual POA_Two_Objects_Test::Object_Factory { public: - Object_Factory_i (CORBA::ORB_ptr orb, CORBA::ULong len); 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/Second_i.h b/TAO/tests/Two_Objects/Second_i.h index c4f54572700..895dc85b823 100644 --- a/TAO/tests/Two_Objects/Second_i.h +++ b/TAO/tests/Two_Objects/Second_i.h @@ -13,7 +13,6 @@ class Second_i : public virtual POA_Two_Objects_Test::Second { public: - Second_i ( CORBA::ORB_ptr orb, CORBA::ULong len, ACE_Auto_Event &two_way_done); 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/Two_Objects/worker.h b/TAO/tests/Two_Objects/worker.h index 2e50f9c9982..82dba9770b1 100644 --- a/TAO/tests/Two_Objects/worker.h +++ b/TAO/tests/Two_Objects/worker.h @@ -10,7 +10,6 @@ class Worker : public ACE_Task_Base { public: - // Ctor Worker (CORBA::ORB_ptr orb); diff --git a/TAO/tests/UNKNOWN_Exception/server.cpp b/TAO/tests/UNKNOWN_Exception/server.cpp index 1245a1f3650..71855f95da3 100644 --- a/TAO/tests/UNKNOWN_Exception/server.cpp +++ b/TAO/tests/UNKNOWN_Exception/server.cpp @@ -16,7 +16,6 @@ class test_i : public POA_test { public: - test_i (CORBA::ORB_ptr orb); void normal_method (void); @@ -104,7 +103,6 @@ class test_factory_i : public POA_test_factory { public: - test_factory_i (CORBA::ORB_ptr orb); test_ptr create_test (void); diff --git a/TAO/tests/Xt_Stopwatch/Client.h b/TAO/tests/Xt_Stopwatch/Client.h index 8d4507c83aa..d46ed4ca6f1 100644 --- a/TAO/tests/Xt_Stopwatch/Client.h +++ b/TAO/tests/Xt_Stopwatch/Client.h @@ -20,7 +20,6 @@ class Control; class Client { public: - /// ctor Client (CORBA::ORB_ptr orb); @@ -44,7 +43,6 @@ public: void parse_args (int argc, ACE_TCHAR *argv[]); private: - /// The ORB CORBA::ORB_var orb_; diff --git a/TAO/tests/Xt_Stopwatch/Control.h b/TAO/tests/Xt_Stopwatch/Control.h index ecda322aef1..2a80f83d474 100644 --- a/TAO/tests/Xt_Stopwatch/Control.h +++ b/TAO/tests/Xt_Stopwatch/Control.h @@ -39,7 +39,6 @@ class Control Widget& stopwidget (void); private: - /// A frame widget... Widget frame_; @@ -51,7 +50,6 @@ class Control /// Pushbutton widget that is used to stop the timer.. Widget stopwidget_; - }; diff --git a/TAO/tests/Xt_Stopwatch/Stopwatch_display.h b/TAO/tests/Xt_Stopwatch/Stopwatch_display.h index 16b2227b330..fcba4acadd9 100644 --- a/TAO/tests/Xt_Stopwatch/Stopwatch_display.h +++ b/TAO/tests/Xt_Stopwatch/Stopwatch_display.h @@ -19,7 +19,6 @@ class Stopwatch_display { public: - /// Stopwatch_display constructor Stopwatch_display (Widget &parent); diff --git a/TAO/tests/Xt_Stopwatch/timer.h b/TAO/tests/Xt_Stopwatch/timer.h index 48979fd954b..3870a4c7599 100644 --- a/TAO/tests/Xt_Stopwatch/timer.h +++ b/TAO/tests/Xt_Stopwatch/timer.h @@ -20,7 +20,6 @@ class Timer_imp { public: - /// Constructor Timer_imp (XtAppContext &, CORBA::Long, @@ -39,7 +38,6 @@ class Timer_imp CORBA::Float elapsed_time (void); private: - /// Static member function used for TimeOut callback. static void tick_callback (XtPointer, XtIntervalId *); 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/AddNameServerDlg.h b/TAO/utils/NamingViewer/AddNameServerDlg.h index 56b86500e2d..0dcdc561196 100644 --- a/TAO/utils/NamingViewer/AddNameServerDlg.h +++ b/TAO/utils/NamingViewer/AddNameServerDlg.h @@ -33,7 +33,6 @@ public: // Implementation protected: - // Generated message map functions //{{AFX_MSG(CAddNameServerDlg) virtual void OnOK(); diff --git a/TAO/utils/NamingViewer/BindDialog.h b/TAO/utils/NamingViewer/BindDialog.h index 27ce08764ee..384bb7a7be1 100644 --- a/TAO/utils/NamingViewer/BindDialog.h +++ b/TAO/utils/NamingViewer/BindDialog.h @@ -37,7 +37,6 @@ public: // Implementation protected: - // Generated message map functions //{{AFX_MSG(CBindDialog) afx_msg void OnViewior(); diff --git a/TAO/utils/NamingViewer/BindNewContext.h b/TAO/utils/NamingViewer/BindNewContext.h index 637823c89d0..0ca48484bb8 100644 --- a/TAO/utils/NamingViewer/BindNewContext.h +++ b/TAO/utils/NamingViewer/BindNewContext.h @@ -33,7 +33,6 @@ public: // Implementation protected: - // Generated message map functions //{{AFX_MSG(CBindNewContext) virtual void OnOK(); 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 2a7f2791148..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); @@ -351,7 +350,6 @@ void CNamingTreeCtrl::OnDestroy() // TODO: Add your message handler code here ClearChildren(); - } diff --git a/TAO/utils/NamingViewer/NamingViewerDlg.cpp b/TAO/utils/NamingViewer/NamingViewerDlg.cpp index ad8f422ae33..16ed157e9d1 100644 --- a/TAO/utils/NamingViewer/NamingViewerDlg.cpp +++ b/TAO/utils/NamingViewer/NamingViewerDlg.cpp @@ -70,7 +70,6 @@ CNamingViewerDlg::CNamingViewerDlg(CORBA::ORB_ptr pORB, CWnd* pParent /*=0*/) m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME); m_pORB = pORB; - } void CNamingViewerDlg::DoDataExchange(CDataExchange* pDX) diff --git a/TAO/utils/NamingViewer/SelectNSDialog.cpp b/TAO/utils/NamingViewer/SelectNSDialog.cpp index 98536f484bb..32d9378bc21 100644 --- a/TAO/utils/NamingViewer/SelectNSDialog.cpp +++ b/TAO/utils/NamingViewer/SelectNSDialog.cpp @@ -78,7 +78,6 @@ void CSelectNSDialog::OnAdd() ACE_TCHAR* pIOR = new ACE_TCHAR[Value.length() + 1]; ACE_OS::strcpy(pIOR, Value.c_str()); m_Servers.SetItemData(pos, (DWORD)pIOR); - } void CSelectNSDialog::OnRemove() diff --git a/TAO/utils/NamingViewer/SelectNSDialog.h b/TAO/utils/NamingViewer/SelectNSDialog.h index acee77ff4f2..815dab44505 100644 --- a/TAO/utils/NamingViewer/SelectNSDialog.h +++ b/TAO/utils/NamingViewer/SelectNSDialog.h @@ -34,7 +34,6 @@ public: // Implementation protected: - // Generated message map functions //{{AFX_MSG(CSelectNSDialog) virtual void OnOK(); diff --git a/TAO/utils/NamingViewer/StdAfx.cpp b/TAO/utils/NamingViewer/StdAfx.cpp index 51dc942d791..12270aa03b2 100644 --- a/TAO/utils/NamingViewer/StdAfx.cpp +++ b/TAO/utils/NamingViewer/StdAfx.cpp @@ -5,4 +5,3 @@ #include "stdafx.h" - diff --git a/TAO/utils/NamingViewer/ViewIORDialog.h b/TAO/utils/NamingViewer/ViewIORDialog.h index a49de2b8724..b600a9703ff 100644 --- a/TAO/utils/NamingViewer/ViewIORDialog.h +++ b/TAO/utils/NamingViewer/ViewIORDialog.h @@ -33,7 +33,6 @@ public: // Implementation protected: - // Generated message map functions //{{AFX_MSG(ViewIORDialog) virtual BOOL OnInitDialog(); diff --git a/TAO/utils/catior/Catior_i.cpp b/TAO/utils/catior/Catior_i.cpp index 344b85c517f..c0489e7329d 100644 --- a/TAO/utils/catior/Catior_i.cpp +++ b/TAO/utils/catior/Catior_i.cpp @@ -90,7 +90,6 @@ Catior_i::decode (const ACE_CString& aString, ACE_CString& output) } - CORBA::Boolean Catior_i::catiiop (char* string) { @@ -727,7 +726,6 @@ Catior_i::cat_tag_policies (TAO_InputCDR& stream) { ACE_OS::snprintf (buf, bufsize, "\t Priority: %d\n", server_priority); buffer_ += buf; - } else if (policies[iter].ptype == RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE) { indent (); ACE_OS::snprintf (buf, bufsize, diff --git a/TAO/utils/logWalker/GIOP_Buffer.cpp b/TAO/utils/logWalker/GIOP_Buffer.cpp index f0e763bd113..59cf1d2df43 100644 --- a/TAO/utils/logWalker/GIOP_Buffer.cpp +++ b/TAO/utils/logWalker/GIOP_Buffer.cpp @@ -101,7 +101,6 @@ struct ReplyHeader_1_0 { // Renamed from ReplyHeader */ - //static const size_t target_offset_12 = GIOP_Buffer::giop_header_len + 12; // 12 = req_id + flags + RESVD + addr disp. @@ -482,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/GIOP_Buffer.h b/TAO/utils/logWalker/GIOP_Buffer.h index ed1549e86ef..1b476d2defe 100644 --- a/TAO/utils/logWalker/GIOP_Buffer.h +++ b/TAO/utils/logWalker/GIOP_Buffer.h @@ -31,7 +31,6 @@ class Thread; class GIOP_Buffer { public: - static const char *size_leadin; static size_t leadin_len; static const size_t giop_header_len; 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/Log.cpp b/TAO/utils/logWalker/Log.cpp index abcb62328eb..3c75453f244 100644 --- a/TAO/utils/logWalker/Log.cpp +++ b/TAO/utils/logWalker/Log.cpp @@ -736,7 +736,6 @@ Log::parse_connection_handler_ctor_i (void) // char *c = ACE_OS::strchr (this->info_, '[') + 1; // size_t handle = ACE_OS::strtol (c, 0, 10); // ACE_DEBUG ((LM_DEBUG,"%d: constructed new handler for %d\n", offset_, handle)); - } void diff --git a/TAO/utils/logWalker/Log.h b/TAO/utils/logWalker/Log.h index 813895c9df5..498bde21159 100644 --- a/TAO/utils/logWalker/Log.h +++ b/TAO/utils/logWalker/Log.h @@ -42,7 +42,6 @@ public: bool process_file (const ACE_TCHAR *filename, const char *alias = ""); protected: - virtual void parse_line (void); void get_preamble (void); diff --git a/TAO/utils/logWalker/PeerObject.cpp b/TAO/utils/logWalker/PeerObject.cpp index 3d15be1db38..c78b5be710d 100644 --- a/TAO/utils/logWalker/PeerObject.cpp +++ b/TAO/utils/logWalker/PeerObject.cpp @@ -44,5 +44,4 @@ PeerObject::dump_detail (ostream &strm) << s << " invocation" << (s > 1 ? "s" : "") << endl; - } diff --git a/TAO/utils/logWalker/Thread.cpp b/TAO/utils/logWalker/Thread.cpp index d7e1bc9fa5a..d6769bf078c 100644 --- a/TAO/utils/logWalker/Thread.cpp +++ b/TAO/utils/logWalker/Thread.cpp @@ -141,7 +141,6 @@ Thread::split_filename (char *buff, size_t len) const *c = '_'; c = strchr (c, ']'); strcpy (c, ".txt"); - } void @@ -281,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 ff1e56eb987..eb2f3294a1d 100644 --- a/TAO/utils/nsgroup/nsgroup.cpp +++ b/TAO/utils/nsgroup/nsgroup.cpp @@ -67,7 +67,6 @@ show_help(int argc, ACE_TCHAR *argv[]) class NSGROUP { public: - enum NSGROUP_COMMAND { NSGROUP_NONE, NSGROUP_HELP, @@ -102,12 +101,10 @@ public: const ACE_TCHAR * namepath_arg() const { return namepath_arg_; } private: - /// parse command line arguments NSGROUP_COMMAND parse_command_line (void); private: - NS_group_svc svc_; int argc_; @@ -145,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){ @@ -162,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); @@ -212,7 +207,6 @@ NSGROUP::start_orb (void) } return RC_SUCCESS; - } int @@ -225,7 +219,6 @@ NSGROUP::run_cmd(void) switch( parse_command_line () ) { - case NSGROUP_HELP: return show_usage (); break; @@ -387,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++; @@ -437,7 +429,6 @@ NSGROUP::parse_command_line (void) ACE_OS::strlen (ACE_TEXT("member_remove"))) == 0 ) { nsgroup_cmd_ = NSGROUP_MEMBER_REMOVE; - } else if(ACE_OS::strncmp (this->argv_[i], ACE_TEXT("member_show"), ACE_OS::strlen (ACE_TEXT("member_show"))) == 0 ) @@ -494,7 +485,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 303d835bb76..6baafd53a19 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); @@ -62,7 +61,6 @@ void create_dialog_components(wxDialog* dialog) topsizer->SetSizeHints( dialog); } - }; // anonymous @@ -101,11 +99,8 @@ 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( @@ -148,14 +143,10 @@ 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(); - } return true; } diff --git a/TAO/utils/wxNamingViewer/wxBindNewContext.cpp b/TAO/utils/wxNamingViewer/wxBindNewContext.cpp index 42310af30c4..3bbe855380e 100644 --- a/TAO/utils/wxNamingViewer/wxBindNewContext.cpp +++ b/TAO/utils/wxNamingViewer/wxBindNewContext.cpp @@ -83,7 +83,6 @@ namespace // anonymous dialog->SetSizer( topsizer); topsizer->SetSizeHints( dialog); } - }; // anonymous WxBindNewContext::WxBindNewContext( wxWindow* parent) diff --git a/TAO/utils/wxNamingViewer/wxNamingTree.cpp b/TAO/utils/wxNamingViewer/wxNamingTree.cpp index e900f66dc37..bbff234ff52 100644 --- a/TAO/utils/wxNamingViewer/wxNamingTree.cpp +++ b/TAO/utils/wxNamingViewer/wxNamingTree.cpp @@ -83,10 +83,8 @@ void WxNamingTree::clearChildren( void) { wxTreeItemId item = GetRootItem(); if (item) { - clearChildren( item); Delete( item); - } } @@ -95,11 +93,9 @@ void WxNamingTree::clearChildren( wxTreeItemId& item) long cookie; wxTreeItemId child = GetFirstChild( item, cookie); while( child) { - clearChildren( child); Delete( child); child = GetFirstChild( item, cookie); - } } @@ -108,19 +104,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 +139,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,34 +150,26 @@ 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); - } break; case CosNaming::nobject: break; - } } } catch( CORBA::Exception& ex) { - wxMessageBox( ex._rep_id(), "CORBA::Exception"); - } } @@ -198,14 +179,11 @@ 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; - } // List the context's entries @@ -214,9 +192,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,21 +200,16 @@ void WxNamingTree::listContext( wxTreeItemId& item) text, "Question", wxYES_NO | wxICON_QUESTION) == wxYES) { - bi->next_n( listQuantum, bl); listBindingList( item, context.in(), bl); - } } bi->destroy(); - } } catch( CORBA::Exception& ex) { - wxMessageBox( ex._rep_id(), "CORBA::Exception"); - } } @@ -251,42 +222,32 @@ 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", wxOK | wxICON_EXCLAMATION, this); return; - } context->bind_context( dialog->getName(), newContext.in ()); onContextPopupRefresh( event); - } catch( CORBA::Exception& ex) { - wxMessageBox( ex._rep_id(), "CORBA::Exception"); - } } @@ -298,29 +259,21 @@ 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; - } context->bind( dialog->getName(), dialog->getObject()); onContextPopupRefresh( event); - } catch( CORBA::Exception& ex) { - wxMessageBox( ex._rep_id(), "CORBA::Exception"); - } } @@ -331,28 +284,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,22 +308,17 @@ 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; - } WxNamingObject* object = getTreeObject( item); 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(); @@ -387,11 +327,8 @@ void WxNamingTree::onContextPopupDestroy( wxCommandEvent&) Delete( item); // Do the unbind parentNaming->unbind( object->Name()); - } catch( CORBA::Exception& ex) { - wxMessageBox( ex._rep_id(), "CORBA::Exception"); - } } @@ -410,43 +347,32 @@ 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; - } WxNamingObject* object = getTreeObject( item); 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"); - } } 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; - } listContext( item); } @@ -456,7 +382,6 @@ void WxNamingTree::onLeftDClick( wxMouseEvent& event) { wxTreeItemId item = HitTest( event.GetPosition()); if (!item) { - return; } WxAutoDialog<WxViewIORDialog> dialog( new WxViewIORDialog( @@ -474,32 +399,24 @@ void WxNamingTree::onObjectPopupUnbind( wxCommandEvent& ) "Are you sure you want to unbind this object?", "Confirm", wxYES_NO | wxICON_QUESTION) != wxYES) { - return; - } wxTreeItemId item = GetSelection(); // Make sure we don't unbind "Root" wxTreeItemId parentItem = GetParent( item); if (parentItem == 0) { - return; - } WxNamingObject* object = getTreeObject( item); 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 +436,6 @@ void WxNamingTree::onRMouseUClick( wxMouseEvent& event) { wxTreeItemId item = HitTest( event.GetPosition()); if (!item) { - return; } // First select the item, then popup the appropriate menu @@ -527,15 +443,11 @@ 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,15 +455,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..e9859892e31 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()); @@ -157,13 +155,10 @@ void WxNamingViewerFrame::onSelectNS( wxCommandEvent& WXUNUSED( event)) server = selectNS->getServerName(); serverText->SetValue( server); resolve(); - } catch( CORBA::Exception const & ex) { - wxMessageBox( ex._info().c_str(), "CORBA::Exception"); - } break; @@ -172,7 +167,6 @@ void WxNamingViewerFrame::onSelectNS( wxCommandEvent& WXUNUSED( event)) setDefaultNS(); resolve(); break; - } } @@ -196,7 +190,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..ca363fcfd1c 100644 --- a/TAO/utils/wxNamingViewer/wxSelectNSDialog.cpp +++ b/TAO/utils/wxNamingViewer/wxSelectNSDialog.cpp @@ -124,17 +124,13 @@ 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())); - } index++; - } } @@ -143,9 +139,7 @@ WxSelectNSDialog::~WxSelectNSDialog() { int count = servers->Number(); for (int i = 0; i < count; i++) { - delete static_cast<wxString*>( servers->GetClientData( i)); - } } @@ -154,7 +148,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())); @@ -164,7 +157,6 @@ void WxSelectNSDialog::onAdd( wxCommandEvent& WXUNUSED(event)) section, dialog->getServerName().c_str(), value); - } } @@ -205,7 +197,6 @@ void WxSelectNSDialog::onOK( wxCommandEvent& WXUNUSED(event)) { int index = servers->GetSelection(); if (index == -1) { - wxMessageBox( "You must select a server or cancel", "Error", @@ -222,13 +213,11 @@ 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); ACE_Configuration_Section_Key section = config->root_section(); config->remove_value( section, name); - } } diff --git a/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp b/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp index 6b773657f58..f6ea0460cf5 100644 --- a/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp +++ b/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp @@ -113,7 +113,6 @@ namespace // anonymous dialog->SetSizer( topsizer); topsizer->SetSizeHints( dialog); } - }; // anonymous BEGIN_EVENT_TABLE( WxViewIORDialog, wxDialog) @@ -169,9 +168,7 @@ WxViewIORDialog::WxViewIORDialog( applyButton->Enable( false); if (object != CORBA::Object::_nil()) { - WxViewIORDialog::object = CORBA::Object::_duplicate( object); - } CORBA::String_var ior = orb->object_to_string( object); WxViewIORDialog::ior = ior; @@ -185,11 +182,9 @@ void WxViewIORDialog::decodeIOR() // if object is nil, return out if(CORBA::is_nil( object.in())) { - typeID = ""; TransferDataToWindow(); return; - } // Get the stub @@ -203,20 +198,15 @@ 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(); profiles->AppendItem( rootItem, profileString); delete [] profileString; - } catch (const CORBA::Exception& ex) { - wxMessageBox( ex._info().c_str(), "CORBA::Exception"); - } } @@ -228,12 +218,9 @@ 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"); } } @@ -243,9 +230,7 @@ void WxViewIORDialog::onIORText( wxCommandEvent& event) { // Enable the Apply button if the IOR has changed if (event.GetString() != ior) { - applyButton->Enable( true); - } } |