diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp index 8f6fa6f6021..ffb80d8158c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp @@ -2,20 +2,22 @@ // // $Id$ -#include "CEC_TypedEventChannel.h" -#include "CEC_Dispatching.h" -#include "CEC_TypedConsumerAdmin.h" -#include "CEC_TypedSupplierAdmin.h" -#include "CEC_ConsumerControl.h" -#include "CEC_SupplierControl.h" +#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h" +#include "orbsvcs/CosEvent/CEC_Dispatching.h" +#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h" +#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h" +#include "orbsvcs/CosEvent/CEC_ConsumerControl.h" +#include "orbsvcs/CosEvent/CEC_SupplierControl.h" #include "tao/debug.h" #include "ace/Dynamic_Service.h" #if ! defined (__ACE_INLINE__) -#include "CEC_TypedEventChannel.i" +#include "orbsvcs/CosEvent/CEC_TypedEventChannel.i" #endif /* __ACE_INLINE__ */ +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + // Implementation skeleton constructor TAO_CEC_TypedEventChannel:: TAO_CEC_TypedEventChannel (const TAO_CEC_TypedEventChannel_Attributes& attr, @@ -287,7 +289,7 @@ TAO_CEC_TypedEventChannel::cache_interface_description (const char *interface_ { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("***** Base interface %s found on interface %s *****\n"), - fid->base_interfaces[base].in(), + static_cast<char const*>(fid->base_interfaces[base]), interface_ )); } } @@ -437,8 +439,6 @@ TAO_CEC_TypedEventChannel::consumer_register_uses_interace (const char *uses_int } return result; } - // Should not get here! - return -1; } // A supplier is attempting to register its supported_interface. @@ -503,8 +503,6 @@ TAO_CEC_TypedEventChannel::supplier_register_supported_interface (const char *su } return result; } - // Should not get here! - return -1; } // Function creates a NVList and populates it from the parameter information. @@ -567,3 +565,4 @@ TAO_CEC_TypedEventChannel::destroy (ACE_ENV_SINGLE_ARG_DECL) } } +TAO_END_VERSIONED_NAMESPACE_DECL |