diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-03-08 18:25:49 +0100 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-03-08 18:25:49 +0100 |
commit | 813d80ca6f4949f4c831433166c058f4c7bbb975 (patch) | |
tree | 695b05ffcdc974af974b5898a618209917a40e1c | |
parent | d4826febefb4892bbcae55bd312f9ddfd3a62a4a (diff) | |
download | ATCD-813d80ca6f4949f4c831433166c058f4c7bbb975.tar.gz |
Layout changes
* ACE/ASNMP/tests/test_config.h:
* ACE/Kokyu/Kokyu_defs.inl:
* ACE/ace/ATM_Params.h:
* ACE/apps/JAWS2/HTTPU/http_headers.h:
* TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp:
* TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp:
* TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp:
* TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
* TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp:
* TAO/tao/Codeset/Codeset_Manager_i.h:
* TAO/tao/Codeset/Codeset_Translator_Factory.h:
* TAO/tao/Codeset_Manager.h:
* TAO/tests/Portable_Interceptors/AdvSlotDblCpy/client.cpp:
* TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp:
-rw-r--r-- | ACE/ASNMP/tests/test_config.h | 4 | ||||
-rw-r--r-- | ACE/Kokyu/Kokyu_defs.inl | 2 | ||||
-rw-r--r-- | ACE/ace/ATM_Params.h | 26 | ||||
-rw-r--r-- | ACE/apps/JAWS2/HTTPU/http_headers.h | 9 | ||||
-rw-r--r-- | TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp | 2 | ||||
-rw-r--r-- | TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp | 2 | ||||
-rw-r--r-- | TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp | 2 | ||||
-rw-r--r-- | TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp | 2 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp | 8 | ||||
-rw-r--r-- | TAO/tao/Codeset/Codeset_Manager_i.h | 2 | ||||
-rw-r--r-- | TAO/tao/Codeset/Codeset_Translator_Factory.h | 8 | ||||
-rw-r--r-- | TAO/tao/Codeset_Manager.h | 2 | ||||
-rw-r--r-- | TAO/tests/Portable_Interceptors/AdvSlotDblCpy/client.cpp | 2 | ||||
-rw-r--r-- | TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp | 4 |
14 files changed, 37 insertions, 38 deletions
diff --git a/ACE/ASNMP/tests/test_config.h b/ACE/ASNMP/tests/test_config.h index ea23390b9c9..39601b60064 100644 --- a/ACE/ASNMP/tests/test_config.h +++ b/ACE/ASNMP/tests/test_config.h @@ -59,7 +59,7 @@ #define ACE_NEW_THREAD \ do {\ ACE_LOG_MSG->msg_ostream (ace_file_stream.output_file ()); \ - ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER ); \ + ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER); \ ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM); \ } while (0) @@ -133,7 +133,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) return -1; ACE_LOG_MSG->msg_ostream (ace_file_stream.output_file ()); - ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER ); + ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER); ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM); return 0; diff --git a/ACE/Kokyu/Kokyu_defs.inl b/ACE/Kokyu/Kokyu_defs.inl index a6639c429ec..b775ae93936 100644 --- a/ACE/Kokyu/Kokyu_defs.inl +++ b/ACE/Kokyu/Kokyu_defs.inl @@ -80,5 +80,5 @@ bool operator != (const Kokyu::ConfigInfo& lhs, { return (lhs.preemption_priority_ != rhs.preemption_priority_ || lhs.thread_priority_ != rhs.thread_priority_ || - lhs.dispatching_type_ != rhs.dispatching_type_ ); + lhs.dispatching_type_ != rhs.dispatching_type_); } diff --git a/ACE/ace/ATM_Params.h b/ACE/ace/ATM_Params.h index 0981a528e08..32ff0a99e36 100644 --- a/ACE/ace/ATM_Params.h +++ b/ACE/ace/ATM_Params.h @@ -89,70 +89,70 @@ public: ~ACE_ATM_Params (); /// Get protocol family. - int get_protocol_family (void) const; + int get_protocol_family () const; /// Set protocol family. void set_protocol_family (int); /// Get protocol. - int get_protocol (void) const; + int get_protocol () const; /// Set protocol. void set_protocol (int); /// Get type. - int get_type (void) const; + int get_type () const; /// Set type. void set_type (int); /// Get protocol info. - ACE_Protocol_Info *get_protocol_info( void ); + ACE_Protocol_Info *get_protocol_info(); /// Set protocol info. void set_protocol_info( ACE_Protocol_Info *); /// Get socket group. - ACE_SOCK_GROUP get_sock_group( void ); + ACE_SOCK_GROUP get_sock_group(); /// Set socket group. void set_sock_group( ACE_SOCK_GROUP ); /// Get socket flags. - u_long get_flags( void ); + u_long get_flags(); /// Set socket flags. - void set_flags( u_long ); + void set_flags(u_long); /// Get reuse_addr flag. - int get_reuse_addr (void) const; + int get_reuse_addr () const; /// Set reuse_addr flag. void set_reuse_addr (int); /// Get device. - const char* get_device (void) const; + const char* get_device () const; /// Get info. - Param_Info* get_info (void) const; + Param_Info* get_info () const; /// Set info. void set_info (Param_Info *); /// Get r/w flag. - int get_rw_flag (void) const; + int get_rw_flag () const; /// Set r/w flag. void set_rw_flag (int); /// Get user data. - Param_Udata* get_user_data (void) const; + Param_Udata* get_user_data () const; /// Set user data. void set_user_data (Param_Udata*); /// Get open flag. - int get_oflag (void) const; + int get_oflag () const; /// Set open flag. void set_oflag (int); diff --git a/ACE/apps/JAWS2/HTTPU/http_headers.h b/ACE/apps/JAWS2/HTTPU/http_headers.h index 839df6d7ff5..798f1c502b7 100644 --- a/ACE/apps/JAWS2/HTTPU/http_headers.h +++ b/ACE/apps/JAWS2/HTTPU/http_headers.h @@ -144,17 +144,16 @@ protected: class HTTPU_Export HTTP_Headers : public JAWS_Header_Info, public HTTP_HCodes { public: - const char *header( int name ) const; - const char *value( int name ); - const char *value_next( int name ); - void value_reset ( void ); + const char *header(int name) const; + const char *value(int name); + const char *value_next(int name); + void value_reset (); public: HTTP_Headers (void); const char *header_token (int name) const; const char *header_strings (int name) const; - }; diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp index 56f8e7ee686..63fbc5addff 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp @@ -125,7 +125,7 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node) *os << "virtual ::CORBA::Boolean " << "_tao_unmarshal_v (TAO_InputCDR &);" << be_nl; *os << "virtual ::CORBA::Boolean " - << "_tao_match_formal_type (ptrdiff_t ) const;" << be_nl; + << "_tao_match_formal_type (ptrdiff_t) const;" << be_nl; // Private unimplemented default assignment operator *os << be_uidt_nl << "private:" << be_idt_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp index 97ee366b542..5dcc239871d 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp @@ -125,7 +125,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node) // simply return true. *os << "::CORBA::Boolean" << be_nl << node->name () - << "::_tao_match_formal_type (ptrdiff_t ) const" << be_nl + << "::_tao_match_formal_type (ptrdiff_t) const" << be_nl << "{" << be_idt_nl << "return true;" << be_uidt_nl << "}" << be_nl_2; diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp index 08e9c233fbc..3694cf2e480 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp @@ -268,7 +268,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) *os << "virtual ::CORBA::Boolean " << "_tao_unmarshal_v (TAO_InputCDR &);" << be_nl; *os << "virtual ::CORBA::Boolean " - << "_tao_match_formal_type (ptrdiff_t ) const;" << be_nl; + << "_tao_match_formal_type (ptrdiff_t) const;" << be_nl; } if (be_global->gen_ostream_operators ()) diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp index f09a8cd5313..5814e1c120e 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp @@ -273,7 +273,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) // The virtual _tao_match_formal_type method. *os << "::CORBA::Boolean" << be_nl << node->name () - << "::_tao_match_formal_type (ptrdiff_t ) const" + << "::_tao_match_formal_type (ptrdiff_t) const" << be_nl << "{" << be_idt_nl << "return false;"<< be_uidt_nl diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp index a57cd230a60..b39aded25c9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp @@ -32,11 +32,11 @@ public: static TAO_Notify_Tracker& get_instance(); - void add( TAO_Notify_Refcountable* p ); + void add( TAO_Notify_Refcountable* p); - void remove( const TAO_Notify_Refcountable* p ); + void remove( const TAO_Notify_Refcountable* p); - Entry find( const TAO_Notify_Refcountable* p ) const; + Entry find( const TAO_Notify_Refcountable* p) const; void dump( const char* title = 0 ); @@ -227,7 +227,7 @@ TAO_Notify_Tracker::remove( const TAO_Notify_Refcountable* p ) TAO_Notify_Tracker::Entry -TAO_Notify_Tracker::find( const TAO_Notify_Refcountable* p ) const +TAO_Notify_Tracker::find( const TAO_Notify_Refcountable* p) const { Entry e = { 0, "" }; if ( p == 0 ) return e; diff --git a/TAO/tao/Codeset/Codeset_Manager_i.h b/TAO/tao/Codeset/Codeset_Manager_i.h index 8e7c49ead32..4d801b97c85 100644 --- a/TAO/tao/Codeset/Codeset_Manager_i.h +++ b/TAO/tao/Codeset/Codeset_Manager_i.h @@ -72,7 +72,7 @@ public: /// Called by an object of TAO_Acceptor to set NCS and CCS values /// for Char/Wchar in to the Object Reference. - void set_codeset (TAO_Tagged_Components& ) const; + void set_codeset (TAO_Tagged_Components&) const; /// /// Called from an object of "TAO_GIOP_Invocation" to set TCS on the /// Transport diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory.h b/TAO/tao/Codeset/Codeset_Translator_Factory.h index 45b418ac4a6..422d6bfe10f 100644 --- a/TAO/tao/Codeset/Codeset_Translator_Factory.h +++ b/TAO/tao/Codeset/Codeset_Translator_Factory.h @@ -63,22 +63,22 @@ protected: /// will have a translator that is based on either the Char or Wchar /// translator, so the compiler will select the appropriate call from /// assign(). - void assign_i (TAO_InputCDR *, ACE_Char_Codeset_Translator* ) const; + void assign_i (TAO_InputCDR *, ACE_Char_Codeset_Translator*) const; /// Assign the translator to the supplied input CDR. The template instance /// will have a translator that is based on either the Char or Wchar /// translator, so the compiler will select the appropriate call from /// assign(). - void assign_i (TAO_InputCDR *, ACE_WChar_Codeset_Translator* ) const; + void assign_i (TAO_InputCDR *, ACE_WChar_Codeset_Translator*) const; /// Assign the translator to the supplied output CDR. The template instance /// will have a translator that is based on either the Char or Wchar /// translator, so the compiler will select the appropriate call from /// assign(). - void assign_i (TAO_OutputCDR *, ACE_Char_Codeset_Translator* ) const; + void assign_i (TAO_OutputCDR *, ACE_Char_Codeset_Translator*) const; /// Assign the translator to the supplied output CDR. The template instance /// will have a translator that is based on either the Char or Wchar /// translator, so the compiler will select the appropriate call from /// assign(). - void assign_i (TAO_OutputCDR *, ACE_WChar_Codeset_Translator* ) const; + void assign_i (TAO_OutputCDR *, ACE_WChar_Codeset_Translator*) const; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Codeset_Manager.h b/TAO/tao/Codeset_Manager.h index 0a39d7b3d90..dc1f2cda99a 100644 --- a/TAO/tao/Codeset_Manager.h +++ b/TAO/tao/Codeset_Manager.h @@ -66,7 +66,7 @@ public: /// Called by an object of TAO_Acceptor to set NCS and CCS values for /// Char/Wchar in to the Object Reference. - virtual void set_codeset (TAO_Tagged_Components& ) const = 0; + virtual void set_codeset (TAO_Tagged_Components&) const = 0; /// Called from an object of "TAO_GIOP_Invocation" to set TCS on the /// Transport diff --git a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/client.cpp b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/client.cpp index 4c829a31980..10dfa7e3653 100644 --- a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/client.cpp +++ b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/client.cpp @@ -32,7 +32,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) CORBA::Object_var obj = orb->string_to_object (argv[1]); InvokeMe_var server = InvokeMe::_narrow (obj.in ()); - always Shutdown( server.in () ); // When goes out of scope! + always Shutdown( server.in ()); // When goes out of scope! server->invoke_me (); ACE_DEBUG ((LM_DEBUG, "\n")); server->invoke_me (); diff --git a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp index dab0e2fd811..610a517976e 100644 --- a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp +++ b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp @@ -68,7 +68,7 @@ namespace CORBA::Any_var data; ACE_DEBUG ((LM_DEBUG, "SERVER %C -> get_slot(TSC) -> is ", location)); - data= pi_current->get_slot( slot_id ); + data= pi_current->get_slot(slot_id); CORBA::TypeCode_var tc= data->type(); if (tc->kind() == CORBA::tk_null) @@ -98,7 +98,7 @@ namespace } ACE_DEBUG ((LM_DEBUG, "SERVER %C -> get_slot(RSC) -> is ", location)); - data= ri->get_slot( slot_id ); + data= ri->get_slot(slot_id); tc= data->type(); if (tc->kind() == CORBA::tk_null) |