diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-02-20 17:50:09 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-02-20 17:50:09 +0000 |
| commit | f867624380ba0003c2a7af8c289738ebe358fb8b (patch) | |
| tree | e525bff1d716f4a9b884898cb87db5ef7d1200cb /TAO/tao/MCAST_Parser.cpp | |
| parent | 7e31ea97370b17e12614547535bc60696f9ab57b (diff) | |
| download | ATCD-f867624380ba0003c2a7af8c289738ebe358fb8b.tar.gz | |
ChangeLogTag:Thu Feb 20 09:07:56 2003 Ossama Othman <ossama@uci.edu>
Diffstat (limited to 'TAO/tao/MCAST_Parser.cpp')
| -rw-r--r-- | TAO/tao/MCAST_Parser.cpp | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/TAO/tao/MCAST_Parser.cpp b/TAO/tao/MCAST_Parser.cpp index 5ab85188a43..61d4e7efc13 100644 --- a/TAO/tao/MCAST_Parser.cpp +++ b/TAO/tao/MCAST_Parser.cpp @@ -1,13 +1,12 @@ -// $Id$ - #include "MCAST_Parser.h" #include "default_ports.h" -#include "tao/Object_Loader.h" -#include "tao/Object.h" -#include "tao/ORB.h" -#include "tao/Exception.h" -#include "tao/Environment.h" -#include "tao/debug.h" +#include "Object_Loader.h" +#include "Object.h" +#include "ORB_Core.h" +#include "Exception.h" +#include "Environment.h" +#include "debug.h" + #include "ace/Read_Buffer.h" #include "ace/INET_Addr.h" #include "ace/SOCK_Acceptor.h" @@ -18,13 +17,18 @@ #include "MCAST_Parser.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(tao, MCAST_Parser, "$Id$") + +ACE_RCSID (tao, + MCAST_Parser, + "$Id$") + + +static const char mcast_prefix[] = "mcast:"; TAO_MCAST_Parser::~TAO_MCAST_Parser (void) { } -static const char mcast_prefix[] = "mcast:"; int TAO_MCAST_Parser::match_prefix (const char *ior_string) const @@ -69,7 +73,7 @@ TAO_MCAST_Parser::parse_string (const char *ior, return object; } -CORBA_Object_ptr +CORBA::Object_ptr TAO_MCAST_Parser::multicast_to_service (const char *service_name, u_short port, const char *mcast_address, @@ -84,8 +88,8 @@ TAO_MCAST_Parser::multicast_to_service (const char *service_name, CORBA::String_var cleaner; - CORBA_Object_var return_value = - CORBA_Object::_nil (); + CORBA::Object_var return_value = + CORBA::Object::_nil (); // Use UDP multicast to locate the service. int result = this->multicast_query (ior, @@ -107,8 +111,8 @@ TAO_MCAST_Parser::multicast_to_service (const char *service_name, // Convert IOR to an object reference. return_value = orb->string_to_object (ior - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA_Object::_nil ()); + ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (CORBA::Object::_nil ()); } // Return object reference. |