conv_frame.diff

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

--- orig/CONV_FRAMEC.h	2003-12-24 12:44:13.000000000 -0600
+++ CONV_FRAMEC.h	2003-12-24 12:20:01.000000000 -0600
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// CONV_FRAME.diff,v 1.1 2003/12/24 19:00:48 bala Exp
+// CONV_FRAME.diff,v 1.1 2003/12/24 19:00:48 bala Exp
 
 // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
 // TAO and the TAO IDL Compiler have been developed by:
@@ -33,18 +33,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ORB.h"
+#include "tao/CDR.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "TAO_Export.h"
-#include "tao/CDR.h"
-#include "tao/Environment.h"
-#include "tao/Sequence_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
+#include "tao/Sequence.h"
 #include "tao/VarOut_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -83,11 +78,6 @@
   typedef CORBA::ULong_out CodeSetId_out;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetId;
-  
-  // TAO_IDL - Generated from
   // be/be_type.cpp:258
   
   struct CodeSetComponent;
@@ -151,11 +141,6 @@
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetComponent;
-  
-  // TAO_IDL - Generated from
   // be/be_type.cpp:258
   
   struct CodeSetComponentInfo;
@@ -186,11 +171,6 @@
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetComponentInfo;
-  
-  // TAO_IDL - Generated from
   // be/be_type.cpp:258
   
   struct CodeSetContext;
@@ -217,10 +197,7 @@
     CONV_FRAME::CodeSetId wchar_data;
   };
   
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetContext;
 
 // TAO_IDL - Generated from
 // be/be_visitor_module/module_ch.cpp:66
--- orig/CONV_FRAMEC.i	2003-12-24 12:44:13.000000000 -0600
+++ CONV_FRAMEC.i	2003-12-23 19:11:35.000000000 -0600
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// CONV_FRAME.diff,v 1.1 2003/12/24 19:00:48 bala Exp
+// CONV_FRAME.diff,v 1.1 2003/12/24 19:00:48 bala Exp
 
 // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
 // TAO and the TAO IDL Compiler have been developed by:
--- orig/CONV_FRAMEC.cpp	2003-12-24 12:44:13.000000000 -0600
+++ CONV_FRAMEC.cpp	2003-12-24 12:25:38.000000000 -0600
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// CONV_FRAME.diff,v 1.1 2003/12/24 19:00:48 bala Exp
+// CONV_FRAME.diff,v 1.1 2003/12/24 19:00:48 bala Exp
 
 // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
 // TAO and the TAO IDL Compiler have been developed by:
@@ -28,9 +28,7 @@
 // TAO_IDL - Generated from
 // be/be_codegen.cpp:338
 
-
 #include "CONV_FRAMEC.h"
-#include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -48,146 +46,6 @@
 {
 }
 
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CONV_FRAME_CodeSetId[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  37,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f4e56), 
-  ACE_NTOHL (0x5f465241), 
-  ACE_NTOHL (0x4d452f43), 
-  ACE_NTOHL (0x6f646553), 
-  ACE_NTOHL (0x65744964), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-    10,
-  ACE_NTOHL (0x436f6465), 
-  ACE_NTOHL (0x53657449), 
-  ACE_NTOHL (0x64000000),  // name = CodeSetId
-    CORBA::tk_ulong,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetId (
-    CORBA::tk_alias,
-    sizeof (_oc_CONV_FRAME_CodeSetId),
-    (char *) &_oc_CONV_FRAME_CodeSetId,
-    0,
-    sizeof (CONV_FRAME::CodeSetId)
-  );
-
-namespace CONV_FRAME
-{
-  ::CORBA::TypeCode_ptr _tc_CodeSetId =
-    &_tc_TAO_tc_CONV_FRAME_CodeSetId;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CONV_FRAME_CodeSetComponent[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  44,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f4e56), 
-  ACE_NTOHL (0x5f465241), 
-  ACE_NTOHL (0x4d452f43), 
-  ACE_NTOHL (0x6f646553), 
-  ACE_NTOHL (0x6574436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e743a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0
-    17,
-  ACE_NTOHL (0x436f6465), 
-  ACE_NTOHL (0x53657443), 
-  ACE_NTOHL (0x6f6d706f), 
-  ACE_NTOHL (0x6e656e74), 
-  ACE_NTOHL (0x0),  // name = CodeSetComponent
-  2, // member count
-    16,
-  ACE_NTOHL (0x6e617469), 
-  ACE_NTOHL (0x76655f63), 
-  ACE_NTOHL (0x6f64655f), 
-  ACE_NTOHL (0x73657400),  // name = native_code_set
-    CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    37,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f4e56), 
-    ACE_NTOHL (0x5f465241), 
-    ACE_NTOHL (0x4d452f43), 
-    ACE_NTOHL (0x6f646553), 
-    ACE_NTOHL (0x65744964), 
-    ACE_NTOHL (0x3a312e30), 
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-        10,
-    ACE_NTOHL (0x436f6465), 
-    ACE_NTOHL (0x53657449), 
-    ACE_NTOHL (0x64000000),  // name = CodeSetId
-        CORBA::tk_ulong,
-
-
-  21,
-  ACE_NTOHL (0x636f6e76), 
-  ACE_NTOHL (0x65727369), 
-  ACE_NTOHL (0x6f6e5f63), 
-  ACE_NTOHL (0x6f64655f), 
-  ACE_NTOHL (0x73657473), 
-  ACE_NTOHL (0x0),  // name = conversion_code_sets
-    CORBA::tk_sequence, // typecode kind
-  84, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_alias, // typecode kind for typedefs
-    68, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      37,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f4e56), 
-      ACE_NTOHL (0x5f465241), 
-      ACE_NTOHL (0x4d452f43), 
-      ACE_NTOHL (0x6f646553), 
-      ACE_NTOHL (0x65744964), 
-      ACE_NTOHL (0x3a312e30), 
-      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-            10,
-      ACE_NTOHL (0x436f6465), 
-      ACE_NTOHL (0x53657449), 
-      ACE_NTOHL (0x64000000),  // name = CodeSetId
-            CORBA::tk_ulong,
-
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetComponent (
-    CORBA::tk_struct,
-    sizeof (_oc_CONV_FRAME_CodeSetComponent),
-    (char *) &_oc_CONV_FRAME_CodeSetComponent,
-    0,
-    sizeof (CONV_FRAME::CodeSetComponent)
-  );
-
-namespace CONV_FRAME
-{
-  ::CORBA::TypeCode_ptr _tc_CodeSetComponent =
-    &_tc_TAO_tc_CONV_FRAME_CodeSetComponent;
-}
-
 // TAO_IDL - Generated from 
 // be/be_visitor_structure/structure_cs.cpp:66
 
