diff options
Diffstat (limited to 'ACE')
886 files changed, 0 insertions, 1753 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])); - } } } |