diff options
| -rw-r--r-- | TAO/tao/IIOP_ORB.cpp | 24 | ||||
| -rw-r--r-- | TAO/tao/IIOP_ORB.h | 7 | ||||
| -rw-r--r-- | TAO/tao/IIOP_Object.cpp | 6 | ||||
| -rw-r--r-- | TAO/tao/IIOP_Object.h | 10 | ||||
| -rw-r--r-- | TAO/tao/IIOP_Object.i | 4 | ||||
| -rw-r--r-- | TAO/tao/corba.h | 4 |
6 files changed, 37 insertions, 18 deletions
diff --git a/TAO/tao/IIOP_ORB.cpp b/TAO/tao/IIOP_ORB.cpp index a9ae3dbdb26..f43204a5564 100644 --- a/TAO/tao/IIOP_ORB.cpp +++ b/TAO/tao/IIOP_ORB.cpp @@ -1,16 +1,20 @@ // $Id$ // -// @(#)iioporb.cpp 1.8 95/09/19 +// @(#)iioporb.cpp 1.8 95/09/19 // Copyright 1994-1995 by Sun Microsystems Inc. // All Rights Reserved // -// IIOP: ORB pseudo-object +// IIOP: ORB pseudo-object // // This includes objref stringification/destringification for IIOP // object references. #include "tao/corba.h" +#if !defined (__ACE_INLINE__) +# include "tao/IIOP_ORB.i" +#endif /* ! __ACE_INLINE__ */ + static const char ior_prefix [] = "IOR:"; static const char iiop_prefix [] = "iiop:"; @@ -45,8 +49,8 @@ IIOP_ORB::object_to_string (CORBA::Object_ptr obj, // Marshal the objref into an encapsulation bytestream. (void) cdr.put_char (TAO_ENCAP_BYTE_ORDER); if (cdr.encode (CORBA::_tc_Object, - &obj, 0, - env) != CORBA::TypeCode::TRAVERSE_CONTINUE) + &obj, 0, + env) != CORBA::TypeCode::TRAVERSE_CONTINUE) return 0; // Now hexify the encapsulated CDR data into a string, and @@ -89,7 +93,7 @@ IIOP_ORB::object_to_string (CORBA::Object_ptr obj, // Similarly with the port, because there's no single IIOP port // to which we could default. - static const char digits [] = "0123456789"; + static const char digits [] = "0123456789"; // This only works for IIOP objrefs. If we're handed an objref // that's not an IIOP objref, fail -- application must use an @@ -98,13 +102,13 @@ IIOP_ORB::object_to_string (CORBA::Object_ptr obj, IIOP_Object *obj2; if (obj->QueryInterface (IID_IIOP_Object, - (void **) &obj2) != TAO_NOERROR) + (void **) &obj2) != TAO_NOERROR) { env.exception (new CORBA_DATA_CONVERSION (CORBA::COMPLETED_NO)); return 0; - } + } - if (!obj2) // null? + if (!obj2) // null? return CORBA::string_copy ((CORBA::String) iiop_prefix); CORBA::String_var key; @@ -182,8 +186,8 @@ ior_string_to_object (CORBA::String str, stream.setup_encapsulation (buffer, len); if (stream.decode (CORBA::_tc_Object, - &objref, 0, - env) != CORBA::TypeCode::TRAVERSE_CONTINUE) + &objref, 0, + env) != CORBA::TypeCode::TRAVERSE_CONTINUE) objref = 0; delete [] buffer; diff --git a/TAO/tao/IIOP_ORB.h b/TAO/tao/IIOP_ORB.h index 84b47ef8efe..943e6a5c9d2 100644 --- a/TAO/tao/IIOP_ORB.h +++ b/TAO/tao/IIOP_ORB.h @@ -1,4 +1,5 @@ // This may look like C, but it's really -*- C++ -*- +// $Id$ // ============================================================================ // @@ -72,4 +73,8 @@ private: typedef IIOP_ORB *IIOP_ORB_ptr; -#endif /* TAO_IIOPORB_H */ +#if defined (__ACE_INLINE__) +# include "tao/IIOP_ORB.i" +#endif /* __ACE_INLINE__ */ + +#endif /* TAO_IIOPORB_H */ diff --git a/TAO/tao/IIOP_Object.cpp b/TAO/tao/IIOP_Object.cpp index 33829eb8c6b..bcb282ae48b 100644 --- a/TAO/tao/IIOP_Object.cpp +++ b/TAO/tao/IIOP_Object.cpp @@ -12,6 +12,10 @@ #include "tao/corba.h" +#if !defined (__ACE_INLINE__) +# include "tao/IIOP_Object.i" +#endif /* ! __ACE_INLINE__ */ + int IIOP::Profile::set (const char *h, const CORBA::UShort p, @@ -207,7 +211,7 @@ IIOP_Object::hash (CORBA::ULong max, } int operator==(const TAO_opaque& rhs, - const TAO_opaque& lhs) + const TAO_opaque& lhs) { if (rhs.length () != lhs.length ()) return 0; diff --git a/TAO/tao/IIOP_Object.h b/TAO/tao/IIOP_Object.h index 8d750878798..5c4d070a49b 100644 --- a/TAO/tao/IIOP_Object.h +++ b/TAO/tao/IIOP_Object.h @@ -135,7 +135,7 @@ class TAO_Export IIOP_Object : public STUB_Object // = DESCRIPTION // NOTE that this uses (single) implementation inheritance to share // most of the basic code for an object reference. - // + // // This implementation provides DII support, and an analagous // interpreter that let static stubs be very small. It's // specific to objrefs with IIOP::Profile. @@ -207,14 +207,14 @@ public: IIOP_Object (const char *host, const CORBA::UShort p, - const char *objkey, + const char *objkey, char *repository_id = 0); // This constructor will usually be used by a <_bind> call on the // client side. IIOP_Object (char *repository_id, const ACE_INET_Addr &addr, - const char *objkey); + const char *objkey); // Constructor used typically by the server side. // = Memory management. @@ -261,4 +261,8 @@ private: #endif /* __GNUG__ */ }; +#if defined (__ACE_INLINE__) +# include "tao/IIOP_Object.i" +#endif /* __ACE_INLINE__ */ + #endif /* TAO_IIOPOBJ_H */ diff --git a/TAO/tao/IIOP_Object.i b/TAO/tao/IIOP_Object.i index a8da7e90b62..333b1fb95aa 100644 --- a/TAO/tao/IIOP_Object.i +++ b/TAO/tao/IIOP_Object.i @@ -1,3 +1,5 @@ +// $Id$ + ACE_INLINE IIOP::Version::Version (CORBA::Octet maj, CORBA::Octet min) : major (maj), @@ -49,7 +51,7 @@ IIOP_Object::IIOP_Object (char *repository_id) ACE_INLINE IIOP_Object::IIOP_Object (char *repository_id, - const IIOP::Profile &a_profile) + const IIOP::Profile &a_profile) : STUB_Object (repository_id), profile (a_profile), refcount_ (0), diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h index 5bbf5209967..a2b3e56b35a 100644 --- a/TAO/tao/corba.h +++ b/TAO/tao/corba.h @@ -222,10 +222,10 @@ extern TAO_Export int operator== (const TAO_ObjectKey &l, #include "tao/Marshal.i" #include "tao/CDR.i" #include "tao/GIOP.i" -#endif /* 0 */ - #include "tao/IIOP_ORB.i" #include "tao/IIOP_Object.i" +#endif /* 0 */ + #include "tao/Server_Request.i" #include "tao/Request.i" |