summaryrefslogtreecommitdiff
path: root/TAO/tao
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao')
-rw-r--r--TAO/tao/PortableServer/POA.pidl2
-rw-r--r--TAO/tao/PortableServer/Root_POA.cpp5
-rw-r--r--TAO/tao/PortableServer/Root_POA.h2
-rw-r--r--TAO/tao/PortableServer/ServantRetentionStrategy.h56
-rw-r--r--TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp2
-rw-r--r--TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h5
-rw-r--r--TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp2
-rw-r--r--TAO/tao/PortableServer/ServantRetentionStrategyRetain.h30
-rw-r--r--TAO/tao/RTPortableServer/RT_POA.cpp2
-rw-r--r--TAO/tao/RTPortableServer/RT_POA.h6
-rw-r--r--TAO/tao/RTPortableServer/RT_POA.inl4
11 files changed, 55 insertions, 61 deletions
diff --git a/TAO/tao/PortableServer/POA.pidl b/TAO/tao/PortableServer/POA.pidl
index aed75dfd6d3..e0060e76390 100644
--- a/TAO/tao/PortableServer/POA.pidl
+++ b/TAO/tao/PortableServer/POA.pidl
@@ -221,8 +221,10 @@ module PortableServer
Object create_reference (in CORBA::RepositoryId intf)
raises (WrongPolicy);
+#if !defined (CORBA_E_MICRO)
Object create_reference_with_id (in ObjectId oid,
in CORBA::RepositoryId intf);
+#endif
// Identity mapping operations:.
ObjectId servant_to_id (in Servant p_servant)
diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp
index d11efc7135c..d9f2cd10b0f 100644
--- a/TAO/tao/PortableServer/Root_POA.cpp
+++ b/TAO/tao/PortableServer/Root_POA.cpp
@@ -720,6 +720,7 @@ TAO_Root_POA::id_to_reference (const PortableServer::ObjectId &oid)
}
+#if ! defined (CORBA_E_MICRO)
CORBA::Object_ptr
TAO_Root_POA::create_reference_with_id (const PortableServer::ObjectId &id,
const char *intf)
@@ -731,7 +732,7 @@ TAO_Root_POA::create_reference_with_id (const PortableServer::ObjectId &id,
intf,
this->server_priority ());
}
-
+#endif
void
TAO_Root_POA::destroy (CORBA::Boolean etherealize_objects,
@@ -1286,6 +1287,7 @@ TAO_Root_POA::invoke_key_to_object_helper_i (const char * repository_id,
}
}
+#if ! defined (CORBA_E_MICRO)
CORBA::Object_ptr
TAO_Root_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_id,
const char *intf,
@@ -1309,6 +1311,7 @@ TAO_Root_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_i
return this->active_policy_strategies_.servant_retention_strategy()->
create_reference_with_id (user_id, intf, priority);
}
+#endif
PortableServer::ObjectId *
TAO_Root_POA::servant_to_id_i (PortableServer::Servant servant)
diff --git a/TAO/tao/PortableServer/Root_POA.h b/TAO/tao/PortableServer/Root_POA.h
index e234b6591f8..5cb34358dfa 100644
--- a/TAO/tao/PortableServer/Root_POA.h
+++ b/TAO/tao/PortableServer/Root_POA.h
@@ -226,9 +226,11 @@ public:
CORBA::Object_ptr create_reference (const char *intf);
+#if !defined (CORBA_E_MICRO)
CORBA::Object_ptr create_reference_with_id (
const PortableServer::ObjectId &oid,
const char *intf);
+#endif
PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant);
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategy.h b/TAO/tao/PortableServer/ServantRetentionStrategy.h
index f1b1de2de9b..6f211fb0256 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategy.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategy.h
@@ -46,85 +46,63 @@ namespace TAO
virtual TAO_SERVANT_LOCATION servant_present (
const PortableServer::ObjectId &system_id,
- PortableServer::Servant &servant
- ) = 0;
+ PortableServer::Servant &servant) = 0;
virtual PortableServer::Servant find_servant (
const PortableServer::ObjectId &system_id,
TAO::Portable_Server::Servant_Upcall &servant_upcall,
- TAO::Portable_Server::POA_Current_Impl &poa_current_impl
- ) = 0;
+ TAO::Portable_Server::POA_Current_Impl &poa_current_impl) = 0;
virtual int find_servant_priority (
const PortableServer::ObjectId &system_id,
- CORBA::Short &priority
- ) = 0;
+ CORBA::Short &priority) = 0;
virtual PortableServer::ObjectId *activate_object (
PortableServer::Servant servant,
CORBA::Short priority,
- bool &wait_occurred_restart_call
- )
- = 0;
+ bool &wait_occurred_restart_call) = 0;
#if !defined (CORBA_E_MICRO)
virtual void activate_object_with_id (
const PortableServer::ObjectId &id,
PortableServer::Servant servant,
CORBA::Short priority,
- bool &wait_occurred_restart_call
- )
- = 0;
+ bool &wait_occurred_restart_call) = 0;
#endif
- virtual void deactivate_object (const PortableServer::ObjectId &id
- ) = 0;
+ virtual void deactivate_object (const PortableServer::ObjectId &id) = 0;
virtual PortableServer::Servant find_servant (
- const PortableServer::ObjectId &system_id
- ) = 0;
+ const PortableServer::ObjectId &system_id) = 0;
virtual PortableServer::ObjectId *system_id_to_object_id (
- const PortableServer::ObjectId &system_id
- )
- = 0;
+ const PortableServer::ObjectId &system_id) = 0;
virtual PortableServer::Servant user_id_to_servant (
- const PortableServer::ObjectId &id
- )
- = 0;
+ const PortableServer::ObjectId &id) = 0;
virtual CORBA::Object_ptr id_to_reference (
const PortableServer::ObjectId &id,
- bool indirect
- )
- = 0;
+ bool indirect) = 0;
- virtual void deactivate_all_objects (void)
- = 0;
+ virtual void deactivate_all_objects (void) = 0;
virtual PortableServer::ObjectId *servant_to_user_id (
- PortableServer::Servant servant
- )
- = 0;
+ PortableServer::Servant servant) = 0;
virtual CORBA::Object_ptr servant_to_reference (
- PortableServer::Servant servant
- )
- = 0;
+ PortableServer::Servant servant) = 0;
virtual CORBA::Object_ptr create_reference (
const char *intf,
- CORBA::Short priority
- )
- = 0;
+ CORBA::Short priority) = 0;
+#if !defined (CORBA_E_MICRO)
virtual CORBA::Object_ptr create_reference_with_id (
const PortableServer::ObjectId &oid,
const char *intf,
- CORBA::Short priority
- )
- = 0;
+ CORBA::Short priority) = 0;
+#endif
virtual int rebind_using_user_id_and_system_id (
PortableServer::Servant servant,
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
index da629fa29e0..62f2078e477 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
@@ -216,6 +216,7 @@ namespace TAO
return this->poa_->invoke_key_to_object_helper_i (intf, user_id);
}
+#if !defined (CORBA_E_MICRO)
CORBA::Object_ptr
ServantRetentionStrategyNonRetain::create_reference_with_id (
const PortableServer::ObjectId &oid,
@@ -252,6 +253,7 @@ namespace TAO
return this->poa_->invoke_key_to_object_helper_i (intf, oid);
}
+#endif
int
ServantRetentionStrategyNonRetain::rebind_using_user_id_and_system_id (
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h
index 8bac1e0af4d..a9c181d848d 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h
@@ -66,8 +66,7 @@ namespace TAO
bool &wait_occurred_restart_call);
virtual PortableServer::ObjectId *system_id_to_object_id (
- const PortableServer::ObjectId &system_id
- );
+ const PortableServer::ObjectId &system_id);
virtual
PortableServer::Servant
@@ -102,10 +101,12 @@ namespace TAO
const char *intf,
CORBA::Short priority);
+#if !defined (CORBA_E_MICRO)
virtual CORBA::Object_ptr create_reference_with_id (
const PortableServer::ObjectId &oid,
const char *intf,
CORBA::Short priority);
+#endif
virtual int rebind_using_user_id_and_system_id (
PortableServer::Servant servant,
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
index bb23af7c0f8..d4f061e4023 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
@@ -908,6 +908,7 @@ namespace TAO
user_id);
}
+#if !defined (CORBA_E_MICRO)
CORBA::Object_ptr
ServantRetentionStrategyRetain::create_reference_with_id (
const PortableServer::ObjectId &oid,
@@ -949,6 +950,7 @@ namespace TAO
return this->poa_->invoke_key_to_object_helper_i (intf, oid);
}
+#endif
int
ServantRetentionStrategyRetain::rebind_using_user_id_and_system_id (
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
index ca8dd792244..a805a6bb096 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
@@ -47,8 +47,7 @@ namespace TAO
PortableServer::ObjectId *
activate_object (PortableServer::Servant servant,
CORBA::Short priority,
- bool &wait_occurred_restart_call
- );
+ bool &wait_occurred_restart_call);
#if !defined (CORBA_E_MICRO)
virtual
@@ -62,8 +61,7 @@ namespace TAO
void deactivate_object (const PortableServer::ObjectId &id);
virtual PortableServer::Servant find_servant (
- const PortableServer::ObjectId &system_id
- );
+ const PortableServer::ObjectId &system_id);
virtual PortableServer::ObjectId * system_id_to_object_id (
const PortableServer::ObjectId &system_id);
@@ -87,32 +85,29 @@ namespace TAO
virtual int find_servant_priority (
const PortableServer::ObjectId &system_id,
- CORBA::Short &priority
- );
+ CORBA::Short &priority);
virtual void deactivate_all_objects (void);
virtual PortableServer::ObjectId *servant_to_user_id (
- PortableServer::Servant servant
- );
+ PortableServer::Servant servant);
virtual
CORBA::Object_ptr
- servant_to_reference (PortableServer::Servant servant
- );
+ servant_to_reference (PortableServer::Servant servant);
virtual
CORBA::Object_ptr create_reference (
const char *intf,
- CORBA::Short priority
- );
+ CORBA::Short priority);
+#if !defined (CORBA_E_MICRO)
virtual
CORBA::Object_ptr create_reference_with_id (
const PortableServer::ObjectId &oid,
const char *intf,
- CORBA::Short priority
- );
+ CORBA::Short priority);
+#endif
virtual ::PortableServer::ServantRetentionPolicyValue type() const;
@@ -124,14 +119,11 @@ namespace TAO
bool &wait_occurred_restart_call);
void
- deactivate_map_entry (TAO_Active_Object_Map_Entry *active_object_map_entry
- );
+ deactivate_map_entry (TAO_Active_Object_Map_Entry *active_object_map_entry);
PortableServer::ObjectId *servant_to_system_id_i (
PortableServer::Servant p_servant,
- CORBA::Short &priority
-
- );
+ CORBA::Short &priority);
virtual
int rebind_using_user_id_and_system_id (
diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp
index 1a79cf2b377..77886f86fe8 100644
--- a/TAO/tao/RTPortableServer/RT_POA.cpp
+++ b/TAO/tao/RTPortableServer/RT_POA.cpp
@@ -665,12 +665,14 @@ TAO_RT_POA::create_reference (const char *intf)
return this->TAO_Regular_POA::create_reference (intf);
}
+#if !defined (CORBA_E_MICRO)
CORBA::Object_ptr
TAO_RT_POA::create_reference_with_id (const PortableServer::ObjectId &oid,
const char *intf)
{
return this->TAO_Regular_POA::create_reference_with_id (oid, intf);
}
+#endif
PortableServer::ObjectId *
TAO_RT_POA::servant_to_id (PortableServer::Servant p_servant)
diff --git a/TAO/tao/RTPortableServer/RT_POA.h b/TAO/tao/RTPortableServer/RT_POA.h
index 41a73486008..ab10b764b62 100644
--- a/TAO/tao/RTPortableServer/RT_POA.h
+++ b/TAO/tao/RTPortableServer/RT_POA.h
@@ -55,16 +55,20 @@ public:
CORBA::Object_ptr create_reference_with_priority (const char * intf,
RTCORBA::Priority priority);
+#if !defined (CORBA_E_MICRO)
CORBA::Object_ptr create_reference_with_id_and_priority (const PortableServer::ObjectId & oid,
const char * intf,
RTCORBA::Priority priority);
+#endif
PortableServer::ObjectId * activate_object_with_priority (PortableServer::Servant p_servant,
RTCORBA::Priority priority);
+#if !defined (CORBA_E_MICRO)
void activate_object_with_id_and_priority (const PortableServer::ObjectId & oid,
PortableServer::Servant p_servant,
RTCORBA::Priority priority);
+#endif
// End RTCORBA specific methods
// Standard POA interface methods
@@ -150,8 +154,10 @@ public:
CORBA::Object_ptr create_reference (const char *intf);
+#if !defined (CORBA_E_MICRO)
CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid,
const char *intf);
+#endif
PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant);
diff --git a/TAO/tao/RTPortableServer/RT_POA.inl b/TAO/tao/RTPortableServer/RT_POA.inl
index 4b771dd5661..990d71a4277 100644
--- a/TAO/tao/RTPortableServer/RT_POA.inl
+++ b/TAO/tao/RTPortableServer/RT_POA.inl
@@ -23,6 +23,7 @@ TAO_RT_POA::create_reference_with_priority (const char * intf,
return this->create_reference_i (intf, priority);
}
+#if !defined (CORBA_E_MICRO)
ACE_INLINE CORBA::Object_ptr
TAO_RT_POA::create_reference_with_id_and_priority (const PortableServer::ObjectId & oid,
const char * intf,
@@ -38,6 +39,7 @@ TAO_RT_POA::create_reference_with_id_and_priority (const PortableServer::ObjectI
return this->create_reference_with_id_i (oid, intf, priority);
}
+#endif
ACE_INLINE PortableServer::ObjectId *
TAO_RT_POA::activate_object_with_priority (PortableServer::Servant servant,
@@ -68,6 +70,7 @@ TAO_RT_POA::activate_object_with_priority (PortableServer::Servant servant,
}
}
+#if !defined (CORBA_E_MICRO)
ACE_INLINE void
TAO_RT_POA::activate_object_with_id_and_priority (const PortableServer::ObjectId & oid,
PortableServer::Servant servant,
@@ -99,6 +102,7 @@ TAO_RT_POA::activate_object_with_id_and_priority (const PortableServer::ObjectId
return;
}
}
+#endif
ACE_INLINE void *
TAO_RT_POA::thread_pool (void) const
View Lorry Controller Status