summaryrefslogtreecommitdiff
path: root/TAO/tao/PortableServer
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/PortableServer')
-rw-r--r--TAO/tao/PortableServer/POA.cpp42
-rw-r--r--TAO/tao/PortableServer/POA.h31
-rw-r--r--TAO/tao/PortableServer/PortableServer.pidl17
-rw-r--r--TAO/tao/PortableServer/PortableServerC.cpp862
-rw-r--r--TAO/tao/PortableServer/PortableServerC.h814
-rw-r--r--TAO/tao/PortableServer/PortableServerC.i198
-rw-r--r--TAO/tao/PortableServer/RTPortableServerC.cpp55
-rw-r--r--TAO/tao/PortableServer/RTPortableServerC.h39
8 files changed, 1196 insertions, 862 deletions
diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp
index 4996eed5b6f..2c7844b960e 100644
--- a/TAO/tao/PortableServer/POA.cpp
+++ b/TAO/tao/PortableServer/POA.cpp
@@ -3089,11 +3089,11 @@ TAO_POA::create_id_for_reference (CORBA::Object_ptr the_ref,
CORBA::Environment &ACE_TRY_ENV)
ACE_THROW_SPEC ((
CORBA::SystemException,
- PortableServer::POA::WrongAdapter
+ PortableServer::NotAGroupObject
))
{
TAO_POA_PortableGroup_Hooks *hooks =
- orb_core_.portable_group ()->poa_hooks (ACE_TRY_ENV);
+ this->orb_core_.portable_group ()->poa_hooks (ACE_TRY_ENV);
ACE_CHECK_RETURN (PortableServer::ObjectId::_nil ());
PortableServer::ObjectId *obj_id =
@@ -3108,11 +3108,11 @@ TAO_POA::reference_to_ids (CORBA::Object_ptr the_ref,
CORBA::Environment &ACE_TRY_ENV)
ACE_THROW_SPEC ((
CORBA::SystemException,
- PortableServer::POA::WrongAdapter
+ PortableServer::NotAGroupObject
))
{
TAO_POA_PortableGroup_Hooks *hooks =
- orb_core_.portable_group ()->poa_hooks (ACE_TRY_ENV);
+ this->orb_core_.portable_group ()->poa_hooks (ACE_TRY_ENV);
ACE_CHECK_RETURN (PortableServer::IDs::_nil ());
PortableServer::IDs *id_list =
@@ -3122,6 +3122,40 @@ TAO_POA::reference_to_ids (CORBA::Object_ptr the_ref,
return id_list;
}
+void
+TAO_POA::associate_reference_with_id (CORBA::Object_ptr ref,
+ const PortableServer::ObjectId & oid,
+ CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((
+ CORBA::SystemException,
+ PortableServer::NotAGroupObject
+ ))
+{
+ TAO_POA_PortableGroup_Hooks *hooks =
+ this->orb_core_.portable_group ()->poa_hooks (ACE_TRY_ENV);
+ ACE_CHECK;
+
+ hooks->associate_reference_with_id (*this, ref, oid, ACE_TRY_ENV);
+ ACE_CHECK;
+}
+
+void
+TAO_POA::disassociate_reference_with_id (CORBA::Object_ptr ref,
+ const PortableServer::ObjectId & oid,
+ CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((
+ CORBA::SystemException,
+ PortableServer::NotAGroupObject
+ ))
+{
+ TAO_POA_PortableGroup_Hooks *hooks =
+ this->orb_core_.portable_group ()->poa_hooks (ACE_TRY_ENV);
+ ACE_CHECK;
+
+ hooks->disassociate_reference_with_id (*this, ref, oid, ACE_TRY_ENV);
+ ACE_CHECK;
+}
+
#endif /* TAO_HAS_MIOP == 1 */
#if (TAO_HAS_MINIMUM_POA == 0)
diff --git a/TAO/tao/PortableServer/POA.h b/TAO/tao/PortableServer/POA.h
index 07883522215..09e24355b67 100644
--- a/TAO/tao/PortableServer/POA.h
+++ b/TAO/tao/PortableServer/POA.h
@@ -627,23 +627,46 @@ public:
#if (TAO_HAS_MIOP == 1)
virtual PortableServer::ObjectId * create_id_for_reference (
CORBA::Object_ptr the_ref,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
CORBA::SystemException,
- PortableServer::POA::WrongAdapter
+ PortableServer::NotAGroupObject
));
virtual PortableServer::IDs * reference_to_ids (
CORBA::Object_ptr the_ref,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
CORBA::SystemException,
- PortableServer::POA::WrongAdapter
+ PortableServer::NotAGroupObject
));
+
+ virtual void associate_reference_with_id (
+ CORBA::Object_ptr ref,
+ const PortableServer::ObjectId & oid,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException,
+ PortableServer::NotAGroupObject
+ ));
+
+ virtual void disassociate_reference_with_id (
+ CORBA::Object_ptr ref,
+ const PortableServer::ObjectId & oid,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException,
+ PortableServer::NotAGroupObject
+ ));
+
#endif /* TAO_HAS_MIOP == 1 */
TAO_POA_Policies &policies (void);
diff --git a/TAO/tao/PortableServer/PortableServer.pidl b/TAO/tao/PortableServer/PortableServer.pidl
index f4ee6e81523..f36be07d264 100644
--- a/TAO/tao/PortableServer/PortableServer.pidl
+++ b/TAO/tao/PortableServer/PortableServer.pidl
@@ -71,8 +71,9 @@ module PortableServer {
Object forward_reference;
};
- // @@ Frank - MIOP specific calls
+ // @@ Frank - MIOP specific types
+ exception NotAGroupObject {};
typedef sequence <ObjectId> IDs;
// @@ Frank - End MIOP
@@ -287,13 +288,21 @@ module PortableServer {
Object id_to_reference( in ObjectId oid)
raises (ObjectNotActive, WrongPolicy);
- // @@ Frank - MIOP specific calls
+ // @@ Frank - MIOP specific methods
ObjectId create_id_for_reference(in CORBA::Object the_ref)
- raises (WrongAdapter);
+ raises (NotAGroupObject);
IDs reference_to_ids(in CORBA::Object the_ref)
- raises (WrongAdapter);
+ raises (NotAGroupObject);
+
+ void associate_reference_with_id (in CORBA::Object ref,
+ in ObjectId oid)
+ raises (NotAGroupObject);
+
+ void disassociate_reference_with_id (in CORBA::Object ref,
+ in ObjectId oid)
+ raises (NotAGroupObject);
// @@ Frank - End MIOP
};
diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp
index 14e9b4a9ea4..864a591ee43 100644
--- a/TAO/tao/PortableServer/PortableServerC.cpp
+++ b/TAO/tao/PortableServer/PortableServerC.cpp
@@ -22,7 +22,7 @@
#include "PortableServerC.h"
#include "POA.h"
#include "tao/ORB.h"
-#include "tao/ORB_Core.h"
+#include "tao/ORB_Core.h" // @@ Frank: Added...
#if defined (__BORLANDC__)
#pragma option -w-rvl -w-rch -w-ccc -w-aus
@@ -34,7 +34,7 @@
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+
#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_PORTABLESERVER_POALIST_CS_)
#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_PORTABLESERVER_POALIST_CS_
@@ -44,7 +44,7 @@
{
PortableServer::POA **tmp = 0;
tmp = _TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (length);
-
+
if (this->buffer_ != 0)
{
PortableServer::POA **old = ACE_reinterpret_cast (PortableServer::POA**, this->buffer_);
@@ -59,7 +59,7 @@
tmp[i] = old[i];
}
}
-
+
if (this->release_)
{
delete[] old;
@@ -67,42 +67,42 @@
}
this->buffer_ = tmp;
}
-
+
void
PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_deallocate_buffer (void)
{
if (this->buffer_ == 0 || this->release_ == 0)
return;
PortableServer::POA **tmp = ACE_reinterpret_cast (PortableServer::POA**, this->buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
{
CORBA::release (tmp[i]);
tmp[i] = PortableServer::POA::_nil ();
}
-
+
_TAO_Unbounded_Object_Sequence_PortableServer_POAList::freebuf (tmp);
this->buffer_ = 0;
}
-
+
PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::~_TAO_Unbounded_Object_Sequence_PortableServer_POAList (void)
{
this->_deallocate_buffer ();
}
-
+
void
PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
{
PortableServer::POA **tmp = ACE_reinterpret_cast (PortableServer::POA**, this->buffer_);
-
+
for (CORBA::ULong i = nl; i < ol; ++i)
{
CORBA::release (tmp[i]);
tmp[i] = PortableServer::POA::_nil ();
}
}
-
- void
+
+ void
PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_downcast (
void* target,
CORBA_Object *src,
@@ -120,11 +120,11 @@
PortableServer::POA **tmp = ACE_static_cast (PortableServer::POA**, src);
return *tmp;
}
-
+
#endif /* end #if !defined */
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
#if !defined (_PORTABLESERVER_POALIST_CS_)
#define _PORTABLESERVER_POALIST_CS_
@@ -136,30 +136,30 @@
PortableServer::POAList::POAList (void)
{}
PortableServer::POAList::POAList (CORBA::ULong max) // uses max size
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_PortableServer_POAList
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<PortableServer::POA,PortableServer::POA_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max)
{}
PortableServer::POAList::POAList (CORBA::ULong max, CORBA::ULong length, PortableServer::POA_ptr *buffer, CORBA::Boolean release)
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_PortableServer_POAList
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<PortableServer::POA,PortableServer::POA_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max, length, buffer, release)
{}
PortableServer::POAList::POAList (const POAList &seq) // copy ctor
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_PortableServer_POAList
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<PortableServer::POA,PortableServer::POA_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(seq)
{}
PortableServer::POAList::~POAList (void) // dtor
@@ -184,30 +184,30 @@ void PortableServer::POAList::_tao_any_destructor (void *x)
PortableServer::ObjectId::ObjectId (void)
{}
PortableServer::ObjectId::ObjectId (CORBA::ULong max) // uses max size
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
TAO_Unbounded_Sequence<CORBA::Octet>
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max)
{}
PortableServer::ObjectId::ObjectId (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
TAO_Unbounded_Sequence<CORBA::Octet>
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max, length, buffer, release)
{}
PortableServer::ObjectId::ObjectId (const ObjectId &seq) // copy ctor
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
TAO_Unbounded_Sequence<CORBA::Octet>
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(seq)
{}
PortableServer::ObjectId::~ObjectId (void) // dtor
@@ -225,17 +225,17 @@ static const CORBA::Long _oc_PortableServer_ObjectId[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
32,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x506f7274),
- ACE_NTOHL (0x61626c65),
- ACE_NTOHL (0x53657276),
- ACE_NTOHL (0x65722f4f),
- ACE_NTOHL (0x626a6563),
- ACE_NTOHL (0x7449643a),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x506f7274),
+ ACE_NTOHL (0x61626c65),
+ ACE_NTOHL (0x53657276),
+ ACE_NTOHL (0x65722f4f),
+ ACE_NTOHL (0x626a6563),
+ ACE_NTOHL (0x7449643a),
ACE_NTOHL (0x312e3000), // repository ID = IDL:PortableServer/ObjectId:1.0
9,
- ACE_NTOHL (0x4f626a65),
- ACE_NTOHL (0x63744964),
+ ACE_NTOHL (0x4f626a65),
+ ACE_NTOHL (0x63744964),
ACE_NTOHL (0x0), // name = ObjectId
CORBA::tk_sequence, // typecode kind
12, // encapsulation length
@@ -322,7 +322,7 @@ void PortableServer::ForwardRequest::_tao_encode (
{
return;
}
-
+
ACE_THROW (CORBA::MARSHAL ());
}
@@ -335,7 +335,7 @@ void PortableServer::ForwardRequest::_tao_decode (
{
return;
}
-
+
ACE_THROW (CORBA::MARSHAL ());
}
@@ -359,42 +359,42 @@ static const CORBA::Long _oc_PortableServer_ForwardRequest[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
38,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x506f7274),
- ACE_NTOHL (0x61626c65),
- ACE_NTOHL (0x53657276),
- ACE_NTOHL (0x65722f46),
- ACE_NTOHL (0x6f727761),
- ACE_NTOHL (0x72645265),
- ACE_NTOHL (0x71756573),
- ACE_NTOHL (0x743a312e),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x506f7274),
+ ACE_NTOHL (0x61626c65),
+ ACE_NTOHL (0x53657276),
+ ACE_NTOHL (0x65722f46),
+ ACE_NTOHL (0x6f727761),
+ ACE_NTOHL (0x72645265),
+ ACE_NTOHL (0x71756573),
+ ACE_NTOHL (0x743a312e),
ACE_NTOHL (0x30000000), // repository ID = IDL:PortableServer/ForwardRequest:1.0
15,
- ACE_NTOHL (0x466f7277),
- ACE_NTOHL (0x61726452),
- ACE_NTOHL (0x65717565),
+ ACE_NTOHL (0x466f7277),
+ ACE_NTOHL (0x61726452),
+ ACE_NTOHL (0x65717565),
ACE_NTOHL (0x73740000), // name = ForwardRequest
1, // member count
18,
- ACE_NTOHL (0x666f7277),
- ACE_NTOHL (0x6172645f),
- ACE_NTOHL (0x72656665),
- ACE_NTOHL (0x72656e63),
+ ACE_NTOHL (0x666f7277),
+ ACE_NTOHL (0x6172645f),
+ ACE_NTOHL (0x72656665),
+ ACE_NTOHL (0x72656e63),
ACE_NTOHL (0x65000000), // name = forward_reference
CORBA::tk_objref,
52, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
29,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f4f62),
- ACE_NTOHL (0x6a656374),
- ACE_NTOHL (0x3a312e30),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f4f62),
+ ACE_NTOHL (0x6a656374),
+ ACE_NTOHL (0x3a312e30),
ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Object:1.0
7,
- ACE_NTOHL (0x4f626a65),
+ ACE_NTOHL (0x4f626a65),
ACE_NTOHL (0x63740000), // name = Object
};
@@ -419,9 +419,135 @@ CORBA::TypeCode_ptr PortableServer::ForwardRequest::_type (void) const
return ::PortableServer::_tc_ForwardRequest;
}
+// Default constructor.
+PortableServer::NotAGroupObject::NotAGroupObject (void)
+ : CORBA_UserException ("IDL:PortableServer/NotAGroupObject:1.0")
+{
+}
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+// Destructor - all members are of self managing types.
+PortableServer::NotAGroupObject::~NotAGroupObject (void)
+{
+}
+
+void PortableServer::NotAGroupObject::_tao_any_destructor (void *x)
+{
+ NotAGroupObject *tmp = ACE_static_cast (NotAGroupObject*,x);
+ delete tmp;
+}
+
+// Copy constructor.
+PortableServer::NotAGroupObject::NotAGroupObject (const ::PortableServer::NotAGroupObject &_tao_excp)
+ : CORBA_UserException (_tao_excp._id ())
+{
+}
+
+// Assignment operator.
+PortableServer::NotAGroupObject&
+PortableServer::NotAGroupObject::operator= (const ::PortableServer::NotAGroupObject &_tao_excp)
+{
+ this->CORBA_UserException::operator= (_tao_excp);
+ return *this;
+}
+// Narrow.
+PortableServer::NotAGroupObject *
+PortableServer::NotAGroupObject::_downcast (CORBA::Exception *exc)
+{
+ if (!ACE_OS::strcmp ("IDL:PortableServer/NotAGroupObject:1.0", exc->_id ()))
+ {
+ return ACE_dynamic_cast (NotAGroupObject *, exc);
+ }
+ else
+ {
+ return 0;
+ }
+}
+
+void PortableServer::NotAGroupObject::_raise ()
+{
+ TAO_RAISE (*this);
+}
+
+void PortableServer::NotAGroupObject::_tao_encode (
+ TAO_OutputCDR &cdr,
+ CORBA::Environment &ACE_TRY_ENV
+ ) const
+{
+ if (cdr << *this)
+ {
+ return;
+ }
+
+ ACE_THROW (CORBA::MARSHAL ());
+}
+
+void PortableServer::NotAGroupObject::_tao_decode (
+ TAO_InputCDR &cdr,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+{
+ if (cdr >> *this)
+ {
+ return;
+ }
+
+ ACE_THROW (CORBA::MARSHAL ());
+}
+
+// TAO extension - the _alloc method.
+CORBA::Exception *PortableServer::NotAGroupObject::_alloc (void)
+{
+ CORBA::Exception *retval = 0;
+ ACE_NEW_RETURN (retval, ::PortableServer::NotAGroupObject, 0);
+ return retval;
+}
+
+static const CORBA::Long _oc_PortableServer_NotAGroupObject[] =
+{
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 39,
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x506f7274),
+ ACE_NTOHL (0x61626c65),
+ ACE_NTOHL (0x53657276),
+ ACE_NTOHL (0x65722f4e),
+ ACE_NTOHL (0x6f744147),
+ ACE_NTOHL (0x726f7570),
+ ACE_NTOHL (0x4f626a65),
+ ACE_NTOHL (0x63743a31),
+ ACE_NTOHL (0x2e300000), // repository ID = IDL:PortableServer/NotAGroupObject:1.0
+ 16,
+ ACE_NTOHL (0x4e6f7441),
+ ACE_NTOHL (0x47726f75),
+ ACE_NTOHL (0x704f626a),
+ ACE_NTOHL (0x65637400), // name = NotAGroupObject
+ 0, // member count
+};
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_NotAGroupObject (
+ CORBA::tk_except,
+ sizeof (_oc_PortableServer_NotAGroupObject),
+ (char *) &_oc_PortableServer_NotAGroupObject,
+ 0,
+ sizeof (PortableServer::NotAGroupObject)
+ );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableServer)
+TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_NotAGroupObject, &_tc_TAO_tc_PortableServer_NotAGroupObject)
+TAO_NAMESPACE_END
+
+
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableServer::NotAGroupObject::_type (void) const
+{
+ return ::PortableServer::_tc_NotAGroupObject;
+}
+
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
#if !defined (__TAO_UNBOUNDED_SEQUENCE_PORTABLESERVER_IDS_CS_)
#define __TAO_UNBOUNDED_SEQUENCE_PORTABLESERVER_IDS_CS_
@@ -430,43 +556,43 @@ CORBA::TypeCode_ptr PortableServer::ForwardRequest::_type (void) const
{
PortableServer::ObjectId* tmp = 0;
tmp = _TAO_Unbounded_Sequence_PortableServer_IDs::allocbuf (length);
-
+
if (this->buffer_ != 0)
{
PortableServer::ObjectId *old = ACE_reinterpret_cast (PortableServer::ObjectId *,this->buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp[i] = old[i];
-
+
if (this->release_)
_TAO_Unbounded_Sequence_PortableServer_IDs::freebuf (old);
-
+
}
this->buffer_ = tmp;
}
-
+
void
PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::_deallocate_buffer (void)
{
if (this->buffer_ == 0 || this->release_ == 0)
return;
-
+
PortableServer::ObjectId *tmp = ACE_reinterpret_cast (PortableServer::ObjectId *,this->buffer_);
-
+
_TAO_Unbounded_Sequence_PortableServer_IDs::freebuf (tmp);
this->buffer_ = 0;
- }
-
+ }
+
PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::~_TAO_Unbounded_Sequence_PortableServer_IDs (void) // Dtor.
{
this->_deallocate_buffer ();
}
-
-
+
+
#endif /* end #if !defined */
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
#if !defined (_PORTABLESERVER_IDS_CS_)
#define _PORTABLESERVER_IDS_CS_
@@ -478,30 +604,30 @@ CORBA::TypeCode_ptr PortableServer::ForwardRequest::_type (void) const
PortableServer::IDs::IDs (void)
{}
PortableServer::IDs::IDs (CORBA::ULong max) // uses max size
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_PortableServer_IDs
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<PortableServer::ObjectId>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max)
{}
PortableServer::IDs::IDs (CORBA::ULong max, CORBA::ULong length, PortableServer::ObjectId *buffer, CORBA::Boolean release)
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_PortableServer_IDs
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<PortableServer::ObjectId>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max, length, buffer, release)
{}
PortableServer::IDs::IDs (const IDs &seq) // copy ctor
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_PortableServer_IDs
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<PortableServer::ObjectId>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(seq)
{}
PortableServer::IDs::~IDs (void) // dtor
@@ -519,12 +645,12 @@ static const CORBA::Long _oc_PortableServer_IDs[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
27,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x506f7274),
- ACE_NTOHL (0x61626c65),
- ACE_NTOHL (0x53657276),
- ACE_NTOHL (0x65722f49),
- ACE_NTOHL (0x44733a31),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x506f7274),
+ ACE_NTOHL (0x61626c65),
+ ACE_NTOHL (0x53657276),
+ ACE_NTOHL (0x65722f49),
+ ACE_NTOHL (0x44733a31),
ACE_NTOHL (0x2e300000), // repository ID = IDL:PortableServer/IDs:1.0
4,
ACE_NTOHL (0x49447300), // name = IDs
@@ -535,17 +661,17 @@ static const CORBA::Long _oc_PortableServer_IDs[] =
76, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x506f7274),
- ACE_NTOHL (0x61626c65),
- ACE_NTOHL (0x53657276),
- ACE_NTOHL (0x65722f4f),
- ACE_NTOHL (0x626a6563),
- ACE_NTOHL (0x7449643a),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x506f7274),
+ ACE_NTOHL (0x61626c65),
+ ACE_NTOHL (0x53657276),
+ ACE_NTOHL (0x65722f4f),
+ ACE_NTOHL (0x626a6563),
+ ACE_NTOHL (0x7449643a),
ACE_NTOHL (0x312e3000), // repository ID = IDL:PortableServer/ObjectId:1.0
9,
- ACE_NTOHL (0x4f626a65),
- ACE_NTOHL (0x63744964),
+ ACE_NTOHL (0x4f626a65),
+ ACE_NTOHL (0x63744964),
ACE_NTOHL (0x0), // name = ObjectId
CORBA::tk_sequence, // typecode kind
12, // encapsulation length
@@ -609,34 +735,34 @@ static const CORBA::Long _oc_PortableServer_ThreadPolicyValue[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
41,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x506f7274),
- ACE_NTOHL (0x61626c65),
- ACE_NTOHL (0x53657276),
- ACE_NTOHL (0x65722f54),
- ACE_NTOHL (0x68726561),
- ACE_NTOHL (0x64506f6c),
- ACE_NTOHL (0x69637956),
- ACE_NTOHL (0x616c7565),
- ACE_NTOHL (0x3a312e30),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x506f7274),
+ ACE_NTOHL (0x61626c65),
+ ACE_NTOHL (0x53657276),
+ ACE_NTOHL (0x65722f54),
+ ACE_NTOHL (0x68726561),
+ ACE_NTOHL (0x64506f6c),
+ ACE_NTOHL (0x69637956),
+ ACE_NTOHL (0x616c7565),
+ ACE_NTOHL (0x3a312e30),
ACE_NTOHL (0x0), // repository ID = IDL:PortableServer/ThreadPolicyValue:1.0
18,
- ACE_NTOHL (0x54687265),
- ACE_NTOHL (0x6164506f),
- ACE_NTOHL (0x6c696379),
- ACE_NTOHL (0x56616c75),
+ ACE_NTOHL (0x54687265),
+ ACE_NTOHL (0x6164506f),
+ ACE_NTOHL (0x6c696379),
+ ACE_NTOHL (0x56616c75),
ACE_NTOHL (0x65000000), // name = ThreadPolicyValue
2, // member count
15,
- ACE_NTOHL (0x4f52425f),
- ACE_NTOHL (0x4354524c),
- ACE_NTOHL (0x5f4d4f44),
+ ACE_NTOHL (0x4f52425f),
+ ACE_NTOHL (0x4354524c),
+ ACE_NTOHL (0x5f4d4f44),
ACE_NTOHL (0x454c0000), // name = ORB_CTRL_MODEL
20,
- ACE_NTOHL (0x53494e47),
- ACE_NTOHL (0x4c455f54),
- ACE_NTOHL (0x48524541),
- ACE_NTOHL (0x445f4d4f),
+ ACE_NTOHL (0x53494e47),
+ ACE_NTOHL (0x4c455f54),
+ ACE_NTOHL (0x48524541),
+ ACE_NTOHL (0x445f4d4f),
ACE_NTOHL (0x44454c00), // name = SINGLE_THREAD_MODEL
};
@@ -701,7 +827,7 @@ PortableServer::ThreadPolicy_var::operator const ::PortableServer::ThreadPolicy_
return this->ptr_;
}
-PortableServer::ThreadPolicy_var::operator ::PortableServer::ThreadPolicy_ptr &() // cast
+PortableServer::ThreadPolicy_var::operator ::PortableServer::ThreadPolicy_ptr &() // cast
{
return this->ptr_;
}
@@ -905,7 +1031,7 @@ void *PortableServer::ThreadPolicy::_tao_QueryInterface (ptr_arith_t type)
else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
retv = ACE_reinterpret_cast (void *,
ACE_static_cast (CORBA::Object_ptr, this));
-
+
if (retv)
this->_add_ref ();
return retv;
@@ -922,31 +1048,31 @@ static const CORBA::Long _oc_PortableServer_LifespanPolicyValue[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
43,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x506f7274),
- ACE_NTOHL (0x61626c65),
- ACE_NTOHL (0x53657276),
- ACE_NTOHL (0x65722f4c),
- ACE_NTOHL (0x69666573),
- ACE_NTOHL (0x70616e50),
- ACE_NTOHL (0x6f6c6963),
- ACE_NTOHL (0x7956616c),
- ACE_NTOHL (0x75653a31),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x506f7274),
+ ACE_NTOHL (0x61626c65),
+ ACE_NTOHL (0x53657276),
+ ACE_NTOHL (0x65722f4c),
+ ACE_NTOHL (0x69666573),
+ ACE_NTOHL (0x70616e50),
+ ACE_NTOHL (0x6f6c6963),
+ ACE_NTOHL (0x7956616c),
+ ACE_NTOHL (0x75653a31),
ACE_NTOHL (0x2e300000), // repository ID = IDL:PortableServer/LifespanPolicyValue:1.0
20,
- ACE_NTOHL (0x4c696665),
- ACE_NTOHL (0x7370616e),
- ACE_NTOHL (0x506f6c69),
- ACE_NTOHL (0x63795661),
+ ACE_NTOHL (0x4c696665),
+ ACE_NTOHL (0x7370616e),
+ ACE_NTOHL (0x506f6c69),
+ ACE_NTOHL (0x63795661),
ACE_NTOHL (0x6c756500), // name = LifespanPolicyValue
2, // member count
10,
- ACE_NTOHL (0x5452414e),
- ACE_NTOHL (0x5349454e),
+ ACE_NTOHL (0x5452414e),
+ ACE_NTOHL (0x5349454e),
ACE_NTOHL (0x54000000), // name = TRANSIENT
11,
- ACE_NTOHL (0x50455253),
- ACE_NTOHL (0x49535445),
+ ACE_NTOHL (0x50455253),
+ ACE_NTOHL (0x49535445),
ACE_NTOHL (0x4e540000), // name = PERSISTENT
};
@@ -1011,7 +1137,7 @@ PortableServer::LifespanPolicy_var::operator const ::PortableServer::LifespanPol
return this->ptr_;
}
-PortableServer::LifespanPolicy_var::operator ::PortableServer::LifespanPolicy_ptr &() // cast
+PortableServer::LifespanPolicy_var::operator ::PortableServer::LifespanPolicy_ptr &() // cast
{
return this->ptr_;
}
@@ -1215,7 +1341,7 @@ void *PortableServer::LifespanPolicy::_tao_QueryInterface (ptr_arith_t type)
else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
retv = ACE_reinterpret_cast (void *,
ACE_static_cast (CORBA::Object_ptr, this));
-
+
if (retv)
this->_add_ref ();
return retv;
@@ -1230,33 +1356,33 @@ static const CORBA::Long _oc_PortableServer_IdUniquenessPolicyValue[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
47,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x506f7274),
- ACE_NTOHL (0x61626c65),
- ACE_NTOHL (0x53657276),
- ACE_NTOHL (0x65722f49),
- ACE_NTOHL (0x64556e69),
- ACE_NTOHL (0x7175656e),
- ACE_NTOHL (0x65737350),
- ACE_NTOHL (0x6f6c6963),
- ACE_NTOHL (0x7956616c),
- ACE_NTOHL (0x75653a31),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x506f7274),
+ ACE_NTOHL (0x61626c65),
+ ACE_NTOHL (0x53657276),
+ ACE_NTOHL (0x65722f49),
+ ACE_NTOHL (0x64556e69),
+ ACE_NTOHL (0x7175656e),
+ ACE_NTOHL (0x65737350),
+ ACE_NTOHL (0x6f6c6963),
+ ACE_NTOHL (0x7956616c),
+ ACE_NTOHL (0x75653a31),
ACE_NTOHL (0x2e300000), // repository ID = IDL:PortableServer/IdUniquenessPolicyValue:1.0
24,
- ACE_NTOHL (0x4964556e),
- ACE_NTOHL (0x69717565),
- ACE_NTOHL (0x6e657373),
- ACE_NTOHL (0x506f6c69),
- ACE_NTOHL (0x63795661),
+ ACE_NTOHL (0x4964556e),
+ ACE_NTOHL (0x69717565),
+ ACE_NTOHL (0x6e657373),
+ ACE_NTOHL (0x506f6c69),
+ ACE_NTOHL (0x63795661),
ACE_NTOHL (0x6c756500), // name = IdUniquenessPolicyValue
2, // member count
10,
- ACE_NTOHL (0x554e4951),
- ACE_NTOHL (0x55455f49),
+ ACE_NTOHL (0x554e4951),
+ ACE_NTOHL (0x55455f49),
ACE_NTOHL (0x44000000), // name = UNIQUE_ID
12,
- ACE_NTOHL (0x4d554c54),
- ACE_NTOHL (0x49504c45),
+ ACE_NTOHL (0x4d554c54),
+ ACE_NTOHL (0x49504c45),
ACE_NTOHL (0x5f494400), // name = MULTIPLE_ID
};
@@ -1321,7 +1447,7 @@ PortableServer::IdUniquenessPolicy_var::operator const ::PortableServer::IdUniqu
return this->ptr_;
}
-PortableServer::IdUniquenessPolicy_var::operator ::PortableServer::IdUniquenessPolicy_ptr &() // cast
+PortableServer::IdUniquenessPolicy_var::operator ::PortableServer::IdUniquenessPolicy_ptr &() // cast
{
return this->ptr_;
}
@@ -1525,7 +1651,7 @@ void *PortableServer::IdUniquenessPolicy::_tao_QueryInterface (ptr_arith_t type)
else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
retv = ACE_reinterpret_cast (void *,
ACE_static_cast (CORBA::Object_ptr, this));
-
+
if (retv)
this->_add_ref ();
return retv;
@@ -1540,32 +1666,32 @@ static const CORBA::Long _oc_PortableServer_IdAssignmentPolicyValue[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
47,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x506f7274),
- ACE_NTOHL (0x61626c65),
- ACE_NTOHL (0x53657276),
- ACE_NTOHL (0x65722f49),
- ACE_NTOHL (0x64417373),
- ACE_NTOHL (0x69676e6d),
- ACE_NTOHL (0x656e7450),
- ACE_NTOHL (0x6f6c6963),
- ACE_NTOHL (0x7956616c),
- ACE_NTOHL (0x75653a31),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x506f7274),
+ ACE_NTOHL (0x61626c65),
+ ACE_NTOHL (0x53657276),
+ ACE_NTOHL (0x65722f49),
+ ACE_NTOHL (0x64417373),
+ ACE_NTOHL (0x69676e6d),
+ ACE_NTOHL (0x656e7450),
+ ACE_NTOHL (0x6f6c6963),
+ ACE_NTOHL (0x7956616c),
+ ACE_NTOHL (0x75653a31),
ACE_NTOHL (0x2e300000), // repository ID = IDL:PortableServer/IdAssignmentPolicyValue:1.0
24,
- ACE_NTOHL (0x49644173),
- ACE_NTOHL (0x7369676e),
- ACE_NTOHL (0x6d656e74),
- ACE_NTOHL (0x506f6c69),
- ACE_NTOHL (0x63795661),
+ ACE_NTOHL (0x49644173),
+ ACE_NTOHL (0x7369676e),
+ ACE_NTOHL (0x6d656e74),
+ ACE_NTOHL (0x506f6c69),
+ ACE_NTOHL (0x63795661),
ACE_NTOHL (0x6c756500), // name = IdAssignmentPolicyValue
2, // member count
8,
- ACE_NTOHL (0x55534552),
+ ACE_NTOHL (0x55534552),
ACE_NTOHL (0x5f494400), // name = USER_ID
10,
- ACE_NTOHL (0x53595354),
- ACE_NTOHL (0x454d5f49),
+ ACE_NTOHL (0x53595354),
+ ACE_NTOHL (0x454d5f49),
ACE_NTOHL (0x44000000), // name = SYSTEM_ID
};
@@ -1630,7 +1756,7 @@ PortableServer::IdAssignmentPolicy_var::operator const ::PortableServer::IdAssig
return this->ptr_;
}
-PortableServer::IdAssignmentPolicy_var::operator ::PortableServer::IdAssignmentPolicy_ptr &() // cast
+PortableServer::IdAssignmentPolicy_var::operator ::PortableServer::IdAssignmentPolicy_ptr &() // cast
{
return this->ptr_;
}
@@ -1834,7 +1960,7 @@ void *PortableServer::IdAssignmentPolicy::_tao_QueryInterface (ptr_arith_t type)
else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
retv = ACE_reinterpret_cast (void *,
ACE_static_cast (CORBA::Object_ptr, this));
-
+
if (retv)
this->_add_ref ();
return retv;
@@ -1851,42 +1977,42 @@ static const CORBA::Long _oc_PortableServer_ImplicitActivationPolicyValue[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
53,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x506f7274),
- ACE_NTOHL (0x61626c65),
- ACE_NTOHL (0x53657276),
- ACE_NTOHL (0x65722f49),
- ACE_NTOHL (0x6d706c69),
- ACE_NTOHL (0x63697441),
- ACE_NTOHL (0x63746976),
- ACE_NTOHL (0x6174696f),
- ACE_NTOHL (0x6e506f6c),
- ACE_NTOHL (0x69637956),
- ACE_NTOHL (0x616c7565),
- ACE_NTOHL (0x3a312e30),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x506f7274),
+ ACE_NTOHL (0x61626c65),
+ ACE_NTOHL (0x53657276),
+ ACE_NTOHL (0x65722f49),
+ ACE_NTOHL (0x6d706c69),
+ ACE_NTOHL (0x63697441),
+ ACE_NTOHL (0x63746976),
+ ACE_NTOHL (0x6174696f),
+ ACE_NTOHL (0x6e506f6c),
+ ACE_NTOHL (0x69637956),
+ ACE_NTOHL (0x616c7565),
+ ACE_NTOHL (0x3a312e30),
ACE_NTOHL (0x0), // repository ID = IDL:PortableServer/ImplicitActivationPolicyValue:1.0
30,
- ACE_NTOHL (0x496d706c),
- ACE_NTOHL (0x69636974),
- ACE_NTOHL (0x41637469),
- ACE_NTOHL (0x76617469),
- ACE_NTOHL (0x6f6e506f),
- ACE_NTOHL (0x6c696379),
- ACE_NTOHL (0x56616c75),
+ ACE_NTOHL (0x496d706c),
+ ACE_NTOHL (0x69636974),
+ ACE_NTOHL (0x41637469),
+ ACE_NTOHL (0x76617469),
+ ACE_NTOHL (0x6f6e506f),
+ ACE_NTOHL (0x6c696379),
+ ACE_NTOHL (0x56616c75),
ACE_NTOHL (0x65000000), // name = ImplicitActivationPolicyValue
2, // member count
20,
- ACE_NTOHL (0x494d504c),
- ACE_NTOHL (0x49434954),
- ACE_NTOHL (0x5f414354),
- ACE_NTOHL (0x49564154),
+ ACE_NTOHL (0x494d504c),
+ ACE_NTOHL (0x49434954),
+ ACE_NTOHL (0x5f414354),
+ ACE_NTOHL (0x49564154),
ACE_NTOHL (0x494f4e00), // name = IMPLICIT_ACTIVATION
23,
- ACE_NTOHL (0x4e4f5f49),
- ACE_NTOHL (0x4d504c49),
- ACE_NTOHL (0x4349545f),
- ACE_NTOHL (0x41435449),
- ACE_NTOHL (0x56415449),
+ ACE_NTOHL (0x4e4f5f49),
+ ACE_NTOHL (0x4d504c49),
+ ACE_NTOHL (0x4349545f),
+ ACE_NTOHL (0x41435449),
+ ACE_NTOHL (0x56415449),
ACE_NTOHL (0x4f4e0000), // name = NO_IMPLICIT_ACTIVATION
};
@@ -1951,7 +2077,7 @@ PortableServer::ImplicitActivationPolicy_var::operator const ::PortableServer::I
return this->ptr_;
}
-PortableServer::ImplicitActivationPolicy_var::operator ::PortableServer::ImplicitActivationPolicy_ptr &() // cast
+PortableServer::ImplicitActivationPolicy_var::operator ::PortableServer::ImplicitActivationPolicy_ptr &() // cast
{
return this->ptr_;
}
@@ -2155,7 +2281,7 @@ void *PortableServer::ImplicitActivationPolicy::_tao_QueryInterface (ptr_arith_t
else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
retv = ACE_reinterpret_cast (void *,
ACE_static_cast (CORBA::Object_ptr, this));
-
+
if (retv)
this->_add_ref ();
return retv;
@@ -2170,34 +2296,34 @@ static const CORBA::Long _oc_PortableServer_ServantRetentionPolicyValue[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
51,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x506f7274),
- ACE_NTOHL (0x61626c65),
- ACE_NTOHL (0x53657276),
- ACE_NTOHL (0x65722f53),
- ACE_NTOHL (0x65727661),
- ACE_NTOHL (0x6e745265),
- ACE_NTOHL (0x74656e74),
- ACE_NTOHL (0x696f6e50),
- ACE_NTOHL (0x6f6c6963),
- ACE_NTOHL (0x7956616c),
- ACE_NTOHL (0x75653a31),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x506f7274),
+ ACE_NTOHL (0x61626c65),
+ ACE_NTOHL (0x53657276),
+ ACE_NTOHL (0x65722f53),
+ ACE_NTOHL (0x65727661),
+ ACE_NTOHL (0x6e745265),
+ ACE_NTOHL (0x74656e74),
+ ACE_NTOHL (0x696f6e50),
+ ACE_NTOHL (0x6f6c6963),
+ ACE_NTOHL (0x7956616c),
+ ACE_NTOHL (0x75653a31),
ACE_NTOHL (0x2e300000), // repository ID = IDL:PortableServer/ServantRetentionPolicyValue:1.0
28,
- ACE_NTOHL (0x53657276),
- ACE_NTOHL (0x616e7452),
- ACE_NTOHL (0x6574656e),
- ACE_NTOHL (0x74696f6e),
- ACE_NTOHL (0x506f6c69),
- ACE_NTOHL (0x63795661),
+ ACE_NTOHL (0x53657276),
+ ACE_NTOHL (0x616e7452),
+ ACE_NTOHL (0x6574656e),
+ ACE_NTOHL (0x74696f6e),
+ ACE_NTOHL (0x506f6c69),
+ ACE_NTOHL (0x63795661),
ACE_NTOHL (0x6c756500), // name = ServantRetentionPolicyValue
2, // member count
7,
- ACE_NTOHL (0x52455441),
+ ACE_NTOHL (0x52455441),
ACE_NTOHL (0x494e0000), // name = RETAIN
11,
- ACE_NTOHL (0x4e4f4e5f),
- ACE_NTOHL (0x52455441),
+ ACE_NTOHL (0x4e4f4e5f),
+ ACE_NTOHL (0x52455441),
ACE_NTOHL (0x494e0000), // name = NON_RETAIN
};
@@ -2262,7 +2388,7 @@ PortableServer::ServantRetentionPolicy_var::operator const ::PortableServer::Ser
return this->ptr_;
}
-PortableServer::ServantRetentionPolicy_var::operator ::PortableServer::ServantRetentionPolicy_ptr &() // cast
+PortableServer::ServantRetentionPolicy_var::operator ::PortableServer::ServantRetentionPolicy_ptr &() // cast
{
return this->ptr_;
}
@@ -2466,7 +2592,7 @@ void *PortableServer::ServantRetentionPolicy::_tao_QueryInterface (ptr_arith_t t
else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
retv = ACE_reinterpret_cast (void *,
ACE_static_cast (CORBA::Object_ptr, this));
-
+
if (retv)
this->_add_ref ();
return retv;
@@ -2481,48 +2607,48 @@ static const CORBA::Long _oc_PortableServer_RequestProcessingPolicyValue[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
52,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x506f7274),
- ACE_NTOHL (0x61626c65),
- ACE_NTOHL (0x53657276),
- ACE_NTOHL (0x65722f52),
- ACE_NTOHL (0x65717565),
- ACE_NTOHL (0x73745072),
- ACE_NTOHL (0x6f636573),
- ACE_NTOHL (0x73696e67),
- ACE_NTOHL (0x506f6c69),
- ACE_NTOHL (0x63795661),
- ACE_NTOHL (0x6c75653a),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x506f7274),
+ ACE_NTOHL (0x61626c65),
+ ACE_NTOHL (0x53657276),
+ ACE_NTOHL (0x65722f52),
+ ACE_NTOHL (0x65717565),
+ ACE_NTOHL (0x73745072),
+ ACE_NTOHL (0x6f636573),
+ ACE_NTOHL (0x73696e67),
+ ACE_NTOHL (0x506f6c69),
+ ACE_NTOHL (0x63795661),
+ ACE_NTOHL (0x6c75653a),
ACE_NTOHL (0x312e3000), // repository ID = IDL:PortableServer/RequestProcessingPolicyValue:1.0
29,
- ACE_NTOHL (0x52657175),
- ACE_NTOHL (0x65737450),
- ACE_NTOHL (0x726f6365),
- ACE_NTOHL (0x7373696e),
- ACE_NTOHL (0x67506f6c),
- ACE_NTOHL (0x69637956),
- ACE_NTOHL (0x616c7565),
+ ACE_NTOHL (0x52657175),
+ ACE_NTOHL (0x65737450),
+ ACE_NTOHL (0x726f6365),
+ ACE_NTOHL (0x7373696e),
+ ACE_NTOHL (0x67506f6c),
+ ACE_NTOHL (0x69637956),
+ ACE_NTOHL (0x616c7565),
ACE_NTOHL (0x0), // name = RequestProcessingPolicyValue
3, // member count
27,
- ACE_NTOHL (0x5553455f),
- ACE_NTOHL (0x41435449),
- ACE_NTOHL (0x56455f4f),
- ACE_NTOHL (0x424a4543),
- ACE_NTOHL (0x545f4d41),
- ACE_NTOHL (0x505f4f4e),
+ ACE_NTOHL (0x5553455f),
+ ACE_NTOHL (0x41435449),
+ ACE_NTOHL (0x56455f4f),
+ ACE_NTOHL (0x424a4543),
+ ACE_NTOHL (0x545f4d41),
+ ACE_NTOHL (0x505f4f4e),
ACE_NTOHL (0x4c590000), // name = USE_ACTIVE_OBJECT_MAP_ONLY
20,
- ACE_NTOHL (0x5553455f),
- ACE_NTOHL (0x44454641),
- ACE_NTOHL (0x554c545f),
- ACE_NTOHL (0x53455256),
+ ACE_NTOHL (0x5553455f),
+ ACE_NTOHL (0x44454641),
+ ACE_NTOHL (0x554c545f),
+ ACE_NTOHL (0x53455256),
ACE_NTOHL (0x414e5400), // name = USE_DEFAULT_SERVANT
20,
- ACE_NTOHL (0x5553455f),
- ACE_NTOHL (0x53455256),
- ACE_NTOHL (0x414e545f),
- ACE_NTOHL (0x4d414e41),
+ ACE_NTOHL (0x5553455f),
+ ACE_NTOHL (0x53455256),
+ ACE_NTOHL (0x414e545f),
+ ACE_NTOHL (0x4d414e41),
ACE_NTOHL (0x47455200), // name = USE_SERVANT_MANAGER
};
@@ -2587,7 +2713,7 @@ PortableServer::RequestProcessingPolicy_var::operator const ::PortableServer::Re
return this->ptr_;
}
-PortableServer::RequestProcessingPolicy_var::operator ::PortableServer::RequestProcessingPolicy_ptr &() // cast
+PortableServer::RequestProcessingPolicy_var::operator ::PortableServer::RequestProcessingPolicy_ptr &() // cast
{
return this->ptr_;
}
@@ -2791,7 +2917,7 @@ void *PortableServer::RequestProcessingPolicy::_tao_QueryInterface (ptr_arith_t
else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
retv = ACE_reinterpret_cast (void *,
ACE_static_cast (CORBA::Object_ptr, this));
-
+
if (retv)
this->_add_ref ();
return retv;
@@ -2852,7 +2978,7 @@ PortableServer::POAManager_var::operator const ::PortableServer::POAManager_ptr
return this->ptr_;
}
-PortableServer::POAManager_var::operator ::PortableServer::POAManager_ptr &() // cast
+PortableServer::POAManager_var::operator ::PortableServer::POAManager_ptr &() // cast
{
return this->ptr_;
}
@@ -3044,7 +3170,7 @@ void *PortableServer::POAManager::_tao_QueryInterface (ptr_arith_t type)
else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
retv = ACE_reinterpret_cast (void *,
ACE_static_cast (CORBA::Object_ptr, this));
-
+
if (retv)
this->_add_ref ();
return retv;
@@ -3173,7 +3299,7 @@ PortableServer::AdapterActivator_var::operator const ::PortableServer::AdapterAc
return this->ptr_;
}
-PortableServer::AdapterActivator_var::operator ::PortableServer::AdapterActivator_ptr &() // cast
+PortableServer::AdapterActivator_var::operator ::PortableServer::AdapterActivator_ptr &() // cast
{
return this->ptr_;
}
@@ -3365,7 +3491,7 @@ void *PortableServer::AdapterActivator::_tao_QueryInterface (ptr_arith_t type)
else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
retv = ACE_reinterpret_cast (void *,
ACE_static_cast (CORBA::Object_ptr, this));
-
+
if (retv)
this->_add_ref ();
return retv;
@@ -3424,7 +3550,7 @@ PortableServer::ServantManager_var::operator const ::PortableServer::ServantMana
return this->ptr_;
}
-PortableServer::ServantManager_var::operator ::PortableServer::ServantManager_ptr &() // cast
+PortableServer::ServantManager_var::operator ::PortableServer::ServantManager_ptr &() // cast
{
return this->ptr_;
}
@@ -3616,7 +3742,7 @@ void *PortableServer::ServantManager::_tao_QueryInterface (ptr_arith_t type)
else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
retv = ACE_reinterpret_cast (void *,
ACE_static_cast (CORBA::Object_ptr, this));
-
+
if (retv)
this->_add_ref ();
return retv;
@@ -3675,7 +3801,7 @@ PortableServer::ServantActivator_var::operator const ::PortableServer::ServantAc
return this->ptr_;
}
-PortableServer::ServantActivator_var::operator ::PortableServer::ServantActivator_ptr &() // cast
+PortableServer::ServantActivator_var::operator ::PortableServer::ServantActivator_ptr &() // cast
{
return this->ptr_;
}
@@ -3879,7 +4005,7 @@ void *PortableServer::ServantActivator::_tao_QueryInterface (ptr_arith_t type)
else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
retv = ACE_reinterpret_cast (void *,
ACE_static_cast (CORBA::Object_ptr, this));
-
+
if (retv)
this->_add_ref ();
return retv;
@@ -3938,7 +4064,7 @@ PortableServer::ServantLocator_var::operator const ::PortableServer::ServantLoca
return this->ptr_;
}
-PortableServer::ServantLocator_var::operator ::PortableServer::ServantLocator_ptr &() // cast
+PortableServer::ServantLocator_var::operator ::PortableServer::ServantLocator_ptr &() // cast
{
return this->ptr_;
}
@@ -4142,7 +4268,7 @@ void *PortableServer::ServantLocator::_tao_QueryInterface (ptr_arith_t type)
else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
retv = ACE_reinterpret_cast (void *,
ACE_static_cast (CORBA::Object_ptr, this));
-
+
if (retv)
this->_add_ref ();
return retv;
@@ -4203,7 +4329,7 @@ PortableServer::POA_var::operator const ::PortableServer::POA_ptr &() const // c
return this->ptr_;
}
-PortableServer::POA_var::operator ::PortableServer::POA_ptr &() // cast
+PortableServer::POA_var::operator ::PortableServer::POA_ptr &() // cast
{
return this->ptr_;
}
@@ -4395,7 +4521,7 @@ void *PortableServer::POA::_tao_QueryInterface (ptr_arith_t type)
else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
retv = ACE_reinterpret_cast (void *,
ACE_static_cast (CORBA::Object_ptr, this));
-
+
if (retv)
this->_add_ref ();
return retv;
@@ -5148,7 +5274,7 @@ PortableServer::Current_var::operator const ::PortableServer::Current_ptr &() co
return this->ptr_;
}
-PortableServer::Current_var::operator ::PortableServer::Current_ptr &() // cast
+PortableServer::Current_var::operator ::PortableServer::Current_ptr &() // cast
{
return this->ptr_;
}
@@ -5352,7 +5478,7 @@ void *PortableServer::Current::_tao_QueryInterface (ptr_arith_t type)
else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
retv = ACE_reinterpret_cast (void *,
ACE_static_cast (CORBA::Object_ptr, this));
-
+
if (retv)
this->_add_ref ();
return retv;
@@ -5499,13 +5625,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::Ob
ACE_TRY_NEW_ENV
{
CORBA::TypeCode_var type = _tao_any.type ();
-
+
CORBA::Boolean result = type->equivalent (PortableServer::_tc_ObjectId, ACE_TRY_ENV);
ACE_TRY_CHECK;
-
+
if (!result)
return 0; // not equivalent
-
+
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -5587,13 +5713,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::Fo
ACE_TRY_NEW_ENV
{
CORBA::TypeCode_var type = _tao_any.type ();
-
+
CORBA::Boolean result = type->equivalent (PortableServer::_tc_ForwardRequest, ACE_TRY_ENV);
ACE_TRY_CHECK;
-
+
if (!result)
return 0; // not equivalent
-
+
if (_tao_any.any_owns_data ())
{
_tao_elem = (PortableServer::ForwardRequest *)_tao_any.value ();
@@ -5638,6 +5764,96 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::Fo
return 0;
}
+void operator<<= (CORBA::Any &_tao_any, const PortableServer::NotAGroupObject &_tao_elem) // copying
+{
+ TAO_OutputCDR stream;
+ stream << _tao_elem;
+ _tao_any._tao_replace (
+ PortableServer::_tc_NotAGroupObject,
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin ()
+ );
+}
+
+void operator<<= (CORBA::Any &_tao_any, PortableServer::NotAGroupObject *_tao_elem) // non copying
+{
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+ _tao_any._tao_replace (
+ PortableServer::_tc_NotAGroupObject,
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+ _tao_elem,
+ PortableServer::NotAGroupObject::_tao_any_destructor
+ );
+}
+
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::NotAGroupObject *&_tao_elem)
+{
+ return _tao_any >>= ACE_const_cast(
+ const PortableServer::NotAGroupObject*&,
+ _tao_elem
+ );
+}
+
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::NotAGroupObject *&_tao_elem)
+{
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+
+ CORBA::Boolean result = type->equivalent (PortableServer::_tc_NotAGroupObject, ACE_TRY_ENV);
+ ACE_TRY_CHECK;
+
+ if (!result)
+ return 0; // not equivalent
+
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = (PortableServer::NotAGroupObject *)_tao_any.value ();
+ return 1;
+ }
+ else
+ {
+ PortableServer::NotAGroupObject *tmp;
+ ACE_NEW_RETURN (tmp, PortableServer::NotAGroupObject, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+ );
+ CORBA::String_var interface_repository_id;
+ if (!(stream >> interface_repository_id.out ()))
+ return 0;
+ if (ACE_OS::strcmp (
+ interface_repository_id.in (),
+ "IDL:PortableServer/NotAGroupObject:1.0"))
+ return 0;
+ if (stream >> *tmp)
+ {
+ ((CORBA::Any *)&_tao_any)->_tao_replace (
+ PortableServer::_tc_NotAGroupObject,
+ 1,
+ tmp,
+ PortableServer::NotAGroupObject::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+ }
+ else
+ {
+ delete tmp;
+ }
+ }
+ }
+ ACE_CATCHANY
+ {
+ }
+ ACE_ENDTRY;
+ return 0;
+}
+
void operator<<= (
CORBA::Any &_tao_any,
const PortableServer::IDs &_tao_elem
@@ -5682,13 +5898,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::ID
ACE_TRY_NEW_ENV
{
CORBA::TypeCode_var type = _tao_any.type ();
-
+
CORBA::Boolean result = type->equivalent (PortableServer::_tc_IDs, ACE_TRY_ENV);
ACE_TRY_CHECK;
-
+
if (!result)
return 0; // not equivalent
-
+
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -5749,13 +5965,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::ThreadPo
ACE_TRY_NEW_ENV
{
CORBA::TypeCode_var type = _tao_any.type ();
-
+
CORBA::Boolean result = type->equivalent (PortableServer::_tc_ThreadPolicyValue, ACE_TRY_ENV);
ACE_TRY_CHECK;
-
+
if (!result)
return 0; // not equivalent
-
+
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
@@ -5798,13 +6014,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::Lifespan
ACE_TRY_NEW_ENV
{
CORBA::TypeCode_var type = _tao_any.type ();
-
+
CORBA::Boolean result = type->equivalent (PortableServer::_tc_LifespanPolicyValue, ACE_TRY_ENV);
ACE_TRY_CHECK;
-
+
if (!result)
return 0; // not equivalent
-
+
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
@@ -5845,13 +6061,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::IdUnique
ACE_TRY_NEW_ENV
{
CORBA::TypeCode_var type = _tao_any.type ();
-
+
CORBA::Boolean result = type->equivalent (PortableServer::_tc_IdUniquenessPolicyValue, ACE_TRY_ENV);
ACE_TRY_CHECK;
-
+
if (!result)
return 0; // not equivalent
-
+
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
@@ -5892,13 +6108,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::IdAssign
ACE_TRY_NEW_ENV
{
CORBA::TypeCode_var type = _tao_any.type ();
-
+
CORBA::Boolean result = type->equivalent (PortableServer::_tc_IdAssignmentPolicyValue, ACE_TRY_ENV);
ACE_TRY_CHECK;
-
+
if (!result)
return 0; // not equivalent
-
+
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
@@ -5941,13 +6157,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::Implicit
ACE_TRY_NEW_ENV
{
CORBA::TypeCode_var type = _tao_any.type ();
-
+
CORBA::Boolean result = type->equivalent (PortableServer::_tc_ImplicitActivationPolicyValue, ACE_TRY_ENV);
ACE_TRY_CHECK;
-
+
if (!result)
return 0; // not equivalent
-
+
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
@@ -5988,13 +6204,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::ServantR
ACE_TRY_NEW_ENV
{
CORBA::TypeCode_var type = _tao_any.type ();
-
+
CORBA::Boolean result = type->equivalent (PortableServer::_tc_ServantRetentionPolicyValue, ACE_TRY_ENV);
ACE_TRY_CHECK;
-
+
if (!result)
return 0; // not equivalent
-
+
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
@@ -6035,13 +6251,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::RequestP
ACE_TRY_NEW_ENV
{
CORBA::TypeCode_var type = _tao_any.type ();
-
+
CORBA::Boolean result = type->equivalent (PortableServer::_tc_RequestProcessingPolicyValue, ACE_TRY_ENV);
ACE_TRY_CHECK;
-
+
if (!result)
return 0; // not equivalent
-
+
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
@@ -6129,20 +6345,20 @@ CORBA::Boolean operator<< (
if (strm << _tao_sequence.length ())
{
// encode all elements
-
+
#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
{
- TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
+ TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (PortableServer::ObjectId *)&_tao_sequence);
if (oseq->mb ())
return strm.write_octet_array_mb (oseq->mb ());
else
return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
}
-
+
#else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+
#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
}
return 0; // error
@@ -6159,10 +6375,10 @@ CORBA::Boolean operator>> (
// set the length of the sequence
_tao_sequence.length (_tao_seq_len);
// If length is 0 we return true.
- if (0 >= _tao_seq_len)
+ if (0 >= _tao_seq_len)
return 1;
// retrieve all the elements
-
+
#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
if (ACE_BIT_DISABLED (strm.start ()->flags (),
ACE_Message_Block::DONT_DELETE))
@@ -6172,7 +6388,7 @@ CORBA::Boolean operator>> (
strm.orb_core ()->resource_factory ()->
input_cdr_allocator_type_locked () == 1)
{
- TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
+ TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
oseq->replace (_tao_seq_len, strm.start ());
oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
@@ -6183,6 +6399,7 @@ CORBA::Boolean operator>> (
return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
#else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+
#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
}
return 0; // error
@@ -6217,7 +6434,7 @@ CORBA::Boolean operator>> (
// set the length of the sequence
_tao_sequence.length (_tao_seq_len);
// If length is 0 we return true.
- if (0 >= _tao_seq_len)
+ if (0 >= _tao_seq_len)
return 1;
// Add a check to the length of the sequence
// to make sure it does not exceed the length
@@ -6234,3 +6451,4 @@ CORBA::Boolean operator>> (
}
return 0; // error
}
+
diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h
index 3bb6d3cb147..8344e8e4fd6 100644
--- a/TAO/tao/PortableServer/PortableServerC.h
+++ b/TAO/tao/PortableServer/PortableServerC.h
@@ -75,7 +75,7 @@ TAO_NAMESPACE PortableServer
typedef TAO_DynamicImplementation DynamicImplementation;
class POA;
-
+
#if !defined (_PORTABLESERVER_POA___PTR_CH_)
#define _PORTABLESERVER_POA___PTR_CH_
@@ -91,23 +91,23 @@ TAO_NAMESPACE PortableServer
{
public:
POA_var (void); // default constructor
- POA_var (POA_ptr p) : ptr_ (p) {}
+ POA_var (POA_ptr p) : ptr_ (p) {}
POA_var (const POA_var &); // copy constructor
~POA_var (void); // destructor
-
+
POA_var &operator= (POA_ptr);
POA_var &operator= (const POA_var &);
POA_ptr operator-> (void) const;
-
+
operator const POA_ptr &() const;
operator POA_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
POA_ptr in (void) const;
POA_ptr &inout (void);
POA_ptr &out (void);
POA_ptr _retn (void);
POA_ptr ptr (void) const;
-
+
// Hooks used by template sequence and object manager classes
// for non-defined forward declared interfaces.
static POA_ptr duplicate (POA_ptr);
@@ -115,7 +115,7 @@ TAO_NAMESPACE PortableServer
static POA_ptr nil (void);
static POA_ptr narrow (CORBA::Object *, CORBA::Environment &);
static CORBA::Object * upcast (void *);
-
+
private:
POA_ptr ptr_;
// Unimplemented - prevents widening assignment.
@@ -142,7 +142,7 @@ TAO_NAMESPACE PortableServer
operator POA_ptr &();
POA_ptr &ptr (void);
POA_ptr operator-> (void);
-
+
private:
POA_ptr &ptr_;
};
@@ -152,7 +152,7 @@ TAO_NAMESPACE PortableServer
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+
#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_PORTABLESERVER_POALIST_CH_)
#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_PORTABLESERVER_POALIST_CH_
@@ -160,7 +160,7 @@ TAO_NAMESPACE PortableServer
{
public:
// = Initialization and termination methods.
-
+
_TAO_Unbounded_Object_Sequence_PortableServer_POAList (void);
_TAO_Unbounded_Object_Sequence_PortableServer_POAList (CORBA::ULong maximum);
_TAO_Unbounded_Object_Sequence_PortableServer_POAList (CORBA::ULong maximum,
@@ -182,42 +182,42 @@ TAO_NAMESPACE PortableServer
virtual void _downcast (
void* target,
CORBA_Object *src,
- CORBA_Environment &ACE_TRY_ENV =
+ CORBA_Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
virtual CORBA_Object* _upcast (void *src) const;
-
+
};
#endif /* end #if !defined */
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
#if !defined (_PORTABLESERVER_POALIST_CH_)
#define _PORTABLESERVER_POALIST_CH_
class POAList;
class POAList_var;
-
+
// *************************************************************
// POAList
// *************************************************************
-
- class TAO_PortableServer_Export POAList : public
+
+ class TAO_PortableServer_Export POAList : public
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_PortableServer_POAList
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<POA,POA_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
POAList (void); // default ctor
POAList (CORBA::ULong max); // uses max size
POAList (
- CORBA::ULong max,
- CORBA::ULong length,
- POA_ptr *buffer,
+ CORBA::ULong max,
+ CORBA::ULong length,
+ POA_ptr *buffer,
CORBA::Boolean release = 0
);
POAList (const POAList &); // copy ctor
@@ -229,7 +229,7 @@ TAO_NAMESPACE PortableServer
#endif /* ! __GNUC__ || g++ >= 2.8 */
};
-
+
#endif /* end #if !defined */
@@ -247,20 +247,20 @@ TAO_NAMESPACE PortableServer
POAList_var (POAList *);
POAList_var (const POAList_var &); // copy constructor
~POAList_var (void); // destructor
-
+
POAList_var &operator= (POAList *);
POAList_var &operator= (const POAList_var &);
POAList *operator-> (void);
const POAList *operator-> (void) const;
-
+
operator const POAList &() const;
operator POAList &();
operator POAList &() const;
operator POAList *&(); // variable-size base types only
-
+
TAO_Object_Manager<POA, POA_var> operator[] (CORBA::ULong index);
-
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const POAList &in (void) const;
POAList &inout (void);
POAList *&out (void);
@@ -290,7 +290,7 @@ TAO_NAMESPACE PortableServer
POAList *&ptr (void);
POAList *operator-> (void);
TAO_Object_Manager<POA, POA_var> operator[] (CORBA::ULong index);
-
+
private:
POAList *&ptr_;
// assignment from T_var not allowed
@@ -306,25 +306,25 @@ TAO_NAMESPACE PortableServer
class ObjectId;
class ObjectId_var;
-
+
// *************************************************************
// ObjectId
// *************************************************************
-
- class TAO_PortableServer_Export ObjectId : public
+
+ class TAO_PortableServer_Export ObjectId : public
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
TAO_Unbounded_Sequence<CORBA::Octet>
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
ObjectId (void); // default ctor
ObjectId (CORBA::ULong max); // uses max size
ObjectId (
- CORBA::ULong max,
- CORBA::ULong length,
- CORBA::Octet *buffer,
+ CORBA::ULong max,
+ CORBA::ULong length,
+ CORBA::Octet *buffer,
CORBA::Boolean release = 0
);
ObjectId (const ObjectId &); // copy ctor
@@ -345,7 +345,7 @@ TAO_NAMESPACE PortableServer
#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
};
-
+
#endif /* end #if !defined */
@@ -364,21 +364,21 @@ TAO_NAMESPACE PortableServer
ObjectId_var (const ObjectId_var &); // copy constructor
ObjectId_var (const ObjectId &); // fixed-size base types only
~ObjectId_var (void); // destructor
-
+
ObjectId_var &operator= (ObjectId *);
ObjectId_var &operator= (const ObjectId_var &);
ObjectId_var &operator= (const ObjectId &); // fixed-size base types only
ObjectId *operator-> (void);
const ObjectId *operator-> (void) const;
-
+
operator const ObjectId &() const;
operator ObjectId &();
operator ObjectId &() const;
-
+
CORBA::Octet & operator[] (CORBA::ULong index);
const CORBA::Octet & operator[] (CORBA::ULong index) const;
-
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const ObjectId &in (void) const;
ObjectId &inout (void);
ObjectId *&out (void);
@@ -408,7 +408,7 @@ TAO_NAMESPACE PortableServer
ObjectId *&ptr (void);
ObjectId *operator-> (void);
CORBA::Octet & operator[] (CORBA::ULong index);
-
+
private:
ObjectId *&ptr_;
// assignment from T_var not allowed
@@ -433,35 +433,35 @@ TAO_NAMESPACE PortableServer
ForwardRequest (void);
// Default constructor.
-
+
ForwardRequest (const ForwardRequest &);
// Copy constructor.
-
+
~ForwardRequest (void);
// Destructor.
-
+
static void _tao_any_destructor (void*);
-
+
ForwardRequest &operator= (const ForwardRequest &);
-
+
virtual void _raise (void);
virtual void _tao_encode (
TAO_OutputCDR &,
CORBA::Environment &
) const;
-
+
virtual void _tao_decode (
TAO_InputCDR &,
CORBA::Environment &
);
-
+
static ForwardRequest *_downcast (CORBA::Exception *);
ForwardRequest (
const CORBA::Object_ptr _tao_forward_reference
);
-
+
// = TAO extension.
static CORBA::Exception *_alloc (void);
virtual CORBA::TypeCode_ptr _type (void) const;
@@ -473,8 +473,54 @@ TAO_NAMESPACE PortableServer
#endif /* end #if !defined */
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+#if !defined (_PORTABLESERVER_NOTAGROUPOBJECT_CH_)
+#define _PORTABLESERVER_NOTAGROUPOBJECT_CH_
+
+ class TAO_PortableServer_Export NotAGroupObject : public CORBA::UserException
+ {
+ public:
+
+ NotAGroupObject (void);
+ // Default constructor.
+
+ NotAGroupObject (const NotAGroupObject &);
+ // Copy constructor.
+
+ ~NotAGroupObject (void);
+ // Destructor.
+
+ static void _tao_any_destructor (void*);
+
+ NotAGroupObject &operator= (const NotAGroupObject &);
+
+ virtual void _raise (void);
+
+ virtual void _tao_encode (
+ TAO_OutputCDR &,
+ CORBA::Environment &
+ ) const;
+
+ virtual void _tao_decode (
+ TAO_InputCDR &,
+ CORBA::Environment &
+ );
+
+ static NotAGroupObject *_downcast (CORBA::Exception *);
+
+
+ // = TAO extension.
+ static CORBA::Exception *_alloc (void);
+ virtual CORBA::TypeCode_ptr _type (void) const;
+ }; // Exception PortableServer::NotAGroupObject.
+
+ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_NotAGroupObject;
+
+#endif /* end #if !defined */
+
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
#if !defined (__TAO_UNBOUNDED_SEQUENCE_PORTABLESERVER_IDS_CH_)
#define __TAO_UNBOUNDED_SEQUENCE_PORTABLESERVER_IDS_CH_
@@ -482,9 +528,9 @@ TAO_NAMESPACE PortableServer
{
public:
// = Initialization and termination methods.
-
+
_TAO_Unbounded_Sequence_PortableServer_IDs (void); // Default constructor.
- _TAO_Unbounded_Sequence_PortableServer_IDs (CORBA::ULong maximum);
+ _TAO_Unbounded_Sequence_PortableServer_IDs (CORBA::ULong maximum);
_TAO_Unbounded_Sequence_PortableServer_IDs (CORBA::ULong maximum,
CORBA::ULong length,
ObjectId *data,
@@ -501,7 +547,7 @@ TAO_NAMESPACE PortableServer
virtual void _allocate_buffer (CORBA::ULong length);
virtual void _deallocate_buffer (void);
// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
+
ObjectId *get_buffer (CORBA::Boolean orphan = 0);
const ObjectId *get_buffer (void) const;
void replace (CORBA::ULong max,
@@ -513,32 +559,32 @@ TAO_NAMESPACE PortableServer
#endif /* end #if !defined */
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
#if !defined (_PORTABLESERVER_IDS_CH_)
#define _PORTABLESERVER_IDS_CH_
class IDs;
class IDs_var;
-
+
// *************************************************************
// IDs
// *************************************************************
-
- class TAO_PortableServer_Export IDs : public
+
+ class TAO_PortableServer_Export IDs : public
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_PortableServer_IDs
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<ObjectId>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
IDs (void); // default ctor
IDs (CORBA::ULong max); // uses max size
IDs (
- CORBA::ULong max,
- CORBA::ULong length,
- ObjectId *buffer,
+ CORBA::ULong max,
+ CORBA::ULong length,
+ ObjectId *buffer,
CORBA::Boolean release = 0
);
IDs (const IDs &); // copy ctor
@@ -550,7 +596,7 @@ TAO_NAMESPACE PortableServer
#endif /* ! __GNUC__ || g++ >= 2.8 */
};
-
+
#endif /* end #if !defined */
@@ -568,21 +614,21 @@ TAO_NAMESPACE PortableServer
IDs_var (IDs *);
IDs_var (const IDs_var &); // copy constructor
~IDs_var (void); // destructor
-
+
IDs_var &operator= (IDs *);
IDs_var &operator= (const IDs_var &);
IDs *operator-> (void);
const IDs *operator-> (void) const;
-
+
operator const IDs &() const;
operator IDs &();
operator IDs &() const;
operator IDs *&(); // variable-size base types only
-
+
ObjectId & operator[] (CORBA::ULong index);
const ObjectId & operator[] (CORBA::ULong index) const;
-
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const IDs &in (void) const;
IDs &inout (void);
IDs *&out (void);
@@ -612,7 +658,7 @@ TAO_NAMESPACE PortableServer
IDs *&ptr (void);
IDs *operator-> (void);
ObjectId & operator[] (CORBA::ULong index);
-
+
private:
IDs *&ptr_;
// assignment from T_var not allowed
@@ -643,7 +689,7 @@ TAO_NAMESPACE PortableServer
enum ThreadPolicyValue
{
ORB_CTRL_MODEL,
- SINGLE_THREAD_MODEL
+ SINGLE_THREAD_MODEL
};
#if (TAO_HAS_MINIMUM_POA == 0)
@@ -657,7 +703,7 @@ TAO_NAMESPACE PortableServer
class ThreadPolicy;
typedef ThreadPolicy *ThreadPolicy_ptr;
-
+
#endif /* end #if !defined */
@@ -668,23 +714,23 @@ TAO_NAMESPACE PortableServer
{
public:
ThreadPolicy_var (void); // default constructor
- ThreadPolicy_var (ThreadPolicy_ptr p) : ptr_ (p) {}
+ ThreadPolicy_var (ThreadPolicy_ptr p) : ptr_ (p) {}
ThreadPolicy_var (const ThreadPolicy_var &); // copy constructor
~ThreadPolicy_var (void); // destructor
-
+
ThreadPolicy_var &operator= (ThreadPolicy_ptr);
ThreadPolicy_var &operator= (const ThreadPolicy_var &);
ThreadPolicy_ptr operator-> (void) const;
-
+
operator const ThreadPolicy_ptr &() const;
operator ThreadPolicy_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
ThreadPolicy_ptr in (void) const;
ThreadPolicy_ptr &inout (void);
ThreadPolicy_ptr &out (void);
ThreadPolicy_ptr _retn (void);
ThreadPolicy_ptr ptr (void) const;
-
+
// Hooks used by template sequence and object manager classes
// for non-defined forward declared interfaces.
static ThreadPolicy_ptr duplicate (ThreadPolicy_ptr);
@@ -692,7 +738,7 @@ TAO_NAMESPACE PortableServer
static ThreadPolicy_ptr nil (void);
static ThreadPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
static CORBA::Object * upcast (void *);
-
+
private:
ThreadPolicy_ptr ptr_;
// Unimplemented - prevents widening assignment.
@@ -719,7 +765,7 @@ TAO_NAMESPACE PortableServer
operator ThreadPolicy_ptr &();
ThreadPolicy_ptr &ptr (void);
ThreadPolicy_ptr operator-> (void);
-
+
private:
ThreadPolicy_ptr &ptr_;
};
@@ -743,12 +789,12 @@ TAO_NAMESPACE PortableServer
static ThreadPolicy_ptr _duplicate (ThreadPolicy_ptr obj);
static ThreadPolicy_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static ThreadPolicy_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static ThreadPolicy_ptr _nil (void)
@@ -757,7 +803,7 @@ TAO_NAMESPACE PortableServer
}
virtual PortableServer::ThreadPolicyValue value (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -765,12 +811,12 @@ TAO_NAMESPACE PortableServer
)) = 0;
virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+
virtual const char* _interface_repository_id (void) const;
protected:
ThreadPolicy ();
-
+
virtual ~ThreadPolicy (void);
private:
ThreadPolicy (const ThreadPolicy &);
@@ -785,7 +831,7 @@ TAO_NAMESPACE PortableServer
enum LifespanPolicyValue
{
TRANSIENT,
- PERSISTENT
+ PERSISTENT
};
typedef LifespanPolicyValue &LifespanPolicyValue_out;
TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_LifespanPolicyValue;
@@ -796,7 +842,7 @@ TAO_NAMESPACE PortableServer
class LifespanPolicy;
typedef LifespanPolicy *LifespanPolicy_ptr;
-
+
#endif /* end #if !defined */
@@ -807,23 +853,23 @@ TAO_NAMESPACE PortableServer
{
public:
LifespanPolicy_var (void); // default constructor
- LifespanPolicy_var (LifespanPolicy_ptr p) : ptr_ (p) {}
+ LifespanPolicy_var (LifespanPolicy_ptr p) : ptr_ (p) {}
LifespanPolicy_var (const LifespanPolicy_var &); // copy constructor
~LifespanPolicy_var (void); // destructor
-
+
LifespanPolicy_var &operator= (LifespanPolicy_ptr);
LifespanPolicy_var &operator= (const LifespanPolicy_var &);
LifespanPolicy_ptr operator-> (void) const;
-
+
operator const LifespanPolicy_ptr &() const;
operator LifespanPolicy_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
LifespanPolicy_ptr in (void) const;
LifespanPolicy_ptr &inout (void);
LifespanPolicy_ptr &out (void);
LifespanPolicy_ptr _retn (void);
LifespanPolicy_ptr ptr (void) const;
-
+
// Hooks used by template sequence and object manager classes
// for non-defined forward declared interfaces.
static LifespanPolicy_ptr duplicate (LifespanPolicy_ptr);
@@ -831,7 +877,7 @@ TAO_NAMESPACE PortableServer
static LifespanPolicy_ptr nil (void);
static LifespanPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
static CORBA::Object * upcast (void *);
-
+
private:
LifespanPolicy_ptr ptr_;
// Unimplemented - prevents widening assignment.
@@ -858,7 +904,7 @@ TAO_NAMESPACE PortableServer
operator LifespanPolicy_ptr &();
LifespanPolicy_ptr &ptr (void);
LifespanPolicy_ptr operator-> (void);
-
+
private:
LifespanPolicy_ptr &ptr_;
};
@@ -882,12 +928,12 @@ TAO_NAMESPACE PortableServer
static LifespanPolicy_ptr _duplicate (LifespanPolicy_ptr obj);
static LifespanPolicy_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static LifespanPolicy_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static LifespanPolicy_ptr _nil (void)
@@ -896,7 +942,7 @@ TAO_NAMESPACE PortableServer
}
virtual PortableServer::LifespanPolicyValue value (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -904,12 +950,12 @@ TAO_NAMESPACE PortableServer
)) = 0;
virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+
virtual const char* _interface_repository_id (void) const;
protected:
LifespanPolicy ();
-
+
virtual ~LifespanPolicy (void);
private:
LifespanPolicy (const LifespanPolicy &);
@@ -922,7 +968,7 @@ TAO_NAMESPACE PortableServer
enum IdUniquenessPolicyValue
{
UNIQUE_ID,
- MULTIPLE_ID
+ MULTIPLE_ID
};
typedef IdUniquenessPolicyValue &IdUniquenessPolicyValue_out;
TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IdUniquenessPolicyValue;
@@ -933,7 +979,7 @@ TAO_NAMESPACE PortableServer
class IdUniquenessPolicy;
typedef IdUniquenessPolicy *IdUniquenessPolicy_ptr;
-
+
#endif /* end #if !defined */
@@ -944,23 +990,23 @@ TAO_NAMESPACE PortableServer
{
public:
IdUniquenessPolicy_var (void); // default constructor
- IdUniquenessPolicy_var (IdUniquenessPolicy_ptr p) : ptr_ (p) {}
+ IdUniquenessPolicy_var (IdUniquenessPolicy_ptr p) : ptr_ (p) {}
IdUniquenessPolicy_var (const IdUniquenessPolicy_var &); // copy constructor
~IdUniquenessPolicy_var (void); // destructor
-
+
IdUniquenessPolicy_var &operator= (IdUniquenessPolicy_ptr);
IdUniquenessPolicy_var &operator= (const IdUniquenessPolicy_var &);
IdUniquenessPolicy_ptr operator-> (void) const;
-
+
operator const IdUniquenessPolicy_ptr &() const;
operator IdUniquenessPolicy_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IdUniquenessPolicy_ptr in (void) const;
IdUniquenessPolicy_ptr &inout (void);
IdUniquenessPolicy_ptr &out (void);
IdUniquenessPolicy_ptr _retn (void);
IdUniquenessPolicy_ptr ptr (void) const;
-
+
// Hooks used by template sequence and object manager classes
// for non-defined forward declared interfaces.
static IdUniquenessPolicy_ptr duplicate (IdUniquenessPolicy_ptr);
@@ -968,7 +1014,7 @@ TAO_NAMESPACE PortableServer
static IdUniquenessPolicy_ptr nil (void);
static IdUniquenessPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
static CORBA::Object * upcast (void *);
-
+
private:
IdUniquenessPolicy_ptr ptr_;
// Unimplemented - prevents widening assignment.
@@ -995,7 +1041,7 @@ TAO_NAMESPACE PortableServer
operator IdUniquenessPolicy_ptr &();
IdUniquenessPolicy_ptr &ptr (void);
IdUniquenessPolicy_ptr operator-> (void);
-
+
private:
IdUniquenessPolicy_ptr &ptr_;
};
@@ -1019,12 +1065,12 @@ TAO_NAMESPACE PortableServer
static IdUniquenessPolicy_ptr _duplicate (IdUniquenessPolicy_ptr obj);
static IdUniquenessPolicy_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IdUniquenessPolicy_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IdUniquenessPolicy_ptr _nil (void)
@@ -1033,7 +1079,7 @@ TAO_NAMESPACE PortableServer
}
virtual PortableServer::IdUniquenessPolicyValue value (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -1041,12 +1087,12 @@ TAO_NAMESPACE PortableServer
)) = 0;
virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+
virtual const char* _interface_repository_id (void) const;
protected:
IdUniquenessPolicy ();
-
+
virtual ~IdUniquenessPolicy (void);
private:
IdUniquenessPolicy (const IdUniquenessPolicy &);
@@ -1059,7 +1105,7 @@ TAO_NAMESPACE PortableServer
enum IdAssignmentPolicyValue
{
USER_ID,
- SYSTEM_ID
+ SYSTEM_ID
};
typedef IdAssignmentPolicyValue &IdAssignmentPolicyValue_out;
TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IdAssignmentPolicyValue;
@@ -1070,7 +1116,7 @@ TAO_NAMESPACE PortableServer
class IdAssignmentPolicy;
typedef IdAssignmentPolicy *IdAssignmentPolicy_ptr;
-
+
#endif /* end #if !defined */
@@ -1081,23 +1127,23 @@ TAO_NAMESPACE PortableServer
{
public:
IdAssignmentPolicy_var (void); // default constructor
- IdAssignmentPolicy_var (IdAssignmentPolicy_ptr p) : ptr_ (p) {}
+ IdAssignmentPolicy_var (IdAssignmentPolicy_ptr p) : ptr_ (p) {}
IdAssignmentPolicy_var (const IdAssignmentPolicy_var &); // copy constructor
~IdAssignmentPolicy_var (void); // destructor
-
+
IdAssignmentPolicy_var &operator= (IdAssignmentPolicy_ptr);
IdAssignmentPolicy_var &operator= (const IdAssignmentPolicy_var &);
IdAssignmentPolicy_ptr operator-> (void) const;
-
+
operator const IdAssignmentPolicy_ptr &() const;
operator IdAssignmentPolicy_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IdAssignmentPolicy_ptr in (void) const;
IdAssignmentPolicy_ptr &inout (void);
IdAssignmentPolicy_ptr &out (void);
IdAssignmentPolicy_ptr _retn (void);
IdAssignmentPolicy_ptr ptr (void) const;
-
+
// Hooks used by template sequence and object manager classes
// for non-defined forward declared interfaces.
static IdAssignmentPolicy_ptr duplicate (IdAssignmentPolicy_ptr);
@@ -1105,7 +1151,7 @@ TAO_NAMESPACE PortableServer
static IdAssignmentPolicy_ptr nil (void);
static IdAssignmentPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
static CORBA::Object * upcast (void *);
-
+
private:
IdAssignmentPolicy_ptr ptr_;
// Unimplemented - prevents widening assignment.
@@ -1132,7 +1178,7 @@ TAO_NAMESPACE PortableServer
operator IdAssignmentPolicy_ptr &();
IdAssignmentPolicy_ptr &ptr (void);
IdAssignmentPolicy_ptr operator-> (void);
-
+
private:
IdAssignmentPolicy_ptr &ptr_;
};
@@ -1156,12 +1202,12 @@ TAO_NAMESPACE PortableServer
static IdAssignmentPolicy_ptr _duplicate (IdAssignmentPolicy_ptr obj);
static IdAssignmentPolicy_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IdAssignmentPolicy_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IdAssignmentPolicy_ptr _nil (void)
@@ -1170,7 +1216,7 @@ TAO_NAMESPACE PortableServer
}
virtual PortableServer::IdAssignmentPolicyValue value (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -1178,12 +1224,12 @@ TAO_NAMESPACE PortableServer
)) = 0;
virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+
virtual const char* _interface_repository_id (void) const;
protected:
IdAssignmentPolicy ();
-
+
virtual ~IdAssignmentPolicy (void);
private:
IdAssignmentPolicy (const IdAssignmentPolicy &);
@@ -1196,7 +1242,7 @@ TAO_NAMESPACE PortableServer
enum ImplicitActivationPolicyValue
{
IMPLICIT_ACTIVATION,
- NO_IMPLICIT_ACTIVATION
+ NO_IMPLICIT_ACTIVATION
};
#if (TAO_HAS_MINIMUM_POA == 0)
@@ -1210,7 +1256,7 @@ TAO_NAMESPACE PortableServer
class ImplicitActivationPolicy;
typedef ImplicitActivationPolicy *ImplicitActivationPolicy_ptr;
-
+
#endif /* end #if !defined */
@@ -1221,23 +1267,23 @@ TAO_NAMESPACE PortableServer
{
public:
ImplicitActivationPolicy_var (void); // default constructor
- ImplicitActivationPolicy_var (ImplicitActivationPolicy_ptr p) : ptr_ (p) {}
+ ImplicitActivationPolicy_var (ImplicitActivationPolicy_ptr p) : ptr_ (p) {}
ImplicitActivationPolicy_var (const ImplicitActivationPolicy_var &); // copy constructor
~ImplicitActivationPolicy_var (void); // destructor
-
+
ImplicitActivationPolicy_var &operator= (ImplicitActivationPolicy_ptr);
ImplicitActivationPolicy_var &operator= (const ImplicitActivationPolicy_var &);
ImplicitActivationPolicy_ptr operator-> (void) const;
-
+
operator const ImplicitActivationPolicy_ptr &() const;
operator ImplicitActivationPolicy_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
ImplicitActivationPolicy_ptr in (void) const;
ImplicitActivationPolicy_ptr &inout (void);
ImplicitActivationPolicy_ptr &out (void);
ImplicitActivationPolicy_ptr _retn (void);
ImplicitActivationPolicy_ptr ptr (void) const;
-
+
// Hooks used by template sequence and object manager classes
// for non-defined forward declared interfaces.
static ImplicitActivationPolicy_ptr duplicate (ImplicitActivationPolicy_ptr);
@@ -1245,7 +1291,7 @@ TAO_NAMESPACE PortableServer
static ImplicitActivationPolicy_ptr nil (void);
static ImplicitActivationPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
static CORBA::Object * upcast (void *);
-
+
private:
ImplicitActivationPolicy_ptr ptr_;
// Unimplemented - prevents widening assignment.
@@ -1272,7 +1318,7 @@ TAO_NAMESPACE PortableServer
operator ImplicitActivationPolicy_ptr &();
ImplicitActivationPolicy_ptr &ptr (void);
ImplicitActivationPolicy_ptr operator-> (void);
-
+
private:
ImplicitActivationPolicy_ptr &ptr_;
};
@@ -1296,12 +1342,12 @@ TAO_NAMESPACE PortableServer
static ImplicitActivationPolicy_ptr _duplicate (ImplicitActivationPolicy_ptr obj);
static ImplicitActivationPolicy_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static ImplicitActivationPolicy_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static ImplicitActivationPolicy_ptr _nil (void)
@@ -1310,7 +1356,7 @@ TAO_NAMESPACE PortableServer
}
virtual PortableServer::ImplicitActivationPolicyValue value (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -1318,12 +1364,12 @@ TAO_NAMESPACE PortableServer
)) = 0;
virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+
virtual const char* _interface_repository_id (void) const;
protected:
ImplicitActivationPolicy ();
-
+
virtual ~ImplicitActivationPolicy (void);
private:
ImplicitActivationPolicy (const ImplicitActivationPolicy &);
@@ -1338,7 +1384,7 @@ TAO_NAMESPACE PortableServer
enum ServantRetentionPolicyValue
{
RETAIN,
- NON_RETAIN
+ NON_RETAIN
};
#if (TAO_HAS_MINIMUM_POA == 0)
@@ -1352,7 +1398,7 @@ TAO_NAMESPACE PortableServer
class ServantRetentionPolicy;
typedef ServantRetentionPolicy *ServantRetentionPolicy_ptr;
-
+
#endif /* end #if !defined */
@@ -1363,23 +1409,23 @@ TAO_NAMESPACE PortableServer
{
public:
ServantRetentionPolicy_var (void); // default constructor
- ServantRetentionPolicy_var (ServantRetentionPolicy_ptr p) : ptr_ (p) {}
+ ServantRetentionPolicy_var (ServantRetentionPolicy_ptr p) : ptr_ (p) {}
ServantRetentionPolicy_var (const ServantRetentionPolicy_var &); // copy constructor
~ServantRetentionPolicy_var (void); // destructor
-
+
ServantRetentionPolicy_var &operator= (ServantRetentionPolicy_ptr);
ServantRetentionPolicy_var &operator= (const ServantRetentionPolicy_var &);
ServantRetentionPolicy_ptr operator-> (void) const;
-
+
operator const ServantRetentionPolicy_ptr &() const;
operator ServantRetentionPolicy_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
ServantRetentionPolicy_ptr in (void) const;
ServantRetentionPolicy_ptr &inout (void);
ServantRetentionPolicy_ptr &out (void);
ServantRetentionPolicy_ptr _retn (void);
ServantRetentionPolicy_ptr ptr (void) const;
-
+
// Hooks used by template sequence and object manager classes
// for non-defined forward declared interfaces.
static ServantRetentionPolicy_ptr duplicate (ServantRetentionPolicy_ptr);
@@ -1387,7 +1433,7 @@ TAO_NAMESPACE PortableServer
static ServantRetentionPolicy_ptr nil (void);
static ServantRetentionPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
static CORBA::Object * upcast (void *);
-
+
private:
ServantRetentionPolicy_ptr ptr_;
// Unimplemented - prevents widening assignment.
@@ -1414,7 +1460,7 @@ TAO_NAMESPACE PortableServer
operator ServantRetentionPolicy_ptr &();
ServantRetentionPolicy_ptr &ptr (void);
ServantRetentionPolicy_ptr operator-> (void);
-
+
private:
ServantRetentionPolicy_ptr &ptr_;
};
@@ -1438,12 +1484,12 @@ TAO_NAMESPACE PortableServer
static ServantRetentionPolicy_ptr _duplicate (ServantRetentionPolicy_ptr obj);
static ServantRetentionPolicy_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static ServantRetentionPolicy_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static ServantRetentionPolicy_ptr _nil (void)
@@ -1452,7 +1498,7 @@ TAO_NAMESPACE PortableServer
}
virtual PortableServer::ServantRetentionPolicyValue value (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -1460,12 +1506,12 @@ TAO_NAMESPACE PortableServer
)) = 0;
virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+
virtual const char* _interface_repository_id (void) const;
protected:
ServantRetentionPolicy ();
-
+
virtual ~ServantRetentionPolicy (void);
private:
ServantRetentionPolicy (const ServantRetentionPolicy &);
@@ -1481,7 +1527,7 @@ TAO_NAMESPACE PortableServer
{
USE_ACTIVE_OBJECT_MAP_ONLY,
USE_DEFAULT_SERVANT,
- USE_SERVANT_MANAGER
+ USE_SERVANT_MANAGER
};
#if (TAO_HAS_MINIMUM_POA == 0)
@@ -1495,7 +1541,7 @@ TAO_NAMESPACE PortableServer
class RequestProcessingPolicy;
typedef RequestProcessingPolicy *RequestProcessingPolicy_ptr;
-
+
#endif /* end #if !defined */
@@ -1506,23 +1552,23 @@ TAO_NAMESPACE PortableServer
{
public:
RequestProcessingPolicy_var (void); // default constructor
- RequestProcessingPolicy_var (RequestProcessingPolicy_ptr p) : ptr_ (p) {}
+ RequestProcessingPolicy_var (RequestProcessingPolicy_ptr p) : ptr_ (p) {}
RequestProcessingPolicy_var (const RequestProcessingPolicy_var &); // copy constructor
~RequestProcessingPolicy_var (void); // destructor
-
+
RequestProcessingPolicy_var &operator= (RequestProcessingPolicy_ptr);
RequestProcessingPolicy_var &operator= (const RequestProcessingPolicy_var &);
RequestProcessingPolicy_ptr operator-> (void) const;
-
+
operator const RequestProcessingPolicy_ptr &() const;
operator RequestProcessingPolicy_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
RequestProcessingPolicy_ptr in (void) const;
RequestProcessingPolicy_ptr &inout (void);
RequestProcessingPolicy_ptr &out (void);
RequestProcessingPolicy_ptr _retn (void);
RequestProcessingPolicy_ptr ptr (void) const;
-
+
// Hooks used by template sequence and object manager classes
// for non-defined forward declared interfaces.
static RequestProcessingPolicy_ptr duplicate (RequestProcessingPolicy_ptr);
@@ -1530,7 +1576,7 @@ TAO_NAMESPACE PortableServer
static RequestProcessingPolicy_ptr nil (void);
static RequestProcessingPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
static CORBA::Object * upcast (void *);
-
+
private:
RequestProcessingPolicy_ptr ptr_;
// Unimplemented - prevents widening assignment.
@@ -1557,7 +1603,7 @@ TAO_NAMESPACE PortableServer
operator RequestProcessingPolicy_ptr &();
RequestProcessingPolicy_ptr &ptr (void);
RequestProcessingPolicy_ptr operator-> (void);
-
+
private:
RequestProcessingPolicy_ptr &ptr_;
};
@@ -1581,12 +1627,12 @@ TAO_NAMESPACE PortableServer
static RequestProcessingPolicy_ptr _duplicate (RequestProcessingPolicy_ptr obj);
static RequestProcessingPolicy_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static RequestProcessingPolicy_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static RequestProcessingPolicy_ptr _nil (void)
@@ -1595,7 +1641,7 @@ TAO_NAMESPACE PortableServer
}
virtual PortableServer::RequestProcessingPolicyValue value (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -1603,12 +1649,12 @@ TAO_NAMESPACE PortableServer
)) = 0;
virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+
virtual const char* _interface_repository_id (void) const;
protected:
RequestProcessingPolicy ();
-
+
virtual ~RequestProcessingPolicy (void);
private:
RequestProcessingPolicy (const RequestProcessingPolicy &);
@@ -1626,7 +1672,7 @@ TAO_NAMESPACE PortableServer
class POAManager;
typedef POAManager *POAManager_ptr;
-
+
#endif /* end #if !defined */
@@ -1637,23 +1683,23 @@ TAO_NAMESPACE PortableServer
{
public:
POAManager_var (void); // default constructor
- POAManager_var (POAManager_ptr p) : ptr_ (p) {}
+ POAManager_var (POAManager_ptr p) : ptr_ (p) {}
POAManager_var (const POAManager_var &); // copy constructor
~POAManager_var (void); // destructor
-
+
POAManager_var &operator= (POAManager_ptr);
POAManager_var &operator= (const POAManager_var &);
POAManager_ptr operator-> (void) const;
-
+
operator const POAManager_ptr &() const;
operator POAManager_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
POAManager_ptr in (void) const;
POAManager_ptr &inout (void);
POAManager_ptr &out (void);
POAManager_ptr _retn (void);
POAManager_ptr ptr (void) const;
-
+
// Hooks used by template sequence and object manager classes
// for non-defined forward declared interfaces.
static POAManager_ptr duplicate (POAManager_ptr);
@@ -1661,7 +1707,7 @@ TAO_NAMESPACE PortableServer
static POAManager_ptr nil (void);
static POAManager_ptr narrow (CORBA::Object *, CORBA::Environment &);
static CORBA::Object * upcast (void *);
-
+
private:
POAManager_ptr ptr_;
// Unimplemented - prevents widening assignment.
@@ -1688,7 +1734,7 @@ TAO_NAMESPACE PortableServer
operator POAManager_ptr &();
POAManager_ptr &ptr (void);
POAManager_ptr operator-> (void);
-
+
private:
POAManager_ptr &ptr_;
};
@@ -1712,12 +1758,12 @@ TAO_NAMESPACE PortableServer
static POAManager_ptr _duplicate (POAManager_ptr obj);
static POAManager_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static POAManager_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static POAManager_ptr _nil (void)
@@ -1735,27 +1781,27 @@ TAO_NAMESPACE PortableServer
AdapterInactive (void);
// Default constructor.
-
+
AdapterInactive (const AdapterInactive &);
// Copy constructor.
-
+
~AdapterInactive (void);
// Destructor.
-
+
AdapterInactive &operator= (const AdapterInactive &);
-
+
virtual void _raise (void);
virtual void _tao_encode (
TAO_OutputCDR &,
CORBA::Environment &
) const;
-
+
virtual void _tao_decode (
TAO_InputCDR &,
CORBA::Environment &
);
-
+
static AdapterInactive *_downcast (CORBA::Exception *);
@@ -1771,11 +1817,11 @@ TAO_NAMESPACE PortableServer
HOLDING,
ACTIVE,
DISCARDING,
- INACTIVE
+ INACTIVE
};
typedef State &State_out;
virtual void activate (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -1787,7 +1833,7 @@ TAO_NAMESPACE PortableServer
virtual void hold_requests (
CORBA::Boolean wait_for_completion,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -1797,7 +1843,7 @@ TAO_NAMESPACE PortableServer
virtual void discard_requests (
CORBA::Boolean wait_for_completion,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -1808,7 +1854,7 @@ TAO_NAMESPACE PortableServer
virtual void deactivate (
CORBA::Boolean etherealize_objects,
CORBA::Boolean wait_for_completion,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -1819,7 +1865,7 @@ TAO_NAMESPACE PortableServer
#endif /* TAO_HAS_MINIMUM_POA == 0 */
virtual PortableServer::POAManager::State get_state (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -1827,12 +1873,12 @@ TAO_NAMESPACE PortableServer
)) = 0;
virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+
virtual const char* _interface_repository_id (void) const;
protected:
POAManager ();
-
+
virtual ~POAManager (void);
private:
POAManager (const POAManager &);
@@ -1850,7 +1896,7 @@ TAO_NAMESPACE PortableServer
class AdapterActivator;
typedef AdapterActivator *AdapterActivator_ptr;
-
+
#endif /* end #if !defined */
@@ -1861,23 +1907,23 @@ TAO_NAMESPACE PortableServer
{
public:
AdapterActivator_var (void); // default constructor
- AdapterActivator_var (AdapterActivator_ptr p) : ptr_ (p) {}
+ AdapterActivator_var (AdapterActivator_ptr p) : ptr_ (p) {}
AdapterActivator_var (const AdapterActivator_var &); // copy constructor
~AdapterActivator_var (void); // destructor
-
+
AdapterActivator_var &operator= (AdapterActivator_ptr);
AdapterActivator_var &operator= (const AdapterActivator_var &);
AdapterActivator_ptr operator-> (void) const;
-
+
operator const AdapterActivator_ptr &() const;
operator AdapterActivator_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
AdapterActivator_ptr in (void) const;
AdapterActivator_ptr &inout (void);
AdapterActivator_ptr &out (void);
AdapterActivator_ptr _retn (void);
AdapterActivator_ptr ptr (void) const;
-
+
// Hooks used by template sequence and object manager classes
// for non-defined forward declared interfaces.
static AdapterActivator_ptr duplicate (AdapterActivator_ptr);
@@ -1885,7 +1931,7 @@ TAO_NAMESPACE PortableServer
static AdapterActivator_ptr nil (void);
static AdapterActivator_ptr narrow (CORBA::Object *, CORBA::Environment &);
static CORBA::Object * upcast (void *);
-
+
private:
AdapterActivator_ptr ptr_;
// Unimplemented - prevents widening assignment.
@@ -1912,7 +1958,7 @@ TAO_NAMESPACE PortableServer
operator AdapterActivator_ptr &();
AdapterActivator_ptr &ptr (void);
AdapterActivator_ptr operator-> (void);
-
+
private:
AdapterActivator_ptr &ptr_;
};
@@ -1936,12 +1982,12 @@ TAO_NAMESPACE PortableServer
static AdapterActivator_ptr _duplicate (AdapterActivator_ptr obj);
static AdapterActivator_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static AdapterActivator_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static AdapterActivator_ptr _nil (void)
@@ -1952,7 +1998,7 @@ TAO_NAMESPACE PortableServer
virtual CORBA::Boolean unknown_adapter (
PortableServer::POA_ptr parent,
const char * name,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -1960,12 +2006,12 @@ TAO_NAMESPACE PortableServer
)) = 0;
virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+
virtual const char* _interface_repository_id (void) const;
protected:
AdapterActivator ();
-
+
virtual ~AdapterActivator (void);
private:
AdapterActivator (const AdapterActivator &);
@@ -1981,7 +2027,7 @@ TAO_NAMESPACE PortableServer
class ServantManager;
typedef ServantManager *ServantManager_ptr;
-
+
#endif /* end #if !defined */
@@ -1992,23 +2038,23 @@ TAO_NAMESPACE PortableServer
{
public:
ServantManager_var (void); // default constructor
- ServantManager_var (ServantManager_ptr p) : ptr_ (p) {}
+ ServantManager_var (ServantManager_ptr p) : ptr_ (p) {}
ServantManager_var (const ServantManager_var &); // copy constructor
~ServantManager_var (void); // destructor
-
+
ServantManager_var &operator= (ServantManager_ptr);
ServantManager_var &operator= (const ServantManager_var &);
ServantManager_ptr operator-> (void) const;
-
+
operator const ServantManager_ptr &() const;
operator ServantManager_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
ServantManager_ptr in (void) const;
ServantManager_ptr &inout (void);
ServantManager_ptr &out (void);
ServantManager_ptr _retn (void);
ServantManager_ptr ptr (void) const;
-
+
// Hooks used by template sequence and object manager classes
// for non-defined forward declared interfaces.
static ServantManager_ptr duplicate (ServantManager_ptr);
@@ -2016,7 +2062,7 @@ TAO_NAMESPACE PortableServer
static ServantManager_ptr nil (void);
static ServantManager_ptr narrow (CORBA::Object *, CORBA::Environment &);
static CORBA::Object * upcast (void *);
-
+
private:
ServantManager_ptr ptr_;
// Unimplemented - prevents widening assignment.
@@ -2043,7 +2089,7 @@ TAO_NAMESPACE PortableServer
operator ServantManager_ptr &();
ServantManager_ptr &ptr (void);
ServantManager_ptr operator-> (void);
-
+
private:
ServantManager_ptr &ptr_;
};
@@ -2067,12 +2113,12 @@ TAO_NAMESPACE PortableServer
static ServantManager_ptr _duplicate (ServantManager_ptr obj);
static ServantManager_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static ServantManager_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static ServantManager_ptr _nil (void)
@@ -2081,12 +2127,12 @@ TAO_NAMESPACE PortableServer
}
virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+
virtual const char* _interface_repository_id (void) const;
protected:
ServantManager ();
-
+
virtual ~ServantManager (void);
private:
ServantManager (const ServantManager &);
@@ -2102,7 +2148,7 @@ TAO_NAMESPACE PortableServer
class ServantActivator;
typedef ServantActivator *ServantActivator_ptr;
-
+
#endif /* end #if !defined */
@@ -2113,23 +2159,23 @@ TAO_NAMESPACE PortableServer
{
public:
ServantActivator_var (void); // default constructor
- ServantActivator_var (ServantActivator_ptr p) : ptr_ (p) {}
+ ServantActivator_var (ServantActivator_ptr p) : ptr_ (p) {}
ServantActivator_var (const ServantActivator_var &); // copy constructor
~ServantActivator_var (void); // destructor
-
+
ServantActivator_var &operator= (ServantActivator_ptr);
ServantActivator_var &operator= (const ServantActivator_var &);
ServantActivator_ptr operator-> (void) const;
-
+
operator const ServantActivator_ptr &() const;
operator ServantActivator_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
ServantActivator_ptr in (void) const;
ServantActivator_ptr &inout (void);
ServantActivator_ptr &out (void);
ServantActivator_ptr _retn (void);
ServantActivator_ptr ptr (void) const;
-
+
// Hooks used by template sequence and object manager classes
// for non-defined forward declared interfaces.
static ServantActivator_ptr duplicate (ServantActivator_ptr);
@@ -2137,7 +2183,7 @@ TAO_NAMESPACE PortableServer
static ServantActivator_ptr nil (void);
static ServantActivator_ptr narrow (CORBA::Object *, CORBA::Environment &);
static CORBA::Object * upcast (void *);
-
+
private:
ServantActivator_ptr ptr_;
// Unimplemented - prevents widening assignment.
@@ -2164,7 +2210,7 @@ TAO_NAMESPACE PortableServer
operator ServantActivator_ptr &();
ServantActivator_ptr &ptr (void);
ServantActivator_ptr operator-> (void);
-
+
private:
ServantActivator_ptr &ptr_;
};
@@ -2188,12 +2234,12 @@ TAO_NAMESPACE PortableServer
static ServantActivator_ptr _duplicate (ServantActivator_ptr obj);
static ServantActivator_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static ServantActivator_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static ServantActivator_ptr _nil (void)
@@ -2230,12 +2276,12 @@ TAO_NAMESPACE PortableServer
)) = 0;
virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+
virtual const char* _interface_repository_id (void) const;
protected:
ServantActivator ();
-
+
virtual ~ServantActivator (void);
private:
ServantActivator (const ServantActivator &);
@@ -2251,7 +2297,7 @@ TAO_NAMESPACE PortableServer
class ServantLocator;
typedef ServantLocator *ServantLocator_ptr;
-
+
#endif /* end #if !defined */
@@ -2262,23 +2308,23 @@ TAO_NAMESPACE PortableServer
{
public:
ServantLocator_var (void); // default constructor
- ServantLocator_var (ServantLocator_ptr p) : ptr_ (p) {}
+ ServantLocator_var (ServantLocator_ptr p) : ptr_ (p) {}
ServantLocator_var (const ServantLocator_var &); // copy constructor
~ServantLocator_var (void); // destructor
-
+
ServantLocator_var &operator= (ServantLocator_ptr);
ServantLocator_var &operator= (const ServantLocator_var &);
ServantLocator_ptr operator-> (void) const;
-
+
operator const ServantLocator_ptr &() const;
operator ServantLocator_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
ServantLocator_ptr in (void) const;
ServantLocator_ptr &inout (void);
ServantLocator_ptr &out (void);
ServantLocator_ptr _retn (void);
ServantLocator_ptr ptr (void) const;
-
+
// Hooks used by template sequence and object manager classes
// for non-defined forward declared interfaces.
static ServantLocator_ptr duplicate (ServantLocator_ptr);
@@ -2286,7 +2332,7 @@ TAO_NAMESPACE PortableServer
static ServantLocator_ptr nil (void);
static ServantLocator_ptr narrow (CORBA::Object *, CORBA::Environment &);
static CORBA::Object * upcast (void *);
-
+
private:
ServantLocator_ptr ptr_;
// Unimplemented - prevents widening assignment.
@@ -2313,7 +2359,7 @@ TAO_NAMESPACE PortableServer
operator ServantLocator_ptr &();
ServantLocator_ptr &ptr (void);
ServantLocator_ptr operator-> (void);
-
+
private:
ServantLocator_ptr &ptr_;
};
@@ -2340,12 +2386,12 @@ TAO_NAMESPACE PortableServer
static ServantLocator_ptr _duplicate (ServantLocator_ptr obj);
static ServantLocator_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static ServantLocator_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static ServantLocator_ptr _nil (void)
@@ -2384,12 +2430,12 @@ TAO_NAMESPACE PortableServer
)) = 0;
virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+
virtual const char* _interface_repository_id (void) const;
protected:
ServantLocator ();
-
+
virtual ~ServantLocator (void);
private:
ServantLocator (const ServantLocator &);
@@ -2417,12 +2463,12 @@ TAO_NAMESPACE PortableServer
static POA_ptr _duplicate (POA_ptr obj);
static POA_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static POA_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static POA_ptr _nil (void)
@@ -2440,27 +2486,27 @@ TAO_NAMESPACE PortableServer
AdapterAlreadyExists (void);
// Default constructor.
-
+
AdapterAlreadyExists (const AdapterAlreadyExists &);
// Copy constructor.
-
+
~AdapterAlreadyExists (void);
// Destructor.
-
+
AdapterAlreadyExists &operator= (const AdapterAlreadyExists &);
-
+
virtual void _raise (void);
virtual void _tao_encode (
TAO_OutputCDR &,
CORBA::Environment &
) const;
-
+
virtual void _tao_decode (
TAO_InputCDR &,
CORBA::Environment &
);
-
+
static AdapterAlreadyExists *_downcast (CORBA::Exception *);
@@ -2481,27 +2527,27 @@ TAO_NAMESPACE PortableServer
AdapterNonExistent (void);
// Default constructor.
-
+
AdapterNonExistent (const AdapterNonExistent &);
// Copy constructor.
-
+
~AdapterNonExistent (void);
// Destructor.
-
+
AdapterNonExistent &operator= (const AdapterNonExistent &);
-
+
virtual void _raise (void);
virtual void _tao_encode (
TAO_OutputCDR &,
CORBA::Environment &
) const;
-
+
virtual void _tao_decode (
TAO_InputCDR &,
CORBA::Environment &
);
-
+
static AdapterNonExistent *_downcast (CORBA::Exception *);
@@ -2523,33 +2569,33 @@ TAO_NAMESPACE PortableServer
InvalidPolicy (void);
// Default constructor.
-
+
InvalidPolicy (const InvalidPolicy &);
// Copy constructor.
-
+
~InvalidPolicy (void);
// Destructor.
-
+
InvalidPolicy &operator= (const InvalidPolicy &);
-
+
virtual void _raise (void);
virtual void _tao_encode (
TAO_OutputCDR &,
CORBA::Environment &
) const;
-
+
virtual void _tao_decode (
TAO_InputCDR &,
CORBA::Environment &
);
-
+
static InvalidPolicy *_downcast (CORBA::Exception *);
InvalidPolicy (
CORBA::UShort _tao_index
);
-
+
// = TAO extension.
static CORBA::Exception *_alloc (void);
}; // Exception PortableServer::POA::InvalidPolicy.
@@ -2569,27 +2615,27 @@ TAO_NAMESPACE PortableServer
NoServant (void);
// Default constructor.
-
+
NoServant (const NoServant &);
// Copy constructor.
-
+
~NoServant (void);
// Destructor.
-
+
NoServant &operator= (const NoServant &);
-
+
virtual void _raise (void);
virtual void _tao_encode (
TAO_OutputCDR &,
CORBA::Environment &
) const;
-
+
virtual void _tao_decode (
TAO_InputCDR &,
CORBA::Environment &
);
-
+
static NoServant *_downcast (CORBA::Exception *);
@@ -2612,27 +2658,27 @@ TAO_NAMESPACE PortableServer
ObjectAlreadyActive (void);
// Default constructor.
-
+
ObjectAlreadyActive (const ObjectAlreadyActive &);
// Copy constructor.
-
+
~ObjectAlreadyActive (void);
// Destructor.
-
+
ObjectAlreadyActive &operator= (const ObjectAlreadyActive &);
-
+
virtual void _raise (void);
virtual void _tao_encode (
TAO_OutputCDR &,
CORBA::Environment &
) const;
-
+
virtual void _tao_decode (
TAO_InputCDR &,
CORBA::Environment &
);
-
+
static ObjectAlreadyActive *_downcast (CORBA::Exception *);
@@ -2653,27 +2699,27 @@ TAO_NAMESPACE PortableServer
ObjectNotActive (void);
// Default constructor.
-
+
ObjectNotActive (const ObjectNotActive &);
// Copy constructor.
-
+
~ObjectNotActive (void);
// Destructor.
-
+
ObjectNotActive &operator= (const ObjectNotActive &);
-
+
virtual void _raise (void);
virtual void _tao_encode (
TAO_OutputCDR &,
CORBA::Environment &
) const;
-
+
virtual void _tao_decode (
TAO_InputCDR &,
CORBA::Environment &
);
-
+
static ObjectNotActive *_downcast (CORBA::Exception *);
@@ -2694,27 +2740,27 @@ TAO_NAMESPACE PortableServer
ServantAlreadyActive (void);
// Default constructor.
-
+
ServantAlreadyActive (const ServantAlreadyActive &);
// Copy constructor.
-
+
~ServantAlreadyActive (void);
// Destructor.
-
+
ServantAlreadyActive &operator= (const ServantAlreadyActive &);
-
+
virtual void _raise (void);
virtual void _tao_encode (
TAO_OutputCDR &,
CORBA::Environment &
) const;
-
+
virtual void _tao_decode (
TAO_InputCDR &,
CORBA::Environment &
);
-
+
static ServantAlreadyActive *_downcast (CORBA::Exception *);
@@ -2735,27 +2781,27 @@ TAO_NAMESPACE PortableServer
ServantNotActive (void);
// Default constructor.
-
+
ServantNotActive (const ServantNotActive &);
// Copy constructor.
-
+
~ServantNotActive (void);
// Destructor.
-
+
ServantNotActive &operator= (const ServantNotActive &);
-
+
virtual void _raise (void);
virtual void _tao_encode (
TAO_OutputCDR &,
CORBA::Environment &
) const;
-
+
virtual void _tao_decode (
TAO_InputCDR &,
CORBA::Environment &
);
-
+
static ServantNotActive *_downcast (CORBA::Exception *);
@@ -2776,27 +2822,27 @@ TAO_NAMESPACE PortableServer
WrongAdapter (void);
// Default constructor.
-
+
WrongAdapter (const WrongAdapter &);
// Copy constructor.
-
+
~WrongAdapter (void);
// Destructor.
-
+
WrongAdapter &operator= (const WrongAdapter &);
-
+
virtual void _raise (void);
virtual void _tao_encode (
TAO_OutputCDR &,
CORBA::Environment &
) const;
-
+
virtual void _tao_decode (
TAO_InputCDR &,
CORBA::Environment &
);
-
+
static WrongAdapter *_downcast (CORBA::Exception *);
@@ -2817,27 +2863,27 @@ TAO_NAMESPACE PortableServer
WrongPolicy (void);
// Default constructor.
-
+
WrongPolicy (const WrongPolicy &);
// Copy constructor.
-
+
~WrongPolicy (void);
// Destructor.
-
+
WrongPolicy &operator= (const WrongPolicy &);
-
+
virtual void _raise (void);
virtual void _tao_encode (
TAO_OutputCDR &,
CORBA::Environment &
) const;
-
+
virtual void _tao_decode (
TAO_InputCDR &,
CORBA::Environment &
);
-
+
static WrongPolicy *_downcast (CORBA::Exception *);
@@ -2852,7 +2898,7 @@ TAO_NAMESPACE PortableServer
const char * adapter_name,
PortableServer::POAManager_ptr a_POAManager,
const CORBA::PolicyList & policies,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -2864,7 +2910,7 @@ TAO_NAMESPACE PortableServer
virtual PortableServer::POA_ptr find_POA (
const char * adapter_name,
CORBA::Boolean activate_it,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -2875,7 +2921,7 @@ TAO_NAMESPACE PortableServer
virtual void destroy (
CORBA::Boolean etherealize_objects,
CORBA::Boolean wait_for_completion,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -2886,7 +2932,7 @@ TAO_NAMESPACE PortableServer
virtual PortableServer::ThreadPolicy_ptr create_thread_policy (
PortableServer::ThreadPolicyValue value,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -2897,7 +2943,7 @@ TAO_NAMESPACE PortableServer
virtual PortableServer::LifespanPolicy_ptr create_lifespan_policy (
PortableServer::LifespanPolicyValue value,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -2906,7 +2952,7 @@ TAO_NAMESPACE PortableServer
virtual PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (
PortableServer::IdUniquenessPolicyValue value,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -2915,7 +2961,7 @@ TAO_NAMESPACE PortableServer
virtual PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (
PortableServer::IdAssignmentPolicyValue value,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -2926,7 +2972,7 @@ TAO_NAMESPACE PortableServer
virtual PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (
PortableServer::ImplicitActivationPolicyValue value,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -2935,7 +2981,7 @@ TAO_NAMESPACE PortableServer
virtual PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (
PortableServer::ServantRetentionPolicyValue value,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -2944,7 +2990,7 @@ TAO_NAMESPACE PortableServer
virtual PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (
PortableServer::RequestProcessingPolicyValue value,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -2954,7 +3000,7 @@ TAO_NAMESPACE PortableServer
#endif /* TAO_HAS_MINIMUM_POA == 0 */
virtual char * the_name (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -2962,7 +3008,7 @@ TAO_NAMESPACE PortableServer
)) = 0;
virtual PortableServer::POA_ptr the_parent (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -2970,7 +3016,7 @@ TAO_NAMESPACE PortableServer
)) = 0;
virtual PortableServer::POAList * the_children (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -2978,7 +3024,7 @@ TAO_NAMESPACE PortableServer
)) = 0;
virtual PortableServer::POAManager_ptr the_POAManager (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -2988,7 +3034,7 @@ TAO_NAMESPACE PortableServer
#if (TAO_HAS_MINIMUM_POA == 0)
virtual PortableServer::AdapterActivator_ptr the_activator (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -2997,7 +3043,7 @@ TAO_NAMESPACE PortableServer
virtual void the_activator (
PortableServer::AdapterActivator_ptr the_activator,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -3005,7 +3051,7 @@ TAO_NAMESPACE PortableServer
)) = 0;
virtual PortableServer::ServantManager_ptr get_servant_manager (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -3015,7 +3061,7 @@ TAO_NAMESPACE PortableServer
virtual void set_servant_manager (
PortableServer::ServantManager_ptr imgr,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -3024,7 +3070,7 @@ TAO_NAMESPACE PortableServer
)) = 0;
virtual PortableServer::Servant get_servant (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -3035,7 +3081,7 @@ TAO_NAMESPACE PortableServer
virtual void set_servant (
PortableServer::Servant p_servant,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -3047,7 +3093,7 @@ TAO_NAMESPACE PortableServer
virtual PortableServer::ObjectId * activate_object (
PortableServer::Servant p_servant,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -3059,7 +3105,7 @@ TAO_NAMESPACE PortableServer
virtual void activate_object_with_id (
const PortableServer::ObjectId & id,
PortableServer::Servant p_servant,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -3071,7 +3117,7 @@ TAO_NAMESPACE PortableServer
virtual void deactivate_object (
const PortableServer::ObjectId & oid,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -3082,7 +3128,7 @@ TAO_NAMESPACE PortableServer
virtual CORBA::Object_ptr create_reference (
const char * intf,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -3093,7 +3139,7 @@ TAO_NAMESPACE PortableServer
virtual CORBA::Object_ptr create_reference_with_id (
const PortableServer::ObjectId & oid,
const char * intf,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -3103,7 +3149,7 @@ TAO_NAMESPACE PortableServer
virtual PortableServer::ObjectId * servant_to_id (
PortableServer::Servant p_servant,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -3114,7 +3160,7 @@ TAO_NAMESPACE PortableServer
virtual CORBA::Object_ptr servant_to_reference (
PortableServer::Servant p_servant,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -3125,7 +3171,7 @@ TAO_NAMESPACE PortableServer
virtual PortableServer::Servant reference_to_servant (
CORBA::Object_ptr reference,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -3137,7 +3183,7 @@ TAO_NAMESPACE PortableServer
virtual PortableServer::ObjectId * reference_to_id (
CORBA::Object_ptr reference,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -3148,7 +3194,7 @@ TAO_NAMESPACE PortableServer
virtual PortableServer::Servant id_to_servant (
const PortableServer::ObjectId & oid,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -3159,7 +3205,7 @@ TAO_NAMESPACE PortableServer
virtual CORBA::Object_ptr id_to_reference (
const PortableServer::ObjectId & oid,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -3170,31 +3216,53 @@ TAO_NAMESPACE PortableServer
virtual PortableServer::ObjectId * create_id_for_reference (
CORBA::Object_ptr the_ref,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
CORBA::SystemException,
- PortableServer::POA::WrongAdapter
+ PortableServer::NotAGroupObject
)) = 0;
virtual PortableServer::IDs * reference_to_ids (
CORBA::Object_ptr the_ref,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
CORBA::SystemException,
- PortableServer::POA::WrongAdapter
+ PortableServer::NotAGroupObject
)) = 0;
- virtual void *_tao_QueryInterface (ptr_arith_t type);
+ virtual void associate_reference_with_id (
+ CORBA::Object_ptr ref,
+ const PortableServer::ObjectId & oid,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException,
+ PortableServer::NotAGroupObject
+ )) = 0;
+ virtual void disassociate_reference_with_id (
+ CORBA::Object_ptr ref,
+ const PortableServer::ObjectId & oid,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException,
+ PortableServer::NotAGroupObject
+ )) = 0;
+
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
protected:
POA ();
-
+
virtual ~POA (void);
private:
POA (const POA &);
@@ -3210,7 +3278,7 @@ TAO_NAMESPACE PortableServer
class Current;
typedef Current *Current_ptr;
-
+
#endif /* end #if !defined */
@@ -3221,23 +3289,23 @@ TAO_NAMESPACE PortableServer
{
public:
Current_var (void); // default constructor
- Current_var (Current_ptr p) : ptr_ (p) {}
+ Current_var (Current_ptr p) : ptr_ (p) {}
Current_var (const Current_var &); // copy constructor
~Current_var (void); // destructor
-
+
Current_var &operator= (Current_ptr);
Current_var &operator= (const Current_var &);
Current_ptr operator-> (void) const;
-
+
operator const Current_ptr &() const;
operator Current_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
Current_ptr in (void) const;
Current_ptr &inout (void);
Current_ptr &out (void);
Current_ptr _retn (void);
Current_ptr ptr (void) const;
-
+
// Hooks used by template sequence and object manager classes
// for non-defined forward declared interfaces.
static Current_ptr duplicate (Current_ptr);
@@ -3245,7 +3313,7 @@ TAO_NAMESPACE PortableServer
static Current_ptr nil (void);
static Current_ptr narrow (CORBA::Object *, CORBA::Environment &);
static CORBA::Object * upcast (void *);
-
+
private:
Current_ptr ptr_;
// Unimplemented - prevents widening assignment.
@@ -3272,7 +3340,7 @@ TAO_NAMESPACE PortableServer
operator Current_ptr &();
Current_ptr &ptr (void);
Current_ptr operator-> (void);
-
+
private:
Current_ptr &ptr_;
};
@@ -3296,12 +3364,12 @@ TAO_NAMESPACE PortableServer
static Current_ptr _duplicate (Current_ptr obj);
static Current_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static Current_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static Current_ptr _nil (void)
@@ -3319,27 +3387,27 @@ TAO_NAMESPACE PortableServer
NoContext (void);
// Default constructor.
-
+
NoContext (const NoContext &);
// Copy constructor.
-
+
~NoContext (void);
// Destructor.
-
+
NoContext &operator= (const NoContext &);
-
+
virtual void _raise (void);
virtual void _tao_encode (
TAO_OutputCDR &,
CORBA::Environment &
) const;
-
+
virtual void _tao_decode (
TAO_InputCDR &,
CORBA::Environment &
);
-
+
static NoContext *_downcast (CORBA::Exception *);
@@ -3351,7 +3419,7 @@ TAO_NAMESPACE PortableServer
#endif /* end #if !defined */
virtual PortableServer::POA_ptr get_POA (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -3360,7 +3428,7 @@ TAO_NAMESPACE PortableServer
)) = 0;
virtual PortableServer::ObjectId * get_object_id (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -3369,12 +3437,12 @@ TAO_NAMESPACE PortableServer
)) = 0;
virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+
virtual const char* _interface_repository_id (void) const;
protected:
Current ();
-
+
virtual ~Current (void);
private:
Current (const Current &);
@@ -3398,7 +3466,7 @@ TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::Object
TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ObjectId *&); // deprecated
TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::ObjectId *&);
-#if (TAO_HAS_MINIMAL_CORBA == 0)
+#if (TAO_HAS_MINIMUM_CORBA == 0)
TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::ForwardRequest &); // copying version
TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ForwardRequest*); // noncopying version
@@ -3407,6 +3475,10 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const
#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::NotAGroupObject &); // copying version
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::NotAGroupObject*); // noncopying version
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::NotAGroupObject *&); // deprecated
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::NotAGroupObject *&);
TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::IDs &); // copying version
TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IDs*); // noncopying version
TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IDs *&); // deprecated
@@ -3461,6 +3533,10 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer
#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::NotAGroupObject &);
+TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::NotAGroupObject &);
+
+
#if !defined _TAO_CDR_OP_PortableServer_IDs_H_
#define _TAO_CDR_OP_PortableServer_IDs_H_
@@ -3477,25 +3553,25 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (
#if (TAO_HAS_MINIMUM_POA == 0)
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ThreadPolicyValue &); //
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ThreadPolicyValue &); //
TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ThreadPolicyValue &);
#endif /* TAO_HAS_MINIMUM_POA == 0 */
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::LifespanPolicyValue &); //
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::LifespanPolicyValue &); //
TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::LifespanPolicyValue &);
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdUniquenessPolicyValue &); //
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdUniquenessPolicyValue &); //
TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdUniquenessPolicyValue &);
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdAssignmentPolicyValue &); //
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdAssignmentPolicyValue &); //
TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdAssignmentPolicyValue &);
#if (TAO_HAS_MINIMUM_POA == 0)
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ImplicitActivationPolicyValue &); //
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ImplicitActivationPolicyValue &); //
TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ImplicitActivationPolicyValue &);
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ServantRetentionPolicyValue &); //
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ServantRetentionPolicyValue &); //
TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ServantRetentionPolicyValue &);
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::RequestProcessingPolicyValue &); //
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::RequestProcessingPolicyValue &); //
TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::RequestProcessingPolicyValue &);
#endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/PortableServerC.i b/TAO/tao/PortableServer/PortableServerC.i
index beddce7b123..396b4062009 100644
--- a/TAO/tao/PortableServer/PortableServerC.i
+++ b/TAO/tao/PortableServer/PortableServerC.i
@@ -21,7 +21,7 @@
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+
#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_PORTABLESERVER_POALIST_CI_)
#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_PORTABLESERVER_POALIST_CI_
@@ -29,36 +29,36 @@
PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (CORBA::ULong nelems)
{
PortableServer::POA **buf = 0;
-
+
ACE_NEW_RETURN (buf, PortableServer::POA*[nelems], 0);
-
+
for (CORBA::ULong i = 0; i < nelems; i++)
{
buf[i] = PortableServer::POA::_nil ();
}
-
+
return buf;
}
-
- ACE_INLINE void
+
+ ACE_INLINE void
PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::freebuf (PortableServer::POA **buffer)
{
if (buffer == 0)
return;
delete[] buffer;
}
-
+
ACE_INLINE
PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_TAO_Unbounded_Object_Sequence_PortableServer_POAList (void)
{
}
-
+
ACE_INLINE
PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_TAO_Unbounded_Object_Sequence_PortableServer_POAList (CORBA::ULong maximum)
: TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (maximum))
{
}
-
+
ACE_INLINE
PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_TAO_Unbounded_Object_Sequence_PortableServer_POAList (CORBA::ULong maximum,
CORBA::ULong length,
@@ -67,7 +67,7 @@
: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
{
}
-
+
ACE_INLINE
PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_TAO_Unbounded_Object_Sequence_PortableServer_POAList(const _TAO_Unbounded_Object_Sequence_PortableServer_POAList &rhs)
: TAO_Unbounded_Base_Sequence (rhs)
@@ -76,12 +76,12 @@
{
PortableServer::POA **tmp1 = _TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (this->maximum_);
PortableServer::POA ** const tmp2 = ACE_reinterpret_cast (PortableServer::POA ** ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < rhs.length_; ++i)
{
tmp1[i] = PortableServer::POA::_duplicate (tmp2[i]);
}
-
+
this->buffer_ = tmp1;
}
else
@@ -89,17 +89,17 @@
this->buffer_ = 0;
}
}
-
+
ACE_INLINE PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList &
PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::operator= (const _TAO_Unbounded_Object_Sequence_PortableServer_POAList &rhs)
{
if (this == &rhs)
return *this;
-
+
if (this->release_)
{
PortableServer::POA **tmp = ACE_reinterpret_cast (PortableServer::POA **, this->buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
{
CORBA::release (tmp[i]);
@@ -113,20 +113,20 @@
}
else
this->buffer_ = _TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (rhs.maximum_);
-
+
TAO_Unbounded_Base_Sequence::operator= (rhs);
-
+
PortableServer::POA **tmp1 = ACE_reinterpret_cast (PortableServer::POA **, this->buffer_);
PortableServer::POA ** const tmp2 = ACE_reinterpret_cast (PortableServer::POA ** ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < rhs.length_; ++i)
{
tmp1[i] = PortableServer::POA::_duplicate (tmp2[i]);
}
-
+
return *this;
}
-
+
ACE_INLINE TAO_Object_Manager<PortableServer::POA,PortableServer::POA_var>
PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::operator[] (CORBA::ULong index) const
// read-write accessor
@@ -135,7 +135,7 @@
PortableServer::POA ** const tmp = ACE_reinterpret_cast (PortableServer::POA ** ACE_CAST_CONST, this->buffer_);
return TAO_Object_Manager<PortableServer::POA,PortableServer::POA_var> (tmp + index, this->release_);
}
-
+
ACE_INLINE PortableServer::POA* *
PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::get_buffer (CORBA::Boolean orphan)
{
@@ -169,18 +169,18 @@
}
return result;
}
-
+
ACE_INLINE const PortableServer::POA* *
PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::get_buffer (void) const
{
return ACE_reinterpret_cast(const PortableServer::POA ** ACE_CAST_CONST, this->buffer_);
}
-
-
+
+
#endif /* end #if !defined */
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
#if !defined (_PORTABLESERVER_POALIST_CI_)
#define _PORTABLESERVER_POALIST_CI_
@@ -236,7 +236,7 @@ PortableServer::POAList_var::operator= (const ::PortableServer::POAList_var &p)
{
POAList *deep_copy =
new POAList (*p.ptr_);
-
+
if (deep_copy != 0)
{
POAList *tmp = deep_copy;
@@ -246,7 +246,7 @@ PortableServer::POAList_var::operator= (const ::PortableServer::POAList_var &p)
}
}
}
-
+
return *this;
}
@@ -262,27 +262,27 @@ PortableServer::POAList_var::operator-> (void)
return this->ptr_;
}
-ACE_INLINE
+ACE_INLINE
PortableServer::POAList_var::operator const ::PortableServer::POAList &() const // cast
{
return *this->ptr_;
}
-ACE_INLINE
-PortableServer::POAList_var::operator ::PortableServer::POAList &() // cast
+ACE_INLINE
+PortableServer::POAList_var::operator ::PortableServer::POAList &() // cast
{
return *this->ptr_;
}
-ACE_INLINE
-PortableServer::POAList_var::operator ::PortableServer::POAList &() const // cast
+ACE_INLINE
+PortableServer::POAList_var::operator ::PortableServer::POAList &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-PortableServer::POAList_var::operator ::PortableServer::POAList *&() // cast
+PortableServer::POAList_var::operator ::PortableServer::POAList *&() // cast
{
return this->ptr_;
}
@@ -305,7 +305,7 @@ PortableServer::POAList_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::PortableServer::POAList *&
PortableServer::POAList_var::out (void)
{
@@ -366,7 +366,7 @@ PortableServer::POAList_out::operator= (POAList *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
PortableServer::POAList_out::operator ::PortableServer::POAList *&() // cast
{
return this->ptr_;
@@ -455,7 +455,7 @@ PortableServer::ObjectId_var::operator= (const ::PortableServer::ObjectId_var &p
{
ObjectId *deep_copy =
new ObjectId (*p.ptr_);
-
+
if (deep_copy != 0)
{
ObjectId *tmp = deep_copy;
@@ -465,7 +465,7 @@ PortableServer::ObjectId_var::operator= (const ::PortableServer::ObjectId_var &p
}
}
}
-
+
return *this;
}
@@ -493,20 +493,20 @@ PortableServer::ObjectId_var::operator-> (void)
return this->ptr_;
}
-ACE_INLINE
+ACE_INLINE
PortableServer::ObjectId_var::operator const ::PortableServer::ObjectId &() const // cast
{
return *this->ptr_;
}
-ACE_INLINE
-PortableServer::ObjectId_var::operator ::PortableServer::ObjectId &() // cast
+ACE_INLINE
+PortableServer::ObjectId_var::operator ::PortableServer::ObjectId &() // cast
{
return *this->ptr_;
}
-ACE_INLINE
-PortableServer::ObjectId_var::operator ::PortableServer::ObjectId &() const // cast
+ACE_INLINE
+PortableServer::ObjectId_var::operator ::PortableServer::ObjectId &() const // cast
{
return *this->ptr_;
}
@@ -535,7 +535,7 @@ PortableServer::ObjectId_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::PortableServer::ObjectId *&
PortableServer::ObjectId_var::out (void)
{
@@ -596,7 +596,7 @@ PortableServer::ObjectId_out::operator= (ObjectId *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
PortableServer::ObjectId_out::operator ::PortableServer::ObjectId *&() // cast
{
return this->ptr_;
@@ -627,9 +627,13 @@ PortableServer::ObjectId_out::operator[] (CORBA::ULong index)
// Inline operations for exception PortableServer::ForwardRequest
// *************************************************************
+// *************************************************************
+// Inline operations for exception PortableServer::NotAGroupObject
+// *************************************************************
+
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+
#if !defined (__TAO_UNBOUNDED_SEQUENCE_PORTABLESERVER_IDS_CI_)
#define __TAO_UNBOUNDED_SEQUENCE_PORTABLESERVER_IDS_CI_
@@ -642,24 +646,24 @@ PortableServer::ObjectId_out::operator[] (CORBA::ULong index)
ACE_NEW_RETURN (retval, PortableServer::ObjectId[size], 0);
return retval;
}
-
+
ACE_INLINE void PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::freebuf (PortableServer::ObjectId *buffer)
// Free the sequence.
{
delete [] buffer;
}
-
+
ACE_INLINE
PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::_TAO_Unbounded_Sequence_PortableServer_IDs (void) // Default constructor.
{
}
-
+
ACE_INLINE
PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::_TAO_Unbounded_Sequence_PortableServer_IDs (CORBA::ULong maximum) // Constructor using a maximum length value.
: TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_PortableServer_IDs::allocbuf (maximum))
{
}
-
+
ACE_INLINE
PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::_TAO_Unbounded_Sequence_PortableServer_IDs (CORBA::ULong maximum,
CORBA::ULong length,
@@ -668,7 +672,7 @@ PortableServer::ObjectId_out::operator[] (CORBA::ULong index)
: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
{
}
-
+
ACE_INLINE
PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::_TAO_Unbounded_Sequence_PortableServer_IDs (const _TAO_Unbounded_Sequence_PortableServer_IDs &rhs)
// Copy constructor.
@@ -678,10 +682,10 @@ PortableServer::ObjectId_out::operator[] (CORBA::ULong index)
{
PortableServer::ObjectId *tmp1 = _TAO_Unbounded_Sequence_PortableServer_IDs::allocbuf (this->maximum_);
PortableServer::ObjectId * const tmp2 = ACE_reinterpret_cast (PortableServer::ObjectId * ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-
+
this->buffer_ = tmp1;
}
else
@@ -689,14 +693,14 @@ PortableServer::ObjectId_out::operator[] (CORBA::ULong index)
this->buffer_ = 0;
}
}
-
+
ACE_INLINE PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs &
PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::operator= (const _TAO_Unbounded_Sequence_PortableServer_IDs &rhs)
// Assignment operator.
{
if (this == &rhs)
return *this;
-
+
if (this->release_)
{
if (this->maximum_ < rhs.maximum_)
@@ -709,18 +713,18 @@ PortableServer::ObjectId_out::operator[] (CORBA::ULong index)
}
else
this->buffer_ = _TAO_Unbounded_Sequence_PortableServer_IDs::allocbuf (rhs.maximum_);
-
+
TAO_Unbounded_Base_Sequence::operator= (rhs);
-
+
PortableServer::ObjectId *tmp1 = ACE_reinterpret_cast (PortableServer::ObjectId *, this->buffer_);
PortableServer::ObjectId * const tmp2 = ACE_reinterpret_cast (PortableServer::ObjectId * ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-
+
return *this;
}
-
+
// = Accessors.
ACE_INLINE PortableServer::ObjectId &
PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::operator[] (CORBA::ULong i)
@@ -730,7 +734,7 @@ PortableServer::ObjectId_out::operator[] (CORBA::ULong index)
PortableServer::ObjectId* tmp = ACE_reinterpret_cast(PortableServer::ObjectId*,this->buffer_);
return tmp[i];
}
-
+
ACE_INLINE const PortableServer::ObjectId &
PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::operator[] (CORBA::ULong i) const
// operator []
@@ -739,9 +743,9 @@ PortableServer::ObjectId_out::operator[] (CORBA::ULong index)
PortableServer::ObjectId * const tmp = ACE_reinterpret_cast (PortableServer::ObjectId* ACE_CAST_CONST, this->buffer_);
return tmp[i];
}
-
+
// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
+
ACE_INLINE PortableServer::ObjectId *
PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::get_buffer (CORBA::Boolean orphan)
{
@@ -775,13 +779,13 @@ PortableServer::ObjectId_out::operator[] (CORBA::ULong index)
}
return result;
}
-
+
ACE_INLINE const PortableServer::ObjectId *
PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::get_buffer (void) const
{
return ACE_reinterpret_cast(const PortableServer::ObjectId * ACE_CAST_CONST, this->buffer_);
}
-
+
ACE_INLINE void
PortableServer::_TAO_Unbounded_Sequence_PortableServer_IDs::replace (CORBA::ULong max,
CORBA::ULong length,
@@ -798,11 +802,11 @@ PortableServer::ObjectId_out::operator[] (CORBA::ULong index)
this->buffer_ = data;
this->release_ = release;
}
-
+
#endif /* end #if !defined */
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
#if !defined (_PORTABLESERVER_IDS_CI_)
#define _PORTABLESERVER_IDS_CI_
@@ -858,7 +862,7 @@ PortableServer::IDs_var::operator= (const ::PortableServer::IDs_var &p)
{
IDs *deep_copy =
new IDs (*p.ptr_);
-
+
if (deep_copy != 0)
{
IDs *tmp = deep_copy;
@@ -868,7 +872,7 @@ PortableServer::IDs_var::operator= (const ::PortableServer::IDs_var &p)
}
}
}
-
+
return *this;
}
@@ -884,27 +888,27 @@ PortableServer::IDs_var::operator-> (void)
return this->ptr_;
}
-ACE_INLINE
+ACE_INLINE
PortableServer::IDs_var::operator const ::PortableServer::IDs &() const // cast
{
return *this->ptr_;
}
-ACE_INLINE
-PortableServer::IDs_var::operator ::PortableServer::IDs &() // cast
+ACE_INLINE
+PortableServer::IDs_var::operator ::PortableServer::IDs &() // cast
{
return *this->ptr_;
}
-ACE_INLINE
-PortableServer::IDs_var::operator ::PortableServer::IDs &() const // cast
+ACE_INLINE
+PortableServer::IDs_var::operator ::PortableServer::IDs &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-PortableServer::IDs_var::operator ::PortableServer::IDs *&() // cast
+PortableServer::IDs_var::operator ::PortableServer::IDs *&() // cast
{
return this->ptr_;
}
@@ -933,7 +937,7 @@ PortableServer::IDs_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::PortableServer::IDs *&
PortableServer::IDs_var::out (void)
{
@@ -994,7 +998,7 @@ PortableServer::IDs_out::operator= (IDs *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
PortableServer::IDs_out::operator ::PortableServer::IDs *&() // cast
{
return this->ptr_;
@@ -1826,6 +1830,20 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm,PortableServer::Forward
return 0;
}
+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::NotAGroupObject &_tao_aggregate)
+{
+ // first marshal the repository ID
+ if (strm << _tao_aggregate._id ())
+ return 1;
+ else
+ return 0;
+}
+
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,PortableServer::NotAGroupObject&)
+{
+ return 1;
+}
+
#if !defined _TAO_CDR_OP_PortableServer_IDs_I_
#define _TAO_CDR_OP_PortableServer_IDs_I_
@@ -1855,12 +1873,12 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::Thread
{
CORBA::ULong _tao_temp = 0;
CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+
if (_tao_result == 1)
{
_tao_enumval = ACE_static_cast (PortableServer::ThreadPolicyValue, _tao_temp);
}
-
+
return _tao_result;
}
@@ -1876,12 +1894,12 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::Lifesp
{
CORBA::ULong _tao_temp = 0;
CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+
if (_tao_result == 1)
{
_tao_enumval = ACE_static_cast (PortableServer::LifespanPolicyValue, _tao_temp);
}
-
+
return _tao_result;
}
@@ -1895,12 +1913,12 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::IdUniq
{
CORBA::ULong _tao_temp = 0;
CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+
if (_tao_result == 1)
{
_tao_enumval = ACE_static_cast (PortableServer::IdUniquenessPolicyValue, _tao_temp);
}
-
+
return _tao_result;
}
@@ -1914,12 +1932,12 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::IdAssi
{
CORBA::ULong _tao_temp = 0;
CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+
if (_tao_result == 1)
{
_tao_enumval = ACE_static_cast (PortableServer::IdAssignmentPolicyValue, _tao_temp);
}
-
+
return _tao_result;
}
@@ -1935,12 +1953,12 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::Implic
{
CORBA::ULong _tao_temp = 0;
CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+
if (_tao_result == 1)
{
_tao_enumval = ACE_static_cast (PortableServer::ImplicitActivationPolicyValue, _tao_temp);
}
-
+
return _tao_result;
}
@@ -1954,12 +1972,12 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::Servan
{
CORBA::ULong _tao_temp = 0;
CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+
if (_tao_result == 1)
{
_tao_enumval = ACE_static_cast (PortableServer::ServantRetentionPolicyValue, _tao_temp);
}
-
+
return _tao_result;
}
@@ -1973,12 +1991,12 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::Reques
{
CORBA::ULong _tao_temp = 0;
CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+
if (_tao_result == 1)
{
_tao_enumval = ACE_static_cast (PortableServer::RequestProcessingPolicyValue, _tao_temp);
}
-
+
return _tao_result;
}
diff --git a/TAO/tao/PortableServer/RTPortableServerC.cpp b/TAO/tao/PortableServer/RTPortableServerC.cpp
index 22faf64e342..b8a97440933 100644
--- a/TAO/tao/PortableServer/RTPortableServerC.cpp
+++ b/TAO/tao/PortableServer/RTPortableServerC.cpp
@@ -21,12 +21,7 @@
#include "RTPortableServerC.h"
-#include "tao/Stub.h"
-#include "tao/Invocation.h"
-#include "tao/ClientRequestInfo.h"
-#if TAO_HAS_INTERCEPTORS == 1
-#include "tao/RequestInfo_Util.h"
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+#if (TAO_HAS_RT_CORBA == 1)
#if defined (__BORLANDC__)
#pragma option -w-rvl -w-rch -w-ccc -w-aus
@@ -36,49 +31,6 @@
#include "RTPortableServerC.i"
#endif /* !defined INLINE */
-RTPortableServer::POA_ptr
-tao_RTPortableServer_POA_duplicate (
- RTPortableServer::POA_ptr p
- )
-{
- return RTPortableServer::POA::_duplicate (p);
-}
-
-void
-tao_RTPortableServer_POA_release (
- RTPortableServer::POA_ptr p
- )
-{
- CORBA::release (p);
-}
-
-RTPortableServer::POA_ptr
-tao_RTPortableServer_POA_nil (
- void
- )
-{
- return RTPortableServer::POA::_nil ();
-}
-
-RTPortableServer::POA_ptr
-tao_RTPortableServer_POA_narrow (
- CORBA::Object *p,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- return RTPortableServer::POA::_narrow (p, ACE_TRY_ENV);
-}
-
-CORBA::Object *
-tao_RTPortableServer_POA_upcast (
- void *src
- )
-{
- RTPortableServer::POA **tmp =
- ACE_static_cast (RTPortableServer::POA **, src);
- return *tmp;
-}
-
// *************************************************************
// Operations for class RTPortableServer::POA_var
// *************************************************************
@@ -127,7 +79,7 @@ RTPortableServer::POA_var::operator const ::RTPortableServer::POA_ptr &() const
return this->ptr_;
}
-RTPortableServer::POA_var::operator ::RTPortableServer::POA_ptr &() // cast
+RTPortableServer::POA_var::operator ::RTPortableServer::POA_ptr &() // cast
{
return this->ptr_;
}
@@ -331,7 +283,7 @@ void *RTPortableServer::POA::_tao_QueryInterface (ptr_arith_t type)
else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
retv = ACE_reinterpret_cast (void *,
ACE_static_cast (CORBA::Object_ptr, this));
-
+
if (retv)
this->_add_ref ();
return retv;
@@ -349,3 +301,4 @@ const char* RTPortableServer::POA::_interface_repository_id (void) const
# pragma instantiate TAO_Object_Manager<RTPortableServer::POA,RTPortableServer::POA_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* TAO_HAS_RT_CORBA == 1 */
diff --git a/TAO/tao/PortableServer/RTPortableServerC.h b/TAO/tao/PortableServer/RTPortableServerC.h
index a7302fe4d3c..a7c2c357441 100644
--- a/TAO/tao/PortableServer/RTPortableServerC.h
+++ b/TAO/tao/PortableServer/RTPortableServerC.h
@@ -23,13 +23,14 @@
#define _TAO_IDL_RTPORTABLESERVERC_H_
#include "ace/pre.h"
-#include "tao/corba.h"
+#include "PortableServerC.h"
+
+#if (TAO_HAS_RT_CORBA == 1)
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "PortableServerC.h"
#include "tao/RTCORBAC.h"
#if defined (TAO_EXPORT_MACRO)
@@ -63,7 +64,7 @@ TAO_NAMESPACE RTPortableServer
class POA;
typedef POA *POA_ptr;
-
+
#endif /* end #if !defined */
@@ -74,23 +75,23 @@ TAO_NAMESPACE RTPortableServer
{
public:
POA_var (void); // default constructor
- POA_var (POA_ptr p) : ptr_ (p) {}
+ POA_var (POA_ptr p) : ptr_ (p) {}
POA_var (const POA_var &); // copy constructor
~POA_var (void); // destructor
-
+
POA_var &operator= (POA_ptr);
POA_var &operator= (const POA_var &);
POA_ptr operator-> (void) const;
-
+
operator const POA_ptr &() const;
operator POA_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
POA_ptr in (void) const;
POA_ptr &inout (void);
POA_ptr &out (void);
POA_ptr _retn (void);
POA_ptr ptr (void) const;
-
+
// Hooks used by template sequence and object manager classes
// for non-defined forward declared interfaces.
static POA_ptr duplicate (POA_ptr);
@@ -98,7 +99,7 @@ TAO_NAMESPACE RTPortableServer
static POA_ptr nil (void);
static POA_ptr narrow (CORBA::Object *, CORBA::Environment &);
static CORBA::Object * upcast (void *);
-
+
private:
POA_ptr ptr_;
// Unimplemented - prevents widening assignment.
@@ -125,7 +126,7 @@ TAO_NAMESPACE RTPortableServer
operator POA_ptr &();
POA_ptr &ptr (void);
POA_ptr operator-> (void);
-
+
private:
POA_ptr &ptr_;
};
@@ -149,12 +150,12 @@ TAO_NAMESPACE RTPortableServer
static POA_ptr _duplicate (POA_ptr obj);
static POA_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static POA_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static POA_ptr _nil (void)
@@ -165,7 +166,7 @@ TAO_NAMESPACE RTPortableServer
virtual CORBA::Object_ptr create_reference_with_priority (
const char * intf,
RTCORBA::Priority priority,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -177,7 +178,7 @@ TAO_NAMESPACE RTPortableServer
const PortableServer::ObjectId & oid,
const char * intf,
RTCORBA::Priority priority,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -188,7 +189,7 @@ TAO_NAMESPACE RTPortableServer
virtual PortableServer::ObjectId * activate_object_with_priority (
PortableServer::Servant p_servant,
RTCORBA::Priority priority,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -201,7 +202,7 @@ TAO_NAMESPACE RTPortableServer
const PortableServer::ObjectId & oid,
PortableServer::Servant p_servant,
RTCORBA::Priority priority,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -212,12 +213,12 @@ TAO_NAMESPACE RTPortableServer
)) = 0;
virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+
virtual const char* _interface_repository_id (void) const;
protected:
POA ();
-
+
virtual ~POA (void);
private:
POA (const POA &);
@@ -250,5 +251,7 @@ TAO_NAMESPACE_CLOSE // module RTPortableServer
#pragma option pop
#endif /* __BORLANDC__ */
+#endif /* TAO_HAS_RT_CORBA */
+
#include "ace/post.h"
#endif /* ifndef */
View Lorry Controller Status