portableserver.diff

来自「这是广泛使用的通信开源项目,对于大容量,高并发的通讯要求完全能够胜任,他广泛可用」· DIFF 代码 · 共 754 行 · 第 1/2 页

 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicyValue);
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::RequestProcessingPolicyValue &);
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
 #ifndef __ACE_INLINE__
 
 
@@ -3570,9 +3670,15 @@
 
 #endif /* _TAO_CDR_OP_PortableServer_ObjectId_H_ */
 
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ForwardRequest &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ForwardRequest &);
 
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::NotAGroupObject &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::NotAGroupObject &);
 
@@ -3593,18 +3699,26 @@
 
 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_InputCDR &, PortableServer::LifespanPolicyValue &);
 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_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_InputCDR &, PortableServer::ImplicitActivationPolicyValue &);
 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_InputCDR &, PortableServer::RequestProcessingPolicyValue &);
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 #endif /* __ACE_INLINE__ */
 
--- orig/PortableServerC.i	Tue Feb  5 16:29:50 2002
+++ PortableServerC.i	Tue Feb  5 17:04:22 2002
@@ -627,6 +627,8 @@
 // Inline operations for exception PortableServer::ForwardRequest
 // *************************************************************
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 // *************************************************************
 // Inline operations for exception PortableServer::NotAGroupObject
 // *************************************************************
@@ -1025,6 +1027,10 @@
 
 #endif /* end #if !defined */
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+
+#if (TAO_HAS_MINIMUM_POA == 0)
 
 #if !defined (_PORTABLESERVER_THREADPOLICY___CI_)
 #define _PORTABLESERVER_THREADPOLICY___CI_
@@ -1054,6 +1060,8 @@
 #endif /* end #if !defined */
 
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___CI_)
 #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___CI_
 
@@ -1074,6 +1082,8 @@
 
 #endif /* end #if !defined */
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
 // *************************************************************
 // Inline operations for exception PortableServer::POAManager::AdapterInactive
 // *************************************************************
@@ -1113,6 +1123,8 @@
 
 #endif /* end #if !defined */
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
 // *************************************************************
 // Inline operations for exception PortableServer::POA::AdapterAlreadyExists
 // *************************************************************
@@ -1186,6 +1198,8 @@
 
 #endif /* _TAO_CDR_OP_PortableServer_ObjectId_I_ */
 
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ForwardRequest &_tao_aggregate)
 {
   // first marshal the repository ID
@@ -1214,6 +1228,10 @@
     return 0;
 }
 
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::NotAGroupObject &_tao_aggregate)
 {
   // first marshal the repository ID
@@ -1243,6 +1261,10 @@
 
 #endif /* _TAO_CDR_OP_PortableServer_IDs_I_ */
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ThreadPolicyValue &_tao_enumval)
 {
   CORBA::ULong _tao_temp = _tao_enumval;
@@ -1262,6 +1284,8 @@
   return _tao_result;
 }
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::LifespanPolicyValue &_tao_enumval)
 {
   CORBA::ULong _tao_temp = _tao_enumval;
@@ -1319,6 +1343,8 @@
   return _tao_result;
 }
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ImplicitActivationPolicyValue &_tao_enumval)
 {
   CORBA::ULong _tao_temp = _tao_enumval;
@@ -1375,4 +1401,4 @@
   
   return _tao_result;
 }
-
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
--- orig/PortableServerC.cpp	Tue Feb  5 16:29:50 2002
+++ PortableServerC.cpp	Tue Feb  5 17:15:19 2002
@@ -31,6 +31,8 @@
 #include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
+#include "POA.h"
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -39,6 +41,29 @@
 #include "PortableServerC.i"
 #endif /* !defined INLINE */
 
+char *
+PortableServer::ObjectId_to_string (const PortableServer::ObjectId &id)
+{
+  return TAO_POA::ObjectId_to_string (id);
+}
+
+CORBA::WChar *
+PortableServer::ObjectId_to_wstring (const PortableServer::ObjectId &id)
+{
+  return TAO_POA::ObjectId_to_wstring (id);
+}
+
+PortableServer::ObjectId *
+PortableServer::string_to_ObjectId (const char *id)
+{
+  return TAO_POA::string_to_ObjectId (id);
+}
+
+PortableServer::ObjectId *
+PortableServer::wstring_to_ObjectId (const CORBA::WChar *id)
+{
+  return TAO_POA::wstring_to_ObjectId (id);
+}
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
@@ -268,6 +293,8 @@
 TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ObjectId, &_tc_TAO_tc_PortableServer_ObjectId)
 TAO_NAMESPACE_END
 
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
 // Default constructor.
 PortableServer::ForwardRequest::ForwardRequest (void)
   : CORBA_UserException ("IDL:omg.org/PortableServer/ForwardRequest:1.0")
