diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp index ee750df8f22..dd523803cd6 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h" -#include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h" -#include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h" +#include "ForwardCtrlServerInterceptor.h" +#include "GroupInfoPublisher.h" +#include "IOGR_Maker.h" #include "tao/PortableServer/PortableServer.h" #include "../Utils/resolve_init.h" #include "../Utils/Safe_InputCDR.h" @@ -17,8 +17,6 @@ ACE_RCSID (EventChannel, ForwardCtrlServerInterceptor, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - CORBA::Object_ptr get_target(PortableInterceptor::ServerRequestInfo_ptr ri ACE_ENV_ARG_DECL) { @@ -192,7 +190,7 @@ void ForwardCtrlServerInterceptor::send_reply (PortableInterceptor::ServerReques // pass a new IOGR if the client use an outdated version IOGR_Maker* maker = IOGR_Maker::instance(); - TAO_FTRTEC::Log(3, "Current GROUP Version = %d, received version = %d\n", + TAO_FTRTEC::Log(3, ACE_TEXT("Current GROUP Version = %d, received version = %d\n"), maker->get_ref_version(), version); if (version < maker->get_ref_version()) { @@ -256,5 +254,3 @@ void ForwardCtrlServerInterceptor::send_other (PortableInterceptor::ServerReques PortableInterceptor::ForwardRequest)) { } - -TAO_END_VERSIONED_NAMESPACE_DECL |