diff options
759 files changed, 0 insertions, 968 deletions
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/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/parser/Parser.cpp b/ACE/ACEXML/parser/parser/Parser.cpp index 53d594b68c3..16346dbc19d 100644 --- a/ACE/ACEXML/parser/parser/Parser.cpp +++ b/ACE/ACEXML/parser/parser/Parser.cpp @@ -2613,7 +2613,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 dae67db09de..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. diff --git a/ACE/ASNMP/asnmp/address.cpp b/ACE/ASNMP/asnmp/address.cpp index b4a64b327c2..0e6e44a25f6 100644 --- a/ACE/ASNMP/asnmp/address.cpp +++ b/ACE/ASNMP/asnmp/address.cpp @@ -1714,7 +1714,6 @@ int IpxSockAddress::parse_address( const char *inaddr) } - //-------------[ set the socket number ]---------------------------------- void IpxSockAddress::set_socket( const unsigned short s) { @@ -1839,7 +1838,6 @@ MacAddress& MacAddress::operator=( const MacAddress &macaddress) } - //-----[ MAC Address general = operator ]--------------------------------- SnmpSyntax& MacAddress::operator=( SnmpSyntax &val) { diff --git a/ACE/ASNMP/asnmp/address.h b/ACE/ASNMP/asnmp/address.h index 48793f4f498..9c6013a42d0 100644 --- a/ACE/ASNMP/asnmp/address.h +++ b/ACE/ASNMP/asnmp/address.h @@ -702,7 +702,6 @@ protected: }; - //------------------------------------------------------------------------ //---------[ IpxSock Address Class ]-------------------------------------- //------------------------------------------------------------------------ diff --git a/ACE/ASNMP/asnmp/asn1.cpp b/ACE/ASNMP/asnmp/asn1.cpp index a0f1eb1cb40..d13c4e58efd 100644 --- a/ACE/ASNMP/asnmp/asn1.cpp +++ b/ACE/ASNMP/asnmp/asn1.cpp @@ -1084,7 +1084,6 @@ void cmu_snmp::add_var(struct snmp_pdu *pdu, break; - case sNMP_SYNTAX_TIMETICKS: case sNMP_SYNTAX_CNTR32: case sNMP_SYNTAX_GAUGE32: @@ -1521,7 +1520,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/pdu.cpp b/ACE/ASNMP/asnmp/pdu.cpp index 4a05750685a..3c9288c698f 100644 --- a/ACE/ASNMP/asnmp/pdu.cpp +++ b/ACE/ASNMP/asnmp/pdu.cpp @@ -408,7 +408,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/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/Kokyu/DSRT_Dispatcher_Impl_T.h b/ACE/Kokyu/DSRT_Dispatcher_Impl_T.h index 92fc64e43e7..572cbe14214 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 { /** 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/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_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/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..28a4846c80c 100644 --- a/ACE/ace/Containers_T.h +++ b/ACE/ace/Containers_T.h @@ -330,7 +330,6 @@ private: }; - /** * @class ACE_Unbounded_Stack * 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..e16d1f56a4f 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 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/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/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_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_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_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_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/Priority_Reactor.cpp b/ACE/ace/Priority_Reactor.cpp index e4418972540..64ef7d45cf7 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>; 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/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/Service_Config.cpp b/ACE/ace/Service_Config.cpp index f88ef610fe4..e7569e97cb8 100644 --- a/ACE/ace/Service_Config.cpp +++ b/ACE/ace/Service_Config.cpp @@ -453,7 +453,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, diff --git a/ACE/ace/Service_Gestalt.cpp b/ACE/ace/Service_Gestalt.cpp index 37c8313b398..76cd6b60699 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:: @@ -294,7 +293,6 @@ ACE_Service_Gestalt::load_static_svcs () } /* load_static_svcs () */ - /// Find a static service descriptor by name int ACE_Service_Gestalt::find_static_svc_descriptor (const ACE_TCHAR* name, @@ -341,7 +339,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. @@ -1249,7 +1246,6 @@ ACE_Service_Gestalt::parse_args_i (int argc, } /* parse_args_i () */ - // Process service configuration directives from the files queued for // processing int 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..d2bc20b0882 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 @@ -1148,7 +1144,6 @@ int ace_yyparse (); - /*----------. | ace_yyparse. | `----------*/ @@ -1217,7 +1212,6 @@ int ace_yynerrs; YYSTYPE *ace_yyvsp; - #define YYPOPSTACK(N) (ace_yyvsp -= (N), ace_yyssp -= (N)) YYSIZE_T ace_yystacksize = YYINITDEPTH; @@ -1771,7 +1765,6 @@ ace_yyerrlab: } - if (ace_yyerrstatus == 3) { /* If just tried and failed to reuse look-ahead token after an @@ -1914,7 +1907,6 @@ ace_yyreturn: - ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Prints the error string to standard output. Cleans up the error 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/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/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/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/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/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/util.cpp b/ACE/apps/JAWS/stress_testing/util.cpp index 0de9231957b..6f1c0eff1c5 100644 --- a/ACE/apps/JAWS/stress_testing/util.cpp +++ b/ACE/apps/JAWS/stress_testing/util.cpp @@ -45,7 +45,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 8c55173902e..40bb089589b 100644 --- a/ACE/apps/JAWS/stress_testing/util.h +++ b/ACE/apps/JAWS/stress_testing/util.h @@ -28,4 +28,3 @@ int copier(connection in); - 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_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_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/Cache_Hash_T.cpp b/ACE/apps/JAWS2/JAWS/Cache_Hash_T.cpp index a5349ab5bf1..5b18a3fdba9 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Hash_T.cpp +++ b/ACE/apps/JAWS2/JAWS/Cache_Hash_T.cpp @@ -94,7 +94,6 @@ JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::~JAWS_Cache_Hash (void) - this->hashtable_[i] = 0; } } @@ -231,5 +230,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_Manager_T.cpp b/ACE/apps/JAWS2/JAWS/Cache_Manager_T.cpp index 5dd377d766f..9c19dfd97d6 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; @@ -181,7 +179,6 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>::close (void) KEY, HASH_FUNC, EQ_FUNC); - this->hash_ = 0; } @@ -193,7 +190,6 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>::close (void) KEY, FACTORY, HASH_FUNC, EQ_FUNC); - this->heap_ = 0; } 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/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/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/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/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_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/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/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/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/Cached_Allocator_T.h b/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h index f9fe4df36d6..2b4a0c1d8d5 100644 --- a/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h +++ b/ACE/apps/JAWS3/jaws3/Cached_Allocator_T.h @@ -53,7 +53,6 @@ private: }; - template <class T> class JAWS_TSS_Cached_Allocator : public ACE_New_Allocator // = TITLE 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/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/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/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 00f5b224085..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; 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..23ec0d71774 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 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_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..77537780806 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, 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..cd70de0e2ca 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 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-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..16b15010cec 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? 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/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..0dc20d393cb 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 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..879474447cf 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 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/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/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/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/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/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/receiver.cpp b/ACE/examples/QOS/Change_Receiver_FlowSpec/receiver.cpp index 6edc97b6d4a..90610291337 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/receiver.cpp +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/receiver.cpp @@ -292,4 +292,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..aa4b6f7806a 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" @@ -287,7 +286,6 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) - // Start the event loop. ACE_DEBUG ((LM_DEBUG, "Running the Event Loop ...\n")); @@ -307,5 +305,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/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/Receiver_QoS_Event_Handler.cpp b/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.cpp index 1a4d08b08ea..9e28628077b 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 @@ -137,4 +137,3 @@ 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/receiver.cpp b/ACE/examples/QOS/Change_Sender_TSpec/receiver.cpp index 36fb26fdf22..57e1a80cbba 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/receiver.cpp +++ b/ACE/examples/QOS/Change_Sender_TSpec/receiver.cpp @@ -311,4 +311,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..15c7f01af6a 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" @@ -304,5 +303,3 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) - - 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/QoS_Signal_Handler.cpp b/ACE/examples/QOS/Simple/QoS_Signal_Handler.cpp index 77937f484b3..07607532a59 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) 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/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/receiver.cpp b/ACE/examples/QOS/Simple/receiver.cpp index 0e4c2865df6..aea5c18033e 100644 --- a/ACE/examples/QOS/Simple/receiver.cpp +++ b/ACE/examples/QOS/Simple/receiver.cpp @@ -293,4 +293,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..b2d7550bd76 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" @@ -286,7 +285,6 @@ ACE_TMAIN (int argc, ACE_TCHAR * argv[]) -1); - // Start the event loop. ACE_DEBUG ((LM_DEBUG, "Running the Event Loop ...\n")); @@ -306,5 +304,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..74dcf4a80dc 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" 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/simple_test_proactor.cpp b/ACE/examples/Reactor/Proactor/simple_test_proactor.cpp index 68635e259c0..e2235b7403a 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. 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 2e1899c983d..3645317848f 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) /** 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 939d9ef0b14..c44c3519ea8 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. diff --git a/ACE/examples/Reactor/Proactor/test_proactor3.cpp b/ACE/examples/Reactor/Proactor/test_proactor3.cpp index b6d8c56ae48..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. diff --git a/ACE/examples/Reactor/Proactor/test_timeout_st.cpp b/ACE/examples/Reactor/Proactor/test_timeout_st.cpp index dbc7fdb820c..164c8a9faad 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. diff --git a/ACE/examples/Reactor/Proactor/test_udp_proactor.cpp b/ACE/examples/Reactor/Proactor/test_udp_proactor.cpp index fc46ed11ff3..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. diff --git a/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp b/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp index b78bc30c6a9..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; 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 e3158292cc6..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: 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/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/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/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/Driver.cpp b/ACE/examples/Timer_Queue/Driver.cpp index 52b1332ea62..afe3dd82b2a 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> 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..2b827cde0d7 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) { } 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/Mem_Map_Stream.cpp b/ACE/examples/Web_Crawler/Mem_Map_Stream.cpp index 532f1b636c7..fa7fd63c195 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) { 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..851d5bb4aae 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), 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 d8cb97c9059..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; /** 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/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp b/ACE/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp index f218a31cf44..52a99c27ada 100644 --- a/ACE/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp +++ b/ACE/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp @@ -289,7 +289,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/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp b/ACE/performance-tests/Server_Concurrency/Leader_Follower/RT_CORBA_Leader_Follower.cpp index 1ab919b1b2a..a841f5fdb92 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) 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 f48319cbd34..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 @@ -151,7 +151,6 @@ private: - #endif /*ACE_HAS_THREADS*/ #include /**/ "ace/post.h" 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 9f05d9480c1..eddcb895e9f 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Filter_Factory.h +++ b/ACE/protocols/ace/HTBP/HTBP_Filter_Factory.h @@ -60,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_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/INet/ClientRequestHandler.cpp b/ACE/protocols/ace/INet/ClientRequestHandler.cpp index c0ef1f794b6..be7f1018e55 100644 --- a/ACE/protocols/ace/INet/ClientRequestHandler.cpp +++ b/ACE/protocols/ace/INet/ClientRequestHandler.cpp @@ -6,7 +6,6 @@ #endif - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE diff --git a/ACE/protocols/ace/INet/ConnectionCache.cpp b/ACE/protocols/ace/INet/ConnectionCache.cpp index 064baaf346b..ee9900fd3cd 100644 --- a/ACE/protocols/ace/INet/ConnectionCache.cpp +++ b/ACE/protocols/ace/INet/ConnectionCache.cpp @@ -7,7 +7,6 @@ #include "ace/INet/INet_Log.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE diff --git a/ACE/protocols/ace/INet/FTP_ClientRequestHandler.cpp b/ACE/protocols/ace/INet/FTP_ClientRequestHandler.cpp index f406821a1dd..2214dbe6e15 100644 --- a/ACE/protocols/ace/INet/FTP_ClientRequestHandler.cpp +++ b/ACE/protocols/ace/INet/FTP_ClientRequestHandler.cpp @@ -13,7 +13,6 @@ #include "ace/SOCK_Acceptor.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE diff --git a/ACE/protocols/ace/INet/FTP_IOStream.cpp b/ACE/protocols/ace/INet/FTP_IOStream.cpp index 110b9431681..7466e13d496 100644 --- a/ACE/protocols/ace/INet/FTP_IOStream.cpp +++ b/ACE/protocols/ace/INet/FTP_IOStream.cpp @@ -8,7 +8,6 @@ #include "ace/Truncate.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE diff --git a/ACE/protocols/ace/INet/FTP_Request.cpp b/ACE/protocols/ace/INet/FTP_Request.cpp index 13206f0e7bf..e7e12d00d6e 100644 --- a/ACE/protocols/ace/INet/FTP_Request.cpp +++ b/ACE/protocols/ace/INet/FTP_Request.cpp @@ -10,7 +10,6 @@ #include "ace/INet/String_IOStream.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE 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/HTTP_BasicAuthentication.cpp b/ACE/protocols/ace/INet/HTTP_BasicAuthentication.cpp index e03154b718c..2954096f8d7 100644 --- a/ACE/protocols/ace/INet/HTTP_BasicAuthentication.cpp +++ b/ACE/protocols/ace/INet/HTTP_BasicAuthentication.cpp @@ -7,7 +7,6 @@ #endif - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE diff --git a/ACE/protocols/ace/INet/HTTP_Header.cpp b/ACE/protocols/ace/INet/HTTP_Header.cpp index 392ca645514..a22321df095 100644 --- a/ACE/protocols/ace/INet/HTTP_Header.cpp +++ b/ACE/protocols/ace/INet/HTTP_Header.cpp @@ -7,7 +7,6 @@ #endif - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE diff --git a/ACE/protocols/ace/INet/HTTP_IOStream.cpp b/ACE/protocols/ace/INet/HTTP_IOStream.cpp index 7095c673c9b..2a310356a8d 100644 --- a/ACE/protocols/ace/INet/HTTP_IOStream.cpp +++ b/ACE/protocols/ace/INet/HTTP_IOStream.cpp @@ -8,7 +8,6 @@ #include "ace/Truncate.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE diff --git a/ACE/protocols/ace/INet/HTTP_Request.cpp b/ACE/protocols/ace/INet/HTTP_Request.cpp index 980ffb70cd5..94d5054f472 100644 --- a/ACE/protocols/ace/INet/HTTP_Request.cpp +++ b/ACE/protocols/ace/INet/HTTP_Request.cpp @@ -9,7 +9,6 @@ #include "ace/INet/INet_Log.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE diff --git a/ACE/protocols/ace/INet/HTTP_Response.cpp b/ACE/protocols/ace/INet/HTTP_Response.cpp index 25e77c5eef8..daa49935e42 100644 --- a/ACE/protocols/ace/INet/HTTP_Response.cpp +++ b/ACE/protocols/ace/INet/HTTP_Response.cpp @@ -10,7 +10,6 @@ #include "ace/INet/INet_Log.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE diff --git a/ACE/protocols/ace/INet/HTTP_Status.cpp b/ACE/protocols/ace/INet/HTTP_Status.cpp index 6fc7471d374..3f886797693 100644 --- a/ACE/protocols/ace/INet/HTTP_Status.cpp +++ b/ACE/protocols/ace/INet/HTTP_Status.cpp @@ -7,7 +7,6 @@ #endif - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE diff --git a/ACE/protocols/ace/INet/HeaderBase.cpp b/ACE/protocols/ace/INet/HeaderBase.cpp index e944c312f43..884f1803ca8 100644 --- a/ACE/protocols/ace/INet/HeaderBase.cpp +++ b/ACE/protocols/ace/INet/HeaderBase.cpp @@ -8,7 +8,6 @@ #include "ace/INet/INet_Log.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE diff --git a/ACE/protocols/ace/INet/Request.cpp b/ACE/protocols/ace/INet/Request.cpp index 49dab2ce012..b5835b0c79d 100644 --- a/ACE/protocols/ace/INet/Request.cpp +++ b/ACE/protocols/ace/INet/Request.cpp @@ -1,7 +1,6 @@ #include "ace/INet/Request.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE diff --git a/ACE/protocols/ace/INet/RequestHandler.cpp b/ACE/protocols/ace/INet/RequestHandler.cpp index 2c9d0b12583..85057605364 100644 --- a/ACE/protocols/ace/INet/RequestHandler.cpp +++ b/ACE/protocols/ace/INet/RequestHandler.cpp @@ -1,7 +1,6 @@ #include "ace/INet/RequestHandler.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE diff --git a/ACE/protocols/ace/INet/Response.cpp b/ACE/protocols/ace/INet/Response.cpp index 6660475afd7..0c9984b4e0c 100644 --- a/ACE/protocols/ace/INet/Response.cpp +++ b/ACE/protocols/ace/INet/Response.cpp @@ -1,7 +1,6 @@ #include "ace/INet/Response.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE 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/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 50a017f3057..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"; 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 627ff276527..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 ) { 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/CDR_Array_Test.cpp b/ACE/tests/CDR_Array_Test.cpp index a051dcfa379..a639ef9a7be 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). 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_Allocator_Test.cpp b/ACE/tests/Cached_Allocator_Test.cpp index d954c2980cd..4222e7144df 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" 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/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..327c1c8468b 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 *[]) { 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/Dynamic_Priority_Test.cpp b/ACE/tests/Dynamic_Priority_Test.cpp index f71d9b3d5f5..b72c567b86b 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}; 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/MT_Reactor_Timer_Test.cpp b/ACE/tests/MT_Reactor_Timer_Test.cpp index 85cedf6f5c4..1959cfe674d 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 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/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/Max_Default_Port_Test.h b/ACE/tests/Max_Default_Port_Test.h index 70d68dea586..039d5f454d0 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 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_Queue_Notifications_Test.cpp b/ACE/tests/Message_Queue_Notifications_Test.cpp index 91cb7138a5d..db5ae164027 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; diff --git a/ACE/tests/Message_Queue_Test.cpp b/ACE/tests/Message_Queue_Test.cpp index 0e3768ab837..957e58dec0d 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>; @@ -959,7 +958,6 @@ run_main (int argc, ACE_TCHAR *argv[]) timer = 0; - ACE_END_TEST; return status; } 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_Test.cpp b/ACE/tests/Proactor_Test.cpp index d766c7db58c..e82b054b90c 100644 --- a/ACE/tests/Proactor_Test.cpp +++ b/ACE/tests/Proactor_Test.cpp @@ -108,7 +108,6 @@ public: }; - // Function to remove signals from the signal mask. static int disable_signal (int sigmin, int sigmax) 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/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/SOCK_Connector_Test.cpp b/ACE/tests/SOCK_Connector_Test.cpp index 78cabecb0d0..4ed5c65560a 100644 --- a/ACE/tests/SOCK_Connector_Test.cpp +++ b/ACE/tests/SOCK_Connector_Test.cpp @@ -316,4 +316,3 @@ run_main (int, ACE_TCHAR *[]) } - diff --git a/ACE/tests/SOCK_Netlink_Test.cpp b/ACE/tests/SOCK_Netlink_Test.cpp index 491d2e18d65..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. 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..bd8bf74851b 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; 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_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/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/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_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_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/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_Queue_Reference_Counting_Test.cpp b/ACE/tests/Timer_Queue_Reference_Counting_Test.cpp index 00ccc8d73ec..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"; diff --git a/ACE/tests/Token_Strategy_Test.cpp b/ACE/tests/Token_Strategy_Test.cpp index 454bfceed99..5c1e990164d 100644 --- a/ACE/tests/Token_Strategy_Test.cpp +++ b/ACE/tests/Token_Strategy_Test.cpp @@ -24,7 +24,6 @@ #include "ace/Barrier.h" - #if defined (ACE_HAS_THREADS) class Token_Strategy_Test : public ACE_Task<ACE_MT_SYNCH> 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..98009a8223f 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. diff --git a/ACE/websvcs/tests/Test_URL_Addr.cpp b/ACE/websvcs/tests/Test_URL_Addr.cpp index cafb934b761..581927fd6e5 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); diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h index 8841cfafc13..4f64f81be01 100644 --- a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h +++ b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h @@ -45,5 +45,4 @@ private: }; - #endif /* MESSENGER_IMPL_H_ */ diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index d61acfd99b3..988d7442bfe 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -2338,7 +2338,6 @@ TAO_CodeGen::gen_stub_hdr_includes () this->client_header_); - if (idl_global->abstract_iface_seen_ || idl_global->abstractbase_seen_) { // Include the AbstractBase file from the Valuetype library. diff --git a/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp index 87b095402ab..1939360a4aa 100644 --- a/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp +++ b/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp @@ -738,7 +738,6 @@ be_visitor_amh_pre_proc::generate_name (ACE_CString &destination, } - be_operation * be_visitor_amh_pre_proc::generate_get_operation (be_attribute *node) { diff --git a/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp index f8505ad354a..de4f218b6f7 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp @@ -432,7 +432,6 @@ be_visitor_args_vardecl_ss::emit_common ( } - int be_visitor_args_vardecl_ss::emit_common2 (be_type *node) { diff --git a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp index b8a19f5ce7b..4d14ced3194 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp @@ -321,7 +321,6 @@ be_visitor_facet_ami_exh::gen_facet_executor_class () sync_iface->get_insert_queue ().enqueue_tail (sync_iface); - Facet_AMI_ExecH_Op_Attr_Generator op_attr_gen (this); int status = sync_iface->traverse_inheritance_graph( diff --git a/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp index f1918f568b1..e24d7d6d397 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp @@ -129,7 +129,6 @@ be_visitor_operation_direct_proxy_impl_ss::visit_operation ( } - int be_visitor_operation_direct_proxy_impl_ss::gen_invoke ( be_visitor_context & /*ctx*/, diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp index 429e571b166..8f86b379ac5 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp @@ -558,7 +558,6 @@ be_visitor_valuebox_ci::visit_union (be_union *node) } - int be_visitor_valuebox_ci::emit_for_predef_enum (be_type *node, const char * type_suffix, diff --git a/TAO/TAO_IDL/fe/idl.tab.cpp b/TAO/TAO_IDL/fe/idl.tab.cpp index d22f815b466..efbd52752b5 100644 --- a/TAO/TAO_IDL/fe/idl.tab.cpp +++ b/TAO/TAO_IDL/fe/idl.tab.cpp @@ -709,7 +709,6 @@ typedef enum yysymbol_kind_t yysymbol_kind_t; - #ifdef short # undef short #endif @@ -2446,7 +2445,6 @@ int yydebug; - /*-----------------------------------------------. | Release the memory associated to this symbol. | `-----------------------------------------------*/ @@ -2476,7 +2474,6 @@ int yynerrs; - /*----------. | yyparse. | `----------*/ @@ -2514,7 +2511,6 @@ yyparse (void) YYSTYPE yyval; - #define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) /* The number of symbols on the RHS of the reduced rule. diff --git a/TAO/TAO_IDL/include/ast_extern.h b/TAO/TAO_IDL/include/ast_extern.h index 92eb7908cc9..70387c74934 100644 --- a/TAO/TAO_IDL/include/ast_extern.h +++ b/TAO/TAO_IDL/include/ast_extern.h @@ -66,7 +66,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #define _AST_EXTERN_AST_EXTERN_HH - class AST_Type; class AST_Decl; diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.cpp b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.cpp index 746362c2a14..eec81a98842 100644 --- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.cpp +++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.cpp @@ -39,4 +39,3 @@ Quoter_Stock_i::get_price_and_names (CORBA::String_out symbol, } - diff --git a/TAO/examples/Advanced/ch_18/icp.cpp b/TAO/examples/Advanced/ch_18/icp.cpp index 1717861115a..0f93686ee37 100644 --- a/TAO/examples/Advanced/ch_18/icp.cpp +++ b/TAO/examples/Advanced/ch_18/icp.cpp @@ -12,7 +12,6 @@ - #include <string> #include <map> #include <algorithm> diff --git a/TAO/examples/Advanced/ch_18/server.h b/TAO/examples/Advanced/ch_18/server.h index 97b6ed266ba..d3c9e58be7e 100644 --- a/TAO/examples/Advanced/ch_18/server.h +++ b/TAO/examples/Advanced/ch_18/server.h @@ -12,7 +12,6 @@ - #ifndef server_HH_ #define server_HH_ diff --git a/TAO/examples/Advanced/ch_21/icp.cpp b/TAO/examples/Advanced/ch_21/icp.cpp index 2cb291765f9..cc6a4e0213b 100644 --- a/TAO/examples/Advanced/ch_21/icp.cpp +++ b/TAO/examples/Advanced/ch_21/icp.cpp @@ -12,7 +12,6 @@ - #include <string> #include <map> #include <algorithm> @@ -388,6 +387,3 @@ static ICP_Persist mydb("/tmp/CCS_DB"); - - - diff --git a/TAO/examples/Advanced/ch_21/icp.h b/TAO/examples/Advanced/ch_21/icp.h index 367dba07e09..6174b4b9b17 100644 --- a/TAO/examples/Advanced/ch_21/icp.h +++ b/TAO/examples/Advanced/ch_21/icp.h @@ -37,5 +37,3 @@ extern "C" { - - diff --git a/TAO/examples/Advanced/ch_21/server.h b/TAO/examples/Advanced/ch_21/server.h index f0c94184bc1..ed8bba2774e 100644 --- a/TAO/examples/Advanced/ch_21/server.h +++ b/TAO/examples/Advanced/ch_21/server.h @@ -12,7 +12,6 @@ - #ifndef server_HH_ #define server_HH_ diff --git a/TAO/examples/Advanced/ch_3/server.cpp b/TAO/examples/Advanced/ch_3/server.cpp index b59b38df1c2..a47c32f9579 100644 --- a/TAO/examples/Advanced/ch_3/server.cpp +++ b/TAO/examples/Advanced/ch_3/server.cpp @@ -81,5 +81,3 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) - - diff --git a/TAO/examples/Advanced/ch_8_and_10/icp.cpp b/TAO/examples/Advanced/ch_8_and_10/icp.cpp index 4788e48ac07..c0223f2b86c 100644 --- a/TAO/examples/Advanced/ch_8_and_10/icp.cpp +++ b/TAO/examples/Advanced/ch_8_and_10/icp.cpp @@ -12,7 +12,6 @@ - #include <string> #include <map> #include <algorithm> diff --git a/TAO/examples/Advanced/ch_8_and_10/server.h b/TAO/examples/Advanced/ch_8_and_10/server.h index 45d0c88a980..925de61a5b2 100644 --- a/TAO/examples/Advanced/ch_8_and_10/server.h +++ b/TAO/examples/Advanced/ch_8_and_10/server.h @@ -12,7 +12,6 @@ - #ifndef server_HH_ #define server_HH_ diff --git a/TAO/examples/Buffered_Oneways/client.cpp b/TAO/examples/Buffered_Oneways/client.cpp index ab440861826..35495e04ba8 100644 --- a/TAO/examples/Buffered_Oneways/client.cpp +++ b/TAO/examples/Buffered_Oneways/client.cpp @@ -18,7 +18,6 @@ #include "ace/Read_Buffer.h" - // Name of file contains ior. static const ACE_TCHAR *IOR = ACE_TEXT ("file://ior"); diff --git a/TAO/examples/Buffered_Oneways/server.cpp b/TAO/examples/Buffered_Oneways/server.cpp index 0956a0c58c1..5b0cd76c6b0 100644 --- a/TAO/examples/Buffered_Oneways/server.cpp +++ b/TAO/examples/Buffered_Oneways/server.cpp @@ -3,7 +3,6 @@ #include "ace/OS_NS_stdio.h" - const ACE_TCHAR *ior_output_file = ACE_TEXT("ior"); int diff --git a/TAO/examples/Buffered_Oneways/test_i.cpp b/TAO/examples/Buffered_Oneways/test_i.cpp index a35f50caa4d..332bfb5d808 100644 --- a/TAO/examples/Buffered_Oneways/test_i.cpp +++ b/TAO/examples/Buffered_Oneways/test_i.cpp @@ -1,7 +1,6 @@ #include "test_i.h" - test_i::test_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp index 035329c2b13..ef25dc055cb 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp @@ -86,7 +86,6 @@ ClientApp::run(int argc, ACE_TCHAR* argv[]) } - int ClientApp::parse_args(int argc, ACE_TCHAR* argv[]) { diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp index 5018a78c872..f7d79613a9d 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp @@ -34,7 +34,6 @@ Foo_i::op3(void) } - void Foo_i::op4(CORBA::Long value) { diff --git a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp index ef4f4883e4a..c3d2dd11196 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp @@ -6,7 +6,6 @@ #include "Content_Iterator_i.h" - Content_Iterator_i::Content_Iterator_i (const char *pathname, CORBA::ULongLong file_size) : file_ (ACE_TEXT_CHAR_TO_TCHAR(pathname)), diff --git a/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp b/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp index cef8fb40b2c..f185296101e 100644 --- a/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp +++ b/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp @@ -84,7 +84,6 @@ Supplier_Input_Handler::handle_input (ACE_HANDLE) } - if (ACE_OS::strncmp (buf, "quit", 4) == 0) // Tell the main event loop to shutdown. this->notifier_->shutdown (); diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp index 688e14eff77..5347c00ac99 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp @@ -340,7 +340,6 @@ EDF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri, DSUI_EVENT_LOG (EDF_SCHED_FAM, ENTER_SERVER_SCHED_TIME, 0, 0, 0); - #ifdef KOKYU_DSRT_LOGGING ACE_DEBUG ((LM_DEBUG, "(%t|%T):entered EDF_Scheduler::receive_request\n")); #endif diff --git a/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp index 0cb1fc165ba..68363132cfc 100644 --- a/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp +++ b/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp @@ -105,7 +105,6 @@ Load_Balancing_Service::init (int argc, } - int Load_Balancing_Service::run (void) { diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp index e6a4069813d..68b6743e709 100644 --- a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp +++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp @@ -103,7 +103,6 @@ Identity_Server::register_groups (void) { - // Contact the <Object_Group_Factory> to create 2 // <Object_Group>s, one random and one rr. CORBA::ORB_var orb = orb_manager_.orb (); diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp index 24294b84f8a..ddd0a0d150c 100644 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp @@ -229,7 +229,6 @@ Object_Group_Factory_i::make_group (int random, } - // As we are sure that it is not in the list go ahead and insert it if (random) ACE_NEW_THROW_EX (group_servant, @@ -285,7 +284,6 @@ Object_Group_Factory_i::make_group (int random, } - // Update the value of flags_ this->update_flags (random); @@ -310,7 +308,6 @@ Object_Group_Factory_i::resolve (const char * id) { - #if defined (DOORS_MEASURE_STATS) // Time the calls // Record the entry time. @@ -389,7 +386,6 @@ Object_Group_Factory_i::resolve (const char * id) object_group = Load_Balancer::Object_Group::_narrow (objref.in ()); - #if defined (DOORS_MEASURE_STATS) // Grab timestamp again. ACE_hrtime_t now = ACE_OS::gethrtime (); @@ -756,7 +752,6 @@ Object_Group_i::unbind (const char * id) } - Object_Group_i::ITERATOR iter (*(this->member_id_list_)); while (ACE_OS::strcmp (id,*(iter.next ()))) diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp index f22a46aea6a..78028eecc73 100644 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp @@ -135,7 +135,6 @@ Load_Balancing_Service::init (int argc, ACE_TCHAR* argv[]) } - int Load_Balancing_Service::run (void) { diff --git a/TAO/examples/OBV/Simple_util.cpp b/TAO/examples/OBV/Simple_util.cpp index 8c2475d30d2..35a70e74c07 100644 --- a/TAO/examples/OBV/Simple_util.cpp +++ b/TAO/examples/OBV/Simple_util.cpp @@ -230,7 +230,6 @@ Client<InterfaceObj, Var>::init (const char *name, this->argv_ = argv; - try { // Retrieve the ORB. diff --git a/TAO/examples/OBV/Typed_Events/Server_i.cpp b/TAO/examples/OBV/Typed_Events/Server_i.cpp index 2cdd221fc7b..e317239e1d2 100644 --- a/TAO/examples/OBV/Typed_Events/Server_i.cpp +++ b/TAO/examples/OBV/Typed_Events/Server_i.cpp @@ -9,7 +9,6 @@ Criterion_List_var criterions; // Arriving events are tested against the list members. - // Set the ORB pointer, register OBV factories and init the // lists declared above. @@ -120,7 +119,6 @@ Checkpoint_i::put_event (Event *event) } - // If we want to return the event (e.g. return type is Event *) // return (DUP_REF (event)); // should be right. diff --git a/TAO/examples/Persistent_Grid/Simple_util.cpp b/TAO/examples/Persistent_Grid/Simple_util.cpp index d692a78648d..618d5a493ce 100644 --- a/TAO/examples/Persistent_Grid/Simple_util.cpp +++ b/TAO/examples/Persistent_Grid/Simple_util.cpp @@ -144,7 +144,6 @@ Server<Servant>::run (void) } - ///////////////////////////////////////////////////////////////// // Client code Starts here //////////////////////////////////////////////////////////////// diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp index 18a7e506b5d..47d93a2863d 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp @@ -1,7 +1,6 @@ #include "UDP_i.h" - // Constructor UDP_i::UDP_i (void) : messages_count_ (0) diff --git a/TAO/examples/PluggableUDP/tests/Performance/client.cpp b/TAO/examples/PluggableUDP/tests/Performance/client.cpp index b16acb89b2d..ab2308011fd 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/client.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/client.cpp @@ -10,7 +10,6 @@ //============================================================================= - #include "ace/Get_Opt.h" #include "ace/Task.h" @@ -24,7 +23,6 @@ #include "tao/Strategies/advanced_resource.h" - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); ACE_UINT32 burst_messages = 1000; diff --git a/TAO/examples/PluggableUDP/tests/Performance/server.cpp b/TAO/examples/PluggableUDP/tests/Performance/server.cpp index 379e624c0af..d0c1655024a 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/server.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/server.cpp @@ -21,7 +21,6 @@ - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int orb_threads = 1; // Number of threads running inside the ORB. diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp index 06757f4f51a..3ce36a8aaba 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp @@ -10,7 +10,6 @@ //============================================================================= - #include "ace/Get_Opt.h" #include "test_i.h" diff --git a/TAO/examples/Quoter/Generic_Factory_i.cpp b/TAO/examples/Quoter/Generic_Factory_i.cpp index 5ba2333b03c..16c937b5805 100644 --- a/TAO/examples/Quoter/Generic_Factory_i.cpp +++ b/TAO/examples/Quoter/Generic_Factory_i.cpp @@ -36,7 +36,6 @@ Quoter_Generic_Factory_i::supports (const CosLifeCycle::Key &) } - CosNaming::NamingContext_ptr Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_key) { @@ -78,7 +77,6 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k } - CORBA::Object_ptr Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key, const CosLifeCycle::Criteria &) diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h index da92f0532cc..3d87db7a750 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h @@ -39,7 +39,6 @@ class DT_Test :public ACE_Task <ACE_SYNCH> virtual int svc (); - private: /// = Policies long thr_sched_policy_; diff --git a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp index 750be01de8b..3157582646d 100644 --- a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp +++ b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp @@ -303,7 +303,6 @@ DOVE_Supplier::use_prev_connection () } - // -------------------- Internal Demo Supplier ----------------------------- DOVE_Supplier::Internal_DOVE_Supplier::Internal_DOVE_Supplier (DOVE_Supplier *impl_ptr) @@ -400,7 +399,6 @@ DOVE_Supplier::connect_Supplier () static_cast<RtecScheduler::Info_Type_t> (this->current_connection_params_->pod_rt_info_.info_type)); - // Set the publications to report them to the event channel. CORBA::Short x = 0; diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp index fb2b427f324..cc5324ee9f9 100644 --- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp @@ -431,7 +431,6 @@ DualEC_Supplier::run_weap_thread (void *arg) } - // Create two scheduling service instances, register // them with the Naming Service. @@ -1032,7 +1031,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } - try { // Initialize ORB. diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp index 5afcf85c89c..00b3d45ed12 100644 --- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp @@ -330,7 +330,6 @@ Event_Supplier::insert_event_data (CORBA::Any &data, } - if (last_completion > (*sched_data)->completion_time) last_completion = 0; @@ -361,7 +360,6 @@ Event_Supplier::insert_event_data (CORBA::Any &data, } - // Function get_options. unsigned int diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp index 2f343983540..4286b337b02 100644 --- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp @@ -364,7 +364,6 @@ Logging_Supplier::insert_event_data (CORBA::Any &data, } - if (last_completion > (*sched_data)->completion_time) last_completion = 0; diff --git a/TAO/examples/TypeCode_Creation/main.cpp b/TAO/examples/TypeCode_Creation/main.cpp index ba0c21c4a93..789df8ee0fb 100644 --- a/TAO/examples/TypeCode_Creation/main.cpp +++ b/TAO/examples/TypeCode_Creation/main.cpp @@ -3,7 +3,6 @@ #include "tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h" - int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try diff --git a/TAO/examples/mfc/StdAfx.cpp b/TAO/examples/mfc/StdAfx.cpp index bd1211b1c68..f02b85711c1 100644 --- a/TAO/examples/mfc/StdAfx.cpp +++ b/TAO/examples/mfc/StdAfx.cpp @@ -5,4 +5,3 @@ #include "stdafx.h" - diff --git a/TAO/interop-tests/CdrOutArg/tao/client_interceptor.cpp b/TAO/interop-tests/CdrOutArg/tao/client_interceptor.cpp index 45ffa3d97a6..c07475d2a01 100644 --- a/TAO/interop-tests/CdrOutArg/tao/client_interceptor.cpp +++ b/TAO/interop-tests/CdrOutArg/tao/client_interceptor.cpp @@ -65,7 +65,6 @@ Echo_Client_Request_Interceptor::send_request ( #endif /*if 0*/ - // Populate target member of the ClientRequestInfo. // Make the context to send the context to the target diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp index 54a3ec2ab39..8d94d19eff7 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp @@ -76,5 +76,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) - - diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h index 524f58f339c..a74227a4345 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h @@ -31,4 +31,3 @@ private: - diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp index 8728eb776c4..1163e577c31 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp @@ -73,5 +73,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) - - diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.h index 2d9c4182adb..e488e183bcf 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/Messenger_i.h @@ -25,4 +25,3 @@ class Messenger_i : public POA_Messenger - diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp index 0208d26fc7f..6618dcbfce1 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp @@ -49,4 +49,3 @@ int ACE_TMAIN(int argc, ACE_TCHAR * argv[]) - diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerServer.cpp index ad834dd609c..b9acf920824 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerServer.cpp @@ -88,5 +88,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) - - diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.h index 2d9c4182adb..e488e183bcf 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.h @@ -25,4 +25,3 @@ class Messenger_i : public POA_Messenger - diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp index 8728eb776c4..1163e577c31 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp @@ -73,5 +73,3 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) - - diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp index 3d1fb378775..0b56d2aede3 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp @@ -125,7 +125,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } - return 0; } diff --git a/TAO/orbsvcs/IFR_Service/drv_init_ifr.cpp b/TAO/orbsvcs/IFR_Service/drv_init_ifr.cpp index 3012c700d76..c8332057f1e 100644 --- a/TAO/orbsvcs/IFR_Service/drv_init_ifr.cpp +++ b/TAO/orbsvcs/IFR_Service/drv_init_ifr.cpp @@ -70,7 +70,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "be_extern.h" - const size_t LOCAL_ESCAPES_BUFFER_SIZE = 1024; void diff --git a/TAO/orbsvcs/IFR_Service/drv_private_ifr.cpp b/TAO/orbsvcs/IFR_Service/drv_private_ifr.cpp index 293564a0d33..95b7fb43177 100644 --- a/TAO/orbsvcs/IFR_Service/drv_private_ifr.cpp +++ b/TAO/orbsvcs/IFR_Service/drv_private_ifr.cpp @@ -69,7 +69,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "drv_private_ifr.h" - // Storage for file names #if !defined (NFILES) diff --git a/TAO/orbsvcs/ImplRepo_Service/Iterator.h b/TAO/orbsvcs/ImplRepo_Service/Iterator.h index 959adb90b45..d606a97858f 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Iterator.h +++ b/TAO/orbsvcs/ImplRepo_Service/Iterator.h @@ -22,7 +22,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ - class ImR_AsyncIterator : public POA_ImplementationRepository::AMH_ServerInformationIterator { diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h index 94a055bfb77..1c291c84d7f 100644 --- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h +++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h @@ -226,7 +226,6 @@ protected: }; - /** * @class TAO_IMR_Op_List * diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp index ecc9e69a0f2..c395b67f8a8 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp +++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp @@ -14,7 +14,6 @@ #include "ace/OS_NS_string.h" - Criteria_Evaluator::Criteria_Evaluator (const CosLifeCycle::Criteria &criteria) : criteria_ (criteria) { diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h index be0dd75e3f5..63c3d225195 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h +++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h @@ -50,4 +50,3 @@ private: - diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h index b81dbb945b7..a7c32e168d5 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h @@ -62,5 +62,3 @@ private: - - diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h index cf385d36f7b..77e74bcbc34 100644 --- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h +++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h @@ -90,7 +90,6 @@ private: }; - typedef ACE_Singleton<TAO_NT_Naming_Service, TAO_NT_Naming_Service::MUTEX> SERVICE; #endif /* ACE_WIN32 && !ACE_LACKS_WIN32_SERVICES */ diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp index dcd98386e8e..b5b4906cfc8 100644 --- a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp +++ b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp @@ -3,7 +3,6 @@ #include "ace/OS_main.h" - // This is the main driver program for the Time Service clerk. int diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp b/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp index 5adc3578fb1..3b3b460b7f4 100644 --- a/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp +++ b/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp @@ -3,7 +3,6 @@ #include "ace/OS_main.h" - // This is the main driver program for the Time Service server. int diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp index 4a6b0e23017..644331151de 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp @@ -3,7 +3,6 @@ #include "CountryC.h" - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { @@ -69,4 +68,3 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } - diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp index 051e09989a5..f9a97e28060 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp @@ -127,7 +127,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) object = iorm->merge_iors (iors); - FT::TagFTGroupTaggedComponent ft_tag_component; // Property values diff --git a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp index 4902f70300f..f0550d67bb8 100644 --- a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp +++ b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp @@ -9,7 +9,6 @@ #define QUERY_LANG "TCL" - TLS_Client::TLS_Client (void) { // No-Op. diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp index 7040112fe63..ab758ee1852 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp @@ -41,7 +41,6 @@ Supplier::run (int argc, ACE_TCHAR* argv[]) CORBA::ORB_init (argc, argv); - CORBA::Object_var naming_obj = this->orb_->resolve_initial_references (NAMING_SERVICE_NAME); diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp index b7e4f09ed25..e288e2e04e0 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp @@ -93,7 +93,6 @@ Supplier::run (int argc, ACE_TCHAR* argv[]) - // create a log.. ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp index 285db7c8a01..9f8c6db6b8f 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp @@ -9,7 +9,6 @@ #include "ace/OS_NS_errno.h" - TAO_Notify_Lanes_Consumer_Client::TAO_Notify_Lanes_Consumer_Client (TAO_Notify_ORB_Objects& orb_objects) : orb_objects_ (orb_objects) , lane_priority_ (0) diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp index 687fa6053ea..7bbd202e3d3 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.cpp @@ -1,7 +1,6 @@ #include "ORB_Objects.h" - TAO_Notify_ORB_Objects::TAO_Notify_ORB_Objects (void) { } diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp index d27314e6c6b..5e1cb1fb3f2 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.cpp @@ -1,7 +1,6 @@ #include "ORB_Run_Task.h" - TAO_Notify_ORB_Run_Task::TAO_Notify_ORB_Run_Task (TAO_Notify_ORB_Objects& orb_objects) : orb_objects_ (orb_objects) { diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp index 3651c9fd1ef..8bab425bc0f 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp @@ -1,7 +1,6 @@ #include "Supplier.h" - #include "tao/ORB_Core.h" TAO_Notify_Lanes_Supplier::TAO_Notify_Lanes_Supplier (TAO_Notify_ORB_Objects& orb_objects) diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp index 32865fcd20c..765a594f9f6 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp @@ -10,7 +10,6 @@ #include "ace/OS_NS_errno.h" - TAO_Notify_Lanes_Supplier_Client::TAO_Notify_Lanes_Supplier_Client (TAO_Notify_ORB_Objects& orb_objects) : orb_objects_ (orb_objects) ,supplier_ (0) diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp index d34251bb9b7..73cd247c642 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp @@ -9,7 +9,6 @@ #include "ace/OS_NS_errno.h" - TAO_Notify_ThreadPool_Consumer_Client::TAO_Notify_ThreadPool_Consumer_Client (TAO_Notify_ORB_Objects& orb_objects) : orb_objects_ (orb_objects) , consumer_ (0) diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp index 687fa6053ea..7bbd202e3d3 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.cpp @@ -1,7 +1,6 @@ #include "ORB_Objects.h" - TAO_Notify_ORB_Objects::TAO_Notify_ORB_Objects (void) { } diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp index d27314e6c6b..5e1cb1fb3f2 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.cpp @@ -1,7 +1,6 @@ #include "ORB_Run_Task.h" - TAO_Notify_ORB_Run_Task::TAO_Notify_ORB_Run_Task (TAO_Notify_ORB_Objects& orb_objects) : orb_objects_ (orb_objects) { diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp index af8bf93d61b..416239c0e0e 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp @@ -1,7 +1,6 @@ #include "Supplier.h" - #include "tao/ORB_Core.h" TAO_Notify_ThreadPool_Supplier::TAO_Notify_ThreadPool_Supplier (TAO_Notify_ORB_Objects& orb_objects) diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp index 6affe0ce442..8ba0a0c792a 100644 --- a/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Consumer.cpp @@ -1,7 +1,6 @@ #include "Consumer.h" - Consumer::Consumer (void) { } diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp index d5294b91bec..5032ec9520a 100644 --- a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp @@ -20,7 +20,6 @@ #include "ace/Thread.h" - namespace { int config_run = 0; diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp index a08693a781d..a62d2de04dd 100644 --- a/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Supplier.cpp @@ -4,7 +4,6 @@ #include "orbsvcs/RtecEventCommC.h" - Supplier::Supplier (RtecEventComm::EventSourceID id, const RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer_proxy) :id_ (id), diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp index 09820b9d704..3afa9f99684 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp @@ -15,7 +15,6 @@ #include "ace/OS_NS_unistd.h" - int config_run = 0; int parse_args (int argc, ACE_TCHAR *argv[]); diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp index 66f5acd3b42..5e292c26972 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp @@ -1,7 +1,6 @@ #include "SLevel1_TestC.h" - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int diff --git a/TAO/orbsvcs/examples/Security/Send_File/client.cpp b/TAO/orbsvcs/examples/Security/Send_File/client.cpp index ab977303ded..68a578d17cc 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/client.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/client.cpp @@ -3,7 +3,6 @@ #include "testC.h" - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int diff --git a/TAO/orbsvcs/examples/Security/Send_File/server.cpp b/TAO/orbsvcs/examples/Security/Send_File/server.cpp index 9b9f82aab2c..326958271d9 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/server.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/server.cpp @@ -4,7 +4,6 @@ #include "ace/OS_NS_unistd.h" - const ACE_TCHAR *ior_output_file = 0; int diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp index 8f06732eb5c..3e2822e1927 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp +++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp @@ -5,7 +5,6 @@ #endif /* __ACE_INLINE__ */ - void Simple_Server_i::send_line (const char *line) { diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index baafac90542..2a53ea29c8e 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -836,7 +836,6 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party, the_flows); - } // This is the light profile, call connect() else if (!CORBA::is_nil (this->vdev_a_.in ()) && !CORBA::is_nil (this->vdev_b_.in ())) diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h index fcd6e492dc7..b2daa2809f4 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h @@ -51,7 +51,6 @@ typedef ACE_Hash_Map_Entry <ACE_CString,TAO_AV_Flow_Handler*> Flow_Handler_Map_E typedef ACE_Hash_Map_Iterator <ACE_CString,TAO_AV_Flow_Handler*,ACE_Null_Mutex> Flow_Handler_Map_Iterator; - class TAO_AV_Export AV_Null_MediaCtrl : public virtual POA_Null_MediaCtrl { @@ -1055,7 +1054,6 @@ public: const char * use_flow_protocol); - /// sets the public key to be used for encryption of the data. virtual void set_key (const AVStreams::key & the_key); diff --git a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp index f0b511711d2..122d5116d24 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp @@ -3,7 +3,6 @@ #if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS) - TAO_BEGIN_VERSIONED_NAMESPACE_DECL const iovec Fill_ACE_QoS::iov_ = {0,0}; diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp index feb571fe886..0001e862225 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp @@ -330,7 +330,6 @@ TAO_AV_RTCP::rtcp_interval (int members, } - // TAO_AV_RTCP_Flow_Factory TAO_AV_RTCP_Flow_Factory::TAO_AV_RTCP_Flow_Factory () { diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.h b/TAO/orbsvcs/orbsvcs/AV/RTP.h index de25ebff1d9..6b629a8788a 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTP.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTP.h @@ -390,7 +390,6 @@ protected: }; - /** * @class TAO_AV_RTP_Flow_Factory * @brief diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp index 03a2175adb9..247cc2bf866 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp @@ -11,7 +11,6 @@ #include "orbsvcs/Concurrency/CC_LockSet.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Default constructor diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp index 74555ec8ed7..d192342a8cb 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp @@ -15,7 +15,6 @@ #include "ace/Dynamic_Service.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Concurrency_Loader::TAO_Concurrency_Loader () diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp index a60a7f02583..f69967a1709 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp @@ -8,5 +8,4 @@ #endif /* __ACE_INLINE__ */ - #endif /* TAO_ESF_REFCOUNT_GUARD_CPP */ diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp index a218fb7f0d5..855026457a8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp @@ -10,7 +10,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL void diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp index 9c513ff2b77..925b755b3b7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp @@ -1,7 +1,6 @@ #include "orbsvcs/Event/ECG_ConsumerEC_Control.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ECG_ConsumerEC_Control::TAO_ECG_ConsumerEC_Control () diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp index 8c36dc6b44c..59d75748768 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp @@ -13,7 +13,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ECG_Mcast_EH::TAO_ECG_Mcast_EH (TAO_ECG_Dgram_Handler *recv, diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp index 04b881ae603..6d129cb04b4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp @@ -7,7 +7,6 @@ #include "ace/Reactor.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ECG_Reactive_ConsumerEC_Control:: diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp index 018b710de09..bdba1aba31a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp @@ -5,7 +5,6 @@ #include "ace/Reactor.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ECG_Reconnect_ConsumerEC_Control:: diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp index 49ff6f35ecf..36d9075a0fd 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp @@ -8,7 +8,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ECG_UDP_EH::TAO_ECG_UDP_EH (TAO_ECG_Dgram_Handler *recv) diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp index 6f238efb3c1..1a8404f7906 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp @@ -8,7 +8,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_ECG_UDP_Out_Endpoint::~TAO_ECG_UDP_Out_Endpoint () diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp index 0aabbbc08bc..615034df663 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp @@ -3,7 +3,6 @@ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_MT_Dispatching::TAO_EC_MT_Dispatching (int nthreads, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp index 249dbb9e7ee..f323262abe0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp @@ -1,7 +1,6 @@ #include "orbsvcs/Event/EC_Masked_Type_Filter.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Masked_Type_Filter:: diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp index a64fc8b06f1..573a860d455 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp @@ -1,7 +1,6 @@ #include "orbsvcs/Event/EC_Negation_Filter.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Negation_Filter::TAO_EC_Negation_Filter (TAO_EC_Filter* child) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp index 8bc8ff7eab4..284b0d7d748 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp @@ -18,7 +18,6 @@ #include "tao/ORB_Core.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Null_Factory::TAO_EC_Null_Factory () diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp index 141c3bd9b3b..a5bf9bac800 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp @@ -7,7 +7,6 @@ #endif /* __ACE_INLINE__ */ - void TAO_EC_Null_Scheduling::add_proxy_supplier_dependencies ( TAO_EC_ProxyPushSupplier *, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp index 74b29ea94cf..446b3e72b5f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp @@ -14,7 +14,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Per_Supplier_Filter:: diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp index 9aa1306d3b4..4ef991a850f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp @@ -14,7 +14,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Prefix_Filter_Builder::~TAO_EC_Prefix_Filter_Builder () diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp index 1908203fd0b..8afced46cac 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp @@ -10,7 +10,6 @@ #include "ace/Sched_Params.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Priority_Dispatching::TAO_EC_Priority_Dispatching (TAO_EC_Event_Channel_Base *ec) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp index 7f8bae66487..a0667e99cd9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp @@ -10,7 +10,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Priority_Scheduling::~TAO_EC_Priority_Scheduling () diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h index bee04b5b3c7..d8a0d1104a8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h @@ -39,7 +39,6 @@ typedef ACE_Utils::Auto_Functor< TAO_EC_Supplier_Proxy_Disconnector; - /** * @struct TAO_EC_Consumer_Proxy_Disconnect_Functor * diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp index 07ecf59d97c..64a79b50eff 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp @@ -2,7 +2,6 @@ #include "tao/RTCORBA/Priority_Mapping.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_RTCORBA_Dispatching:: diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp index 8c0d8d3723a..4d12df4083e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp @@ -4,7 +4,6 @@ #include "tao/RTCORBA/Priority_Mapping_Manager.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_RTCORBA_Factory:: diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp index 585b4a0e10e..662a83b1532 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp @@ -14,7 +14,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Reactive_ConsumerControl:: diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp index 1a2dee5f5d9..0148937adc8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp @@ -2,7 +2,6 @@ #include "orbsvcs/Event/EC_ProxySupplier.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Reactive_Dispatching::TAO_EC_Reactive_Dispatching () diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp index b76dc2aa4e7..a4edbf59e43 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp @@ -14,7 +14,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Reactive_SupplierControl:: diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp index edc5a380c27..2404a9287d6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp @@ -15,7 +15,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Sched_Factory::~TAO_EC_Sched_Factory () diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp index 99a0693f1f7..288cc20e4a1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp @@ -3,7 +3,6 @@ #include "orbsvcs/Log_Macros.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Sched_Filter:: diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp index 3df2fa9f386..ca4940982e9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp @@ -14,7 +14,6 @@ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Sched_Filter_Builder::~TAO_EC_Sched_Filter_Builder () diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp index ea13e8047b4..778c2086f39 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp @@ -2,7 +2,6 @@ #include "orbsvcs/Event/EC_QOS_Info.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Scheduling_Strategy::~TAO_EC_Scheduling_Strategy () diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp index e31589276a4..dc6f1409a96 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp @@ -7,7 +7,6 @@ #include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_SupplierAdmin::TAO_EC_SupplierAdmin (TAO_EC_Event_Channel_Base *ec) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp index 5519b5b9022..c91a5ce03f5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp @@ -1,7 +1,6 @@ #include "orbsvcs/Event/EC_SupplierControl.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_SupplierControl::TAO_EC_SupplierControl () diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp index 46ea1b4e70e..6efc05751f2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp @@ -7,7 +7,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Supplier_Filter::~TAO_EC_Supplier_Filter () diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp index 446058b3f45..ab000125751 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp @@ -1,7 +1,6 @@ #include "orbsvcs/Event/EC_Supplier_Filter_Builder.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Supplier_Filter_Builder::~TAO_EC_Supplier_Filter_Builder () diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp index 52af0795fc3..827973d288f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp @@ -12,7 +12,6 @@ #include "ace/OS_NS_strings.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL unsigned long TAO_EC_TPC_debug_level; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp index a08142d98ab..fc4299bf109 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp @@ -7,7 +7,6 @@ #include "ace/Sched_Params.h" - #define TETFSF(flag) { #flag, flag } TAO_EC_Thread_Flags::Supported_Flag TAO_EC_Thread_Flags::supported_flags_[] = { #if defined (ACE_HAS_THREADS) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.h b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.h index 81f87cf51b5..185e3182d64 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.h @@ -90,7 +90,6 @@ public: long default_priority () const; - struct Supported_Flag { const char* n; /// Flag name, e.g., THR_NEW_LWP diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp index 1ec13c1e230..713dc5e93f7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp @@ -7,7 +7,6 @@ #include "orbsvcs/Event/EC_ProxyConsumer.h" // @@ MSVC 6 bug - // **************************************************************** TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp index 56ec593b2ea..15e693cfc85 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp @@ -1,7 +1,6 @@ #include "orbsvcs/Event/EC_Type_Filter.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_EC_Type_Filter::TAO_EC_Type_Filter (const RtecEventComm::EventHeader& header) diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp index f3203343855..26f075f4eb2 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp @@ -11,7 +11,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TimeBase::TimeT diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp index 195f5c2bdce..813e82221fa 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp @@ -10,7 +10,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Boolean diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp index a0d88dd93f7..c077a85b344 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp @@ -198,7 +198,6 @@ TAO_FTEC_Event_Channel::remove_observer (RtecEventChannelAdmin::Observer_Handle) } - CORBA::Boolean TAO_FTEC_Event_Channel::start ( FTRT::FaultListener_ptr listener, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp index 1a346c32385..e845ed7d35f 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp @@ -221,7 +221,6 @@ TAO_FTEC_Event_Channel_Impl::activate_object ( } - // = The RtecEventChannelAdmin::EventChannel methods... /// The default implementation is: /// this->consumer_admin ()->_this (); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp index 7a7ea02de09..376a16b4004 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp @@ -122,7 +122,6 @@ FT::ObjectGroupRefVersion get_ft_group_version(IOP::ServiceContext_var service_c } - void ForwardCtrlServerInterceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) { IOP::ServiceContext_var service_context; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp index aa5763720eb..50943253f93 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp @@ -33,7 +33,6 @@ CachedRequestTable::update(const ACE_CString& client_id, } - CORBA::Any CachedRequestTable::get_result(const ACE_CString& client_id) { diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp index 4e757109620..b9355cbcd72 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp @@ -15,7 +15,6 @@ GroupInfoPublisherBase::GroupInfoPublisherBase() } - void GroupInfoPublisherBase::subscribe(TAO_FTEC_Become_Primary_Listener* listener) { @@ -46,7 +45,6 @@ GroupInfoPublisherBase::successor() const } - const GroupInfoPublisherBase::BackupList& GroupInfoPublisherBase::backups() const { @@ -54,7 +52,6 @@ GroupInfoPublisherBase::backups() const } - GroupInfoPublisherBase::Info* GroupInfoPublisherBase::setup_info(const FTRT::ManagerInfoList & info_list, int my_position, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp index c62bf2a1164..6321701e459 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp @@ -31,7 +31,6 @@ FTRT::AMI_UpdateableHandler_ptr UpdateableHandler::activate( } - void UpdateableHandler::dispatch(UpdateableHandler::Handler handler) { PortableServer::Current_var current = diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp index 624829ef98d..5392f3e6427 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp @@ -316,7 +316,6 @@ TAO::HTIOP::Profile::to_string () const } - const char * TAO::HTIOP::Profile::prefix () { diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h index f7b5e715e7a..d7149023ae1 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h @@ -158,4 +158,3 @@ TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_COMPONENTDEF_I_H */ - diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp index 93c5607b08d..dde3268fe83 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp @@ -627,7 +627,6 @@ TAO_Hash_LogRecordStore::set_capacity_alarm_thresholds (const DsLogAdmin::Capaci } - DsLogAdmin::ForwardingState TAO_Hash_LogRecordStore::get_forwarding_state () const { diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp index 2b444c1a68b..1c6ac6b1f17 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp @@ -256,7 +256,6 @@ TAO_NotifyLogFactory_i::obtain_push_supplier ( } - CosEventChannelAdmin::ProxyPullSupplier_ptr TAO_NotifyLogFactory_i::obtain_pull_supplier ( ) diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp index d6017c77eea..d1448c979aa 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp @@ -908,7 +908,6 @@ TAO_Naming_Server::bundle_at(size_t ndx) const } - int TAO_Naming_Server::write(size_t ndx) const { diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp index 0836bd43139..4f725cbb11e 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp @@ -12,7 +12,6 @@ #include "ace/OS_NS_stdio.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL int diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp index 0ad5f026dc3..e83ee24703b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp @@ -223,5 +223,4 @@ TAO_Notify_Admin::validate () } - TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp index a20b22359f3..2ac03308b09 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp @@ -110,5 +110,4 @@ TAO_Notify_ProxyPushSupplier::configure( } - TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp index 8721836d7e6..d92430161ad 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp @@ -361,5 +361,4 @@ TAO_Notify_Buffering_Strategy::discard (TAO_Notify_Method_Request_Queueable* met } - TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp index 56b93b5206f..881d397d4ca 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp @@ -43,7 +43,6 @@ TAO_Notify_ConsumerAdmin::get_admin_type_name () const } - TAO_Notify_ConsumerAdmin::~TAO_Notify_ConsumerAdmin () { } diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp index 63a375d9120..417c6ae8d87 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp @@ -93,7 +93,6 @@ TAO_Notify_Constraint_Expr::release () } - TAO_Notify_ETCL_Filter::TAO_Notify_ETCL_Filter (PortableServer::POA_ptr poa, const char *constraint_grammar, const TAO_Notify_Object::ID& id) diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp index a5daa3611b9..eb9881eb2e9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp @@ -320,5 +320,4 @@ TAO_Notify_ETCL_FilterFactory::find_filter_id (CosNotifyFilter::Filter_ptr filte } - ACE_FACTORY_DEFINE (TAO_Notify_Serv, TAO_Notify_ETCL_FilterFactory) diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp index 35445ee3fcf..4301182362c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp @@ -627,5 +627,4 @@ TAO_Notify_EventChannel::validate () } - TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp index 5d9275a1412..e599a5491cc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp @@ -247,7 +247,6 @@ TAO_MonitorConsumerAdmin::remove () } - TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp index 8836af68ee3..420f6bce869 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp @@ -132,5 +132,4 @@ TAO_Notify_StructuredProxyPushConsumer::configure( } - TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp index 7d9d138d90e..a13f035b279 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp @@ -293,7 +293,6 @@ int TAO::PG_Group_Factory::destroy_group (PortableGroup::ObjectGroup_ptr object_ } - PortableGroup::ObjectGroups * TAO::PG_Group_Factory::groups_at_location ( const PortableGroup::Location & the_location) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h index 60a2a0cdff1..20d0fa6446d 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h @@ -176,7 +176,6 @@ namespace TAO PortableGroup::InitialNumberMembersValue get_initial_number_members () const; - /** * @@TODO DOC */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp index bf18a767a8a..4554afdc793 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp @@ -164,7 +164,6 @@ void TAO::PG_Property_Set::set_property ( } - void TAO::PG_Property_Set::export_properties(PortableGroup::Properties & property_set) const { ValueMap merged_values; @@ -211,7 +210,6 @@ void TAO::PG_Property_Set::merge_properties (ValueMap & merged_values) const } - int TAO::PG_Property_Set::find ( const ACE_CString & key, const PortableGroup::Value *& pValue) const diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp index dacf841dea0..38693b09cef 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp @@ -15,7 +15,6 @@ #include "ace/OS_NS_string.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // = Methods to deal with ACE_Hash_Map_Manager. diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp index 458198a14c7..56aab64b0a1 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp @@ -257,7 +257,6 @@ TAO::SSLIOP::Connector::make_secure_profile () } - TAO_Profile * TAO::SSLIOP::Connector::corbaloc_scan (const char *endpoint, size_t &len) { diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp index ac09e5b1cab..bb1747d0efd 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp @@ -293,7 +293,6 @@ TAO_SSLIOP_Endpoint::set_sec_attrs (::Security::QOP q, - TAO_SSLIOP_Synthetic_Endpoint::~TAO_SSLIOP_Synthetic_Endpoint () { } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp index e9df6979bb0..966da1897ca 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp @@ -188,7 +188,6 @@ TAO::SSLIOP::Transport::tear_listen_point_list (TAO_InputCDR &cdr) } - void TAO::SSLIOP::Transport::set_bidir_context_info ( TAO_Operation_Details &opdetails) diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp index f80cd66be75..0bb52ccb898 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp @@ -8,7 +8,6 @@ #include "orbsvcs/Sched/Config_Scheduler.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Config_Scheduler::ACE_Config_Scheduler () diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp index f1844bed135..ed94b74ec40 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp @@ -19,7 +19,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL ////////////////////// @@ -308,7 +307,6 @@ ACE_DynScheduler::register_task (RT_Info *rt_info, handle_t &handle) // = registers a task. - ACE_DynScheduler::status_t ACE_DynScheduler::get_rt_info (Object_Name name, RT_Info* &rtinfo) @@ -357,7 +355,6 @@ ACE_DynScheduler::get_rt_info (Object_Name name, - int ACE_DynScheduler::priority ( const RtecScheduler::handle_t handle, RtecScheduler::OS_Priority &priority, @@ -1286,7 +1283,6 @@ ACE_DynScheduler::calculate_utilization_params () } - void ACE_DynScheduler::update_priority_level_params () { @@ -1916,7 +1912,6 @@ ACE_DynScheduler::create_timeline () // Create a timeline. - ACE_DynScheduler::status_t ACE_DynScheduler::output_dispatch_priorities (const char *filename) { diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h index 6116895ad4f..375bbbebaec 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h +++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h @@ -106,7 +106,6 @@ public: }; - ///////////////////////////// // public member functions // ///////////////////////////// diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp index b50d9381218..09c2cb01284 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp @@ -19,7 +19,6 @@ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL /////////////////////////// @@ -168,7 +167,6 @@ TAO_RT_Info_Ex::enabled_state () } - ////////////////////////////// // struct TAO_RT_Info_Tuple // ////////////////////////////// @@ -444,7 +442,6 @@ register_tuples (TAO_RT_Info_Tuple ** tuple_ptr_array, - // Accessor for original RT_Info data. TAO_RT_Info_Ex & @@ -582,7 +579,6 @@ fwd_dfs_status (TAO_Reconfig_Scheduler_Entry::DFS_Status ds) } - // Accessor for DFS traversal status of the node. TAO_Reconfig_Scheduler_Entry::DFS_Status @@ -1196,7 +1192,6 @@ TAO_MUF_FAIR_Reconfig_Sched_Strategy::total_admission_comp (const void *s, } - // Compares two RT_Info entries by priority alone. Returns -1 if the // first one is higher, 0 if they're the same, and 1 if the second one is higher. diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp index 61ec21234da..a02b5821535 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp @@ -226,7 +226,6 @@ postfix_action (TAO_Reconfig_Scheduler_Entry & /* rse */) } - ///////////////////////// // TAO_RSE_DFS_Visitor // ///////////////////////// diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h index 9f48686b364..d55095ca06d 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h @@ -104,7 +104,6 @@ protected: }; - template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> class TAO_RSE_DFS_Visitor : public TAO_RSE_Dependency_Visitor<RECONFIG_SCHED_STRATEGY, ACE_LOCK> diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp index f5735cdb6ee..fee14157da2 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp @@ -626,7 +626,6 @@ reset (RtecScheduler::handle_t handle, } - template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>:: @@ -2209,7 +2208,6 @@ dfs_traverse_i (void) } - // Sorts an array of RT_info handles in topological order, then // checks for loops, marks unresolved remote dependencies. template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp index 9cfb8e0b5da..484cd578e35 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp @@ -18,7 +18,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL Task_Entry::Task_Entry () diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h index 74f6dab71af..bb29121d49d 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h +++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h @@ -75,7 +75,6 @@ private: }; - /** * @class Task_Entry * @@ -540,7 +539,6 @@ private: }; - class TAO_RTSched_Export TimeLine_Entry { public: diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp index 456d98d885d..7b6fe47d043 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp @@ -16,7 +16,6 @@ #include "ace/Lock_Adapter_T.h" - /////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// // class Scheduler static members diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h index cb64989590c..9ffced104f8 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h @@ -167,7 +167,6 @@ public: Config_Info* &config_info) = 0; - // = Computes the schedule. /// This actually generates the files. virtual status_t diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp index eb2db77c5e9..eaa44622deb 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp @@ -13,7 +13,6 @@ #include "ace/OS_NS_stdio.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL /////////////////////////////////////////////////////////////////////////////// diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp index c1bb16f71c5..74e5d01c316 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp @@ -578,7 +578,6 @@ ACE_Strategy_Scheduler::schedule_timeline_entry ( } - //////////////////////////////////////////////////////////////////// // class template ACE_Strategy_Scheduler_Factory member functions // //////////////////////////////////////////////////////////////////// @@ -600,7 +599,6 @@ ACE_Strategy_Scheduler_Factory<STRATEGY>::create (RtecScheduler::Preemption_Prio } - ///////////////////////////////////////////////////////////////// // abstract base class ACE_Scheduler_Strategy member functions // ///////////////////////////////////////////////////////////////// @@ -697,7 +695,6 @@ ACE_Scheduler_Strategy::minimum_critical_priority () } - ///////////////////////////////////////////////////////////////////////// // class ACE_MUF_Scheduler_Strategy static data member initializations // ///////////////////////////////////////////////////////////////////////// @@ -857,7 +854,6 @@ ACE_MUF_Scheduler_Strategy::dispatch_type (const Dispatch_Entry & /* entry */) - ///////////////////////////////////////////////////////////////////////// // class ACE_RMS_Scheduler_Strategy static data member initializations // ///////////////////////////////////////////////////////////////////////// @@ -989,7 +985,6 @@ ACE_RMS_Scheduler_Strategy::dispatch_type (const Dispatch_Entry & /* entry */) } - ///////////////////////////////////////////////////////////////////////// // class ACE_MLF_Scheduler_Strategy static data member initializations // ///////////////////////////////////////////////////////////////////////// @@ -1123,7 +1118,6 @@ ACE_MLF_Scheduler_Strategy::dispatch_type (const Dispatch_Entry & /* entry */) } - ///////////////////////////////////////////////////////////////////////// // class ACE_EDF_Scheduler_Strategy static data member initializations // ///////////////////////////////////////////////////////////////////////// diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h index af6ae58bf77..2db996da3d6 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h +++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h @@ -75,7 +75,6 @@ private: }; - //////////////////////////////////////// // Factory for strategized schedulers // //////////////////////////////////////// @@ -183,7 +182,6 @@ protected: }; - /** * @class ACE_MUF_Scheduler_Strategy * @@ -318,7 +316,6 @@ private: }; - /** * @class ACE_MLF_Scheduler_Strategy * diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp index aa6bc96b982..07fa0725ad3 100644 --- a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp +++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp @@ -5,7 +5,6 @@ #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Number of nanoseconds between CORBA and POSIX epochs. diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp index 3d20afdd2bd..f7c3fe02985 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp @@ -605,7 +605,6 @@ operator== (const TAO_Literal_Constraint& left, } - bool operator< (const TAO_Literal_Constraint& left, const TAO_Literal_Constraint& right) diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp index 9d0429b6b46..189fccdf3a8 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp @@ -10,7 +10,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL - #define YY_INT_ALIGNED short int /* A lexical scanner generated by flex */ @@ -22,9 +21,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 6 @@ -53,13 +49,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - - - - - /* First, we deal with platform-specific or compiler-specific issues. */ /* begin standard C headers. */ @@ -176,13 +165,6 @@ typedef unsigned int flex_uint32_t; - - - - - - - /* Enter a start condition. This macro really ought to take a parameter, * but we do it the disgusting crufty way forced on us by the ()-less * definition of BEGIN. @@ -220,7 +202,6 @@ typedef unsigned int flex_uint32_t; #define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type)) - #ifndef YY_TYPEDEF_YY_BUFFER_STATE #define YY_TYPEDEF_YY_BUFFER_STATE typedef struct yy_buffer_state *YY_BUFFER_STATE; @@ -266,7 +247,6 @@ struct yy_buffer_state FILE *yy_input_file; - char *yy_ch_buf; /* input buffer */ char *yy_buf_pos; /* current position in input buffer */ @@ -334,7 +314,6 @@ static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ - /* We provide macros for accessing buffer states in case in the * future we want to put the buffer states in a more general * "scanner state". @@ -350,7 +329,6 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ #define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)] - /* yy_hold_char holds the character lost when yytext is formed. */ static char yy_hold_char; static int yy_n_chars; /* number of characters read into yy_ch_buf */ @@ -434,7 +412,6 @@ extern char *yytext; - static yy_state_type yy_get_previous_state ( ); static yy_state_type yy_try_NUL_trans ( yy_state_type current_state ); static int yy_get_next_buffer ( ); @@ -442,7 +419,6 @@ static void yynoreturn yy_fatal_error ( const char* msg ); - /* Done after the current pattern has been matched and before the * corresponding action - sets up yytext. */ @@ -629,12 +605,10 @@ static CORBA::ULongLong trader_strtoull(const char* str, unsigned int base); - #define INITIAL 0 - #ifndef YY_NO_UNISTD_H /* Special case for "unistd.h", since it is non-ANSI. We include it way * down here because we want the user's section 1 to have been scanned first. @@ -643,14 +617,12 @@ static CORBA::ULongLong trader_strtoull(const char* str, unsigned int base); #endif - #ifndef YY_EXTRA_TYPE #define YY_EXTRA_TYPE void * #endif - static int yy_init_globals ( ); @@ -661,59 +633,45 @@ static int yy_init_globals ( ); int yylex_destroy ( ); - int yyget_debug ( ); - void yyset_debug ( int debug_flag ); - YY_EXTRA_TYPE yyget_extra ( ); - void yyset_extra ( YY_EXTRA_TYPE user_defined ); - FILE *yyget_in ( ); - void yyset_in ( FILE * _in_str ); - FILE *yyget_out ( ); - void yyset_out ( FILE * _out_str ); - int yyget_leng ( ); - char *yyget_text ( ); - int yyget_lineno ( ); - void yyset_lineno ( int _line_number ); - - /* Macros after this point can all be overridden by user definitions in * section 1. */ @@ -755,8 +713,6 @@ static int input ( void ); - - /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE #ifdef __ia64__ @@ -777,7 +733,6 @@ static int input ( void ); #endif - /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, * is returned in "result". */ @@ -815,7 +770,6 @@ static int input ( void ); #endif - /* No semi-colon after return; correct usage is to write "yyterminate();" - * we don't want an extra ';' after the "return" because that will cause * some compilers to complain about unreachable statements. @@ -837,11 +791,9 @@ static int input ( void ); #endif - /* end tables serialization structures and prototypes */ - /* Default declaration of generated scanner - a define so the user can * easily add parameters. */ @@ -854,8 +806,6 @@ static int input ( void ); - - extern int yylex (); #define YY_DECL int yylex (void) @@ -870,14 +820,12 @@ extern int yylex (); #endif - /* Code executed at the end of each rule. */ #ifndef YY_BREAK #define YY_BREAK /*LINTED*/break; #endif - #define YY_RULE_SETUP \ YY_USER_ACTION @@ -897,8 +845,6 @@ YY_DECL - - if ( !(yy_init) ) { (yy_init) = 1; @@ -908,7 +854,6 @@ YY_DECL #endif - if ( ! (yy_start) ) (yy_start) = 1; /* first start state */ @@ -930,7 +875,6 @@ YY_DECL { - while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { yy_cp = (yy_c_buf_p); @@ -976,7 +920,6 @@ yy_find_action: YY_DO_BEFORE_ACTION; - do_action: /* This label is used only to access EOF actions. */ @@ -1290,7 +1233,6 @@ case YY_STATE_EOF(INITIAL): - /* yy_get_next_buffer - try to read in a new buffer * * Returns a code representing an action: @@ -1529,7 +1471,6 @@ static int yy_get_next_buffer () *--yy_cp = (char) c; - (yytext_ptr) = yy_bp; (yy_hold_char) = *yy_cp; (yy_c_buf_p) = yy_cp; @@ -1750,7 +1691,6 @@ static void yy_load_buffer_state () } - b->yy_is_interactive = file ? (ACE_OS::isatty( fileno(file) ) > 0) : 0; @@ -1888,7 +1828,6 @@ static void yyensure_buffer_stack () - /** Setup the input buffer state to scan directly from a user-specified character buffer. * @param base the character buffer * @param size the size in bytes of the character buffer @@ -1926,7 +1865,6 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) - /** Setup the input buffer state to scan a string. The next call to yylex() will * scan from a @e copy of @a str. * @param yystr a NUL-terminated string to scan @@ -1943,7 +1881,6 @@ YY_BUFFER_STATE yy_scan_string (const char * yystr ) - /** Setup the input buffer state to scan the given bytes. The next call to yylex() will * scan from a @e copy of @a bytes. * @param yybytes the byte buffer to scan @@ -1988,9 +1925,6 @@ YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len ) - - - #ifndef YY_EXIT_FAILURE #define YY_EXIT_FAILURE 2 #endif @@ -2019,11 +1953,9 @@ static void yynoreturn yy_fatal_error (const char* msg ) while ( 0 ) - /* Accessor methods (get/set functions) to struct members. */ - /** Get the current line number. * */ @@ -2037,7 +1969,6 @@ int yyget_lineno () - /** Get the input stream. * */ @@ -2047,7 +1978,6 @@ FILE *yyget_in () } - /** Get the output stream. * */ @@ -2057,7 +1987,6 @@ FILE *yyget_out () } - /** Get the length of the current token. * */ @@ -2078,7 +2007,6 @@ char *yyget_text () - /** Set the current line number. * @param _line_number line number * @@ -2094,7 +2022,6 @@ void yyset_lineno (int _line_number ) - /** Set the input stream. This does not discard the current * input buffer. * @param _in_str A readable stream. @@ -2107,7 +2034,6 @@ void yyset_in (FILE * _in_str ) } - void yyset_out (FILE * _out_str ) { yyout = _out_str ; @@ -2115,21 +2041,18 @@ void yyset_out (FILE * _out_str ) - int yyget_debug () { return yy_flex_debug; } - void yyset_debug (int _bdebug ) { yy_flex_debug = _bdebug ; } - static int yy_init_globals () { /* Initialization is the same as for the non-reentrant scanner. @@ -2148,8 +2071,6 @@ static int yy_init_globals () - - /* Defined in main.c */ #ifdef YY_STDINIT yyin = stdin; @@ -2184,7 +2105,6 @@ int yylex_destroy () - /* Reset the globals. This is important in a non-reentrant scanner so the next time * yylex() is called, initialization will occur. */ yy_init_globals( ); @@ -2193,13 +2113,11 @@ int yylex_destroy () } - /* * Internal utility routines. */ - #ifndef yytext_ptr static void yy_flex_strncpy (char* s1, const char * s2, int n ) { @@ -2211,7 +2129,6 @@ static void yy_flex_strncpy (char* s1, const char * s2, int n ) #endif - #ifdef YY_NEED_STRLEN static int yy_flex_strlen (const char * s ) { @@ -2224,14 +2141,12 @@ static int yy_flex_strlen (const char * s ) #endif - void *yyalloc (yy_size_t size ) { return malloc(size); } - void *yyrealloc (void * ptr, yy_size_t size ) { @@ -2246,7 +2161,6 @@ void *yyrealloc (void * ptr, yy_size_t size ) } - void yyfree (void * ptr ) { free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ @@ -2260,8 +2174,6 @@ void yyfree (void * ptr ) - - TAO_Literal_Constraint* extract_string(const char* total) { diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp index d3e59a5cb51..3a219db610d 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp @@ -236,7 +236,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } - try { ORBInitializer *initializer = 0; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp index 77f774eeef6..b9b51ce7053 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp @@ -29,7 +29,6 @@ #include "ace/Barrier.h" - int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { const CORBA::Long experiment_id = 1; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp index 1720871c44f..93af9abe2dd 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp @@ -27,7 +27,6 @@ #include "ace/Barrier.h" - const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); int nthreads = 0; int high_priority_period = 0; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp index d29ccb9964f..58f8003d5dc 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp @@ -26,7 +26,6 @@ #include "ace/Barrier.h" - int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { const CORBA::Long experiment_id = 1; diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h index 71c08c2ce95..4288e5cc846 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h @@ -84,7 +84,6 @@ public: Protocol_Objects; - // Map of streamctrl. typedef ACE_Hash_Map_Manager<ACE_CString, AVStreams::StreamCtrl_var, diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp index eda4570e7eb..2f46f68479e 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp @@ -101,7 +101,6 @@ Sender::init (int argc, ACE_TCHAR *argv[]) return result; - // Parse the command line arguments result = this->parse_args (argc, argv); diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp index 829afe4ed37..c14b1843eca 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp @@ -156,7 +156,6 @@ Receiver::~Receiver (void) } - int Receiver::init (int, ACE_TCHAR *[]) diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h index 915bf09bff4..9c39b387c14 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h @@ -11,7 +11,6 @@ //============================================================================= - #ifndef TAO_AV_FTP_H #define TAO_AV_FTP_H diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp index fd8a2e09260..6e993b1c39e 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp @@ -237,5 +237,3 @@ ACE_STATIC_SVC_DEFINE (TimeStamp_Protocol_Factory, - - diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp index 26ad37fdce5..83dfc47aa97 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp @@ -7,7 +7,6 @@ #endif /* __ACE_INLINE__ */ - void Receiver_Stats::accumulate (const Receiver_Stats &rhs) { diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp index a4b8f17c4d0..4ca00b3b1a0 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp @@ -87,7 +87,6 @@ Receiver::~Receiver (void) } - int Receiver::init (int, ACE_TCHAR *[]) diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp index 402016611d7..1303aa8587a 100644 --- a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp +++ b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp @@ -115,7 +115,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) contextIds) ; - // Create operation list. // CORBA::NVList_var opList ; diff --git a/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp b/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp index c3e99f7402e..296091f8adf 100644 --- a/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp +++ b/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp @@ -8,7 +8,6 @@ #include "orbsvcs/CosNamingC.h" - ORB_Task::ORB_Task (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp index ead055e510d..a0b18143cae 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp @@ -6,7 +6,6 @@ #include "Hello.h" - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp index 949c7fe30e2..caa1748ee64 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp @@ -8,7 +8,6 @@ #include "ace/Auto_Ptr.h" - //const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); TAO_IOP::TAO_IOR_Manipulation_var iorm = 0; CORBA::ULong number_of_servers = 0; diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp index 23ba5d49388..042ec8802dd 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp @@ -44,7 +44,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) } - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp index b5d6d3241fd..7a8b89da632 100644 --- a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp +++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp @@ -1,7 +1,6 @@ #include "Hello.h" - Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp index 43d8a6a7c1e..240fd36b5a8 100644 --- a/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp @@ -6,7 +6,6 @@ #include "Hello.h" - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp index daf613de7ad..822aec3cc9f 100644 --- a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp +++ b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp @@ -3,7 +3,6 @@ #include "Hello.h" - Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp index a70b3b6b156..03c2aec6dab 100644 --- a/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2615_Regression/client.cpp @@ -6,7 +6,6 @@ #include "Hello.h" - const ACE_TCHAR *ior = ACE_TEXT("file://ior.ior"); const ACE_TCHAR *iogr = ACE_TEXT("file://iogr.ior"); diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp index 5b23d33f306..4efc517a981 100644 --- a/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp +++ b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp @@ -1,7 +1,6 @@ #include "Hello.h" - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp index fe585143468..133eb6a7e0e 100644 --- a/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2800_Regression/client.cpp @@ -3,7 +3,6 @@ #include "ace/Get_Opt.h" - const ACE_TCHAR *ior = ACE_TEXT("file://shutdown.ior"); bool shutdown_nsmain = false; diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.cpp index 81d7d7081fe..ec960286654 100644 --- a/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.cpp +++ b/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.cpp @@ -1,7 +1,6 @@ #include "Hello.h" - Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp index 9bb5cb60097..a6b5c27169a 100644 --- a/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp @@ -6,7 +6,6 @@ #include "Hello.h" - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.cpp index d8c46266d98..d3c150a24b6 100644 --- a/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.cpp +++ b/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.cpp @@ -1,7 +1,6 @@ #include "Hello.h" - CORBA::Boolean Hello::normal_context_ok_ = 0; diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp index e2c58cf865d..fa4b6386745 100644 --- a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp +++ b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp @@ -91,7 +91,6 @@ catch (const CORBA::Exception& ex) } - } void diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp index 04aab458c3c..5affa4bc4c1 100644 --- a/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_3216_Regression/client.cpp @@ -6,7 +6,6 @@ #include "Hello.h" - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerConsumer.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerConsumer.cpp index a6575d05a1e..7ff5461dfcb 100644 --- a/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerConsumer.cpp +++ b/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerConsumer.cpp @@ -98,7 +98,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) - CosNotification::EventTypeSeq added (1); CosNotification::EventTypeSeq removed (1); added.length (1); @@ -115,7 +114,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) - PortableServer::POAManager_var poa_manager = poa->the_POAManager(); poa_manager->activate(); diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerServer.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerServer.cpp index 5095a179afd..b23dc33a54e 100644 --- a/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerServer.cpp +++ b/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerServer.cpp @@ -78,5 +78,3 @@ ACE_TMAIN(int argc, ACE_TCHAR * argv[]) - - diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h index 561676e19d7..ad99b055f31 100644 --- a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h +++ b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h @@ -26,4 +26,3 @@ class Messenger_i : public POA_Messenger - diff --git a/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp b/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp index d1a4c81904f..d59755cc7ce 100644 --- a/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp +++ b/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.cpp @@ -1,7 +1,6 @@ #include "Test_impl.h" - Server_impl::Server_impl (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/TAO/orbsvcs/tests/Bug_3444_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3444_Regression/client.cpp index 34e9ae8b7a4..ff97ec813f6 100644 --- a/TAO/orbsvcs/tests/Bug_3444_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_3444_Regression/client.cpp @@ -3,7 +3,6 @@ #include "TestC.h" - const ACE_TCHAR *ior_server = 0; int diff --git a/TAO/orbsvcs/tests/Bug_3444_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3444_Regression/server.cpp index db1b3a6a5ea..4eb878ed19e 100644 --- a/TAO/orbsvcs/tests/Bug_3444_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_3444_Regression/server.cpp @@ -4,7 +4,6 @@ #include "orbsvcs/PortableGroup/GOA.h" - const ACE_TCHAR *uipmc_url = 0; const ACE_TCHAR *ior_output_file = 0; diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp index 15d7b298abc..7f74ae1d075 100644 --- a/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp +++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.cpp @@ -1,7 +1,6 @@ #include "Hello.h" - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3598b_Regression/client.cpp index c214c911fcc..6ad127f255f 100644 --- a/TAO/orbsvcs/tests/Bug_3598b_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/client.cpp @@ -6,7 +6,6 @@ #include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h" - const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); int diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp index 5b23d33f306..4efc517a981 100644 --- a/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp +++ b/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp @@ -1,7 +1,6 @@ #include "Hello.h" - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/client.cpp index cc4ea47298a..10d56888f1a 100644 --- a/TAO/orbsvcs/tests/Bug_3673_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_3673_Regression/client.cpp @@ -3,7 +3,6 @@ #include "ace/Get_Opt.h" - const ACE_TCHAR *ior = ACE_TEXT("file://shutdown.ior"); bool shutdown_nsmain = false; int test_count = 10; diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp index d299fbe0924..c1b275f824f 100644 --- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp +++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp @@ -4,7 +4,6 @@ #include "TestC.h" - Client_Task::Client_Task (CosNaming::NamingContext_ptr root_context, CORBA::ORB_ptr corb, ACE_Thread_Manager *thr_mgr, diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp index d12a6c3eba5..f047a361bee 100644 --- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp +++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp @@ -4,7 +4,6 @@ #include "tao/Strategies/advanced_resource.h" - Hello::Hello (CORBA::ORB_ptr orb, ACE_thread_t thrid) : orb_ (CORBA::ORB::_duplicate (orb)) diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp index d1be2fba532..30a1ba98a50 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp @@ -24,7 +24,6 @@ #include "ace/OS_NS_fcntl.h" - // Constructor. CC_Client::CC_Client (void) : naming_service_ (0), diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp index a4844b9edba..696c94c1fd1 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp @@ -54,7 +54,6 @@ typedef union { #endif - #define ACE_CC_YYFINAL 66 #define ACE_CC_YYFLAG -32768 #define ACE_CC_YYNTBASE 24 @@ -413,7 +412,6 @@ __ace_cc_yy_memcpy (char *to, char *from, unsigned int count) #endif - /* The user can define ACE_CC_YYPARSE_PARAM as the name of an argument to be passed into ace_cc_yyparse. The argument should have type void *. It should actually point to an object. diff --git a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp index f0b111d5ec7..573e991246f 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp @@ -16,7 +16,6 @@ #include "ace/Log_Msg.h" - CC_naming_service::CC_naming_service (CORBA::ORB_var orb) : cc_factory_key_ (0), orb_ (0), diff --git a/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp index ac1562263fb..a4b68b98b73 100644 --- a/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp +++ b/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp @@ -610,7 +610,6 @@ ACE_CC_YY_DECL - if ( ace_cc_yy_init ) { ace_cc_yy_init = 0; @@ -1372,7 +1371,6 @@ ACE_CC_YY_BUFFER_STATE b; } - #ifdef ACE_CC_YY_USE_PROTOS void ace_cc_yy_init_buffer( ACE_CC_YY_BUFFER_STATE b, FILE *file ) #else @@ -1592,7 +1590,6 @@ char msg[]; } - /* Redefine ace_cc_yyless() so it works in section 3 code. */ #undef ace_cc_yyless diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp index 6032d54f33a..f097d4e47e4 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp +++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp @@ -2,7 +2,6 @@ #include "ace/OS_NS_unistd.h" - CEC_Counting_Supplier::CEC_Counting_Supplier (void) : event_count (0), disconnect_count (0) diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp index d44792d6a43..3a946c12854 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Data.cpp @@ -2,7 +2,6 @@ #include "tao/CDR.h" - CORBA::Boolean operator<< (TAO_OutputCDR& cdr, ECM_Data& x) { diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp index 587936448f3..316116add8d 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp @@ -15,7 +15,6 @@ #include "ace/OS_NS_errno.h" - ECMS_Driver::ECMS_Driver (void) : n_suppliers_ (1), event_count_ (100), diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp index 20d679e4bd2..2e088db72f5 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp @@ -2,7 +2,6 @@ #include "ace/High_Res_Timer.h" - ECT_Driver::~ECT_Driver (void) { } diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp index b7662e40b11..898287edee4 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp @@ -10,7 +10,6 @@ #include "ace/Sched_Params.h" - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp index 960ee33ee13..c8248e4d06a 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp @@ -3,7 +3,6 @@ #include "Supplier.h" - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp index a741f4f6c52..e52e0ae8490 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp @@ -4,7 +4,6 @@ #include "ace/OS_NS_strings.h" - const ACE_TCHAR *ior = ACE_TEXT("file://as.ior"); int diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp index d44f1be20cd..0ea6cd2f969 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp @@ -12,7 +12,6 @@ #include "ace/OS_NS_errno.h" - int iterations = 1000; int do_dump_history = 0; const ACE_TCHAR *ec_ior = ACE_TEXT("file://ec.ior"); diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp index 156656a53a9..91415ec499c 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp @@ -11,7 +11,6 @@ #include "ace/OS_NS_errno.h" - const ACE_TCHAR *ior_file_name = ACE_TEXT("ec.ior"); /// Parse the arguments. diff --git a/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp b/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp index 40c6dcb48dc..13319a2d586 100644 --- a/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp +++ b/TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp @@ -8,7 +8,6 @@ #include "ace/OS_NS_strings.h" - /* Here are the scenarios we need to test: diff --git a/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp b/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp index e6dc0eababf..389dcea940a 100644 --- a/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp +++ b/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp @@ -2,7 +2,6 @@ #include "tao/SystemException.h" - AddrServer::AddrServer (const ACE_INET_Addr& addr) { this->addr_ = addr; diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp index 2c28ecdda5e..a48b544a703 100644 --- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp @@ -1,7 +1,6 @@ #include "Counting_Consumer.h" - EC_Counting_Consumer::EC_Counting_Consumer (const char* name) : event_count (0), disconnect_count (0), diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp index ea034f0539b..a97beb2f677 100644 --- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp @@ -25,7 +25,6 @@ #endif /* __ACE_INLINE__ */ - EC_Driver::EC_Driver (void) : n_consumers_ (1), consumers_ (0), diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp index 6251fb5b9f8..450ef8bd016 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp @@ -129,7 +129,6 @@ void FTAPP::FT_Creator::usage(FILE* out)const } - int FTAPP::FT_Creator::init (CORBA::ORB_ptr orb) { int result = 0; diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp index 798c79a9e82..02e9480704c 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp @@ -287,7 +287,6 @@ int FT_ReplicaFactory_i::idle (int & result) } - int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb) { int result = 0; diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp index 1fcbb23dda1..f9b3a8f6f46 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp @@ -146,7 +146,6 @@ void FT_TestReplica_i::suicide(const char * note) // class FT_TestReplica_i public, non-CORBA interface - //static const char * FT_TestReplica_i::repository_id() { @@ -246,7 +245,6 @@ int FT_TestReplica_i::fini (void) } - ///////////////////////////////////////////////////// // class FT_TestReplica_i: PullMonitorable interface CORBA::Boolean FT_TestReplica_i::is_alive (void) diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp index 129f92fe1ca..e6d482c0814 100644 --- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp +++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp @@ -116,7 +116,6 @@ int TAO::Object_Group_Creator::unregister_role (const char * role) } - int TAO::Object_Group_Creator::create_detector_for_replica ( CORBA::Object_ptr replica, const char * role, diff --git a/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.cpp b/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.cpp index 5b23d33f306..4efc517a981 100644 --- a/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.cpp @@ -1,7 +1,6 @@ #include "Hello.h" - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp index ada224e6656..0e6b845a470 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp @@ -83,7 +83,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) number)); - } if (number < 250) diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp index 2b04f3871d1..548e0defdf7 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp @@ -186,7 +186,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) policies); - PortableServer::ObjectId_var oid1 = first_poa->activate_object (&servant1); diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp index 802d415e6b4..159b2cbcd5c 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp @@ -26,7 +26,6 @@ PushSupplier_impl::ReactorTask::svc (void) } - PushSupplier_impl::PushSupplier_impl(CORBA::ORB_ptr orb) : orb_(orb), seq_no_(0), reactor_task_(this) { @@ -49,7 +48,6 @@ int PushSupplier_impl::init(RtecEventChannelAdmin::EventChannel_ptr channel) supplier_admin->obtain_push_consumer(); - ACE_DEBUG((LM_DEBUG, "got push_consumer with %d profiles\n", consumer_->_stubobj ()->base_profiles ().profile_count ())); @@ -80,7 +78,6 @@ int PushSupplier_impl::init(RtecEventChannelAdmin::EventChannel_ptr channel) } - void PushSupplier_impl::disconnect_push_supplier ( ) { diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp index 7e306372e07..b10ab7bc453 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp @@ -15,7 +15,6 @@ #include "tao/debug.h" - AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)), number_ ((CORBA::Long) 931232), @@ -47,7 +46,6 @@ AMI_Test_i::foo (CORBA::Long_out out_l, } - void AMI_Test_i::shutdown (void) { diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp index 8e9f9941fa2..e2984787fe3 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp @@ -18,7 +18,6 @@ #include "ami_testS.h" - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int nthreads = 5; int niterations = 5; diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp index 8a9784588c9..94a895e8151 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp @@ -18,7 +18,6 @@ #include "ace/OS_NS_sys_socket.h" - const ACE_TCHAR *ior_output_file = 0; int diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp index 1eff7c36d17..9e6bfdb4d0f 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp @@ -21,7 +21,6 @@ #include "ami_testS.h" - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 5; int shutdown_flag = 0; diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp index d763b3045f3..fe3cf38c26d 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp @@ -4,7 +4,6 @@ #include "tao/AnyTypeCode/Any.h" - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); void do_nothing (void) diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp index f9e6a88977e..890e6c4631a 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp @@ -5,7 +5,6 @@ #include "tao/AnyTypeCode/Any.h" - const ACE_TCHAR *ior_output_file = 0; int no_iterations = 10; diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp index 32b64d17de5..1c26209df03 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp @@ -10,7 +10,6 @@ #endif /* __ACE_INLINE__ */ - void Callback_i::shutdown (void) { diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp index 060bd693cc1..731abb310fe 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp +++ b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp @@ -1,7 +1,6 @@ #include "Hello.h" - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp index 8b1b5de842f..d3a610e2e6c 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp @@ -3,7 +3,6 @@ - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp index a3292254a97..1fb635fa185 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp @@ -5,7 +5,6 @@ #include "ace/ACE.h" - // Constructor. Airplane_Client_i::Airplane_Client_i (void) : argc_ (0), diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.cpp index 29c74f751b2..f21f9e4d9af 100644 --- a/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.cpp @@ -32,4 +32,3 @@ Test_i::get_server_num (void) } - diff --git a/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.cpp index db7abc4244c..72c61382265 100644 --- a/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.cpp @@ -11,4 +11,3 @@ Test_i::server_pid (void) } - diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp index 406f52b8c10..b755dbd223c 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp @@ -5,7 +5,6 @@ #include "ace/ACE.h" - // Constructor. Nestea_Client_i::Nestea_Client_i (void) : argc_ (0) diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp index 4c8b2fde791..bfc07642af8 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp @@ -10,7 +10,6 @@ const size_t MAX_UINT32_STR_LEN = 11; // Largest UINT32 is 8589934591 + NUL is 11 characters - Nestea_i::Nestea_i (CORBA::ORB_ptr orb, const ACE_TCHAR *filename) : cans_ (0) { diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp index f950bfcc84e..82f97385c72 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp @@ -1,7 +1,6 @@ #include "nestea_server_i.h" - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp index 5e81ec83a88..5499a7b070d 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp @@ -10,7 +10,6 @@ #include "ace/OS_NS_stdio.h" - // The file to save the persistent state to. const ACE_TCHAR NESTEA_DATA_FILENAME[] = ACE_TEXT("nestea.dat"); diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.cpp index ad5344fbc6f..069f2f15399 100644 --- a/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.cpp @@ -28,4 +28,3 @@ Test_i::get_call_count (void) } - diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp index 7c1e0cec61c..dd9704490df 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp @@ -5,7 +5,6 @@ #include "ace/Get_Opt.h" - static const ACE_TCHAR *ior_output_file = ACE_TEXT("iorfile"); int diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp index 87e04510f2d..a3c15776a31 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp @@ -6,7 +6,6 @@ - const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); int diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h index 361720e6f5c..ebf8f240a05 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h +++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h @@ -13,7 +13,6 @@ //============================================================================= - #if !defined (NCONTEXTEXT_CLIENT_I_H) #define NCONTEXTEXT_CLIENT_I_H diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp index de52cba81eb..2da14281231 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp @@ -48,7 +48,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) } - int dead_member_rr_test (CORBA::ORB_ptr orb, const ACE_TCHAR *group_ior, Test::Basic_ptr direct_basic) diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp index e86fd5b0413..d59481f87cd 100644 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp @@ -472,7 +472,6 @@ BasicLog_Test::test_retrieval (CORBA::ULong /* numberOfRecordsToWrite */) } - int BasicLog_Test::test_query(CORBA::ULong numberOfRecordsToWrite) { diff --git a/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.cpp b/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.cpp index 5c49bf752c7..2ef95fa4f05 100644 --- a/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.cpp +++ b/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.cpp @@ -1,7 +1,6 @@ #include "McastHello.h" - McastHello::McastHello (CORBA::ORB_ptr orb, int instance) : orb_ (CORBA::ORB::_duplicate (orb)), diff --git a/TAO/orbsvcs/tests/Miop/McastLocal/client.cpp b/TAO/orbsvcs/tests/Miop/McastLocal/client.cpp index 64678a3a6e4..82ce5ecd2aa 100644 --- a/TAO/orbsvcs/tests/Miop/McastLocal/client.cpp +++ b/TAO/orbsvcs/tests/Miop/McastLocal/client.cpp @@ -4,7 +4,6 @@ #include "orbsvcs/PortableGroup/MIOP.h" - #define MAX_MIOP_OCTET_SEQUENCE (ACE_MAX_DGRAM_SIZE - 272 /* MIOP_MAX_HEADER_SIZE */) const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); diff --git a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test_impl.cpp b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test_impl.cpp index d1a4c81904f..d59755cc7ce 100644 --- a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test_impl.cpp +++ b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/Test_impl.cpp @@ -1,7 +1,6 @@ #include "Test_impl.h" - Server_impl::Server_impl (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/client.cpp b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/client.cpp index 34e9ae8b7a4..ff97ec813f6 100644 --- a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/client.cpp +++ b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/client.cpp @@ -3,7 +3,6 @@ #include "TestC.h" - const ACE_TCHAR *ior_server = 0; int diff --git a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/server.cpp b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/server.cpp index db1b3a6a5ea..4eb878ed19e 100644 --- a/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/server.cpp +++ b/TAO/orbsvcs/tests/Miop/McastPreferredInterfaces/server.cpp @@ -4,7 +4,6 @@ #include "orbsvcs/PortableGroup/GOA.h" - const ACE_TCHAR *uipmc_url = 0; const ACE_TCHAR *ior_output_file = 0; diff --git a/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.cpp b/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.cpp index a32eb6127e1..2e60841de9b 100644 --- a/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.cpp +++ b/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.cpp @@ -1,7 +1,6 @@ #include "McastHello.h" - McastHello::McastHello (CORBA::ORB_ptr orb, int instance) : orb_ (CORBA::ORB::_duplicate (orb)), diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp index 56a3172182b..f5390872c18 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp @@ -4,7 +4,6 @@ #include "ConnectDisconnect.h" - #define CD_IMPLEMENT_ENTITY(X)\ \ CD_##X::CD_##X (ConnectDisconnect* cd, int id) \ diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp index 6dfcd5110ac..fd444d02ea0 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp @@ -4,7 +4,6 @@ #include "Events.h" - /***************************************************************************/ Event_StructuredPushConsumer::Event_StructuredPushConsumer (Events *test_client) diff --git a/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp b/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp index 13953088e6a..7d2504daf97 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp @@ -5,7 +5,6 @@ #include "orbsvcs/CosNotifyFilterExtC.h" - ExtendedFilter::ExtendedFilter (void) : event_count_ (5) { diff --git a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp index 6014d6c7aaf..e10e796bc8f 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp @@ -4,7 +4,6 @@ #include "Filter.h" - Filter::Filter (void) : event_count_ (5) { diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp index e65237bdb92..35d06b5d5f9 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp @@ -4,7 +4,6 @@ #include "MultiTypes.h" - //***************************************************************************************************** MultiTypes_PushConsumer::MultiTypes_PushConsumer (MultiTypes* client) diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp index f61f6e17edd..942d4dcdaf3 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp @@ -5,7 +5,6 @@ #include "Sequence.h" - /***************************************************************************/ SequencePushConsumer::SequencePushConsumer (Sequence *test_client) diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp index ddd0ad8f9ac..add5a5317b6 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp @@ -4,7 +4,6 @@ #include "Simple.h" - //*************************************************************************** Event_AnyPushConsumer::Event_AnyPushConsumer (Simple_Test *test_client) diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp index a3326305bcb..612deae2d2f 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp @@ -4,7 +4,6 @@ #include "Updates.h" - Updates_StructuredPushConsumer::Updates_StructuredPushConsumer (Updates *test_client) : test_client_ (test_client) { diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp index 6f110389e8b..27ef659b602 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp @@ -16,7 +16,6 @@ get_event_channel(CORBA::ORB_ptr orb) CosNotification::AdminProperties init_admin(0); - std::cout << "Get CosNotifyChannelAdmin::EventChannelFactory" << std::endl; std::cout << "IorEventChannelFactory=" << ior << std::endl; CORBA::Object_var obj = orb->string_to_object(ior); diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp index 96fe82eb761..23a8719f783 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp @@ -136,7 +136,6 @@ int loadOrb(ACE_Service_Config & service_config) } - int ACE_TMAIN(int, ACE_TCHAR **argv) { diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp index 78ac583c59a..caf8ef284ac 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp @@ -98,7 +98,6 @@ return 0; } - void loadunloadcycle() { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp index 9c61a834f92..b60ec30150f 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp @@ -43,7 +43,6 @@ ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_VERSIONED_SERVICE_D ACE_TCHAR const * const scpc_unloadNotifyService = ACE_REMOVE_SERVICE_DIRECTIVE("testNotifyService"); - int publish() { int result = 0; diff --git a/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp b/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp index 6f3a741ea98..827a2a95461 100644 --- a/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp +++ b/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp @@ -18,7 +18,6 @@ sorter (const void* a, const void* b) } - // It's reasonable to assume that there is only one event channel // factory and that we know its name. class MonitorTestInterface_i: public virtual POA_MonitorTestInterface diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp index 02f9125570c..1fc535fc299 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp @@ -1,7 +1,6 @@ #include "RT_Application_Command.h" - #include "../lib/LookupManager.h" #include "RT_Priority_Mapping.h" diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp index e1f9c3d1a34..5622466deed 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp +++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Factories_Define.cpp @@ -1,7 +1,6 @@ #include "../lib/Factories_Define.h" - #include "rt_notify_test_export.h" #include "../lib/Name.h" #include "../lib/Command_Factory_T.h" diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp index 88cda77d7ec..56879cece67 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp @@ -1,7 +1,6 @@ #include "RT_POA_Command.h" - #include "tao/debug.h" #include "../lib/LookupManager.h" #include "../lib/Name.h" diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp index 10a8b6ba093..4545dc048f5 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp +++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp @@ -1,7 +1,6 @@ #include "RT_Priority_Mapping.h" - #include "../lib/LookupManager.h" TAO_Notify_Tests_RT_Priority_Mapping::~TAO_Notify_Tests_RT_Priority_Mapping (void) diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp index 4b43325d224..31b9baac697 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp @@ -7,7 +7,6 @@ #include "tao/AnyTypeCode/Any.h" - static const char NOTIFY_FACTORY_NAME[] = "NotifyEventChannelFactory"; static const char NAMING_SERVICE_NAME[] = "NameService"; diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp index c550f4178fe..ea591edbf60 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp @@ -7,7 +7,6 @@ #include "ace/OS_NS_strings.h" - static const char NOTIFY_FACTORY_NAME[] = "NotifyEventChannelFactory"; static const char NAMING_SERVICE_NAME[] = "NameService"; @@ -168,7 +167,6 @@ ReconnectionCallback_i::init ( } - ///////////////// // Supplier_Main diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h index 8485a93a1ca..fa0a3988c89 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h @@ -170,5 +170,4 @@ class Supplier_Main }; - #endif /* RECONNECTNG_SUPPLIER_H */ diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp index ff86d67b4e7..b5299870f68 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp @@ -1,7 +1,6 @@ #include "RT_Test_FilterFactory.h" - #include "RT_Test_Filter.h" #include "tao/debug.h" #include "ace/OS_NS_string.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp index 3ebb4709a2d..3b89f49dbcc 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp @@ -1,7 +1,6 @@ #include "Application_Command.h" - #include "tao/PortableServer/PortableServer.h" #include "LookupManager.h" #include "Name.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Command.cpp index 96dff4a1d34..4b7de8fcb56 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Command.cpp @@ -6,7 +6,6 @@ #include "ace/Log_Msg.h" - TAO_Notify_Tests_Command::TAO_Notify_Tests_Command (void) :next_ (0), command_ (INVALID) { diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp index 94c10a875ba..9b76abd6578 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp @@ -6,7 +6,6 @@ #include "Name.h" - TAO_Notify_Tests_Command_Builder::TAO_Notify_Tests_Command_Builder (void) : start_command_ (0), last_command_ (0) diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp index ecb1789c077..b9e7c2e70c3 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp @@ -2,7 +2,6 @@ #include "Command_Factory.h" - TAO_Notify_Tests_Command_Factory::TAO_Notify_Tests_Command_Factory (void) { } diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp index ad72f569edc..f4b2ebdf7b7 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp @@ -4,7 +4,6 @@ #include "Command_Factory_T.h" - #include "ace/Dynamic_Service.h" #include "tao/debug.h" #include "Command_Builder.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp index f64c5988d5f..7aa1dac3b08 100644 --- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp @@ -1,7 +1,6 @@ #include "ConsumerAdmin_Command.h" - #include "LookupManager.h" #include "Name.h" #include "Options_Parser.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp index 615acf230fe..ab4ea2c7edf 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp @@ -4,7 +4,6 @@ #include "Consumer_T.h" - template <class Consumer_Traits> TAO_Notify_Tests_Consumer_T<Consumer_Traits>::TAO_Notify_Tests_Consumer_T (void) { diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp index 7d967fc85e2..4c356f12e5d 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp @@ -1,7 +1,6 @@ #include "Direct_Consumer.h" - #include "LookupManager.h" TAO_Notify_Tests_Direct_Consumer::TAO_Notify_Tests_Direct_Consumer (void) diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp index e9c66c60d25..d45f244a88b 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp @@ -5,7 +5,6 @@ #endif /* __ACE_INLINE__ */ - #include "LookupManager.h" TAO_Notify_Tests_Direct_Supplier::TAO_Notify_Tests_Direct_Supplier (ACE_CString& target) diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp index 45850fbc5e2..5cb0902ea3a 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp @@ -1,7 +1,6 @@ #include "Driver.h" - #include "ace/Dynamic_Service.h" #include "ace/Thread_Manager.h" #include "ace/Arg_Shifter.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.h b/TAO/orbsvcs/tests/Notify/lib/Driver.h index 054eba9e8f9..babb998dd5a 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Driver.h +++ b/TAO/orbsvcs/tests/Notify/lib/Driver.h @@ -50,7 +50,6 @@ private: }; - /** * Run a server thread * diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp index 16745bb20e5..7e23a78a5bb 100644 --- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp @@ -2,7 +2,6 @@ #include "ace/Log_Msg.h" - #include "LookupManager.h" #include "Name.h" #include "Options_Parser.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp b/TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp index 1822f47896d..9311312b506 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Factories_Define.cpp @@ -1,7 +1,6 @@ #include "Factories_Define.h" - #include "Name.h" #include "Command_Factory_T.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp index 93fe8e5af33..64a1003095c 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp @@ -2,7 +2,6 @@ #include "ace/Log_Msg.h" - #include "LookupManager.h" #include "Name.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp index 492a6a2f2bf..d2cbf162200 100644 --- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp @@ -2,7 +2,6 @@ #include "ace/OS_NS_string.h" - #include "Name.h" TAO_Notify_Tests_LookupManager::TAO_Notify_Tests_LookupManager (void) diff --git a/TAO/orbsvcs/tests/Notify/lib/Name.cpp b/TAO/orbsvcs/tests/Notify/lib/Name.cpp index f86ec08f39e..e0594607bd6 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Name.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Name.cpp @@ -1,7 +1,6 @@ #include "Name.h" - #define TAO_Notify_Tests_DECLARE_NAME(target, name) \ const char* const TAO_Notify_Tests_Name::target = name; diff --git a/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp b/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp index 19e60fa7c72..5b65827eef4 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp @@ -1,7 +1,6 @@ #include "Priority_Mapping.h" - TAO_Notify_Tests_Priority_Mapping::~TAO_Notify_Tests_Priority_Mapping (void) { } diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp index 9358f2326ba..21b198b5164 100644 --- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp @@ -5,7 +5,6 @@ #endif /* __ACE_INLINE__ */ - TAO_Notify_Tests_PushConsumer_Traits::TAO_Notify_Tests_PushConsumer_Traits (void) :type_ (CosNotifyChannelAdmin::ANY_EVENT) { diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp index e32616ff243..c06dc8c17a7 100644 --- a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp @@ -5,7 +5,6 @@ #endif /* __ACE_INLINE__ */ - TAO_Notify_Tests_PushSupplier_Traits::TAO_Notify_Tests_PushSupplier_Traits (void) :type_ (CosNotifyChannelAdmin::ANY_EVENT) { diff --git a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp index 4e6aeca4a33..5341b868cdc 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp @@ -1,7 +1,6 @@ #include "Relay_Consumer.h" - #include "LookupManager.h" TAO_Notify_Tests_Relay_Consumer::TAO_Notify_Tests_Relay_Consumer (ACE_CString& destination) diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp index a9d59c40b55..69f1580fac4 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp @@ -5,7 +5,6 @@ #endif /* __ACE_INLINE__ */ - TAO_Notify_Tests_SequencePushConsumer_Traits::TAO_Notify_Tests_SequencePushConsumer_Traits (void) :type_ (CosNotifyChannelAdmin::SEQUENCE_EVENT) { diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp index bdb78afc0d3..7898a9101fb 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp @@ -5,7 +5,6 @@ #endif /* __ACE_INLINE__ */ - TAO_Notify_Tests_SequencePushSupplier_Traits::TAO_Notify_Tests_SequencePushSupplier_Traits (void) :type_ (CosNotifyChannelAdmin::SEQUENCE_EVENT) { diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp index 45d6bd1add4..9ef61bfdd45 100644 --- a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp @@ -1,7 +1,6 @@ #include "StructuredEvent.h" - TAO_Notify_Tests_StructuredEvent::TAO_Notify_Tests_StructuredEvent (void) { } diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp index 3c47d0c1201..acd8e77f3d1 100644 --- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp @@ -5,7 +5,6 @@ #endif /* __ACE_INLINE__ */ - TAO_Notify_Tests_StructuredPushConsumer_Traits::TAO_Notify_Tests_StructuredPushConsumer_Traits (void) :type_ (CosNotifyChannelAdmin::STRUCTURED_EVENT) { diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp index b5ef2bfc9f6..02d9fae6808 100644 --- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp @@ -5,7 +5,6 @@ #endif /* __ACE_INLINE__ */ - TAO_Notify_Tests_StructuredPushSupplier_Traits::TAO_Notify_Tests_StructuredPushSupplier_Traits (void) :type_ (CosNotifyChannelAdmin::STRUCTURED_EVENT) { diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp index 5735508d687..b3b91fae728 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp @@ -1,7 +1,6 @@ #include "SupplierAdmin_Command.h" - #include "LookupManager.h" #include "Name.h" #include "Options_Parser.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp index 33fb119d383..75e2ce86f1b 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp @@ -4,7 +4,6 @@ #include "Supplier_T.h" - template <class Supplier_Traits> TAO_Notify_Tests_Supplier_T<Supplier_Traits>::TAO_Notify_Tests_Supplier_T (void) { diff --git a/TAO/orbsvcs/tests/Property/client.cpp b/TAO/orbsvcs/tests/Property/client.cpp index 02c8642afea..a4431f432f1 100644 --- a/TAO/orbsvcs/tests/Property/client.cpp +++ b/TAO/orbsvcs/tests/Property/client.cpp @@ -14,7 +14,6 @@ #include "tao/debug.h" - Client::Client (void) { } diff --git a/TAO/orbsvcs/tests/Property/main.cpp b/TAO/orbsvcs/tests/Property/main.cpp index 261b126d520..3dec33abd9a 100644 --- a/TAO/orbsvcs/tests/Property/main.cpp +++ b/TAO/orbsvcs/tests/Property/main.cpp @@ -17,7 +17,6 @@ #include "orbsvcs/Property/CosPropertyService_i.h" - class TAO_PropertySet_Tester { // = TITLE diff --git a/TAO/orbsvcs/tests/Property/server.cpp b/TAO/orbsvcs/tests/Property/server.cpp index 8e65a4fe98d..02fb01d1f4e 100644 --- a/TAO/orbsvcs/tests/Property/server.cpp +++ b/TAO/orbsvcs/tests/Property/server.cpp @@ -13,7 +13,6 @@ #include "server.h" - // Main program int diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp index fcaf868bf25..f3fc41ea831 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp +++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp @@ -10,7 +10,6 @@ #include "orbsvcs/Naming/Naming_Server.h" - const char* service_name = "ScheduleService"; const char* format_string = "{%-12s, %d, %d, %d, %d, %8d, " diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies_Runtime.h b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies_Runtime.h index caf91220202..6da2cf94406 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies_Runtime.h +++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies_Runtime.h @@ -20,7 +20,6 @@ ERROR: The following entry points have unresolved local dependencies: // both_unresolved_consumer_2 - static ACE_Scheduler_Factory::POD_RT_Info infos[] = { {"good_supplier", 1, 5000, 5000, 5000, 500000, (RtecScheduler::Criticality_t) 3, (RtecScheduler::Importance_t) 1, 0, 1, 15, 0, 0, (RtecScheduler::Info_Type_t) 0} , diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp index 55ef7703736..78bbc88a2ee 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp +++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp @@ -15,7 +15,6 @@ - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp index 9c81e257b95..21be335d766 100644 --- a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp +++ b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp @@ -8,7 +8,6 @@ #include "tao/Thread_Lane_Resources.h" - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); void do_nothing (void) diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp index 0b3a484f806..66d184ba1be 100644 --- a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp +++ b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp @@ -5,7 +5,6 @@ #include "tao/AnyTypeCode/Any.h" - const ACE_TCHAR *ior_output_file = 0; int no_iterations = 10; diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp index 0fd0602b0b4..6d40115b9ea 100644 --- a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp +++ b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp @@ -10,7 +10,6 @@ #endif /* __ACE_INLINE__ */ - void Callback_i::shutdown (void) { diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp index c2919011234..e6b3d3e6fcc 100644 --- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp +++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp @@ -30,7 +30,6 @@ Server_Task::svc (void) this->event_.wait (); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Start doing some work....\n")); diff --git a/TAO/orbsvcs/tests/Time/Client_i.cpp b/TAO/orbsvcs/tests/Time/Client_i.cpp index b6a9fc776d9..2f26da216b9 100644 --- a/TAO/orbsvcs/tests/Time/Client_i.cpp +++ b/TAO/orbsvcs/tests/Time/Client_i.cpp @@ -10,7 +10,6 @@ #include "ace/os_include/os_netdb.h" - // Constructor. Client_i::Client_i (void) diff --git a/TAO/orbsvcs/tests/Time/client.cpp b/TAO/orbsvcs/tests/Time/client.cpp index b5ba042c043..4ea33d6dda6 100644 --- a/TAO/orbsvcs/tests/Time/client.cpp +++ b/TAO/orbsvcs/tests/Time/client.cpp @@ -2,7 +2,6 @@ #include "ace/Log_Msg.h" - // This function runs the Time Service client test. int diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp index fbd6b915254..92811ca9285 100644 --- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp +++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp @@ -4,7 +4,6 @@ #include "Simple_Dynamic.h" - template <class T> TAO_Simple_Dynamic_Property<T>::TAO_Simple_Dynamic_Property (const T& dp) : dp_ (dp) diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.cpp b/TAO/orbsvcs/tests/Trading/TT_Info.cpp index 329f3d8c86a..1442190a726 100644 --- a/TAO/orbsvcs/tests/Trading/TT_Info.cpp +++ b/TAO/orbsvcs/tests/Trading/TT_Info.cpp @@ -4,7 +4,6 @@ #include "ace/OS_NS_string.h" - const char* TT_Info::INTERFACE_NAMES[] = { "TAO_Trader_Test::Remote_IO", diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h index e2b64b3ddc1..e2f09f0b197 100644 --- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h +++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h @@ -47,7 +47,6 @@ public: Test::Timestamp send_time); - void shutdown (Test::AMH_RoundtripResponseHandler_ptr _tao_rh); private: diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp index 7af03422198..64c44e0d706 100644 --- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp @@ -335,7 +335,6 @@ test_double_seq (Test::Roundtrip_ptr roundtrip) } - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/performance-tests/Sequence_Latency/DSI/client.cpp b/TAO/performance-tests/Sequence_Latency/DSI/client.cpp index a399d56df78..54ec9a64dde 100644 --- a/TAO/performance-tests/Sequence_Latency/DSI/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/DSI/client.cpp @@ -337,7 +337,6 @@ test_double_seq (Test::Roundtrip_ptr roundtrip) } - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp index 098776142d6..b159411c7d5 100644 --- a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp @@ -89,7 +89,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) } - int test_octet_seq (Test::Roundtrip_ptr roundtrip) { @@ -510,7 +509,6 @@ test_double_seq (Test::Roundtrip_ptr roundtrip) } - // The main() function starts here int diff --git a/TAO/tao/AnyTypeCode/WrongTransactionA.cpp b/TAO/tao/AnyTypeCode/WrongTransactionA.cpp index 43e2a8f8836..18b2591053e 100644 --- a/TAO/tao/AnyTypeCode/WrongTransactionA.cpp +++ b/TAO/tao/AnyTypeCode/WrongTransactionA.cpp @@ -56,7 +56,6 @@ namespace CORBA } - // TAO_IDL - Generated from // be\be_visitor_exception/any_op_cs.cpp:50 diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp index 79835eacf2c..3267f210d56 100644 --- a/TAO/tao/CDR.cpp +++ b/TAO/tao/CDR.cpp @@ -245,7 +245,6 @@ TAO_OutputCDR::fragment_stream (ACE_CDR::ULong pending_alignment, } - int TAO_OutputCDR::offset (char* pos) { diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp index 84627c4375f..c91f7ef99b3 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp @@ -19,7 +19,6 @@ TAO::CSD::TP_Strategy::~TP_Strategy() } - TAO::CSD::TP_Strategy::CustomRequestOutcome TAO::CSD::TP_Strategy::custom_synch_request(TP_Custom_Request_Operation* op) { diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp index 9e714f9e4b9..378ea9e05af 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp @@ -278,7 +278,6 @@ TAO::CSD::TP_Task::close(u_long flag) } - void TAO::CSD::TP_Task::cancel_servant (PortableServer::Servant servant) { diff --git a/TAO/tao/Connector_Impl.h b/TAO/tao/Connector_Impl.h index e220cb83212..42ca96486ec 100644 --- a/TAO/tao/Connector_Impl.h +++ b/TAO/tao/Connector_Impl.h @@ -58,7 +58,6 @@ private: }; - /** * @class TAO_Connect_Concurrency_Strategy * diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy.h b/TAO/tao/DiffServPolicy/DiffServPolicy.h index 1f88da59fef..2aa89367bb6 100644 --- a/TAO/tao/DiffServPolicy/DiffServPolicy.h +++ b/TAO/tao/DiffServPolicy/DiffServPolicy.h @@ -42,7 +42,6 @@ TAO_Requires_DiffServPolicy_Initializer = TAO_DiffServPolicy_Initializer::static_init (); - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_DiffServPolicy, TAO_DiffServPolicy_Initializer) ACE_FACTORY_DECLARE (TAO_DiffServPolicy, TAO_DiffServPolicy_Initializer) TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp index 053ac1bba8b..dcc2530d7ae 100644 --- a/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp +++ b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp @@ -107,7 +107,6 @@ TAO_DTP_POA_Strategy::poa_activated_event_i (TAO_ORB_Core& orb_core) } - } return (this->dtp_task_.open () == 0); diff --git a/TAO/tao/Dynamic_TP/DTP_POA_Strategy.h b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.h index 3b9acd43681..aeb0359a025 100644 --- a/TAO/tao/Dynamic_TP/DTP_POA_Strategy.h +++ b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.h @@ -201,7 +201,6 @@ class TAO_Dynamic_TP_Export TAO_DTP_POA_Strategy: }; - TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.h b/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.h index 46d044de18a..57f8ec56bf3 100644 --- a/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.h +++ b/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.h @@ -103,7 +103,6 @@ public: }; - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Dynamic_TP, TAO_DTP_Thread_Lane_Resources_Manager_Factory) ACE_FACTORY_DECLARE (TAO_Dynamic_TP, diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy.h b/TAO/tao/EndpointPolicy/EndpointPolicy.h index 6895190df68..3bbc84610a9 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicy.h +++ b/TAO/tao/EndpointPolicy/EndpointPolicy.h @@ -40,7 +40,6 @@ static int TAO_Requires_EndpointPolicy_Initializer = TAO_EndpointPolicy_Initializer::static_init (); - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_EndpointPolicy, TAO_EndpointPolicy_Initializer) ACE_FACTORY_DECLARE (TAO_EndpointPolicy, TAO_EndpointPolicy_Initializer) diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_i.h b/TAO/tao/EndpointPolicy/EndpointPolicy_i.h index 5fe59a50bb5..cbcf802228e 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicy_i.h +++ b/TAO/tao/EndpointPolicy/EndpointPolicy_i.h @@ -74,7 +74,6 @@ private: }; - TAO_END_VERSIONED_NAMESPACE_DECL #if defined(_MSC_VER) diff --git a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp index 197b7e26192..5237c0d7261 100644 --- a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp +++ b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp @@ -55,7 +55,6 @@ TAO_Endpoint_Acceptor_Filter_Factory::~TAO_Endpoint_Acceptor_Filter_Factory(void } - ACE_FACTORY_DEFINE (TAO_EndpointPolicy, TAO_Endpoint_Acceptor_Filter_Factory) ACE_STATIC_SVC_DEFINE (TAO_Endpoint_Acceptor_Filter_Factory, ACE_TEXT ("TAO_Acceptor_Filter_Factory"), diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h index 7012aac3152..8b4cc5dd7b3 100644 --- a/TAO/tao/IIOP_Connector.h +++ b/TAO/tao/IIOP_Connector.h @@ -131,7 +131,6 @@ private: ACE_Time_Value *timeout = 0); - /// Return the remote endpoint, a helper function TAO_IIOP_Endpoint *remote_endpoint (TAO_Endpoint *ep); diff --git a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp index ff0302be5d1..79ed9106ddf 100644 --- a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp +++ b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp @@ -127,7 +127,6 @@ TAO_AMI_Arguments_Converter_Impl::Initializer () } - ACE_STATIC_SVC_DEFINE ( TAO_AMI_Arguments_Converter_Impl, ACE_TEXT ("AMI_Arguments_Converter"), diff --git a/TAO/tao/PI/DLL_Resident_ORB_Initializer.h b/TAO/tao/PI/DLL_Resident_ORB_Initializer.h index 306e088b265..c1bec77d2f4 100644 --- a/TAO/tao/PI/DLL_Resident_ORB_Initializer.h +++ b/TAO/tao/PI/DLL_Resident_ORB_Initializer.h @@ -76,4 +76,3 @@ TAO_END_VERSIONED_NAMESPACE_DECL - diff --git a/TAO/tao/PI/PolicyFactoryC.h b/TAO/tao/PI/PolicyFactoryC.h index f97f52df981..db4338c0fb0 100644 --- a/TAO/tao/PI/PolicyFactoryC.h +++ b/TAO/tao/PI/PolicyFactoryC.h @@ -112,7 +112,6 @@ namespace PortableInterceptor } - // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorC.h b/TAO/tao/PI_Server/ServerRequestInterceptorC.h index 4dce9d6cc6a..b1b298e9fe5 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptorC.h +++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.h @@ -137,7 +137,6 @@ namespace PortableInterceptor } - // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp index 531be3b10f4..54d5cff2d9d 100644 --- a/TAO/tao/PortableServer/Servant_Base.cpp +++ b/TAO/tao/PortableServer/Servant_Base.cpp @@ -350,7 +350,6 @@ TAO_ServantBase::_component_thru_poa_skel (TAO_ServerRequest & server_request, # endif /* !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ - void TAO_ServantBase::_repository_id_skel (TAO_ServerRequest & server_request, TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall), diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp index 45de2e87c27..9bc48cb6352 100644 --- a/TAO/tao/Profile.cpp +++ b/TAO/tao/Profile.cpp @@ -868,7 +868,6 @@ TAO_Unknown_Profile::create_profile_body (TAO_OutputCDR &) const } - // ************************************************************* // Operators for TAO_opaque encoding and decoding // ************************************************************* diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping.h b/TAO/tao/RTCORBA/Network_Priority_Mapping.h index cfd886b6fe6..94ac1a3df4d 100644 --- a/TAO/tao/RTCORBA/Network_Priority_Mapping.h +++ b/TAO/tao/RTCORBA/Network_Priority_Mapping.h @@ -58,4 +58,3 @@ TAO_END_VERSIONED_NAMESPACE_DECL - diff --git a/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.cpp b/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.cpp index 1b08b74c125..b1315fc4b69 100644 --- a/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.cpp +++ b/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.cpp @@ -34,7 +34,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_typecode/objref_typecode.cpp:76 @@ -52,7 +51,6 @@ namespace RTCORBA } - // TAO_IDL - Generated from // be\be_visitor_interface/any_op_cs.cpp:51 diff --git a/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.h b/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.h index 01d9fe52e01..698f884583d 100644 --- a/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.h +++ b/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.h @@ -39,7 +39,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:59 @@ -61,7 +60,6 @@ namespace RTCORBA // be\be_visitor_interface/any_op_ch.cpp:54 - namespace CORBA { TAO_RTCORBA_Export void operator<<= (::CORBA::Any &, RTCORBA::ProtocolProperties_ptr); // copying TAO_RTCORBA_Export void operator<<= (::CORBA::Any &, RTCORBA::ProtocolProperties_ptr *); // non-copying @@ -70,7 +68,6 @@ TAO_RTCORBA_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, RTCORBA:: TAO_END_VERSIONED_NAMESPACE_DECL - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.cpp b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.cpp index c7ae47b6ab6..ad4ac56622d 100644 --- a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.cpp +++ b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.cpp @@ -33,7 +33,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:72 @@ -56,7 +55,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_visitor_interface/interface_cs.cpp:60 diff --git a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h index f32303eb9ba..62e45e792f9 100644 --- a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h +++ b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h @@ -177,7 +177,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // TAO_IDL - Generated from // be\be_codegen.cpp:1209 diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h index 25f06df9d2c..8f14615e171 100644 --- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h +++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h @@ -102,7 +102,6 @@ public: }; - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTCORBA, TAO_RT_Thread_Lane_Resources_Manager_Factory) ACE_FACTORY_DECLARE (TAO_RTCORBA, TAO_RT_Thread_Lane_Resources_Manager_Factory) diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h index 279a6783848..d95d4108d6f 100644 --- a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h +++ b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h @@ -72,7 +72,6 @@ protected: - ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Strategies, TAO_OC_Endpoint_Selector_Factory) ACE_FACTORY_DECLARE (TAO_Strategies, TAO_OC_Endpoint_Selector_Factory) diff --git a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp index 656d238970b..1f1a862d93e 100644 --- a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp +++ b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp @@ -125,7 +125,6 @@ TAO_Optimized_Connection_Endpoint_Selector::select_endpoint } - // at this point, we do not have an existing transport, so we must // reset the profile list and try establishing connections via the // connector(s). diff --git a/TAO/tao/Strategies/SHMIOP_Transport.cpp b/TAO/tao/Strategies/SHMIOP_Transport.cpp index 70834ff1af1..c75de9b6f65 100644 --- a/TAO/tao/Strategies/SHMIOP_Transport.cpp +++ b/TAO/tao/Strategies/SHMIOP_Transport.cpp @@ -263,7 +263,6 @@ TAO_SHMIOP_Transport::handle_input (TAO_Resume_Handle &rh, } - int TAO_SHMIOP_Transport::send_request (TAO_Stub *stub, TAO_ORB_Core *orb_core, diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp index 0abba74c236..385dc65ea31 100644 --- a/TAO/tao/Strategies/advanced_resource.cpp +++ b/TAO/tao/Strategies/advanced_resource.cpp @@ -406,7 +406,6 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void) } - TAO_ProtocolFactorySet * TAO_Advanced_Resource_Factory::get_protocol_factories (void) { diff --git a/TAO/tests/BiDirectional_MultipleORB/destroy.cpp b/TAO/tests/BiDirectional_MultipleORB/destroy.cpp index f3446e8b98c..3588381540e 100644 --- a/TAO/tests/BiDirectional_MultipleORB/destroy.cpp +++ b/TAO/tests/BiDirectional_MultipleORB/destroy.cpp @@ -16,7 +16,6 @@ #include "tao/BiDir_GIOP/BiDirGIOP.h" - int test_with_bidir_poa (int argc, ACE_TCHAR **argv, diff --git a/TAO/tests/Big_Reply/Client_Task.cpp b/TAO/tests/Big_Reply/Client_Task.cpp index 36a76b6f73b..d0732cf60f8 100644 --- a/TAO/tests/Big_Reply/Client_Task.cpp +++ b/TAO/tests/Big_Reply/Client_Task.cpp @@ -2,7 +2,6 @@ #include "Client_Task.h" - Client_Task::Client_Task (Test::Big_Reply_ptr reply_gen, int event_count, ACE_Thread_Manager *thr_mgr) diff --git a/TAO/tests/Big_Reply/client.cpp b/TAO/tests/Big_Reply/client.cpp index 3ddf68ada38..2889ffc3928 100644 --- a/TAO/tests/Big_Reply/client.cpp +++ b/TAO/tests/Big_Reply/client.cpp @@ -2,7 +2,6 @@ #include "ace/Get_Opt.h" - const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); bool server_shutdown = false; diff --git a/TAO/tests/Big_Reply/server.cpp b/TAO/tests/Big_Reply/server.cpp index f9518505a01..020e73d2120 100644 --- a/TAO/tests/Big_Reply/server.cpp +++ b/TAO/tests/Big_Reply/server.cpp @@ -4,7 +4,6 @@ #include "ace/Task.h" - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); // We can change this value if wanted.. diff --git a/TAO/tests/Bug_1020_Regression/Echo.cpp b/TAO/tests/Bug_1020_Regression/Echo.cpp index 049b77c94c8..f46204005cc 100644 --- a/TAO/tests/Bug_1020_Regression/Echo.cpp +++ b/TAO/tests/Bug_1020_Regression/Echo.cpp @@ -6,7 +6,6 @@ #include "Echo.h" - Echo::Echo(CORBA::ORB_ptr orb) : orb_(CORBA::ORB::_duplicate(orb)) { diff --git a/TAO/tests/Bug_1020_Regression/ORB_Task.cpp b/TAO/tests/Bug_1020_Regression/ORB_Task.cpp index 72b42ee6a30..cb379028636 100644 --- a/TAO/tests/Bug_1020_Regression/ORB_Task.cpp +++ b/TAO/tests/Bug_1020_Regression/ORB_Task.cpp @@ -7,7 +7,6 @@ #include "tao/Environment.h" - ORB_Task::ORB_Task(CORBA::ORB_ptr orb) : orb_(CORBA::ORB::_duplicate(orb)) { diff --git a/TAO/tests/Bug_1020_Regression/Server_Task.cpp b/TAO/tests/Bug_1020_Regression/Server_Task.cpp index 550ddb0c070..214129aaa4f 100644 --- a/TAO/tests/Bug_1020_Regression/Server_Task.cpp +++ b/TAO/tests/Bug_1020_Regression/Server_Task.cpp @@ -6,7 +6,6 @@ #include "Server_Task.h" - Server_Task::Server_Task(Test::Echo_ptr echo) : echo_(Test::Echo::_duplicate(echo)) { diff --git a/TAO/tests/Bug_1869_Regression/client.cpp b/TAO/tests/Bug_1869_Regression/client.cpp index e38493d8d97..8add5c09f5f 100644 --- a/TAO/tests/Bug_1869_Regression/client.cpp +++ b/TAO/tests/Bug_1869_Regression/client.cpp @@ -121,4 +121,3 @@ ACE_TCHAR address_servant[1000]; } - diff --git a/TAO/tests/Bug_2188_Regression/broken_i.cpp b/TAO/tests/Bug_2188_Regression/broken_i.cpp index 0045d9c8970..9cccd8429bc 100644 --- a/TAO/tests/Bug_2188_Regression/broken_i.cpp +++ b/TAO/tests/Bug_2188_Regression/broken_i.cpp @@ -28,7 +28,6 @@ #include "broken_i.h" - ServerAdmin_i::ServerAdmin_i (ArrayTest_ptr target) :target_ (ArrayTest::_duplicate(target)) { diff --git a/TAO/tests/Bug_2678_Regression/server.cpp b/TAO/tests/Bug_2678_Regression/server.cpp index 1a40df86114..da4ec179b1e 100644 --- a/TAO/tests/Bug_2678_Regression/server.cpp +++ b/TAO/tests/Bug_2678_Regression/server.cpp @@ -117,5 +117,3 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) - - diff --git a/TAO/tests/Bug_3198_Regression/bug_3198_regression.cpp b/TAO/tests/Bug_3198_Regression/bug_3198_regression.cpp index b4c93c1b20b..40e905106ff 100644 --- a/TAO/tests/Bug_3198_Regression/bug_3198_regression.cpp +++ b/TAO/tests/Bug_3198_Regression/bug_3198_regression.cpp @@ -94,13 +94,3 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) - - - - - - - - - - diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp index c98bd78c21b..95115803f11 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp @@ -84,4 +84,3 @@ Foo_A_Statistics::actual_vs_expected() } - diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp index 6f314f493a4..1f4f3850a74 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp @@ -107,4 +107,3 @@ Foo_C_Statistics::actual_vs_expected() } - diff --git a/TAO/tests/DII_AMI_Forward/DII_ReplyHandler.cpp b/TAO/tests/DII_AMI_Forward/DII_ReplyHandler.cpp index a7ec401629a..3d1588d4a80 100644 --- a/TAO/tests/DII_AMI_Forward/DII_ReplyHandler.cpp +++ b/TAO/tests/DII_AMI_Forward/DII_ReplyHandler.cpp @@ -119,5 +119,4 @@ DII_ReplyHandler::handle_location_forward (TAO_InputCDR &incoming, req->sendc(this); - } diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp index 628c447dbe2..8e525bb5aaa 100644 --- a/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp +++ b/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp @@ -339,4 +339,3 @@ CORBA::ULong Hello::error_count () const } - diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp index 7d1ea2c57a1..2dbe25a3b22 100644 --- a/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp +++ b/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp @@ -356,4 +356,3 @@ CORBA::ULong Hello::error_count () const } - diff --git a/TAO/tests/DIOP/server.cpp b/TAO/tests/DIOP/server.cpp index e1ba8b5ff02..ed556905685 100644 --- a/TAO/tests/DIOP/server.cpp +++ b/TAO/tests/DIOP/server.cpp @@ -10,7 +10,6 @@ //============================================================================= - #include "UDP_i.h" #include "tao/debug.h" diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp index 441ded57aca..c4c71f9bd5f 100644 --- a/TAO/tests/DynAny_Test/test_dynsequence.cpp +++ b/TAO/tests/DynAny_Test/test_dynsequence.cpp @@ -230,7 +230,6 @@ Test_DynSequence::run_test (void) } - if (this->error_count_ == 0) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/MT_BiDir/Server_Task.cpp b/TAO/tests/MT_BiDir/Server_Task.cpp index c2919011234..e6b3d3e6fcc 100644 --- a/TAO/tests/MT_BiDir/Server_Task.cpp +++ b/TAO/tests/MT_BiDir/Server_Task.cpp @@ -30,7 +30,6 @@ Server_Task::svc (void) this->event_.wait (); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Start doing some work....\n")); diff --git a/TAO/tests/MT_Timeout/client.cpp b/TAO/tests/MT_Timeout/client.cpp index a1a9569a78b..21e9291f016 100644 --- a/TAO/tests/MT_Timeout/client.cpp +++ b/TAO/tests/MT_Timeout/client.cpp @@ -154,5 +154,3 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) - - diff --git a/TAO/tests/Mixed_Sync_ASync_Events/test_i.h b/TAO/tests/Mixed_Sync_ASync_Events/test_i.h index ef96d582596..2afce180a26 100644 --- a/TAO/tests/Mixed_Sync_ASync_Events/test_i.h +++ b/TAO/tests/Mixed_Sync_ASync_Events/test_i.h @@ -117,6 +117,5 @@ private: }; - #endif /* TAO_MSAE_TEST_I_H */ diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp index 0b8ef63068c..e166bfcfe90 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp @@ -75,7 +75,6 @@ MT_Server::read_ior (ACE_TCHAR *filename) } - int MT_Server::parse_args (void) { diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp index 787932e6aed..1477fa15f75 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp @@ -27,7 +27,6 @@ Object_A_i::~Object_A_i (void) } - void Object_A_i::foo (Initiator_ptr theInitiator_ptr) { diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp index 0651d0b96d2..174e4c01d2b 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp @@ -26,7 +26,6 @@ Object_B_i::~Object_B_i (void) } - void Object_B_i::foo (Object_A_ptr theObject_A_ptr) { diff --git a/TAO/tests/OBV/Indirection/Messenger_i.h b/TAO/tests/OBV/Indirection/Messenger_i.h index 14736adccb8..31c99744931 100644 --- a/TAO/tests/OBV/Indirection/Messenger_i.h +++ b/TAO/tests/OBV/Indirection/Messenger_i.h @@ -36,7 +36,6 @@ protected: - //class NodeImpl : public virtual POA_demo::value::idl::Node //class NodeFactory // : public virtual CORBA::ValueFactoryBase diff --git a/TAO/tests/OBV/Simple/Simple_util.cpp b/TAO/tests/OBV/Simple/Simple_util.cpp index 8d9a697ed1e..4bd871dad87 100644 --- a/TAO/tests/OBV/Simple/Simple_util.cpp +++ b/TAO/tests/OBV/Simple/Simple_util.cpp @@ -231,7 +231,6 @@ Client<InterfaceObj, Var>::init (const char *name, this->argv_ = argv; - try { // Retrieve the ORB. diff --git a/TAO/tests/OBV/ValueBox/Test_impl.h b/TAO/tests/OBV/ValueBox/Test_impl.h index c1895e13793..95b9d4af8e5 100644 --- a/TAO/tests/OBV/ValueBox/Test_impl.h +++ b/TAO/tests/OBV/ValueBox/Test_impl.h @@ -8,7 +8,6 @@ //============================================================================= - #ifndef TAO_TEST_IMPL_H #define TAO_TEST_IMPL_H diff --git a/TAO/tests/OBV/ValueBox/client.cpp b/TAO/tests/OBV/ValueBox/client.cpp index 506cd15686c..7c35bf1ef05 100644 --- a/TAO/tests/OBV/ValueBox/client.cpp +++ b/TAO/tests/OBV/ValueBox/client.cpp @@ -612,7 +612,6 @@ int test_boxed_sequence (void) } - int test_boxed_sequence_invocations (Test * test_object) { int fail = 0; @@ -802,7 +801,6 @@ int test_boxed_struct (void) } - int test_boxed_struct_invocations (Test * test_object) { int fail = 0; @@ -1026,7 +1024,6 @@ int test_boxed_array() } - int test_boxed_array_invocations (Test * test_object) { int fail = 0; @@ -1273,7 +1270,6 @@ int test_boxed_union() - int test_boxed_union_invocations (Test * test_object) { int fail = 0; diff --git a/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp b/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp index a738fa1f230..969d2a7a1ad 100644 --- a/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp +++ b/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp @@ -99,7 +99,6 @@ testOpenDynamicServices (int , ACE_TCHAR *[]) - // @brief Try loading the ORBInitializer_Registry locally int @@ -270,7 +269,6 @@ testORBInitializer_Registry (int , ACE_TCHAR *[]) } - // @brief ... diff --git a/TAO/tests/Objref_Sequence_Test/client.cpp b/TAO/tests/Objref_Sequence_Test/client.cpp index 27798aeba9b..a7c7d19c97b 100644 --- a/TAO/tests/Objref_Sequence_Test/client.cpp +++ b/TAO/tests/Objref_Sequence_Test/client.cpp @@ -35,7 +35,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - try { CORBA::ORB_var orb = diff --git a/TAO/tests/Objref_Sequence_Test/server.cpp b/TAO/tests/Objref_Sequence_Test/server.cpp index 9dc656d6d0b..027c3d6683b 100644 --- a/TAO/tests/Objref_Sequence_Test/server.cpp +++ b/TAO/tests/Objref_Sequence_Test/server.cpp @@ -73,7 +73,6 @@ ServerServant::CreateExtra (CORBA::ULong len, } - void ServerServant::DeleteExtra (const ServerSequence &seq) { diff --git a/TAO/tests/Oneway_Send_Timeouts/Client.cpp b/TAO/tests/Oneway_Send_Timeouts/Client.cpp index 5bcafb48a2a..ce1a086c0a5 100644 --- a/TAO/tests/Oneway_Send_Timeouts/Client.cpp +++ b/TAO/tests/Oneway_Send_Timeouts/Client.cpp @@ -67,7 +67,6 @@ Client::init (int argc, ACE_TCHAR* argv[]) policy_list[1]->destroy (); - // Timeout with SYNC_SCOPE SYNC_NONE Messaging::SyncScope sync_none = Messaging::SYNC_NONE; CORBA::Any sync_none_any; diff --git a/TAO/tests/Oneway_Timeouts/client.cpp b/TAO/tests/Oneway_Timeouts/client.cpp index a834bb31de2..f74a1197835 100644 --- a/TAO/tests/Oneway_Timeouts/client.cpp +++ b/TAO/tests/Oneway_Timeouts/client.cpp @@ -301,7 +301,6 @@ namespace } - void reset_buffering (ORB_ptr orb) { Object_var obj = orb->resolve_initial_references ("PolicyCurrent"); diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp index 00f53cac6ce..4a6eebd0826 100644 --- a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp +++ b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp @@ -94,7 +94,6 @@ test_object_deactivation (PortableServer::POA_ptr poa, ACE_ASSERT (expected_exception_raised); - poa->activate_object_with_id (id, &servant); diff --git a/TAO/tests/Param_Test/objref.cpp b/TAO/tests/Param_Test/objref.cpp index 469c812224a..2bed0f53148 100644 --- a/TAO/tests/Param_Test/objref.cpp +++ b/TAO/tests/Param_Test/objref.cpp @@ -259,7 +259,6 @@ Test_ObjRef::print_values (void) } - ACE_DEBUG ((LM_DEBUG, "\n=*=*=*=*=*=*" "in = %C, " diff --git a/TAO/tests/Param_Test/ub_struct_seq.h b/TAO/tests/Param_Test/ub_struct_seq.h index 4c3ac7ea6db..22c18764a05 100644 --- a/TAO/tests/Param_Test/ub_struct_seq.h +++ b/TAO/tests/Param_Test/ub_struct_seq.h @@ -79,7 +79,6 @@ private: }; - class Test_Unbounded_Struct_Sequence { public: diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp index 758467497be..9411f7c39d8 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp @@ -43,7 +43,6 @@ parse_args (int argc, ACE_TCHAR *argv[]) } - void run_test (Test_Interceptors::Secure_Vault_ptr server) { diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp index b33f1b1692b..7ba00642546 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp @@ -67,7 +67,6 @@ Echo_Client_Request_Interceptor::send_request ( #endif /*if 0*/ - // Populate target member of the ClientRequestInfo. // Make the context to send the context to the target diff --git a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp index 8791b9e4fad..be462a69223 100644 --- a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp +++ b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp @@ -100,7 +100,6 @@ Thread_Task::svc (void) // End - Nested Scheduling Segment - this->current_->end_scheduling_segment (name); // End - Nested Scheduling Segment diff --git a/TAO/tests/Sequence_Unit_Tests/string_sequence_element_ut.cpp b/TAO/tests/Sequence_Unit_Tests/string_sequence_element_ut.cpp index 56985021e43..4ae6b243b72 100644 --- a/TAO/tests/Sequence_Unit_Tests/string_sequence_element_ut.cpp +++ b/TAO/tests/Sequence_Unit_Tests/string_sequence_element_ut.cpp @@ -19,7 +19,6 @@ using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO::details; - template<typename charT> struct helper { diff --git a/TAO/tests/Sequence_Unit_Tests/testing_allocation_traits_ut.cpp b/TAO/tests/Sequence_Unit_Tests/testing_allocation_traits_ut.cpp index 51fe07bb213..00be9a2f8e1 100644 --- a/TAO/tests/Sequence_Unit_Tests/testing_allocation_traits_ut.cpp +++ b/TAO/tests/Sequence_Unit_Tests/testing_allocation_traits_ut.cpp @@ -17,7 +17,6 @@ try { statement; } catch(...) { \ using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO::details; - CORBA::ULong const MAXIMUM = 32; template<class value_type> diff --git a/TAO/tests/Stack_Recursion/client.cpp b/TAO/tests/Stack_Recursion/client.cpp index 8b5fd8d0389..65f0e90bdc4 100644 --- a/TAO/tests/Stack_Recursion/client.cpp +++ b/TAO/tests/Stack_Recursion/client.cpp @@ -79,7 +79,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) sender->shutdown (); - orb->destroy (); } catch (const CORBA::Exception& ex) diff --git a/TAO/tests/Timeout/client.cpp b/TAO/tests/Timeout/client.cpp index 6faa56e1516..463a4e63837 100644 --- a/TAO/tests/Timeout/client.cpp +++ b/TAO/tests/Timeout/client.cpp @@ -165,7 +165,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) - ACE_DEBUG ((LM_DEBUG, "client(%P) Set the ORB policies\n")); @@ -185,8 +184,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) - - ACE_DEBUG ((LM_DEBUG, "client(%P) Set the thread policies\n")); @@ -206,8 +203,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) - - ACE_DEBUG ((LM_DEBUG, "client(%P) Use the object policies\n")); send_echo (object1, orb.in (), timeout_server.in (), t); diff --git a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp index 08bcc61a7ed..5fe338c57c1 100644 --- a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp +++ b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp @@ -58,7 +58,6 @@ Current_Test_Impl::test_transport_current (void) } - void Current_Test_Impl::invoked_by_client (void) { diff --git a/TAO/tests/TransportCurrent/IIOP/server.cpp b/TAO/tests/TransportCurrent/IIOP/server.cpp index b7c0e769a28..83c95e93308 100644 --- a/TAO/tests/TransportCurrent/IIOP/server.cpp +++ b/TAO/tests/TransportCurrent/IIOP/server.cpp @@ -85,7 +85,6 @@ Worker::svc (void) } - /// Main driver int diff --git a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h index 985ee093b60..7598c9c952a 100644 --- a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h +++ b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h @@ -49,4 +49,3 @@ namespace Test #endif /* CLIENT_ORBINITIALIZER_T_H */ - diff --git a/TAO/utils/NamingViewer/StdAfx.cpp b/TAO/utils/NamingViewer/StdAfx.cpp index 51dc942d791..12270aa03b2 100644 --- a/TAO/utils/NamingViewer/StdAfx.cpp +++ b/TAO/utils/NamingViewer/StdAfx.cpp @@ -5,4 +5,3 @@ #include "stdafx.h" - diff --git a/TAO/utils/catior/Catior_i.cpp b/TAO/utils/catior/Catior_i.cpp index 344b85c517f..b3b030f123d 100644 --- a/TAO/utils/catior/Catior_i.cpp +++ b/TAO/utils/catior/Catior_i.cpp @@ -90,7 +90,6 @@ Catior_i::decode (const ACE_CString& aString, ACE_CString& output) } - CORBA::Boolean Catior_i::catiiop (char* string) { diff --git a/TAO/utils/logWalker/GIOP_Buffer.cpp b/TAO/utils/logWalker/GIOP_Buffer.cpp index f0e763bd113..175c9136486 100644 --- a/TAO/utils/logWalker/GIOP_Buffer.cpp +++ b/TAO/utils/logWalker/GIOP_Buffer.cpp @@ -101,7 +101,6 @@ struct ReplyHeader_1_0 { // Renamed from ReplyHeader */ - //static const size_t target_offset_12 = GIOP_Buffer::giop_header_len + 12; // 12 = req_id + flags + RESVD + addr disp. |