From f2651931f41153e7a6af659fef6fc2b9d15c3798 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 18 Aug 2023 13:39:59 +0200 Subject: [PATCH 1/2] More usage of TAOX11_NAMESPACE::PS * ridlbe/c++11/templates/srv/src/ami/exceptionholder_traits.erb: * ridlbe/c++11/templates/srv/src/array_sarg_traits.erb: * ridlbe/c++11/templates/srv/src/bitmask_sarg_traits.erb: * ridlbe/c++11/templates/srv/src/bitset_sarg_traits.erb: * ridlbe/c++11/templates/srv/src/enum_sarg_traits.erb: * ridlbe/c++11/templates/srv/src/interface_sarg_traits.erb: * ridlbe/c++11/templates/srv/src/map_sarg_traits.erb: * ridlbe/c++11/templates/srv/src/sequence_sarg_traits.erb: * ridlbe/c++11/templates/srv/src/string_sarg_traits.erb: * ridlbe/c++11/templates/srv/src/struct_sarg_traits.erb: * ridlbe/c++11/templates/srv/src/union_sarg_traits.erb: * ridlbe/c++11/templates/srv/src/value_sarg_traits.erb: * ridlbe/c++11/writers/servantsource.rb: * tao/x11/anytypecode/any_sarg_traits.h: * tao/x11/portable_server/basic_sargument_t.cpp: * tao/x11/portable_server/basic_sarguments.h: * tao/x11/portable_server/get_skel_arg.h: * tao/x11/portable_server/long_double_sargument_t.cpp: * tao/x11/portable_server/long_double_sargument_t.h: * tao/x11/portable_server/sarg_traits_t.h: * tao/x11/portable_server/special_basic_sargument_t.cpp: * tao/x11/portable_server/special_basic_sarguments.h: * tao/x11/portable_server/stub_sarg_traits.h: --- .../srv/src/ami/exceptionholder_traits.erb | 2 +- .../templates/srv/src/array_sarg_traits.erb | 2 +- .../templates/srv/src/bitmask_sarg_traits.erb | 2 +- .../templates/srv/src/bitset_sarg_traits.erb | 2 +- .../templates/srv/src/enum_sarg_traits.erb | 2 +- .../srv/src/interface_sarg_traits.erb | 2 +- .../templates/srv/src/map_sarg_traits.erb | 2 +- .../srv/src/sequence_sarg_traits.erb | 2 +- .../templates/srv/src/string_sarg_traits.erb | 2 +- .../templates/srv/src/struct_sarg_traits.erb | 2 +- .../templates/srv/src/union_sarg_traits.erb | 2 +- .../templates/srv/src/value_sarg_traits.erb | 2 +- ridlbe/c++11/writers/servantsource.rb | 4 +- tao/x11/anytypecode/any_sarg_traits.h | 22 +- tao/x11/portable_server/basic_sargument_t.cpp | 9 +- tao/x11/portable_server/basic_sarguments.h | 233 +++++++++--------- tao/x11/portable_server/get_skel_arg.h | 133 +++++----- .../long_double_sargument_t.cpp | 9 +- .../portable_server/long_double_sargument_t.h | 9 +- tao/x11/portable_server/sarg_traits_t.h | 24 +- .../special_basic_sargument_t.cpp | 9 +- .../special_basic_sarguments.h | 8 +- tao/x11/portable_server/stub_sarg_traits.h | 23 +- 23 files changed, 234 insertions(+), 273 deletions(-) diff --git a/ridlbe/c++11/templates/srv/src/ami/exceptionholder_traits.erb b/ridlbe/c++11/templates/srv/src/ami/exceptionholder_traits.erb index d5fbe8a3..5ece753f 100644 --- a/ridlbe/c++11/templates/srv/src/ami/exceptionholder_traits.erb +++ b/ridlbe/c++11/templates/srv/src/ami/exceptionholder_traits.erb @@ -5,7 +5,7 @@ #define <%= _traits_incl_guard_ %> // Arg traits specializations. template<> -class PS::SArg_Traits +class SArg_Traits : public Basic_SArg_Traits_T::ref_type, Any_Insert_Policy_Stream> { }; diff --git a/ridlbe/c++11/templates/srv/src/array_sarg_traits.erb b/ridlbe/c++11/templates/srv/src/array_sarg_traits.erb index 5141d4f3..7144c9c9 100644 --- a/ridlbe/c++11/templates/srv/src/array_sarg_traits.erb +++ b/ridlbe/c++11/templates/srv/src/array_sarg_traits.erb @@ -7,7 +7,7 @@ #define _ALIAS_<%= alias_md5 %>_SARG_TRAITS_ /// Argument traits specializations for <%= name %> template<> -class PS::SArg_Traits<<%= scoped_cxxtype %>> +class SArg_Traits<<%= scoped_cxxtype %>> : public Basic_SArg_Traits_T<<%= scoped_cxxtype %>, <% if generate_any_support? %>Any_Insert_Policy_Stream<% else %>Any_Insert_Policy_Noop<% end %>> { }; diff --git a/ridlbe/c++11/templates/srv/src/bitmask_sarg_traits.erb b/ridlbe/c++11/templates/srv/src/bitmask_sarg_traits.erb index 4d7b7705..58667a29 100644 --- a/ridlbe/c++11/templates/srv/src/bitmask_sarg_traits.erb +++ b/ridlbe/c++11/templates/srv/src/bitmask_sarg_traits.erb @@ -5,7 +5,7 @@ # define _<%= _traits_incl_guard_ %>_SARG_TRAITS_ /// Argument traits specializations for <%= name %> template<> -class PS::SArg_Traits<<%= scoped_cxxtype %>> +class SArg_Traits<<%= scoped_cxxtype %>> : public Basic_SArg_Traits_T<<%= scoped_cxxtype %>, <% if generate_any_support? %>Any_Insert_Policy_Stream<% else %>Any_Insert_Policy_Noop<% end %>> { }; diff --git a/ridlbe/c++11/templates/srv/src/bitset_sarg_traits.erb b/ridlbe/c++11/templates/srv/src/bitset_sarg_traits.erb index 4d7b7705..58667a29 100644 --- a/ridlbe/c++11/templates/srv/src/bitset_sarg_traits.erb +++ b/ridlbe/c++11/templates/srv/src/bitset_sarg_traits.erb @@ -5,7 +5,7 @@ # define _<%= _traits_incl_guard_ %>_SARG_TRAITS_ /// Argument traits specializations for <%= name %> template<> -class PS::SArg_Traits<<%= scoped_cxxtype %>> +class SArg_Traits<<%= scoped_cxxtype %>> : public Basic_SArg_Traits_T<<%= scoped_cxxtype %>, <% if generate_any_support? %>Any_Insert_Policy_Stream<% else %>Any_Insert_Policy_Noop<% end %>> { }; diff --git a/ridlbe/c++11/templates/srv/src/enum_sarg_traits.erb b/ridlbe/c++11/templates/srv/src/enum_sarg_traits.erb index 582c8651..12d53634 100644 --- a/ridlbe/c++11/templates/srv/src/enum_sarg_traits.erb +++ b/ridlbe/c++11/templates/srv/src/enum_sarg_traits.erb @@ -5,7 +5,7 @@ # define _<%= _traits_incl_guard_ %>_SARG_TRAITS_ /// Argument traits specializations for <%= name %> template<> -class PS::SArg_Traits<<%= scoped_cxxtype %>> +class SArg_Traits<<%= scoped_cxxtype %>> : public Basic_SArg_Traits_T<<%= scoped_cxxtype %>,<% if generate_any_support? %>Any_Insert_Policy_Stream<% else %>Any_Insert_Policy_Noop<% end %>> { }; diff --git a/ridlbe/c++11/templates/srv/src/interface_sarg_traits.erb b/ridlbe/c++11/templates/srv/src/interface_sarg_traits.erb index 816061b6..9a64ceb3 100644 --- a/ridlbe/c++11/templates/srv/src/interface_sarg_traits.erb +++ b/ridlbe/c++11/templates/srv/src/interface_sarg_traits.erb @@ -4,7 +4,7 @@ #if !defined (_<%= _traits_incl_guard_ %>_SARG_TRAITS_) #define _<%= _traits_incl_guard_ %>_SARG_TRAITS_ template<> -class PS::SArg_Traits<<%= scoped_cxxtype %>> +class SArg_Traits<<%= scoped_cxxtype %>> : public Basic_SArg_Traits_T<<%= scoped_cxx_traits_type %>::ref_type, <% if generate_any_support? %>Any_Insert_Policy_Stream<% else %>Any_Insert_Policy_Noop<% end %>> { }; diff --git a/ridlbe/c++11/templates/srv/src/map_sarg_traits.erb b/ridlbe/c++11/templates/srv/src/map_sarg_traits.erb index 95518747..b9eef68e 100644 --- a/ridlbe/c++11/templates/srv/src/map_sarg_traits.erb +++ b/ridlbe/c++11/templates/srv/src/map_sarg_traits.erb @@ -7,7 +7,7 @@ #define _ALIAS_<%= alias_md5 %>_SARG_TRAITS_ /// Argument traits specializations for <%= name %> template<> -class PS::SArg_Traits<<%= scoped_cxxtype %>> +class SArg_Traits<<%= scoped_cxxtype %>> : public Basic_SArg_Traits_T<<%= scoped_cxxtype %>, <% if generate_any_support? %>Any_Insert_Policy_Stream<% else %>Any_Insert_Policy_Noop<% end %>> { }; diff --git a/ridlbe/c++11/templates/srv/src/sequence_sarg_traits.erb b/ridlbe/c++11/templates/srv/src/sequence_sarg_traits.erb index 8b0f118d..df7dbcae 100644 --- a/ridlbe/c++11/templates/srv/src/sequence_sarg_traits.erb +++ b/ridlbe/c++11/templates/srv/src/sequence_sarg_traits.erb @@ -7,7 +7,7 @@ #define _ALIAS_<%= alias_md5 %>_SARG_TRAITS_ /// Argument traits specializations for <%= name %> template<> -class PS::SArg_Traits<<%= scoped_cxxtype %>> +class SArg_Traits<<%= scoped_cxxtype %>> : public Basic_SArg_Traits_T<<%= scoped_cxxtype %>, <% if generate_any_support? %><% if generate_anyinsert_adapter? %>Any_Insert_Policy_AnyInsert_Adapter<% else %>Any_Insert_Policy_Stream<% end %><% else %>Any_Insert_Policy_Noop<% end %>> { }; diff --git a/ridlbe/c++11/templates/srv/src/string_sarg_traits.erb b/ridlbe/c++11/templates/srv/src/string_sarg_traits.erb index 8b0f118d..df7dbcae 100644 --- a/ridlbe/c++11/templates/srv/src/string_sarg_traits.erb +++ b/ridlbe/c++11/templates/srv/src/string_sarg_traits.erb @@ -7,7 +7,7 @@ #define _ALIAS_<%= alias_md5 %>_SARG_TRAITS_ /// Argument traits specializations for <%= name %> template<> -class PS::SArg_Traits<<%= scoped_cxxtype %>> +class SArg_Traits<<%= scoped_cxxtype %>> : public Basic_SArg_Traits_T<<%= scoped_cxxtype %>, <% if generate_any_support? %><% if generate_anyinsert_adapter? %>Any_Insert_Policy_AnyInsert_Adapter<% else %>Any_Insert_Policy_Stream<% end %><% else %>Any_Insert_Policy_Noop<% end %>> { }; diff --git a/ridlbe/c++11/templates/srv/src/struct_sarg_traits.erb b/ridlbe/c++11/templates/srv/src/struct_sarg_traits.erb index 7aca4aa9..8717d48e 100644 --- a/ridlbe/c++11/templates/srv/src/struct_sarg_traits.erb +++ b/ridlbe/c++11/templates/srv/src/struct_sarg_traits.erb @@ -5,7 +5,7 @@ # define _<%= _traits_incl_guard_ %>_SARG_TRAITS_ /// Argument traits specializations for <%= name %> template<> -class PS::SArg_Traits<<%= scoped_cxxtype %>> +class SArg_Traits<<%= scoped_cxxtype %>> : public Basic_SArg_Traits_T<<%= scoped_cxxtype %>, <% if generate_any_support? %>Any_Insert_Policy_Stream<% else %>Any_Insert_Policy_Noop<% end %>> { }; diff --git a/ridlbe/c++11/templates/srv/src/union_sarg_traits.erb b/ridlbe/c++11/templates/srv/src/union_sarg_traits.erb index 4d7b7705..58667a29 100644 --- a/ridlbe/c++11/templates/srv/src/union_sarg_traits.erb +++ b/ridlbe/c++11/templates/srv/src/union_sarg_traits.erb @@ -5,7 +5,7 @@ # define _<%= _traits_incl_guard_ %>_SARG_TRAITS_ /// Argument traits specializations for <%= name %> template<> -class PS::SArg_Traits<<%= scoped_cxxtype %>> +class SArg_Traits<<%= scoped_cxxtype %>> : public Basic_SArg_Traits_T<<%= scoped_cxxtype %>, <% if generate_any_support? %>Any_Insert_Policy_Stream<% else %>Any_Insert_Policy_Noop<% end %>> { }; diff --git a/ridlbe/c++11/templates/srv/src/value_sarg_traits.erb b/ridlbe/c++11/templates/srv/src/value_sarg_traits.erb index 406a8c3f..72575275 100644 --- a/ridlbe/c++11/templates/srv/src/value_sarg_traits.erb +++ b/ridlbe/c++11/templates/srv/src/value_sarg_traits.erb @@ -5,7 +5,7 @@ # define _<%= _traits_incl_guard_ %>_SARG_TRAITS_ /// Argument traits specializations for <%= name %> template<> -class PS::SArg_Traits<<%= scoped_cxxtype %>> +class SArg_Traits<<%= scoped_cxxtype %>> : public Basic_SArg_Traits_T<<%= scoped_cxx_in_type %>, <% if generate_any_support? %>Any_Insert_Policy_Stream<% else %>Any_Insert_Policy_Noop<% end %>> { }; diff --git a/ridlbe/c++11/writers/servantsource.rb b/ridlbe/c++11/writers/servantsource.rb index 1253460b..16e117dd 100644 --- a/ridlbe/c++11/writers/servantsource.rb +++ b/ridlbe/c++11/writers/servantsource.rb @@ -282,13 +282,13 @@ def pre_visit(parser) super println printiln('// generated from ServantSourceSArgTraitsWriter#pre_visit') - printiln('namespace TAOX11_NAMESPACE') + printiln('namespace TAOX11_NAMESPACE::PS') printiln('{') end def post_visit(parser) println - println('} // namespace TAOX11_NAMESPACE') + println('} // namespace TAOX11_NAMESPACE:PS') super end diff --git a/tao/x11/anytypecode/any_sarg_traits.h b/tao/x11/anytypecode/any_sarg_traits.h index ba2a828f..c8454963 100644 --- a/tao/x11/anytypecode/any_sarg_traits.h +++ b/tao/x11/anytypecode/any_sarg_traits.h @@ -20,20 +20,16 @@ #include "tao/x11/object.h" -namespace TAOX11_NAMESPACE +namespace TAOX11_NAMESPACE::PS { - - namespace PS + /// Used in generated code if CORBA::Any is an argument or + /// return type. + template<> + class SArg_Traits + : public Basic_SArg_Traits_T { - /// Used in generated code if CORBA::Any is an argument or - /// return type. - template<> - class SArg_Traits - : public Basic_SArg_Traits_T - { - }; - } // namespace PS -} // namespace TAOX11_NAMESPACE + }; +} // namespace TAOX11_NAMESPACE::PS #endif /* TAOX11_ANYTYPECODE_ANY_SARG_TRAITS_T_H */ diff --git a/tao/x11/portable_server/basic_sargument_t.cpp b/tao/x11/portable_server/basic_sargument_t.cpp index 6bac4d4d..03f193f5 100644 --- a/tao/x11/portable_server/basic_sargument_t.cpp +++ b/tao/x11/portable_server/basic_sargument_t.cpp @@ -13,11 +13,8 @@ #include "tao/x11/portable_server/basic_sargument_t.h" #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ -namespace TAOX11_NAMESPACE +namespace TAOX11_NAMESPACE::PS { - -namespace PS { - template class Insert_Policy> TAO_CORBA::Boolean @@ -112,8 +109,6 @@ Ret_Basic_SArgument_T::interceptor_value (TAO_CORBA::Any *any) #endif /* TAO_HAS_INTERCEPTORS */ -} // namespace PS - -} // namespace TAOX11_NAMESPACE +} // namespace TAOX11_NAMESPACE::PS #endif /* TAOX11_BASIC_SARGUMENT_T_CPP */ diff --git a/tao/x11/portable_server/basic_sarguments.h b/tao/x11/portable_server/basic_sarguments.h index 0086f2e0..13ecfd3f 100644 --- a/tao/x11/portable_server/basic_sarguments.h +++ b/tao/x11/portable_server/basic_sarguments.h @@ -18,128 +18,125 @@ #include "tao/x11/portable_server/basic_sargument_t.h" #include "tao/x11/portable_server/long_double_sargument_t.h" -namespace TAOX11_NAMESPACE +namespace TAOX11_NAMESPACE::PS { - namespace PS { - /** - * - * @brief Specialization for void return type. - * - */ - template<> - class TAOX11_PortableServer_Export SArg_Traits - { - public: - using ret_type = void; - using ret_val = TAO_TAO::RetArgument; - }; - - /** - * - * @brief Specializations for basic skeleton arg types, - * except (w)char/boolean/octet. - * - */ - template<> - class TAOX11_PortableServer_Export SArg_Traits - : public - Basic_SArg_Traits_T< - int16_t, - Any_Insert_Policy_Stream> - { - }; - - template<> - class TAOX11_PortableServer_Export SArg_Traits - : public - Basic_SArg_Traits_T< - int32_t, - Any_Insert_Policy_Stream> - { - }; - - template<> - class TAOX11_PortableServer_Export SArg_Traits - : public - Basic_SArg_Traits_T< - uint16_t, - Any_Insert_Policy_Stream> - { - }; - - template<> - class TAOX11_PortableServer_Export SArg_Traits - : public - Basic_SArg_Traits_T< - uint32_t, - Any_Insert_Policy_Stream> - { - }; - - template<> - class TAOX11_PortableServer_Export SArg_Traits - : public - Basic_SArg_Traits_T< - float, - Any_Insert_Policy_Stream> - { - }; - - template<> - class TAOX11_PortableServer_Export SArg_Traits - : public - Basic_SArg_Traits_T< - double, - Any_Insert_Policy_Stream> - { - }; - - template<> - class TAOX11_PortableServer_Export SArg_Traits - : public - Basic_SArg_Traits_T< - int64_t, - Any_Insert_Policy_Stream> - { - }; - - template<> - class TAOX11_PortableServer_Export SArg_Traits - : public - Basic_SArg_Traits_T< - uint64_t, - Any_Insert_Policy_Stream> - { - }; - - template<> - class TAOX11_PortableServer_Export SArg_Traits - : public - Basic_SArg_Traits_T< - long double, - Any_Insert_Policy_Stream> - { - }; - - template<> - class TAOX11_PortableServer_Export SArg_Traits - : public Basic_SArg_Traits_T< - std::string, + /** + * + * @brief Specialization for void return type. + * + */ + template<> + class TAOX11_PortableServer_Export SArg_Traits + { + public: + using ret_type = void; + using ret_val = TAO_TAO::RetArgument; + }; + + /** + * + * @brief Specializations for basic skeleton arg types, + * except (w)char/boolean/octet. + * + */ + template<> + class TAOX11_PortableServer_Export SArg_Traits + : public + Basic_SArg_Traits_T< + int16_t, Any_Insert_Policy_Stream> - { - }; + { + }; + + template<> + class TAOX11_PortableServer_Export SArg_Traits + : public + Basic_SArg_Traits_T< + int32_t, + Any_Insert_Policy_Stream> + { + }; + + template<> + class TAOX11_PortableServer_Export SArg_Traits + : public + Basic_SArg_Traits_T< + uint16_t, + Any_Insert_Policy_Stream> + { + }; + + template<> + class TAOX11_PortableServer_Export SArg_Traits + : public + Basic_SArg_Traits_T< + uint32_t, + Any_Insert_Policy_Stream> + { + }; + + template<> + class TAOX11_PortableServer_Export SArg_Traits + : public + Basic_SArg_Traits_T< + float, + Any_Insert_Policy_Stream> + { + }; + + template<> + class TAOX11_PortableServer_Export SArg_Traits + : public + Basic_SArg_Traits_T< + double, + Any_Insert_Policy_Stream> + { + }; + + template<> + class TAOX11_PortableServer_Export SArg_Traits + : public + Basic_SArg_Traits_T< + int64_t, + Any_Insert_Policy_Stream> + { + }; + + template<> + class TAOX11_PortableServer_Export SArg_Traits + : public + Basic_SArg_Traits_T< + uint64_t, + Any_Insert_Policy_Stream> + { + }; + + template<> + class TAOX11_PortableServer_Export SArg_Traits + : public + Basic_SArg_Traits_T< + long double, + Any_Insert_Policy_Stream> + { + }; + + template<> + class TAOX11_PortableServer_Export SArg_Traits + : public Basic_SArg_Traits_T< + std::string, + Any_Insert_Policy_Stream> + { + }; #if !defined(ACE_LACKS_STD_WSTRING) - template<> - class TAOX11_PortableServer_Export SArg_Traits - : public Basic_SArg_Traits_T< - std::wstring, - Any_Insert_Policy_Stream> - { - }; + template<> + class TAOX11_PortableServer_Export SArg_Traits + : public Basic_SArg_Traits_T< + std::wstring, + Any_Insert_Policy_Stream> + { + }; #endif - - } // namespace PS -} // namespace TAOX11_NAMESPACE +} // namespace TAOX11_NAMESPACE::PS #endif /* TAOX11_BASIC_SARGUMENTS_H */ diff --git a/tao/x11/portable_server/get_skel_arg.h b/tao/x11/portable_server/get_skel_arg.h index c1cf9e11..c1ebecc9 100644 --- a/tao/x11/portable_server/get_skel_arg.h +++ b/tao/x11/portable_server/get_skel_arg.h @@ -15,106 +15,103 @@ #include "tao/x11/arg_traits_t.h" #include "tao/x11/portable_server/sarg_traits_t.h" -namespace TAOX11_NAMESPACE +namespace TAOX11_NAMESPACE::PS { - namespace PS + /// Get return value/argument. + template + typename PS::SArg_Traits::ret_arg_type + get_ret_arg (TAO_Operation_Details const * details, + TAO::Argument * const * skel_args) { - /// Get return value/argument. - template - typename PS::SArg_Traits::ret_arg_type - get_ret_arg (TAO_Operation_Details const * details, - TAO::Argument * const * skel_args) + if (details && details->use_stub_args ()) { - if (details && details->use_stub_args ()) - { - return static_cast::ret_val *> (details->args ()[0])->arg (); + return static_cast::ret_val *> (details->args ()[0])->arg (); + } + else + { + if (skel_args) + { + return static_cast::ret_val *> (skel_args[0])->arg (); } else { - if (skel_args) - { - return static_cast::ret_val *> (skel_args[0])->arg (); - } - else - { - throw TAO_CORBA::INTERNAL (); - } + throw TAO_CORBA::INTERNAL (); } } + } - /// Get "in" argument. - template - typename PS::SArg_Traits::in_arg_type - get_in_arg (TAO_Operation_Details const * details, - TAO_TAO::Argument * const * skel_args, - size_t i) + /// Get "in" argument. + template + typename PS::SArg_Traits::in_arg_type + get_in_arg (TAO_Operation_Details const * details, + TAO_TAO::Argument * const * skel_args, + size_t i) + { + if (details && details->use_stub_args ()) + { + return static_cast::in_arg_val *> (details->args ()[i])->arg (); + } + else { - if (details && details->use_stub_args ()) + if (skel_args) { - return static_cast::in_arg_val *> (details->args ()[i])->arg (); + return static_cast::in_arg_val *> (skel_args[i])->arg (); } else { - if (skel_args) - { - return static_cast::in_arg_val *> (skel_args[i])->arg (); - } - else - { - throw TAO_CORBA::INTERNAL (); - } + throw TAO_CORBA::INTERNAL (); } } + } - /// Get "inout" argument. - template - typename PS::SArg_Traits::inout_arg_type - get_inout_arg (TAO_Operation_Details const * details, - TAO::Argument * const * skel_args, - size_t i) + /// Get "inout" argument. + template + typename PS::SArg_Traits::inout_arg_type + get_inout_arg (TAO_Operation_Details const * details, + TAO::Argument * const * skel_args, + size_t i) + { + if (details && details->use_stub_args ()) + { + return static_cast::inout_arg_val *> (details->args ()[i])->arg (); + } + else { - if (details && details->use_stub_args ()) + if (skel_args) { - return static_cast::inout_arg_val *> (details->args ()[i])->arg (); + return static_cast::inout_arg_val *> (skel_args[i])->arg (); } else { - if (skel_args) - { - return static_cast::inout_arg_val *> (skel_args[i])->arg (); - } - else - { - throw TAO_CORBA::INTERNAL (); - } + throw TAO_CORBA::INTERNAL (); } } + } - /// Get "out" argument. - template - typename PS::SArg_Traits::out_arg_type - get_out_arg (TAO_Operation_Details const * details, - TAO::Argument * const * skel_args, - size_t i) + /// Get "out" argument. + template + typename PS::SArg_Traits::out_arg_type + get_out_arg (TAO_Operation_Details const * details, + TAO::Argument * const * skel_args, + size_t i) + { + if (details && details->use_stub_args ()) + { + return static_cast::out_arg_val *> (details->args ()[i])->arg (); + } + else { - if (details && details->use_stub_args ()) + if (skel_args) { - return static_cast::out_arg_val *> (details->args ()[i])->arg (); + return static_cast::out_arg_val *> (skel_args[i])->arg (); } else { - if (skel_args) - { - return static_cast::out_arg_val *> (skel_args[i])->arg (); - } - else - { - throw TAO_CORBA::INTERNAL (); - } + throw TAO_CORBA::INTERNAL (); } } - } // namespace PS -} // namespace TAOX11_NAMESPACE + } +} // namespace TAOX11_NAMESPACE::PS #endif /* TAOX11_GET_SKEL_ARG_T_H */ diff --git a/tao/x11/portable_server/long_double_sargument_t.cpp b/tao/x11/portable_server/long_double_sargument_t.cpp index 9c70fde7..23761732 100644 --- a/tao/x11/portable_server/long_double_sargument_t.cpp +++ b/tao/x11/portable_server/long_double_sargument_t.cpp @@ -15,11 +15,8 @@ #if (ACE_SIZEOF_LONG_DOUBLE != 16) -namespace TAOX11_NAMESPACE +namespace TAOX11_NAMESPACE::PS { - -namespace PS { - template