@@ -438,6 +465,10 @@
   return ::PortableServer::_tc_ForwardRequest;
 }
 
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 // Default constructor.
 PortableServer::NotAGroupObject::NotAGroupObject (void)
   : CORBA_UserException ("IDL:omg.org/PortableServer/NotAGroupObject:1.0")
@@ -733,6 +764,8 @@
 TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_IDs, &_tc_TAO_tc_PortableServer_IDs)
 TAO_NAMESPACE_END
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (PortableServer)
 TAO_NAMESPACE_DEFINE (const CORBA::ULong, THREAD_POLICY_ID, 16U)
@@ -761,6 +794,9 @@
 TAO_NAMESPACE_BEGIN (PortableServer)
 TAO_NAMESPACE_DEFINE (const CORBA::ULong, REQUEST_PROCESSING_POLICY_ID, 22U)
 TAO_NAMESPACE_END
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 static const CORBA::Long _oc_PortableServer_ThreadPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -1124,6 +1160,8 @@
   return "IDL:omg.org/PortableServer/ThreadPolicy:1.0";
 }
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
 static const CORBA::Long _oc_PortableServer_LifespanPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -2207,6 +2245,8 @@
   return "IDL:omg.org/PortableServer/IdAssignmentPolicy:1.0";
 }
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 static const CORBA::Long _oc_PortableServer_ImplicitActivationPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -3318,6 +3358,8 @@
   return "IDL:omg.org/PortableServer/RequestProcessingPolicy:1.0";
 }
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
 int PortableServer::POAManager::_tao_class_id = 0;
 
 PortableServer::POAManager_ptr
@@ -3697,6 +3739,7 @@
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+#if (TAO_HAS_MINIMUM_POA == 0)
 int PortableServer::AdapterActivator::_tao_class_id = 0;
 
 PortableServer::AdapterActivator_ptr
@@ -4925,6 +4968,8 @@
   return "IDL:omg.org/PortableServer/ServantLocator:2.3";
 }
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
 int PortableServer::POA::_tao_class_id = 0;
 
 PortableServer::POA_ptr
@@ -5470,6 +5515,8 @@
   this->index = _tao_index;
 }
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 // Default constructor.
 PortableServer::POA::NoServant::NoServant (void)
   : CORBA_UserException ("IDL:omg.org/PortableServer/POA/NoServant:1.0")
@@ -5548,6 +5595,8 @@
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
 // Default constructor.
 PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (void)
   : CORBA_UserException ("IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:1.0")
@@ -6498,6 +6547,8 @@
   return 0;
 }
 
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
 void operator<<= (CORBA::Any &_tao_any, const PortableServer::ForwardRequest &_tao_elem) // copying
 {
   TAO_OutputCDR stream;
@@ -6588,6 +6639,10 @@
   return 0;
 }
 
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 void operator<<= (CORBA::Any &_tao_any, const PortableServer::NotAGroupObject &_tao_elem) // copying
 {
   TAO_OutputCDR stream;
@@ -6816,6 +6871,8 @@
   #  pragma instantiate TAO_Object_Manager<PortableServer::ThreadPolicy,PortableServer::ThreadPolicy_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
 void operator<<= (CORBA::Any &_tao_any, PortableServer::LifespanPolicyValue _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -6957,6 +7014,8 @@
   #  pragma instantiate TAO_Object_Manager<PortableServer::IdAssignmentPolicy,PortableServer::IdAssignmentPolicy_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 void operator<<= (CORBA::Any &_tao_any, PortableServer::ImplicitActivationPolicyValue _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -7098,6 +7157,8 @@
   #  pragma instantiate TAO_Object_Manager<PortableServer::RequestProcessingPolicy,PortableServer::RequestProcessingPolicy_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
     template class TAO_Object_Manager<PortableServer::POAManager,PortableServer::POAManager_var>;
@@ -7105,6 +7166,8 @@
   #  pragma instantiate TAO_Object_Manager<PortableServer::POAManager,PortableServer::POAManager_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
     template class TAO_Object_Manager<PortableServer::AdapterActivator,PortableServer::AdapterActivator_var>;
@@ -7133,6 +7196,8 @@
   #  pragma instantiate TAO_Object_Manager<PortableServer::ServantLocator,PortableServer::ServantLocator_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
     template class TAO_Object_Manager<PortableServer::POA,PortableServer::POA_var>;
@@ -7220,6 +7285,8 @@
   return 0; // error
 }
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const PortableServer::IDs &_tao_sequence
@@ -7267,3 +7334,4 @@
   return 0; // error
 }
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */