diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-09-13 18:23:17 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-09-13 18:23:17 +0000 |
| commit | ed8291d8da71da82a9d8f1e05a516d844bcb103b (patch) | |
| tree | 65fc848006d95a9ccea4bd0f56eaf2e4fef6bb34 /TAO | |
| parent | b740d2d231d5b2a6e83c55a2552ffe20e822b490 (diff) | |
| download | ATCD-ed8291d8da71da82a9d8f1e05a516d844bcb103b.tar.gz | |
Mon Sep 13 18:15:27 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
*:
Zapped trailing whitespaces using
find -name \*.h -o -name \*.cpp -name \*.inl | xargs perl -i -pe's/\s+\n/\n/'
Diffstat (limited to 'TAO')
263 files changed, 827 insertions, 816 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index cd3b2125ab6..ad20025bffd 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Mon Sep 13 18:15:27 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + *: + Zapped trailing whitespaces using + find -name \*.h -o -name \*.cpp -name \*.inl | xargs perl -i -pe's/\s+\n/\n/' + Mon Sep 13 15:12:27 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> * examples/Callback_Quoter/Consumer_Handler.cpp: diff --git a/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.h b/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.h index c2dc71e773e..ba0da517de5 100644 --- a/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.h +++ b/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.h @@ -27,4 +27,4 @@ class Messenger_Locator_i : public PortableServer::ServantLocator, PortableServer::Servant servant); }; -#endif +#endif diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h index 986654f44d4..5a12435881d 100644 --- a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h +++ b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h @@ -8,12 +8,12 @@ class MessengerHandler : public virtual POA_AMI_MessengerHandler { public: - //Constructor + //Constructor MessengerHandler (CORBA::ORB_ptr orb); - - //Destructor + + //Destructor virtual ~MessengerHandler (void); - + virtual void send_message ( CORBA::Boolean ami_return_val, const char * message, diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h index 2cc2587c3eb..9bfe4448d19 100644 --- a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h +++ b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h @@ -20,13 +20,13 @@ class Messenger_i : public virtual POA_Messenger { public: - //Constructor + //Constructor Messenger_i (unsigned int seconds_to_wait = 0, CORBA::Boolean throw_exception = 0); - - //Destructor + + //Destructor virtual ~Messenger_i (void); - + virtual CORBA::Boolean send_message ( const char * user_name, const char * subject, @@ -42,7 +42,7 @@ private: // Force an exception to be thrown to test client-side // exception handling CORBA::Boolean throw_exception_; - + }; diff --git a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h index 98be27c4cdd..07e4e735ee9 100644 --- a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h +++ b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h @@ -20,12 +20,12 @@ class Messenger_i : public virtual POA_Messenger { public: - //Constructor + //Constructor Messenger_i (void); - - //Destructor + + //Destructor virtual ~Messenger_i (void); - + virtual CORBA::Boolean send_message ( const char * user_name, const char * subject, diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h index 3a2dff83972..dc1ef1e8be5 100644 --- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h +++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h @@ -20,12 +20,12 @@ class Messenger_i : public virtual POA_Messenger { public: - //Constructor + //Constructor Messenger_i (CORBA::ORB_ptr orb); - - //Destructor + + //Destructor virtual ~Messenger_i (void); - + virtual CORBA::Boolean send_message ( const char * user_name, const char * subject, diff --git a/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.h b/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.h index 98be27c4cdd..07e4e735ee9 100644 --- a/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.h +++ b/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.h @@ -20,12 +20,12 @@ class Messenger_i : public virtual POA_Messenger { public: - //Constructor + //Constructor Messenger_i (void); - - //Destructor + + //Destructor virtual ~Messenger_i (void); - + virtual CORBA::Boolean send_message ( const char * user_name, const char * subject, diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h index 98be27c4cdd..07e4e735ee9 100644 --- a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h +++ b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h @@ -20,12 +20,12 @@ class Messenger_i : public virtual POA_Messenger { public: - //Constructor + //Constructor Messenger_i (void); - - //Destructor + + //Destructor virtual ~Messenger_i (void); - + virtual CORBA::Boolean send_message ( const char * user_name, const char * subject, diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h b/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h index 98be27c4cdd..07e4e735ee9 100644 --- a/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h +++ b/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h @@ -20,12 +20,12 @@ class Messenger_i : public virtual POA_Messenger { public: - //Constructor + //Constructor Messenger_i (void); - - //Destructor + + //Destructor virtual ~Messenger_i (void); - + virtual CORBA::Boolean send_message ( const char * user_name, const char * subject, diff --git a/TAO/TAO_IDL/be_include/be_argument.h b/TAO/TAO_IDL/be_include/be_argument.h index 369b6fc3587..f33f53d57d4 100644 --- a/TAO/TAO_IDL/be_include/be_argument.h +++ b/TAO/TAO_IDL/be_include/be_argument.h @@ -33,7 +33,7 @@ public: // Visiting. virtual int accept (be_visitor *visitor); - + // Cleanup. virtual void destroy (void); diff --git a/TAO/TAO_IDL/be_include/be_array.h b/TAO/TAO_IDL/be_include/be_array.h index e359bac54bc..de0fd106a80 100644 --- a/TAO/TAO_IDL/be_include/be_array.h +++ b/TAO/TAO_IDL/be_include/be_array.h @@ -40,7 +40,7 @@ public: /// definition. int gen_dimensions (TAO_OutStream *os, unsigned short slice = 0); - + /// Overridden from class be_type. virtual void gen_ostream_operator (TAO_OutStream *os, bool use_underscore); @@ -51,7 +51,7 @@ public: // Visiting. virtual int accept (be_visitor *visitor); - + // Cleanup. virtual void destroy (void); diff --git a/TAO/TAO_IDL/be_include/be_codegen.h b/TAO/TAO_IDL/be_include/be_codegen.h index 1899c781368..a13ddef3411 100644 --- a/TAO/TAO_IDL/be_include/be_codegen.h +++ b/TAO/TAO_IDL/be_include/be_codegen.h @@ -246,7 +246,7 @@ public: /// Set the anyop source stream. int start_anyop_source (const char *fname); - + int start_ciao_svnt_header (const char *fname); int start_ciao_svnt_source (const char *fname); int start_ciao_exec_header (const char *fname); @@ -294,7 +294,7 @@ public: /// Make sure we end with a newline. int end_anyop_source (void); - + int end_ciao_svnt_header (void); int end_ciao_svnt_source (void); int end_ciao_exec_header (void); @@ -365,7 +365,7 @@ public: /// Get the CIAO connector impl source stream. TAO_OutStream *ciao_conn_source (void); - + /// Get the CIAO AMI connector IDL stream. TAO_OutStream *ciao_ami_conn_idl (void); @@ -374,7 +374,7 @@ public: /// Get the CIAO connector impl source stream. TAO_OutStream *ciao_ami_rh_impl_source (void); - + /// Set the gperf input file stream. void gperf_input_stream (TAO_OutStream *gperf_input); @@ -398,11 +398,11 @@ public: /// Pass along the #ident string, if any, from the IDL file. void gen_ident_string (TAO_OutStream *stream) const; - + /// Generates the export files selected on the command line. void gen_export_files (void); - /// Generate file include, with optional empty comment to + /// Generate file include, with optional empty comment to /// short-circuit DOxygen. void gen_standard_include (TAO_OutStream *stream, const char *included_file, @@ -430,7 +430,7 @@ private: const char *filepath, TAO_OutStream *stream); void gen_typecode_includes (TAO_OutStream * stream); - + /// Used if one or both of the CIAO code gen flags are set. void gen_svnt_hdr_includes (void); void gen_svnt_src_includes (void); @@ -440,12 +440,12 @@ private: void gen_conn_hdr_includes (void); void gen_conn_src_includes (void); void gen_ami_conn_idl_includes (void); - + void gen_export_file (const char *filename, const char *macro, const char *msg, bool for_skel = false); - + void make_rand_extension (char * const t); private: diff --git a/TAO/TAO_IDL/be_include/be_component.h b/TAO/TAO_IDL/be_include/be_component.h index 4c49b12f4a8..d98e3d47d70 100644 --- a/TAO/TAO_IDL/be_include/be_component.h +++ b/TAO/TAO_IDL/be_include/be_component.h @@ -39,7 +39,7 @@ public: long n_supports_flat); ~be_component (void); - + /// Override of the AST method to eliminate narrowing of /// the return value. Non-virtual. be_component *base_component (void) const; @@ -66,31 +66,31 @@ public: ACE_CDR::ULong n_publishes (void) const; ACE_CDR::ULong n_consumes (void) const; ACE_CDR::ULong n_emits (void) const; - + /// Update the has_* members. void scan (UTL_Scope *s); - + /// Generate the "public virtual" entries in the stub header. virtual void gen_stub_inheritance (TAO_OutStream *os); - + /// Generate the "public virtual" entries in the skel header. virtual void gen_skel_inheritance (TAO_OutStream *os); - + /// Generate the string compares for ancestors in _is_a(). virtual int gen_is_a_ancestors (TAO_OutStream *os); - + /// Generate setup_collocation() for base component, if any. virtual void gen_parent_collocation (TAO_OutStream *os); - + // Narrowing. DEF_NARROW_FROM_DECL (be_component); DEF_NARROW_FROM_SCOPE (be_component); - + private: /// Specialized version for mirror ports. void mirror_scan (AST_PortType *p); - + private: /// Used by visitors to reduce footprint. ACE_CDR::ULong n_provides_; diff --git a/TAO/TAO_IDL/be_include/be_connector.h b/TAO/TAO_IDL/be_include/be_connector.h index 65cbc2d7dd0..27c5ee7d74d 100644 --- a/TAO/TAO_IDL/be_include/be_connector.h +++ b/TAO/TAO_IDL/be_include/be_connector.h @@ -27,13 +27,13 @@ public: /// Visiting. virtual int accept (be_visitor *visitor); - + bool dds_connector (void); bool ami_connector (void); - + private: void check_ancestors (void); - + private: bool dds_connector_; bool ami_connector_; diff --git a/TAO/TAO_IDL/be_include/be_consumes.h b/TAO/TAO_IDL/be_include/be_consumes.h index 9e09c3cdc64..0aa8cfa1aea 100644 --- a/TAO/TAO_IDL/be_include/be_consumes.h +++ b/TAO/TAO_IDL/be_include/be_consumes.h @@ -17,18 +17,18 @@ class be_consumes : public virtual AST_Consumes, public: be_consumes (UTL_ScopedName *n, AST_Type *consumes_type); - + virtual ~be_consumes (void); - + // Non-virtual override of frontend method. be_eventtype *consumes_type (void) const; - + // Narrowing. DEF_NARROW_FROM_DECL (be_consumes); // Visiting. virtual int accept (be_visitor *visitor); - + // Cleanup. virtual void destroy (void); }; diff --git a/TAO/TAO_IDL/be_include/be_emits.h b/TAO/TAO_IDL/be_include/be_emits.h index b8aa5d2b66a..d14d665455a 100644 --- a/TAO/TAO_IDL/be_include/be_emits.h +++ b/TAO/TAO_IDL/be_include/be_emits.h @@ -17,18 +17,18 @@ class be_emits : public virtual AST_Emits, public: be_emits (UTL_ScopedName *n, AST_Type *emits_type); - + virtual ~be_emits (void); - + // Non-virtual override of frontend method. be_eventtype *emits_type (void) const; - + // Narrowing. DEF_NARROW_FROM_DECL (be_emits); // Visiting. virtual int accept (be_visitor *visitor); - + // Cleanup. virtual void destroy (void); }; diff --git a/TAO/TAO_IDL/be_include/be_enum.h b/TAO/TAO_IDL/be_include/be_enum.h index 95eeb8217d1..1dbba85d447 100644 --- a/TAO/TAO_IDL/be_include/be_enum.h +++ b/TAO/TAO_IDL/be_include/be_enum.h @@ -32,7 +32,7 @@ public: be_enum (UTL_ScopedName *n, bool local, bool abstract); - + /// Overridden from class be_type. virtual void gen_ostream_operator (TAO_OutStream *os, bool use_underscore); diff --git a/TAO/TAO_IDL/be_include/be_extended_port.h b/TAO/TAO_IDL/be_include/be_extended_port.h index 1b7951db43f..de339dd9e99 100644 --- a/TAO/TAO_IDL/be_include/be_extended_port.h +++ b/TAO/TAO_IDL/be_include/be_extended_port.h @@ -38,13 +38,13 @@ public: be_extended_port ( UTL_ScopedName *n, AST_PortType *porttype_ref); - + virtual ~be_extended_port (void); - + be_porttype *port_type (void) const; - + virtual void destroy (void); - + virtual int accept (be_visitor *visitor); DEF_NARROW_FROM_DECL (be_extended_port); diff --git a/TAO/TAO_IDL/be_include/be_field.h b/TAO/TAO_IDL/be_include/be_field.h index a2654588c19..8aa3910e3e0 100644 --- a/TAO/TAO_IDL/be_include/be_field.h +++ b/TAO/TAO_IDL/be_include/be_field.h @@ -30,30 +30,30 @@ public: be_field (AST_Type *ft, UTL_ScopedName *n, Visibility vis = vis_NA); - + // Non-virtual override of frontend method. be_type *field_type (void) const; - + // Generate debugging ostream operator for members. void gen_member_ostream_operator (TAO_OutStream *os, const char *instance_name, bool use_underscore, bool accessor = false); - - // Accessors for the member. + + // Accessors for the member. bool port_name_prefixed (void) const; void port_name_prefixed (bool val); // Visiting. virtual int accept (be_visitor *visitor); - + // Cleanup. virtual void destroy (void); // Narrowing. DEF_NARROW_FROM_DECL (be_field); - + private: // If the name of a provides or uses node has already been // prefixed with the (mirror)port name(s), we don't want diff --git a/TAO/TAO_IDL/be_include/be_generator.h b/TAO/TAO_IDL/be_include/be_generator.h index 358ac3eb084..4f199e83947 100644 --- a/TAO/TAO_IDL/be_include/be_generator.h +++ b/TAO/TAO_IDL/be_include/be_generator.h @@ -276,24 +276,24 @@ public: virtual AST_PortType *create_porttype (UTL_ScopedName *n); - + virtual AST_Provides *create_provides (UTL_ScopedName *n, AST_Type *provides_type); - + virtual AST_Uses *create_uses (UTL_ScopedName *n, AST_Type *uses_type, bool is_multiple); - + virtual AST_Publishes *create_publishes (UTL_ScopedName *n, AST_Type *publishes_type); - + virtual AST_Emits *create_emits (UTL_ScopedName *n, AST_Type *emits_type); - + virtual AST_Consumes *create_consumes (UTL_ScopedName *n, AST_Type *consumes_type); @@ -301,34 +301,34 @@ public: AST_Extended_Port *create_extended_port ( UTL_ScopedName *n, AST_PortType *porttype_ref); - + virtual AST_Mirror_Port *create_mirror_port ( UTL_ScopedName *n, AST_PortType *porttype_ref); - + virtual AST_Connector *create_connector ( UTL_ScopedName *n, AST_Connector *base_connector); - + virtual AST_Template_Module *create_template_module ( UTL_ScopedName *n, FE_Utils::T_PARAMLIST_INFO *template_params); - + virtual AST_Template_Module_Inst *create_template_module_inst ( UTL_ScopedName *n, AST_Template_Module *ref, FE_Utils::T_ARGLIST *template_args); - + virtual AST_Template_Module_Ref *create_template_module_ref ( UTL_ScopedName *n, AST_Template_Module *ref, UTL_StrList *param_refs); - + virtual AST_Param_Holder *create_param_holder ( UTL_ScopedName *parameter_name, diff --git a/TAO/TAO_IDL/be_include/be_global.h b/TAO/TAO_IDL/be_include/be_global.h index ec6ac40ff4b..72549694b67 100644 --- a/TAO/TAO_IDL/be_include/be_global.h +++ b/TAO/TAO_IDL/be_include/be_global.h @@ -486,25 +486,25 @@ public: /// impl and executor IDL files, if generated. void ciao_svnt_header_ending (const char* s); const char* ciao_svnt_header_ending (void) const; - + void ciao_svnt_source_ending (const char* s); const char* ciao_svnt_source_ending (void) const; - + void ciao_exec_header_ending (const char* s); const char* ciao_exec_header_ending (void) const; - + void ciao_exec_source_ending (const char* s); const char* ciao_exec_source_ending (void) const; - + void ciao_exec_stub_header_ending (const char* s); const char* ciao_exec_stub_header_ending (void) const; - + void ciao_exec_idl_ending (const char* s); const char* ciao_exec_idl_ending (void) const; - + void ciao_conn_header_ending (const char* s); const char* ciao_conn_header_ending (void) const; - + void ciao_conn_source_ending (const char* s); const char* ciao_conn_source_ending (void) const; @@ -789,18 +789,18 @@ public: /// Accessors for the member gen_unique_guards_. bool gen_unique_guards (void) const; void gen_unique_guards (bool val); - + /// Accessors for the corresponding members. - + bool gen_ciao_svnt (void) const; void gen_ciao_svnt (bool val); - + bool gen_ciao_exec_idl (void) const; void gen_ciao_exec_idl (bool val); - + bool gen_ciao_exec_impl (void) const; void gen_ciao_exec_impl (bool val); - + bool gen_ciao_conn_impl (void) const; void gen_ciao_conn_impl (bool val); @@ -824,7 +824,7 @@ public: bool gen_lem_force_all (void) const; void gen_lem_force_all (bool val); - + bool alt_mapping (void) const; void alt_mapping (bool val); @@ -957,7 +957,7 @@ private: /// CIAO AMI connector IDL file name ending. Default is "A.idl". char* ciao_ami_conn_idl_ending_; - + /// CIAO AMI reply handler impl header file name ending. /// Default is "A_impl.h". char* ciao_ami_conn_impl_hdr_ending_; @@ -1166,7 +1166,7 @@ private: /// 2 spaces by default, can be set from the command line. unsigned int tab_size_; - + bool alt_mapping_; // Are we generating STL types? }; diff --git a/TAO/TAO_IDL/be_include/be_helper.h b/TAO/TAO_IDL/be_include/be_helper.h index 18883539ede..2993d9afeb3 100644 --- a/TAO/TAO_IDL/be_include/be_helper.h +++ b/TAO/TAO_IDL/be_include/be_helper.h @@ -205,7 +205,7 @@ protected: /// Indentation level int indent_level_; - + /// Used to set tab spaces. ACE_CString tab_unit_str_; const char *tab_unit_; diff --git a/TAO/TAO_IDL/be_include/be_home.h b/TAO/TAO_IDL/be_include/be_home.h index af11c149844..89cae16df3a 100644 --- a/TAO/TAO_IDL/be_include/be_home.h +++ b/TAO/TAO_IDL/be_include/be_home.h @@ -39,7 +39,7 @@ public: long n_supports_flat); virtual ~be_home (void); - + void scan (UTL_Scope *s); // Cleanup function. diff --git a/TAO/TAO_IDL/be_include/be_identifier_helper.h b/TAO/TAO_IDL/be_include/be_identifier_helper.h index c0d20a5718e..a8737a086d2 100644 --- a/TAO/TAO_IDL/be_include/be_identifier_helper.h +++ b/TAO/TAO_IDL/be_include/be_identifier_helper.h @@ -42,13 +42,13 @@ struct TAO_IDL_BE_Export IdentifierHelper // 2) removes the '_' escape character when the identifier is // part of another identifier such as in provides_XXX // 3) removes any '_cxx_' in generated IDL - + static const char * type_name (be_type *t, be_visitor *visitor); - - static Identifier * + + static Identifier * original_local_name (Identifier * local_name); - + // Removes '_cxx_ from segments of a scoped name, and optionally // de-escape the last segment, if it's to be appended to. static ACE_CString @@ -57,12 +57,12 @@ struct TAO_IDL_BE_Export IdentifierHelper // Detects case-insensitive match with IDL keyword. static bool is_idl_keyword (Identifier * local_name); - + // Preserves the 'escape' (leading underscore) in a // generated identifier if necessary. - static ACE_CString + static ACE_CString try_escape (Identifier * local_name); - + static ACE_CString tmp_retval_; }; diff --git a/TAO/TAO_IDL/be_include/be_interface.h b/TAO/TAO_IDL/be_include/be_interface.h index 72b5b0027f7..84dacb71bd4 100644 --- a/TAO/TAO_IDL/be_include/be_interface.h +++ b/TAO/TAO_IDL/be_include/be_interface.h @@ -326,7 +326,7 @@ public: TAO_OutStream &os); int gen_facet_svnt_src (be_visitor *visitor, TAO_OutStream &os); - + /// Used with ami4ccm. int gen_ami4ccm_idl (TAO_OutStream *os); @@ -335,23 +335,23 @@ public: bool is_ami4ccm_rh (void) const; void is_ami4ccm_rh (bool val); - + /// Accessors for the member. bool dds_connector_traits_done (void) const; void dds_connector_traits_done (bool val); - + /// Generate the "public virtual" entries in the stub header. virtual void gen_stub_inheritance (TAO_OutStream *os); - + /// Generate the "public virtual" entries in the skel header. virtual void gen_skel_inheritance (TAO_OutStream *os); - + /// Generate the string compares for ancestors in _is_a(). virtual int gen_is_a_ancestors (TAO_OutStream *os); - + /// Generate setup_collocation() for base component, if any. virtual void gen_parent_collocation (TAO_OutStream *os); - + protected: /** * CDreate a new string made by the concatenation @@ -454,7 +454,7 @@ private: */ void enqueue_base_component_r (AST_Component *node); void enqueue_base_home_r (AST_Home *node); - + protected: /// Have these been done already? bool var_out_seq_decls_gen_; @@ -473,7 +473,7 @@ protected: /// Are we a direct child of Components::SessionComponent? int session_component_child_; - + /// Are we an AMI reply handler? bool is_ami_rh_; @@ -493,7 +493,7 @@ protected: /// Used to suppress generation of some CCM servant methods/ bool has_rw_attributes_; - + /// Flags to ensure that DDS connector impl traits members /// are generated only once per port interface. bool dds_connector_traits_done_; diff --git a/TAO/TAO_IDL/be_include/be_mirror_port.h b/TAO/TAO_IDL/be_include/be_mirror_port.h index cbfedd91d42..9616ca83064 100644 --- a/TAO/TAO_IDL/be_include/be_mirror_port.h +++ b/TAO/TAO_IDL/be_include/be_mirror_port.h @@ -37,11 +37,11 @@ public: be_mirror_port ( UTL_ScopedName *n, AST_PortType *porttype_ref); - + virtual ~be_mirror_port (void); - + virtual void destroy (void); - + virtual int accept (be_visitor *visitor); DEF_NARROW_FROM_DECL (be_mirror_port); diff --git a/TAO/TAO_IDL/be_include/be_native.h b/TAO/TAO_IDL/be_include/be_native.h index f3b032f5187..a5368147cf6 100644 --- a/TAO/TAO_IDL/be_include/be_native.h +++ b/TAO/TAO_IDL/be_include/be_native.h @@ -20,7 +20,7 @@ class be_visitor; -// Representation of "native" IDL type. It may be used as a +// Representation of "native" IDL type. It may be used as a // return type, parameter type, or in an operation's // exception list. This last usage creates special problems // with both syntax checking and code generation. Letting @@ -40,7 +40,7 @@ public: /// Return typecode size. virtual long tc_size (void); - + /// Cleanup. virtual void destroy (void); diff --git a/TAO/TAO_IDL/be_include/be_null_return_emitter.h b/TAO/TAO_IDL/be_include/be_null_return_emitter.h index ecdc9ff019d..5d3e24ac2d7 100644 --- a/TAO/TAO_IDL/be_include/be_null_return_emitter.h +++ b/TAO/TAO_IDL/be_include/be_null_return_emitter.h @@ -27,9 +27,9 @@ class be_null_return_emitter public: be_null_return_emitter (be_visitor_context *ctx); ~be_null_return_emitter (void); - + int emit (be_type *node); - + private: be_visitor_context *ctx_; TAO_OutStream &os_; diff --git a/TAO/TAO_IDL/be_include/be_operation.h b/TAO/TAO_IDL/be_include/be_operation.h index 964b0ccc8e6..268d289a944 100644 --- a/TAO/TAO_IDL/be_include/be_operation.h +++ b/TAO/TAO_IDL/be_include/be_operation.h @@ -51,10 +51,10 @@ public: /// Insert an exception at the head of the list. int be_insert_exception (AST_Exception *ex); - + bool is_sendc_ami (void) const; void is_sendc_ami (bool val); - + bool is_excep_ami (void) const; void is_excep_ami (bool val); diff --git a/TAO/TAO_IDL/be_include/be_param_holder.h b/TAO/TAO_IDL/be_include/be_param_holder.h index 9065dbecb3f..1be9a6a2568 100644 --- a/TAO/TAO_IDL/be_include/be_param_holder.h +++ b/TAO/TAO_IDL/be_include/be_param_holder.h @@ -6,7 +6,7 @@ * * $Id$ * - * Place holder referenced by AST_Field (or subclass) + * Place holder referenced by AST_Field (or subclass) * representing a corresponding template parameter in IDL. * * @@ -30,7 +30,7 @@ public: FE_Utils::T_Param_Info *info); virtual ~be_param_holder (void); - + // Narrowing. DEF_NARROW_FROM_DECL (be_param_holder); diff --git a/TAO/TAO_IDL/be_include/be_porttype.h b/TAO/TAO_IDL/be_include/be_porttype.h index aabdda78772..1ddf8f1dbd9 100644 --- a/TAO/TAO_IDL/be_include/be_porttype.h +++ b/TAO/TAO_IDL/be_include/be_porttype.h @@ -37,11 +37,11 @@ class be_porttype : public virtual AST_PortType, // public: be_porttype (UTL_ScopedName *n); - + virtual ~be_porttype (void); - + virtual void destroy (void); - + virtual int accept (be_visitor *visitor); DEF_NARROW_FROM_DECL (be_porttype); diff --git a/TAO/TAO_IDL/be_include/be_predefined_type.h b/TAO/TAO_IDL/be_include/be_predefined_type.h index a99a423e2d5..102679e5dca 100644 --- a/TAO/TAO_IDL/be_include/be_predefined_type.h +++ b/TAO/TAO_IDL/be_include/be_predefined_type.h @@ -29,7 +29,7 @@ class be_predefined_type : public virtual AST_PredefinedType, public: be_predefined_type (AST_PredefinedType::PredefinedType t, UTL_ScopedName *n); - + // Overridden from class be_type. virtual void gen_member_ostream_operator (TAO_OutStream *os, const char *instance_name, diff --git a/TAO/TAO_IDL/be_include/be_provides.h b/TAO/TAO_IDL/be_include/be_provides.h index 317f597f76a..0effaf3ce33 100644 --- a/TAO/TAO_IDL/be_include/be_provides.h +++ b/TAO/TAO_IDL/be_include/be_provides.h @@ -18,22 +18,22 @@ class be_provides : public virtual AST_Provides, public: be_provides (UTL_ScopedName *n, AST_Type *provides_type); - + virtual ~be_provides (void); - + // Non-virtual override of frontend method. be_type *provides_type (void) const; - + // Common code called by visitors. int gen_facet_svnt_decl (TAO_OutStream &os); int gen_facet_svnt_defn (TAO_OutStream &os); - + // Narrowing. DEF_NARROW_FROM_DECL(be_provides); // Visiting. virtual int accept (be_visitor *visitor); - + // Cleanup. virtual void destroy (void); }; @@ -45,11 +45,11 @@ class be_facet_op_attr_defn_helper { public: be_facet_op_attr_defn_helper (be_interface *op_scope); - + virtual int emit (be_interface *derived_interface, TAO_OutStream *os, be_interface *base_interface); - + private: be_interface *op_scope_; }; diff --git a/TAO/TAO_IDL/be_include/be_publishes.h b/TAO/TAO_IDL/be_include/be_publishes.h index 42e0d82ebcf..64c7279bd88 100644 --- a/TAO/TAO_IDL/be_include/be_publishes.h +++ b/TAO/TAO_IDL/be_include/be_publishes.h @@ -17,18 +17,18 @@ class be_publishes : public virtual AST_Publishes, public: be_publishes (UTL_ScopedName *n, AST_Type *publishes_type); - + virtual ~be_publishes (void); - + // Non-virtual override of frontend method. be_eventtype *publishes_type (void) const; - + // Narrowing. DEF_NARROW_FROM_DECL(be_publishes); // Visiting. virtual int accept (be_visitor *visitor); - + // Cleanup. virtual void destroy (void); }; diff --git a/TAO/TAO_IDL/be_include/be_root.h b/TAO/TAO_IDL/be_include/be_root.h index 7044df489ed..b077d4388b5 100644 --- a/TAO/TAO_IDL/be_include/be_root.h +++ b/TAO/TAO_IDL/be_include/be_root.h @@ -32,7 +32,7 @@ class be_root : public virtual AST_Root, // public: be_root (UTL_ScopedName *n); - + virtual ~be_root (void); /// Cleanup method. diff --git a/TAO/TAO_IDL/be_include/be_sequence.h b/TAO/TAO_IDL/be_include/be_sequence.h index 7fb1e13588e..af3f98c86b8 100644 --- a/TAO/TAO_IDL/be_include/be_sequence.h +++ b/TAO/TAO_IDL/be_include/be_sequence.h @@ -58,7 +58,7 @@ public: // Non-virtual override of frontend method. be_type *base_type (void) const; - + /// Create a name for ourselves. If we are typedefed, then we get the name of /// the typedef node, else we generate a name for ourselves. virtual int create_name (be_typedef *node); @@ -71,7 +71,7 @@ public: /// Overridden method on the be_scope class. virtual be_decl *decl (void); - + /// Overridden from class be_type. virtual void gen_ostream_operator (TAO_OutStream *os, bool use_underscore); diff --git a/TAO/TAO_IDL/be_include/be_structure.h b/TAO/TAO_IDL/be_include/be_structure.h index 4a36b7e63a5..920365f0275 100644 --- a/TAO/TAO_IDL/be_include/be_structure.h +++ b/TAO/TAO_IDL/be_include/be_structure.h @@ -37,11 +37,11 @@ public: UTL_ScopedName *n, bool local, bool abstract); - + /// Copy BE-specific values when redefining struct or union /// from a forward declaration. virtual void redefine (AST_Structure *from); - + /// Overridden from class be_type. virtual void gen_ostream_operator (TAO_OutStream *os, bool use_underscore); diff --git a/TAO/TAO_IDL/be_include/be_template_module_inst.h b/TAO/TAO_IDL/be_include/be_template_module_inst.h index 206683ed87e..aed486e3437 100644 --- a/TAO/TAO_IDL/be_include/be_template_module_inst.h +++ b/TAO/TAO_IDL/be_include/be_template_module_inst.h @@ -17,7 +17,7 @@ public: FE_Utils::T_ARGLIST *template_args); virtual ~be_template_module_inst (void); - + // Narrowing. DEF_NARROW_FROM_DECL (be_template_module_inst); diff --git a/TAO/TAO_IDL/be_include/be_template_module_ref.h b/TAO/TAO_IDL/be_include/be_template_module_ref.h index ab8bc4a4478..cd8a020461e 100644 --- a/TAO/TAO_IDL/be_include/be_template_module_ref.h +++ b/TAO/TAO_IDL/be_include/be_template_module_ref.h @@ -18,7 +18,7 @@ public: UTL_StrList *param_refs); virtual ~be_template_module_ref (void); - + // Narrowing. DEF_NARROW_FROM_DECL (be_template_module_ref); diff --git a/TAO/TAO_IDL/be_include/be_type.h b/TAO/TAO_IDL/be_include/be_type.h index 2add00a446d..b8317c63c9d 100644 --- a/TAO/TAO_IDL/be_include/be_type.h +++ b/TAO/TAO_IDL/be_include/be_type.h @@ -48,7 +48,7 @@ public: /// Compute the value of the member. void gen_fwd_helper_name (void); - + /// No-op, overridden in derived classes. virtual void gen_ostream_operator (TAO_OutStream *os, bool use_underscore); @@ -65,7 +65,7 @@ public: /// Generate _var and _out typedefs for structs and unions. void gen_common_varout (TAO_OutStream *os); - + /// Generate common typedef and any destructor decl. void gen_stub_decls (TAO_OutStream *os); diff --git a/TAO/TAO_IDL/be_include/be_union_branch.h b/TAO/TAO_IDL/be_include/be_union_branch.h index 33341ef8d22..a356e1128a6 100644 --- a/TAO/TAO_IDL/be_include/be_union_branch.h +++ b/TAO/TAO_IDL/be_include/be_union_branch.h @@ -44,7 +44,7 @@ public: // Visiting. virtual int accept (be_visitor *visitor); - + // Cleanup. virtual void destroy (void); diff --git a/TAO/TAO_IDL/be_include/be_union_label.h b/TAO/TAO_IDL/be_include/be_union_label.h index 1c5c6855398..7ad8a751570 100644 --- a/TAO/TAO_IDL/be_include/be_union_label.h +++ b/TAO/TAO_IDL/be_include/be_union_label.h @@ -15,7 +15,7 @@ public: // Visiting. virtual int accept (be_visitor *visitor); - + // Cleanup. virtual void destroy (void); }; diff --git a/TAO/TAO_IDL/be_include/be_util.h b/TAO/TAO_IDL/be_include/be_util.h index 6b3f93f4acc..e5a4933f3f6 100644 --- a/TAO/TAO_IDL/be_include/be_util.h +++ b/TAO/TAO_IDL/be_include/be_util.h @@ -39,7 +39,7 @@ public: static void gen_nesting_open (TAO_OutStream &os, AST_Decl *node); - + static void gen_nesting_close (TAO_OutStream &os, AST_Decl *node); diff --git a/TAO/TAO_IDL/be_include/be_valuetype.h b/TAO/TAO_IDL/be_include/be_valuetype.h index d0e1441986f..29362592118 100644 --- a/TAO/TAO_IDL/be_include/be_valuetype.h +++ b/TAO/TAO_IDL/be_include/be_valuetype.h @@ -179,7 +179,7 @@ private: /// Have these been done already? bool var_out_seq_decls_gen_; - + /// To differentiate from the interface skeleton name. char *full_obv_skel_name_; }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_amh_pre_proc.h b/TAO/TAO_IDL/be_include/be_visitor_amh_pre_proc.h index e362eb94d23..50c0b4ec8b7 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_amh_pre_proc.h +++ b/TAO/TAO_IDL/be_include/be_visitor_amh_pre_proc.h @@ -29,7 +29,7 @@ class be_visitor_amh_pre_proc : public be_visitor_scope { private: - typedef enum + typedef enum { NORMAL, GET_OPERATION, diff --git a/TAO/TAO_IDL/be_include/be_visitor_ami_pre_proc.h b/TAO/TAO_IDL/be_include/be_visitor_ami_pre_proc.h index 9485504c86f..1b3b23f78c6 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_ami_pre_proc.h +++ b/TAO/TAO_IDL/be_include/be_visitor_ami_pre_proc.h @@ -34,7 +34,7 @@ class AST_Type; class be_visitor_ami_pre_proc : public be_visitor_scope { private: - typedef enum + typedef enum { NORMAL, GET_OPERATION, @@ -95,7 +95,7 @@ private: /// Create an inheritance list for the reply handler. AST_Type **create_inheritance_list (be_interface *node, long &n_parents); - + /// Generate an *A.idl file for AMI4CCM. int generate_ami4ccm_idl (void); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_any_extracted_type_decl.h b/TAO/TAO_IDL/be_include/be_visitor_any_extracted_type_decl.h index ff779a649e5..9e2b92ef967 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_any_extracted_type_decl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_any_extracted_type_decl.h @@ -34,7 +34,7 @@ class be_visitor_any_extracted_type_decl : public be_visitor_decl public: be_visitor_any_extracted_type_decl (be_visitor_context *ctx); virtual ~be_visitor_any_extracted_type_decl (void); - + virtual int visit_array (be_array *); virtual int visit_component (be_component *); virtual int visit_enum (be_enum *); @@ -49,7 +49,7 @@ public: virtual int visit_union (be_union *); virtual int visit_valuebox (be_valuebox *); virtual int visit_valuetype (be_valuetype *); - + protected: TAO_OutStream & os_; const char * var_name_; diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h b/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h index d14caa1c84c..5eb53b587c9 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h +++ b/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h @@ -101,13 +101,13 @@ public: /// visit valuebox virtual int visit_valuebox (be_valuebox *node); - + /// Set the member. void unused (bool val); private: int emit_common (be_type *node); - + private: bool unused_; }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/argument.h b/TAO/TAO_IDL/be_include/be_visitor_argument/argument.h index 811d0697a1d..655a12719f4 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_argument/argument.h +++ b/TAO/TAO_IDL/be_include/be_visitor_argument/argument.h @@ -44,7 +44,7 @@ public: //= helper /// helper that produces either a nested name for /// header files or full name for others. - virtual const char *type_name (be_type *type, + virtual const char *type_name (be_type *type, const char *suffix = 0); /// return the direction of the argument node @@ -54,7 +54,7 @@ public: virtual int visit_argument (be_argument *node); void set_fixed_direction (AST_Argument::Direction direction); - + protected: /// Consolidation of common code from invoke_cs and marshal_ss /// for predefined type args. diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/serializer_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_array/serializer_op_ch.h index 8696cde3e46..64f53a48b72 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_array/serializer_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_array/serializer_op_ch.h @@ -5,7 +5,7 @@ * * $Id$ * - * Visitors for generation of TAO::DCPS::Serializer operators code + * Visitors for generation of TAO::DCPS::Serializer operators code * for Arrays in client header. This one * generates the TAO::DCPS::Serializer operators. * diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/serializer_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_array/serializer_op_cs.h index 1df99890299..fc68c069804 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_array/serializer_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_array/serializer_op_cs.h @@ -5,9 +5,9 @@ * * $Id$ * - * The array's own TAO::DCPS::Serializer operators are generated in + * The array's own TAO::DCPS::Serializer operators are generated in * the .i file, but if the - * array contains an anonymous sequence, those + * array contains an anonymous sequence, those * TAO::DCPS::Serializer operators will not * get generated on their own, and, since the sequence may contain a * recursive type, they must also be generated in the .cpp file. That is diff --git a/TAO/TAO_IDL/be_include/be_visitor_attribute/attribute.h b/TAO/TAO_IDL/be_include/be_visitor_attribute/attribute.h index a18cd89c116..441dccbc387 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_attribute/attribute.h +++ b/TAO/TAO_IDL/be_include/be_visitor_attribute/attribute.h @@ -48,7 +48,7 @@ public: private: bool for_facets_; be_decl *op_scope_; - + /// Defaults to "exec_i" but in special cases we want to /// modify it. ACE_CString exec_class_extension_; diff --git a/TAO/TAO_IDL/be_include/be_visitor_attribute/ccm_init.h b/TAO/TAO_IDL/be_include/be_visitor_attribute/ccm_init.h index c5c39c74ba7..a7110b0b5e2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_attribute/ccm_init.h +++ b/TAO/TAO_IDL/be_include/be_visitor_attribute/ccm_init.h @@ -31,7 +31,7 @@ class be_visitor_attribute_ccm_init public: be_visitor_attribute_ccm_init (be_visitor_context *ctx); ~be_visitor_attribute_ccm_init (void); - + virtual int visit_attribute (be_attribute *node); virtual int visit_array (be_array *node); @@ -48,13 +48,13 @@ public: virtual int visit_union (be_union *node); virtual int visit_valuebox (be_valuebox *node); virtual int visit_valuetype (be_valuetype *node); - + private: void emit_init_block (void); void emit_error (const char *); void open_if_block (void); void close_if_block (void); - + private: be_attribute *attr_; }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_attribute/set_from_extracted.h b/TAO/TAO_IDL/be_include/be_visitor_attribute/set_from_extracted.h index d94353030b6..3f07ddbc509 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_attribute/set_from_extracted.h +++ b/TAO/TAO_IDL/be_include/be_visitor_attribute/set_from_extracted.h @@ -32,7 +32,7 @@ class be_visitor_attribute_set_from_extracted public: be_visitor_attribute_set_from_extracted (be_visitor_context *ctx); virtual ~be_visitor_attribute_set_from_extracted (void); - + virtual int visit_array (be_array *); virtual int visit_component (be_component *); virtual int visit_enum (be_enum *); diff --git a/TAO/TAO_IDL/be_include/be_visitor_ccm_pre_proc.h b/TAO/TAO_IDL/be_include/be_visitor_ccm_pre_proc.h index fc4ac5c4a18..0667048ba6f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_ccm_pre_proc.h +++ b/TAO/TAO_IDL/be_include/be_visitor_ccm_pre_proc.h @@ -53,7 +53,7 @@ public: virtual int visit_home (be_home *node); virtual int visit_eventtype (be_eventtype *node); virtual int visit_eventtype_fwd (be_eventtype_fwd *node); - + protected: // Utility methods to handle the corresponding IDL declarations. int gen_implicit_ops (be_home *node, @@ -103,7 +103,7 @@ protected: const char *suffix, AST_Decl *parent); UTL_NameList *compute_inheritance (be_home *node); - + protected: /// These are created for operations implied by 'uses multiple' declarations. Identifier module_id_; @@ -120,18 +120,18 @@ protected: be_exception *invalid_key_; be_exception *unknown_key_value_; be_exception *duplicate_key_value_; - + /// Working nodes. be_component *comp_; be_home *home_; - + /// So we can look up Cookie and the CCM exceptions /// once when the first component is seen (then we /// know that Components.idl is included and the /// lookups will succeed). bool ccm_lookups_done_; - -private: + +private: /// Generate a sendc_* receptacle for AMI4CCM. int generate_ami4ccm_uses (void); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component.h b/TAO/TAO_IDL/be_include/be_visitor_component/component.h index a349c8bf6d5..566419de2f7 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/component.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/component.h @@ -22,7 +22,7 @@ * * @brief be_visitor_component * - * This is a concrete visitor for component + * This is a concrete visitor for component * that abstracts all common tasks. */ class be_visitor_component : public be_visitor_interface @@ -44,7 +44,7 @@ public: /// declarations. virtual int visit_structure (be_structure *node); virtual int visit_typedef (be_typedef *node); - + /// Overridden to pick up attribute declarations from a porrttype. virtual int visit_extended_port (be_extended_port *node); virtual int visit_mirror_port (be_mirror_port *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_ex_idl.h index 6aa5c0b2867..99d4904bf48 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/component_ex_idl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_ex_idl.h @@ -21,7 +21,7 @@ * * @brief be_visitor_component_ex_idl * - * This is a concrete visitor to generate the + * This is a concrete visitor to generate the * CIAO executor IDL for component. */ class be_visitor_component_ex_idl : public be_visitor_decl @@ -33,7 +33,7 @@ public: virtual int visit_component (be_component *node); virtual int visit_connector (be_connector *node); - + private: TAO_OutStream &os_; }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_exh.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_exh.h index bd853dc8c8a..f49becdef06 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/component_exh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_exh.h @@ -31,9 +31,9 @@ class be_visitor_component_exh // public: be_visitor_component_exh (be_visitor_context *ctx); - + ~be_visitor_component_exh (void); - + virtual int visit_component (be_component *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_exs.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_exs.h index 4eb779927ef..46fcec41007 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/component_exs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_exs.h @@ -31,9 +31,9 @@ class be_visitor_component_exs // public: be_visitor_component_exs (be_visitor_context *ctx); - + ~be_visitor_component_exs (void); - + virtual int visit_component (be_component *node); }; @@ -48,7 +48,7 @@ class Component_Exec_Op_Attr_Generator { public: Component_Exec_Op_Attr_Generator (be_visitor_scope * visitor); - + virtual int emit (be_interface * derived_interface, TAO_OutStream * os, be_interface * base_interface); @@ -56,6 +56,6 @@ public: private: be_visitor_scope * visitor_; }; - + #endif /* _BE_COMPONENT_COMPONENT_EXS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_svh.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_svh.h index e9d957a3c2e..95c9850896d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/component_svh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_svh.h @@ -27,15 +27,15 @@ class be_visitor_component_svh : public be_visitor_component { public: be_visitor_component_svh (be_visitor_context *ctx); - + ~be_visitor_component_svh (void); - + virtual int visit_component (be_component *node); virtual int visit_connector (be_connector *node); - + private: void gen_entrypoint (be_component *node); - + private: TAO_OutStream &os_; ACE_CString export_macro_; diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_svs.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_svs.h index 3040bcffe65..8e4f2d07e91 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/component_svs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_svs.h @@ -28,19 +28,19 @@ class be_visitor_component_svs : public be_visitor_component { public: be_visitor_component_svs (be_visitor_context *ctx); - + ~be_visitor_component_svs (void); - + virtual int visit_component (be_component *node); virtual int visit_connector (be_connector *node); - + private: void gen_entrypoint (AST_Component *node); - + private: TAO_OutStream &os_; ACE_CString export_macro_; }; - + #endif /* _BE_COMPONENT_COMPONENT_SVS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/context_svh.h b/TAO/TAO_IDL/be_include/be_visitor_component/context_svh.h index c13ca8bc334..9384a0d0c2f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/context_svh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/context_svh.h @@ -29,9 +29,9 @@ class be_visitor_context_svh : public be_visitor_component_scope { public: be_visitor_context_svh (be_visitor_context *ctx); - + ~be_visitor_context_svh (void); - + virtual int visit_component (be_component *node); virtual int visit_connector (be_connector *node); virtual int visit_uses (be_uses *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/executor_exh.h b/TAO/TAO_IDL/be_include/be_visitor_component/executor_exh.h index 05870f4ed9a..eef5f7de9d0 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/executor_exh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/executor_exh.h @@ -30,9 +30,9 @@ class be_visitor_executor_exh // public: be_visitor_executor_exh (be_visitor_context *ctx); - + ~be_visitor_executor_exh (void); - + virtual int visit_attribute (be_attribute *node); virtual int visit_component (be_component *node); virtual int visit_provides (be_provides *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/executor_exs.h b/TAO/TAO_IDL/be_include/be_visitor_component/executor_exs.h index 23afac20bd6..4c92e57bdd1 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/executor_exs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/executor_exs.h @@ -30,15 +30,15 @@ class be_visitor_executor_exs // public: be_visitor_executor_exs (be_visitor_context *ctx); - + ~be_visitor_executor_exs (void); - + virtual int visit_operation (be_operation *node); virtual int visit_attribute (be_attribute *node); virtual int visit_component (be_component *node); virtual int visit_provides (be_provides *node); virtual int visit_consumes (be_consumes *node); - + private: be_interface *op_scope_; const char *comment_border_; diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/facet_exh.h b/TAO/TAO_IDL/be_include/be_visitor_component/facet_exh.h index d93327b055f..64bf6b02716 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/facet_exh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/facet_exh.h @@ -29,9 +29,9 @@ class be_visitor_facet_exh // public: be_visitor_facet_exh (be_visitor_context *ctx); - + ~be_visitor_facet_exh (void); - + virtual int visit_provides (be_provides *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/facet_exs.h b/TAO/TAO_IDL/be_include/be_visitor_component/facet_exs.h index 1b4b5e83e81..2c75f4f3e96 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/facet_exs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/facet_exs.h @@ -30,13 +30,13 @@ class be_visitor_facet_exs // public: be_visitor_facet_exs (be_visitor_context *ctx); - + ~be_visitor_facet_exs (void); - + virtual int visit_operation (be_operation *node); virtual int visit_attribute (be_attribute *node); virtual int visit_provides (be_provides *node); - + private: be_provides *op_scope_; const char *comment_border_; diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/facet_private_exh.h b/TAO/TAO_IDL/be_include/be_visitor_component/facet_private_exh.h index 93adfbce4b8..1bf464f4155 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/facet_private_exh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/facet_private_exh.h @@ -31,9 +31,9 @@ class be_visitor_facet_private_exh // public: be_visitor_facet_private_exh (be_visitor_context *ctx); - + ~be_visitor_facet_private_exh (void); - + virtual int visit_provides (be_provides *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/facet_svh.h b/TAO/TAO_IDL/be_include/be_visitor_component/facet_svh.h index 395b394693f..93d83b4eb57 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/facet_svh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/facet_svh.h @@ -29,9 +29,9 @@ class be_visitor_facet_svh : public be_visitor_component_scope { public: be_visitor_facet_svh (be_visitor_context *ctx); - + ~be_visitor_facet_svh (void); - + virtual int visit_provides (be_provides *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/facet_svs.h b/TAO/TAO_IDL/be_include/be_visitor_component/facet_svs.h index f8dd0988b39..46658f60257 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/facet_svs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/facet_svs.h @@ -29,9 +29,9 @@ class be_visitor_facet_svs : public be_visitor_component_scope { public: be_visitor_facet_svs (be_visitor_context *ctx); - + ~be_visitor_facet_svs (void); - + virtual int visit_provides (be_provides *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/servant_svh.h b/TAO/TAO_IDL/be_include/be_visitor_component/servant_svh.h index e1ce49b94bb..71340afd5b9 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/servant_svh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/servant_svh.h @@ -29,9 +29,9 @@ class be_visitor_servant_svh : public be_visitor_component_scope { public: be_visitor_servant_svh (be_visitor_context *ctx); - + ~be_visitor_servant_svh (void); - + virtual int visit_component (be_component *node); virtual int visit_connector (be_connector *node); virtual int visit_attribute (be_attribute *node); @@ -40,9 +40,9 @@ public: virtual int visit_publishes (be_publishes *node); virtual int visit_emits (be_emits *node); virtual int visit_consumes (be_consumes *node); - + private: - /// Base class overrides and CIAO-specific code. + /// Base class overrides and CIAO-specific code. void gen_non_type_specific (void); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/servant_svs.h b/TAO/TAO_IDL/be_include/be_visitor_component/servant_svs.h index 1b92a4971a1..5007b4edbd6 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/servant_svs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/servant_svs.h @@ -31,9 +31,9 @@ class be_visitor_servant_svs // public: be_visitor_servant_svs (be_visitor_context *ctx); - + ~be_visitor_servant_svs (void); - + virtual int visit_component (be_component *node); virtual int visit_connector (be_connector *node); virtual int visit_operation (be_operation *node); @@ -43,13 +43,13 @@ public: virtual int visit_publishes (be_publishes *node); virtual int visit_emits (be_emits *node); virtual int visit_consumes (be_consumes *node); - + private: void gen_provides_top (void); void gen_uses_top (void); void gen_publishes_top (void); void gen_emits_top (void); - + /// This method gets generated (unless we are /// generating the LwCCM profile) whether the /// comonent has any emitters or not. @@ -66,13 +66,13 @@ class be_visitor_obv_factory_reg { public: be_visitor_obv_factory_reg (be_visitor_context *ctx); - + ~be_visitor_obv_factory_reg (void); - + virtual int visit_publishes (be_publishes *node); virtual int visit_emits (be_emits *node); virtual int visit_consumes (be_consumes *node); - + private: void gen_obv_factory_registration (AST_Type *t); }; @@ -83,9 +83,9 @@ class be_visitor_attr_set : public be_visitor_component_scope { public: be_visitor_attr_set (be_visitor_context *ctx); - + ~be_visitor_attr_set (void); - + virtual int visit_attribute (be_attribute *node); }; @@ -96,9 +96,9 @@ class be_visitor_facet_executor_block { public: be_visitor_facet_executor_block (be_visitor_context *ctx); - + ~be_visitor_facet_executor_block (void); - + virtual int visit_provides (be_provides *node); }; @@ -109,9 +109,9 @@ class be_visitor_connect_block { public: be_visitor_connect_block (be_visitor_context *ctx); - + ~be_visitor_connect_block (void); - + virtual int visit_uses (be_uses *node); }; @@ -122,9 +122,9 @@ class be_visitor_disconnect_block { public: be_visitor_disconnect_block (be_visitor_context *ctx); - + ~be_visitor_disconnect_block (void); - + virtual int visit_uses (be_uses *node); }; @@ -135,11 +135,11 @@ class be_visitor_receptacle_desc { public: be_visitor_receptacle_desc (be_visitor_context *ctx); - + ~be_visitor_receptacle_desc (void); - + virtual int visit_uses (be_uses *node); - + private: ACE_CDR::ULong slot_; }; @@ -151,9 +151,9 @@ class be_visitor_subscribe_block { public: be_visitor_subscribe_block (be_visitor_context *ctx); - + ~be_visitor_subscribe_block (void); - + virtual int visit_publishes (be_publishes *node); }; @@ -164,9 +164,9 @@ class be_visitor_unsubscribe_block { public: be_visitor_unsubscribe_block (be_visitor_context *ctx); - + ~be_visitor_unsubscribe_block (void); - + virtual int visit_publishes (be_publishes *node); }; @@ -177,11 +177,11 @@ class be_visitor_event_source_desc { public: be_visitor_event_source_desc (be_visitor_context *ctx); - + ~be_visitor_event_source_desc (void); - + virtual int visit_publishes (be_publishes *node); - + private: ACE_CDR::ULong slot_; }; @@ -193,9 +193,9 @@ class be_visitor_connect_consumer_block { public: be_visitor_connect_consumer_block (be_visitor_context *ctx); - + ~be_visitor_connect_consumer_block (void); - + virtual int visit_emits (be_emits *node); }; @@ -206,9 +206,9 @@ class be_visitor_disconnect_consumer_block { public: be_visitor_disconnect_consumer_block (be_visitor_context *ctx); - + ~be_visitor_disconnect_consumer_block (void); - + virtual int visit_emits (be_emits *node); }; @@ -219,11 +219,11 @@ class be_visitor_emitter_desc { public: be_visitor_emitter_desc (be_visitor_context *ctx); - + ~be_visitor_emitter_desc (void); - + virtual int visit_emits (be_emits *node); - + private: ACE_CDR::ULong slot_; }; @@ -235,11 +235,11 @@ class be_visitor_populate_port_tables { public: be_visitor_populate_port_tables (be_visitor_context *ctx); - + ~be_visitor_populate_port_tables (void); - + virtual int visit_provides (be_provides *node); - + virtual int visit_consumes (be_consumes *node); }; @@ -252,7 +252,7 @@ class Component_Op_Attr_Generator { public: Component_Op_Attr_Generator (be_visitor_scope * visitor); - + virtual int emit (be_interface * derived_interface, TAO_OutStream * os, be_interface * base_interface); @@ -260,6 +260,6 @@ public: private: be_visitor_scope * visitor_; }; - + #endif /* _BE_COMPONENT_SERVANT_SVS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_exh.h b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_exh.h index 897a3384a86..d7e8d69b906 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_exh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_exh.h @@ -33,11 +33,11 @@ class be_visitor_connector_ami_exh // public: be_visitor_connector_ami_exh (be_visitor_context *ctx); - + ~be_visitor_connector_ami_exh (void); - + virtual int visit_connector (be_connector *node); - + private: void gen_entrypoint (void); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_exs.h b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_exs.h index 728f06676ec..ac03efd9545 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_exs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_exs.h @@ -34,11 +34,11 @@ class be_visitor_connector_ami_exs // public: be_visitor_connector_ami_exs (be_visitor_context *ctx); - + ~be_visitor_connector_ami_exs (void); - + virtual int visit_connector (be_connector *node); - + private: void gen_entrypoint (void); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_rh_exh.h b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_rh_exh.h index a3bb3ce026d..033563da14c 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_rh_exh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_rh_exh.h @@ -36,13 +36,13 @@ class be_visitor_connector_ami_rh_exh // public: be_visitor_connector_ami_rh_exh (be_visitor_context *ctx); - + ~be_visitor_connector_ami_rh_exh (void); - + virtual int visit_component (be_component *node); - + virtual int visit_provides (be_provides *node); - + virtual int visit_attribute (be_attribute *node); }; @@ -55,7 +55,7 @@ class ReplyHandler_Op_Attr_Decl_Generator { public: ReplyHandler_Op_Attr_Decl_Generator (be_visitor_scope * visitor); - + virtual int emit (be_interface * derived_interface, TAO_OutStream * os, be_interface * base_interface); @@ -63,6 +63,6 @@ public: private: be_visitor_scope * visitor_; }; - + #endif /* _BE_CONNECTOR_CONNECTOR_AMI_EXH_RH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_rh_exs.h b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_rh_exs.h index b40fd6d8420..e6a08b5f7c8 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_rh_exs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_rh_exs.h @@ -36,15 +36,15 @@ class be_visitor_connector_ami_rh_exs // public: be_visitor_connector_ami_rh_exs (be_visitor_context *ctx); - + ~be_visitor_connector_ami_rh_exs (void); - + virtual int visit_component (be_component *node); - + virtual int visit_provides (be_provides *node); - + virtual int visit_operation (be_operation *node); - + virtual int visit_attribute (be_attribute *node); }; @@ -57,7 +57,7 @@ class ReplyHandler_Op_Attr_Defn_Generator { public: ReplyHandler_Op_Attr_Defn_Generator (be_visitor_scope * visitor); - + virtual int emit (be_interface * derived_interface, TAO_OutStream * os, be_interface * base_interface); @@ -65,6 +65,6 @@ public: private: be_visitor_scope * visitor_; }; - + #endif /* _BE_CONNECTOR_CONNECTOR_AMI_EXS_RH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h index 3bcc9912b78..68d8fe74907 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h +++ b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h @@ -32,23 +32,23 @@ class be_visitor_connector_dds_ex_base // public: be_visitor_connector_dds_ex_base (be_visitor_context *ctx); - + ~be_visitor_connector_dds_ex_base (void); - + protected: bool begin (be_connector *node); - + protected: // Storage for the current template module instantiation we // are using, and its associated template args. AST_Template_Module_Inst *t_inst_; FE_Utils::T_ARGLIST *t_args_; - + // Derives from the DDS datatype, so we want to calculate it // once and store it. ACE_CString dds_traits_name_; const char *base_tname_; - + private: void process_template_args (AST_Connector *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exh.h b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exh.h index 1b96d896876..341f5b1eaae 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exh.h @@ -33,25 +33,25 @@ class be_visitor_connector_dds_exh // public: be_visitor_connector_dds_exh (be_visitor_context *ctx); - + ~be_visitor_connector_dds_exh (void); - + virtual int visit_connector (be_connector *node); - + /// Used to generate the traits structures. virtual int visit_provides (be_provides *node); virtual int visit_uses (be_uses *node); - + private: /// Generate application-specific instantiations of /// middleware templates containing traits constructs. void gen_dds_traits (void); void gen_connector_traits (void); - + /// Common code triggered by provides and uses ports. void gen_interface_connector_trait (be_interface *iface, bool for_facet); - + /// Have to keep a list of port interfaces so their /// dds ACE_Unbounded_Queue<be_interface *> port_ifaces_; diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exs.h b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exs.h index 0f3184b1597..a976c2beab9 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exs.h @@ -31,9 +31,9 @@ class be_visitor_connector_dds_exs // public: be_visitor_connector_dds_exs (be_visitor_context *ctx); - + ~be_visitor_connector_dds_exs (void); - + virtual int visit_connector (be_connector *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/executor_ami_exh.h b/TAO/TAO_IDL/be_include/be_visitor_connector/executor_ami_exh.h index 521bb5b0ffe..f9bdd4695de 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_connector/executor_ami_exh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_connector/executor_ami_exh.h @@ -31,9 +31,9 @@ class be_visitor_executor_ami_exh // public: be_visitor_executor_ami_exh (be_visitor_context *ctx); - + ~be_visitor_executor_ami_exh (void); - + virtual int visit_connector (be_connector *node); virtual int visit_provides (be_provides *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/executor_ami_exs.h b/TAO/TAO_IDL/be_include/be_visitor_connector/executor_ami_exs.h index 20864ef3154..a125c4ff6bd 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_connector/executor_ami_exs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_connector/executor_ami_exs.h @@ -31,9 +31,9 @@ class be_visitor_executor_ami_exs // public: be_visitor_executor_ami_exs (be_visitor_context *ctx); - + ~be_visitor_executor_ami_exs (void); - + virtual int visit_connector (be_connector *node); virtual int visit_provides (be_provides *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exh.h b/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exh.h index 5f87a3537a0..1ab59a3edef 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exh.h @@ -30,17 +30,17 @@ class be_visitor_facet_ami_exh // public: be_visitor_facet_ami_exh (be_visitor_context *ctx); - + ~be_visitor_facet_ami_exh (void); - + virtual int visit_component (be_component *node); virtual int visit_provides (be_provides *node); virtual int visit_operation (be_operation *node); - + protected: /// Common the this class and derived class. void init (bool for_impl); - + protected: be_interface *iface_; be_interface *callback_iface_; @@ -48,7 +48,7 @@ protected: const char *scope_name_; const char *iface_name_; const char *smart_scope_; - + private: int gen_reply_handler_class (void); int gen_facet_executor_class (void); diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exs.h b/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exs.h index 523e1aa3bff..525e9cfa439 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exs.h @@ -30,26 +30,26 @@ class be_visitor_facet_ami_exs // public: be_visitor_facet_ami_exs (be_visitor_context *ctx); - + ~be_visitor_facet_ami_exs (void); - + virtual int visit_component (be_component *node); virtual int visit_provides (be_provides *node); virtual int visit_operation (be_operation *node); virtual int visit_argument (be_argument *node); - + virtual int post_process (be_decl *node); - + private: int gen_reply_handler_class (void); int gen_facet_executor_class (void); int gen_reply_hander_op (be_operation *node); int gen_facet_executor_op (be_operation *node); - + private: /// Storage for the interface type of the facet. be_interface *iface_; - + /// Flag to tell us which operation body (reply handler /// or sendc_* class) we are generating. bool for_reply_handler_; @@ -64,7 +64,7 @@ class Facet_AMI_Exec_Op_Attr_Generator { public: Facet_AMI_Exec_Op_Attr_Generator (be_visitor_scope * visitor); - + virtual int emit (be_interface * derived_interface, TAO_OutStream * os, be_interface * base_interface); @@ -72,6 +72,6 @@ public: private: be_visitor_scope * visitor_; }; - + #endif /* _BE_CONNECTOR_FACET_AMI_EXS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_context.h b/TAO/TAO_IDL/be_include/be_visitor_context.h index 2e62555ecdd..1b0240d38df 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_context.h +++ b/TAO/TAO_IDL/be_include/be_visitor_context.h @@ -128,10 +128,10 @@ public: */ be_interface *interface (void) const; void interface (be_interface *); - + /// Accessor for the member. ACE_CString &port_prefix (void); - + /// return the export macro currently in force const char *export_macro (void) const; @@ -171,7 +171,7 @@ private: /// See the method declaration above. be_interface *interface_; - + /// Used in enough visitors to put it here. ACE_CString port_prefix_; }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_decl.h b/TAO/TAO_IDL/be_include/be_visitor_decl.h index fda016def9f..c7260d6f4ce 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_decl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_decl.h @@ -33,7 +33,7 @@ public: be_visitor_decl (be_visitor_context *ctx); ~be_visitor_decl (void); - + be_visitor_context *ctx (void); protected: @@ -44,8 +44,8 @@ protected: /// contained by another. int gen_anonymous_base_type (be_type *bt, TAO_CodeGen::CG_STATE cg_state); - - /// Our file stream. + + /// Our file stream. TAO_OutStream &os_; }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/serializer_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_enum/serializer_op_ch.h index 61660264c86..3cb16ef3029 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_enum/serializer_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_enum/serializer_op_ch.h @@ -6,7 +6,7 @@ * * $Id$ * - * Concrete visitor for Enums generating code for the + * Concrete visitor for Enums generating code for the * TAO::DCPS::Serializer operators * * diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/serializer_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_enum/serializer_op_cs.h index 2187dea092f..3079a6a8274 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_enum/serializer_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_enum/serializer_op_cs.h @@ -6,7 +6,7 @@ * * $Id$ * - * Concrete visitor for Enums generating code for the + * Concrete visitor for Enums generating code for the * TAO::DCPS::Serializer operators * * diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/serializer_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_field/serializer_op_ch.h index fb80e261ae8..fc72b31adfb 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_field/serializer_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_field/serializer_op_ch.h @@ -6,7 +6,7 @@ * $Id$ * * Concrete visitor for the base "BE_Field" node - * This generates TAO::DCPS::Serializer operators code for structure members + * This generates TAO::DCPS::Serializer operators code for structure members * in the client header. * * diff --git a/TAO/TAO_IDL/be_include/be_visitor_home/home_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_home/home_ex_idl.h index b3988c894f1..8d721db108f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_home/home_ex_idl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_home/home_ex_idl.h @@ -22,7 +22,7 @@ * * @brief be_visitor_home_ex_idl * - * This is a concrete visitor to generate the + * This is a concrete visitor to generate the * CIAO executor IDL for home. */ class be_visitor_home_ex_idl : public be_visitor_scope @@ -33,37 +33,37 @@ public: ~be_visitor_home_ex_idl (void); virtual int visit_home (be_home *node); - + virtual int visit_attribute (be_attribute *node); virtual int visit_operation (be_operation *node); virtual int visit_argument (be_argument *node); virtual int visit_factory (be_factory *node); - + /// To regenerate the name of an anonymous type. /// Anonymous arrays are not allowed. virtual int visit_sequence (be_sequence *node); virtual int visit_string (be_string *node); - + private: void gen_implicit (void); void gen_explicit (void); void gen_derived (void); - + void gen_supported (void); - + void gen_exception_list (UTL_ExceptList *exceptions, const char *prefix = "", bool init_op = false); - + void gen_home_executor (void); - + /// The CCM preproc visitor changed the scoped name and the /// defined_in() for the home's members to the implied /// *Explicit interface, which isn't a problem unless /// they include exceptions raised by a contained operation. /// factory or finder. So we restore the members just in case. void restore_scope (void); - + private: be_home *node_; TAO_OutStream &os_; diff --git a/TAO/TAO_IDL/be_include/be_visitor_home/home_exh.h b/TAO/TAO_IDL/be_include/be_visitor_home/home_exh.h index f09f0a654f0..38d714516e6 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_home/home_exh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_home/home_exh.h @@ -29,25 +29,25 @@ class be_visitor_home_exh : public be_visitor_scope { public: be_visitor_home_exh (be_visitor_context *ctx); - + ~be_visitor_home_exh (void); - + virtual int visit_home (be_home *node); virtual int visit_operation (be_operation *node); virtual int visit_attribute (be_attribute *node); virtual int visit_factory (be_factory *node); - + /// Helper method passed to traverse_inheritance_graph(), /// collects supported operations and attributes. static int op_attr_decl_helper (be_interface *, be_interface *, TAO_OutStream *); - + private: int gen_exec_class (void); - + void gen_entrypoint (void); - + private: be_home *node_; AST_Component *comp_; diff --git a/TAO/TAO_IDL/be_include/be_visitor_home/home_exs.h b/TAO/TAO_IDL/be_include/be_visitor_home/home_exs.h index 53faae2b1fe..3f117a68b67 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_home/home_exs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_home/home_exs.h @@ -29,19 +29,19 @@ class be_visitor_home_exs : public be_visitor_scope { public: be_visitor_home_exs (be_visitor_context *ctx); - + ~be_visitor_home_exs (void); - + virtual int visit_home (be_home *node); virtual int visit_operation (be_operation *node); virtual int visit_attribute (be_attribute *node); virtual int visit_factory (be_factory *node); - + private: int gen_exec_class (void); - + void gen_entrypoint (void); - + private: be_home *node_; AST_Component *comp_; @@ -58,7 +58,7 @@ class Home_Exec_Op_Attr_Generator { public: Home_Exec_Op_Attr_Generator (be_visitor_scope * visitor); - + virtual int emit (be_interface * derived_interface, TAO_OutStream * os, be_interface * base_interface); @@ -66,6 +66,6 @@ public: private: be_visitor_scope * visitor_; }; - + #endif /* _BE_HOME_HOME_EXS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_home/home_svh.h b/TAO/TAO_IDL/be_include/be_visitor_home/home_svh.h index b4c79bf8076..650e3ec52c2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_home/home_svh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_home/home_svh.h @@ -28,26 +28,26 @@ class be_visitor_home_svh : public be_visitor_scope { public: be_visitor_home_svh (be_visitor_context *ctx); - + ~be_visitor_home_svh (void); - + virtual int visit_home (be_home *node); virtual int visit_operation (be_operation *node); virtual int visit_attribute (be_attribute *node); virtual int visit_factory (be_factory *node); virtual int visit_finder (be_finder *node); - + private: int gen_servant_class (void); - + void gen_entrypoint (void); - + /// Helper method passed to traverse_inheritance_graph(), /// collects supported operations and attributes. static int op_attr_decl_helper (be_interface *, be_interface *, TAO_OutStream *); - + private: be_home *node_; AST_Component *comp_; diff --git a/TAO/TAO_IDL/be_include/be_visitor_home/home_svs.h b/TAO/TAO_IDL/be_include/be_visitor_home/home_svs.h index 46236b5fe46..80a7620ca5a 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_home/home_svs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_home/home_svs.h @@ -71,9 +71,9 @@ class be_visitor_home_attr_set : public be_visitor_decl { public: be_visitor_home_attr_set (be_visitor_context *ctx); - + ~be_visitor_home_attr_set (void); - + virtual int visit_home (be_home *node); virtual int visit_attribute (be_attribute *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_rh_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_rh_ss.h index 54013f43791..56415e49996 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_rh_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_rh_ss.h @@ -4,7 +4,7 @@ * * $Id$ * - * Specialized visitor for AMH-ResponseHandler that generates code for the + * Specialized visitor for AMH-ResponseHandler that generates code for the * RH in the skeleton source file * * @author Mayur Deshpande <mayur@ics.uci.edu> diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_conn_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_conn_ex_idl.h index b5f04553078..911f631d7b7 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_conn_ex_idl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_conn_ex_idl.h @@ -32,7 +32,7 @@ public: ~be_visitor_ami4ccm_conn_ex_idl (void); virtual int visit_interface (be_interface *node); - + private: TAO_OutStream &os_; }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_rh_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_rh_ex_idl.h index 8616f14e762..e00c8f464a5 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_rh_ex_idl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_rh_ex_idl.h @@ -37,13 +37,13 @@ public: virtual int visit_argument (be_argument *node); virtual int visit_string (be_string *node); virtual int visit_sequence (be_sequence *node); - + virtual int pre_process (be_decl *node); - + private: void gen_attr_rh_ops (bool is_set_op, be_attribute *node); - + private: TAO_OutStream &os_; bool seen_in_or_inout_arg_; diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_sendc_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_sendc_ex_idl.h index 38bb668440f..b051f721f20 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_sendc_ex_idl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_sendc_ex_idl.h @@ -36,9 +36,9 @@ public: virtual int visit_argument (be_argument *node); virtual int visit_string (be_string *node); virtual int visit_sequence (be_sequence *node); - + virtual int pre_process (be_decl *node); - + private: TAO_OutStream &os_; be_interface *iface_; diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_sh.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_sh.h index 995c09314af..5e51ccd2c8b 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_sh.h @@ -28,11 +28,11 @@ class be_visitor_interface_sh : public be_visitor_interface public: be_visitor_interface_sh (be_visitor_context *ctx); ~be_visitor_interface_sh (void); - + virtual int visit_interface (be_interface *node); virtual int visit_component (be_component *node); virtual int visit_connector (be_connector *node); - + /// Helper to generate the declarations for the operations /// of any abstract parents we may have. static int gen_abstract_ops_helper (be_interface *node, diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/serializer_op.h b/TAO/TAO_IDL/be_include/be_visitor_module/serializer_op.h index 2481284b5cb..1d60ed097d5 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_module/serializer_op.h +++ b/TAO/TAO_IDL/be_include/be_visitor_module/serializer_op.h @@ -7,7 +7,7 @@ * $Id$ * * Concrete visitor for the Module class - * This one provides visitors to generate the + * This one provides visitors to generate the * TAO::DCPS::Serializer operators for elements in * the Module's scope. * diff --git a/TAO/TAO_IDL/be_include/be_visitor_null_return_value.h b/TAO/TAO_IDL/be_include/be_visitor_null_return_value.h index 879ae5621ad..1c7f0a42b91 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_null_return_value.h +++ b/TAO/TAO_IDL/be_include/be_visitor_null_return_value.h @@ -34,7 +34,7 @@ class be_visitor_null_return_value : public be_visitor_decl public: be_visitor_null_return_value (be_visitor_context *ctx); virtual ~be_visitor_null_return_value (void); - + virtual int visit_array (be_array *); virtual int visit_component (be_component *); virtual int visit_enum (be_enum *); @@ -49,7 +49,7 @@ public: virtual int visit_union (be_union *); virtual int visit_valuebox (be_valuebox *); virtual int visit_valuetype (be_valuetype *); - + protected: TAO_OutStream & os_; }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_ss.h index 84dc944af6e..9d3d1c566c6 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_ss.h @@ -26,13 +26,13 @@ class be_visitor_amh_rh_operation_ss : public be_visitor_operation { public: be_visitor_amh_rh_operation_ss (be_visitor_context *ctx); - + ~be_visitor_amh_rh_operation_ss (void); - + int visit_operation (be_operation *node); private: - int marshal_params (be_operation *node); + int marshal_params (be_operation *node); }; #endif /* AMH_RH_OPERATION_SS_H */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/arglist.h b/TAO/TAO_IDL/be_include/be_visitor_operation/arglist.h index e3e00e96b33..9cfba6530bc 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/arglist.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/arglist.h @@ -41,10 +41,10 @@ public: /// Stuff to output after each element of the scope is handled. virtual int post_process (be_decl *); - + /// Set the member. void unused (bool val); - + private: bool unused_; }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_exs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_exs.h index be9e7a56199..b3727279f85 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_exs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_exs.h @@ -36,13 +36,13 @@ public: ~be_visitor_operation_exs (void); virtual int visit_operation (be_operation *node); - + void scope (be_decl *node); void class_extension (const char *extension); private: int gen_op_body (be_type *return_type); - + private: TAO_OutStream &os_; be_decl *scope_; diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h index 5549615b9bb..bf56ac72d00 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h @@ -93,10 +93,10 @@ public: /// visit a valuebox node int visit_valuebox (be_valuebox *node); - + private: const char *type_name (be_type *node); - + private: TAO_OutStream *os; }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_ch.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_ch.h index ba0af627fe3..f19f5584fd1 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_ch.h @@ -32,13 +32,13 @@ public: be_visitor_root_ch (be_visitor_context *ctx); ~be_visitor_root_ch (void); - + virtual int visit_root (be_root *node); private: /// Open file and initialize stream. int init (void); - + /// Encapsulating various bits of code generation peculiar /// to the client header file, done either before or after /// the main scope traversal. @@ -52,7 +52,7 @@ private: int gen_any_ops (be_root *node); int gen_cdr_ops (be_root *node); int gen_dds_serializer_ops (be_root *node); - + private: /// Can't use base class be_visitor_decl's member since /// its constructor is called too soon to initialize the diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_ci.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_ci.h index 0125bec7840..aec8003bf45 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_ci.h @@ -38,7 +38,7 @@ public: private: /// Open file and initialize stream. int init (void); - + /// Generate OBV definitions in the client inline /// file, done after the main scope traversal. int gen_obv_defns (be_root *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_exh.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_exh.h index 1b2eff7b6fd..1161835f43e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_exh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_exh.h @@ -32,7 +32,7 @@ public: be_visitor_root_exh (be_visitor_context *ctx); ~be_visitor_root_exh (void); - + virtual int visit_root (be_root *node); private: diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_exs.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_exs.h index 8d61719030c..2da966b7eda 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_exs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_exs.h @@ -32,7 +32,7 @@ public: be_visitor_root_exs (be_visitor_context *ctx); ~be_visitor_root_exs (void); - + virtual int visit_root (be_root *node); private: diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_ss.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_ss.h index 03944b9e4cf..50b67208471 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_ss.h @@ -37,7 +37,7 @@ public: private: /// Open file and initialize stream. int init (void); - + /// Generate arg template trait specializations in /// the skeleton source file, done before the main /// scope traversal. diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_svs.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_svs.h index bbacfeb73ea..80b5698b09c 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_svs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_svs.h @@ -32,7 +32,7 @@ public: be_visitor_root_svs (be_visitor_context *ctx); ~be_visitor_root_svs (void); - + virtual int visit_root (be_root *node); private: diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h index 6a683f50e37..5f28258ec40 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h @@ -40,7 +40,7 @@ public: virtual int visit_sequence (be_sequence *node); /// Generate the typedefs for our _var and _out template classes. - void gen_varout_typedefs (be_sequence *node, + void gen_varout_typedefs (be_sequence *node, be_type *elem); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/serializer_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/serializer_op_ch.h index ae89e7f82e9..bb8f106b2fd 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/serializer_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/serializer_op_ch.h @@ -7,7 +7,7 @@ * $Id$ * * Concrete visitor for the Sequence class - * This one provides code generation for the + * This one provides code generation for the * TAO::DCPS::Serializer operators for the sequence * in the client header. * diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h index ef1a75d1f3e..b1076c723bc 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h @@ -92,7 +92,7 @@ protected: * to generate a TypeCode for its members or content type. */ bool is_typecode_generation_required (be_type * node); - + /// Generate nested namespaces for anonymous type typecodes. /** * Utility methods to generate enclosing namespaces for diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/serializer_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union/serializer_op_ch.h index f7dd09dce74..263948ea986 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/serializer_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/serializer_op_ch.h @@ -7,7 +7,7 @@ * $Id$ * * Concrete visitor for the Union class - * This one provides code generation for the TAO::DCPS::Serializer operators + * This one provides code generation for the TAO::DCPS::Serializer operators * for the union in the client header. * * diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h index cd34ca0e8ee..da4e8178899 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h @@ -36,7 +36,7 @@ public: /// Called only by AMH exceptions. virtual int visit_operation (be_operation *node); - + private: /// Recursive to generate for inherited members. void gen_ostream_operator_r (be_valuetype *node, unsigned long &index); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_sh.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_sh.h index 33b59575fb2..a598735fc38 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_sh.h @@ -29,10 +29,10 @@ class be_visitor_valuetype_sh : public be_visitor_valuetype public: /// constructor be_visitor_valuetype_sh (be_visitor_context *ctx); - + /// destructor ~be_visitor_valuetype_sh (void); - + virtual int visit_valuetype (be_valuetype *node); virtual int visit_eventtype (be_eventtype *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h b/TAO/TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h index 4ccf5d485f0..dd3f23bd1b6 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h +++ b/TAO/TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h @@ -32,14 +32,14 @@ public: be_visitor_xplicit_pre_proc (be_visitor_context *ctx); virtual ~be_visitor_xplicit_pre_proc (void); - + virtual int visit_home (be_home *node); virtual int visit_operation (be_operation *node); virtual int visit_argument (be_argument *node); virtual int visit_factory (be_factory *node); virtual int visit_finder (be_finder *node); - + virtual int visit_interface (be_interface *node); virtual int visit_valuebox (be_valuebox *node); virtual int visit_valuetype (be_valuetype *node); @@ -65,11 +65,11 @@ public: // Member accessor be_interface *xplicit (void) const; - + private: void check_and_store (AST_Decl *node); UTL_ScopedName *xplicit_iface_rel_name (AST_Decl *d); - + private: be_interface *xplicit_; AST_Decl *type_holder_; diff --git a/TAO/TAO_IDL/include/ast_argument.h b/TAO/TAO_IDL/include/ast_argument.h index 602be943cc9..d50831a9395 100644 --- a/TAO/TAO_IDL/include/ast_argument.h +++ b/TAO/TAO_IDL/include/ast_argument.h @@ -102,10 +102,10 @@ public: // Visiting. virtual int ast_accept (ast_visitor *visitor); - + // Cleanup. virtual void destroy (void); - + static AST_Decl::NodeType const NT; private: diff --git a/TAO/TAO_IDL/include/ast_array.h b/TAO/TAO_IDL/include/ast_array.h index 5ba744a4fe0..f9d94826178 100644 --- a/TAO/TAO_IDL/include/ast_array.h +++ b/TAO/TAO_IDL/include/ast_array.h @@ -105,7 +105,7 @@ public: // a primary key. Overridden for valuetype, struct, sequence, // union, array, typedef, and interface. virtual bool legal_for_primary_key (void) const; - + // Cleanup. virtual void destroy (void); @@ -118,9 +118,9 @@ public: // Visiting. virtual int ast_accept (ast_visitor *visitor); - + static AST_Decl::NodeType const NT; - + protected: virtual int compute_size_type (void); // Compute the size type if it is unknown. @@ -136,7 +136,7 @@ private: AST_Type *pd_base_type; // Base type of array. - + bool owns_base_type_; // If our base type is anonymous array or sequence, we're // responsible for destroying it. diff --git a/TAO/TAO_IDL/include/ast_attribute.h b/TAO/TAO_IDL/include/ast_attribute.h index abdcbdc85ce..c8ebf245889 100644 --- a/TAO/TAO_IDL/include/ast_attribute.h +++ b/TAO/TAO_IDL/include/ast_attribute.h @@ -99,7 +99,7 @@ public: // Visiting. virtual int ast_accept (ast_visitor *visitor); - + // Cleanup. virtual void destroy (void); @@ -108,7 +108,7 @@ public: UTL_ExceptList *be_add_set_exceptions (UTL_ExceptList *t); static AST_Decl::NodeType const NT; - + private: // Data. diff --git a/TAO/TAO_IDL/include/ast_component.h b/TAO/TAO_IDL/include/ast_component.h index d40746b9b62..b2b99f86875 100644 --- a/TAO/TAO_IDL/include/ast_component.h +++ b/TAO/TAO_IDL/include/ast_component.h @@ -46,7 +46,7 @@ public: AST_Type **supports (void) const; long n_supports (void) const; - + // Override for component of UTL_Scope method. virtual AST_Decl *special_lookup (UTL_ScopedName *e, bool full_def_only); @@ -73,7 +73,7 @@ public: static AST_Decl::NodeType const NT; typedef AST_ComponentFwd FWD_TYPE; - + protected: virtual AST_Provides *fe_add_provides (AST_Provides *p); diff --git a/TAO/TAO_IDL/include/ast_concrete_type.h b/TAO/TAO_IDL/include/ast_concrete_type.h index 44e961be886..79a8ff55fab 100644 --- a/TAO/TAO_IDL/include/ast_concrete_type.h +++ b/TAO/TAO_IDL/include/ast_concrete_type.h @@ -79,7 +79,7 @@ public: UTL_ScopedName *n); virtual ~AST_ConcreteType (void); - + // Cleanup. virtual void destroy (void); diff --git a/TAO/TAO_IDL/include/ast_connector.h b/TAO/TAO_IDL/include/ast_connector.h index 33c39f352e8..895f0b00376 100644 --- a/TAO/TAO_IDL/include/ast_connector.h +++ b/TAO/TAO_IDL/include/ast_connector.h @@ -17,12 +17,12 @@ public: AST_Connector *base_connector); virtual ~AST_Connector (void); - + AST_Connector *base_connector (void) const; // Cleanup function. virtual void destroy (void); - + // Narrowing. DEF_NARROW_FROM_DECL (AST_Connector); diff --git a/TAO/TAO_IDL/include/ast_consumes.h b/TAO/TAO_IDL/include/ast_consumes.h index df6f3b0fe9f..6dd17285520 100644 --- a/TAO/TAO_IDL/include/ast_consumes.h +++ b/TAO/TAO_IDL/include/ast_consumes.h @@ -13,9 +13,9 @@ class TAO_IDL_FE_Export AST_Consumes : public virtual AST_Field public: AST_Consumes (UTL_ScopedName *n, AST_Type *consumes_type); - + virtual ~AST_Consumes (void); - + // Data Accessor. AST_Type *consumes_type (void) const; @@ -27,7 +27,7 @@ public: // Visiting. virtual int ast_accept (ast_visitor *visitor); - + // Cleanup. virtual void destroy (void); diff --git a/TAO/TAO_IDL/include/ast_decl.h b/TAO/TAO_IDL/include/ast_decl.h index f5f7e619d18..df696838cb5 100644 --- a/TAO/TAO_IDL/include/ast_decl.h +++ b/TAO/TAO_IDL/include/ast_decl.h @@ -108,7 +108,7 @@ public: // Accessor needs to get overridden for a few types. virtual bool is_local (void); void is_local (bool val); - + bool is_abstract (void) const; void is_abstract (bool val); @@ -299,12 +299,12 @@ public: // Useful for GIOP to know if a wstring is being marshaled. virtual int contains_wstring (void); void contains_wstring (int val); - + // Additional checks when we think we have caught an IDL // masking scope error in a lookup, which starts simply with // a comparison of names in a scope masking queue. bool masking_checks (AST_Decl *mod); - + protected: // These are not private because they're used by // be_predefined_type' constructor and can be called diff --git a/TAO/TAO_IDL/include/ast_emits.h b/TAO/TAO_IDL/include/ast_emits.h index d1aba825406..b8e0a450e95 100644 --- a/TAO/TAO_IDL/include/ast_emits.h +++ b/TAO/TAO_IDL/include/ast_emits.h @@ -13,9 +13,9 @@ class TAO_IDL_FE_Export AST_Emits : public virtual AST_Field public: AST_Emits (UTL_ScopedName *n, AST_Type *emits_type); - + virtual ~AST_Emits (void); - + // Data Accessor. AST_Type *emits_type (void) const; @@ -27,7 +27,7 @@ public: // Visiting. virtual int ast_accept (ast_visitor *visitor); - + // Cleanup. virtual void destroy (void); diff --git a/TAO/TAO_IDL/include/ast_exception.h b/TAO/TAO_IDL/include/ast_exception.h index f70a512353c..a1a50b4a64f 100644 --- a/TAO/TAO_IDL/include/ast_exception.h +++ b/TAO/TAO_IDL/include/ast_exception.h @@ -99,7 +99,7 @@ public: // Visiting. virtual int ast_accept (ast_visitor *visitor); - + // Cleanup. virtual void destroy (void); diff --git a/TAO/TAO_IDL/include/ast_expression.h b/TAO/TAO_IDL/include/ast_expression.h index 70f49839ca0..faf9e6c72a8 100644 --- a/TAO/TAO_IDL/include/ast_expression.h +++ b/TAO/TAO_IDL/include/ast_expression.h @@ -202,7 +202,7 @@ public: AST_Expression (ACE_CDR::UShort us); AST_Expression (ACE_CDR::Long l); - + AST_Expression (ACE_CDR::LongLong ll); AST_Expression (ACE_CDR::Boolean b); @@ -286,7 +286,7 @@ public: // Accessor for the member. AST_Decl *get_tdef (void) const; - + // Accessor for the member. AST_Param_Holder *param_holder (void) const; @@ -331,10 +331,10 @@ private: AST_Decl *tdef; // Propagates aliased constant type. - + AST_Param_Holder *param_holder_; // Non-zero if we were created from a reference template param. - + private: // Fill out the lineno, filename and definition scope details. void fill_definition_details (void); diff --git a/TAO/TAO_IDL/include/ast_field.h b/TAO/TAO_IDL/include/ast_field.h index 8641de10063..9cbfcecf02c 100644 --- a/TAO/TAO_IDL/include/ast_field.h +++ b/TAO/TAO_IDL/include/ast_field.h @@ -123,7 +123,7 @@ public: // Visiting. virtual int ast_accept (ast_visitor *visitor); - + // Cleanup. virtual void destroy (void); @@ -137,7 +137,7 @@ protected: Visibility visibility_; // Used with valuetype and eventtype fields. - + bool owns_base_type_; // If our field type is anonymous array or sequence, we're // responsible for destroying it. diff --git a/TAO/TAO_IDL/include/ast_generator.h b/TAO/TAO_IDL/include/ast_generator.h index bc8e6dda13d..0624b2f4e78 100644 --- a/TAO/TAO_IDL/include/ast_generator.h +++ b/TAO/TAO_IDL/include/ast_generator.h @@ -365,60 +365,60 @@ public: virtual AST_PortType *create_porttype (UTL_ScopedName *n); - + virtual AST_Provides *create_provides (UTL_ScopedName *n, AST_Type *provides_type); - + virtual AST_Uses *create_uses (UTL_ScopedName *n, AST_Type *uses_type, bool is_multiple); - + virtual AST_Publishes *create_publishes (UTL_ScopedName *n, AST_Type *publishes_type); - + virtual AST_Emits *create_emits (UTL_ScopedName *n, AST_Type *emits_type); - + virtual AST_Consumes *create_consumes (UTL_ScopedName *n, AST_Type *consumes_type); - + virtual AST_Extended_Port *create_extended_port ( UTL_ScopedName *n, AST_PortType *porttype_ref); - + virtual AST_Mirror_Port *create_mirror_port ( UTL_ScopedName *n, AST_PortType *porttype_ref); - + virtual AST_Connector *create_connector ( UTL_ScopedName *n, AST_Connector *base_connector); - + virtual AST_Template_Module *create_template_module ( UTL_ScopedName *n, FE_Utils::T_PARAMLIST_INFO *template_params); - + virtual AST_Template_Module_Inst *create_template_module_inst ( UTL_ScopedName *n, AST_Template_Module *ref, FE_Utils::T_ARGLIST *template_args); - + virtual AST_Template_Module_Ref *create_template_module_ref ( UTL_ScopedName *n, AST_Template_Module *ref, UTL_StrList *param_refs); - + virtual AST_Param_Holder *create_param_holder ( UTL_ScopedName *parameter_name, diff --git a/TAO/TAO_IDL/include/ast_home.h b/TAO/TAO_IDL/include/ast_home.h index df69e21c001..41ac3e06391 100644 --- a/TAO/TAO_IDL/include/ast_home.h +++ b/TAO/TAO_IDL/include/ast_home.h @@ -31,8 +31,8 @@ public: // Extend lookup to the supported interfaces. virtual AST_Decl *look_in_supported (UTL_ScopedName *e, bool full_def_only); - - // Overridden for homes from the UTL_Scope method. + + // Overridden for homes from the UTL_Scope method. virtual AST_Decl *special_lookup (UTL_ScopedName *, bool full_def_only); @@ -63,10 +63,10 @@ public: virtual int ast_accept (ast_visitor *visitor); static AST_Decl::NodeType const NT; - + private: // Scope Management Protocol. - + friend int tao_yyparse (void); friend class ast_visitor_tmpl_module_inst; diff --git a/TAO/TAO_IDL/include/ast_interface.h b/TAO/TAO_IDL/include/ast_interface.h index 6dbf5be957d..b38bf997531 100644 --- a/TAO/TAO_IDL/include/ast_interface.h +++ b/TAO/TAO_IDL/include/ast_interface.h @@ -123,7 +123,7 @@ public: // Accessors for the member. bool home_equiv (void) const; void home_equiv (bool val); - + // Accessors for the member. AST_InterfaceFwd *fwd_decl (void) const; void fwd_decl (AST_InterfaceFwd *node); @@ -131,7 +131,7 @@ public: // Look through inherited interfaces. virtual AST_Decl *look_in_inherited (UTL_ScopedName *e, bool full_def_only); - + AST_Decl *look_in_inherited_local (Identifier *e, bool full_def_only = false); @@ -146,11 +146,11 @@ public: // a primary key. Overridden for valuetype, struct, sequence, // union, array, typedef, and interface. virtual bool legal_for_primary_key (void) const; - + virtual AST_Decl *special_lookup (UTL_ScopedName *e, bool full_def_only); - - /// Accessors for the members. + + /// Accessors for the members. AST_Interface *ami_handler (void) const; void ami_handler (AST_Interface *handler); AST_Interface *ami4ccm_uses (void) const; @@ -201,12 +201,12 @@ protected: // Are we the equivalent interface of a home? bool home_equiv_; - + // The forward declaration we may have been created from. AST_InterfaceFwd *fwd_decl_; - + // Must keep these base interface placeholders in a separate - // container, so they can be destroyed. Iterating over + // container, so they can be destroyed. Iterating over // pd_inherits won't work because the real interfaces will // probably already be destroyed and the pointers will be // garbage. @@ -214,7 +214,7 @@ protected: /// Do we have both abstract and concrete parents? int has_mixed_parentage_; - + /// Store here for quick retrieval without an AST lookup. AST_Interface *ami_handler_; AST_Interface *ami4ccm_uses_; diff --git a/TAO/TAO_IDL/include/ast_interface_fwd.h b/TAO/TAO_IDL/include/ast_interface_fwd.h index 91e9591d7dc..887bcd68777 100644 --- a/TAO/TAO_IDL/include/ast_interface_fwd.h +++ b/TAO/TAO_IDL/include/ast_interface_fwd.h @@ -89,7 +89,7 @@ public: virtual bool is_local (void); virtual bool is_valuetype (void); virtual bool is_abstract_valuetype (void); - + bool full_def_seen (void); // Cleanup function. @@ -118,7 +118,7 @@ public: private: AST_Interface *pd_full_definition; // The interface this is a forward declaration of. - + bool is_defined_; // Checking the member above isn't good enough. }; diff --git a/TAO/TAO_IDL/include/ast_mirror_port.h b/TAO/TAO_IDL/include/ast_mirror_port.h index 60d926ecc33..9f2a280c6af 100644 --- a/TAO/TAO_IDL/include/ast_mirror_port.h +++ b/TAO/TAO_IDL/include/ast_mirror_port.h @@ -15,7 +15,7 @@ public: AST_PortType *porttype_ref); virtual ~AST_Mirror_Port (void); - + // Cleanup function. virtual void destroy (void); diff --git a/TAO/TAO_IDL/include/ast_module.h b/TAO/TAO_IDL/include/ast_module.h index 91c6b48ea5a..bb743d0f5bf 100644 --- a/TAO/TAO_IDL/include/ast_module.h +++ b/TAO/TAO_IDL/include/ast_module.h @@ -132,7 +132,7 @@ public: // Visiting. virtual int ast_accept (ast_visitor *visitor); - + // Accessors for the member. AST_Template_Module_Inst *from_inst (void) const; void from_inst (AST_Template_Module_Inst *node); diff --git a/TAO/TAO_IDL/include/ast_native.h b/TAO/TAO_IDL/include/ast_native.h index 7b831c8f419..cf3ff280d92 100644 --- a/TAO/TAO_IDL/include/ast_native.h +++ b/TAO/TAO_IDL/include/ast_native.h @@ -6,7 +6,7 @@ #include "ast_exception.h" -// Representation of "native" IDL type. It may be used as a +// Representation of "native" IDL type. It may be used as a // return type, parameter type, or in an operation's // exception list. This last usage creates special problems // with both syntax checking and code generation. Letting @@ -18,7 +18,7 @@ public: AST_Native (UTL_ScopedName *n); virtual ~AST_Native (void); - + // Cleanup. virtual void destroy (void); diff --git a/TAO/TAO_IDL/include/ast_porttype.h b/TAO/TAO_IDL/include/ast_porttype.h index a4ae64ffc2b..7b810151039 100644 --- a/TAO/TAO_IDL/include/ast_porttype.h +++ b/TAO/TAO_IDL/include/ast_porttype.h @@ -37,12 +37,12 @@ public: virtual int ast_accept (ast_visitor *visitor); static AST_Decl::NodeType const NT; - + protected: virtual AST_Provides *fe_add_provides (AST_Provides *p); virtual AST_Uses *fe_add_uses (AST_Uses *p); - + virtual AST_Attribute *fe_add_attribute (AST_Attribute *a); }; diff --git a/TAO/TAO_IDL/include/ast_publishes.h b/TAO/TAO_IDL/include/ast_publishes.h index a6208a1f59f..483c59ad755 100644 --- a/TAO/TAO_IDL/include/ast_publishes.h +++ b/TAO/TAO_IDL/include/ast_publishes.h @@ -13,9 +13,9 @@ class TAO_IDL_FE_Export AST_Publishes : public virtual AST_Field public: AST_Publishes (UTL_ScopedName *n, AST_Type *publishes_type); - + virtual ~AST_Publishes (void); - + // Data Accessor. AST_Type *publishes_type (void) const; @@ -27,7 +27,7 @@ public: // Visiting. virtual int ast_accept (ast_visitor *visitor); - + // Cleanup. virtual void destroy (void); diff --git a/TAO/TAO_IDL/include/ast_sequence.h b/TAO/TAO_IDL/include/ast_sequence.h index f0a9e7dfedb..dee65422b5e 100644 --- a/TAO/TAO_IDL/include/ast_sequence.h +++ b/TAO/TAO_IDL/include/ast_sequence.h @@ -99,11 +99,11 @@ public: // a primary key. Overridden for valuetype, struct, sequence, // union, array, typedef, and interface. virtual bool legal_for_primary_key (void) const; - + // Is the element type a forward declared struct or union // that hasn't yet been fully defined? virtual bool is_defined (void); - + // Cleanup method. virtual void destroy (void); @@ -129,7 +129,7 @@ private: bool unbounded_; // Whether we are bounded or unbounded. - + bool owns_base_type_; // If our base type is anonymous array or sequence, we're // responsible for destroying it. diff --git a/TAO/TAO_IDL/include/ast_structure.h b/TAO/TAO_IDL/include/ast_structure.h index 7539b64c5a7..e61c09fb52e 100644 --- a/TAO/TAO_IDL/include/ast_structure.h +++ b/TAO/TAO_IDL/include/ast_structure.h @@ -137,7 +137,7 @@ public: // a primary key. Overridden for valuetype, struct, sequence, // union, array, typedef, and interface. virtual bool legal_for_primary_key (void) const; - + // Accessors for the member. AST_StructureFwd *fwd_decl (void) const; void fwd_decl (AST_StructureFwd *node); @@ -150,7 +150,7 @@ public: // Visiting. virtual int ast_accept (ast_visitor *visitor); - + // Accessor for the member. ACE_Unbounded_Queue<AST_Field *> &fields (void); @@ -188,7 +188,7 @@ private: int local_struct_; // We also need to determine whether we contain any local type. - + AST_StructureFwd *fwd_decl_; // The forward declaration we may have been created from. }; diff --git a/TAO/TAO_IDL/include/ast_structure_fwd.h b/TAO/TAO_IDL/include/ast_structure_fwd.h index 6315e24ce2e..25bfbbdcaa5 100644 --- a/TAO/TAO_IDL/include/ast_structure_fwd.h +++ b/TAO/TAO_IDL/include/ast_structure_fwd.h @@ -49,7 +49,7 @@ public: private: AST_Structure *pd_full_definition; // The structure this is a forward declaration of. - + bool is_defined_; // Checking the member above isn't good enough. }; diff --git a/TAO/TAO_IDL/include/ast_template_module.h b/TAO/TAO_IDL/include/ast_template_module.h index 41a51e9fda1..d271accf7c8 100644 --- a/TAO/TAO_IDL/include/ast_template_module.h +++ b/TAO/TAO_IDL/include/ast_template_module.h @@ -21,10 +21,10 @@ public: FE_Utils::T_PARAMLIST_INFO * template_params (void) const; - + // Checks for errors in the template args of an instantiation. bool match_arg_names (FE_Utils::T_ARGLIST *args); - + // Checks for errors in the template param refs of an alias. bool match_param_refs (UTL_StrList *refs, UTL_Scope *decl_scope); @@ -50,15 +50,15 @@ public: protected: FE_Utils::T_PARAMLIST_INFO * template_params_; - + private: // Match with a template arg. bool match_one_param (FE_Utils::T_Param_Info *param, AST_Decl *d); - - // Find one of our params by name. + + // Find one of our params by name. FE_Utils::T_Param_Info *find_param (UTL_String *name); - + // Match a param with an aliased id by type. bool match_param_by_type (FE_Utils::T_Param_Info *param); }; diff --git a/TAO/TAO_IDL/include/ast_template_module_inst.h b/TAO/TAO_IDL/include/ast_template_module_inst.h index ebe5e3c0d6c..ee4161be9d0 100644 --- a/TAO/TAO_IDL/include/ast_template_module_inst.h +++ b/TAO/TAO_IDL/include/ast_template_module_inst.h @@ -18,18 +18,18 @@ public: FE_Utils::T_ARGLIST *template_args); virtual ~AST_Template_Module_Inst (void); - + AST_Template_Module *ref (void) const; FE_Utils::T_ARGLIST * template_args (void) const; - + // Narrowing. DEF_NARROW_FROM_DECL (AST_Template_Module_Inst); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); - + // Cleanup function. virtual void destroy (void); @@ -37,7 +37,7 @@ public: virtual int ast_accept (ast_visitor *visitor); static AST_Decl::NodeType const NT; - + private: FE_Utils::T_ARGLIST * template_args_; }; diff --git a/TAO/TAO_IDL/include/ast_union.h b/TAO/TAO_IDL/include/ast_union.h index 9be71f68e60..fb2927c4760 100644 --- a/TAO/TAO_IDL/include/ast_union.h +++ b/TAO/TAO_IDL/include/ast_union.h @@ -145,7 +145,7 @@ protected: virtual AST_UnionBranch *fe_add_union_branch (AST_UnionBranch *b); // Moved out of private section so it can be called from subclass. - + private: // Data. @@ -174,7 +174,7 @@ private: friend int tao_yyparse (void); friend class ast_visitor_tmpl_module_inst; - + // Scope Management Protocol. virtual AST_Union *fe_add_union (AST_Union *u); diff --git a/TAO/TAO_IDL/include/ast_union_branch.h b/TAO/TAO_IDL/include/ast_union_branch.h index 55f74848e89..3310ffb4238 100644 --- a/TAO/TAO_IDL/include/ast_union_branch.h +++ b/TAO/TAO_IDL/include/ast_union_branch.h @@ -88,15 +88,15 @@ public: virtual ~AST_UnionBranch (void); UTL_LabelList *labels (void) const; - + AST_UnionLabel *label (unsigned long index = 0); unsigned long label_list_length (void); - + // Called if our labels are enum values - adds them to the // enclosing scope's name_referenced list. void add_labels (AST_Union *u); - + // Integer literals create a ulonglong AST_Expression. If // our union's discriminator type is some other kind of // integer, and we have more than one label, only the first @@ -113,7 +113,7 @@ public: // Visiting. virtual int ast_accept (ast_visitor *visitor); - + // Cleanup. virtual void destroy (void); diff --git a/TAO/TAO_IDL/include/ast_union_label.h b/TAO/TAO_IDL/include/ast_union_label.h index ac25a7ca945..33df6970673 100644 --- a/TAO/TAO_IDL/include/ast_union_label.h +++ b/TAO/TAO_IDL/include/ast_union_label.h @@ -82,7 +82,7 @@ public: enum UnionLabel { UL_default - , UL_label + , UL_label }; AST_UnionLabel (UnionLabel lk, @@ -99,7 +99,7 @@ public: // Visiting. virtual int ast_accept (ast_visitor *visitor); - + // Cleanup. virtual void destroy (void); diff --git a/TAO/TAO_IDL/include/ast_uses.h b/TAO/TAO_IDL/include/ast_uses.h index 0d3b7f00eba..5de26d74997 100644 --- a/TAO/TAO_IDL/include/ast_uses.h +++ b/TAO/TAO_IDL/include/ast_uses.h @@ -12,9 +12,9 @@ public: AST_Uses (UTL_ScopedName *n, AST_Type *uses_type, bool is_multiple); - + virtual ~AST_Uses (void); - + // Data Accessors. AST_Type *uses_type (void) const; bool is_multiple (void) const; @@ -27,12 +27,12 @@ public: // Visiting. virtual int ast_accept (ast_visitor *visitor); - + // Cleanup. virtual void destroy (void); static AST_Decl::NodeType const NT; - + private: bool is_multiple_; }; diff --git a/TAO/TAO_IDL/include/ast_valuebox.h b/TAO/TAO_IDL/include/ast_valuebox.h index 450d42c29b6..77213527a0b 100644 --- a/TAO/TAO_IDL/include/ast_valuebox.h +++ b/TAO/TAO_IDL/include/ast_valuebox.h @@ -11,12 +11,12 @@ class TAO_IDL_FE_Export AST_ValueBox : public virtual AST_ConcreteType public: AST_ValueBox (UTL_ScopedName *n, AST_Type *boxed_type); - + virtual ~AST_ValueBox (void); // Data Accessors. AST_Type *boxed_type (void) const; - + // Narrowing. DEF_NARROW_FROM_DECL(AST_ValueBox); @@ -25,7 +25,7 @@ public: // Visiting. virtual int ast_accept (ast_visitor *visitor); - + // Cleanup. virtual void destroy (void); diff --git a/TAO/TAO_IDL/include/ast_valuetype.h b/TAO/TAO_IDL/include/ast_valuetype.h index 35ea20f10ae..44e880ec3f9 100644 --- a/TAO/TAO_IDL/include/ast_valuetype.h +++ b/TAO/TAO_IDL/include/ast_valuetype.h @@ -48,7 +48,7 @@ public: // Look up a scoped name in the supported interface list. virtual AST_Decl *look_in_supported (UTL_ScopedName *, bool full_def_only); - + // Overridden for valuetype from UTL_Scope method. virtual AST_Decl *special_lookup (UTL_ScopedName *, bool full_def_only); diff --git a/TAO/TAO_IDL/include/ast_visitor.h b/TAO/TAO_IDL/include/ast_visitor.h index ceb9ef5a7b8..fdad96a9445 100644 --- a/TAO/TAO_IDL/include/ast_visitor.h +++ b/TAO/TAO_IDL/include/ast_visitor.h @@ -139,7 +139,7 @@ public: virtual int visit_root (AST_Root *node) = 0; virtual int visit_native (AST_Native *node) = 0; virtual int visit_valuebox (AST_ValueBox *node) = 0; - + protected: // For abstract class. ast_visitor (void); diff --git a/TAO/TAO_IDL/include/ast_visitor_context.h b/TAO/TAO_IDL/include/ast_visitor_context.h index dbab0020f3a..88e4f12d29b 100644 --- a/TAO/TAO_IDL/include/ast_visitor_context.h +++ b/TAO/TAO_IDL/include/ast_visitor_context.h @@ -36,11 +36,11 @@ public: FE_Utils::T_PARAMLIST_INFO *template_params (void) const; void template_params (FE_Utils::T_PARAMLIST_INFO *args); - + FE_Utils::T_ARGLIST *template_args (void) const; void template_args (FE_Utils::T_ARGLIST *args); -protected: +protected: // Storage for the current template module params and args. FE_Utils::T_PARAMLIST_INFO *template_params_; FE_Utils::T_ARGLIST *template_args_; diff --git a/TAO/TAO_IDL/include/ast_visitor_tmpl_module_inst.h b/TAO/TAO_IDL/include/ast_visitor_tmpl_module_inst.h index fbe95c55a63..5997ac5c44f 100644 --- a/TAO/TAO_IDL/include/ast_visitor_tmpl_module_inst.h +++ b/TAO/TAO_IDL/include/ast_visitor_tmpl_module_inst.h @@ -94,32 +94,32 @@ public: virtual int visit_field (AST_Field *node); virtual int visit_factory (AST_Factory *node); virtual int visit_finder (AST_Finder *node); - + private: // If arg is a param holder, return the matching template arg, // otherwise return arg unchanged. If the arg is declared in // the scope of a template module, the returned node will be a // copy created in the scope of the template module instantiation. AST_Decl *reify_type (AST_Decl *d); - + // Utility method used for attributes and operations. UTL_ExceptList *reify_exception_list (UTL_ExceptList *orig); - + // Utility method to create a NameList from a list of inherited // or supported types that may contain a template param ref. UTL_NameList *create_name_list (AST_Type **list, long length); - + private: ast_visitor_context *ctx_; // Flag to branch in visit_valuetype() where we create an // eventtype or a valuetype. bool for_eventtype_; - + // Flag to branch in visit_factory() where we create a // finder or a factory. bool for_finder_; - + // Flag to short_circuit reifying if we are the base class of // ast_visitor_tmpl_module_ref. bool ref_only_; diff --git a/TAO/TAO_IDL/include/fe_home_header.h b/TAO/TAO_IDL/include/fe_home_header.h index ea5b5eeed90..7f276821639 100644 --- a/TAO/TAO_IDL/include/fe_home_header.h +++ b/TAO/TAO_IDL/include/fe_home_header.h @@ -24,7 +24,7 @@ public: UTL_NameList *supports, UTL_ScopedName *managed_component, UTL_ScopedName *primary_key); - + virtual ~FE_HomeHeader (void); // Data Accessors. diff --git a/TAO/TAO_IDL/include/fe_interface_header.h b/TAO/TAO_IDL/include/fe_interface_header.h index c56843d00ec..2e332ddd936 100644 --- a/TAO/TAO_IDL/include/fe_interface_header.h +++ b/TAO/TAO_IDL/include/fe_interface_header.h @@ -122,9 +122,9 @@ protected: void add_inheritance_flat (AST_Interface *i); bool already_seen (AST_Type *ip); bool already_seen_flat (AST_Interface *ip); - + void install_in_header (void); - + void destroy_flat_arrays (void); // Data. diff --git a/TAO/TAO_IDL/include/fe_obv_header.h b/TAO/TAO_IDL/include/fe_obv_header.h index 78ac265ca17..ed3b71c4886 100644 --- a/TAO/TAO_IDL/include/fe_obv_header.h +++ b/TAO/TAO_IDL/include/fe_obv_header.h @@ -28,7 +28,7 @@ public: AST_Type *inherits_concrete (void) const; AST_Type *supports_concrete (void) const; bool truncatable (void) const; - + virtual void destroy (void); // Destroy anything allocated for this class. diff --git a/TAO/TAO_IDL/include/fe_private.h b/TAO/TAO_IDL/include/fe_private.h index 0c975ff65b2..0c7e88b53c3 100644 --- a/TAO/TAO_IDL/include/fe_private.h +++ b/TAO/TAO_IDL/include/fe_private.h @@ -82,10 +82,10 @@ class TAO_IDL_FE_Export TAO_IDL_CPP_Keyword_Table // Define a table that provides the lookup for the C++ // keyword. The lookup uses a perfect hash function private: - unsigned int hash (const char *str, + unsigned int hash (const char *str, unsigned int len); public: - const TAO_IDL_CPP_Keyword_Entry *lookup (const char *str, + const TAO_IDL_CPP_Keyword_Entry *lookup (const char *str, unsigned int len); }; diff --git a/TAO/TAO_IDL/include/fe_utils.h b/TAO/TAO_IDL/include/fe_utils.h index 3abce8470f7..a021f2610c7 100644 --- a/TAO/TAO_IDL/include/fe_utils.h +++ b/TAO/TAO_IDL/include/fe_utils.h @@ -65,7 +65,7 @@ struct TAO_IDL_FE_Export FE_Utils create_uses_multiple_stuff (AST_Component *c, AST_Uses *u, const char *prefix = ""); - + /// For the executor IDL file, when a pragma ciao ami receptacle /// name is multiplex. static void @@ -94,7 +94,7 @@ struct TAO_IDL_FE_Export FE_Utils static bool is_include_file_found (ACE_CString & inc_file, UTL_String * idl_file_name); - + /// Validate the included idl files, somefiles might have been /// ignored by the preprocessor. static void @@ -107,14 +107,14 @@ struct TAO_IDL_FE_Export FE_Utils /// Strips _cxx_ prefix for use in port names. static void original_local_name (Identifier *local_name); - + /// Types, constants and exceptions can be redefined in /// derived interfaces, modules may be reopened, forward /// declarations may be repeated, etc. static bool can_be_redefined (AST_Decl *prev_dec, AST_Decl *curr_decl); - + private: static bool check_one_seq_of_param (FE_Utils::T_PARAMLIST_INFO *list, diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h index 00c0b456cd5..3ed04d27d14 100644 --- a/TAO/TAO_IDL/include/idl_global.h +++ b/TAO/TAO_IDL/include/idl_global.h @@ -437,13 +437,13 @@ public: // = Types & methods supporting DDS DCPS data type/key definition (from #pragma) typedef ACE_Unbounded_Queue<ACE_TString> DCPS_Key_List; - + struct DCPS_Data_Type_Info { UTL_ScopedName *name_; DCPS_Key_List key_list_; }; - + typedef ACE_Unbounded_Queue_Iterator<ACE_TString> DCPS_Data_Type_Info_Iter; typedef ACE_Hash_Map_Manager_Ex< const char*, @@ -455,22 +455,22 @@ public: // FE calls when #pragma DCPS_DATA_TYPE is processed void add_dcps_data_type (const char* id); - + // FE calls when #pragma DCPS_DATA_KEY is processed bool add_dcps_data_key (const char* id, const char* key); - + // returns null if not matching; otherwise pointer to the info DCPS_Data_Type_Info* is_dcps_type (UTL_ScopedName* target); - + // FE calls when #pragma DCPS_SUPPORT_ZERO_COPY_READ is processed void dcps_support_zero_copy_read (bool value); - + // BE calls to check the status of zero-copy read support bool dcps_support_zero_copy_read (void) const; - + // FE calls when #pragma DCPS_GEN_ZERO_COPY_READ is processed void dcps_gen_zero_copy_read (bool value); - + // BE calls to check the status of zero-copy read support bool dcps_gen_zero_copy_read (void) const; @@ -607,7 +607,7 @@ public: void add_ciao_oci_ts_file_names (const char *s); ACE_Unbounded_Queue<char *> & ciao_oci_ts_file_names (void); // Accessor/mutator for the ciao_oci_ts_file_names_ member. - + void add_ciao_ami_iface_names (const char *s); ACE_Unbounded_Queue<char *> & ciao_ami_iface_names (void); // Accessor/mutator for the ciao_ami_iface_names_ member. @@ -615,25 +615,25 @@ public: void add_ciao_ami_recep_names (const char *s); ACE_Unbounded_Queue<char *> & ciao_ami_recep_names (void); // Accessor/mutator for the ciao_ami_recep_names_ member. - + void add_included_ami_recep_names (const char *s); ACE_Unbounded_Queue<char *> & included_ami_recep_names (void); // Accessor/mutator for the included_ami_recep_names_ member. - + bool included_ami_receps_done (void) const; void included_ami_receps_done (bool val); - + void add_ciao_ami_idl_fnames (const char *s); ACE_Unbounded_Queue<char *> & ciao_ami_idl_fnames (void); // Accessor/mutator for the included_ami_idl_fnames_ member. - + void add_dds4ccm_impl_fnames (const char *s); ACE_Unbounded_Queue<char *> & dds4ccm_impl_fnames (void); // Accessor mutator for the dds4ccm_impl_fnames_ member. - + ACE_Unbounded_Queue<AST_Decl *> & masking_scopes (void); // Accessor for the member - + ACE_Unbounded_Queue<AST_Interface *> & mixed_parentage_interfaces (void); // Accessor for the member @@ -706,10 +706,10 @@ public: Unbounded_Paths_Queue; typedef ACE_Unbounded_Queue_Iterator<Include_Path_Info> Unbounded_Paths_Queue_Iterator; - + Unbounded_Paths_Queue &include_paths (void); // Accessor for the member. - + enum ANON_TYPE_DIAGNOSTIC { ANON_TYPE_ERROR, @@ -718,15 +718,15 @@ public: }; // Determines which type of diagnostic to emit, if any, upon // detecting the presence of an anonymous IDL construct. - + void anon_type_diagnostic (ANON_TYPE_DIAGNOSTIC val); // Mutator for the member. - - bool anon_error (void) const; + + bool anon_error (void) const; bool anon_warning (void) const; bool anon_silent (void) const; // Simple checks for the value of anon_type_diagnostic_. - + bool in_typedef (void) const; void in_typedef (bool val); // Accessors for the member. @@ -863,41 +863,41 @@ private: ACE_Unbounded_Queue<char *> ciao_oci_ts_file_names_; // Files parsed with OpenDDS typesupport pragma - + ACE_Unbounded_Queue<char *> ciao_ami_iface_names_; // Interfaces that get a reply handler generated for AMI4CCM. - + ACE_Unbounded_Queue<char *> ciao_ami_recep_names_; // Receptacles that get a sendc_ version added for AMI4CCM. - + ACE_Unbounded_Queue<char *> included_ami_recep_names_; // We need to do something different with these... - + bool included_ami_receps_done_; // ...but we need to do it only once. - + ACE_Unbounded_Queue<char *> ciao_ami_idl_fnames_; // Stores directives from #pragma ciao ami4ccm idl "xxx". - + ACE_Unbounded_Queue<char *> dds4ccm_impl_fnames_; // Stores directives from #pragma dds4ccm impl "xxx". - + ACE_Unbounded_Queue<AST_Decl *> masking_scopes_; // Used to check for an incorrect lookup success that should // have been masked by an inner scope of the same name. - + /** * Used in the generation of overrides for CORBA::release and * CORBA::is_nil, needed when the interface inherits versions from * both CORBA::Object and CORBA::AbstractBase. */ ACE_Unbounded_Queue<AST_Interface *> mixed_parentage_interfaces_; - + /// For quick access. AST_Module *corba_module_; - + ANON_TYPE_DIAGNOSTIC anon_type_diagnostic_; - + /// Flag set in parser so we can decide whether to emit /// an anonymous type diagnostic. bool in_typedef_; diff --git a/TAO/TAO_IDL/include/utl_decllist.h b/TAO/TAO_IDL/include/utl_decllist.h index 45492f4dce7..7f0ead854c7 100644 --- a/TAO/TAO_IDL/include/utl_decllist.h +++ b/TAO/TAO_IDL/include/utl_decllist.h @@ -86,7 +86,7 @@ public: // Operations // Constructor(s) - UTL_DeclList (FE_Declarator *s, + UTL_DeclList (FE_Declarator *s, UTL_DeclList *cdr); // Get element diff --git a/TAO/TAO_IDL/include/utl_err.h b/TAO/TAO_IDL/include/utl_err.h index 1c7ac5d3f9b..b4983a4208c 100644 --- a/TAO/TAO_IDL/include/utl_err.h +++ b/TAO/TAO_IDL/include/utl_err.h @@ -364,18 +364,18 @@ public: // Referenced template parameter not matched in param list. void mismatched_template_param (const char *name); - + // Given a template param of the form 'sequence<T>', the // 'T' must match a previous param in the list. void mismatch_seq_of_param (const char *param_id); - + // Informative message when a lookup fails because a // masking scope has not been correctly differentiated // in the scoped name from the scope it masks. void scope_masking_error (AST_Decl *masked, AST_Decl *loc); - - // Error (default) or warning (set by command line option). + + // Error (default) or warning (set by command line option). void anonymous_type_diagnostic (void); }; diff --git a/TAO/TAO_IDL/include/utl_exceptlist.h b/TAO/TAO_IDL/include/utl_exceptlist.h index 5598f08c8c9..53e935571f4 100644 --- a/TAO/TAO_IDL/include/utl_exceptlist.h +++ b/TAO/TAO_IDL/include/utl_exceptlist.h @@ -82,15 +82,15 @@ class AST_Type; class TAO_IDL_FE_Export UTL_ExceptList : public UTL_List { public: - UTL_ExceptList (AST_Type *s, + UTL_ExceptList (AST_Type *s, UTL_ExceptList *cdr); // Get list item. AST_Type *head (void); - + // Cleanup. virtual void destroy (void); - + // Copies the UTL_ExceptList pointers but not the // contained AST_Exceptions. virtual UTL_ExceptList *copy (void); diff --git a/TAO/TAO_IDL/include/utl_exprlist.h b/TAO/TAO_IDL/include/utl_exprlist.h index 4b8108bbb58..4220a0e9008 100644 --- a/TAO/TAO_IDL/include/utl_exprlist.h +++ b/TAO/TAO_IDL/include/utl_exprlist.h @@ -82,7 +82,7 @@ class AST_Expression; class TAO_IDL_FE_Export UTL_ExprList : public UTL_List { public: - UTL_ExprList (AST_Expression *s, + UTL_ExprList (AST_Expression *s, UTL_ExprList *cdr); // Get list item. diff --git a/TAO/TAO_IDL/include/utl_labellist.h b/TAO/TAO_IDL/include/utl_labellist.h index 1c365b59cfb..24e5c76e9ed 100644 --- a/TAO/TAO_IDL/include/utl_labellist.h +++ b/TAO/TAO_IDL/include/utl_labellist.h @@ -82,15 +82,15 @@ class AST_UnionLabel; class TAO_IDL_FE_Export UTL_LabelList : public UTL_List { public: - UTL_LabelList (AST_UnionLabel *s, + UTL_LabelList (AST_UnionLabel *s, UTL_LabelList *cdr); // Get list item. AST_UnionLabel *head (void); - + // Override of base class method. virtual UTL_LabelList *copy (void); - + // Cleanup. virtual void destroy (void); diff --git a/TAO/TAO_IDL/include/utl_namelist.h b/TAO/TAO_IDL/include/utl_namelist.h index 275e442f47b..e36ac200319 100644 --- a/TAO/TAO_IDL/include/utl_namelist.h +++ b/TAO/TAO_IDL/include/utl_namelist.h @@ -89,7 +89,7 @@ public: // Accessors. bool truncatable (void) const; void truncatable (bool val); - + // Cleanup. virtual void destroy (void); diff --git a/TAO/TAO_IDL/include/utl_scope.h b/TAO/TAO_IDL/include/utl_scope.h index 82886e43d20..39e77fc1c6a 100644 --- a/TAO/TAO_IDL/include/utl_scope.h +++ b/TAO/TAO_IDL/include/utl_scope.h @@ -179,7 +179,7 @@ public: AST_Decl *lookup_by_name (UTL_ScopedName *, bool full_def_only = false, bool for_add = true); - + AST_Decl *lookup_by_name_r (UTL_ScopedName *, bool full_def_only); @@ -195,9 +195,9 @@ public: virtual AST_Decl *look_in_prev_mods_local (Identifier *e, bool ignore_fwd = false); - + // A no-op here, overridden for types like interface - // (look_in_inherited), modules (look_in_prev_mods) etc. + // (look_in_inherited), modules (look_in_prev_mods) etc. virtual AST_Decl *special_lookup (UTL_ScopedName *e, bool ful_def_only); @@ -206,10 +206,10 @@ public: // If the Identifier string (from the scoped name which has been // already determined to be of length 1) matches a param, - // create and return a param holder AST node, otherwise + // create and return a param holder AST node, otherwise // return 0. static AST_Param_Holder *match_param (UTL_ScopedName *e); - + // Add to decls. Node represents a local declaration // The new decl e is inserted after ex if ex is not 0. // This one is public because the case of a reopened @@ -284,7 +284,7 @@ protected: void check_for_predef_seq (AST_Decl *d); // Set the appropriate *_seen_ flag if we are seeing a spec-defined // sequence of a basic type. - + protected: // Data. @@ -316,7 +316,7 @@ protected: // Have we seen a #pragma prefix declaration in this scope? bool has_prefix_; - + // Used in lookup of various CORBA pseudo objects, which also // determines generation of specific #include headers. enum WHICH_PSEUDO @@ -326,37 +326,37 @@ protected: PSEUDO_VALUEBASE, PSEUDO_ABSTRACTBASE }; - + WHICH_PSEUDO which_pseudo_; - + public: /// Scope Management Protocol. - + /// Common code for most basic adding action. AST_Decl *fe_add_decl (AST_Decl *d); - + /// Specialized for types that reference another type. AST_Field *fe_add_ref_decl (AST_Field *d); - + template<typename DECL> DECL *fe_add_full_intf_decl (DECL *t); - + template<typename FULL_DECL> typename FULL_DECL::FWD_TYPE *fe_add_fwd_intf_decl ( typename FULL_DECL::FWD_TYPE *t); - + AST_Structure *fe_add_full_struct_type (AST_Structure *t); AST_StructureFwd *fe_add_fwd_struct_type (AST_StructureFwd *t); - + /// No-op base class version of the specialized adding actions. - + virtual AST_PredefinedType *fe_add_predefined_type ( AST_PredefinedType *t); virtual AST_Module *fe_add_module (AST_Module *m); - + virtual AST_Template_Module_Inst *fe_add_template_module_inst ( AST_Template_Module_Inst *m); @@ -457,7 +457,7 @@ public: virtual AST_Factory *fe_add_factory (AST_Factory *f); - + virtual AST_Finder *fe_add_finder (AST_Finder *f); @@ -487,7 +487,7 @@ public: virtual AST_Mirror_Port *fe_add_mirror_port (AST_Mirror_Port *mp); - + protected: /// Quick check on the head of a name to see if it's global. bool is_global_name (Identifier *i); @@ -497,11 +497,11 @@ private: /// (and its subtypes) and operations respectively. bool inherited_op_attr_clash (AST_Decl *t); bool arg_specific_error (AST_Decl *t); - + /// Encapsulates the vagaries of adding fields vs decls to /// structs/unions vs other types. void smart_local_add (AST_Decl *t); - + /// Helper function for lookup_by_name(). Iterates doing local /// lookups of subsequent components of a scoped name. AST_Decl * diff --git a/TAO/TAO_IDL/include/utl_strlist.h b/TAO/TAO_IDL/include/utl_strlist.h index a00d3f15325..1229cbe1a00 100644 --- a/TAO/TAO_IDL/include/utl_strlist.h +++ b/TAO/TAO_IDL/include/utl_strlist.h @@ -83,7 +83,7 @@ class UTL_String; class TAO_IDL_FE_Export UTL_StrList : public UTL_List { public: - UTL_StrList (UTL_String *s, + UTL_StrList (UTL_String *s, UTL_StrList *cdr); virtual ~UTL_StrList (void); diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.h b/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.h index fddf03be3a2..9b840d93e78 100644 --- a/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.h +++ b/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.h @@ -66,7 +66,7 @@ public: * Return the StockQuoter object. * * @return Returns the StockQuoter object reference that has been - * created by connect_quoter_info (). + * created by connect_quoter_info (). */ virtual ::Stock::StockQuoter_ptr get_connection_quoter_info (); @@ -74,11 +74,11 @@ public: * Shutdown the object and destroy the application. */ virtual void shutdown (); - + private: // Cached ORB pointer CORBA::ORB_var orb_; - + /// A StockQuoter object reference that is used to get detailed /// stock information. Stock::StockQuoter_var quoter_; @@ -86,7 +86,7 @@ private: /// A StockNameConsumer servant that is used to get notification of /// updates. Stock_StockNameConsumer_i *consumer_; - + /// The distributor that we are registered with, useful for shutdown. Stock::StockDistributor_var distributor_; }; @@ -97,12 +97,12 @@ private: */ class Stock_StockBrokerHome_i : public virtual POA_Stock::StockBrokerHome, - public ACE_Event_Handler + public ACE_Event_Handler { public: /** * Constructor. - * Register the necessary factories and mappings with the specified orb and + * Register the necessary factories and mappings with the specified orb and * Create a new instance of the StockBroker object. * * @param orb @@ -127,7 +127,7 @@ public: private: /// The StockDistributor object created by its home. Stock::StockBroker_var broker_; - + /// Cache a reference to the ORB. CORBA::ORB_var orb_; }; diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.h b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.h index 888727905b6..42cf2eda881 100644 --- a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.h +++ b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.h @@ -48,20 +48,20 @@ public: virtual ~StockDistributor_i (void); /** - * Insert StockNameConsumer object and its priority into the StockDistributor + * Insert StockNameConsumer object and its priority into the StockDistributor * object's subscribers' map. * - * @param c The StockNameConsumer object to be inserted into the StockDistributor + * @param c The StockNameConsumer object to be inserted into the StockDistributor * object's subscribers' map. * @param priority The priority of the StockNameConsumer object. * @return A Cookie object that records this subscription. */ - virtual ::Stock::Cookie * subscribe_notifier (::Stock::StockNameConsumer_ptr c, + virtual ::Stock::Cookie * subscribe_notifier (::Stock::StockNameConsumer_ptr c, ::RTCORBA::Priority priority); /** * Erase the StockNameConsumer object from the StockDistributor object's subscribers' map. - * + * * @param ck The Cookie object that records the subscription. * @param The reference of the StockNameConsumer object that has been erased. */ @@ -89,7 +89,7 @@ public: virtual void notification_rate (::CORBA::Long notification_rate); /** - * Set the active state of the StockDistributor object to true and create a thread + * Set the active state of the StockDistributor object to true and create a thread * to publish the stock information to the Stock Broker clients. */ virtual void start (void); @@ -98,14 +98,14 @@ public: * Set the active state of StockDistributor object to false. */ virtual void stop (void); - + virtual void shutdown (); - + /// Callback for stock database. void operator () (std::vector <std::string> &stocks); - + int svn (void); - + /// The map that stores the subscribed StockNameConsumer object. typedef std::map <std::string, std::pair <Stock::StockNameConsumer_var, @@ -122,7 +122,7 @@ private: /// The active state of the StockDistributor object. bool active_; - + /// Cache a copy of the RTCORBA::POA. RTPortableServer::POA_var rt_poa_; @@ -164,7 +164,7 @@ class StockDistributorHome_i public: /** * Constructor. - * Register the necessary factories and mappings with the specified orb and + * Register the necessary factories and mappings with the specified orb and * Create a new instance of the StockDistributor object. * * @param orb @@ -176,23 +176,23 @@ public: /** * Return the StockDistributor object created by the Constructor. - * + * * @return The StockDistributor object created by the Constructor. */ virtual ::Stock::StockDistributor_ptr create (); - + virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); private: void create_distributor (void); - + /// Cached ORB used to shut down the system CORBA::ORB_var orb_; - + /// Cached POA created during object construction RTPortableServer::POA_var rt_poa_; - + /// The StockDistributor servant created by its home. PortableServer::ObjectId_var dist_id_; }; diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.h b/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.h index bcaf14b5ac6..02045e1bd37 100644 --- a/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.h +++ b/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.h @@ -30,12 +30,12 @@ class Stock_StockBroker_i; /** * @class Stock_StockNameConsumer_i - * @brief This class is used as a callback interface used by the + * @brief This class is used as a callback interface used by the * distributor to notify brokers of updates. This class is ALSO used as a * signal handler to catch SIGINT and properly unsubscribe from the * distributor. */ -class Stock_StockNameConsumer_i : +class Stock_StockNameConsumer_i : public virtual POA_Stock::StockNameConsumer { public: @@ -57,7 +57,7 @@ public: * @param the_stockname The name of the stock that will be provided to the context StockBroker object. */ virtual void push_StockName (::Stock::StockNames *the_stockname); - + /** * Get the cookie attribute. * @@ -78,7 +78,7 @@ private: /// Name of the stock to listen to. CORBA::String_var stock_name_; - + Stock::Cookie_var cookie__; }; diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.h b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.h index 1b9aaa75273..705b8a02b1e 100644 --- a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.h +++ b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.h @@ -22,7 +22,7 @@ /** * @class Stock_Database - * @brief This class is used to install, update and publish the information of + * @brief This class is used to install, update and publish the information of * all the stocks. It uses the singleton design pattern. * The parameter type may be any type that has a method called "updated_stocks" and * accepts a std::vector of std::strings as an argument. @@ -39,49 +39,49 @@ public: /// Constructor. /// @param file The name of a file to read initial stocks and values from. Stock_Database (const char *file, u_int rate = 1); - + typedef std::map <std::string, unsigned int> Init_Map; - + /// Constructor /// @param stockmap A map containing stocks and initial values. An initial value /// of 0 will be assigned a random start value. Stock_Database (const Init_Map &stockmap, u_int rate = 0); - + typedef std::string Cookie; - + /** * Register a callback object with the database. The callback object must have * the () operator defined accepting a std::vector of strings as the argument. * @returns A cookie to identify the registration */ Cookie register_callback (CALLBACK &obj); - + /** * Removes a callback from the notification queue. * @returns false if the provided cookie is not found. */ bool remove_callback (const Cookie &); - + /// Raised if an invalid stock name is requested. class Invalid_Stock {}; - + struct StockInfo { StockInfo (void) : name_(""), high_ (0), low_ (0), last_ (0) {}; - + StockInfo (const std::string name) : name_ (name), high_ (0), low_(0), last_(0) {}; - + std::string name_; int high_; int low_; int last_; }; - + /** * Create a StockInfo object stored in the database with the given name. * @@ -89,47 +89,47 @@ public: * @return A StockInfo object. */ StockInfo get_stock_info (const char *name); - + /** * This function is used to calculate the new high, low and last values - * for each stock in the stock database randomly. + * for each stock in the stock database randomly. */ virtual int svc (void); - + /// Change the rate at which database updates are made void update_rate (u_int rate); - + /// Launch the active object void start (void); - + /// Stop the active object void stop (void); - + typedef std::map <std::string, StockInfo> Stock_Map; - + /// This method is not intended to be called by clients of this class, - /// it is public only by necessity. + /// it is public only by necessity. virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); - + typedef std::map <Cookie, CALLBACK *> Callback_Map; private: /// The filname initialized from, if any. const std::string filename_; - + /// Keep track of the stock names and information about them. Stock_Map stock_map_; - + /// Lock to protect concurrent access to the <stock_map_>. ACE_RW_Thread_Mutex lock_; - + /// Rate at which updates are made. u_int rate_; Callback_Map callbacks_; - + bool active_; }; diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h index 4326b43401f..931ba509498 100644 --- a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h +++ b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h @@ -50,7 +50,7 @@ namespace Stock /// Register mapping. static void register_mapping (CORBA::ORB_ptr orb); }; - + } #endif // !defined STOCK_PRIORITYMAPPING_ diff --git a/TAO/examples/Advanced/ch_3/server.h b/TAO/examples/Advanced/ch_3/server.h index a4510fd1637..0df75e405cc 100644 --- a/TAO/examples/Advanced/ch_3/server.h +++ b/TAO/examples/Advanced/ch_3/server.h @@ -23,8 +23,8 @@ #include "timeS.h" -class Time_impl : public virtual POA_Time -{ +class Time_impl : public virtual POA_Time +{ public: virtual TimeOfDay get_gmt (void); }; diff --git a/TAO/examples/Borland/ORBThread.h b/TAO/examples/Borland/ORBThread.h index fb680fcc8fe..8c4e50d6b50 100644 --- a/TAO/examples/Borland/ORBThread.h +++ b/TAO/examples/Borland/ORBThread.h @@ -8,7 +8,7 @@ class PACKAGE TORBThread : public TThread { // Class for running the orb in a separate thread. -public: +public: // = Initialization and termination methods. __fastcall TORBThread (CORBA::ORB_ptr orb); // Constructor. diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.h b/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.h index 2f0aa572f8a..5489c2577a9 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.h +++ b/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.h @@ -21,7 +21,7 @@ class ClientTask : public ACE_Task_Base { public: - ClientTask(Foo_ptr foo, + ClientTask(Foo_ptr foo, Callback_ptr callback); virtual ~ClientTask(); diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.h b/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.h index aec109d9ed6..bc6a5585e4f 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.h +++ b/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.h @@ -21,8 +21,8 @@ class ClientTask : public ACE_Task_Base { public: - ClientTask(CORBA::ORB_ptr orb, - Foo_ptr foo, + ClientTask(CORBA::ORB_ptr orb, + Foo_ptr foo, Callback_ptr callback, bool collocated = false); diff --git a/TAO/examples/Callback_Quoter/Supplier_Timer_Handler.h b/TAO/examples/Callback_Quoter/Supplier_Timer_Handler.h index b359a59e40c..d4baca0d25a 100644 --- a/TAO/examples/Callback_Quoter/Supplier_Timer_Handler.h +++ b/TAO/examples/Callback_Quoter/Supplier_Timer_Handler.h @@ -42,13 +42,13 @@ class Supplier_Timer_Handler : public ACE_Event_Handler // need to be handled, only the handle_timeout method is overlaoded. public: Supplier_Timer_Handler (Supplier *supplier, - ACE_Reactor *reactor, + ACE_Reactor *reactor, FILE *file_ptr); // Initilization. ~Supplier_Timer_Handler (void); // Destructor. - + virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg = 0); // Method which will be called by the Reactor when timeout occurs. @@ -62,7 +62,7 @@ private: // The supplier instance. ACE_Reactor *reactor_; - // Reactor used by the supplier. + // Reactor used by the supplier. FILE* file_ptr_; // The file handle of the file from where the stock input is obtained. diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.h b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.h index 36e26668cd3..28c854c9d70 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.h +++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.h @@ -26,7 +26,7 @@ #include "UDP_i.h" #include "UDPC.h" -class UDP_PerformanceClient +class UDP_PerformanceClient : public ACE_Task_Base { // = TITLE diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.h b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.h index 4404293c69b..64c255f6444 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.h +++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.h @@ -20,7 +20,7 @@ public: int iter, int dist, char *job_name); - + virtual void yield (time_t suspend_time, Thread_Task* task); diff --git a/TAO/examples/Simple/echo/Echo_Client_i.h b/TAO/examples/Simple/echo/Echo_Client_i.h index d09df364357..83a6e3bb063 100644 --- a/TAO/examples/Simple/echo/Echo_Client_i.h +++ b/TAO/examples/Simple/echo/Echo_Client_i.h @@ -13,9 +13,9 @@ // This class implements the interface calls for RMI. // // = AUTHOR -// +// // Balachandran Natarajan <bala@cs.wustl.edu> -// +// // ============================================================================ #ifndef ECHO_CLIENT_I_H diff --git a/TAO/examples/Simple/grid/Grid_Client_i.h b/TAO/examples/Simple/grid/Grid_Client_i.h index 5caab3550ac..44cf36693a0 100644 --- a/TAO/examples/Simple/grid/Grid_Client_i.h +++ b/TAO/examples/Simple/grid/Grid_Client_i.h @@ -14,7 +14,7 @@ // // = AUTHOR // Balachandran Natarajan <bala@cs.wustl.edu> -// +// // ============================================================================ #ifndef GRID_CLIENT_I_H diff --git a/TAO/examples/Simple/time/Time_Client_i.h b/TAO/examples/Simple/time/Time_Client_i.h index f0f6aba59c3..75c84948927 100644 --- a/TAO/examples/Simple/time/Time_Client_i.h +++ b/TAO/examples/Simple/time/Time_Client_i.h @@ -14,7 +14,7 @@ // // = AUTHOR // Balachandran Natarajan <bala@cs.wustl.edu> -// +// // ============================================================================ #ifndef TIME_CLIENT_I_H diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp index cd0b64746a4..e7ee5055e28 100644 --- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp @@ -37,6 +37,7 @@ #include "ace/Get_Opt.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" +#include "ace/OS_NS_ctype.h" //FUZZ: disable check_for_lack_ACE_OS static const char usage [] = diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp index 375eccc877b..b7663a2bd0f 100644 --- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp @@ -36,8 +36,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_string.h" - -#include "ace/os_include/os_ctype.h" +#include "ace/OS_NS_ctype.h" #if defined (ACE_OPENVMS) // need this to circumvent link error on OpenVMS diff --git a/TAO/examples/mfc/Resource.h b/TAO/examples/mfc/Resource.h index 6d26d3724b4..d0cff0d6290 100644 --- a/TAO/examples/mfc/Resource.h +++ b/TAO/examples/mfc/Resource.h @@ -9,7 +9,7 @@ #define IDR_SERVERTYPE 129 // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 diff --git a/TAO/interop-tests/wchar/wchar_reference.cpp b/TAO/interop-tests/wchar/wchar_reference.cpp index 0ca0384c81b..13f13712f53 100644 --- a/TAO/interop-tests/wchar/wchar_reference.cpp +++ b/TAO/interop-tests/wchar/wchar_reference.cpp @@ -20,6 +20,7 @@ // ============================================================================ #include "wchar_reference.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" #if defined (ACE_HAS_WCHAR) || defined (ACE_HAS_XPG4_MULTIBYTE_CHAR) diff --git a/TAO/interop-tests/wchar/wchar_reference.h b/TAO/interop-tests/wchar/wchar_reference.h index a99b83fede2..88be0efdcc3 100644 --- a/TAO/interop-tests/wchar/wchar_reference.h +++ b/TAO/interop-tests/wchar/wchar_reference.h @@ -23,6 +23,8 @@ #define NUM_KEYS 1 +#include "ace/OS_NS_wchar.h" + class wchar_reference { public: diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h index b021dcaa44c..55e623d21ed 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h @@ -20,12 +20,12 @@ class Messenger_i : public virtual POA_Messenger { public: - //Constructor + //Constructor Messenger_i (void); - - //Destructor + + //Destructor virtual ~Messenger_i (void); - + virtual CORBA::Boolean send_message ( const char * user_name, const char * subject, diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h index b021dcaa44c..55e623d21ed 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h @@ -20,12 +20,12 @@ class Messenger_i : public virtual POA_Messenger { public: - //Constructor + //Constructor Messenger_i (void); - - //Destructor + + //Destructor virtual ~Messenger_i (void); - + virtual CORBA::Boolean send_message ( const char * user_name, const char * subject, diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Priorities.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Priorities.h index 581af1cb221..8fd79a67cb8 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Priorities.h +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/Priorities.h @@ -1,4 +1,4 @@ -// $Id$ +// $Id$ #ifndef _PRIORITIES_H_ #define _PRIORITIES_H_ @@ -7,4 +7,4 @@ #define HIGH_PRIORITY 0 #define DEFAULT_PRIORITY LOW_PRIORITY -#endif +#endif diff --git a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h index ef9b4a759a2..3ea208dd978 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h @@ -13,12 +13,12 @@ class Messenger_i : public virtual POA_Messenger { public: - //Constructor + //Constructor Messenger_i (void); - - //Destructor + + //Destructor virtual ~Messenger_i (void); - + virtual CORBA::Boolean send_message ( const char * user_name, const char * subject, diff --git a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h index ef9b4a759a2..3ea208dd978 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h +++ b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h @@ -13,12 +13,12 @@ class Messenger_i : public virtual POA_Messenger { public: - //Constructor + //Constructor Messenger_i (void); - - //Destructor + + //Destructor virtual ~Messenger_i (void); - + virtual CORBA::Boolean send_message ( const char * user_name, const char * subject, diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp index e5d5ca95c44..eade1aa488f 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp @@ -12,6 +12,7 @@ #include "orbsvcs/FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h" #include "orbsvcs/FtRtEvent/Utils/Log.h" #include "ace/OS_main.h" +#include "ace/OS_NS_strings.h" int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) { diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp index c3fbcce5f76..60988ef91a8 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp @@ -6,6 +6,7 @@ #include "ace/SOCK_Acceptor.h" #include "ace/SOCK_Stream.h" #include "orbsvcs/FtRtEvent/Utils/UUID.h" +#include "ace/OS_NS_sys_time.h" const int WAIT_FOR_REGISTRATION_TIME = 10; //sec const int MAX_ID_STRING = 10; diff --git a/TAO/orbsvcs/IFR_Service/drv_private_ifr.h b/TAO/orbsvcs/IFR_Service/drv_private_ifr.h index e901e9a97be..26064d473b7 100644 --- a/TAO/orbsvcs/IFR_Service/drv_private_ifr.h +++ b/TAO/orbsvcs/IFR_Service/drv_private_ifr.h @@ -75,10 +75,10 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // The ACE_Process_Options default size of 1024 is sometimes not enough. const unsigned long TAO_IDL_COMMAND_LINE_BUFFER_SIZE = 4 * 1024; -extern const char *DRV_files[]; +extern const char *DRV_files[]; // All files to be processed. -extern long DRV_nfiles; +extern long DRV_nfiles; // How many are there? extern long DRV_file_index; diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.h b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.h index 41860b51a21..0be2c96e0bb 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.h +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.h @@ -45,7 +45,7 @@ public: virtual int visit_structure (AST_Structure *node); virtual int visit_enum (AST_Enum *node); virtual int visit_union (AST_Union *node); - + virtual CORBA::IDLType_ptr ir_current (void) const; // Lets the visitor one level above acess this value. diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.h b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.h index 21c3e6475d2..bb19ea4ed0d 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.h +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.h @@ -45,10 +45,10 @@ public: virtual int visit_structure (AST_Structure *node); virtual int visit_enum (AST_Enum *node); virtual int visit_union (AST_Union *node); - + virtual CORBA::IDLType_ptr ir_current (void) const; // Lets the visitor one level above acess this value. - + private: int add_members (AST_Union *node, CORBA::UnionDef_ptr union_def); // Common code called whether we are creating a new union diff --git a/TAO/orbsvcs/IFR_Service/ifr_visitor.h b/TAO/orbsvcs/IFR_Service/ifr_visitor.h index a280bd84101..f9b91f173b3 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_visitor.h +++ b/TAO/orbsvcs/IFR_Service/ifr_visitor.h @@ -41,7 +41,7 @@ class ifr_visitor : public ast_visitor // public: virtual ~ifr_visitor (void); - + virtual int visit_decl (AST_Decl *d); virtual int visit_scope (UTL_Scope *node); virtual int visit_type (AST_Type *node); @@ -96,7 +96,7 @@ public: ACE_Lock &lock (void) const; // Accessor for our lock. - + protected: // Not abstract but we want to force subclassing anyway. ifr_visitor (void); diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h index f4dde176033..c0b22e1877e 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h @@ -124,7 +124,7 @@ private: /// The default environment buffer length int env_buf_len_; - + /// Maximum number of environment variables int max_env_vars_; }; diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h index 2cf290d07c5..50af16887ac 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h @@ -145,7 +145,7 @@ private: /// The persistent XML file name. ACE_TString persist_file_name_; - /// Should check the server address and remove previous server if + /// Should check the server address and remove previous server if /// the address is reused. bool unregister_if_address_reused_; }; diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h index 302df853cc8..b41e75d4426 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h @@ -55,7 +55,7 @@ public: int init (const Options& opts); int unregister_if_address_reused (const ACE_CString& server_id, - const ACE_CString& name, + const ACE_CString& name, const char* partial_ior); /// Add a new server to the Repository diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.h b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.h index 5ab9d4bbc65..643ea3408f3 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.h +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.h @@ -46,10 +46,10 @@ public: virtual ~Callback() {} virtual void next_server (const ACE_CString& server_id, - const ACE_CString& server_name, const ACE_CString& aname, - const ACE_CString& startup_cmd, const EnvList& env_vars, - const ACE_CString& working_dir, const ACE_CString& actmode, - int start_limit, const ACE_CString& partial_ior, + const ACE_CString& server_name, const ACE_CString& aname, + const ACE_CString& startup_cmd, const EnvList& env_vars, + const ACE_CString& working_dir, const ACE_CString& actmode, + int start_limit, const ACE_CString& partial_ior, const ACE_CString& ior) = 0; virtual void next_activator (const ACE_CString& activator_name, diff --git a/TAO/orbsvcs/PSS/PSDL_Interface_Scope.h b/TAO/orbsvcs/PSS/PSDL_Interface_Scope.h index 3f28e08a3a3..9fc126fa966 100644 --- a/TAO/orbsvcs/PSS/PSDL_Interface_Scope.h +++ b/TAO/orbsvcs/PSS/PSDL_Interface_Scope.h @@ -68,7 +68,7 @@ class TAO_PSDL_Export TAO_PSDL_Interface_Scope : public TAO_PSDL_Scope int get_module_name (const ACE_CString &identifier_name, ACE_CString &module_name); - + int get_interface_name (const ACE_CString &identifier_name, ACE_CString &interface_name); diff --git a/TAO/orbsvcs/PSS/PSDL_Module_Scope.h b/TAO/orbsvcs/PSS/PSDL_Module_Scope.h index 283a1067bb6..5ee36266477 100644 --- a/TAO/orbsvcs/PSS/PSDL_Module_Scope.h +++ b/TAO/orbsvcs/PSS/PSDL_Module_Scope.h @@ -65,10 +65,10 @@ class TAO_PSDL_Export TAO_PSDL_Module_Scope : public TAO_PSDL_Scope ACE_CString &identifier_type); int find (const ACE_CString &identifier_name); - + int get_module_name (const ACE_CString &identifier_name, ACE_CString &module_name); - + int get_interface_name (const ACE_CString &identifier_name, ACE_CString &interface_name); diff --git a/TAO/orbsvcs/PSS/PSDL_Root_Scope.h b/TAO/orbsvcs/PSS/PSDL_Root_Scope.h index df0856c8880..e4e2171fa50 100644 --- a/TAO/orbsvcs/PSS/PSDL_Root_Scope.h +++ b/TAO/orbsvcs/PSS/PSDL_Root_Scope.h @@ -65,10 +65,10 @@ public: int get_module_name (const ACE_CString &identifier_name, ACE_CString &module_name); - + int get_interface_name (const ACE_CString &identifier_name, ACE_CString &interface_name); - + /// Public methods to return the scopes needed. TAO_PSDL_Scope *parent_scope (void); diff --git a/TAO/orbsvcs/PSS/PSDL_Type_Dcl_Visitor.h b/TAO/orbsvcs/PSS/PSDL_Type_Dcl_Visitor.h index cd8d558a4a2..af1072746f0 100644 --- a/TAO/orbsvcs/PSS/PSDL_Type_Dcl_Visitor.h +++ b/TAO/orbsvcs/PSS/PSDL_Type_Dcl_Visitor.h @@ -47,7 +47,7 @@ private: void print_for_sequence_typedefs (ACE_CString identifier_type, ACE_CString identifier); - + // Generate the code that should go into the stub implementation // file for the type_declarators. void gen_code_for_si (void); diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Schedule.h b/TAO/orbsvcs/examples/RtEC/Schedule/Schedule.h index 3a6d4463fa3..5f4119984e8 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Schedule.h +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Schedule.h @@ -36,7 +36,7 @@ static int configs_size = sizeof(configs)/sizeof(configs[0]); // This sets up Scheduler_Factory to use the runtime version. -int scheduler_factory_setup = +int scheduler_factory_setup = ACE_Scheduler_Factory::use_runtime (configs_size, configs, infos_size, infos); // EOF diff --git a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h index ede10e0e1ec..a476858c61c 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h +++ b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h @@ -30,7 +30,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class Fill_ACE_QoS - * + * * This class helps users to add new flow specs and provides * utility functions for filling up the flow specs for simplex/duplex * sessions. diff --git a/TAO/orbsvcs/orbsvcs/AV/ntp-time.h b/TAO/orbsvcs/orbsvcs/AV/ntp-time.h index 11dcd720911..6df31d6cf67 100644 --- a/TAO/orbsvcs/orbsvcs/AV/ntp-time.h +++ b/TAO/orbsvcs/orbsvcs/AV/ntp-time.h @@ -79,7 +79,7 @@ ntptime (timeval t) return (s << 16 | usec2ntp((u_int)t.tv_usec) >> 16); } -ACE_INLINE ACE_UINT32 +ACE_INLINE ACE_UINT32 ntptime() { // diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h index 4c804304f54..bc3f03882db 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h @@ -104,7 +104,7 @@ private: * * @brief Implements a Command object that invokes the * disconnected_i() method on the target, passing an argument of type - * Object. + * Object. * * <H2>Memory Managment</H2> * It does not assume ownership of Object nor the Target diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.h b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.h index ad80bc38f68..d72eeb81f17 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.h @@ -27,7 +27,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \class TAO_EC_Thread_Flags \brief Parse thread flags from string to a long. - + Encapsulate flags used for creating threads with \a ACE_OS::thr_create and \a ACE_Task::activate. @@ -76,7 +76,7 @@ public: \brief Returns value of THR_SCOPE_* used, or zero if unknown. */ long scope() const { return this->scope_; } - + /*! \brief Returns value of THR_SCHED_* used, or zero if unknown. */ @@ -90,7 +90,7 @@ public: \return the priority, or ACE_DEFAULT_THREAD_PRIORITY if the scheduler is unknown. */ long default_priority () const; - + struct Supported_Flag diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h index 49d4f1a30d4..9978ebac44d 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h @@ -46,7 +46,7 @@ class TAO_LoadBalancing_Export TAO_LB_LoadManager public: /// Constructor. - TAO_LB_LoadManager (int ping_timeout, + TAO_LB_LoadManager (int ping_timeout, int ping_interval); virtual int svc (void); diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h b/TAO/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h index 9ae1ef978e2..712d43deb0c 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h @@ -43,12 +43,12 @@ namespace CORBA * @brief Base Strategy for Log / Log Record Storage * */ -class TAO_Log_Serv_Export TAO_Log_Persistence_Strategy +class TAO_Log_Serv_Export TAO_Log_Persistence_Strategy : public ACE_Service_Object { public: /// @brief Log Store Factory - virtual TAO_LogStore* + virtual TAO_LogStore* create_log_store (TAO_LogMgr_i* logmgr_i) = 0; private: diff --git a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.h b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.h index 8c76dbc99a3..7b03ba75b03 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.h @@ -86,7 +86,7 @@ public: // Factory Methods /// Create the stream that can operate on a disk file - virtual TAO_Storable_Base *create_stream(const ACE_CString & file, + virtual TAO_Storable_Base *create_stream(const ACE_CString & file, const ACE_TCHAR * mode); }; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h index eec7e570347..4210fb99c45 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h @@ -32,8 +32,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * @brief The Event Map for Consumers. * */ -typedef TAO_Notify_Event_Map_T<TAO_Notify_ProxySupplier, - TAO_SYNCH_RW_MUTEX> +typedef TAO_Notify_Event_Map_T<TAO_Notify_ProxySupplier, + TAO_SYNCH_RW_MUTEX> TAO_Notify_Consumer_Map; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h index 3dc1b144832..afae176dab5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h @@ -52,7 +52,7 @@ public: TAO_Notify::Topology_Object* load_child ( const ACE_CString &type, - CORBA::Long id, + CORBA::Long id, const TAO_Notify::NVPList& attrs); diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h index ce95bb061ea..0e1012360e2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h @@ -26,7 +26,7 @@ #include "orbsvcs/Notify/ID_Factory.h" #include "orbsvcs/Notify/ETCL_Filter.h" #include "orbsvcs/Notify/Topology_Saver.h" - + #if defined(_MSC_VER) #pragma warning(push) @@ -73,7 +73,7 @@ public: virtual TAO_Notify::Topology_Object* load_child ( const ACE_CString &type, - CORBA::Long id, + CORBA::Long id, const TAO_Notify::NVPList& attrs); virtual TAO_Notify_Object::ID get_filter_id (CosNotifyFilter::Filter_ptr filter); @@ -82,7 +82,7 @@ public: protected: - CosNotifyFilter::Filter_ptr + CosNotifyFilter::Filter_ptr create_filter (const char *constraint_grammar, const TAO_Notify_Object::ID& id, TAO_Notify_ETCL_Filter*& filter); diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h index 77c27c7e2e8..d988afabfa2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h @@ -26,7 +26,7 @@ #include "orbsvcs/Notify/Topology_Object.h" #include "orbsvcs/Notify/EventChannel.h" -class TAO_Notify_EventChannel; +class TAO_Notify_EventChannel; TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h index 7810a37421b..bc9398463b2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h @@ -33,7 +33,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * @brief Service Object to obtain a CosNotifyFilter::FilterFactory reference. * */ -class TAO_Notify_Serv_Export TAO_Notify_FilterFactory +class TAO_Notify_Serv_Export TAO_Notify_FilterFactory : public ACE_Service_Object, public TAO_Notify::Topology_Object { public: diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h index 29ffa7cd26c..f15f886431a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.h @@ -30,7 +30,7 @@ public: /// Remove the statistics for this event channel ~TAO_MonitorSupplierAdmin (void); - /// Register our statistic and control objects + /// Register our statistic and control objects void register_stats_controls (TAO_MonitorEventChannel* mec, const ACE_CString& name); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.h b/TAO/orbsvcs/orbsvcs/Notify/Properties.h index 3419780448e..a61b936f5c4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Properties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.h @@ -169,10 +169,10 @@ protected: /// The default PC QoS Properties. CosNotification::QoSProperties pc_qos_; - + /// The default consumer admin filter operator. CosNotifyChannelAdmin::InterFilterGroupOperator defaultConsumerAdminFilterOp_; - + /// The default supplier admin filter operator. CosNotifyChannelAdmin::InterFilterGroupOperator defaultSupplierAdminFilterOp_; }; diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h index f191c6d45ac..e6a802e905e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h @@ -70,7 +70,7 @@ public: ACE_Time_Value last_ping() const; void last_ping(const ACE_Time_Value& tv); - + protected: /// Access the Supplier TAO_Notify_Supplier* supplier (void); @@ -78,7 +78,7 @@ protected: /// Accept an event from the Supplier void push_i (TAO_Notify_Event * event); - /// Last time either push an event or validate connection + /// Last time either push an event or validate connection /// via _non_exist call. ACE_Atomic_Op<TAO_SYNCH_MUTEX, ACE_Time_Value> last_ping_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h index d4b8d62f7b1..ee2a9a2c4d3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h @@ -48,7 +48,7 @@ public: virtual ACE_CString get_ior (void) const; protected: - + virtual CORBA::Object_ptr get_supplier (void); /// The Supplier diff --git a/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h index 63ea04584dd..c7617c94a47 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h @@ -41,7 +41,7 @@ class TAO_Notify_EventChannelFactory; * = LOCKING * = TODO */ -class TAO_Notify_Serv_Export TAO_Notify_validate_client_Task +class TAO_Notify_Serv_Export TAO_Notify_validate_client_Task : public ACE_Task<ACE_NULL_SYNCH> { public: @@ -65,7 +65,7 @@ private: /// The delay of first time validate. ACE_Time_Value delay_; - /// The validate interval + /// The validate interval ACE_Time_Value interval_; /// The event channel diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h index c88007d70f3..394693e1d32 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h @@ -185,7 +185,7 @@ public: */ void generic_factory (TAO_PG_GenericFactory * generic_factory); - /// Get active or inactive member count in a group. + /// Get active or inactive member count in a group. size_t member_count ( const PortableServer::ObjectId & oid, bool is_active); @@ -193,7 +193,7 @@ public: bool is_alive ( const PortableServer::ObjectId & oid, CORBA::Object_ptr member); - + /// Remove the inactive members. void remove_inactive_members (); @@ -246,10 +246,10 @@ private: /// Help function to get active or inactive member infos. TAO_PG_MemberInfo_Set get_members (bool is_alive); - + /// Ping the remote to verify the connections. - bool ping (CORBA::ORB_ptr orb, - CORBA::Object_var& obj, + bool ping (CORBA::ORB_ptr orb, + CORBA::Object_var& obj, const TimeBase::TimeT& tt); /// Reference to the POA that created the object group references. diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.h index 318bb24e2aa..0814173a275 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.h @@ -34,9 +34,9 @@ public: /// Constructor Send_Task (void); - /// This is for compilers that are a PITA complaining that we are - /// hiding something. - virtual int init (int argc, ACE_TCHAR *argv[]) + /// This is for compilers that are a PITA complaining that we are + /// hiding something. + virtual int init (int argc, ACE_TCHAR *argv[]) { return ACE_Task_Base::init (argc, argv); } diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.h b/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.h index 5ecc2954d86..cf80fb9115d 100644 --- a/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.h +++ b/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.h @@ -4,7 +4,7 @@ #define TEST_IMPL_HPP #include "TestS.h" - + class Server_impl : public virtual POA_server { public: @@ -13,7 +13,7 @@ public: virtual void shutdown (); private: - CORBA::ORB_var orb_; + CORBA::ORB_var orb_; }; #endif /* TEST_IMPL_HPP */ diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h index a11046ec762..4edfe313641 100644 --- a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h +++ b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h @@ -11,7 +11,7 @@ class Messenger_i : public POA_Messenger { public: Messenger_i (CORBA::ORB_ptr orb); - + virtual ~Messenger_i (void); CORBA::Boolean send_message (const char * user_name, @@ -23,7 +23,7 @@ class Messenger_i : public POA_Messenger CosNotifyChannelAdmin::StructuredProxyPushConsumer_var consumer_proxy_; }; -#endif +#endif diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.h b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.h index a2b07b3fd30..9be7bc4cbdc 100644 --- a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.h +++ b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.h @@ -6,7 +6,7 @@ #include "orbsvcs/CosNotifyCommS.h" -class StructuredEventConsumer_i : +class StructuredEventConsumer_i : public virtual POA_CosNotifyComm::StructuredPushConsumer { public: @@ -30,4 +30,4 @@ private: int count_; }; -#endif +#endif diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.h b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.h index 8a3ab506e1f..376fb3873c7 100644 --- a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.h +++ b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.h @@ -5,7 +5,7 @@ #include "orbsvcs/CosNotifyCommS.h" -class StructuredEventSupplier_i : +class StructuredEventSupplier_i : public virtual POA_CosNotifyComm::StructuredPushSupplier { public: @@ -13,7 +13,7 @@ public: StructuredEventSupplier_i(CORBA::ORB_ptr orb); virtual void disconnect_structured_push_supplier (); - + virtual void subscription_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed @@ -23,4 +23,4 @@ private: CORBA::ORB_var orb_; }; -#endif +#endif diff --git a/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.h b/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.h index 12a504f7230..2201809a698 100644 --- a/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.h +++ b/TAO/orbsvcs/tests/Bug_3444_Regression/Test_impl.h @@ -4,7 +4,7 @@ #define TEST_IMPL_HPP #include "TestS.h" - + class Server_impl : public virtual POA_Test::Server { public: @@ -13,7 +13,7 @@ public: virtual void shutdown (); private: - CORBA::ORB_var orb_; + CORBA::ORB_var orb_; }; #endif /* TEST_IMPL_HPP */ diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h index ccb9c6c524c..4c0e0ef2ceb 100755 --- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h @@ -13,12 +13,12 @@ class Test_Dummy_i : public virtual POA_Test::Dummy { public: - // Constructor + // Constructor Test_Dummy_i (void); - - // Destructor + + // Destructor virtual ~Test_Dummy_i (void); - + virtual char * getMessage (void); }; @@ -26,17 +26,17 @@ class Test_Time_i : public virtual POA_Test::Time { public: - // Constructor + // Constructor Test_Time_i (void); - - // Destructor + + // Destructor virtual ~Test_Time_i (void); - + virtual ::CORBA::Long current_time ( void ); - + virtual void shutdown ( void diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h index 4a4bc5670dd..e3e10eea60e 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h +++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h @@ -17,12 +17,12 @@ class Test_interfaceOne_i : public virtual POA_Test::interfaceOne { public: - // Constructor + // Constructor Test_interfaceOne_i (void); - - // Destructor + + // Destructor virtual ~Test_interfaceOne_i (void); - + virtual void getstruct (::Test::structOne_out tester); }; diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/common.h b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/common.h index 3520155bf02..4ba52e0064b 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/common.h +++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/common.h @@ -5,7 +5,7 @@ #include <iostream> const char *ior = "file://ecf.ior"; -CosNotifyChannelAdmin::EventChannel_var +CosNotifyChannelAdmin::EventChannel_var get_event_channel(CORBA::ORB_ptr orb) { @@ -20,8 +20,8 @@ get_event_channel(CORBA::ORB_ptr orb) if (CORBA::is_nil(obj.in ())) { - std::cerr << "Bad ec_fact.ior " << std::endl; - ACE_OS::exit (1); + std::cerr << "Bad ec_fact.ior " << std::endl; + ACE_OS::exit (1); } CosNotifyChannelAdmin::EventChannelFactory_var factory = @@ -40,20 +40,20 @@ get_event_channel(CORBA::ORB_ptr orb) } catch (CORBA::SystemException& se ) { - std::cerr << "System exception occurred during get_all_channels: " + std::cerr << "System exception occurred during get_all_channels: " << se << std::endl; throw; } if( channelIdSeq->length() == 0 ) { - try + try { ec = factory->create_channel( init_qos, init_admin, id); } catch (CORBA::SystemException& se ) { - std::cerr << "System exception occurred during find_channel: " + std::cerr << "System exception occurred during find_channel: " << se << std::endl; throw; } @@ -65,14 +65,14 @@ get_event_channel(CORBA::ORB_ptr orb) } catch (CosNotifyChannelAdmin::ChannelNotFound& ) { - std::cerr << "ChannelNotFound: " + std::cerr << "ChannelNotFound: " << channelIdSeq[0] << std::endl; throw; } catch (CORBA::SystemException& se ) { - std::cerr << "System exception occurred during get_event_channel: " + std::cerr << "System exception occurred during get_event_channel: " << se << std::endl; throw; } diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/common.h b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/common.h index 3520155bf02..4ba52e0064b 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/common.h +++ b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/common.h @@ -5,7 +5,7 @@ #include <iostream> const char *ior = "file://ecf.ior"; -CosNotifyChannelAdmin::EventChannel_var +CosNotifyChannelAdmin::EventChannel_var get_event_channel(CORBA::ORB_ptr orb) { @@ -20,8 +20,8 @@ get_event_channel(CORBA::ORB_ptr orb) if (CORBA::is_nil(obj.in ())) { - std::cerr << "Bad ec_fact.ior " << std::endl; - ACE_OS::exit (1); + std::cerr << "Bad ec_fact.ior " << std::endl; + ACE_OS::exit (1); } CosNotifyChannelAdmin::EventChannelFactory_var factory = @@ -40,20 +40,20 @@ get_event_channel(CORBA::ORB_ptr orb) } catch (CORBA::SystemException& se ) { - std::cerr << "System exception occurred during get_all_channels: " + std::cerr << "System exception occurred during get_all_channels: " << se << std::endl; throw; } if( channelIdSeq->length() == 0 ) { - try + try { ec = factory->create_channel( init_qos, init_admin, id); } catch (CORBA::SystemException& se ) { - std::cerr << "System exception occurred during find_channel: " + std::cerr << "System exception occurred during find_channel: " << se << std::endl; throw; } @@ -65,14 +65,14 @@ get_event_channel(CORBA::ORB_ptr orb) } catch (CosNotifyChannelAdmin::ChannelNotFound& ) { - std::cerr << "ChannelNotFound: " + std::cerr << "ChannelNotFound: " << channelIdSeq[0] << std::endl; throw; } catch (CORBA::SystemException& se ) { - std::cerr << "System exception occurred during get_event_channel: " + std::cerr << "System exception occurred during get_event_channel: " << se << std::endl; throw; } diff --git a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h index 59f6477c7af..d85dc6edabb 100644 --- a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h +++ b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h @@ -95,7 +95,7 @@ class FilterClient void wait_consumer_complete (); - void verify_filter (CosNotifyFilter::FilterAdmin_var& admin, + void verify_filter (CosNotifyFilter::FilterAdmin_var& admin, const char* constraint_expr, const char* mod_constraint_expr); @@ -145,7 +145,7 @@ class FilterClient CosNotifyChannelAdmin::AdminID adminid_1_id_; CosNotifyChannelAdmin::AdminID adminid_2_id_; - + CosNotifyChannelAdmin::ChannelID channel_id_; bool use_persistent_; diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h index 34d0240c104..2249dcaef0e 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h @@ -59,7 +59,7 @@ public: virtual TAO_Notify_Object::ID get_filter_id (CosNotifyFilter::Filter_ptr filter); virtual CosNotifyFilter::Filter_ptr get_filter (const TAO_Notify_Object::ID& id); virtual void save_persistent (TAO_Notify::Topology_Saver& saver); - + protected: /// Release this object. virtual void release (void); 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 2662b3acb41..b221cecf8e5 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies_Runtime.h +++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies_Runtime.h @@ -53,7 +53,7 @@ static int configs_size = sizeof(configs)/sizeof(configs[0]); // This sets up Scheduler_Factory to use the runtime version. -int scheduler_factory_setup = +int scheduler_factory_setup = ACE_Scheduler_Factory::use_runtime (configs_size, configs, infos_size, infos); // EOF diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h index b0fa2c85cbd..5b13c8e4912 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h +++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.h @@ -56,7 +56,7 @@ static int configs_size = sizeof(configs)/sizeof(configs[0]); // This sets up Scheduler_Factory to use the runtime version. -int scheduler_factory_setup = +int scheduler_factory_setup = ACE_Scheduler_Factory::use_runtime (configs_size, configs, infos_size, infos); // EOF diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.h b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.h index e864489f9b3..118e5afd81d 100644 --- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.h +++ b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.h @@ -5,7 +5,7 @@ #include "CSD_PT_TestServant_Export.h" -class CSD_PT_TestServant_Export Foo_Statistics +class CSD_PT_TestServant_Export Foo_Statistics { public: diff --git a/TAO/tests/Alt_Mapping/alt_mapping_i.h b/TAO/tests/Alt_Mapping/alt_mapping_i.h index 5360f329137..4eabc9a117f 100644 --- a/TAO/tests/Alt_Mapping/alt_mapping_i.h +++ b/TAO/tests/Alt_Mapping/alt_mapping_i.h @@ -35,7 +35,7 @@ public: const Alt_Mapping::StructSeq & s1, Alt_Mapping::StructSeq & s2, Alt_Mapping::StructSeq & s3); - + void shutdown (void); private: diff --git a/TAO/tests/Alt_Mapping/helper.h b/TAO/tests/Alt_Mapping/helper.h index 3165a376941..78aad3946a9 100644 --- a/TAO/tests/Alt_Mapping/helper.h +++ b/TAO/tests/Alt_Mapping/helper.h @@ -37,7 +37,7 @@ public: CORBA::WChar* gen_wstring (void); CORBA::WChar* gen_wstring (int maxlength); const Alt_Mapping::Fixed_Struct gen_fixed_struct (void); - + private: Alt_Mapping::Fixed_Struct fixed_struct_; }; diff --git a/TAO/tests/Alt_Mapping/ub_string.h b/TAO/tests/Alt_Mapping/ub_string.h index 33155631c07..a66640052d1 100644 --- a/TAO/tests/Alt_Mapping/ub_string.h +++ b/TAO/tests/Alt_Mapping/ub_string.h @@ -57,7 +57,7 @@ public: private: char *opname_; // operation name - + std::string in_; std::string inout_; std::string out_; diff --git a/TAO/tests/Bug_1495_Regression/tid_to_int.h b/TAO/tests/Bug_1495_Regression/tid_to_int.h index 4b374663c38..9a1010188a4 100755 --- a/TAO/tests/Bug_1495_Regression/tid_to_int.h +++ b/TAO/tests/Bug_1495_Regression/tid_to_int.h @@ -38,7 +38,7 @@ namespace // We assume sizeof(thread_id_type) >= sizeof(ace_thread_id_type). return (thread_id_type) tmp; - } + } }; template<typename thread_id_type> diff --git a/TAO/tests/Bug_2791_Regression/Message_i.h b/TAO/tests/Bug_2791_Regression/Message_i.h index abaf59570fb..fd5c3c4d61a 100755 --- a/TAO/tests/Bug_2791_Regression/Message_i.h +++ b/TAO/tests/Bug_2791_Regression/Message_i.h @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ #include "MessageC.h" #include "tao/corba.h" diff --git a/TAO/tests/Bug_3276_Regression/Manager.h b/TAO/tests/Bug_3276_Regression/Manager.h index 7531e48955f..f9c7188b6aa 100644 --- a/TAO/tests/Bug_3276_Regression/Manager.h +++ b/TAO/tests/Bug_3276_Regression/Manager.h @@ -39,7 +39,7 @@ private: // Our servant locator CORBA::Object_var server_; - // + // }; #endif /*_MANAGER_H_ */ diff --git a/TAO/tests/Bug_3766_Regression/TestI.h b/TAO/tests/Bug_3766_Regression/TestI.h index 67e1a28be35..e3a4e5bf79c 100644 --- a/TAO/tests/Bug_3766_Regression/TestI.h +++ b/TAO/tests/Bug_3766_Regression/TestI.h @@ -27,7 +27,7 @@ * http://www.cs.wustl.edu/~schmidt/TAO.html **/ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // .\be\be_codegen.cpp:1364 #ifndef TESTI_H_ @@ -43,16 +43,16 @@ class Test_i : public virtual POA_Test { public: - // Constructor + // Constructor Test_i (CORBA::ORB_ptr o); - - // Destructor + + // Destructor virtual ~Test_i (void); - + virtual void do_something_FixedLength ( ::FixedLengthInfo_out my_info); - + virtual void do_something_VariableLength ( ::VariableLengthInfo_out my_info); diff --git a/TAO/tests/Bug_3812_Regression/mock_transport.h b/TAO/tests/Bug_3812_Regression/mock_transport.h index 5101d883f2b..4b466ff5a65 100644 --- a/TAO/tests/Bug_3812_Regression/mock_transport.h +++ b/TAO/tests/Bug_3812_Regression/mock_transport.h @@ -32,7 +32,7 @@ public: ACE_Event_Handler::Reference_Count remove_reference (void) {return 0;} // Implementation needs be similar to TAO_Transport::cache_map_entry(). - void cache_map_entry (TCM::HASH_MAP_ENTRY *entry) { + void cache_map_entry (TCM::HASH_MAP_ENTRY *entry) { ACE_GUARD (ACE_Lock, ace_mon, *this->handler_lock_); ACE_DEBUG ((LM_DEBUG, "(%P|%t)cache_map_entry %X\n", entry)); this->entry_ = entry; @@ -41,7 +41,7 @@ public: void close_connection (void) { purged_count_ = ++global_purged_count;}; int purged_count (void) { return this->purged_count_;} bool can_be_purged (void) { return true;} - + // Implementation needs be similar to TAO_Transport::purge_entry(). int purge_entry (void) { @@ -56,7 +56,7 @@ public: } // Implementation needs be similar to TAO_Transport::make_idle(). - // + // // int // TAO_Transport::make_idle (void) // { @@ -66,7 +66,7 @@ public: // ACE_TEXT ("TAO (%P|%t) - Transport[%d]::make_idle\n"), // this->id ())); // } - // + // // return this->transport_cache_manager ().make_idle (this->cache_map_entry_); // } @@ -78,7 +78,7 @@ public: int make_idle (void) { static bool is_first = true; - + ACE_DEBUG ((LM_DEBUG, "(%P|%t)make_idle pass entry %X\n", this->entry_)); TCM::HASH_MAP_ENTRY* entry = this->entry_; @@ -92,13 +92,13 @@ public: test_condition.wait (); } - ACE_DEBUG ((LM_DEBUG, "(%P|%t)make_idle execute on entry %X and now entry %X\n", + ACE_DEBUG ((LM_DEBUG, "(%P|%t)make_idle execute on entry %X and now entry %X\n", entry, this->entry_)); // When the first thread is at this point, the entry is // deleted by second thread, so make idle on the invalid // entry cause SEGV. It's possible that the memory is still - // available then next checking if entry is changed should + // available then next checking if entry is changed should // confirm if the entry is valid or not. int ret = tcm->make_idle (entry); if (entry != this->entry_) @@ -107,7 +107,7 @@ public: ACE_TEXT ("after passing to TCM and before calling make_idl.\n"))); result = 1; } - + return ret; } diff --git a/TAO/tests/Bug_3853_Regression/Hello_i.h b/TAO/tests/Bug_3853_Regression/Hello_i.h index 4713d8d771c..2f7fc11e8f1 100644 --- a/TAO/tests/Bug_3853_Regression/Hello_i.h +++ b/TAO/tests/Bug_3853_Regression/Hello_i.h @@ -15,18 +15,18 @@ class Demo_HelloWorld_i : public virtual POA_Demo::HelloWorld { public: - // Constructor + // Constructor Demo_HelloWorld_i (CORBA::ORB_ptr orb); - - // Destructor + + // Destructor virtual ~Demo_HelloWorld_i (void); - + virtual void sayHello ( const char * msg ); - + virtual void shutdown(); - + private: CORBA::ORB_var orb_; diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h index d5bf9ea2c71..b9301b915bf 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h @@ -6,7 +6,7 @@ #include "StatisticsHelper.h" -class CSD_TP_Foo_A_Export Foo_A_Statistics +class CSD_TP_Foo_A_Export Foo_A_Statistics { public: diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h index cf21382c549..e8d9569a2d5 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h @@ -6,14 +6,14 @@ #include "StatisticsHelper.h" -class CSD_TP_Foo_B_Export Foo_B_Statistics +class CSD_TP_Foo_B_Export Foo_B_Statistics { public: - enum In_Value_Type + enum In_Value_Type { - FOO_B_STAT_NONE, - FOO_B_STAT_STRING, + FOO_B_STAT_NONE, + FOO_B_STAT_STRING, FOO_B_STAT_LONG }; diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h index 4d7dcff1df9..f115ddc2b1f 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h @@ -6,11 +6,11 @@ #include "StatisticsHelper.h" -class CSD_TP_Foo_C_Export Foo_C_Statistics +class CSD_TP_Foo_C_Export Foo_C_Statistics { public: - Foo_C_Statistics(unsigned num_remote_clients, + Foo_C_Statistics(unsigned num_remote_clients, unsigned num_collocated_clients); virtual ~Foo_C_Statistics(); @@ -24,7 +24,7 @@ class CSD_TP_Foo_C_Export Foo_C_Statistics private: - unsigned num_remote_clients_; + unsigned num_remote_clients_; unsigned num_collocated_clients_; unsigned expected_[10]; unsigned actual_[10]; diff --git a/TAO/tests/DynAny_Test/data.h b/TAO/tests/DynAny_Test/data.h index 05133d6de65..e25a35da1ad 100644 --- a/TAO/tests/DynAny_Test/data.h +++ b/TAO/tests/DynAny_Test/data.h @@ -40,7 +40,7 @@ public: CORBA::Object_var m_objref1, m_objref2; CORBA::ShortSeq m_shortseq1; CORBA::ShortSeq_var m_shortseq2; - CORBA::LongDouble m_longdouble1, m_longdouble2; + CORBA::LongDouble m_longdouble1, m_longdouble2; const char* labels[20]; diff --git a/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.h b/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.h index 2248ee1d872..efc430f3851 100644 --- a/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.h +++ b/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.h @@ -1,5 +1,5 @@ // -*- C++ -*- -// $Id:$ +// $Id$ #ifndef INHERITED_OP_I_H #define INHERITED_OP_I_H @@ -11,10 +11,10 @@ class Derived_i : public virtual POA_Outer::Derived { public: Derived_i (CORBA::ORB_ptr orb); - + virtual void BaseOp (void); virtual void shutdown (void); - + private: CORBA::ORB_ptr orb_; }; diff --git a/TAO/tests/OBV/Indirection/Messenger_i.h b/TAO/tests/OBV/Indirection/Messenger_i.h index 34cbeb3ff95..dc8f061cb07 100644 --- a/TAO/tests/OBV/Indirection/Messenger_i.h +++ b/TAO/tests/OBV/Indirection/Messenger_i.h @@ -11,7 +11,7 @@ class Messenger_i : public virtual POA_demo::value::idl::ValueServer { public: Messenger_i(); - + virtual char * receive_boxedvalue ( ::demo::value::idl::boxedValue * b); diff --git a/TAO/tests/RTScheduling/Current/Thread_Task.h b/TAO/tests/RTScheduling/Current/Thread_Task.h index a6ae16092a1..47682ac2328 100644 --- a/TAO/tests/RTScheduling/Current/Thread_Task.h +++ b/TAO/tests/RTScheduling/Current/Thread_Task.h @@ -15,7 +15,7 @@ class Thread_Task : public ACE_Task <ACE_SYNCH> int activate_task (int thr_count); ~Thread_Task (void); - + protected: /// task svc virtual int svc (void); diff --git a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.h b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.h index 441469fa8d4..8d0441d08d3 100644 --- a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.h +++ b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.h @@ -13,7 +13,7 @@ class Thread_Task : public ACE_Task <ACE_SYNCH> int activate_task (CORBA::ORB_ptr orb); RTScheduling::Current::IdType* guids (void); - + protected: /// task svc virtual int svc (void); diff --git a/TAO/tests/ZIOP/Hello.h b/TAO/tests/ZIOP/Hello.h index dbbd2d62e2a..6209a6541e8 100644 --- a/TAO/tests/ZIOP/Hello.h +++ b/TAO/tests/ZIOP/Hello.h @@ -28,7 +28,7 @@ private: /// Use an ORB reference to conver strings to objects and shutdown /// the application. CORBA::ULong length_; - + CORBA::ORB_var orb_; }; diff --git a/TAO/utils/NamingViewer/resource.h b/TAO/utils/NamingViewer/resource.h index d2788078a96..379585f672a 100644 --- a/TAO/utils/NamingViewer/resource.h +++ b/TAO/utils/NamingViewer/resource.h @@ -41,7 +41,7 @@ #define ID_CONTEXTPOPUP_BINDNEWCONTEXT 32779 // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 138 diff --git a/TAO/utils/logWalker/HostProcess.h b/TAO/utils/logWalker/HostProcess.h index 9c63d4ac63f..659cb298d13 100644 --- a/TAO/utils/logWalker/HostProcess.h +++ b/TAO/utils/logWalker/HostProcess.h @@ -1,7 +1,7 @@ // -*- C++ -*- // $Id$ -// +// #ifndef LOG_WALKER_HOST_PROCESS_H #define LOG_WALKER_HOST_PROCESS_H @@ -48,7 +48,7 @@ public: HostProcess (const ACE_CString &src, long pid); ~HostProcess (void); - // set/get the name of the process. This is only provided by + // set/get the name of the process. This is only provided by // an alias supplied to the logWalker command line or manifest file. void proc_name (const ACE_CString &name); const ACE_CString &proc_name (void) const; @@ -58,7 +58,7 @@ public: Thread * find_thread (long tid); // Returns a thread that had previously worked with handle h. May return - // a null pointer. + // a null pointer. Thread * find_thread_for_handle (long h); // Returns the process id. @@ -66,7 +66,7 @@ public: // returns true if the supplied endpoint has been visited before. This // may be either a listen endpoint or a client endpoint used to connect - // to another peer. + // to another peer. bool has_endpoint (ACE_CString& addr, bool listen); // adds a new endpoint to the list of listen endpoints. Client endpoints @@ -77,7 +77,7 @@ public: // are added as part of the process to add a new peer process void add_listen_endpoint (ACE_CString& addr); - // add a peer to the connection list. If the peer is not in the + // add a peer to the connection list. If the peer is not in the // by_addr_ table, it will be added there too. void add_peer (long handle, PeerProcess *peer); @@ -104,9 +104,9 @@ public: void reconcile_peers (Session *session); private: - void iterate_peers (int group, - int operation, - ostream *strm = 0, + void iterate_peers (int group, + int operation, + ostream *strm = 0, Session * session = 0); long pid_; diff --git a/TAO/utils/logWalker/Log.h b/TAO/utils/logWalker/Log.h index 8b346c31147..b4ba478a517 100644 --- a/TAO/utils/logWalker/Log.h +++ b/TAO/utils/logWalker/Log.h @@ -1,7 +1,7 @@ // -*- C++ -*- // $Id$ -// +// #ifndef LOG_WALKER_LOG_H #define LOG_WALKER_LOG_H diff --git a/TAO/utils/logWalker/PeerObject.h b/TAO/utils/logWalker/PeerObject.h index 7a7be19bd68..dcb15acd81c 100644 --- a/TAO/utils/logWalker/PeerObject.h +++ b/TAO/utils/logWalker/PeerObject.h @@ -1,7 +1,7 @@ // -*- C++ -*- // $Id$ -// +// #ifndef LOG_WALKER_PEER_OBJECT_H #define LOG_WALKER_PEER_OBJECT_H diff --git a/TAO/utils/logWalker/PeerProcess.h b/TAO/utils/logWalker/PeerProcess.h index bdb2f7b6227..76205ba19ad 100644 --- a/TAO/utils/logWalker/PeerProcess.h +++ b/TAO/utils/logWalker/PeerProcess.h @@ -1,7 +1,7 @@ // -*- C++ -*- // $Id$ -// +// #ifndef LOG_WALKER_PEER_PROCESS_H #define LOG_WALKER_PEER_PROCESS_H @@ -57,7 +57,7 @@ public: void add_transport (Transport *t); Transport *last_transport (void); Transport *find_transport (long handle); - + bool match_local (const char *addr) const; Invocation *new_invocation (size_t req_id, Thread *thr); diff --git a/TAO/utils/logWalker/Session.h b/TAO/utils/logWalker/Session.h index 7bb8c05b04c..d75480bfa3b 100644 --- a/TAO/utils/logWalker/Session.h +++ b/TAO/utils/logWalker/Session.h @@ -1,7 +1,7 @@ // -*- C++ -*- // $Id$ -// +// #ifndef LOG_WALKER_SESSION_H #define LOG_WALKER_SESSION_H diff --git a/TAO/utils/logWalker/Thread.h b/TAO/utils/logWalker/Thread.h index 0905fdecaac..63a3958c756 100644 --- a/TAO/utils/logWalker/Thread.h +++ b/TAO/utils/logWalker/Thread.h @@ -1,7 +1,7 @@ // -*- C++ -*- // $Id$ -// +// #ifndef LOG_WALKER_THREAD_H #define LOG_WALKER_THREAD_H |