diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-03-25 18:31:03 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-03-25 18:31:03 +0000 |
commit | 0b1aaf6f03a378e4bf1e51debafab24d702bf000 (patch) | |
tree | cf5503d1e9008aabd3ddacc90dfeabfa7871c845 | |
parent | 0435db7afcd78ec47dcaf8384f3ed84bc2dfc1bf (diff) | |
download | ATCD-0b1aaf6f03a378e4bf1e51debafab24d702bf000.tar.gz |
ChangeLogTag: Fri Mar 25 18:30:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
97 files changed, 469 insertions, 2320 deletions
diff --git a/TAO/tao/AnySeqC.h b/TAO/tao/AnySeqC.h index 082a09792f4..1ec82e80c42 100644 --- a/TAO/tao/AnySeqC.h +++ b/TAO/tao/AnySeqC.h @@ -43,6 +43,7 @@ #include "tao/TAO_Export.h" #include "tao/ORB.h" #include "tao/Environment.h" +#include "tao/TypeCode_Constants.h" #include "tao/Any.h" #include "tao/Sequence_T.h" #include "tao/Seq_Var_T.h" diff --git a/TAO/tao/BoundsC.cpp b/TAO/tao/BoundsC.cpp index b82d2ff4124..3931f405829 100644 --- a/TAO/tao/BoundsC.cpp +++ b/TAO/tao/BoundsC.cpp @@ -31,7 +31,10 @@ #include "BoundsC.h" #include "tao/CDR.h" -#include "tao/Typecode.h" +#include "tao/Null_RefCount_Policy.h" +#include "tao/TypeCode_Constants.h" +#include "tao/Alias_TypeCode.h" +#include "tao/Struct_TypeCode.h" #include "tao/SystemException.h" #include "ace/OS_NS_string.h" @@ -152,47 +155,12 @@ void CORBA::Bounds::_tao_decode ( } // TAO extension - the virtual _type method. -CORBA::TypeCode_ptr CORBA::Bounds::_type (void) const +CORBA::TypeCode_ptr CORBA::Bounds::_tao_type (void) const { return ::CORBA::_tc_Bounds; } // TAO_IDL - Generated from -// be\be_visitor_typecode/typecode_defn.cpp:295 - -static const CORBA::Long _oc_CORBA_Bounds[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 29, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f426f), - ACE_NTOHL (0x756e6473), - ACE_NTOHL (0x3a312e30), - ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Bounds:1.0 - 7, - ACE_NTOHL (0x426f756e), - ACE_NTOHL (0x64730000), // name = Bounds - 0, // member count - }; - -static CORBA::TypeCode _tc_TAO_tc_CORBA_Bounds ( - CORBA::tk_except, - sizeof (_oc_CORBA_Bounds), - (char *) &_oc_CORBA_Bounds, - 0, - 0 - ); - -namespace CORBA -{ - ::CORBA::TypeCode_ptr const _tc_Bounds = - &_tc_TAO_tc_CORBA_Bounds; -} - -// TAO_IDL - Generated from // be\be_visitor_exception/cdr_op_cs.cpp:60 CORBA::Boolean operator<< ( diff --git a/TAO/tao/BoundsC.h b/TAO/tao/BoundsC.h index 3d522fab50d..8c1b11163ed 100644 --- a/TAO/tao/BoundsC.h +++ b/TAO/tao/BoundsC.h @@ -111,7 +111,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:127 - virtual CORBA::TypeCode_ptr _type (void) const; + virtual CORBA::TypeCode_ptr _tao_type (void) const; }; // TAO_IDL - Generated from diff --git a/TAO/tao/CONV_FRAMEC.cpp b/TAO/tao/CONV_FRAMEC.cpp index 3c0111a9172..2f188c4d724 100644 --- a/TAO/tao/CONV_FRAMEC.cpp +++ b/TAO/tao/CONV_FRAMEC.cpp @@ -103,7 +103,7 @@ void CONV_FRAME::CodeSetIdSeq::_tao_any_destructor ( #endif /* end #if !defined */ // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:66 +// be\be_visitor_structure/structure_cs.cpp:68 void CONV_FRAME::CodeSetComponent::_tao_any_destructor ( @@ -116,7 +116,7 @@ CONV_FRAME::CodeSetComponent::_tao_any_destructor ( } // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:66 +// be\be_visitor_structure/structure_cs.cpp:68 void CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor ( @@ -129,7 +129,7 @@ CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor ( } // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:66 +// be\be_visitor_structure/structure_cs.cpp:68 void CONV_FRAME::CodeSetContext::_tao_any_destructor ( @@ -269,7 +269,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1619 +// be\be_visitor_root/root.cpp:1528 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/CONV_FRAMEC.h b/TAO/tao/CONV_FRAMEC.h index ac71fa4756a..a6ad32cc808 100644 --- a/TAO/tao/CONV_FRAMEC.h +++ b/TAO/tao/CONV_FRAMEC.h @@ -322,7 +322,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CONV_FRAME::CodeSet TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetContext &); // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "CONV_FRAMEC.inl" diff --git a/TAO/tao/CONV_FRAMES.h b/TAO/tao/CONV_FRAMES.h index c4106c6d5e1..17b1360599e 100644 --- a/TAO/tao/CONV_FRAMES.h +++ b/TAO/tao/CONV_FRAMES.h @@ -25,55 +25,4 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from -// be\be_codegen.cpp:390 - -#ifndef _TAO_IDL_ORIG_CONV_FRAMES_H_ -#define _TAO_IDL_ORIG_CONV_FRAMES_H_ - -#include /**/ "ace/pre.h" - -#include "CONV_FRAMEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option push -w-rvl -w-rch -w-ccc -w-inl -#endif /* __BORLANDC__ */ - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:49 - -namespace POA_CONV_FRAME -{ - - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:80 - -} // module CONV_FRAME - -// TAO_IDL - Generated from -// be\be_codegen.cpp:999 - -#include "CONV_FRAMES_T.h" - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option pop -#endif /* __BORLANDC__ */ - -#include /**/ "ace/post.h" -#endif /* ifndef */ - +// Skeleton file generation suppressed with command line option -SS diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp index a488ad7b3b7..03c6c33ef3f 100644 --- a/TAO/tao/DomainC.cpp +++ b/TAO/tao/DomainC.cpp @@ -743,7 +743,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_DomainManagerList_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1619 +// be\be_visitor_root/root.cpp:1528 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h index b229c677848..bf39bdea9f1 100644 --- a/TAO/tao/DomainC.h +++ b/TAO/tao/DomainC.h @@ -406,7 +406,7 @@ namespace CORBA // Proxy Broker Factory function pointer declarations. // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:230 +// be\be_visitor_root/root.cpp:139 extern TAO_Export TAO::Collocation_Proxy_Broker * @@ -522,7 +522,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_DomainManagerList_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "DomainC.inl" diff --git a/TAO/tao/DynamicC.cpp b/TAO/tao/DynamicC.cpp index 5a9d796c179..c7d80e77bb4 100644 --- a/TAO/tao/DynamicC.cpp +++ b/TAO/tao/DynamicC.cpp @@ -300,7 +300,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_Dynamic_ExceptionList_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1619 +// be\be_visitor_root/root.cpp:1528 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/DynamicC.h b/TAO/tao/DynamicC.h index 74726075f0d..20d9df1e524 100644 --- a/TAO/tao/DynamicC.h +++ b/TAO/tao/DynamicC.h @@ -44,6 +44,7 @@ #include "tao/ORB.h" #include "tao/Environment.h" #include "tao/TypeCode.h" +#include "tao/TypeCode_Constants.h" #include "tao/Sequence_T.h" #include "tao/Seq_Var_T.h" #include "tao/Seq_Out_T.h" @@ -277,7 +278,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_Dynamic_ExceptionList_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "DynamicC.inl" diff --git a/TAO/tao/Dynamic_ParameterC.cpp b/TAO/tao/Dynamic_ParameterC.cpp index 3b4a860b2e9..08b77d9c582 100644 --- a/TAO/tao/Dynamic_ParameterC.cpp +++ b/TAO/tao/Dynamic_ParameterC.cpp @@ -50,7 +50,7 @@ namespace TAO // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:66 +// be\be_visitor_structure/structure_cs.cpp:68 void Dynamic::Parameter::_tao_any_destructor ( @@ -86,7 +86,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1619 +// be\be_visitor_root/root.cpp:1528 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/Dynamic_ParameterC.h b/TAO/tao/Dynamic_ParameterC.h index f366df973d8..3eaaa523576 100644 --- a/TAO/tao/Dynamic_ParameterC.h +++ b/TAO/tao/Dynamic_ParameterC.h @@ -43,6 +43,7 @@ #include "tao/TAO_Export.h" #include "tao/ORB.h" #include "tao/Environment.h" +#include "tao/TypeCode_Constants.h" #include "tao/Any.h" #include "tao/VarOut_T.h" @@ -138,7 +139,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Dynamic::Parameter TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Dynamic::Parameter &); // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "Dynamic_ParameterC.inl" diff --git a/TAO/tao/GIOPC.cpp b/TAO/tao/GIOPC.cpp index 70030f1cf67..dfba85ab4cb 100644 --- a/TAO/tao/GIOPC.cpp +++ b/TAO/tao/GIOPC.cpp @@ -52,7 +52,7 @@ namespace TAO // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:66 +// be\be_visitor_structure/structure_cs.cpp:68 void GIOP::Version::_tao_any_destructor ( @@ -65,7 +65,7 @@ GIOP::Version::_tao_any_destructor ( } // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:66 +// be\be_visitor_structure/structure_cs.cpp:68 void GIOP::IORAddressingInfo::_tao_any_destructor ( @@ -391,7 +391,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1619 +// be\be_visitor_root/root.cpp:1528 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/GIOPC.h b/TAO/tao/GIOPC.h index bd21b03e6c0..05098bdc807 100644 --- a/TAO/tao/GIOPC.h +++ b/TAO/tao/GIOPC.h @@ -318,7 +318,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const GIOP::TargetAddress TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::TargetAddress &); // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "GIOPC.inl" diff --git a/TAO/tao/GIOPS.h b/TAO/tao/GIOPS.h index 2799c6ce3fb..17b1360599e 100644 --- a/TAO/tao/GIOPS.h +++ b/TAO/tao/GIOPS.h @@ -25,56 +25,4 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from -// be\be_codegen.cpp:390 - -#ifndef _TAO_IDL_ORIG_GIOPS_H_ -#define _TAO_IDL_ORIG_GIOPS_H_ - -#include /**/ "ace/pre.h" - -#include "tao/IOPS.h" -#include "GIOPC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option push -w-rvl -w-rch -w-ccc -w-inl -#endif /* __BORLANDC__ */ - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:49 - -namespace POA_GIOP -{ - - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:80 - -} // module GIOP - -// TAO_IDL - Generated from -// be\be_codegen.cpp:999 - -#include "GIOPS_T.h" - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option pop -#endif /* __BORLANDC__ */ - -#include /**/ "ace/post.h" -#endif /* ifndef */ - +// Skeleton file generation suppressed with command line option -SS diff --git a/TAO/tao/IIOPC.cpp b/TAO/tao/IIOPC.cpp index a9f64d4ff5b..57ec370ca20 100644 --- a/TAO/tao/IIOPC.cpp +++ b/TAO/tao/IIOPC.cpp @@ -50,7 +50,7 @@ namespace TAO // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:66 +// be\be_visitor_structure/structure_cs.cpp:68 void IIOP::ListenPoint::_tao_any_destructor ( @@ -116,7 +116,7 @@ void IIOP::ListenPointList::_tao_any_destructor ( #endif /* end #if !defined */ // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:66 +// be\be_visitor_structure/structure_cs.cpp:68 void IIOP::BiDirIIOPServiceContext::_tao_any_destructor ( @@ -245,7 +245,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1619 +// be\be_visitor_root/root.cpp:1528 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/IIOPC.h b/TAO/tao/IIOPC.h index 29814d26b6e..6893d89e5cc 100644 --- a/TAO/tao/IIOPC.h +++ b/TAO/tao/IIOPC.h @@ -264,7 +264,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IIOP::BiDirIIOPServ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IIOP::BiDirIIOPServiceContext &); // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "IIOPC.inl" diff --git a/TAO/tao/IIOP_EndpointsC.cpp b/TAO/tao/IIOP_EndpointsC.cpp index 5df80db71c0..bad5610ddac 100644 --- a/TAO/tao/IIOP_EndpointsC.cpp +++ b/TAO/tao/IIOP_EndpointsC.cpp @@ -50,7 +50,7 @@ namespace TAO // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:66 +// be\be_visitor_structure/structure_cs.cpp:68 void TAO::IIOP_Endpoint_Info::_tao_any_destructor ( @@ -213,7 +213,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_TAO_IIOPEndpointSequence_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1619 +// be\be_visitor_root/root.cpp:1528 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/IIOP_EndpointsC.h b/TAO/tao/IIOP_EndpointsC.h index 47d03fff4bd..d1e002520a6 100644 --- a/TAO/tao/IIOP_EndpointsC.h +++ b/TAO/tao/IIOP_EndpointsC.h @@ -217,7 +217,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_TAO_IIOPEndpointSequence_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "IIOP_EndpointsC.inl" diff --git a/TAO/tao/IOPC.h b/TAO/tao/IOPC.h index 7cf8c351b92..d41b23bebfc 100644 --- a/TAO/tao/IOPC.h +++ b/TAO/tao/IOPC.h @@ -77,7 +77,7 @@ namespace TAO } // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "IOPC.inl" diff --git a/TAO/tao/IOPS.h b/TAO/tao/IOPS.h index b6f62b6e326..17b1360599e 100644 --- a/TAO/tao/IOPS.h +++ b/TAO/tao/IOPS.h @@ -25,45 +25,4 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from -// be\be_codegen.cpp:390 - -#ifndef _TAO_IDL_ORIG_IOPS_H_ -#define _TAO_IDL_ORIG_IOPS_H_ - -#include /**/ "ace/pre.h" - -#include "tao/IOP_IORS.h" -#include "tao/IOP_CodecS.h" -#include "IOPC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option push -w-rvl -w-rch -w-ccc -w-inl -#endif /* __BORLANDC__ */ - -// TAO_IDL - Generated from -// be\be_codegen.cpp:997 - -#include "IOPS_T.h" - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option pop -#endif /* __BORLANDC__ */ - -#include /**/ "ace/post.h" -#endif /* ifndef */ - +// Skeleton file generation suppressed with command line option -SS diff --git a/TAO/tao/IOP_CodecC.cpp b/TAO/tao/IOP_CodecC.cpp index ae1d2d4075e..c2014cb4550 100644 --- a/TAO/tao/IOP_CodecC.cpp +++ b/TAO/tao/IOP_CodecC.cpp @@ -32,7 +32,11 @@ #include "IOP_CodecC.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" -#include "tao/Typecode.h" +#include "tao/Null_RefCount_Policy.h" +#include "tao/TypeCode_Constants.h" +#include "tao/Alias_TypeCode.h" +#include "tao/Objref_TypeCode.h" +#include "tao/Struct_TypeCode.h" #include "ace/OS_NS_string.h" #if defined (__BORLANDC__) @@ -178,52 +182,11 @@ void IOP::Codec::InvalidTypeForEncoding::_tao_decode ( } // TAO extension - the virtual _type method. -CORBA::TypeCode_ptr IOP::Codec::InvalidTypeForEncoding::_type (void) const +CORBA::TypeCode_ptr IOP::Codec::InvalidTypeForEncoding::_tao_type (void) const { return ::IOP::Codec::_tc_InvalidTypeForEncoding; } -// TAO_IDL - Generated from -// be\be_visitor_typecode/typecode_defn.cpp:295 - -static const CORBA::Long _oc_IOP_Codec_InvalidTypeForEncoding[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 49, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x436f6465), - ACE_NTOHL (0x632f496e), - ACE_NTOHL (0x76616c69), - ACE_NTOHL (0x64547970), - ACE_NTOHL (0x65466f72), - ACE_NTOHL (0x456e636f), - ACE_NTOHL (0x64696e67), - ACE_NTOHL (0x3a312e30), - ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0 - 23, - ACE_NTOHL (0x496e7661), - ACE_NTOHL (0x6c696454), - ACE_NTOHL (0x79706546), - ACE_NTOHL (0x6f72456e), - ACE_NTOHL (0x636f6469), - ACE_NTOHL (0x6e670000), // name = InvalidTypeForEncoding - 0, // member count - }; - -static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_InvalidTypeForEncoding ( - CORBA::tk_except, - sizeof (_oc_IOP_Codec_InvalidTypeForEncoding), - (char *) &_oc_IOP_Codec_InvalidTypeForEncoding, - 0, - 0 - ); - -::CORBA::TypeCode_ptr const IOP::Codec::_tc_InvalidTypeForEncoding = - &_tc_TAO_tc_IOP_Codec_InvalidTypeForEncoding; - // TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 @@ -314,48 +277,11 @@ void IOP::Codec::FormatMismatch::_tao_decode ( } // TAO extension - the virtual _type method. -CORBA::TypeCode_ptr IOP::Codec::FormatMismatch::_type (void) const +CORBA::TypeCode_ptr IOP::Codec::FormatMismatch::_tao_type (void) const { return ::IOP::Codec::_tc_FormatMismatch; } -// TAO_IDL - Generated from -// be\be_visitor_typecode/typecode_defn.cpp:295 - -static const CORBA::Long _oc_IOP_Codec_FormatMismatch[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 41, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x436f6465), - ACE_NTOHL (0x632f466f), - ACE_NTOHL (0x726d6174), - ACE_NTOHL (0x4d69736d), - ACE_NTOHL (0x61746368), - ACE_NTOHL (0x3a312e30), - ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IOP/Codec/FormatMismatch:1.0 - 15, - ACE_NTOHL (0x466f726d), - ACE_NTOHL (0x61744d69), - ACE_NTOHL (0x736d6174), - ACE_NTOHL (0x63680000), // name = FormatMismatch - 0, // member count - }; - -static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_FormatMismatch ( - CORBA::tk_except, - sizeof (_oc_IOP_Codec_FormatMismatch), - (char *) &_oc_IOP_Codec_FormatMismatch, - 0, - 0 - ); - -::CORBA::TypeCode_ptr const IOP::Codec::_tc_FormatMismatch = - &_tc_TAO_tc_IOP_Codec_FormatMismatch; - // TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 @@ -446,47 +372,11 @@ void IOP::Codec::TypeMismatch::_tao_decode ( } // TAO extension - the virtual _type method. -CORBA::TypeCode_ptr IOP::Codec::TypeMismatch::_type (void) const +CORBA::TypeCode_ptr IOP::Codec::TypeMismatch::_tao_type (void) const { return ::IOP::Codec::_tc_TypeMismatch; } -// TAO_IDL - Generated from -// be\be_visitor_typecode/typecode_defn.cpp:295 - -static const CORBA::Long _oc_IOP_Codec_TypeMismatch[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 39, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x436f6465), - ACE_NTOHL (0x632f5479), - ACE_NTOHL (0x70654d69), - ACE_NTOHL (0x736d6174), - ACE_NTOHL (0x63683a31), - ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IOP/Codec/TypeMismatch:1.0 - 13, - ACE_NTOHL (0x54797065), - ACE_NTOHL (0x4d69736d), - ACE_NTOHL (0x61746368), - ACE_NTOHL (0x0), // name = TypeMismatch - 0, // member count - }; - -static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_TypeMismatch ( - CORBA::tk_except, - sizeof (_oc_IOP_Codec_TypeMismatch), - (char *) &_oc_IOP_Codec_TypeMismatch, - 0, - 0 - ); - -::CORBA::TypeCode_ptr const IOP::Codec::_tc_TypeMismatch = - &_tc_TAO_tc_IOP_Codec_TypeMismatch; - IOP::Codec::Codec (void) {} @@ -593,7 +483,7 @@ IOP::Codec::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:66 +// be\be_visitor_structure/structure_cs.cpp:68 void IOP::Encoding::_tao_any_destructor ( @@ -731,50 +621,11 @@ void IOP::CodecFactory::UnknownEncoding::_tao_decode ( } // TAO extension - the virtual _type method. -CORBA::TypeCode_ptr IOP::CodecFactory::UnknownEncoding::_type (void) const +CORBA::TypeCode_ptr IOP::CodecFactory::UnknownEncoding::_tao_type (void) const { return ::IOP::CodecFactory::_tc_UnknownEncoding; } -// TAO_IDL - Generated from -// be\be_visitor_typecode/typecode_defn.cpp:295 - -static const CORBA::Long _oc_IOP_CodecFactory_UnknownEncoding[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 49, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x494f502f), - ACE_NTOHL (0x436f6465), - ACE_NTOHL (0x63466163), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x2f556e6b), - ACE_NTOHL (0x6e6f776e), - ACE_NTOHL (0x456e636f), - ACE_NTOHL (0x64696e67), - ACE_NTOHL (0x3a312e30), - ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0 - 16, - ACE_NTOHL (0x556e6b6e), - ACE_NTOHL (0x6f776e45), - ACE_NTOHL (0x6e636f64), - ACE_NTOHL (0x696e6700), // name = UnknownEncoding - 0, // member count - }; - -static CORBA::TypeCode _tc_TAO_tc_IOP_CodecFactory_UnknownEncoding ( - CORBA::tk_except, - sizeof (_oc_IOP_CodecFactory_UnknownEncoding), - (char *) &_oc_IOP_CodecFactory_UnknownEncoding, - 0, - 0 - ); - -::CORBA::TypeCode_ptr const IOP::CodecFactory::_tc_UnknownEncoding = - &_tc_TAO_tc_IOP_CodecFactory_UnknownEncoding; - IOP::CodecFactory::CodecFactory (void) {} diff --git a/TAO/tao/IOP_CodecC.h b/TAO/tao/IOP_CodecC.h index e896c1dc77d..c2dbf5db5b0 100644 --- a/TAO/tao/IOP_CodecC.h +++ b/TAO/tao/IOP_CodecC.h @@ -46,6 +46,7 @@ #include "tao/Environment.h" #include "tao/Object.h" #include "tao/TypeCode.h" +#include "tao/TypeCode_Constants.h" #include "tao/Any.h" #include "tao/Objref_VarOut_T.h" #include "tao/VarOut_T.h" @@ -189,7 +190,7 @@ namespace IOP // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:127 - virtual CORBA::TypeCode_ptr _type (void) const; + virtual CORBA::TypeCode_ptr _tao_type (void) const; }; // TAO_IDL - Generated from @@ -239,7 +240,7 @@ namespace IOP // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:127 - virtual CORBA::TypeCode_ptr _type (void) const; + virtual CORBA::TypeCode_ptr _tao_type (void) const; }; // TAO_IDL - Generated from @@ -289,7 +290,7 @@ namespace IOP // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:127 - virtual CORBA::TypeCode_ptr _type (void) const; + virtual CORBA::TypeCode_ptr _tao_type (void) const; }; // TAO_IDL - Generated from @@ -527,7 +528,7 @@ namespace IOP // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:127 - virtual CORBA::TypeCode_ptr _type (void) const; + virtual CORBA::TypeCode_ptr _tao_type (void) const; }; // TAO_IDL - Generated from @@ -696,7 +697,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::Encoding &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::Encoding &); // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "IOP_CodecC.inl" diff --git a/TAO/tao/IOP_CodecS.h b/TAO/tao/IOP_CodecS.h index 9ed88507774..17b1360599e 100644 --- a/TAO/tao/IOP_CodecS.h +++ b/TAO/tao/IOP_CodecS.h @@ -25,55 +25,4 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from -// be\be_codegen.cpp:390 - -#ifndef _TAO_IDL_ORIG_IOP_CODECS_H_ -#define _TAO_IDL_ORIG_IOP_CODECS_H_ - -#include /**/ "ace/pre.h" - -#include "tao/Typecode_typesS.h" -#include "tao/OctetSeqS.h" -#include "IOP_CodecC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option push -w-rvl -w-rch -w-ccc -w-inl -#endif /* __BORLANDC__ */ - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:49 - -namespace POA_IOP -{ - - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:80 - -} // module IOP - -// TAO_IDL - Generated from -// be\be_codegen.cpp:997 - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option pop -#endif /* __BORLANDC__ */ - -#include /**/ "ace/post.h" -#endif /* ifndef */ - +// Skeleton file generation suppressed with command line option -SS diff --git a/TAO/tao/IOP_IORC.cpp b/TAO/tao/IOP_IORC.cpp index 5ed52f2560b..398a3a9338d 100644 --- a/TAO/tao/IOP_IORC.cpp +++ b/TAO/tao/IOP_IORC.cpp @@ -51,7 +51,7 @@ namespace TAO // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:66 +// be\be_visitor_structure/structure_cs.cpp:68 void IOP::TaggedProfile::_tao_any_destructor ( @@ -117,7 +117,7 @@ void IOP::TaggedProfileSeq::_tao_any_destructor ( #endif /* end #if !defined */ // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:66 +// be\be_visitor_structure/structure_cs.cpp:68 void IOP::IOR::_tao_any_destructor ( @@ -130,7 +130,7 @@ IOP::IOR::_tao_any_destructor ( } // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:66 +// be\be_visitor_structure/structure_cs.cpp:68 void IOP::TaggedComponent::_tao_any_destructor ( @@ -302,7 +302,7 @@ void IOP::TaggedComponentSeq::_tao_any_destructor ( #endif /* end #if !defined */ // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:66 +// be\be_visitor_structure/structure_cs.cpp:68 void IOP::ServiceContext::_tao_any_destructor ( @@ -820,7 +820,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_IOP_ServiceContextList_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1619 +// be\be_visitor_root/root.cpp:1528 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/IOP_IORC.h b/TAO/tao/IOP_IORC.h index c3e424c82ef..c479adbf8fc 100644 --- a/TAO/tao/IOP_IORC.h +++ b/TAO/tao/IOP_IORC.h @@ -865,7 +865,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_IOP_ServiceContextList_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "IOP_IORC.inl" diff --git a/TAO/tao/IOP_IORS.h b/TAO/tao/IOP_IORS.h index 930706bf98b..17b1360599e 100644 --- a/TAO/tao/IOP_IORS.h +++ b/TAO/tao/IOP_IORS.h @@ -25,55 +25,4 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from -// be\be_codegen.cpp:390 - -#ifndef _TAO_IDL_ORIG_IOP_IORS_H_ -#define _TAO_IDL_ORIG_IOP_IORS_H_ - -#include /**/ "ace/pre.h" - -#include "tao/OctetSeqS.h" -#include "IOP_IORC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option push -w-rvl -w-rch -w-ccc -w-inl -#endif /* __BORLANDC__ */ - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:49 - -namespace POA_IOP -{ - - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:80 - -} // module IOP - -// TAO_IDL - Generated from -// be\be_codegen.cpp:997 - - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option pop -#endif /* __BORLANDC__ */ - -#include /**/ "ace/post.h" -#endif /* ifndef */ - +// Skeleton file generation suppressed with command line option -SS diff --git a/TAO/tao/LongDoubleSeqC.cpp b/TAO/tao/LongDoubleSeqC.cpp index 68181bda540..963ef411786 100644 --- a/TAO/tao/LongDoubleSeqC.cpp +++ b/TAO/tao/LongDoubleSeqC.cpp @@ -161,7 +161,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_LongDoubleSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1619 +// be\be_visitor_root/root.cpp:1528 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/LongDoubleSeqC.h b/TAO/tao/LongDoubleSeqC.h index d06af543617..59baeaedad8 100644 --- a/TAO/tao/LongDoubleSeqC.h +++ b/TAO/tao/LongDoubleSeqC.h @@ -166,7 +166,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_LongDoubleSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "LongDoubleSeqC.inl" diff --git a/TAO/tao/LongDoubleSeqS.h b/TAO/tao/LongDoubleSeqS.h index e032c4dcd9f..17b1360599e 100644 --- a/TAO/tao/LongDoubleSeqS.h +++ b/TAO/tao/LongDoubleSeqS.h @@ -25,54 +25,4 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from -// be\be_codegen.cpp:390 - -#ifndef _TAO_IDL_ORIG_LONGDOUBLESEQS_H_ -#define _TAO_IDL_ORIG_LONGDOUBLESEQS_H_ - -#include /**/ "ace/pre.h" - -#include "LongDoubleSeqC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option push -w-rvl -w-rch -w-ccc -w-inl -#endif /* __BORLANDC__ */ - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:49 - -namespace POA_CORBA -{ - - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:80 - -} // module CORBA - -// TAO_IDL - Generated from -// be\be_codegen.cpp:997 - - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option pop -#endif /* __BORLANDC__ */ - -#include /**/ "ace/post.h" -#endif /* ifndef */ - +// Skeleton file generation suppressed with command line option -SS diff --git a/TAO/tao/LongLongSeqC.cpp b/TAO/tao/LongLongSeqC.cpp index 230744183d3..e98354c6632 100644 --- a/TAO/tao/LongLongSeqC.cpp +++ b/TAO/tao/LongLongSeqC.cpp @@ -161,7 +161,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_LongLongSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1619 +// be\be_visitor_root/root.cpp:1528 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/LongLongSeqC.h b/TAO/tao/LongLongSeqC.h index ce0ae2a5405..8855fa10d0e 100644 --- a/TAO/tao/LongLongSeqC.h +++ b/TAO/tao/LongLongSeqC.h @@ -166,7 +166,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_LongLongSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "LongLongSeqC.inl" diff --git a/TAO/tao/LongLongSeqS.h b/TAO/tao/LongLongSeqS.h index ae0dc2c662b..17b1360599e 100644 --- a/TAO/tao/LongLongSeqS.h +++ b/TAO/tao/LongLongSeqS.h @@ -25,54 +25,4 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from -// be\be_codegen.cpp:390 - -#ifndef _TAO_IDL_ORIG_LONGLONGSEQS_H_ -#define _TAO_IDL_ORIG_LONGLONGSEQS_H_ - -#include /**/ "ace/pre.h" - -#include "LongLongSeqC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option push -w-rvl -w-rch -w-ccc -w-inl -#endif /* __BORLANDC__ */ - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:49 - -namespace POA_CORBA -{ - - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:80 - -} // module CORBA - -// TAO_IDL - Generated from -// be\be_codegen.cpp:997 - - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option pop -#endif /* __BORLANDC__ */ - -#include /**/ "ace/post.h" -#endif /* ifndef */ - +// Skeleton file generation suppressed with command line option -SS diff --git a/TAO/tao/LongSeqC.cpp b/TAO/tao/LongSeqC.cpp index 46a096dad5e..6332363e731 100644 --- a/TAO/tao/LongSeqC.cpp +++ b/TAO/tao/LongSeqC.cpp @@ -161,7 +161,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_LongSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1619 +// be\be_visitor_root/root.cpp:1528 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/LongSeqC.h b/TAO/tao/LongSeqC.h index 41c18e1970e..e53029fa883 100644 --- a/TAO/tao/LongSeqC.h +++ b/TAO/tao/LongSeqC.h @@ -166,7 +166,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_LongSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "LongSeqC.inl" diff --git a/TAO/tao/LongSeqS.h b/TAO/tao/LongSeqS.h index e4851fe42df..17b1360599e 100644 --- a/TAO/tao/LongSeqS.h +++ b/TAO/tao/LongSeqS.h @@ -25,54 +25,4 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from -// be\be_codegen.cpp:390 - -#ifndef _TAO_IDL_ORIG_LONGSEQS_H_ -#define _TAO_IDL_ORIG_LONGSEQS_H_ - -#include /**/ "ace/pre.h" - -#include "LongSeqC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option push -w-rvl -w-rch -w-ccc -w-inl -#endif /* __BORLANDC__ */ - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:49 - -namespace POA_CORBA -{ - - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:80 - -} // module CORBA - -// TAO_IDL - Generated from -// be\be_codegen.cpp:997 - - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option pop -#endif /* __BORLANDC__ */ - -#include /**/ "ace/post.h" -#endif /* ifndef */ - +// Skeleton file generation suppressed with command line option -SS diff --git a/TAO/tao/Messaging_PolicyValueC.cpp b/TAO/tao/Messaging_PolicyValueC.cpp index 4ce7192b741..c1755ac773c 100644 --- a/TAO/tao/Messaging_PolicyValueC.cpp +++ b/TAO/tao/Messaging_PolicyValueC.cpp @@ -51,7 +51,7 @@ namespace TAO // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:66 +// be\be_visitor_structure/structure_cs.cpp:68 void Messaging::PolicyValue::_tao_any_destructor ( @@ -212,7 +212,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_Messaging_PolicyValueSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1619 +// be\be_visitor_root/root.cpp:1528 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/Messaging_PolicyValueC.h b/TAO/tao/Messaging_PolicyValueC.h index d0ff9ae1859..9c9691d7f13 100644 --- a/TAO/tao/Messaging_PolicyValueC.h +++ b/TAO/tao/Messaging_PolicyValueC.h @@ -229,7 +229,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_Messaging_PolicyValueSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "Messaging_PolicyValueC.inl" diff --git a/TAO/tao/Messaging_SyncScopeC.h b/TAO/tao/Messaging_SyncScopeC.h index ee879d17909..8ebb1b09914 100644 --- a/TAO/tao/Messaging_SyncScopeC.h +++ b/TAO/tao/Messaging_SyncScopeC.h @@ -111,7 +111,7 @@ namespace TAO } // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "Messaging_SyncScopeC.inl" diff --git a/TAO/tao/ObjectIdListC.cpp b/TAO/tao/ObjectIdListC.cpp index a032900138d..4014840cefb 100644 --- a/TAO/tao/ObjectIdListC.cpp +++ b/TAO/tao/ObjectIdListC.cpp @@ -161,7 +161,7 @@ return false; #endif /* _TAO_CDR_OP_CORBA_ORB_ObjectIdList_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1619 +// be\be_visitor_root/root.cpp:1528 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/ObjectIdListC.h b/TAO/tao/ObjectIdListC.h index fec6fb6f810..71951c2c464 100644 --- a/TAO/tao/ObjectIdListC.h +++ b/TAO/tao/ObjectIdListC.h @@ -166,7 +166,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_ORB_ObjectIdList_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "ObjectIdListC.inl" diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp index 67aad5770a2..1b7a63d6c31 100644 --- a/TAO/tao/Object_KeyC.cpp +++ b/TAO/tao/Object_KeyC.cpp @@ -337,7 +337,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_TAO_ObjectKey_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1619 +// be\be_visitor_root/root.cpp:1528 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/Object_KeyC.h b/TAO/tao/Object_KeyC.h index d4d092fb66b..73fcc712e48 100644 --- a/TAO/tao/Object_KeyC.h +++ b/TAO/tao/Object_KeyC.h @@ -178,7 +178,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_TAO_ObjectKey_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "Object_KeyC.inl" diff --git a/TAO/tao/OctetSeqC.cpp b/TAO/tao/OctetSeqC.cpp index adf80a37a7c..7966d877516 100644 --- a/TAO/tao/OctetSeqC.cpp +++ b/TAO/tao/OctetSeqC.cpp @@ -198,7 +198,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_OctetSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1619 +// be\be_visitor_root/root.cpp:1528 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/OctetSeqC.h b/TAO/tao/OctetSeqC.h index b6362922b2a..bddfb0e52be 100644 --- a/TAO/tao/OctetSeqC.h +++ b/TAO/tao/OctetSeqC.h @@ -186,7 +186,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_OctetSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "OctetSeqC.inl" diff --git a/TAO/tao/OctetSeqS.h b/TAO/tao/OctetSeqS.h index 0c1085ace36..17b1360599e 100644 --- a/TAO/tao/OctetSeqS.h +++ b/TAO/tao/OctetSeqS.h @@ -25,54 +25,4 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from -// be\be_codegen.cpp:390 - -#ifndef _TAO_IDL_ORIG_OCTETSEQS_H_ -#define _TAO_IDL_ORIG_OCTETSEQS_H_ - -#include /**/ "ace/pre.h" - -#include "OctetSeqC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option push -w-rvl -w-rch -w-ccc -w-inl -#endif /* __BORLANDC__ */ - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:49 - -namespace POA_CORBA -{ - - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:80 - -} // module CORBA - -// TAO_IDL - Generated from -// be\be_codegen.cpp:997 - - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option pop -#endif /* __BORLANDC__ */ - -#include /**/ "ace/post.h" -#endif /* ifndef */ - +// Skeleton file generation suppressed with command line option -SS diff --git a/TAO/tao/PI_ForwardC.cpp b/TAO/tao/PI_ForwardC.cpp index 308bd9931f7..18e79b867e7 100644 --- a/TAO/tao/PI_ForwardC.cpp +++ b/TAO/tao/PI_ForwardC.cpp @@ -32,7 +32,10 @@ #include "PI_ForwardC.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" -#include "tao/Typecode.h" +#include "tao/Null_RefCount_Policy.h" +#include "tao/TypeCode_Constants.h" +#include "tao/Alias_TypeCode.h" +#include "tao/String_TypeCode.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig @@ -52,301 +55,173 @@ namespace TAO // TAO_IDL - Generated from -// be\be_visitor_typecode/typecode_defn.cpp:295 - -static const CORBA::Long _oc_PortableInterceptor_ServerId[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 45, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x72636570), - ACE_NTOHL (0x746f722f), - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x65724964), - ACE_NTOHL (0x3a312e30), - ACE_NTOHL (0x0), // repository ID = IDL:omg.org/PortableInterceptor/ServerId:1.0 - 9, - ACE_NTOHL (0x53657276), - ACE_NTOHL (0x65724964), - ACE_NTOHL (0x0), // name = ServerId - CORBA::tk_string, - 0U, // string length -}; - -static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ServerId ( - CORBA::tk_alias, - sizeof (_oc_PortableInterceptor_ServerId), - (char *) &_oc_PortableInterceptor_ServerId, - 0, - 0 - ); - +// be\be_visitor_typecode/alias_typecode.cpp:31 + +static TAO::TypeCode::Alias<char const *, + TAO::Null_RefCount_Policy> + _tao_tc_PortableInterceptor_ServerId ( + "IDL:omg.org/PortableInterceptor/ServerId:1.0", + "ServerId", + &::_tao_tc_CORBA::_tc_string); + namespace PortableInterceptor { ::CORBA::TypeCode_ptr const _tc_ServerId = - &_tc_TAO_tc_PortableInterceptor_ServerId; + &_tao_tc_PortableInterceptor_ServerId; } -// TAO_IDL - Generated from -// be\be_visitor_typecode/typecode_defn.cpp:295 -static const CORBA::Long _oc_PortableInterceptor_ORBId[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 42, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x72636570), - ACE_NTOHL (0x746f722f), - ACE_NTOHL (0x4f524249), - ACE_NTOHL (0x643a312e), - ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/PortableInterceptor/ORBId:1.0 - 6, - ACE_NTOHL (0x4f524249), - ACE_NTOHL (0x64000000), // name = ORBId - CORBA::tk_string, - 0U, // string length -}; - -static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBId ( - CORBA::tk_alias, - sizeof (_oc_PortableInterceptor_ORBId), - (char *) &_oc_PortableInterceptor_ORBId, - 0, - 0 - ); +// TAO_IDL - Generated from +// be\be_visitor_typecode/alias_typecode.cpp:31 + +static TAO::TypeCode::Alias<char const *, + TAO::Null_RefCount_Policy> + _tao_tc_PortableInterceptor_ORBId ( + "IDL:omg.org/PortableInterceptor/ORBId:1.0", + "ORBId", + &::_tao_tc_CORBA::_tc_string); + namespace PortableInterceptor { ::CORBA::TypeCode_ptr const _tc_ORBId = - &_tc_TAO_tc_PortableInterceptor_ORBId; + &_tao_tc_PortableInterceptor_ORBId; } + + // TAO_IDL - Generated from -// be\be_visitor_typecode/typecode_defn.cpp:295 +// be\be_visitor_typecode/alias_typecode.cpp:31 + -static const CORBA::Long _oc_PortableInterceptor_AdapterName[] = + +// TAO_IDL - Generated from +// be\be_visitor_typecode/alias_typecode.cpp:31 + + + +// TAO_IDL - Generated from +// be\be_visitor_typecode/typecode_defn.cpp:744 + +static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy> + _tao_tc_CORBA_sequence_0 ( + CORBA::tk_sequence, + &::_tao_tc_CORBA::_tc_string, + 0U); + +static TAO::TypeCode::Alias<char const *, + TAO::Null_RefCount_Policy> + _tao_tc_CORBA_StringSeq ( + "IDL:omg.org/CORBA/StringSeq:1.0", + "StringSeq", + &::_tao_tc_CORBA_sequence_0); + +namespace CORBA { - TAO_ENCAP_BYTE_ORDER, // byte order - 48, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x72636570), - ACE_NTOHL (0x746f722f), - ACE_NTOHL (0x41646170), - ACE_NTOHL (0x7465724e), - ACE_NTOHL (0x616d653a), - ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableInterceptor/AdapterName:1.0 - 12, - ACE_NTOHL (0x41646170), - ACE_NTOHL (0x7465724e), - ACE_NTOHL (0x616d6500), // name = AdapterName - CORBA::tk_alias, // typecode kind for typedefs - 80, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - 32, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5374), - ACE_NTOHL (0x72696e67), - ACE_NTOHL (0x5365713a), - ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/StringSeq:1.0 - 10, - ACE_NTOHL (0x53747269), - ACE_NTOHL (0x6e675365), - ACE_NTOHL (0x71000000), // name = StringSeq - CORBA::tk_sequence, // typecode kind - 16, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_string, - 0U, // string length - 0U, - - -}; - -static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_AdapterName ( - CORBA::tk_alias, - sizeof (_oc_PortableInterceptor_AdapterName), - (char *) &_oc_PortableInterceptor_AdapterName, - 0, - 0 - ); + ::CORBA::TypeCode_ptr const _tc_StringSeq = + &_tao_tc_CORBA_StringSeq; +} +static TAO::TypeCode::Alias<char const *, + TAO::Null_RefCount_Policy> + _tao_tc_PortableInterceptor_AdapterName ( + "IDL:omg.org/PortableInterceptor/AdapterName:1.0", + "AdapterName", + &CORBA::_tc_StringSeq); + namespace PortableInterceptor { ::CORBA::TypeCode_ptr const _tc_AdapterName = - &_tc_TAO_tc_PortableInterceptor_AdapterName; + &_tao_tc_PortableInterceptor_AdapterName; } + + +// TAO_IDL - Generated from +// be\be_visitor_typecode/alias_typecode.cpp:31 + + + // TAO_IDL - Generated from -// be\be_visitor_typecode/typecode_defn.cpp:295 +// be\be_visitor_typecode/alias_typecode.cpp:31 -static const CORBA::Long _oc_PortableInterceptor_ObjectId[] = + + +// TAO_IDL - Generated from +// be\be_visitor_typecode/typecode_defn.cpp:744 + +static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy> + _tao_tc_CORBA_sequence_0 ( + CORBA::tk_sequence, + &::_tao_tc_CORBA::_tc_octet, + 0U); + +static TAO::TypeCode::Alias<char const *, + TAO::Null_RefCount_Policy> + _tao_tc_CORBA_OctetSeq ( + "IDL:omg.org/CORBA/OctetSeq:1.0", + "OctetSeq", + &::_tao_tc_CORBA_sequence_0); + +namespace CORBA { - TAO_ENCAP_BYTE_ORDER, // byte order - 45, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x72636570), - ACE_NTOHL (0x746f722f), - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63744964), - ACE_NTOHL (0x3a312e30), - ACE_NTOHL (0x0), // repository ID = IDL:omg.org/PortableInterceptor/ObjectId:1.0 - 9, - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63744964), - ACE_NTOHL (0x0), // name = ObjectId - CORBA::tk_alias, // typecode kind for typedefs - 76, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - 31, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f4f63), - ACE_NTOHL (0x74657453), - ACE_NTOHL (0x65713a31), - ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0 - 9, - ACE_NTOHL (0x4f637465), - ACE_NTOHL (0x74536571), - ACE_NTOHL (0x0), // name = OctetSeq - CORBA::tk_sequence, // typecode kind - 12, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_octet, - - 0U, - - -}; - -static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ObjectId ( - CORBA::tk_alias, - sizeof (_oc_PortableInterceptor_ObjectId), - (char *) &_oc_PortableInterceptor_ObjectId, - 0, - 0 - ); + ::CORBA::TypeCode_ptr const _tc_OctetSeq = + &_tao_tc_CORBA_OctetSeq; +} +static TAO::TypeCode::Alias<char const *, + TAO::Null_RefCount_Policy> + _tao_tc_PortableInterceptor_ObjectId ( + "IDL:omg.org/PortableInterceptor/ObjectId:1.0", + "ObjectId", + &CORBA::_tc_OctetSeq); + namespace PortableInterceptor { ::CORBA::TypeCode_ptr const _tc_ObjectId = - &_tc_TAO_tc_PortableInterceptor_ObjectId; + &_tao_tc_PortableInterceptor_ObjectId; } -// TAO_IDL - Generated from -// be\be_visitor_typecode/typecode_defn.cpp:295 -static const CORBA::Long _oc_PortableInterceptor_AdapterManagerId[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 53, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x72636570), - ACE_NTOHL (0x746f722f), - ACE_NTOHL (0x41646170), - ACE_NTOHL (0x7465724d), - ACE_NTOHL (0x616e6167), - ACE_NTOHL (0x65724964), - ACE_NTOHL (0x3a312e30), - ACE_NTOHL (0x0), // repository ID = IDL:omg.org/PortableInterceptor/AdapterManagerId:1.0 - 17, - ACE_NTOHL (0x41646170), - ACE_NTOHL (0x7465724d), - ACE_NTOHL (0x616e6167), - ACE_NTOHL (0x65724964), - ACE_NTOHL (0x0), // name = AdapterManagerId - CORBA::tk_long, - -}; - -static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_AdapterManagerId ( - CORBA::tk_alias, - sizeof (_oc_PortableInterceptor_AdapterManagerId), - (char *) &_oc_PortableInterceptor_AdapterManagerId, - 0, - 0 - ); +// TAO_IDL - Generated from +// be\be_visitor_typecode/alias_typecode.cpp:31 + +static TAO::TypeCode::Alias<char const *, + TAO::Null_RefCount_Policy> + _tao_tc_PortableInterceptor_AdapterManagerId ( + "IDL:omg.org/PortableInterceptor/AdapterManagerId:1.0", + "AdapterManagerId", + &::_tao_tc_CORBA::_tc_long); + namespace PortableInterceptor { ::CORBA::TypeCode_ptr const _tc_AdapterManagerId = - &_tc_TAO_tc_PortableInterceptor_AdapterManagerId; + &_tao_tc_PortableInterceptor_AdapterManagerId; } -// TAO_IDL - Generated from -// be\be_visitor_typecode/typecode_defn.cpp:295 -static const CORBA::Long _oc_PortableInterceptor_AdapterState[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 49, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x72636570), - ACE_NTOHL (0x746f722f), - ACE_NTOHL (0x41646170), - ACE_NTOHL (0x74657253), - ACE_NTOHL (0x74617465), - ACE_NTOHL (0x3a312e30), - ACE_NTOHL (0x0), // repository ID = IDL:omg.org/PortableInterceptor/AdapterState:1.0 - 13, - ACE_NTOHL (0x41646170), - ACE_NTOHL (0x74657253), - ACE_NTOHL (0x74617465), - ACE_NTOHL (0x0), // name = AdapterState - CORBA::tk_short, - -}; - -static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_AdapterState ( - CORBA::tk_alias, - sizeof (_oc_PortableInterceptor_AdapterState), - (char *) &_oc_PortableInterceptor_AdapterState, - 0, - 0 - ); +// TAO_IDL - Generated from +// be\be_visitor_typecode/alias_typecode.cpp:31 + +static TAO::TypeCode::Alias<char const *, + TAO::Null_RefCount_Policy> + _tao_tc_PortableInterceptor_AdapterState ( + "IDL:omg.org/PortableInterceptor/AdapterState:1.0", + "AdapterState", + &::_tao_tc_CORBA::_tc_short); + namespace PortableInterceptor { ::CORBA::TypeCode_ptr const _tc_AdapterState = - &_tc_TAO_tc_PortableInterceptor_AdapterState; + &_tao_tc_PortableInterceptor_AdapterState; } + + // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1619 +// be\be_visitor_root/root.cpp:1528 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PI_ForwardC.h b/TAO/tao/PI_ForwardC.h index b0ffb1cb573..ada50921db7 100644 --- a/TAO/tao/PI_ForwardC.h +++ b/TAO/tao/PI_ForwardC.h @@ -158,7 +158,7 @@ namespace TAO } // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "PI_ForwardC.inl" diff --git a/TAO/tao/ParameterModeC.cpp b/TAO/tao/ParameterModeC.cpp index 0ee92294769..4a8a25a37d0 100644 --- a/TAO/tao/ParameterModeC.cpp +++ b/TAO/tao/ParameterModeC.cpp @@ -52,21 +52,20 @@ namespace TAO // TAO_IDL - Generated from // be\be_visitor_enum/cdr_op_cs.cpp:51 -CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::ParameterMode &_tao_enumval) +CORBA::Boolean operator<< (TAO_OutputCDR & strm, CORBA::ParameterMode _tao_enumerator) { - CORBA::ULong _tao_temp = _tao_enumval; - return strm << _tao_temp; + return strm << static_cast<CORBA::ULong> (_tao_enumerator); } -CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::ParameterMode &_tao_enumval) +CORBA::Boolean operator>> (TAO_InputCDR & strm, CORBA::ParameterMode & _tao_enumerator) { CORBA::ULong _tao_temp = 0; - CORBA::Boolean _tao_result = strm >> _tao_temp; + CORBA::Boolean const _tao_success = strm >> _tao_temp; - if (_tao_result == 1) + if (_tao_success) { - _tao_enumval = static_cast<CORBA::ParameterMode> (_tao_temp); + _tao_enumerator = static_cast<CORBA::ParameterMode> (_tao_temp); } - return _tao_result; + return _tao_success; } diff --git a/TAO/tao/ParameterModeC.h b/TAO/tao/ParameterModeC.h index bb43baa2cf0..99162621eff 100644 --- a/TAO/tao/ParameterModeC.h +++ b/TAO/tao/ParameterModeC.h @@ -99,7 +99,7 @@ namespace TAO // TAO_IDL - Generated from // be\be_visitor_enum/cdr_op_ch.cpp:50 -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ParameterMode &); +TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, CORBA::ParameterMode); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ParameterMode &); // TAO_IDL - Generated from diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp index 6fe942a5799..61a5faad048 100644 --- a/TAO/tao/PolicyC.cpp +++ b/TAO/tao/PolicyC.cpp @@ -34,7 +34,11 @@ #include "tao/Exception_Data.h" #include "tao/Invocation_Adapter.h" #include "tao/Object_T.h" -#include "tao/Typecode.h" +#include "tao/Null_RefCount_Policy.h" +#include "tao/TypeCode_Constants.h" +#include "tao/Alias_TypeCode.h" +#include "tao/Objref_TypeCode.h" +#include "tao/Struct_TypeCode.h" #include "tao/Basic_Arguments.h" #include "tao/Object_Argument_T.h" #include "ace/OS_NS_string.h" @@ -191,73 +195,11 @@ CORBA::PolicyError::PolicyError ( } // TAO extension - the virtual _type method. -CORBA::TypeCode_ptr CORBA::PolicyError::_type (void) const +CORBA::TypeCode_ptr CORBA::PolicyError::_tao_type (void) const { return ::CORBA::_tc_PolicyError; } -// TAO_IDL - Generated from -// be\be_visitor_typecode/typecode_defn.cpp:295 - -static const CORBA::Long _oc_CORBA_PolicyError[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 34, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f506f), - ACE_NTOHL (0x6c696379), - ACE_NTOHL (0x4572726f), - ACE_NTOHL (0x723a312e), - ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CORBA/PolicyError:1.0 - 12, - ACE_NTOHL (0x506f6c69), - ACE_NTOHL (0x63794572), - ACE_NTOHL (0x726f7200), // name = PolicyError - 1, // member count - 7, - ACE_NTOHL (0x72656173), - ACE_NTOHL (0x6f6e0000), // name = reason - CORBA::tk_alias, // typecode kind for typedefs - 72, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - 38, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f506f), - ACE_NTOHL (0x6c696379), - ACE_NTOHL (0x4572726f), - ACE_NTOHL (0x72436f64), - ACE_NTOHL (0x653a312e), - ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CORBA/PolicyErrorCode:1.0 - 16, - ACE_NTOHL (0x506f6c69), - ACE_NTOHL (0x63794572), - ACE_NTOHL (0x726f7243), - ACE_NTOHL (0x6f646500), // name = PolicyErrorCode - CORBA::tk_short, - - -}; - -static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyError ( - CORBA::tk_except, - sizeof (_oc_CORBA_PolicyError), - (char *) &_oc_CORBA_PolicyError, - 0, - 0 - ); - -namespace CORBA -{ - ::CORBA::TypeCode_ptr const _tc_PolicyError = - &_tc_TAO_tc_CORBA_PolicyError; -} - // TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 @@ -376,78 +318,12 @@ CORBA::InvalidPolicies::InvalidPolicies ( } // TAO extension - the virtual _type method. -CORBA::TypeCode_ptr CORBA::InvalidPolicies::_type (void) const +CORBA::TypeCode_ptr CORBA::InvalidPolicies::_tao_type (void) const { return ::CORBA::_tc_InvalidPolicies; } // TAO_IDL - Generated from -// be\be_visitor_typecode/typecode_defn.cpp:295 - -static const CORBA::Long _oc_CORBA_InvalidPolicies[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 38, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f496e), - ACE_NTOHL (0x76616c69), - ACE_NTOHL (0x64506f6c), - ACE_NTOHL (0x69636965), - ACE_NTOHL (0x733a312e), - ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CORBA/InvalidPolicies:1.0 - 16, - ACE_NTOHL (0x496e7661), - ACE_NTOHL (0x6c696450), - ACE_NTOHL (0x6f6c6963), - ACE_NTOHL (0x69657300), // name = InvalidPolicies - 1, // member count - 8, - ACE_NTOHL (0x696e6469), - ACE_NTOHL (0x63657300), // name = indices - CORBA::tk_alias, // typecode kind for typedefs - 76, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - 32, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5553), - ACE_NTOHL (0x686f7274), - ACE_NTOHL (0x5365713a), - ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/UShortSeq:1.0 - 10, - ACE_NTOHL (0x5553686f), - ACE_NTOHL (0x72745365), - ACE_NTOHL (0x71000000), // name = UShortSeq - CORBA::tk_sequence, // typecode kind - 12, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_ushort, - - 0U, - - -}; - -static CORBA::TypeCode _tc_TAO_tc_CORBA_InvalidPolicies ( - CORBA::tk_except, - sizeof (_oc_CORBA_InvalidPolicies), - (char *) &_oc_CORBA_InvalidPolicies, - 0, - 0 - ); - -namespace CORBA -{ - ::CORBA::TypeCode_ptr const _tc_InvalidPolicies = - &_tc_TAO_tc_CORBA_InvalidPolicies; -} - -// TAO_IDL - Generated from // be\be_visitor_interface/interface_cs.cpp:60 // Traits specializations for CORBA::Policy. @@ -1147,7 +1023,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1619 +// be\be_visitor_root/root.cpp:1528 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h index 130d78f46d6..093addccca8 100644 --- a/TAO/tao/PolicyC.h +++ b/TAO/tao/PolicyC.h @@ -173,7 +173,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:127 - virtual CORBA::TypeCode_ptr _type (void) const; + virtual CORBA::TypeCode_ptr _tao_type (void) const; }; // TAO_IDL - Generated from @@ -231,7 +231,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:127 - virtual CORBA::TypeCode_ptr _type (void) const; + virtual CORBA::TypeCode_ptr _tao_type (void) const; }; // TAO_IDL - Generated from @@ -601,7 +601,7 @@ namespace CORBA // Proxy Broker Factory function pointer declarations. // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:230 +// be\be_visitor_root/root.cpp:139 extern TAO_Export TAO::Collocation_Proxy_Broker * @@ -736,7 +736,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Policy_ptr ) TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Policy_ptr &); // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "PolicyC.inl" diff --git a/TAO/tao/Policy_ForwardC.cpp b/TAO/tao/Policy_ForwardC.cpp index 2736b9c540f..cf0e8ab7348 100644 --- a/TAO/tao/Policy_ForwardC.cpp +++ b/TAO/tao/Policy_ForwardC.cpp @@ -294,27 +294,26 @@ CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_visitor_enum/cdr_op_cs.cpp:51 -CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::SetOverrideType &_tao_enumval) +CORBA::Boolean operator<< (TAO_OutputCDR & strm, CORBA::SetOverrideType _tao_enumerator) { - CORBA::ULong _tao_temp = _tao_enumval; - return strm << _tao_temp; + return strm << static_cast<CORBA::ULong> (_tao_enumerator); } -CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::SetOverrideType &_tao_enumval) +CORBA::Boolean operator>> (TAO_InputCDR & strm, CORBA::SetOverrideType & _tao_enumerator) { CORBA::ULong _tao_temp = 0; - CORBA::Boolean _tao_result = strm >> _tao_temp; + CORBA::Boolean const _tao_success = strm >> _tao_temp; - if (_tao_result == 1) + if (_tao_success) { - _tao_enumval = static_cast<CORBA::SetOverrideType> (_tao_temp); + _tao_enumerator = static_cast<CORBA::SetOverrideType> (_tao_temp); } - return _tao_result; + return _tao_success; } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1619 +// be\be_visitor_root/root.cpp:1528 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/Policy_ForwardC.h b/TAO/tao/Policy_ForwardC.h index b8c12fe5b27..3971e9b992d 100644 --- a/TAO/tao/Policy_ForwardC.h +++ b/TAO/tao/Policy_ForwardC.h @@ -346,11 +346,11 @@ TAO_Export CORBA::Boolean operator>> ( // TAO_IDL - Generated from // be\be_visitor_enum/cdr_op_ch.cpp:50 -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::SetOverrideType &); +TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, CORBA::SetOverrideType); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::SetOverrideType &); // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "Policy_ForwardC.inl" diff --git a/TAO/tao/Policy_ForwardS.h b/TAO/tao/Policy_ForwardS.h index f8d7cd774da..17b1360599e 100644 --- a/TAO/tao/Policy_ForwardS.h +++ b/TAO/tao/Policy_ForwardS.h @@ -25,54 +25,4 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from -// be\be_codegen.cpp:390 - -#ifndef _TAO_IDL_ORIG_POLICY_FORWARDS_H_ -#define _TAO_IDL_ORIG_POLICY_FORWARDS_H_ - -#include /**/ "ace/pre.h" - -#include "Policy_ForwardC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option push -w-rvl -w-rch -w-ccc -w-inl -#endif /* __BORLANDC__ */ - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:49 - -namespace POA_CORBA -{ - - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:80 - -} // module CORBA - -// TAO_IDL - Generated from -// be\be_codegen.cpp:997 - - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option pop -#endif /* __BORLANDC__ */ - -#include /**/ "ace/post.h" -#endif /* ifndef */ - +// Skeleton file generation suppressed with command line option -SS diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp index 89d562af40d..0a05a915943 100644 --- a/TAO/tao/PollableC.cpp +++ b/TAO/tao/PollableC.cpp @@ -622,7 +622,7 @@ CORBA::PollableSet::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1619 +// be\be_visitor_root/root.cpp:1528 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PollableC.h b/TAO/tao/PollableC.h index a2af394b47a..bef746ec3be 100644 --- a/TAO/tao/PollableC.h +++ b/TAO/tao/PollableC.h @@ -438,7 +438,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - virtual ::CORBA::Pollable_ptr poll ( + virtual ::CORBA::Pollable_ptr get_ready_pollable ( ::CORBA::ULong timeout ACE_ENV_ARG_DECL_WITH_DEFAULTS ) @@ -572,7 +572,7 @@ namespace TAO } // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "PollableC.inl" diff --git a/TAO/tao/PollableS.h b/TAO/tao/PollableS.h index ea72c919713..17b1360599e 100644 --- a/TAO/tao/PollableS.h +++ b/TAO/tao/PollableS.h @@ -25,55 +25,4 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from -// be\be_codegen.cpp:390 - -#ifndef _TAO_IDL_ORIG_POLLABLES_H_ -#define _TAO_IDL_ORIG_POLLABLES_H_ - -#include /**/ "ace/pre.h" - -#include "PollableC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option push -w-rvl -w-rch -w-ccc -w-inl -#endif /* __BORLANDC__ */ - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:49 - -namespace POA_CORBA -{ - - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:80 - -} // module CORBA - -// TAO_IDL - Generated from -// be\be_codegen.cpp:999 - -#include "PollableS_T.h" - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option pop -#endif /* __BORLANDC__ */ - -#include /**/ "ace/post.h" -#endif /* ifndef */ - +// Skeleton file generation suppressed with command line option -SS diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp index ad29af1c2ca..164a24f1bf9 100644 --- a/TAO/tao/PortableInterceptorC.cpp +++ b/TAO/tao/PortableInterceptorC.cpp @@ -32,7 +32,12 @@ #include "PortableInterceptorC.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" -#include "tao/Typecode.h" +#include "tao/Null_RefCount_Policy.h" +#include "tao/TypeCode_Constants.h" +#include "tao/Alias_TypeCode.h" +#include "tao/Objref_TypeCode.h" +#include "tao/String_TypeCode.h" +#include "tao/Struct_TypeCode.h" #include "ace/OS_NS_string.h" #if defined (__BORLANDC__) @@ -315,78 +320,11 @@ PortableInterceptor::ForwardRequest::ForwardRequest ( } // TAO extension - the virtual _type method. -CORBA::TypeCode_ptr PortableInterceptor::ForwardRequest::_type (void) const +CORBA::TypeCode_ptr PortableInterceptor::ForwardRequest::_tao_type (void) const { return ::PortableInterceptor::_tc_ForwardRequest; } -// TAO_IDL - Generated from -// be\be_visitor_typecode/typecode_defn.cpp:295 - -static const CORBA::Long _oc_PortableInterceptor_ForwardRequest[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 51, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x72636570), - ACE_NTOHL (0x746f722f), - ACE_NTOHL (0x466f7277), - ACE_NTOHL (0x61726452), - ACE_NTOHL (0x65717565), - ACE_NTOHL (0x73743a31), - ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableInterceptor/ForwardRequest:1.0 - 15, - ACE_NTOHL (0x466f7277), - ACE_NTOHL (0x61726452), - ACE_NTOHL (0x65717565), - ACE_NTOHL (0x73740000), // name = ForwardRequest - 2, // member count - 8, - ACE_NTOHL (0x666f7277), - ACE_NTOHL (0x61726400), // name = forward - CORBA::tk_objref, - 52, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - 29, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f4f62), - ACE_NTOHL (0x6a656374), - ACE_NTOHL (0x3a312e30), - ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Object:1.0 - 7, - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63740000), // name = Object - - 10, - ACE_NTOHL (0x7065726d), - ACE_NTOHL (0x616e656e), - ACE_NTOHL (0x74000000), // name = permanent - CORBA::tk_boolean, - -}; - -static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ForwardRequest ( - CORBA::tk_except, - sizeof (_oc_PortableInterceptor_ForwardRequest), - (char *) &_oc_PortableInterceptor_ForwardRequest, - 0, - 0 - ); - -namespace PortableInterceptor -{ - ::CORBA::TypeCode_ptr const _tc_ForwardRequest = - &_tc_TAO_tc_PortableInterceptor_ForwardRequest; -} - // TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 @@ -487,52 +425,12 @@ void PortableInterceptor::InvalidSlot::_tao_decode ( } // TAO extension - the virtual _type method. -CORBA::TypeCode_ptr PortableInterceptor::InvalidSlot::_type (void) const +CORBA::TypeCode_ptr PortableInterceptor::InvalidSlot::_tao_type (void) const { return ::PortableInterceptor::_tc_InvalidSlot; } // TAO_IDL - Generated from -// be\be_visitor_typecode/typecode_defn.cpp:295 - -static const CORBA::Long _oc_PortableInterceptor_InvalidSlot[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 48, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x72636570), - ACE_NTOHL (0x746f722f), - ACE_NTOHL (0x496e7661), - ACE_NTOHL (0x6c696453), - ACE_NTOHL (0x6c6f743a), - ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableInterceptor/InvalidSlot:1.0 - 12, - ACE_NTOHL (0x496e7661), - ACE_NTOHL (0x6c696453), - ACE_NTOHL (0x6c6f7400), // name = InvalidSlot - 0, // member count - }; - -static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_InvalidSlot ( - CORBA::tk_except, - sizeof (_oc_PortableInterceptor_InvalidSlot), - (char *) &_oc_PortableInterceptor_InvalidSlot, - 0, - 0 - ); - -namespace PortableInterceptor -{ - ::CORBA::TypeCode_ptr const _tc_InvalidSlot = - &_tc_TAO_tc_PortableInterceptor_InvalidSlot; -} - -// TAO_IDL - Generated from // be\be_visitor_interface/interface_cs.cpp:60 // Traits specializations for PortableInterceptor::Current. @@ -1683,58 +1581,11 @@ PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName ( } // TAO extension - the virtual _type method. -CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::DuplicateName::_type (void) const +CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::DuplicateName::_tao_type (void) const { return ::PortableInterceptor::ORBInitInfo::_tc_DuplicateName; } -// TAO_IDL - Generated from -// be\be_visitor_typecode/typecode_defn.cpp:295 - -static const CORBA::Long _oc_PortableInterceptor_ORBInitInfo_DuplicateName[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 62, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x72636570), - ACE_NTOHL (0x746f722f), - ACE_NTOHL (0x4f524249), - ACE_NTOHL (0x6e697449), - ACE_NTOHL (0x6e666f2f), - ACE_NTOHL (0x4475706c), - ACE_NTOHL (0x69636174), - ACE_NTOHL (0x654e616d), - ACE_NTOHL (0x653a312e), - ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/PortableInterceptor/ORBInitInfo/DuplicateName:1.0 - 14, - ACE_NTOHL (0x4475706c), - ACE_NTOHL (0x69636174), - ACE_NTOHL (0x654e616d), - ACE_NTOHL (0x65000000), // name = DuplicateName - 1, // member count - 5, - ACE_NTOHL (0x6e616d65), - ACE_NTOHL (0x0), // name = name - CORBA::tk_string, - 0U, // string length -}; - -static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitInfo_DuplicateName ( - CORBA::tk_except, - sizeof (_oc_PortableInterceptor_ORBInitInfo_DuplicateName), - (char *) &_oc_PortableInterceptor_ORBInitInfo_DuplicateName, - 0, - 0 - ); - -::CORBA::TypeCode_ptr const PortableInterceptor::ORBInitInfo::_tc_DuplicateName = - &_tc_TAO_tc_PortableInterceptor_ORBInitInfo_DuplicateName; - // TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 @@ -1825,51 +1676,11 @@ void PortableInterceptor::ORBInitInfo::InvalidName::_tao_decode ( } // TAO extension - the virtual _type method. -CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::InvalidName::_type (void) const +CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::InvalidName::_tao_type (void) const { return ::PortableInterceptor::ORBInitInfo::_tc_InvalidName; } -// TAO_IDL - Generated from -// be\be_visitor_typecode/typecode_defn.cpp:295 - -static const CORBA::Long _oc_PortableInterceptor_ORBInitInfo_InvalidName[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 60, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x72636570), - ACE_NTOHL (0x746f722f), - ACE_NTOHL (0x4f524249), - ACE_NTOHL (0x6e697449), - ACE_NTOHL (0x6e666f2f), - ACE_NTOHL (0x496e7661), - ACE_NTOHL (0x6c69644e), - ACE_NTOHL (0x616d653a), - ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableInterceptor/ORBInitInfo/InvalidName:1.0 - 12, - ACE_NTOHL (0x496e7661), - ACE_NTOHL (0x6c69644e), - ACE_NTOHL (0x616d6500), // name = InvalidName - 0, // member count - }; - -static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitInfo_InvalidName ( - CORBA::tk_except, - sizeof (_oc_PortableInterceptor_ORBInitInfo_InvalidName), - (char *) &_oc_PortableInterceptor_ORBInitInfo_InvalidName, - 0, - 0 - ); - -::CORBA::TypeCode_ptr const PortableInterceptor::ORBInitInfo::_tc_InvalidName = - &_tc_TAO_tc_PortableInterceptor_ORBInitInfo_InvalidName; - PortableInterceptor::ORBInitInfo::ORBInitInfo (void) {} @@ -2184,7 +1995,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1619 +// be\be_visitor_root/root.cpp:1528 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h index ee68bb2e549..c8c0d9da9d9 100644 --- a/TAO/tao/PortableInterceptorC.h +++ b/TAO/tao/PortableInterceptorC.h @@ -45,6 +45,7 @@ #include "tao/SystemException.h" #include "tao/Environment.h" #include "tao/Object.h" +#include "tao/TypeCode_Constants.h" #include "tao/Any.h" #include "tao/Objref_VarOut_T.h" @@ -294,7 +295,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:127 - virtual CORBA::TypeCode_ptr _type (void) const; + virtual CORBA::TypeCode_ptr _tao_type (void) const; }; // TAO_IDL - Generated from @@ -401,7 +402,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:127 - virtual CORBA::TypeCode_ptr _type (void) const; + virtual CORBA::TypeCode_ptr _tao_type (void) const; }; // TAO_IDL - Generated from @@ -1711,7 +1712,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:127 - virtual CORBA::TypeCode_ptr _type (void) const; + virtual CORBA::TypeCode_ptr _tao_type (void) const; }; // TAO_IDL - Generated from @@ -1761,7 +1762,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:127 - virtual CORBA::TypeCode_ptr _type (void) const; + virtual CORBA::TypeCode_ptr _tao_type (void) const; }; // TAO_IDL - Generated from @@ -2364,7 +2365,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::InvalidSlot &); // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "PortableInterceptorC.inl" diff --git a/TAO/tao/PortableInterceptorS.h b/TAO/tao/PortableInterceptorS.h index 333ac399b58..17b1360599e 100644 --- a/TAO/tao/PortableInterceptorS.h +++ b/TAO/tao/PortableInterceptorS.h @@ -25,54 +25,4 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from -// be\be_codegen.cpp:390 - -#ifndef _TAO_IDL_ORIG_PORTABLEINTERCEPTORS_H_ -#define _TAO_IDL_ORIG_PORTABLEINTERCEPTORS_H_ - -#include /**/ "ace/pre.h" - -#include "PortableInterceptorC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option push -w-rvl -w-rch -w-ccc -w-inl -#endif /* __BORLANDC__ */ - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:49 - -namespace POA_PortableInterceptor -{ - - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:80 - -} // module PortableInterceptor - -// TAO_IDL - Generated from -// be\be_codegen.cpp:997 - - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option pop -#endif /* __BORLANDC__ */ - -#include /**/ "ace/post.h" -#endif /* ifndef */ - +// Skeleton file generation suppressed with command line option -SS diff --git a/TAO/tao/ServicesC.cpp b/TAO/tao/ServicesC.cpp index b362269f44c..48fb6c612de 100644 --- a/TAO/tao/ServicesC.cpp +++ b/TAO/tao/ServicesC.cpp @@ -51,19 +51,6 @@ namespace TAO // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:66 - -void -CORBA::ServiceDetail::_tao_any_destructor ( - void *_tao_void_pointer - ) -{ - ServiceDetail *_tao_tmp_pointer = - static_cast<ServiceDetail *> (_tao_void_pointer); - delete _tao_tmp_pointer; -} - -// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_SERVICEOPTIONSEQ_CS_) @@ -117,6 +104,19 @@ void CORBA::ServiceOptionSeq::_tao_any_destructor ( #endif /* end #if !defined */ // TAO_IDL - Generated from +// be\be_visitor_structure/structure_cs.cpp:68 + +void +CORBA::ServiceDetail::_tao_any_destructor ( + void *_tao_void_pointer + ) +{ + ServiceDetail *_tao_tmp_pointer = + static_cast<ServiceDetail *> (_tao_void_pointer); + delete _tao_tmp_pointer; +} + +// TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_SERVICEDETAILSEQ_CS_) @@ -170,7 +170,7 @@ void CORBA::ServiceDetailSeq::_tao_any_destructor ( #endif /* end #if !defined */ // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:66 +// be\be_visitor_structure/structure_cs.cpp:68 void CORBA::ServiceInformation::_tao_any_destructor ( @@ -183,29 +183,6 @@ CORBA::ServiceInformation::_tao_any_destructor ( } // TAO_IDL - Generated from -// be\be_visitor_structure/cdr_op_cs.cpp:61 - -CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const CORBA::ServiceDetail &_tao_aggregate - ) -{ - return - (strm << _tao_aggregate.service_detail_type) && - (strm << _tao_aggregate.service_detail); -} - -CORBA::Boolean operator>> ( - TAO_InputCDR &strm, - CORBA::ServiceDetail &_tao_aggregate - ) -{ - return - (strm >> _tao_aggregate.service_detail_type) && - (strm >> _tao_aggregate.service_detail); -} - -// TAO_IDL - Generated from // be\be_visitor_sequence/cdr_op_cs.cpp:96 #if !defined _TAO_CDR_OP_CORBA_ServiceOptionSeq_CPP_ @@ -264,6 +241,29 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_ServiceOptionSeq_CPP_ */ // TAO_IDL - Generated from +// be\be_visitor_structure/cdr_op_cs.cpp:61 + +CORBA::Boolean operator<< ( + TAO_OutputCDR &strm, + const CORBA::ServiceDetail &_tao_aggregate + ) +{ + return + (strm << _tao_aggregate.service_detail_type) && + (strm << _tao_aggregate.service_detail); +} + +CORBA::Boolean operator>> ( + TAO_InputCDR &strm, + CORBA::ServiceDetail &_tao_aggregate + ) +{ + return + (strm >> _tao_aggregate.service_detail_type) && + (strm >> _tao_aggregate.service_detail); +} + +// TAO_IDL - Generated from // be\be_visitor_sequence/cdr_op_cs.cpp:96 #if !defined _TAO_CDR_OP_CORBA_ServiceDetailSeq_CPP_ @@ -359,27 +359,11 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1619 +// be\be_visitor_root/root.cpp:1528 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class - TAO_Var_Var_T< - CORBA::ServiceDetail - >; - - template class - TAO_Var_Base_T< - CORBA::ServiceDetail - >; - - template class - TAO_Out_T< - CORBA::ServiceDetail, - CORBA::ServiceDetail_var - >; - - template class TAO_FixedSeq_Var_T< CORBA::ServiceOptionSeq, CORBA::ServiceOption @@ -399,6 +383,22 @@ CORBA::Boolean operator>> ( >; template class + TAO_Var_Var_T< + CORBA::ServiceDetail + >; + + template class + TAO_Var_Base_T< + CORBA::ServiceDetail + >; + + template class + TAO_Out_T< + CORBA::ServiceDetail, + CORBA::ServiceDetail_var + >; + + template class TAO_VarSeq_Var_T< CORBA::ServiceDetailSeq, CORBA::ServiceDetail @@ -446,22 +446,6 @@ CORBA::Boolean operator>> ( #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate \ - TAO_Var_Var_T< \ - CORBA::ServiceDetail \ - > - -# pragma instantiate \ - TAO_Var_Base_T< \ - CORBA::ServiceDetail \ - > - -# pragma instantiate \ - TAO_Out_T< \ - CORBA::ServiceDetail, \ - CORBA::ServiceDetail_var \ - > - -# pragma instantiate \ TAO_FixedSeq_Var_T< \ CORBA::ServiceOptionSeq, \ CORBA::ServiceOption \ @@ -481,6 +465,22 @@ CORBA::Boolean operator>> ( > # pragma instantiate \ + TAO_Var_Var_T< \ + CORBA::ServiceDetail \ + > + +# pragma instantiate \ + TAO_Var_Base_T< \ + CORBA::ServiceDetail \ + > + +# pragma instantiate \ + TAO_Out_T< \ + CORBA::ServiceDetail, \ + CORBA::ServiceDetail_var \ + > + +# pragma instantiate \ TAO_VarSeq_Var_T< \ CORBA::ServiceDetailSeq, \ CORBA::ServiceDetail \ diff --git a/TAO/tao/ServicesC.h b/TAO/tao/ServicesC.h index bc7af68cede..be25bcf6909 100644 --- a/TAO/tao/ServicesC.h +++ b/TAO/tao/ServicesC.h @@ -111,44 +111,16 @@ namespace CORBA TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServiceDetailType; // TAO_IDL - Generated from - // be\be_visitor_constant/constant_ch.cpp:52 - - const CORBA::ServiceType Security = 1U; + // be\be_visitor_typedef/typedef_ch.cpp:472 - // TAO_IDL - Generated from - // be\be_type.cpp:258 - - struct ServiceDetail; - - typedef - TAO_Var_Var_T< - ServiceDetail - > - ServiceDetail_var; - - typedef - TAO_Out_T< - ServiceDetail, - ServiceDetail_var - > - ServiceDetail_out; - - // TAO_IDL - Generated from - // be\be_visitor_structure/structure_ch.cpp:52 - - struct TAO_Export ServiceDetail - { - typedef ServiceDetail_var _var_type; - - static void _tao_any_destructor (void *); - CORBA::ServiceDetailType service_detail_type; - CORBA::OctetSeq service_detail; - }; + typedef OctetSeq ServiceDetailData; + typedef OctetSeq_var ServiceDetailData_var; + typedef OctetSeq_out ServiceDetailData_out; // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServiceDetail; + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServiceDetailData; // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 @@ -204,6 +176,46 @@ namespace CORBA TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServiceOptionSeq; // TAO_IDL - Generated from + // be\be_visitor_constant/constant_ch.cpp:52 + + const CORBA::ServiceType Security = 1U; + + // TAO_IDL - Generated from + // be\be_type.cpp:258 + + struct ServiceDetail; + + typedef + TAO_Var_Var_T< + ServiceDetail + > + ServiceDetail_var; + + typedef + TAO_Out_T< + ServiceDetail, + ServiceDetail_var + > + ServiceDetail_out; + + // TAO_IDL - Generated from + // be\be_visitor_structure/structure_ch.cpp:52 + + struct TAO_Export ServiceDetail + { + typedef ServiceDetail_var _var_type; + + static void _tao_any_destructor (void *); + CORBA::ServiceDetailType service_detail_type; + CORBA::ServiceDetailData service_detail; + }; + + // TAO_IDL - Generated from + // be\be_visitor_typecode/typecode_decl.cpp:44 + + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServiceDetail; + + // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_SERVICEDETAILSEQ_CH_) @@ -305,14 +317,6 @@ namespace TAO } // TAO_IDL - Generated from -// be\be_visitor_structure/any_op_ch.cpp:52 - -TAO_Export void operator<<= (CORBA::Any &, const CORBA::ServiceDetail &); // copying version -TAO_Export void operator<<= (CORBA::Any &, CORBA::ServiceDetail*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ServiceDetail *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ServiceDetail *&); - -// TAO_IDL - Generated from // be\be_visitor_sequence/any_op_ch.cpp:52 TAO_Export void operator<<= (CORBA::Any &, const CORBA::ServiceOptionSeq &); // copying version @@ -321,6 +325,14 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ServiceOptionS TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ServiceOptionSeq *&); // TAO_IDL - Generated from +// be\be_visitor_structure/any_op_ch.cpp:52 + +TAO_Export void operator<<= (CORBA::Any &, const CORBA::ServiceDetail &); // copying version +TAO_Export void operator<<= (CORBA::Any &, CORBA::ServiceDetail*); // noncopying version +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ServiceDetail *&); // deprecated +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ServiceDetail *&); + +// TAO_IDL - Generated from // be\be_visitor_sequence/any_op_ch.cpp:52 TAO_Export void operator<<= (CORBA::Any &, const CORBA::ServiceDetailSeq &); // copying version @@ -337,12 +349,6 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ServiceInforma TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ServiceInformation *&); // TAO_IDL - Generated from -// be\be_visitor_structure/cdr_op_ch.cpp:54 - -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ServiceDetail &); -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ServiceDetail &); - -// TAO_IDL - Generated from // be\be_visitor_sequence/cdr_op_ch.cpp:71 #if !defined _TAO_CDR_OP_CORBA_ServiceOptionSeq_H_ @@ -360,6 +366,12 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_ServiceOptionSeq_H_ */ // TAO_IDL - Generated from +// be\be_visitor_structure/cdr_op_ch.cpp:54 + +TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ServiceDetail &); +TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ServiceDetail &); + +// TAO_IDL - Generated from // be\be_visitor_sequence/cdr_op_ch.cpp:71 #if !defined _TAO_CDR_OP_CORBA_ServiceDetailSeq_H_ @@ -383,7 +395,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ServiceInfor TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ServiceInformation &); // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "ServicesC.inl" diff --git a/TAO/tao/ServicesS.h b/TAO/tao/ServicesS.h index 0dcb52963c9..17b1360599e 100644 --- a/TAO/tao/ServicesS.h +++ b/TAO/tao/ServicesS.h @@ -25,56 +25,4 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from -// be\be_codegen.cpp:390 - -#ifndef _TAO_IDL_ORIG_SERVICESS_H_ -#define _TAO_IDL_ORIG_SERVICESS_H_ - -#include /**/ "ace/pre.h" - -#include "tao/OctetSeqS.h" -#include "ServicesC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option push -w-rvl -w-rch -w-ccc -w-inl -#endif /* __BORLANDC__ */ - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:49 - -namespace POA_CORBA -{ - - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:80 - -} // module CORBA - -// TAO_IDL - Generated from -// be\be_codegen.cpp:997 - -#include "ServicesS_T.h" - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option pop -#endif /* __BORLANDC__ */ - -#include /**/ "ace/post.h" -#endif /* ifndef */ - +// Skeleton file generation suppressed with command line option -SS diff --git a/TAO/tao/ShortSeqC.cpp b/TAO/tao/ShortSeqC.cpp index 22bae6f2335..27fcf43c4d5 100644 --- a/TAO/tao/ShortSeqC.cpp +++ b/TAO/tao/ShortSeqC.cpp @@ -161,7 +161,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_ShortSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1619 +// be\be_visitor_root/root.cpp:1528 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/ShortSeqC.h b/TAO/tao/ShortSeqC.h index 65037a49c02..90e5c261324 100644 --- a/TAO/tao/ShortSeqC.h +++ b/TAO/tao/ShortSeqC.h @@ -166,7 +166,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_ShortSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "ShortSeqC.inl" diff --git a/TAO/tao/ShortSeqS.h b/TAO/tao/ShortSeqS.h index 17d9ae90fd7..17b1360599e 100644 --- a/TAO/tao/ShortSeqS.h +++ b/TAO/tao/ShortSeqS.h @@ -25,54 +25,4 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from -// be\be_codegen.cpp:390 - -#ifndef _TAO_IDL_ORIG_SHORTSEQS_H_ -#define _TAO_IDL_ORIG_SHORTSEQS_H_ - -#include /**/ "ace/pre.h" - -#include "ShortSeqC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option push -w-rvl -w-rch -w-ccc -w-inl -#endif /* __BORLANDC__ */ - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:49 - -namespace POA_CORBA -{ - - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:80 - -} // module CORBA - -// TAO_IDL - Generated from -// be\be_codegen.cpp:997 - - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option pop -#endif /* __BORLANDC__ */ - -#include /**/ "ace/post.h" -#endif /* ifndef */ - +// Skeleton file generation suppressed with command line option -SS diff --git a/TAO/tao/StringSeqA.cpp b/TAO/tao/StringSeqA.cpp index 7dc6550de26..d0ae84c297d 100644 --- a/TAO/tao/StringSeqA.cpp +++ b/TAO/tao/StringSeqA.cpp @@ -26,53 +26,44 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html #include "StringSeqC.h" -#include "tao/Typecode.h" +#include "tao/Null_RefCount_Policy.h" +#include "tao/TypeCode_Constants.h" +#include "tao/Alias_TypeCode.h" +#include "tao/Sequence_TypeCode.h" +#include "tao/String_TypeCode.h" #include "tao/CDR.h" #include "tao/Any.h" #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be\be_visitor_typecode/typecode_defn.cpp:295 +// be\be_visitor_typecode/alias_typecode.cpp:31 + -static const CORBA::Long _oc_CORBA_StringSeq[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 32, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5374), - ACE_NTOHL (0x72696e67), - ACE_NTOHL (0x5365713a), - ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/StringSeq:1.0 - 10, - ACE_NTOHL (0x53747269), - ACE_NTOHL (0x6e675365), - ACE_NTOHL (0x71000000), // name = StringSeq - CORBA::tk_sequence, // typecode kind - 16, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_string, - 0U, // string length - 0U, - -}; - -static CORBA::TypeCode _tc_TAO_tc_CORBA_StringSeq ( - CORBA::tk_alias, - sizeof (_oc_CORBA_StringSeq), - (char *) &_oc_CORBA_StringSeq, - 0, - 0 - ); +// TAO_IDL - Generated from +// be\be_visitor_typecode/typecode_defn.cpp:744 + +static TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy> + _tao_tc_CORBA_StringSeq_0 ( + CORBA::tk_sequence, + &::_tao_tc_CORBA::_tc_string, + 0U); + +static TAO::TypeCode::Alias<char const *, + TAO::Null_RefCount_Policy> + _tao_tc_CORBA_StringSeq ( + "IDL:omg.org/CORBA/StringSeq:1.0", + "StringSeq", + &::_tao_tc_CORBA_StringSeq_0); + namespace CORBA { ::CORBA::TypeCode_ptr const _tc_StringSeq = - &_tc_TAO_tc_CORBA_StringSeq; + &_tao_tc_CORBA_StringSeq; } + + // TAO_IDL - Generated from // be\be_visitor_sequence/any_op_cs.cpp:54 @@ -85,7 +76,7 @@ void operator<<= ( TAO::Any_Dual_Impl_T<CORBA::StringSeq>::insert_copy ( _tao_any, CORBA::StringSeq::_tao_any_destructor, - CORBA::_tc_StringSeq, + CORBA_StringSeq_0, _tao_elem ); } @@ -99,7 +90,7 @@ void operator<<= ( TAO::Any_Dual_Impl_T<CORBA::StringSeq>::insert ( _tao_any, CORBA::StringSeq::_tao_any_destructor, - CORBA::_tc_StringSeq, + CORBA_StringSeq_0, _tao_elem ); } @@ -126,7 +117,7 @@ CORBA::Boolean operator>>= ( TAO::Any_Dual_Impl_T<CORBA::StringSeq>::extract ( _tao_any, CORBA::StringSeq::_tao_any_destructor, - CORBA::_tc_StringSeq, + CORBA_StringSeq_0, _tao_elem ); } diff --git a/TAO/tao/StringSeqC.cpp b/TAO/tao/StringSeqC.cpp index 9d470712e8f..5e9c28f7753 100644 --- a/TAO/tao/StringSeqC.cpp +++ b/TAO/tao/StringSeqC.cpp @@ -170,7 +170,7 @@ return false; #endif /* _TAO_CDR_OP_CORBA_StringSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1619 +// be\be_visitor_root/root.cpp:1528 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/StringSeqC.h b/TAO/tao/StringSeqC.h index cc40bda680b..b3720c0cd2e 100644 --- a/TAO/tao/StringSeqC.h +++ b/TAO/tao/StringSeqC.h @@ -164,7 +164,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_StringSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "StringSeqC.inl" diff --git a/TAO/tao/StringSeqS.h b/TAO/tao/StringSeqS.h index ab0335d7429..17b1360599e 100644 --- a/TAO/tao/StringSeqS.h +++ b/TAO/tao/StringSeqS.h @@ -25,54 +25,4 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from -// be\be_codegen.cpp:390 - -#ifndef _TAO_IDL_ORIG_STRINGSEQS_H_ -#define _TAO_IDL_ORIG_STRINGSEQS_H_ - -#include /**/ "ace/pre.h" - -#include "StringSeqC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option push -w-rvl -w-rch -w-ccc -w-inl -#endif /* __BORLANDC__ */ - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:49 - -namespace POA_CORBA -{ - - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:80 - -} // module CORBA - -// TAO_IDL - Generated from -// be\be_codegen.cpp:997 - - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option pop -#endif /* __BORLANDC__ */ - -#include /**/ "ace/post.h" -#endif /* ifndef */ - +// Skeleton file generation suppressed with command line option -SS diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp index 6127d51663c..66c54fcc65e 100644 --- a/TAO/tao/TAOC.cpp +++ b/TAO/tao/TAOC.cpp @@ -51,7 +51,7 @@ namespace TAO // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:66 +// be\be_visitor_structure/structure_cs.cpp:68 void TAO::BufferingConstraint::_tao_any_destructor ( @@ -236,7 +236,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1619 +// be\be_visitor_root/root.cpp:1528 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/TAOC.h b/TAO/tao/TAOC.h index 699de18453f..055bf504642 100644 --- a/TAO/tao/TAOC.h +++ b/TAO/tao/TAOC.h @@ -345,7 +345,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO::BufferingConst TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::BufferingConstraint &); // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "TAOC.inl" diff --git a/TAO/tao/TAOS.h b/TAO/tao/TAOS.h index 2fe5cb3554b..17b1360599e 100644 --- a/TAO/tao/TAOS.h +++ b/TAO/tao/TAOS.h @@ -25,58 +25,4 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from -// be\be_codegen.cpp:390 - -#ifndef _TAO_IDL_ORIG_TAOS_H_ -#define _TAO_IDL_ORIG_TAOS_H_ - -#include /**/ "ace/pre.h" - -#include "tao/PolicyS.h" -#include "tao/TimeBaseS.h" -#include "tao/Messaging_SyncScopeS.h" -#include "TAOC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option push -w-rvl -w-rch -w-ccc -w-inl -#endif /* __BORLANDC__ */ - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:49 - -namespace POA_TAO -{ - - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:80 - -} // module TAO - -// TAO_IDL - Generated from -// be\be_codegen.cpp:997 - -#include "TAOS_T.h" - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option pop -#endif /* __BORLANDC__ */ - -#include /**/ "ace/post.h" -#endif /* ifndef */ - +// Skeleton file generation suppressed with command line option -SS diff --git a/TAO/tao/TimeBaseC.cpp b/TAO/tao/TimeBaseC.cpp index ba100cc4e7f..7935e3e5d0d 100644 --- a/TAO/tao/TimeBaseC.cpp +++ b/TAO/tao/TimeBaseC.cpp @@ -50,7 +50,7 @@ namespace TAO // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:66 +// be\be_visitor_structure/structure_cs.cpp:68 void TimeBase::UtcT::_tao_any_destructor ( @@ -63,7 +63,7 @@ TimeBase::UtcT::_tao_any_destructor ( } // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:66 +// be\be_visitor_structure/structure_cs.cpp:68 void TimeBase::IntervalT::_tao_any_destructor ( @@ -126,7 +126,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1619 +// be\be_visitor_root/root.cpp:1528 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/TimeBaseC.h b/TAO/tao/TimeBaseC.h index e1e49777394..e67b69d7882 100644 --- a/TAO/tao/TimeBaseC.h +++ b/TAO/tao/TimeBaseC.h @@ -213,7 +213,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TimeBase::IntervalT TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TimeBase::IntervalT &); // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "TimeBaseC.inl" diff --git a/TAO/tao/TimeBaseS.h b/TAO/tao/TimeBaseS.h index e17b9d4feee..17b1360599e 100644 --- a/TAO/tao/TimeBaseS.h +++ b/TAO/tao/TimeBaseS.h @@ -25,55 +25,4 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from -// be\be_codegen.cpp:390 - -#ifndef _TAO_IDL_ORIG_TIMEBASES_H_ -#define _TAO_IDL_ORIG_TIMEBASES_H_ - -#include /**/ "ace/pre.h" - -#include "TimeBaseC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option push -w-rvl -w-rch -w-ccc -w-inl -#endif /* __BORLANDC__ */ - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:49 - -namespace POA_TimeBase -{ - - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:80 - -} // module TimeBase - -// TAO_IDL - Generated from -// be\be_codegen.cpp:999 - -#include "TimeBaseS_T.h" - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option pop -#endif /* __BORLANDC__ */ - -#include /**/ "ace/post.h" -#endif /* ifndef */ - +// Skeleton file generation suppressed with command line option -SS diff --git a/TAO/tao/Typecode_typesC.cpp b/TAO/tao/Typecode_typesC.cpp index 92aac0d9895..4d5afa5e003 100644 --- a/TAO/tao/Typecode_typesC.cpp +++ b/TAO/tao/Typecode_typesC.cpp @@ -52,21 +52,20 @@ namespace TAO // TAO_IDL - Generated from // be\be_visitor_enum/cdr_op_cs.cpp:51 -CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::TCKind &_tao_enumval) +CORBA::Boolean operator<< (TAO_OutputCDR & strm, CORBA::TCKind _tao_enumerator) { - CORBA::ULong _tao_temp = _tao_enumval; - return strm << _tao_temp; + return strm << static_cast<CORBA::ULong> (_tao_enumerator); } -CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::TCKind &_tao_enumval) +CORBA::Boolean operator>> (TAO_InputCDR & strm, CORBA::TCKind & _tao_enumerator) { CORBA::ULong _tao_temp = 0; - CORBA::Boolean _tao_result = strm >> _tao_temp; + CORBA::Boolean const _tao_success = strm >> _tao_temp; - if (_tao_result == 1) + if (_tao_success) { - _tao_enumval = static_cast<CORBA::TCKind> (_tao_temp); + _tao_enumerator = static_cast<CORBA::TCKind> (_tao_temp); } - return _tao_result; + return _tao_success; } diff --git a/TAO/tao/Typecode_typesC.h b/TAO/tao/Typecode_typesC.h index 9bacd563cbe..8cd9bf5bbee 100644 --- a/TAO/tao/Typecode_typesC.h +++ b/TAO/tao/Typecode_typesC.h @@ -142,11 +142,11 @@ namespace TAO // TAO_IDL - Generated from // be\be_visitor_enum/cdr_op_ch.cpp:50 -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::TCKind &); +TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, CORBA::TCKind); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::TCKind &); // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "Typecode_typesC.inl" diff --git a/TAO/tao/Typecode_typesS.h b/TAO/tao/Typecode_typesS.h index d86cfb7c4ee..17b1360599e 100644 --- a/TAO/tao/Typecode_typesS.h +++ b/TAO/tao/Typecode_typesS.h @@ -25,53 +25,4 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from -// be\be_codegen.cpp:389 - -#ifndef _TAO_IDL_ORIG_TYPECODE_TYPESS_H_ -#define _TAO_IDL_ORIG_TYPECODE_TYPESS_H_ - -#include /**/ "ace/pre.h" - -#include "Typecode_typesC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option push -w-rvl -w-rch -w-ccc -w-inl -#endif /* __BORLANDC__ */ - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:49 - -namespace POA_CORBA -{ - - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:80 - -} // module CORBA - -// TAO_IDL - Generated from -// be\be_codegen.cpp:994 - - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option pop -#endif /* __BORLANDC__ */ - -#include /**/ "ace/post.h" -#endif /* ifndef */ - +// Skeleton file generation suppressed with command line option -SS diff --git a/TAO/tao/ULongLongSeqC.cpp b/TAO/tao/ULongLongSeqC.cpp index 1def29c5c38..41426d3e45c 100644 --- a/TAO/tao/ULongLongSeqC.cpp +++ b/TAO/tao/ULongLongSeqC.cpp @@ -161,7 +161,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_ULongLongSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1619 +// be\be_visitor_root/root.cpp:1528 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/ULongLongSeqC.h b/TAO/tao/ULongLongSeqC.h index 78e2dc8afdd..15bdf5ef2d2 100644 --- a/TAO/tao/ULongLongSeqC.h +++ b/TAO/tao/ULongLongSeqC.h @@ -166,7 +166,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_ULongLongSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "ULongLongSeqC.inl" diff --git a/TAO/tao/ULongLongSeqS.h b/TAO/tao/ULongLongSeqS.h index 823320e2f57..17b1360599e 100644 --- a/TAO/tao/ULongLongSeqS.h +++ b/TAO/tao/ULongLongSeqS.h @@ -25,54 +25,4 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from -// be\be_codegen.cpp:390 - -#ifndef _TAO_IDL_ORIG_ULONGLONGSEQS_H_ -#define _TAO_IDL_ORIG_ULONGLONGSEQS_H_ - -#include /**/ "ace/pre.h" - -#include "ULongLongSeqC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option push -w-rvl -w-rch -w-ccc -w-inl -#endif /* __BORLANDC__ */ - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:49 - -namespace POA_CORBA -{ - - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:80 - -} // module CORBA - -// TAO_IDL - Generated from -// be\be_codegen.cpp:997 - - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option pop -#endif /* __BORLANDC__ */ - -#include /**/ "ace/post.h" -#endif /* ifndef */ - +// Skeleton file generation suppressed with command line option -SS diff --git a/TAO/tao/ULongSeqC.cpp b/TAO/tao/ULongSeqC.cpp index deffb84a42c..f1a05d2f97e 100644 --- a/TAO/tao/ULongSeqC.cpp +++ b/TAO/tao/ULongSeqC.cpp @@ -161,7 +161,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_ULongSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1619 +// be\be_visitor_root/root.cpp:1528 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/ULongSeqC.h b/TAO/tao/ULongSeqC.h index f9c931dd470..bf9670e6c76 100644 --- a/TAO/tao/ULongSeqC.h +++ b/TAO/tao/ULongSeqC.h @@ -166,7 +166,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_ULongSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "ULongSeqC.inl" diff --git a/TAO/tao/ULongSeqS.h b/TAO/tao/ULongSeqS.h index 292028c2617..17b1360599e 100644 --- a/TAO/tao/ULongSeqS.h +++ b/TAO/tao/ULongSeqS.h @@ -25,54 +25,4 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from -// be\be_codegen.cpp:390 - -#ifndef _TAO_IDL_ORIG_ULONGSEQS_H_ -#define _TAO_IDL_ORIG_ULONGSEQS_H_ - -#include /**/ "ace/pre.h" - -#include "ULongSeqC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option push -w-rvl -w-rch -w-ccc -w-inl -#endif /* __BORLANDC__ */ - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:49 - -namespace POA_CORBA -{ - - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:80 - -} // module CORBA - -// TAO_IDL - Generated from -// be\be_codegen.cpp:997 - - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option pop -#endif /* __BORLANDC__ */ - -#include /**/ "ace/post.h" -#endif /* ifndef */ - +// Skeleton file generation suppressed with command line option -SS diff --git a/TAO/tao/UShortSeqC.cpp b/TAO/tao/UShortSeqC.cpp index a8e30b3b54b..223d4062dcc 100644 --- a/TAO/tao/UShortSeqC.cpp +++ b/TAO/tao/UShortSeqC.cpp @@ -161,7 +161,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_UShortSeq_CPP_ */ // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1619 +// be\be_visitor_root/root.cpp:1528 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/UShortSeqC.h b/TAO/tao/UShortSeqC.h index c6f408bfc15..28783b3edab 100644 --- a/TAO/tao/UShortSeqC.h +++ b/TAO/tao/UShortSeqC.h @@ -178,7 +178,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_UShortSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "UShortSeqC.inl" diff --git a/TAO/tao/UShortSeqS.h b/TAO/tao/UShortSeqS.h index 4ab4043b33d..17b1360599e 100644 --- a/TAO/tao/UShortSeqS.h +++ b/TAO/tao/UShortSeqS.h @@ -25,54 +25,4 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from -// be\be_codegen.cpp:390 - -#ifndef _TAO_IDL_ORIG_USHORTSEQS_H_ -#define _TAO_IDL_ORIG_USHORTSEQS_H_ - -#include /**/ "ace/pre.h" - -#include "UShortSeqC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option push -w-rvl -w-rch -w-ccc -w-inl -#endif /* __BORLANDC__ */ - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:49 - -namespace POA_CORBA -{ - - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:80 - -} // module CORBA - -// TAO_IDL - Generated from -// be\be_codegen.cpp:997 - - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option pop -#endif /* __BORLANDC__ */ - -#include /**/ "ace/post.h" -#endif /* ifndef */ - +// Skeleton file generation suppressed with command line option -SS diff --git a/TAO/tao/ValueModifierC.h b/TAO/tao/ValueModifierC.h index 7ac3eef1821..a32c3258290 100644 --- a/TAO/tao/ValueModifierC.h +++ b/TAO/tao/ValueModifierC.h @@ -111,7 +111,7 @@ namespace TAO } // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "ValueModifierC.inl" diff --git a/TAO/tao/ValueModifierS.h b/TAO/tao/ValueModifierS.h index 7b3f0169c84..17b1360599e 100644 --- a/TAO/tao/ValueModifierS.h +++ b/TAO/tao/ValueModifierS.h @@ -25,53 +25,4 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from -// be\be_codegen.cpp:390 - -#ifndef _TAO_IDL_ORIG_VALUEMODIFIERS_H_ -#define _TAO_IDL_ORIG_VALUEMODIFIERS_H_ - -#include /**/ "ace/pre.h" - -#include "ValueModifierC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option push -w-rvl -w-rch -w-ccc -w-inl -#endif /* __BORLANDC__ */ - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:49 - -namespace POA_CORBA -{ - - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:80 - -} // module CORBA - -// TAO_IDL - Generated from -// be\be_codegen.cpp:997 - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option pop -#endif /* __BORLANDC__ */ - -#include /**/ "ace/post.h" -#endif /* ifndef */ - +// Skeleton file generation suppressed with command line option -SS diff --git a/TAO/tao/VisibilityC.h b/TAO/tao/VisibilityC.h index b7822f64465..5cd46c11549 100644 --- a/TAO/tao/VisibilityC.h +++ b/TAO/tao/VisibilityC.h @@ -101,7 +101,7 @@ namespace TAO } // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "VisibilityC.inl" diff --git a/TAO/tao/VisibilityS.h b/TAO/tao/VisibilityS.h index 1fbc77d6c1d..17b1360599e 100644 --- a/TAO/tao/VisibilityS.h +++ b/TAO/tao/VisibilityS.h @@ -25,53 +25,4 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from -// be\be_codegen.cpp:390 - -#ifndef _TAO_IDL_ORIG_VISIBILITYS_H_ -#define _TAO_IDL_ORIG_VISIBILITYS_H_ - -#include /**/ "ace/pre.h" - -#include "VisibilityC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option push -w-rvl -w-rch -w-ccc -w-inl -#endif /* __BORLANDC__ */ - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:49 - -namespace POA_CORBA -{ - - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:80 - -} // module CORBA - -// TAO_IDL - Generated from -// be\be_codegen.cpp:997 - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option pop -#endif /* __BORLANDC__ */ - -#include /**/ "ace/post.h" -#endif /* ifndef */ - +// Skeleton file generation suppressed with command line option -SS diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp index f1fde0c6388..f90138af938 100644 --- a/TAO/tao/WrongTransactionC.cpp +++ b/TAO/tao/WrongTransactionC.cpp @@ -31,7 +31,10 @@ #include "WrongTransactionC.h" #include "tao/CDR.h" -#include "tao/Typecode.h" +#include "tao/Null_RefCount_Policy.h" +#include "tao/TypeCode_Constants.h" +#include "tao/Alias_TypeCode.h" +#include "tao/Struct_TypeCode.h" #include "tao/SystemException.h" #include "ace/OS_NS_string.h" @@ -152,52 +155,12 @@ void CORBA::WrongTransaction::_tao_decode ( } // TAO extension - the virtual _type method. -CORBA::TypeCode_ptr CORBA::WrongTransaction::_type (void) const +CORBA::TypeCode_ptr CORBA::WrongTransaction::_tao_type (void) const { return ::CORBA::_tc_WrongTransaction; } // TAO_IDL - Generated from -// be\be_visitor_typecode/typecode_defn.cpp:295 - -static const CORBA::Long _oc_CORBA_WrongTransaction[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 39, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5772), - ACE_NTOHL (0x6f6e6754), - ACE_NTOHL (0x72616e73), - ACE_NTOHL (0x61637469), - ACE_NTOHL (0x6f6e3a31), - ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/WrongTransaction:1.0 - 17, - ACE_NTOHL (0x57726f6e), - ACE_NTOHL (0x67547261), - ACE_NTOHL (0x6e736163), - ACE_NTOHL (0x74696f6e), - ACE_NTOHL (0x0), // name = WrongTransaction - 0, // member count - }; - -static CORBA::TypeCode _tc_TAO_tc_CORBA_WrongTransaction ( - CORBA::tk_except, - sizeof (_oc_CORBA_WrongTransaction), - (char *) &_oc_CORBA_WrongTransaction, - 0, - 0 - ); - -namespace CORBA -{ - ::CORBA::TypeCode_ptr const _tc_WrongTransaction = - &_tc_TAO_tc_CORBA_WrongTransaction; -} - -// TAO_IDL - Generated from // be\be_visitor_exception/cdr_op_cs.cpp:60 CORBA::Boolean operator<< ( @@ -218,7 +181,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1619 +// be\be_visitor_root/root.cpp:1528 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h index e76286449d2..ded0464974e 100644 --- a/TAO/tao/WrongTransactionC.h +++ b/TAO/tao/WrongTransactionC.h @@ -111,7 +111,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:127 - virtual CORBA::TypeCode_ptr _type (void) const; + virtual CORBA::TypeCode_ptr _tao_type (void) const; }; // TAO_IDL - Generated from @@ -149,7 +149,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::WrongTransac TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::WrongTransaction &); // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "WrongTransactionC.inl" diff --git a/TAO/tao/orb_typesC.h b/TAO/tao/orb_typesC.h index 0506d603484..cd41015dda2 100644 --- a/TAO/tao/orb_typesC.h +++ b/TAO/tao/orb_typesC.h @@ -132,7 +132,7 @@ namespace TAO } // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:969 #if defined (__ACE_INLINE__) #include "orb_typesC.inl" diff --git a/TAO/tao/orb_typesS.h b/TAO/tao/orb_typesS.h index 72ed72bbffd..17b1360599e 100644 --- a/TAO/tao/orb_typesS.h +++ b/TAO/tao/orb_typesS.h @@ -25,53 +25,4 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from -// be\be_codegen.cpp:391 - -#ifndef _TAO_IDL_ORIG_ORB_TYPESS_H_ -#define _TAO_IDL_ORIG_ORB_TYPESS_H_ - -#include /**/ "ace/pre.h" - -#include "orb_typesC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/Collocation_Proxy_Broker.h" -#include "tao/PortableServer/PortableServer.h" -#include "tao/PortableServer/Servant_Base.h" - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option push -w-rvl -w-rch -w-ccc -w-inl -#endif /* __BORLANDC__ */ - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:49 - -namespace POA_CORBA -{ - - -// TAO_IDL - Generated from -// be\be_visitor_module/module_sh.cpp:80 - -} // module CORBA - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option pop -#endif /* __BORLANDC__ */ - -#include /**/ "ace/post.h" -#endif /* ifndef */ - +// Skeleton file generation suppressed with command line option -SS |