diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp | 41 |
1 files changed, 14 insertions, 27 deletions
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp index 848677edd13..02e14e8859e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp @@ -3,13 +3,13 @@ #ifndef TAO_IFR_SERVICE_UTILS_T_CPP #define TAO_IFR_SERVICE_UTILS_T_CPP -#include "orbsvcs/IFRService/IFR_Service_Utils_T.h" -#include "orbsvcs/IFRService/IFR_Service_Utils.h" -#include "orbsvcs/IFRService/Repository_i.h" +#include "IFR_Service_Utils_T.h" +#include "IFR_Service_Utils.h" +#include "Repository_i.h" #include "ace/SString.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL + template<typename T> void @@ -276,13 +276,17 @@ TAO_Port_Desc_Seq_Utils<T_desc_seq>::port_descriptions ( template<typename T_desc_seq> void TAO_Port_Desc_Seq_Utils<T_desc_seq>::get_is_multiple ( - T_desc_seq & /* desc_seq */, - ACE_Configuration * /* config */, - ACE_Configuration_Section_Key & /* key */, - CORBA::ULong /* index */ + T_desc_seq &desc_seq, + ACE_Configuration *config, + ACE_Configuration_Section_Key &key, + CORBA::ULong index ) { // All types except UsesDescription have no is_multiple member. + ACE_UNUSED_ARG (desc_seq); + ACE_UNUSED_ARG (config); + ACE_UNUSED_ARG (key); + ACE_UNUSED_ARG (index); } template<typename T_desc_seq> @@ -357,33 +361,16 @@ TAO_Port_Utils<T>::create_entry (const char *id, ACE_ENV_ARG_PARAMETER); } -#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x582) -// Borland gives warnings about argument not used on the construct as used -// for the other compilers. This has been reported to Borland, adding -// a workaround to suppress these warnings so that the real important ones -// are not missed. template<typename T> void TAO_Port_Utils<T>::set_is_multiple (CORBA::Boolean is_multiple, - ACE_Configuration * config, + ACE_Configuration *config, ACE_Configuration_Section_Key &key) { + /// Do nothing for eveything except UsesDef. ACE_UNUSED_ARG (is_multiple); ACE_UNUSED_ARG (config); ACE_UNUSED_ARG (key); - // Do nothing for everything except UsesDef. } -#else -template<typename T> -void -TAO_Port_Utils<T>::set_is_multiple (CORBA::Boolean /* is_multiple */, - ACE_Configuration * /* config */, - ACE_Configuration_Section_Key & /* key */) -{ - // Do nothing for everything except UsesDef. -} -#endif - -TAO_END_VERSIONED_NAMESPACE_DECL #endif /* TAO_IFR_SERVICE_UTILS_T_CPP */ |