summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-01-19 17:10:36 +0000
committerjai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-01-19 17:10:36 +0000
commit58bb3b15a5537b0780eae9a135cc2d18183a43e9 (patch)
tree673b5b312a11af7422a6637d93e42f1b3effe825
parent152bc53c5a11a3fdceaf3a41b42932e1082a9104 (diff)
downloadATCD-58bb3b15a5537b0780eae9a135cc2d18183a43e9.tar.gz
*** empty log message ***
-rw-r--r--TAO/CIAO/DAnCE/ciao/Container_Base.cpp25
-rw-r--r--TAO/CIAO/DAnCE/ciao/Container_Base.h34
2 files changed, 47 insertions, 12 deletions
diff --git a/TAO/CIAO/DAnCE/ciao/Container_Base.cpp b/TAO/CIAO/DAnCE/ciao/Container_Base.cpp
index 3ac34a8bc60..071d7d3a2d1 100644
--- a/TAO/CIAO/DAnCE/ciao/Container_Base.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Container_Base.cpp
@@ -411,6 +411,31 @@ namespace CIAO
oid = id._retn ();
}
+ void
+ Session_Container::add_servant_map
+ (PortableServer::ObjectId &,
+ Dynamic_Component_Servant_Base*
+ ACE_ENV_ARG_DECL)
+ {
+ ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+ }
+
+ void
+ Session_Container::delete_servant_map
+ (PortableServer::ObjectId &
+ ACE_ENV_ARG_DECL)
+ {
+ ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+ }
+
+ CORBA::Object_ptr
+ Session_Container::get_home_objref (PortableServer::Servant
+ ACE_ENV_ARG_DECL)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
+ }
+
CORBA::Object_ptr
Session_Container::generate_reference (const char *obj_id,
const char *repo_id,
diff --git a/TAO/CIAO/DAnCE/ciao/Container_Base.h b/TAO/CIAO/DAnCE/ciao/Container_Base.h
index 18bbdc997e6..2385b0a0a61 100644
--- a/TAO/CIAO/DAnCE/ciao/Container_Base.h
+++ b/TAO/CIAO/DAnCE/ciao/Container_Base.h
@@ -31,6 +31,7 @@
namespace CIAO
{
class Servant_Activator;
+ class Dynamic_Component_Servant_Base;
/**
* @class Container
@@ -94,6 +95,16 @@ namespace CIAO
ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+ virtual void add_servant_map (PortableServer::ObjectId &oid,
+ Dynamic_Component_Servant_Base* servant
+ ACE_ENV_ARG_DECL) = 0;
+
+ virtual void delete_servant_map (PortableServer::ObjectId &oid
+ ACE_ENV_ARG_DECL) = 0;
+
+ virtual CORBA::Object_ptr get_home_objref (PortableServer::Servant p
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
protected:
CORBA::ORB_var orb_;
@@ -144,8 +155,6 @@ namespace CIAO
HOMESERVANTCREATOR_FUNCPTR_MAP* home_servant_creator_funcptr_map_;
};
- class Dynamic_Component_Servant_Base;
-
class CIAO_SERVER_Export Session_Container : public Container
{
public:
@@ -207,12 +216,6 @@ namespace CIAO
ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void add_servant_map (PortableServer::ObjectId &oid,
- Dynamic_Component_Servant_Base* servant
- ACE_ENV_ARG_DECL) = 0;
-
- virtual void delete_servant_map (PortableServer::ObjectId &oid
- ACE_ENV_ARG_DECL) = 0;
// Install a component servant.
CORBA::Object_ptr install_component (PortableServer::Servant p,
PortableServer::ObjectId_out oid
@@ -224,10 +227,6 @@ namespace CIAO
ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual CORBA::Object_ptr get_home_objref (PortableServer::Servant p
- ACE_ENV_ARG_DECL_WITH_DEFAULTS)
- ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
// Uninstall a servant for component or home.
void uninstall (CORBA::Object_ptr objref,
Container::OA_Type t
@@ -240,6 +239,17 @@ namespace CIAO
ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
+ virtual void add_servant_map (PortableServer::ObjectId &oid,
+ Dynamic_Component_Servant_Base* servant
+ ACE_ENV_ARG_DECL);
+
+ virtual void delete_servant_map (PortableServer::ObjectId &oid
+ ACE_ENV_ARG_DECL);
+
+ virtual CORBA::Object_ptr get_home_objref (PortableServer::Servant p
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_THROW_SPEC ((CORBA::SystemException));
+
// Analog of the POA method that creates an object reference from
// an object id string.
CORBA::Object_ptr generate_reference (const char *obj_id,