diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-09-28 12:43:45 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-09-28 12:43:45 +0000 |
commit | 55ca99c71fe54866d85a2ff1fc5c31ac105eed9f (patch) | |
tree | b3897d505b7cb01ff9c0c0968ca05149464cf6fb | |
parent | e8ba053e33cfb121626124d5239ef798e435a494 (diff) | |
download | ATCD-55ca99c71fe54866d85a2ff1fc5c31ac105eed9f.tar.gz |
Wed Sep 28 12:42:14 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/Generic_Sequence_T.h:
* tao/Valuetype/AbstractBase.h:
* tao/Valuetype/Valuetype_Adapter_Impl.h:
Doxygen changes
* tao/Object.cpp:
* tao/PortableServer/Basic_SArgument_T.h:
* tao/DynamicAny/DynAny_i.h:
Layout changes
-rw-r--r-- | TAO/ChangeLog | 12 | ||||
-rw-r--r-- | TAO/tao/DynamicAny/DynAny_i.h | 38 | ||||
-rw-r--r-- | TAO/tao/Generic_Sequence_T.h | 8 | ||||
-rw-r--r-- | TAO/tao/Object.cpp | 3 | ||||
-rw-r--r-- | TAO/tao/PortableServer/Basic_SArgument_T.h | 1 | ||||
-rw-r--r-- | TAO/tao/Valuetype/AbstractBase.h | 6 | ||||
-rw-r--r-- | TAO/tao/Valuetype/Valuetype_Adapter_Impl.h | 2 |
7 files changed, 31 insertions, 39 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index bbbd0e5803c..526ea34585a 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,15 @@ +Wed Sep 28 12:42:14 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/Generic_Sequence_T.h: + * tao/Valuetype/AbstractBase.h: + * tao/Valuetype/Valuetype_Adapter_Impl.h: + Doxygen changes + + * tao/Object.cpp: + * tao/PortableServer/Basic_SArgument_T.h: + * tao/DynamicAny/DynAny_i.h: + Layout changes + Wed Sep 28 12:39:12 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/orbsvcs/AV/AVStreams_i.h: diff --git a/TAO/tao/DynamicAny/DynAny_i.h b/TAO/tao/DynamicAny/DynAny_i.h index 19f8a31566e..cda8f29c50a 100644 --- a/TAO/tao/DynamicAny/DynAny_i.h +++ b/TAO/tao/DynamicAny/DynAny_i.h @@ -51,50 +51,32 @@ public: ~TAO_DynAny_i (void); /// Initialize using just a TypeCode - void init (CORBA::TypeCode_ptr tc - ); + void init (CORBA::TypeCode_ptr tc); /// Initialize using an Any. - void init (const CORBA::Any& any - ); + void init (const CORBA::Any& any); // = LocalObject methods. - static TAO_DynAny_i *_narrow ( - CORBA::Object_ptr obj - ); + static TAO_DynAny_i *_narrow (CORBA::Object_ptr obj); // = DynAny common functions not implemented in class TAO_DynCommon. - virtual void from_any ( - const CORBA::Any & value - ) -; + virtual void from_any (const CORBA::Any & value); - virtual CORBA::Any * to_any ( - void) -; + virtual CORBA::Any * to_any (void); - virtual CORBA::Boolean equal ( - DynamicAny::DynAny_ptr dyn_any - ) -; + virtual CORBA::Boolean equal (DynamicAny::DynAny_ptr dyn_any); - virtual void destroy ( - void) -; + virtual void destroy (void); - virtual DynamicAny::DynAny_ptr current_component ( - void) -; + virtual DynamicAny::DynAny_ptr current_component (void); private: /// Check if the typecode is acceptable. - void check_typecode (CORBA::TypeCode_ptr tc - ); + void check_typecode (CORBA::TypeCode_ptr tc); /// Used when we are created from a typecode. - void set_to_default_value (CORBA::TypeCode_ptr tc - ); + void set_to_default_value (CORBA::TypeCode_ptr tc); /// Called by both versions of init(). void init_common (void); diff --git a/TAO/tao/Generic_Sequence_T.h b/TAO/tao/Generic_Sequence_T.h index f977d4af29f..58500da4aa5 100644 --- a/TAO/tao/Generic_Sequence_T.h +++ b/TAO/tao/Generic_Sequence_T.h @@ -375,26 +375,26 @@ public: typedef Generic_Sequence_Reverse_Iterator<generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS> > reverse_iterator; typedef Const_Generic_Sequence_Reverse_Iterator<generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS> > const_reverse_iterator; - // Get an iterator that points to the beginning of the sequence. + /// Get an iterator that points to the beginning of the sequence. iterator begin (void) { return typename generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS>::iterator (this); } - // Get a const iterator that points to the beginning of the sequence. + /// Get a const iterator that points to the beginning of the sequence. const_iterator begin (void) const { return typename generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS>::const_iterator (this); } - // Get an iterator that points to the end of the sequence. + /// Get an iterator that points to the end of the sequence. iterator end (void) { return typename generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS>::iterator (this, this->length_); } - // Get a const iterator that points to the end of the sequence. + /// Get a const iterator that points to the end of the sequence. const_iterator end (void) const { return typename generic_sequence<T, ALLOCATION_TRAITS, ELEMENT_TRAITS>::const_iterator (this, diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index 281f168c93f..8b8ed8d7fdb 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -128,8 +128,7 @@ CORBA::Object::marshal (TAO_OutputCDR &cdr) } /*static*/ CORBA::Boolean -CORBA::Object::marshal (const CORBA::Object_ptr x, - TAO_OutputCDR &cdr) +CORBA::Object::marshal (const CORBA::Object_ptr x, TAO_OutputCDR &cdr) { if (x == 0) { diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.h b/TAO/tao/PortableServer/Basic_SArgument_T.h index ed235cf0bcd..0d0bd17ec1c 100644 --- a/TAO/tao/PortableServer/Basic_SArgument_T.h +++ b/TAO/tao/PortableServer/Basic_SArgument_T.h @@ -140,7 +140,6 @@ namespace TAO typedef inout_type inout_arg_type; typedef out_type out_arg_type; typedef out_type ret_arg_type; - }; } diff --git a/TAO/tao/Valuetype/AbstractBase.h b/TAO/tao/Valuetype/AbstractBase.h index c03a2061f3f..d0c9620e14d 100644 --- a/TAO/tao/Valuetype/AbstractBase.h +++ b/TAO/tao/Valuetype/AbstractBase.h @@ -118,8 +118,8 @@ namespace CORBA /// Return the equivalent object reference. /** - * The object is not refcounted. The caler should not put this in - * a var or some such thing. The memory is owned by <this> + * The object is not refcounted. The caller should not put this in + * a var or some such thing. The memory is owned by @c this * object. */ CORBA::Object_ptr equivalent_objref (void); @@ -157,7 +157,7 @@ namespace CORBA /// Our equivalent CORBA::Object version /// @todo We may at some point of time should probably cache a - /// version of CORBA::ValueBase + /// version of CORBA::ValueBase CORBA::Object_var equivalent_obj_; }; diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h index d9f83443214..55a6b72d1ba 100644 --- a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h +++ b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h @@ -35,7 +35,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * * Class that adapts various functions involving the Valuetype, * ValueFactory and AbstractInterface classes. This is a concrete class - * implementating the pure virtual methods of TAO_Valuetype_Adapter + * implementing the pure virtual methods of TAO_Valuetype_Adapter */ class TAO_Valuetype_Export TAO_Valuetype_Adapter_Impl : public TAO_Valuetype_Adapter |