TAO/tao/RTCORBA/diffs/RT_ProtocolProperties.diff

   1 --- orig/RTCORBAC.h     2005-03-25 19:39:53.847483200 +0100
   2 +++ RTCORBAC.h  2005-03-25 19:41:00.863848000 +0100
   3 @@ -36,12 +36,18 @@
   4
   5  #include "ace/config-all.h"
   6
   7 +#ifndef TAO_RTCORBA_SAFE_INCLUDE
   8 +#error "You should not include RTCORBAC.h directly, use RTCORBA.h"
   9 +#endif /* !TAO_RTCORBA_SAFE_INCLUDE */
  10 +
  11  #if !defined (ACE_LACKS_PRAGMA_ONCE)
  12  # pragma once
  13  #endif /* ACE_LACKS_PRAGMA_ONCE */
  14
  15  #include "rtcorba_export.h"
  16 +#include "rtcorba_typedefs.h"
  17  #include "tao/ORB.h"
  18 +#include "tao/TimeBaseC.h"
  19  #include "tao/SystemException.h"
  20  #include "tao/Environment.h"
  21  #include "tao/Object.h"
  22 @@ -576,6 +585,9 @@
  23      virtual const char* _interface_repository_id (void) const;
  24      virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
  25
  26 +    // CDR Encoder/Decoder methods. (handcrafted)
  27 +    virtual CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
  28 +    virtual CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
  29    protected:
  30      // Abstract or local interface only.
  31      ProtocolProperties (void);
  32 --- orig/RTCORBAC.cpp   2005-03-25 19:39:53.847483200 +0100
  33 +++ RTCORBAC.cpp        2005-03-25 19:39:54.318160000 +0100
  34 @@ -29,7 +29,7 @@
  35  // be\be_codegen.cpp:302
  36
  37
  38 -#include "RTCORBAC.h"
  39 +#include "RTCORBA.h"
  40  #include "tao/CDR.h"
  41  #include "tao/Null_RefCount_Policy.h"
  42  #include "tao/TypeCode_Constants.h"
  43 @@ -61,6 +61,22 @@
  44  {
  45  }
  46
  47 +//////////////////////////////////////////////////////
  48 +// CDR Encoding Support hand crafted
  49 +
  50 +CORBA::Boolean
  51 +RTCORBA::ProtocolProperties::_tao_encode (TAO_OutputCDR &)
  52 +{
  53 +  return true;
  54 +}
  55 +// TAO_IDL - Generated from
  56 +// be/be_visitor_arg_traits.cpp:60
  57 +
  58 +CORBA::Boolean
  59 +RTCORBA::ProtocolProperties::_tao_decode (TAO_InputCDR &)
  60 +{
  61 +  return true;
  62 +}
  63
  64  // TAO_IDL - Generated from
  65  // be\be_visitor_structure/structure_cs.cpp:68
  66 --- orig/RTCORBAA.cpp   2005-03-25 19:39:53.857497600 +0100
  67 +++ RTCORBAA.cpp        2005-03-25 19:40:06.796102400 +0100
  68 @@ -25,7 +25,7 @@
  69  // Information about TAO is available at:
  70  //     http://www.cs.wustl.edu/~schmidt/TAO.html
  71
  72 -#include "RTCORBAC.h"
  73 +#include "RTCORBA.h"
  74  #include "tao/Null_RefCount_Policy.h"
  75  #include "tao/TypeCode_Constants.h"
  76  #include "tao/Alias_TypeCode.h"