summaryrefslogtreecommitdiff
path: root/TAO/tao/RTCORBA/diffs/RTCORBA.diff
blob: 489856dc1ca51e6125b970220c236357dcd2958a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
--- orig/RTCORBAC.h	2004-09-16 12:52:02.885009600 +0200
+++ RTCORBAC.h	2004-09-16 12:36:01.362408000 +0200
@@ -36,12 +36,18 @@
 
 #include "ace/config-all.h"
 
+#ifndef TAO_RTCORBA_SAFE_INCLUDE
+#error "You should not include RTCORBAC.h directly, use RTCORBA.h"
+#endif /* !TAO_RTCORBA_SAFE_INCLUDE */
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "rtcorba_export.h"
+#include "rtcorba_typedefs.h"
 #include "tao/ORB.h"
+#include "tao/TimeBaseC.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
@@ -50,6 +56,8 @@
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
 #include "tao/VarOut_T.h"
+#include "tao/Encodable.h"
+#include "tao/PolicyC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -532,6 +540,7 @@
   
   class TAO_RTCORBA_Export ProtocolProperties
     : public virtual CORBA::Object
+    , public virtual TAO_Encodable
   {
   public:
     typedef ProtocolProperties_ptr _ptr_type;
@@ -568,6 +577,9 @@
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   
+    // CDR Encoder/Decoder methods. (handcrafted)
+    virtual CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
+    virtual CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
   protected:
     // Abstract or local interface only.
     ProtocolProperties (void);
--- orig/RTCORBAC.cpp	2004-09-16 12:52:02.885009600 +0200
+++ RTCORBAC.cpp	2004-09-16 12:36:36.643139200 +0200
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:303
 
 
-#include "RTCORBAC.h"
+#include "RTCORBA.h"
 #include "tao/CDR.h"
 #include "tao/Typecode.h"
 #include "tao/Any_Impl_T.h"
@@ -57,7 +57,23 @@
 }
 
 
+//////////////////////////////////////////////////////
+// CDR Encoding Support hand crafted
+
+CORBA::Boolean
+RTCORBA::ProtocolProperties::_tao_encode (TAO_OutputCDR &)
+{
+  return 1;
+}
 // TAO_IDL - Generated from
+// be/be_visitor_arg_traits.cpp:60
+
+CORBA::Boolean
+RTCORBA::ProtocolProperties::_tao_decode (TAO_InputCDR &)
+{
+  return 1;
+}
+
 // be\be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_RTCORBA_NativePriority[] =