diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/AV/sfp.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/sfp.cpp | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp index 0046ce08f85..9c9cccf126a 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp @@ -1,21 +1,20 @@ // $Id$ -#include "orbsvcs/AV/sfp.h" -#include "tao/debug.h" +#include "sfp.h" #include "ace/ARGV.h" -#include "ace/OS_NS_strings.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "tao/debug.h" +#include "ace/OS_NS_strings.h" // default arguments to pass to use for the ORB -const char TAO_SFP_Base::TAO_SFP_ORB_ARGUMENTS[] = "-ORBObjRefStyle URL"; +const char *TAO_SFP_Base::TAO_SFP_ORB_ARGUMENTS = "-ORBObjRefStyle URL"; // SFP magic numbers -const char TAO_SFP_Base::TAO_SFP_MAGIC_NUMBER[] = "=SFP"; -const char TAO_SFP_Base::TAO_SFP_FRAGMENT_MAGIC_NUMBER[] = "FRAG"; -const char TAO_SFP_Base::TAO_SFP_START_MAGIC_NUMBER[] = "=STA"; -const char TAO_SFP_Base::TAO_SFP_CREDIT_MAGIC_NUMBER[] = "=CRE"; -const char TAO_SFP_Base::TAO_SFP_STARTREPLY_MAGIC_NUMBER[] = "=STR"; +const char *TAO_SFP_Base::TAO_SFP_MAGIC_NUMBER = "=SFP"; +const char *TAO_SFP_Base::TAO_SFP_FRAGMENT_MAGIC_NUMBER = "FRAG"; +const char *TAO_SFP_Base::TAO_SFP_START_MAGIC_NUMBER = "=STA"; +const char *TAO_SFP_Base::TAO_SFP_CREDIT_MAGIC_NUMBER = "=CRE"; +const char *TAO_SFP_Base::TAO_SFP_STARTREPLY_MAGIC_NUMBER = "=STR"; // SFP version 1.0 const unsigned char TAO_SFP_Base::TAO_SFP_MAJOR_VERSION = 1; @@ -496,7 +495,7 @@ TAO_SFP_Base::start_frame (CORBA::Octet flags, frame_header.magic_number [2] = 'F'; frame_header.magic_number [3] = 'P'; frame_header.flags = flags; - frame_header.message_type = static_cast<CORBA::Octet> (type); + frame_header.message_type = type; frame_header.message_size = 0; if (!(msg << frame_header)) return 0; @@ -1324,8 +1323,6 @@ TAO_SFP_Frame_State::reset (void) template ACE_Singleton<TAO_SFP_Base, ACE_Thread_Mutex> *ACE_Singleton<TAO_SFP_Base, ACE_Thread_Mutex>::singleton_; #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ -TAO_END_VERSIONED_NAMESPACE_DECL - ACE_FACTORY_DEFINE (TAO_AV, TAO_AV_SFP_Factory) ACE_STATIC_SVC_DEFINE (TAO_AV_SFP_Factory, ACE_TEXT ("SFP_Factory"), |