diff options
Diffstat (limited to 'TAO/tao/AnyTypeCode')
27 files changed, 78 insertions, 105 deletions
diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp b/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp index a9d0809a0fe..19499e7aa93 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp @@ -117,7 +117,7 @@ template<typename StringType, CORBA::TypeCode_ptr TAO::TypeCode::Alias<StringType, TypeCodeType, - RefCountPolicy>::get_compact_typecode_i (void) const + RefCountPolicy>::get_compact_typecode_i () const { TAO_TypeCodeFactory_Adapter * const adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -152,7 +152,7 @@ template<typename StringType, char const * TAO::TypeCode::Alias<StringType, TypeCodeType, - RefCountPolicy>::id_i (void) const + RefCountPolicy>::id_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -165,7 +165,7 @@ template<typename StringType, char const * TAO::TypeCode::Alias<StringType, TypeCodeType, - RefCountPolicy>::name_i (void) const + RefCountPolicy>::name_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -178,7 +178,7 @@ template<typename StringType, CORBA::TypeCode_ptr TAO::TypeCode::Alias<StringType, TypeCodeType, - RefCountPolicy>::content_type_i (void) const + RefCountPolicy>::content_type_i () const { return CORBA::TypeCode::_duplicate ( diff --git a/TAO/tao/AnyTypeCode/Any.cpp b/TAO/tao/AnyTypeCode/Any.cpp index 45e7c8c7c51..da0c5d2c443 100644 --- a/TAO/tao/AnyTypeCode/Any.cpp +++ b/TAO/tao/AnyTypeCode/Any.cpp @@ -429,8 +429,7 @@ operator<<= (CORBA::Any &any, const CORBA::Any &a) any, CORBA::Any::_tao_any_destructor, CORBA::_tc_any, - a - ); + a); } // Insertion of Any - non-copying. @@ -697,8 +696,7 @@ operator>>= (const CORBA::Any &any, const CORBA::Any *&a) any, CORBA::Any::_tao_any_destructor, CORBA::_tc_any, - a - ); + a); } CORBA::Boolean diff --git a/TAO/tao/AnyTypeCode/Any.inl b/TAO/tao/AnyTypeCode/Any.inl index bdb65512148..ff717738628 100644 --- a/TAO/tao/AnyTypeCode/Any.inl +++ b/TAO/tao/AnyTypeCode/Any.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::Any_Impl * -CORBA::Any::impl (void) const +CORBA::Any::impl () const { return this->impl_; } @@ -12,8 +12,8 @@ CORBA::Any::impl (void) const // ************************************************************* ACE_INLINE -CORBA::Any_var::Any_var (void) - : ptr_ (0) +CORBA::Any_var::Any_var () + : ptr_ (nullptr) { } @@ -24,7 +24,7 @@ CORBA::Any_var::Any_var (CORBA::Any *p) } ACE_INLINE -CORBA::Any_var::~Any_var (void) +CORBA::Any_var::~Any_var () { delete this->ptr_; } @@ -42,41 +42,41 @@ CORBA::Any_var::operator const CORBA::Any *() const } ACE_INLINE CORBA::Any * -CORBA::Any_var::operator-> (void) +CORBA::Any_var::operator-> () { return this->ptr_; } ACE_INLINE const CORBA::Any & -CORBA::Any_var::in (void) const +CORBA::Any_var::in () const { return *this->ptr_; } ACE_INLINE CORBA::Any & -CORBA::Any_var::inout (void) +CORBA::Any_var::inout () { return *this->ptr_; } ACE_INLINE CORBA::Any *& -CORBA::Any_var::out (void) +CORBA::Any_var::out () { delete this->ptr_; - this->ptr_ = 0; + this->ptr_ = nullptr; return this->ptr_; } ACE_INLINE CORBA::Any * -CORBA::Any_var::_retn (void) +CORBA::Any_var::_retn () { CORBA::Any *temp = this->ptr_; - this->ptr_ = 0; + this->ptr_ = nullptr; return temp; } ACE_INLINE CORBA::Any * -CORBA::Any_var::ptr (void) const +CORBA::Any_var::ptr () const { return this->ptr_; } diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp index 7c9a1911696..065806a892b 100644 --- a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp +++ b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp @@ -71,7 +71,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL #define TAO_SYSTEM_EXCEPTION(name) \ CORBA::TypeCode_ptr \ -TAO_AnyTypeCode_Adapter_Impl::_tao_type_ ## name (void) const \ +TAO_AnyTypeCode_Adapter_Impl::_tao_type_ ## name () const \ { \ return CORBA::_tc_ ## name; \ } diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h index 566233eb0cf..f00487e15e7 100644 --- a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h +++ b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h @@ -80,7 +80,7 @@ public: TAO_SYSTEM_EXCEPTION (InvalidPolicies) #define TAO_SYSTEM_EXCEPTION(name) \ - virtual CORBA::TypeCode_ptr _tao_type_ ## name (void) const; + virtual CORBA::TypeCode_ptr _tao_type_ ## name () const; ANYTYPECODE__EXCEPTION_LIST #undef TAO_SYSTEM_EXCEPTION diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp index 9222c88dbce..e4336d70a3a 100644 --- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp @@ -136,22 +136,22 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::marshal_value (TAO_OutputCDR &cdr) template<typename T_slice, typename T_forany> const void * -TAO::Any_Array_Impl_T<T_slice, T_forany>::value (void) const +TAO::Any_Array_Impl_T<T_slice, T_forany>::value () const { return this->value_; } template<typename T_slice, typename T_forany> void -TAO::Any_Array_Impl_T<T_slice, T_forany>::free_value (void) +TAO::Any_Array_Impl_T<T_slice, T_forany>::free_value () { - if (this->value_destructor_ != 0) + if (this->value_destructor_) { (*this->value_destructor_) (this->value_); - this->value_destructor_ = 0; + this->value_destructor_ = nullptr; } - this->value_ = 0; + this->value_ = nullptr; ::CORBA::release (this->type_); } diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h index 660d3080136..5acf9822453 100644 --- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h @@ -53,8 +53,8 @@ namespace TAO CORBA::Boolean demarshal_value (TAO_InputCDR &); virtual void _tao_decode (TAO_InputCDR &); - virtual const void *value (void) const; - virtual void free_value (void); + virtual const void *value () const; + virtual void free_value (); private: T_slice * value_; diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp index 7e82b968f9f..8176c26aef0 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp @@ -121,7 +121,7 @@ TAO::Any_Basic_Impl_T<T>::marshal_value (TAO_OutputCDR &cdr) template<typename T> const void * -TAO::Any_Basic_Impl_T<T>::value (void) const +TAO::Any_Basic_Impl_T<T>::value () const { return &this->value_; } diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp index 41bb34ba6aa..39136dec62d 100644 --- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp @@ -193,7 +193,7 @@ TAO::Any_Dual_Impl_T<T>::marshal_value (TAO_OutputCDR &cdr) template<typename T> const void * -TAO::Any_Dual_Impl_T<T>::value (void) const +TAO::Any_Dual_Impl_T<T>::value () const { return this->value_; } diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp index c0ba6c2d82b..990a1881246 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp @@ -156,7 +156,7 @@ TAO::Any_Impl_T<T>::marshal_value (TAO_OutputCDR &cdr) template<typename T> const void * -TAO::Any_Impl_T<T>::value (void) const +TAO::Any_Impl_T<T>::value () const { return this->value_; } diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp index b728b74f42c..a2cd7984afd 100644 --- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp @@ -172,33 +172,33 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::marshal_value (TAO_OutputCDR &cdr) template<typename T, typename from_T, typename to_T> const void * -TAO::Any_Special_Impl_T<T, from_T, to_T>::value (void) const +TAO::Any_Special_Impl_T<T, from_T, to_T>::value () const { return this->value_; } template<typename T, typename from_T, typename to_T> void -TAO::Any_Special_Impl_T<T, from_T, to_T>::free_value (void) +TAO::Any_Special_Impl_T<T, from_T, to_T>::free_value () { - if (this->value_destructor_ != 0) + if (this->value_destructor_) { (*this->value_destructor_) (this->value_); - this->value_destructor_ = 0; + this->value_destructor_ = nullptr; } ::CORBA::release (this->type_); - this->value_ = 0; + this->value_ = nullptr; } template<typename T, typename from_T, typename to_T> void TAO::Any_Special_Impl_T<T, from_T, to_T>::_tao_decode (TAO_InputCDR &cdr) { - if (this->value_destructor_ != 0) + if (this->value_destructor_) { (*this->value_destructor_) (this->value_); - this->value_ = 0; + this->value_ = nullptr; } if (! this->demarshal_value (cdr)) diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp index 37e64256a52..842d244a2b2 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp @@ -127,7 +127,7 @@ template <typename StringType, class EnumeratorArrayType, class RefCountPolicy> CORBA::TypeCode_ptr TAO::TypeCode::Enum<StringType, EnumeratorArrayType, - RefCountPolicy>::get_compact_typecode_i (void) const + RefCountPolicy>::get_compact_typecode_i () const { ACE_Array_Base<CORBA::String_var> tc_enumerators (this->nenumerators_); @@ -162,7 +162,7 @@ TAO::TypeCode::Enum<StringType, template <typename StringType, class EnumeratorArrayType, class RefCountPolicy> char const * -TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::id_i (void) const +TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::id_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -171,7 +171,7 @@ TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::id_i (void template <typename StringType, class EnumeratorArrayType, class RefCountPolicy> char const * -TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::name_i (void) const +TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::name_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -182,7 +182,7 @@ template <typename StringType, class EnumeratorArrayType, class RefCountPolicy> CORBA::ULong TAO::TypeCode::Enum<StringType, EnumeratorArrayType, - RefCountPolicy>::member_count_i (void) const + RefCountPolicy>::member_count_i () const { return this->nenumerators_; } diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp b/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp index c637b062579..2206bebc75d 100644 --- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp @@ -64,7 +64,7 @@ TAO::TypeCode::Fixed<RefCountPolicy>::equivalent_i (CORBA::TypeCode_ptr tc) cons template <class RefCountPolicy> CORBA::TypeCode_ptr -TAO::TypeCode::Fixed<RefCountPolicy>::get_compact_typecode_i (void) const +TAO::TypeCode::Fixed<RefCountPolicy>::get_compact_typecode_i () const { // Already compact since tk_fixed TypeCodes have no name or member // names, meaning that we can simply call _duplicate() on this @@ -84,14 +84,14 @@ TAO::TypeCode::Fixed<RefCountPolicy>::get_compact_typecode_i (void) const template <class RefCountPolicy> CORBA::UShort -TAO::TypeCode::Fixed<RefCountPolicy>::fixed_digits_i (void) const +TAO::TypeCode::Fixed<RefCountPolicy>::fixed_digits_i () const { return this->digits_; } template <class RefCountPolicy> CORBA::UShort -TAO::TypeCode::Fixed<RefCountPolicy>::fixed_scale_i (void) const +TAO::TypeCode::Fixed<RefCountPolicy>::fixed_scale_i () const { return this->scale_; } diff --git a/TAO/tao/AnyTypeCode/NVList.inl b/TAO/tao/AnyTypeCode/NVList.inl index 496b37bfb9e..1cbfdfb7241 100644 --- a/TAO/tao/AnyTypeCode/NVList.inl +++ b/TAO/tao/AnyTypeCode/NVList.inl @@ -11,21 +11,21 @@ CORBA::NamedValue::NamedValue (void) ACE_INLINE const char * -CORBA::NamedValue::name (void) const +CORBA::NamedValue::name () const { return this->name_; } ACE_INLINE CORBA::Any_ptr -CORBA::NamedValue::value (void) const +CORBA::NamedValue::value () const { return const_cast<CORBA::Any_ptr> (&this->any_); } ACE_INLINE CORBA::Flags -CORBA::NamedValue::flags (void) const +CORBA::NamedValue::flags () const { return this->flags_; } @@ -44,9 +44,9 @@ CORBA::NamedValue::_duplicate (CORBA::NamedValue * x) ACE_INLINE CORBA::NamedValue* -CORBA::NamedValue::_nil (void) +CORBA::NamedValue::_nil () { - return 0; + return nullptr; } // ************************************************************* diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp b/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp index 9921f123ee5..96fa61319c1 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp @@ -78,8 +78,7 @@ TAO::TypeCode::Sequence<TypeCodeType, return Traits<TypeCodeType>::get_typecode (this->content_type_)->equal ( - rhs_content_type.in () - ); + rhs_content_type.in ()); } template <typename TypeCodeType, class RefCountPolicy> diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp index 5ef1aec82db..dbcae29f8fb 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp @@ -76,8 +76,7 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, return Traits<CORBA::TypeCode_ptr const *>::get_typecode (this->content_type_)->equal ( - rhs_content_type.in () - ); + rhs_content_type.in ()); } CORBA::Boolean @@ -98,8 +97,7 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, return Traits<CORBA::TypeCode_ptr const *>::get_typecode (this->content_type_)->equivalent ( - rhs_content_type.in () - ); + rhs_content_type.in ()); } CORBA::TypeCode_ptr diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h index 11c76119774..1760d8d49f4 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h @@ -83,7 +83,7 @@ namespace TAO virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; virtual CORBA::ULong length_i () const; - virtual CORBA::TypeCode_ptr content_type_i ( ) const; + virtual CORBA::TypeCode_ptr content_type_i () const; private: /// Element type of the sequence. diff --git a/TAO/tao/AnyTypeCode/SystemExceptionA.cpp b/TAO/tao/AnyTypeCode/SystemExceptionA.cpp index 43b786c0d7c..05fbcb8fc50 100644 --- a/TAO/tao/AnyTypeCode/SystemExceptionA.cpp +++ b/TAO/tao/AnyTypeCode/SystemExceptionA.cpp @@ -129,7 +129,6 @@ CORBA::TypeCode_ptr const CORBA::_tc_ ## name = \ STANDARD_EXCEPTION_LIST #undef TAO_SYSTEM_EXCEPTION - #define TAO_SYSTEM_EXCEPTION(name) \ void \ CORBA::operator<<= (CORBA::Any &any, const CORBA::name &ex) \ @@ -138,8 +137,7 @@ CORBA::operator<<= (CORBA::Any &any, const CORBA::name &ex) \ any, \ CORBA::name ::_tao_any_destructor, \ CORBA::_tc_ ## name, \ - ex \ - ); \ + ex); \ } STANDARD_EXCEPTION_LIST @@ -153,8 +151,7 @@ CORBA::operator<<= (CORBA::Any &any, CORBA::name *ex) \ any, \ CORBA::name ::_tao_any_destructor, \ CORBA::_tc_ ## name, \ - ex \ - ); \ + ex); \ } STANDARD_EXCEPTION_LIST diff --git a/TAO/tao/AnyTypeCode/True_RefCount_Policy.inl b/TAO/tao/AnyTypeCode/True_RefCount_Policy.inl index fa4e65da3cf..bdd78f9cc91 100644 --- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.inl +++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.inl @@ -2,19 +2,19 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO::True_RefCount_Policy::True_RefCount_Policy (void) +TAO::True_RefCount_Policy::True_RefCount_Policy () : refcount_ (1) { } ACE_INLINE void -TAO::True_RefCount_Policy::add_ref (void) +TAO::True_RefCount_Policy::add_ref () { ++this->refcount_; } ACE_INLINE void -TAO::True_RefCount_Policy::remove_ref (void) +TAO::True_RefCount_Policy::remove_ref () { const unsigned long new_count = --this->refcount_; diff --git a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.inl b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.inl index a1267fc00e0..6c3d09069bc 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.inl +++ b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.inl @@ -26,14 +26,14 @@ TAO::TypeCode::Base_Attributes<STRING_TYPE>::Base_Attributes ( template <typename STRING_TYPE> ACE_INLINE char const * -TAO::TypeCode::Base_Attributes<STRING_TYPE>::id (void) const +TAO::TypeCode::Base_Attributes<STRING_TYPE>::id () const { return Traits<STRING_TYPE>::get_string (this->id_); } template <typename STRING_TYPE> ACE_INLINE char const * -TAO::TypeCode::Base_Attributes<STRING_TYPE>::name (void) const +TAO::TypeCode::Base_Attributes<STRING_TYPE>::name () const { return Traits<STRING_TYPE>::get_string (this->name_); } @@ -44,7 +44,6 @@ TAO::TypeCode::Base_Attributes<STRING_TYPE>::name (char const * the_name) { // This method will only be instantiated in the dynamic TypeCode // case, i.e. when STRING_TYPE is CORBA::String_var. - this->name_ = the_name; } diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl index 344f917f845..0370bd091a4 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl @@ -43,7 +43,7 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::marshal ( template <typename StringType, typename TypeCodeType> ACE_INLINE char const * -TAO::TypeCode::Case<StringType, TypeCodeType>::name (void) const +TAO::TypeCode::Case<StringType, TypeCodeType>::name () const { return Traits<StringType>::get_string (this->name_); @@ -59,7 +59,7 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::name ( template <typename StringType, typename TypeCodeType> ACE_INLINE CORBA::TypeCode_ptr -TAO::TypeCode::Case<StringType, TypeCodeType>::type (void) const +TAO::TypeCode::Case<StringType, TypeCodeType>::type () const { return Traits<StringType>::get_typecode (this->type_); diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp index 6a6a6b145b9..dbb16217c47 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp @@ -277,9 +277,7 @@ TAO::TypeCode::Union<StringType, // this->ncases_, // this->default_index_, // "", -// Traits<StringType>::get_typecode (this->default_case_.type) -// ); - +// Traits<StringType>::get_typecode (this->default_case_.type)); throw ::CORBA::NO_IMPLEMENT (); } diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp index d702bec5bfc..c267a8f0dd8 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp @@ -241,9 +241,7 @@ TAO::TypeCode::Union<char const *, // this->ncases_, // this->default_index_, // "", -// Traits<char const *>::get_typecode (this->default_case_.type) -// ); - +// Traits<char const *>::get_typecode (this->default_case_.type)); throw ::CORBA::NO_IMPLEMENT (); } @@ -252,8 +250,7 @@ TAO::TypeCode::Union<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, - TAO::Null_RefCount_Policy>::id_i ( - ) const + TAO::Null_RefCount_Policy>::id_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp index e19f8a95c33..79e5fb02c9d 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp @@ -318,8 +318,7 @@ TAO::TypeCode::Value<StringType, this->type_modifier_, Traits<StringType>::get_typecode (this->concrete_base_), tc_fields, - this->nfields_ - ); + this->nfields_); } template <typename StringType, diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp index 54d40980a78..293192bb0b5 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp @@ -266,8 +266,7 @@ TAO::TypeCode::Value<char const *, this->type_modifier_, Traits<char const *>::get_typecode (this->concrete_base_), tc_fields, - this->nfields_ - ); + this->nfields_); } char const * diff --git a/TAO/tao/AnyTypeCode/WrongTransactionA.cpp b/TAO/tao/AnyTypeCode/WrongTransactionA.cpp index bd3a7c61878..ebe9d4aba4b 100644 --- a/TAO/tao/AnyTypeCode/WrongTransactionA.cpp +++ b/TAO/tao/AnyTypeCode/WrongTransactionA.cpp @@ -65,8 +65,7 @@ namespace TAO template<> CORBA::Boolean Any_Dual_Impl_T<CORBA::WrongTransaction>::demarshal_value ( - TAO_InputCDR & cdr - ) + TAO_InputCDR & cdr) { CORBA::String_var id; @@ -96,15 +95,13 @@ namespace CORBA // Copying insertion. void operator<<= ( CORBA::Any &_tao_any, - const CORBA::WrongTransaction &_tao_elem - ) + const CORBA::WrongTransaction &_tao_elem) { TAO::Any_Dual_Impl_T<CORBA::WrongTransaction>::insert_copy ( _tao_any, CORBA::WrongTransaction::_tao_any_destructor, CORBA::_tc_WrongTransaction, - _tao_elem - ); + _tao_elem); } // Non-copying insertion. @@ -117,15 +114,13 @@ void operator<<= ( _tao_any, CORBA::WrongTransaction::_tao_any_destructor, CORBA::_tc_WrongTransaction, - _tao_elem - ); + _tao_elem); } // Extraction to non-const pointer (deprecated). CORBA::Boolean operator>>= ( const CORBA::Any &_tao_any, - CORBA::WrongTransaction *&_tao_elem - ) + CORBA::WrongTransaction *&_tao_elem) { return _tao_any >>= const_cast< const CORBA::WrongTransaction *&> ( @@ -136,16 +131,14 @@ CORBA::Boolean operator>>= ( // Extraction to const pointer. CORBA::Boolean operator>>= ( const CORBA::Any &_tao_any, - const CORBA::WrongTransaction *&_tao_elem - ) + const CORBA::WrongTransaction *&_tao_elem) { return TAO::Any_Dual_Impl_T<CORBA::WrongTransaction>::extract ( _tao_any, CORBA::WrongTransaction::_tao_any_destructor, CORBA::_tc_WrongTransaction, - _tao_elem - ); + _tao_elem); } #ifdef ACE_ANY_OPS_USE_NAMESPACE diff --git a/TAO/tao/AnyTypeCode/append.cpp b/TAO/tao/AnyTypeCode/append.cpp index 69d88d32aba..aa6b2f97266 100644 --- a/TAO/tao/AnyTypeCode/append.cpp +++ b/TAO/tao/AnyTypeCode/append.cpp @@ -89,8 +89,7 @@ TAO_Marshal_Primitive::append (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) TAOLIB_DEBUG (( LM_DEBUG, - ACE_TEXT ("TAO_Marshal_Primitive::append detected error\n") - )); + ACE_TEXT ("TAO_Marshal_Primitive::append detected error\n"))); throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE); } @@ -306,8 +305,7 @@ TAO_Marshal_ObjRef::append (CORBA::TypeCode_ptr, if (TAO_debug_level > 0) TAOLIB_DEBUG (( LM_DEBUG, - ACE_TEXT ("TAO_Marshal_ObjRef::append detected error\n") - )); + ACE_TEXT ("TAO_Marshal_ObjRef::append detected error\n"))); throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE); } @@ -636,8 +634,7 @@ TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr tc, { TAOLIB_DEBUG (( LM_DEBUG, - ACE_TEXT ("TAO_Marshal_Sequence::append detected error\n") - )); + ACE_TEXT ("TAO_Marshal_Sequence::append detected error\n"))); throw ::CORBA::MARSHAL (); } @@ -820,8 +817,7 @@ TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) TAOLIB_DEBUG (( LM_DEBUG, - ACE_TEXT ("marshaling TAO_Marshal_Sequence::append detected error\n") - )); + ACE_TEXT ("marshaling TAO_Marshal_Sequence::append detected error\n"))); throw ::CORBA::MARSHAL (); } |