diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-03-30 07:21:14 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-03-30 07:21:14 +0000 |
commit | 49051fb78f664421a7df1973e74a1557398ff6b4 (patch) | |
tree | f263b7e14ec5b5f89641fee66a3901def98b51b4 | |
parent | 3eb871d7ad24f8c034674386eac4ae49edf824b9 (diff) | |
download | ATCD-49051fb78f664421a7df1973e74a1557398ff6b4.tar.gz |
Wed Mar 30 07:19:24 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h:
* orbsvcs/orbsvcs/IFRService/EventPortDef_i.h:
* orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h:
* orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h:
* orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h:
* orbsvcs/tests/EC_Throughput/ECT_Throughput.h:
* orbsvcs/tests/Event/Basic/Random.h:
* tests/Bug_3531_Regression/client.cpp:
* tests/Bug_3531_Regression/test_i.h:
Doxygen changes
* tests/Multiple/Multiple.idl:
Fixed problem in this idl file
-rw-r--r-- | TAO/ChangeLog | 16 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h | 14 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h | 11 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h | 9 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h | 12 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h | 45 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h | 5 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/Event/Basic/Random.h | 16 | ||||
-rw-r--r-- | TAO/tests/Bug_3531_Regression/client.cpp | 11 | ||||
-rw-r--r-- | TAO/tests/Bug_3531_Regression/test_i.h | 11 | ||||
-rw-r--r-- | TAO/tests/Multiple/Multiple.idl | 4 |
11 files changed, 62 insertions, 92 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 956056aaffe..4dd354420c9 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,19 @@ +Wed Mar 30 07:19:24 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h: + * orbsvcs/orbsvcs/IFRService/EventPortDef_i.h: + * orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h: + * orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h: + * orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h: + * orbsvcs/tests/EC_Throughput/ECT_Throughput.h: + * orbsvcs/tests/Event/Basic/Random.h: + * tests/Bug_3531_Regression/client.cpp: + * tests/Bug_3531_Regression/test_i.h: + Doxygen changes + + * tests/Multiple/Multiple.idl: + Fixed problem in this idl file + Tue Mar 29 13:20:41 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> * TAO_IDL/be_include/be_visitor_component/component_ami_rh_exh.h: diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h index 90adc1473c2..dd58f1f3810 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h @@ -32,16 +32,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL +/** + * Represents the definition of an event that is consumed + * by a component. + */ class TAO_IFRService_Export TAO_ConsumesDef_i : public virtual TAO_EventPortDef_i { - // = TITLE - // TAO_ConsumesDef_i - // - // = DESCRIPTION - // Represents the definition of an event that is consumed - // by a component. - // public: /// Constructor TAO_ConsumesDef_i (TAO_Repository_i *repo); @@ -50,8 +47,7 @@ public: virtual ~TAO_ConsumesDef_i (void); /// Return our definition kind. - virtual CORBA::DefinitionKind def_kind ( - ); + virtual CORBA::DefinitionKind def_kind (void); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h index 6b2a51ff150..23947ddff95 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h @@ -34,16 +34,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL +/** + * Represents an event port definition. EmitsDef_i, PublishesDef_i, + * and ConsumesDef_i inherit from this. + */ class TAO_IFRService_Export TAO_EventPortDef_i : public virtual TAO_Contained_i { - // = TITLE - // TAO_EventPortDef_i - // - // = DESCRIPTION - // Represents an event port definition. EmitsDef_i, PublishesDef_i, - // and ConsumesDef_i inherit from this. - // public: //// Constructor TAO_EventPortDef_i (TAO_Repository_i *repo); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h index 703baeb6bf5..cff6a17027a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h @@ -33,15 +33,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL +/** + * Represents an exception definition. + */ class TAO_IFRService_Export TAO_ExceptionDef_i : public virtual TAO_Contained_i, public virtual TAO_Container_i { - // = TITLE - // TAO_ExceptionDef_i - // - // = DESCRIPTION - // Represents an exception definition. - // public: /// Constructor TAO_ExceptionDef_i (TAO_Repository_i *repo); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h index 1034cdc79b6..36063b18354 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h @@ -35,16 +35,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL +/** + * Mixes in IDL3 attribute exceptions. + */ class TAO_IFRService_Export TAO_ExtAbstractInterfaceDef_i : public virtual TAO_AbstractInterfaceDef_i, public virtual TAO_InterfaceAttrExtension_i { - // = TITLE - // TAO_ExtAbstractInterfaceDef_i - // - // = DESCRIPTION - // Mixes in IDL3 attribute exceptions. - // public: /// Constructor TAO_ExtAbstractInterfaceDef_i (TAO_Repository_i *repo); @@ -52,8 +49,7 @@ public: /// Destructor virtual ~TAO_ExtAbstractInterfaceDef_i (void); - virtual void destroy ( - ); + virtual void destroy (void); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h index 16ae7ddbec2..64723625f61 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h @@ -32,15 +32,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL +/** + * Adds IDL3 extensions to AttributeDef. + */ class TAO_IFRService_Export TAO_ExtAttributeDef_i : public virtual TAO_AttributeDef_i { - // = TITLE - // TAO_ExtAttributeDef_i - // - // = DESCRIPTION - // Adds IDL3 extensions to AttributeDef. - // public: /// Constructor TAO_ExtAttributeDef_i (TAO_Repository_i *repo); @@ -48,45 +45,31 @@ public: /// Destructor virtual ~TAO_ExtAttributeDef_i (void); - virtual CORBA::ExcDescriptionSeq *get_exceptions ( - ); + virtual CORBA::ExcDescriptionSeq *get_exceptions (void); - CORBA::ExcDescriptionSeq *get_exceptions_i ( - ); + CORBA::ExcDescriptionSeq *get_exceptions_i (void); - virtual void get_exceptions ( - const CORBA::ExcDescriptionSeq &get_exceptions - ); + virtual void get_exceptions (const CORBA::ExcDescriptionSeq &get_exceptions); - void get_exceptions_i ( - const CORBA::ExcDescriptionSeq &get_exceptions - ); + void get_exceptions_i (const CORBA::ExcDescriptionSeq &get_exceptions); - virtual CORBA::ExcDescriptionSeq *set_exceptions ( - ); + virtual CORBA::ExcDescriptionSeq *set_exceptions (void); - CORBA::ExcDescriptionSeq *set_exceptions_i ( - ); + CORBA::ExcDescriptionSeq *set_exceptions_i (void); virtual void set_exceptions ( - const CORBA::ExcDescriptionSeq &set_exceptions - ); + const CORBA::ExcDescriptionSeq &set_exceptions); void set_exceptions_i ( - const CORBA::ExcDescriptionSeq &set_exceptions - ); + const CORBA::ExcDescriptionSeq &set_exceptions); - virtual CORBA::ExtAttributeDescription *describe_attribute ( - ); + virtual CORBA::ExtAttributeDescription *describe_attribute (void); - CORBA::ExtAttributeDescription *describe_attribute_i ( - ); + CORBA::ExtAttributeDescription *describe_attribute_i (void); // Utility function that fills sequence elements for a // ComponentDescription. - void fill_description ( - CORBA::ExtAttributeDescription &desc - ); + void fill_description (CORBA::ExtAttributeDescription &desc); private: /// Common code for the set and get varieties. diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h index 084a636c7d3..e3a3ae718ff 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h @@ -23,11 +23,6 @@ class ECT_Throughput : public ECT_Driver { - // - // = TITLE - // - // = DESCRIPTION - // public: ECT_Throughput (void); diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.h b/TAO/orbsvcs/tests/Event/Basic/Random.h index 566080cc4b1..cdfe706e511 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Random.h +++ b/TAO/orbsvcs/tests/Event/Basic/Random.h @@ -23,14 +23,12 @@ class RND_Driver; +/** + * Simple consumer object + */ class RND_Consumer : public POA_RtecEventComm::PushConsumer { - // = TITLE - // Simple consumer object - // - // = DESCRIPTION - // public: /// Constructor RND_Consumer (RND_Driver *driver); @@ -77,15 +75,13 @@ RND_Timer::RND_Timer (RND_Driver *driver) // **************************************************************** +/** + * Simple supplier object + */ class RND_Supplier : public POA_RtecEventComm::PushSupplier , public ACE_Task_Base { - // = TITLE - // Simple supplier object - // - // = DESCRIPTION - // public: /// Constructor RND_Supplier (int verbose); diff --git a/TAO/tests/Bug_3531_Regression/client.cpp b/TAO/tests/Bug_3531_Regression/client.cpp index c4dd4629b4b..90a02ce55f8 100644 --- a/TAO/tests/Bug_3531_Regression/client.cpp +++ b/TAO/tests/Bug_3531_Regression/client.cpp @@ -8,14 +8,13 @@ const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int do_shutdown = 0; +/** + * Simpler Server Client implementation + * + * Implements the Simple_Server interface in test.idl + */ class Simple_Server_i : public POA_Simple_Server { - // = TITLE - // Simpler Server Client implementation - // - // = DESCRIPTION - // Implements the Simple_Server interface in test.idl - // public: Simple_Server_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) diff --git a/TAO/tests/Bug_3531_Regression/test_i.h b/TAO/tests/Bug_3531_Regression/test_i.h index b89d5e7bdbf..b4900377b9e 100644 --- a/TAO/tests/Bug_3531_Regression/test_i.h +++ b/TAO/tests/Bug_3531_Regression/test_i.h @@ -6,14 +6,13 @@ #include "testS.h" #include "ace/Synch.h" +/** + * Simpler Server implementation + * + * Implements the Simple_Server interface in test.idl + */ class Simple_Server_i : public POA_Simple_Server, public ACE_Event_Handler { - // = TITLE - // Simpler Server implementation - // - // = DESCRIPTION - // Implements the Simple_Server interface in test.idl - // public: Simple_Server_i (CORBA::ORB_ptr orb); // ctor diff --git a/TAO/tests/Multiple/Multiple.idl b/TAO/tests/Multiple/Multiple.idl index 722874ad70a..2739c5a79b2 100644 --- a/TAO/tests/Multiple/Multiple.idl +++ b/TAO/tests/Multiple/Multiple.idl @@ -22,9 +22,6 @@ */ //============================================================================= -*/ - - module _Multiple { @@ -49,5 +46,4 @@ module _Multiple { string bottom_quote (); }; - }; |