rtcorba.diff

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

--- orig/RTCORBAC.h	Wed Feb  6 13:37:48 2002
+++ RTCORBAC.h	Wed Feb  6 13:44:01 2002
@@ -23,15 +23,26 @@
 #define _TAO_IDL_ORIG_RTCORBAC_H_
 
 #include "ace/pre.h"
-#include "tao/corba.h"
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "rtcorba_export.h"
-#include "IOPC.h"
-#include "TimeBaseC.h"
+#include "tao/IOPC.h"
+#include "tao/TimeBaseC.h"
+#include "tao/PolicyC.h"
+
+// Forward references.
+class TAO_Priority_Mapping_Manager;
+class TAO_Priority_Mapping_Manager_var;
+class TAO_Priority_Mapping_Manager_out;
+class TAO_Priority_Mapping;
+
+#ifndef TAO_RTCORBA_SAFE_INCLUDE
+#error "You should not include RTCORBAC.h directly, use RTCORBA.h"
+#endif /* !TAO_RTCORBA_SAFE_INCLUDE */
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -58,6 +69,15 @@
 
 TAO_NAMESPACE  RTCORBA
 {
+  // TAO-specific
+  typedef TAO_Priority_Mapping_Manager PriorityMappingManager;
+  typedef TAO_Priority_Mapping_Manager *PriorityMappingManager_ptr;
+  typedef TAO_Priority_Mapping_Manager_var PriorityMappingManager_var;
+  typedef TAO_Priority_Mapping_Manager_out PriorityMappingManager_out;
+
+  typedef TAO_Priority_Mapping PriorityMapping;
+  // End TAO-specific
+
   typedef CORBA::Short NativePriority;
   typedef CORBA::Short_out NativePriority_out;
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NativePriority;
@@ -674,6 +694,7 @@
   
   class TAO_RTCORBA_Export ProtocolProperties
     : public virtual CORBA_Object
+    , public TAO_Encodable
   {
   public:
   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -705,6 +726,11 @@
     
     virtual const char* _interface_repository_id (void) const;
 
+    // CDR Encoder/Decoder methods.
+
+    virtual CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
+    virtual CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
+
   protected:
     ProtocolProperties (void);
     
--- orig/RTCORBAC.cpp	Wed Feb  6 13:37:48 2002
+++ RTCORBAC.cpp	Wed Feb  6 13:41:48 2002
@@ -19,7 +19,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "RTCORBAC.h"
+#include "RTCORBA.h"
 
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
@@ -39,6 +39,21 @@
 #include "RTCORBAC.i"
 #endif /* !defined INLINE */
 
+//////////////////////////////////////////////////////
+// CDR Encoding Support
+
+CORBA::Boolean
+RTCORBA::ProtocolProperties::_tao_encode (TAO_OutputCDR &)
+{
+  return 1;
+}
+
+CORBA::Boolean
+RTCORBA::ProtocolProperties::_tao_decode (TAO_InputCDR &)
+{
+  return 1;
+}
+
 static const CORBA::Long _oc_RTCORBA_NativePriority[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order