@@ -245,221 +103,7 @@
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
 
-static const CORBA::Long _oc_CONV_FRAME_CodeSetComponentInfo[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f4e56), 
-  ACE_NTOHL (0x5f465241), 
-  ACE_NTOHL (0x4d452f43), 
-  ACE_NTOHL (0x6f646553), 
-  ACE_NTOHL (0x6574436f), 
-  ACE_NTOHL (0x6d706f6e), 
-  ACE_NTOHL (0x656e7449), 
-  ACE_NTOHL (0x6e666f3a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponentInfo:1.0
-    21,
-  ACE_NTOHL (0x436f6465), 
-  ACE_NTOHL (0x53657443), 
-  ACE_NTOHL (0x6f6d706f), 
-  ACE_NTOHL (0x6e656e74), 
-  ACE_NTOHL (0x496e666f), 
-  ACE_NTOHL (0x0),  // name = CodeSetComponentInfo
-  2, // member count
-    12,
-  ACE_NTOHL (0x466f7243), 
-  ACE_NTOHL (0x68617244), 
-  ACE_NTOHL (0x61746100),  // name = ForCharData
-    CORBA::tk_struct, // typecode kind
-  296, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    44,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f4e56), 
-    ACE_NTOHL (0x5f465241), 
-    ACE_NTOHL (0x4d452f43), 
-    ACE_NTOHL (0x6f646553), 
-    ACE_NTOHL (0x6574436f), 
-    ACE_NTOHL (0x6d706f6e), 
-    ACE_NTOHL (0x656e743a), 
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0
-        17,
-    ACE_NTOHL (0x436f6465), 
-    ACE_NTOHL (0x53657443), 
-    ACE_NTOHL (0x6f6d706f), 
-    ACE_NTOHL (0x6e656e74), 
-    ACE_NTOHL (0x0),  // name = CodeSetComponent
-    2, // member count
-        16,
-    ACE_NTOHL (0x6e617469), 
-    ACE_NTOHL (0x76655f63), 
-    ACE_NTOHL (0x6f64655f), 
-    ACE_NTOHL (0x73657400),  // name = native_code_set
-        CORBA::tk_alias, // typecode kind for typedefs
-    68, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      37,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f4e56), 
-      ACE_NTOHL (0x5f465241), 
-      ACE_NTOHL (0x4d452f43), 
-      ACE_NTOHL (0x6f646553), 
-      ACE_NTOHL (0x65744964), 
-      ACE_NTOHL (0x3a312e30), 
-      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-            10,
-      ACE_NTOHL (0x436f6465), 
-      ACE_NTOHL (0x53657449), 
-      ACE_NTOHL (0x64000000),  // name = CodeSetId
-            CORBA::tk_ulong,
-
-
-    21,
-    ACE_NTOHL (0x636f6e76), 
-    ACE_NTOHL (0x65727369), 
-    ACE_NTOHL (0x6f6e5f63), 
-    ACE_NTOHL (0x6f64655f), 
-    ACE_NTOHL (0x73657473), 
-    ACE_NTOHL (0x0),  // name = conversion_code_sets
-        CORBA::tk_sequence, // typecode kind
-    84, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        37,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f4e56), 
-        ACE_NTOHL (0x5f465241),