diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-04-08 08:33:39 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-04-08 08:33:39 +0000 |
commit | 93d9c93972c43a4fb917e7eec3f0e3807b777e1c (patch) | |
tree | 59b2a6594b00191ad1c2b5fd085d5111a8192b56 /TAO/tao | |
parent | b6f759dc77cfd5284c5ea5d1103c9194362da24e (diff) | |
download | ATCD-93d9c93972c43a4fb917e7eec3f0e3807b777e1c.tar.gz |
ChangeLogTag: Fri Apr 8 09:19:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao')
226 files changed, 694 insertions, 2584 deletions
diff --git a/TAO/tao/AnySeq.pidl b/TAO/tao/AnySeq.pidl index 9e4d16d2535..759d7057359 100644 --- a/TAO/tao/AnySeq.pidl +++ b/TAO/tao/AnySeq.pidl @@ -8,7 +8,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Ge 1 -Sc -GT -GA -SS + * -o orig -Ge 1 -Sc -GT -GA -SS -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include="tao/TAO_Export.h" * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/AnySeqA.cpp b/TAO/tao/AnySeqA.cpp index 44db645e9a5..8cfd772e4f2 100644 --- a/TAO/tao/AnySeqA.cpp +++ b/TAO/tao/AnySeqA.cpp @@ -35,18 +35,21 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:914 +// be\be_visitor_typecode/typecode_defn.cpp:925 + +#ifndef _TAO_TYPECODE_CORBA_AnySeq_GUARD +#define _TAO_TYPECODE_CORBA_AnySeq_GUARD namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence<::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> CORBA_AnySeq_0 ( CORBA::tk_sequence, @@ -59,6 +62,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_CORBA_AnySeq_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -77,7 +82,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/AnySeqC.cpp b/TAO/tao/AnySeqC.cpp index c5648d6cfa5..489cfec37d1 100644 --- a/TAO/tao/AnySeqC.cpp +++ b/TAO/tao/AnySeqC.cpp @@ -36,10 +36,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "AnySeqC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/AnySeqC.h b/TAO/tao/AnySeqC.h index f7fbd49fb61..902712ba956 100644 --- a/TAO/tao/AnySeqC.h +++ b/TAO/tao/AnySeqC.h @@ -161,11 +161,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_AnySeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "AnySeqC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/AnySeqC.inl b/TAO/tao/AnySeqC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/AnySeqC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/BooleanSeq.pidl b/TAO/tao/BooleanSeq.pidl index 52758d2bb11..cf297f33c52 100644 --- a/TAO/tao/BooleanSeq.pidl +++ b/TAO/tao/BooleanSeq.pidl @@ -8,7 +8,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Ge 1 -Sc -GT -GA -SS + * -o orig -Ge 1 -Sc -GT -GA -SS -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include=TAO_Export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/BooleanSeqA.cpp b/TAO/tao/BooleanSeqA.cpp index 8974e950429..95acbca7217 100644 --- a/TAO/tao/BooleanSeqA.cpp +++ b/TAO/tao/BooleanSeqA.cpp @@ -35,18 +35,21 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:914 +// be\be_visitor_typecode/typecode_defn.cpp:925 + +#ifndef _TAO_TYPECODE_CORBA_BooleanSeq_GUARD +#define _TAO_TYPECODE_CORBA_BooleanSeq_GUARD namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence<::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> CORBA_BooleanSeq_0 ( CORBA::tk_sequence, @@ -59,6 +62,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_CORBA_BooleanSeq_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -77,7 +82,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/BooleanSeqC.cpp b/TAO/tao/BooleanSeqC.cpp index d11a87d5977..f1b008a0e16 100644 --- a/TAO/tao/BooleanSeqC.cpp +++ b/TAO/tao/BooleanSeqC.cpp @@ -36,10 +36,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "BooleanSeqC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/BooleanSeqC.h b/TAO/tao/BooleanSeqC.h index 3c0538ed7a7..3e0c0e88b5d 100644 --- a/TAO/tao/BooleanSeqC.h +++ b/TAO/tao/BooleanSeqC.h @@ -159,11 +159,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_BooleanSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "BooleanSeqC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/BooleanSeqC.inl b/TAO/tao/BooleanSeqC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/BooleanSeqC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/Bounds.pidl b/TAO/tao/Bounds.pidl index b7c6005f87f..11edf510e37 100644 --- a/TAO/tao/Bounds.pidl +++ b/TAO/tao/Bounds.pidl @@ -10,7 +10,7 @@ * following command: * * tao_idl - * -o orig -Ge 1 -GT -GA -Sc + * -o orig -Ge 1 -GT -GA -Sc -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include=TAO_Export.h * -Wb,pre_include="ace/pre.h" @@ -19,7 +19,7 @@ * * and then: * - * cp orig/BoundsC.{h,inl,cpp} . + * cp orig/BoundsC.{h,cpp} . * */ #ifndef TAO_CORBA_BOUNDS_PIDL diff --git a/TAO/tao/BoundsA.cpp b/TAO/tao/BoundsA.cpp index 3d4c292fdc2..c9fe8083e22 100644 --- a/TAO/tao/BoundsA.cpp +++ b/TAO/tao/BoundsA.cpp @@ -35,7 +35,7 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_CORBA_Bounds = 0; static TAO::TypeCode::Struct<char const *, @@ -59,7 +59,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_exception/any_op_cs.cpp:50 +// be\be_visitor_exception/any_op_cs.cpp:50 template<> CORBA::Boolean diff --git a/TAO/tao/BoundsC.cpp b/TAO/tao/BoundsC.cpp index 750b351b0dd..dad43d70a55 100644 --- a/TAO/tao/BoundsC.cpp +++ b/TAO/tao/BoundsC.cpp @@ -31,10 +31,6 @@ #include "BoundsC.h" #include "tao/CDR.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" @@ -42,10 +38,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "BoundsC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/BoundsC.h b/TAO/tao/BoundsC.h index 6027f08959d..7514ed4a34f 100644 --- a/TAO/tao/BoundsC.h +++ b/TAO/tao/BoundsC.h @@ -142,11 +142,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Bounds &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Bounds &); // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "BoundsC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/BoundsC.inl b/TAO/tao/BoundsC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/BoundsC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/CONV_FRAME.pidl b/TAO/tao/CONV_FRAME.pidl index af10d3a2c49..71be3e3db60 100644 --- a/TAO/tao/CONV_FRAME.pidl +++ b/TAO/tao/CONV_FRAME.pidl @@ -3,11 +3,11 @@ * * $Id$ * - * This file is used to generate CONV_FRAMEC.{h,inl,cpp}, using the + * This file is used to generate CONV_FRAMEC.{h,cpp}, using the * following command: * * tao_idl - * -o orig -Ge 1 -GT -GA -SS + * -o orig -Ge 1 -GT -GA -SS -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include="tao/TAO_Export.h" * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/CONV_FRAMEA.cpp b/TAO/tao/CONV_FRAMEA.cpp index 5069cf70d68..55c1a34b093 100644 --- a/TAO/tao/CONV_FRAMEA.cpp +++ b/TAO/tao/CONV_FRAMEA.cpp @@ -36,7 +36,7 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, @@ -56,18 +56,21 @@ namespace CONV_FRAME // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:914 +// be\be_visitor_typecode/typecode_defn.cpp:925 + +#ifndef _TAO_TYPECODE_CONV_FRAME_CodeSetIdSeq_GUARD +#define _TAO_TYPECODE_CONV_FRAME_CodeSetIdSeq_GUARD namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence<::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> CONV_FRAME_CodeSetIdSeq_0 ( CORBA::tk_sequence, @@ -80,6 +83,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_CONV_FRAME_CodeSetIdSeq_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -98,7 +103,7 @@ namespace CONV_FRAME // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CONV_FRAME_CodeSetComponent[] = { @@ -127,7 +132,7 @@ namespace CONV_FRAME // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CONV_FRAME_CodeSetComponentInfo[] = { @@ -156,7 +161,7 @@ namespace CONV_FRAME // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CONV_FRAME_CodeSetContext[] = { @@ -185,7 +190,7 @@ namespace CONV_FRAME // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -243,7 +248,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -301,7 +306,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -359,7 +364,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/CONV_FRAMEC.cpp b/TAO/tao/CONV_FRAMEC.cpp index c07691d0ca6..9019859fa8f 100644 --- a/TAO/tao/CONV_FRAMEC.cpp +++ b/TAO/tao/CONV_FRAMEC.cpp @@ -36,10 +36,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "CONV_FRAMEC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 @@ -103,7 +99,7 @@ void CONV_FRAME::CodeSetIdSeq::_tao_any_destructor ( #endif /* end #if !defined */ // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:68 +// be\be_visitor_structure/structure_cs.cpp:66 void CONV_FRAME::CodeSetComponent::_tao_any_destructor ( @@ -116,7 +112,7 @@ CONV_FRAME::CodeSetComponent::_tao_any_destructor ( } // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:68 +// be\be_visitor_structure/structure_cs.cpp:66 void CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor ( @@ -129,7 +125,7 @@ CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor ( } // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:68 +// be\be_visitor_structure/structure_cs.cpp:66 void CONV_FRAME::CodeSetContext::_tao_any_destructor ( diff --git a/TAO/tao/CONV_FRAMEC.h b/TAO/tao/CONV_FRAMEC.h index 6af8922cd57..a6b5768314f 100644 --- a/TAO/tao/CONV_FRAMEC.h +++ b/TAO/tao/CONV_FRAMEC.h @@ -315,11 +315,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:947 - -#if defined (__ACE_INLINE__) -#include "CONV_FRAMEC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/CONV_FRAMEC.inl b/TAO/tao/CONV_FRAMEC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/CONV_FRAMEC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/CharSeq.pidl b/TAO/tao/CharSeq.pidl index 742a2deedac..8e1c62f4c18 100644 --- a/TAO/tao/CharSeq.pidl +++ b/TAO/tao/CharSeq.pidl @@ -8,7 +8,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Ge 1 -Sc -GT -GA -SS + * -o orig -Ge 1 -Sc -GT -GA -SS -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include=tao/TAO_Export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/CharSeqA.cpp b/TAO/tao/CharSeqA.cpp index 404a4051bc8..c11513b000f 100644 --- a/TAO/tao/CharSeqA.cpp +++ b/TAO/tao/CharSeqA.cpp @@ -35,18 +35,21 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:914 +// be\be_visitor_typecode/typecode_defn.cpp:925 + +#ifndef _TAO_TYPECODE_CORBA_CharSeq_GUARD +#define _TAO_TYPECODE_CORBA_CharSeq_GUARD namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence<::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> CORBA_CharSeq_0 ( CORBA::tk_sequence, @@ -59,6 +62,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_CORBA_CharSeq_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -77,7 +82,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/CharSeqC.cpp b/TAO/tao/CharSeqC.cpp index e8e6f665acc..ece0d0441d9 100644 --- a/TAO/tao/CharSeqC.cpp +++ b/TAO/tao/CharSeqC.cpp @@ -36,10 +36,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "CharSeqC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/CharSeqC.h b/TAO/tao/CharSeqC.h index cc38b649cc9..512f13e85ee 100644 --- a/TAO/tao/CharSeqC.h +++ b/TAO/tao/CharSeqC.h @@ -159,11 +159,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_CharSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "CharSeqC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/CharSeqC.inl b/TAO/tao/CharSeqC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/CharSeqC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/Current.pidl b/TAO/tao/Current.pidl index d2bdc8d9dc3..3ac4e4a1ffe 100644 --- a/TAO/tao/Current.pidl +++ b/TAO/tao/Current.pidl @@ -11,7 +11,7 @@ // // = DESCRIPTION // -// This file was used to generate the code in CurrentC.{h,inl,cpp}. +// This file was used to generate the code in CurrentC.{h,cpp}. // // The steps to regenerate the code are as follows: // @@ -19,7 +19,7 @@ // command used for this is: // // tao_idl.exe -// -o orig -Gp -Gd -Ge 1 -GT -GA -Sc -SS +// -o orig -Gp -Gd -Ge 1 -GT -GA -Sc -SS -Sci // -Wb,export_macro=TAO_Export // -Wb,export_include="tao/TAO_Export.h" // -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/CurrentA.cpp b/TAO/tao/CurrentA.cpp index c384360e38d..c2ffeb5ec2d 100644 --- a/TAO/tao/CurrentA.cpp +++ b/TAO/tao/CurrentA.cpp @@ -35,7 +35,7 @@ #include "tao/Any_Impl_T.h" // TAO_IDL - Generated from -// be\be_visitor_typecode/objref_typecode.cpp:73 +// be\be_visitor_typecode/objref_typecode.cpp:76 static TAO::TypeCode::Objref<char const *, CORBA::tk_local_interface, diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp index 1b33e0c1c99..204e0508966 100644 --- a/TAO/tao/CurrentC.cpp +++ b/TAO/tao/CurrentC.cpp @@ -37,10 +37,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "CurrentC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h index a50c0407f89..11276496126 100644 --- a/TAO/tao/CurrentC.h +++ b/TAO/tao/CurrentC.h @@ -197,11 +197,7 @@ TAO_Export void operator<<= (CORBA::Any &, CORBA::Current_ptr *); // non-copying TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Current_ptr &); // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "CurrentC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/CurrentC.inl b/TAO/tao/CurrentC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/CurrentC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/DomainA.cpp b/TAO/tao/DomainA.cpp index b11020d1124..3c2695d49f1 100644 --- a/TAO/tao/DomainA.cpp +++ b/TAO/tao/DomainA.cpp @@ -37,7 +37,7 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:73 +// be\be_visitor_typecode/objref_typecode.cpp:76 static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, @@ -55,7 +55,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:73 +// be\be_visitor_typecode/objref_typecode.cpp:76 static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, @@ -73,18 +73,21 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:914 +// be\be_visitor_typecode/typecode_defn.cpp:925 + +#ifndef _TAO_TYPECODE_CORBA_DomainManagerList_GUARD +#define _TAO_TYPECODE_CORBA_DomainManagerList_GUARD namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence<::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> CORBA_DomainManagerList_0 ( CORBA::tk_sequence, @@ -97,6 +100,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_CORBA_DomainManagerList_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -115,7 +120,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:50 +// be\be_visitor_interface/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -170,7 +175,7 @@ operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:50 +// be\be_visitor_interface/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -225,7 +230,7 @@ operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp index e72746b103d..a9facc1b01f 100644 --- a/TAO/tao/DomainC.cpp +++ b/TAO/tao/DomainC.cpp @@ -100,7 +100,7 @@ namespace TAO #define _CORBA_POLICY__ARG_TRAITS_CS_ template<> - class TAO_Export Arg_Traits<CORBA::Policy> + class Arg_Traits<CORBA::Policy> : public Object_Arg_Traits_T< CORBA::Policy_ptr, @@ -117,7 +117,7 @@ namespace TAO #define _CORBA_INTERFACEDEF__ARG_TRAITS_CS_ template<> - class TAO_Export Arg_Traits<CORBA::InterfaceDef> + class Arg_Traits<CORBA::InterfaceDef> : public Object_Arg_Traits_T< CORBA::InterfaceDef_ptr, diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h index 23cea895aab..31617fc936c 100644 --- a/TAO/tao/DomainC.h +++ b/TAO/tao/DomainC.h @@ -513,7 +513,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_DomainManagerList_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:947 +// be\be_codegen.cpp:955 #if defined (__ACE_INLINE__) #include "DomainC.inl" diff --git a/TAO/tao/DoubleSeq.pidl b/TAO/tao/DoubleSeq.pidl index f354b03c74e..e407b911680 100644 --- a/TAO/tao/DoubleSeq.pidl +++ b/TAO/tao/DoubleSeq.pidl @@ -8,7 +8,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Ge 1 -Sc -GT -GA -SS + * -o orig -Ge 1 -Sc -GT -GA -SS -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include="tao/TAO_Export.h" * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/DoubleSeqA.cpp b/TAO/tao/DoubleSeqA.cpp index 5b2fabdaf3e..f68319cf469 100644 --- a/TAO/tao/DoubleSeqA.cpp +++ b/TAO/tao/DoubleSeqA.cpp @@ -35,18 +35,21 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:914 +// be\be_visitor_typecode/typecode_defn.cpp:925 + +#ifndef _TAO_TYPECODE_CORBA_DoubleSeq_GUARD +#define _TAO_TYPECODE_CORBA_DoubleSeq_GUARD namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence<::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> CORBA_DoubleSeq_0 ( CORBA::tk_sequence, @@ -59,6 +62,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_CORBA_DoubleSeq_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -77,7 +82,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/DoubleSeqC.cpp b/TAO/tao/DoubleSeqC.cpp index beac4f164d8..947d59ace03 100644 --- a/TAO/tao/DoubleSeqC.cpp +++ b/TAO/tao/DoubleSeqC.cpp @@ -36,10 +36,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "DoubleSeqC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/DoubleSeqC.h b/TAO/tao/DoubleSeqC.h index 85c233047fb..bdca2234c0a 100644 --- a/TAO/tao/DoubleSeqC.h +++ b/TAO/tao/DoubleSeqC.h @@ -159,11 +159,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_DoubleSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "DoubleSeqC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/DoubleSeqC.inl b/TAO/tao/DoubleSeqC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/DoubleSeqC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/Dynamic.pidl b/TAO/tao/Dynamic.pidl index 34d1e4e51ef..59ba5f6f554 100644 --- a/TAO/tao/Dynamic.pidl +++ b/TAO/tao/Dynamic.pidl @@ -10,7 +10,7 @@ * used to generate code is: * * tao_idl - * -o orig -Ge 1 -GT -GA -Sc -SS + * -o orig -Ge 1 -GT -GA -Sc -SS -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include="tao/TAO_Export.h" * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/DynamicA.cpp b/TAO/tao/DynamicA.cpp index 56c03505f1a..9c7f7be9aa2 100644 --- a/TAO/tao/DynamicA.cpp +++ b/TAO/tao/DynamicA.cpp @@ -36,18 +36,21 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:914 +// be\be_visitor_typecode/typecode_defn.cpp:925 + +#ifndef _TAO_TYPECODE_Dynamic_ParameterList_GUARD +#define _TAO_TYPECODE_Dynamic_ParameterList_GUARD namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence<::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> Dynamic_ParameterList_0 ( CORBA::tk_sequence, @@ -60,6 +63,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_Dynamic_ParameterList_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -78,7 +83,7 @@ namespace Dynamic // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, @@ -98,18 +103,21 @@ namespace Dynamic // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:914 +// be\be_visitor_typecode/typecode_defn.cpp:925 + +#ifndef _TAO_TYPECODE_Dynamic_ExceptionList_GUARD +#define _TAO_TYPECODE_Dynamic_ExceptionList_GUARD namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence<::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> Dynamic_ExceptionList_0 ( CORBA::tk_sequence, @@ -122,6 +130,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_Dynamic_ExceptionList_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -140,7 +150,7 @@ namespace Dynamic // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, @@ -160,7 +170,7 @@ namespace Dynamic // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -218,7 +228,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/DynamicC.cpp b/TAO/tao/DynamicC.cpp index e01d54ee368..287806e962c 100644 --- a/TAO/tao/DynamicC.cpp +++ b/TAO/tao/DynamicC.cpp @@ -36,10 +36,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "DynamicC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/DynamicC.h b/TAO/tao/DynamicC.h index 75729e8f80b..3d5227472f9 100644 --- a/TAO/tao/DynamicC.h +++ b/TAO/tao/DynamicC.h @@ -271,11 +271,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_Dynamic_ExceptionList_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "DynamicC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/DynamicC.inl b/TAO/tao/DynamicC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/DynamicC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/Dynamic_Parameter.pidl b/TAO/tao/Dynamic_Parameter.pidl index 8ddaff3fcea..593a3c89c15 100644 --- a/TAO/tao/Dynamic_Parameter.pidl +++ b/TAO/tao/Dynamic_Parameter.pidl @@ -10,7 +10,7 @@ * used to generate code is: * * tao_idl - * -o orig -Ge 1 -GT -GA -Sc + * -o orig -Ge 1 -GT -GA -Sc -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include="tao/TAO_Export.h" * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/Dynamic_ParameterA.cpp b/TAO/tao/Dynamic_ParameterA.cpp index 56113f76675..3ceab7553b4 100644 --- a/TAO/tao/Dynamic_ParameterA.cpp +++ b/TAO/tao/Dynamic_ParameterA.cpp @@ -35,7 +35,7 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_Dynamic_Parameter[] = { @@ -64,7 +64,7 @@ namespace Dynamic // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/Dynamic_ParameterC.cpp b/TAO/tao/Dynamic_ParameterC.cpp index 96a36ffa108..ff17cd6117b 100644 --- a/TAO/tao/Dynamic_ParameterC.cpp +++ b/TAO/tao/Dynamic_ParameterC.cpp @@ -36,10 +36,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "Dynamic_ParameterC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 @@ -50,7 +46,7 @@ namespace TAO // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:68 +// be\be_visitor_structure/structure_cs.cpp:66 void Dynamic::Parameter::_tao_any_destructor ( diff --git a/TAO/tao/Dynamic_ParameterC.h b/TAO/tao/Dynamic_ParameterC.h index 485bfdf9c8e..167d49100a6 100644 --- a/TAO/tao/Dynamic_ParameterC.h +++ b/TAO/tao/Dynamic_ParameterC.h @@ -132,11 +132,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:947 - -#if defined (__ACE_INLINE__) -#include "Dynamic_ParameterC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/Dynamic_ParameterC.inl b/TAO/tao/Dynamic_ParameterC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/Dynamic_ParameterC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/FloatSeq.pidl b/TAO/tao/FloatSeq.pidl index 51177483b07..81356d97a36 100644 --- a/TAO/tao/FloatSeq.pidl +++ b/TAO/tao/FloatSeq.pidl @@ -9,7 +9,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Ge 1 -Sc -GT -GA -SS + * -o orig -Ge 1 -Sc -GT -GA -SS -Sci * -Wb,export_include=tao/TAO_Export.h * -Wb,export_macro=TAO_Export * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/FloatSeqA.cpp b/TAO/tao/FloatSeqA.cpp index 587a7582077..98f7882b217 100644 --- a/TAO/tao/FloatSeqA.cpp +++ b/TAO/tao/FloatSeqA.cpp @@ -35,18 +35,21 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:914 +// be\be_visitor_typecode/typecode_defn.cpp:925 + +#ifndef _TAO_TYPECODE_CORBA_FloatSeq_GUARD +#define _TAO_TYPECODE_CORBA_FloatSeq_GUARD namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence<::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> CORBA_FloatSeq_0 ( CORBA::tk_sequence, @@ -59,6 +62,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_CORBA_FloatSeq_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -77,7 +82,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/FloatSeqC.cpp b/TAO/tao/FloatSeqC.cpp index 8098d13e131..b480d423c3d 100644 --- a/TAO/tao/FloatSeqC.cpp +++ b/TAO/tao/FloatSeqC.cpp @@ -36,10 +36,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "FloatSeqC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/FloatSeqC.h b/TAO/tao/FloatSeqC.h index e13f51e6b2a..138b90bb1db 100644 --- a/TAO/tao/FloatSeqC.h +++ b/TAO/tao/FloatSeqC.h @@ -159,11 +159,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_FloatSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "FloatSeqC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/FloatSeqC.inl b/TAO/tao/FloatSeqC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/FloatSeqC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/GIOPA.cpp b/TAO/tao/GIOPA.cpp index 31bfb3a32ba..e992a6dd10d 100644 --- a/TAO/tao/GIOPA.cpp +++ b/TAO/tao/GIOPA.cpp @@ -39,7 +39,7 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, @@ -59,7 +59,7 @@ namespace GIOP // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_GIOP_Version[] = { @@ -88,7 +88,7 @@ namespace GIOP // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_GIOP_IORAddressingInfo[] = { @@ -117,7 +117,7 @@ namespace GIOP // TAO_IDL - Generated from -// be/be_visitor_typecode/union_typecode.cpp:29 +// be\be_visitor_typecode/union_typecode.cpp:47 static TAO::TypeCode::Non_Default_Case<CORBA::Short, char const *, CORBA::TypeCode_ptr const *> const _tao_cases_GIOP_TargetAddress_0 (0, "object_key", &CORBA::_tc_OctetSeq); static TAO::TypeCode::Non_Default_Case<CORBA::Short, char const *, CORBA::TypeCode_ptr const *> const _tao_cases_GIOP_TargetAddress_1 (1, "profile", &IOP::_tc_TaggedProfile); @@ -152,7 +152,7 @@ namespace GIOP // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -210,7 +210,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -268,7 +268,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_union/any_op_cs.cpp:54 +// be\be_visitor_union/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/GIOPC.cpp b/TAO/tao/GIOPC.cpp index 64bc0196e73..ca5d90168a7 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:68 +// be\be_visitor_structure/structure_cs.cpp:66 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:68 +// be\be_visitor_structure/structure_cs.cpp:66 void GIOP::IORAddressingInfo::_tao_any_destructor ( diff --git a/TAO/tao/GIOPC.h b/TAO/tao/GIOPC.h index e8b1dff20ef..0d2c912f920 100644 --- a/TAO/tao/GIOPC.h +++ b/TAO/tao/GIOPC.h @@ -311,7 +311,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:947 +// be\be_codegen.cpp:955 #if defined (__ACE_INLINE__) #include "GIOPC.inl" diff --git a/TAO/tao/IIOP.pidl b/TAO/tao/IIOP.pidl index c7d73dba4fd..d8c1bd93585 100644 --- a/TAO/tao/IIOP.pidl +++ b/TAO/tao/IIOP.pidl @@ -8,7 +8,7 @@ // is: // // tao_idl \ -// -o orig -Gp -Gd -Ge 1 -GT -GA -Sc +// -o orig -Gp -Gd -Ge 1 -GT -GA -Sc -Sci // -Wb,export_macro=TAO_Export \ // -Wb,export_include="tao/TAO_Export.h" \ // -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/IIOPA.cpp b/TAO/tao/IIOPA.cpp index 4e90ad85afe..e559501a99b 100644 --- a/TAO/tao/IIOPA.cpp +++ b/TAO/tao/IIOPA.cpp @@ -37,7 +37,7 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_IIOP_ListenPoint[] = { @@ -66,18 +66,21 @@ namespace IIOP // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:914 +// be\be_visitor_typecode/typecode_defn.cpp:925 + +#ifndef _TAO_TYPECODE_IIOP_ListenPointList_GUARD +#define _TAO_TYPECODE_IIOP_ListenPointList_GUARD namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence<::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> IIOP_ListenPointList_0 ( CORBA::tk_sequence, @@ -90,6 +93,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_IIOP_ListenPointList_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -108,7 +113,7 @@ namespace IIOP // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_IIOP_BiDirIIOPServiceContext[] = { @@ -136,7 +141,7 @@ namespace IIOP // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -194,7 +199,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -252,7 +257,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/IIOPC.cpp b/TAO/tao/IIOPC.cpp index e6914de4112..5f3b96bd374 100644 --- a/TAO/tao/IIOPC.cpp +++ b/TAO/tao/IIOPC.cpp @@ -36,10 +36,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "IIOPC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 @@ -50,7 +46,7 @@ namespace TAO // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:68 +// be\be_visitor_structure/structure_cs.cpp:66 void IIOP::ListenPoint::_tao_any_destructor ( @@ -116,7 +112,7 @@ void IIOP::ListenPointList::_tao_any_destructor ( #endif /* end #if !defined */ // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:68 +// be\be_visitor_structure/structure_cs.cpp:66 void IIOP::BiDirIIOPServiceContext::_tao_any_destructor ( diff --git a/TAO/tao/IIOPC.h b/TAO/tao/IIOPC.h index 5503cb0dfc3..d45b4723289 100644 --- a/TAO/tao/IIOPC.h +++ b/TAO/tao/IIOPC.h @@ -257,11 +257,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:947 - -#if defined (__ACE_INLINE__) -#include "IIOPC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/IIOPC.inl b/TAO/tao/IIOPC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/IIOPC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/IIOP_Endpoints.pidl b/TAO/tao/IIOP_Endpoints.pidl index beec93cd805..6ff06647f39 100644 --- a/TAO/tao/IIOP_Endpoints.pidl +++ b/TAO/tao/IIOP_Endpoints.pidl @@ -23,7 +23,7 @@ // is: // // tao_idl -// -o orig -Ge 1 -GT -GA -Sc \ +// -o orig -Ge 1 -GT -GA -Sc -Sci \ // -Wb,export_macro=TAO_Export \ // -Wb,export_include="tao/TAO_Export.h" \ // -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/IIOP_EndpointsA.cpp b/TAO/tao/IIOP_EndpointsA.cpp index 4d172c01757..8e7c34bf4a9 100644 --- a/TAO/tao/IIOP_EndpointsA.cpp +++ b/TAO/tao/IIOP_EndpointsA.cpp @@ -37,7 +37,7 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_TAO_IIOP_Endpoint_Info[] = { @@ -67,18 +67,21 @@ namespace TAO // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:914 +// be\be_visitor_typecode/typecode_defn.cpp:925 + +#ifndef _TAO_TYPECODE_TAO_IIOPEndpointSequence_GUARD +#define _TAO_TYPECODE_TAO_IIOPEndpointSequence_GUARD namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence<::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> TAO_IIOPEndpointSequence_0 ( CORBA::tk_sequence, @@ -91,6 +94,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_TAO_IIOPEndpointSequence_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -109,7 +114,7 @@ namespace TAO // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -167,7 +172,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/IIOP_EndpointsC.cpp b/TAO/tao/IIOP_EndpointsC.cpp index ceda7c4d237..7c9efb09171 100644 --- a/TAO/tao/IIOP_EndpointsC.cpp +++ b/TAO/tao/IIOP_EndpointsC.cpp @@ -36,10 +36,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "IIOP_EndpointsC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 @@ -50,7 +46,7 @@ namespace TAO // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:68 +// be\be_visitor_structure/structure_cs.cpp:66 void TAO::IIOP_Endpoint_Info::_tao_any_destructor ( diff --git a/TAO/tao/IIOP_EndpointsC.h b/TAO/tao/IIOP_EndpointsC.h index 599b2affc7c..b5a2eabc01f 100644 --- a/TAO/tao/IIOP_EndpointsC.h +++ b/TAO/tao/IIOP_EndpointsC.h @@ -210,11 +210,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_TAO_IIOPEndpointSequence_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "IIOP_EndpointsC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/IIOP_EndpointsC.inl b/TAO/tao/IIOP_EndpointsC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/IIOP_EndpointsC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/IOP.pidl b/TAO/tao/IOP.pidl index 166831ddea7..7e70877a9ca 100644 --- a/TAO/tao/IOP.pidl +++ b/TAO/tao/IOP.pidl @@ -6,11 +6,11 @@ * * @brief Pre-compiled IDL source for the IOP module. * - * This file is used to generate IOPC.{h,inl,cpp}, using the following + * This file is used to generate IOPC.{h,cpp}, using the following * command: * * tao_idl.exe - * -o orig -St -Sp -Ge 1 -SS + * -o orig -St -Sp -Ge 1 -SS -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include="tao/TAO_Export.h" * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp index ca2aaea88c1..b16ffbbd190 100644 --- a/TAO/tao/IOPC.cpp +++ b/TAO/tao/IOPC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:302 +// be\be_codegen.cpp:291 #include "IOPC.h" @@ -36,10 +36,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "IOPC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/IOPC.h b/TAO/tao/IOPC.h index d41b23bebfc..d3c72b56aa9 100644 --- a/TAO/tao/IOPC.h +++ b/TAO/tao/IOPC.h @@ -52,13 +52,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -#if defined (TAO_EXPORT_NESTED_CLASSES) -# if defined (TAO_EXPORT_NESTED_MACRO) -# undef TAO_EXPORT_NESTED_MACRO -# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO TAO_Export -#endif /* TAO_EXPORT_NESTED_CLASSES */ - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) @@ -77,11 +70,7 @@ namespace TAO } // TAO_IDL - Generated from -// be\be_codegen.cpp:969 - -#if defined (__ACE_INLINE__) -#include "IOPC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/IOPC.inl b/TAO/tao/IOPC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/IOPC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/IOP_Codec.pidl b/TAO/tao/IOP_Codec.pidl index d42f03ebabd..539552bb024 100644 --- a/TAO/tao/IOP_Codec.pidl +++ b/TAO/tao/IOP_Codec.pidl @@ -7,11 +7,11 @@ * * @brief Pre-compiled IDL source for the IOP module. * - * This file is used to generate IOPC.{h,inl,cpp}, using the following + * This file is used to generate IOPC.{h,cpp}, using the following * command: * * tao_idl.exe - * -o orig -Gp -Gd -Ge 1 -GT -GA -Sc -SS + * -o orig -Gp -Gd -Ge 1 -GT -GA -Sc -SS -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include=tao/TAO_Export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/IOP_CodecA.cpp b/TAO/tao/IOP_CodecA.cpp index eb18071eac1..7e7bd017605 100644 --- a/TAO/tao/IOP_CodecA.cpp +++ b/TAO/tao/IOP_CodecA.cpp @@ -37,7 +37,7 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_IOP_Codec_InvalidTypeForEncoding = 0; static TAO::TypeCode::Struct<char const *, @@ -56,7 +56,7 @@ static TAO::TypeCode::Struct<char const *, &_tao_tc_IOP_Codec_InvalidTypeForEncoding; // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_IOP_Codec_FormatMismatch = 0; static TAO::TypeCode::Struct<char const *, @@ -75,7 +75,7 @@ static TAO::TypeCode::Struct<char const *, &_tao_tc_IOP_Codec_FormatMismatch; // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_IOP_Codec_TypeMismatch = 0; static TAO::TypeCode::Struct<char const *, @@ -94,7 +94,7 @@ static TAO::TypeCode::Struct<char const *, &_tao_tc_IOP_Codec_TypeMismatch; // TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:73 +// be\be_visitor_typecode/objref_typecode.cpp:76 static TAO::TypeCode::Objref<char const *, CORBA::tk_local_interface, @@ -112,7 +112,7 @@ namespace IOP // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, @@ -132,7 +132,7 @@ namespace IOP // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_IOP_Encoding[] = { @@ -162,7 +162,7 @@ namespace IOP // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_IOP_CodecFactory_UnknownEncoding = 0; static TAO::TypeCode::Struct<char const *, @@ -181,7 +181,7 @@ static TAO::TypeCode::Struct<char const *, &_tao_tc_IOP_CodecFactory_UnknownEncoding; // TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:73 +// be\be_visitor_typecode/objref_typecode.cpp:76 static TAO::TypeCode::Objref<char const *, CORBA::tk_local_interface, @@ -199,7 +199,7 @@ namespace IOP // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:50 +// be\be_visitor_interface/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -268,7 +268,7 @@ operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_exception/any_op_cs.cpp:50 +// be\be_visitor_exception/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -340,7 +340,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_exception/any_op_cs.cpp:50 +// be\be_visitor_exception/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -412,7 +412,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_exception/any_op_cs.cpp:50 +// be\be_visitor_exception/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -484,7 +484,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -542,7 +542,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:50 +// be\be_visitor_interface/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -611,7 +611,7 @@ operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_exception/any_op_cs.cpp:50 +// be\be_visitor_exception/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -681,79 +681,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class - TAO::Any_Dual_Impl_T< - IOP::Codec::InvalidTypeForEncoding - >; - - template class - TAO::Any_Dual_Impl_T< - IOP::Codec::FormatMismatch - >; - - template class - TAO::Any_Dual_Impl_T< - IOP::Codec::TypeMismatch - >; - - template class - TAO::Any_Impl_T< - IOP::Codec - >; - - template class - TAO::Any_Dual_Impl_T< - IOP::Encoding - >; - - template class - TAO::Any_Dual_Impl_T< - IOP::CodecFactory::UnknownEncoding - >; - - template class - TAO::Any_Impl_T< - IOP::CodecFactory - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - IOP::Codec::InvalidTypeForEncoding \ - > - -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - IOP::Codec::FormatMismatch \ - > - -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - IOP::Codec::TypeMismatch \ - > - -# pragma instantiate \ - TAO::Any_Impl_T< \ - IOP::Codec \ - > - -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - IOP::Encoding \ - > - -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - IOP::CodecFactory::UnknownEncoding \ - > - -# pragma instantiate \ - TAO::Any_Impl_T< \ - IOP::CodecFactory \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/IOP_CodecC.cpp b/TAO/tao/IOP_CodecC.cpp index c2014cb4550..c20eb02a233 100644 --- a/TAO/tao/IOP_CodecC.cpp +++ b/TAO/tao/IOP_CodecC.cpp @@ -26,27 +26,18 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:302 +// be\be_codegen.cpp:291 #include "IOP_CodecC.h" #include "tao/CDR.h" #include "tao/ORB_Core.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__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "IOP_CodecC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 @@ -483,7 +474,7 @@ IOP::Codec::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:68 +// be\be_visitor_structure/structure_cs.cpp:66 void IOP::Encoding::_tao_any_destructor ( diff --git a/TAO/tao/IOP_CodecC.h b/TAO/tao/IOP_CodecC.h index c2dbf5db5b0..acfdd752d85 100644 --- a/TAO/tao/IOP_CodecC.h +++ b/TAO/tao/IOP_CodecC.h @@ -59,13 +59,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -#if defined (TAO_EXPORT_NESTED_CLASSES) -# if defined (TAO_EXPORT_NESTED_MACRO) -# undef TAO_EXPORT_NESTED_MACRO -# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO TAO_Export -#endif /* TAO_EXPORT_NESTED_CLASSES */ - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) @@ -75,17 +68,6 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// TAO_IDL - Generated from -// be\be_visitor_root/root_ch.cpp:62 - -namespace TAO -{ - class Collocation_Proxy_Broker; - - template<typename T> class Narrow_Utils; - template<typename T> class AbstractBase_Narrow_Utils; -} - // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 @@ -379,7 +361,7 @@ namespace IOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Codec; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Codec; // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:379 @@ -390,7 +372,7 @@ namespace IOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_EncodingFormat; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_EncodingFormat; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -428,7 +410,7 @@ namespace IOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Encoding; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Encoding; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -579,7 +561,7 @@ namespace IOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_CodecFactory; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_CodecFactory; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -697,11 +679,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:969 - -#if defined (__ACE_INLINE__) -#include "IOP_CodecC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/IOP_CodecC.inl b/TAO/tao/IOP_CodecC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/IOP_CodecC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/IOP_IOR.pidl b/TAO/tao/IOP_IOR.pidl index 4e4ab6e3e0b..ba193658e13 100644 --- a/TAO/tao/IOP_IOR.pidl +++ b/TAO/tao/IOP_IOR.pidl @@ -6,11 +6,11 @@ * * @brief Pre-compiled IDL source for the IOP module. * - * This file is used to generate IOPC.{h,inl,cpp}, using the following + * This file is used to generate IOPC.{h,cpp}, using the following * command: * * tao_idl.exe - * -o orig -Gp -Gd -Ge 1 -GT -GA -Sc -SS + * -o orig -Gp -Gd -Ge 1 -GT -GA -Sc -SS -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include=tao/TAO_Export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/IOP_IORA.cpp b/TAO/tao/IOP_IORA.cpp index e4683a8a995..86672f9af7e 100644 --- a/TAO/tao/IOP_IORA.cpp +++ b/TAO/tao/IOP_IORA.cpp @@ -37,7 +37,7 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, @@ -57,7 +57,7 @@ namespace IOP // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_IOP_TaggedProfile[] = { @@ -86,18 +86,21 @@ namespace IOP // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:914 +// be\be_visitor_typecode/typecode_defn.cpp:925 + +#ifndef _TAO_TYPECODE_IOP_TaggedProfileSeq_GUARD +#define _TAO_TYPECODE_IOP_TaggedProfileSeq_GUARD namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence<::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> IOP_TaggedProfileSeq_0 ( CORBA::tk_sequence, @@ -110,6 +113,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_IOP_TaggedProfileSeq_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -128,7 +133,7 @@ namespace IOP // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_IOP_IOR[] = { @@ -157,7 +162,7 @@ namespace IOP // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, @@ -177,7 +182,7 @@ namespace IOP // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_IOP_TaggedComponent[] = { @@ -206,18 +211,21 @@ namespace IOP // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:914 +// be\be_visitor_typecode/typecode_defn.cpp:925 + +#ifndef _TAO_TYPECODE_IOP_MultipleComponentProfile_GUARD +#define _TAO_TYPECODE_IOP_MultipleComponentProfile_GUARD namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence<::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> IOP_MultipleComponentProfile_0 ( CORBA::tk_sequence, @@ -230,6 +238,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_IOP_MultipleComponentProfile_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -248,18 +258,21 @@ namespace IOP // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:914 +// be\be_visitor_typecode/typecode_defn.cpp:925 + +#ifndef _TAO_TYPECODE_IOP_TaggedComponentList_GUARD +#define _TAO_TYPECODE_IOP_TaggedComponentList_GUARD namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence<::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> IOP_TaggedComponentList_0 ( CORBA::tk_sequence, @@ -272,6 +285,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_IOP_TaggedComponentList_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -290,18 +305,21 @@ namespace IOP // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:914 +// be\be_visitor_typecode/typecode_defn.cpp:925 + +#ifndef _TAO_TYPECODE_IOP_TaggedComponentSeq_GUARD +#define _TAO_TYPECODE_IOP_TaggedComponentSeq_GUARD namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence<::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> IOP_TaggedComponentSeq_0 ( CORBA::tk_sequence, @@ -314,6 +332,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_IOP_TaggedComponentSeq_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -332,7 +352,7 @@ namespace IOP // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, @@ -352,7 +372,7 @@ namespace IOP // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_IOP_ServiceContext[] = { @@ -381,18 +401,21 @@ namespace IOP // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:914 +// be\be_visitor_typecode/typecode_defn.cpp:925 + +#ifndef _TAO_TYPECODE_IOP_ServiceContextList_GUARD +#define _TAO_TYPECODE_IOP_ServiceContextList_GUARD namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence<::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> IOP_ServiceContextList_0 ( CORBA::tk_sequence, @@ -405,6 +428,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_IOP_ServiceContextList_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -423,7 +448,7 @@ namespace IOP // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -481,7 +506,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -539,7 +564,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -597,7 +622,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -655,7 +680,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -713,7 +738,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -771,7 +796,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -829,7 +854,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -887,7 +912,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/IOP_IORC.cpp b/TAO/tao/IOP_IORC.cpp index 10d3d8af60c..0ea2b6ab190 100644 --- a/TAO/tao/IOP_IORC.cpp +++ b/TAO/tao/IOP_IORC.cpp @@ -37,10 +37,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "IOP_IORC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 @@ -51,7 +47,7 @@ namespace TAO // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:68 +// be\be_visitor_structure/structure_cs.cpp:66 void IOP::TaggedProfile::_tao_any_destructor ( @@ -117,7 +113,7 @@ void IOP::TaggedProfileSeq::_tao_any_destructor ( #endif /* end #if !defined */ // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:68 +// be\be_visitor_structure/structure_cs.cpp:66 void IOP::IOR::_tao_any_destructor ( @@ -130,7 +126,7 @@ IOP::IOR::_tao_any_destructor ( } // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:68 +// be\be_visitor_structure/structure_cs.cpp:66 void IOP::TaggedComponent::_tao_any_destructor ( @@ -302,7 +298,7 @@ void IOP::TaggedComponentSeq::_tao_any_destructor ( #endif /* end #if !defined */ // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:68 +// be\be_visitor_structure/structure_cs.cpp:66 void IOP::ServiceContext::_tao_any_destructor ( diff --git a/TAO/tao/IOP_IORC.h b/TAO/tao/IOP_IORC.h index 4b1b136570a..87615aadc7a 100644 --- a/TAO/tao/IOP_IORC.h +++ b/TAO/tao/IOP_IORC.h @@ -858,11 +858,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_IOP_ServiceContextList_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "IOP_IORC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/IOP_IORC.inl b/TAO/tao/IOP_IORC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/IOP_IORC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/LongDoubleSeq.pidl b/TAO/tao/LongDoubleSeq.pidl index c33edf5d79f..863d32bfc70 100644 --- a/TAO/tao/LongDoubleSeq.pidl +++ b/TAO/tao/LongDoubleSeq.pidl @@ -8,7 +8,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Ge 1 -Sc -GT -GA -SS + * -o orig -Ge 1 -Sc -GT -GA -SS -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include="tao/TAO_Export.h" * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/LongDoubleSeqA.cpp b/TAO/tao/LongDoubleSeqA.cpp index b88bb579eac..83761f2a7af 100644 --- a/TAO/tao/LongDoubleSeqA.cpp +++ b/TAO/tao/LongDoubleSeqA.cpp @@ -35,18 +35,21 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:914 +// be\be_visitor_typecode/typecode_defn.cpp:925 + +#ifndef _TAO_TYPECODE_CORBA_LongDoubleSeq_GUARD +#define _TAO_TYPECODE_CORBA_LongDoubleSeq_GUARD namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence<::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> CORBA_LongDoubleSeq_0 ( CORBA::tk_sequence, @@ -59,6 +62,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_CORBA_LongDoubleSeq_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -77,7 +82,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/LongDoubleSeqC.cpp b/TAO/tao/LongDoubleSeqC.cpp index 532bbad43f8..8d9edfee0cf 100644 --- a/TAO/tao/LongDoubleSeqC.cpp +++ b/TAO/tao/LongDoubleSeqC.cpp @@ -36,10 +36,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "LongDoubleSeqC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/LongDoubleSeqC.h b/TAO/tao/LongDoubleSeqC.h index e235ac46325..e97bc61a628 100644 --- a/TAO/tao/LongDoubleSeqC.h +++ b/TAO/tao/LongDoubleSeqC.h @@ -159,11 +159,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_LongDoubleSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "LongDoubleSeqC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/LongDoubleSeqC.inl b/TAO/tao/LongDoubleSeqC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/LongDoubleSeqC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/LongLongSeq.pidl b/TAO/tao/LongLongSeq.pidl index 3f4c00441cd..10ff1028236 100644 --- a/TAO/tao/LongLongSeq.pidl +++ b/TAO/tao/LongLongSeq.pidl @@ -8,7 +8,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Ge 1 -Sc -GT -GA -SS + * -o orig -Ge 1 -Sc -GT -GA -SS -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include="tao/TAO_Export.h" * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/LongLongSeqA.cpp b/TAO/tao/LongLongSeqA.cpp index 497b99e0ba3..7a38945e1ec 100644 --- a/TAO/tao/LongLongSeqA.cpp +++ b/TAO/tao/LongLongSeqA.cpp @@ -35,18 +35,21 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:914 +// be\be_visitor_typecode/typecode_defn.cpp:925 + +#ifndef _TAO_TYPECODE_CORBA_LongLongSeq_GUARD +#define _TAO_TYPECODE_CORBA_LongLongSeq_GUARD namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence<::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> CORBA_LongLongSeq_0 ( CORBA::tk_sequence, @@ -59,6 +62,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_CORBA_LongLongSeq_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -77,7 +82,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/LongLongSeqC.cpp b/TAO/tao/LongLongSeqC.cpp index 3b546b9ac72..fd347d37225 100644 --- a/TAO/tao/LongLongSeqC.cpp +++ b/TAO/tao/LongLongSeqC.cpp @@ -36,10 +36,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "LongLongSeqC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/LongLongSeqC.h b/TAO/tao/LongLongSeqC.h index 47486ecabc7..2f4e5c88a90 100644 --- a/TAO/tao/LongLongSeqC.h +++ b/TAO/tao/LongLongSeqC.h @@ -159,11 +159,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_LongLongSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "LongLongSeqC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/LongLongSeqC.inl b/TAO/tao/LongLongSeqC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/LongLongSeqC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/LongSeq.pidl b/TAO/tao/LongSeq.pidl index c9a8603897f..dffd81862bb 100644 --- a/TAO/tao/LongSeq.pidl +++ b/TAO/tao/LongSeq.pidl @@ -8,7 +8,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Ge 1 -Sc -GT -GA -SS + * -o orig -Ge 1 -Sc -GT -GA -SS -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include=TAO_Export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/LongSeqA.cpp b/TAO/tao/LongSeqA.cpp index 70148ee5ab2..ad023224a23 100644 --- a/TAO/tao/LongSeqA.cpp +++ b/TAO/tao/LongSeqA.cpp @@ -35,18 +35,21 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:914 +// be\be_visitor_typecode/typecode_defn.cpp:925 + +#ifndef _TAO_TYPECODE_CORBA_LongSeq_GUARD +#define _TAO_TYPECODE_CORBA_LongSeq_GUARD namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence<::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> CORBA_LongSeq_0 ( CORBA::tk_sequence, @@ -59,6 +62,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_CORBA_LongSeq_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -77,7 +82,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/LongSeqC.cpp b/TAO/tao/LongSeqC.cpp index 70a4389c083..498c46bf345 100644 --- a/TAO/tao/LongSeqC.cpp +++ b/TAO/tao/LongSeqC.cpp @@ -36,10 +36,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "LongSeqC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/LongSeqC.h b/TAO/tao/LongSeqC.h index 94e2db6295c..fc3622c3d4c 100644 --- a/TAO/tao/LongSeqC.h +++ b/TAO/tao/LongSeqC.h @@ -159,11 +159,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_LongSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "LongSeqC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/LongSeqC.inl b/TAO/tao/LongSeqC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/LongSeqC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/Messaging_PolicyValue.pidl b/TAO/tao/Messaging_PolicyValue.pidl index cfb4fc047fc..c8a9fe5d07c 100644 --- a/TAO/tao/Messaging_PolicyValue.pidl +++ b/TAO/tao/Messaging_PolicyValue.pidl @@ -4,12 +4,12 @@ * * $Id$ * - * This file was used to generate the code in Messaging_PolicyValueC.{h,inl,cpp} + * This file was used to generate the code in Messaging_PolicyValueC.{h,cpp} * * The command used to generate code from this file is: * * tao_idl.exe - * -o orig -Ge 1 -GT -GA -Sc + * -o orig -Ge 1 -GT -GA -Sc -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include=tao/TAO_Export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/Messaging_PolicyValueA.cpp b/TAO/tao/Messaging_PolicyValueA.cpp index 83e3187fd22..c88b832f868 100644 --- a/TAO/tao/Messaging_PolicyValueA.cpp +++ b/TAO/tao/Messaging_PolicyValueA.cpp @@ -37,7 +37,7 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_Messaging_PolicyValue[] = { @@ -66,18 +66,21 @@ namespace Messaging // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:914 +// be\be_visitor_typecode/typecode_defn.cpp:925 + +#ifndef _TAO_TYPECODE_Messaging_PolicyValueSeq_GUARD +#define _TAO_TYPECODE_Messaging_PolicyValueSeq_GUARD namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence<::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> Messaging_PolicyValueSeq_0 ( CORBA::tk_sequence, @@ -90,6 +93,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_Messaging_PolicyValueSeq_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -108,7 +113,7 @@ namespace Messaging // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -166,7 +171,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/Messaging_PolicyValueC.cpp b/TAO/tao/Messaging_PolicyValueC.cpp index 98102c4f261..ad5f52c29f5 100644 --- a/TAO/tao/Messaging_PolicyValueC.cpp +++ b/TAO/tao/Messaging_PolicyValueC.cpp @@ -37,10 +37,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "Messaging_PolicyValueC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 @@ -51,7 +47,7 @@ namespace TAO // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:68 +// be\be_visitor_structure/structure_cs.cpp:66 void Messaging::PolicyValue::_tao_any_destructor ( diff --git a/TAO/tao/Messaging_PolicyValueC.h b/TAO/tao/Messaging_PolicyValueC.h index a86f7991114..7859abe173f 100644 --- a/TAO/tao/Messaging_PolicyValueC.h +++ b/TAO/tao/Messaging_PolicyValueC.h @@ -222,11 +222,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_Messaging_PolicyValueSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "Messaging_PolicyValueC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/Messaging_PolicyValueC.inl b/TAO/tao/Messaging_PolicyValueC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/Messaging_PolicyValueC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/Messaging_SyncScope.pidl b/TAO/tao/Messaging_SyncScope.pidl index 1340cb3249c..cbc536b4c42 100644 --- a/TAO/tao/Messaging_SyncScope.pidl +++ b/TAO/tao/Messaging_SyncScope.pidl @@ -9,7 +9,7 @@ * The command used to generate code from this file is: * * tao_idl.exe - * -o orig -St -Sc + * -o orig -St -Sc -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include=tao/TAO_Export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/Messaging_SyncScopeC.cpp b/TAO/tao/Messaging_SyncScopeC.cpp index 5b8befade77..78f81d090d7 100644 --- a/TAO/tao/Messaging_SyncScopeC.cpp +++ b/TAO/tao/Messaging_SyncScopeC.cpp @@ -36,10 +36,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "Messaging_SyncScopeC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/Messaging_SyncScopeC.h b/TAO/tao/Messaging_SyncScopeC.h index 41abdf14137..b0b77a1eb5f 100644 --- a/TAO/tao/Messaging_SyncScopeC.h +++ b/TAO/tao/Messaging_SyncScopeC.h @@ -104,11 +104,7 @@ namespace TAO } // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "Messaging_SyncScopeC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/Messaging_SyncScopeC.inl b/TAO/tao/Messaging_SyncScopeC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/Messaging_SyncScopeC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/ObjectIdList.pidl b/TAO/tao/ObjectIdList.pidl index a31b395821c..5276b6076f1 100644 --- a/TAO/tao/ObjectIdList.pidl +++ b/TAO/tao/ObjectIdList.pidl @@ -14,7 +14,7 @@ * command used for this is: * * tao_idl.exe - * -o orig -Sa -Ge 1 -GT -GA + * -o orig -Sa -Ge 1 -GT -GA -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include="tao/TAO_Export.h" * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/ObjectIdListA.cpp b/TAO/tao/ObjectIdListA.cpp index f4c49a3a7cc..240b5ffc42d 100644 --- a/TAO/tao/ObjectIdListA.cpp +++ b/TAO/tao/ObjectIdListA.cpp @@ -31,12 +31,9 @@ #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/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, @@ -56,18 +53,21 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:914 +// be\be_visitor_typecode/typecode_defn.cpp:925 + +#ifndef _TAO_TYPECODE_CORBA_ORB_ObjectIdList_GUARD +#define _TAO_TYPECODE_CORBA_ORB_ObjectIdList_GUARD namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence<::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> CORBA_ORB_ObjectIdList_0 ( CORBA::tk_sequence, @@ -80,6 +80,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_CORBA_ORB_ObjectIdList_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -97,76 +99,8 @@ namespace CORBA -// TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 - -// Copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - const CORBA::ORB_ObjectIdList &_tao_elem - ) -{ - TAO::Any_Dual_Impl_T<CORBA::ORB_ObjectIdList>::insert_copy ( - _tao_any, - CORBA::ORB_ObjectIdList::_tao_any_destructor, - TAO::TypeCode::tc_CORBA_ORB_ObjectIdList_0, - _tao_elem - ); -} - -// Non-copying insertion. -void operator<<= ( - CORBA::Any &_tao_any, - CORBA::ORB_ObjectIdList *_tao_elem - ) -{ - TAO::Any_Dual_Impl_T<CORBA::ORB_ObjectIdList>::insert ( - _tao_any, - CORBA::ORB_ObjectIdList::_tao_any_destructor, - TAO::TypeCode::tc_CORBA_ORB_ObjectIdList_0, - _tao_elem - ); -} - -// Extraction to non-const pointer (deprecated). -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - CORBA::ORB_ObjectIdList *&_tao_elem - ) -{ - return _tao_any >>= const_cast< - const CORBA::ORB_ObjectIdList *&> ( - _tao_elem - ); -} - -// Extraction to const pointer. -CORBA::Boolean operator>>= ( - const CORBA::Any &_tao_any, - const CORBA::ORB_ObjectIdList *&_tao_elem - ) -{ - return - TAO::Any_Dual_Impl_T<CORBA::ORB_ObjectIdList>::extract ( - _tao_any, - CORBA::ORB_ObjectIdList::_tao_any_destructor, - TAO::TypeCode::tc_CORBA_ORB_ObjectIdList_0, - _tao_elem - ); -} - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class - TAO::Any_Dual_Impl_T< - CORBA::ORB_ObjectIdList - >; - #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate \ - TAO::Any_Dual_Impl_T< \ - CORBA::ORB_ObjectIdList \ - > - #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/ObjectIdListC.cpp b/TAO/tao/ObjectIdListC.cpp index c8097e80245..0b1f1cc767f 100644 --- a/TAO/tao/ObjectIdListC.cpp +++ b/TAO/tao/ObjectIdListC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be/be_codegen.cpp:302 +// be\be_codegen.cpp:291 #include "ObjectIdListC.h" @@ -36,12 +36,8 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "ObjectIdListC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from -// be/be_visitor_arg_traits.cpp:69 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -50,7 +46,7 @@ namespace TAO // TAO_IDL - Generated from -// be/be_visitor_sequence/sequence_cs.cpp:65 +// be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_CORBA_ORB_OBJECTIDLIST_CS_) #define _CORBA_ORB_OBJECTIDLIST_CS_ @@ -85,19 +81,10 @@ CORBA::ORB_ObjectIdList::ORB_ObjectIdList ( CORBA::ORB_ObjectIdList::~ORB_ObjectIdList (void) {} -void CORBA::ORB_ObjectIdList::_tao_any_destructor ( - void * _tao_void_pointer - ) -{ - ORB_ObjectIdList * _tao_tmp_pointer = - static_cast<ORB_ObjectIdList *> (_tao_void_pointer); - delete _tao_tmp_pointer; -} - #endif /* end #if !defined */ // TAO_IDL - Generated from -// be/be_visitor_sequence/cdr_op_cs.cpp:96 +// be\be_visitor_sequence/cdr_op_cs.cpp:96 #if !defined _TAO_CDR_OP_CORBA_ORB_ObjectIdList_CPP_ #define _TAO_CDR_OP_CORBA_ORB_ObjectIdList_CPP_ @@ -170,7 +157,7 @@ return false; #endif /* _TAO_CDR_OP_CORBA_ORB_ObjectIdList_CPP_ */ // TAO_IDL - Generated from -// be/be_visitor_root/root.cpp:1528 +// 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 c78dcd703b9..0d745305ed4 100644 --- a/TAO/tao/ObjectIdListC.h +++ b/TAO/tao/ObjectIdListC.h @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be/be_codegen.cpp:153 +// be\be_codegen.cpp:153 #ifndef _TAO_IDL_ORIG_OBJECTIDLISTC_H_ #define _TAO_IDL_ORIG_OBJECTIDLISTC_H_ @@ -52,13 +52,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -#if defined (TAO_EXPORT_NESTED_CLASSES) -# if defined (TAO_EXPORT_NESTED_MACRO) -# undef TAO_EXPORT_NESTED_MACRO -# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO TAO_Export -#endif /* TAO_EXPORT_NESTED_CLASSES */ - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) @@ -69,25 +62,25 @@ #endif /* __BORLANDC__ */ // TAO_IDL - Generated from -// be/be_visitor_module/module_ch.cpp:48 +// be\be_visitor_module/module_ch.cpp:48 namespace CORBA { // TAO_IDL - Generated from - // be/be_visitor_typedef/typedef_ch.cpp:413 + // be\be_visitor_typedef/typedef_ch.cpp:413 typedef char * ORB_ObjectId; typedef CORBA::String_var ORB_ObjectId_var; typedef CORBA::String_out ORB_ObjectId_out; // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:44 + // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ORB_ObjectId; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ORB_ObjectId; // TAO_IDL - Generated from - // be/be_visitor_sequence/sequence_ch.cpp:101 + // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_CORBA_ORB_OBJECTIDLIST_CH_) #define _CORBA_ORB_OBJECTIDLIST_CH_ @@ -125,25 +118,23 @@ namespace CORBA ORB_ObjectIdList (const ORB_ObjectIdList &); ~ORB_ObjectIdList (void); - static void _tao_any_destructor (void *); - typedef ORB_ObjectIdList_var _var_type; }; #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:44 + // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ORB_ObjectIdList; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ORB_ObjectIdList; // TAO_IDL - Generated from -// be/be_visitor_module/module_ch.cpp:66 +// be\be_visitor_module/module_ch.cpp:66 } // module CORBA // TAO_IDL - Generated from -// be/be_visitor_traits.cpp:59 +// be\be_visitor_traits.cpp:59 // Traits specializations. namespace TAO @@ -151,15 +142,7 @@ namespace TAO } // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_ch.cpp:52 - -TAO_Export void operator<<= (CORBA::Any &, const CORBA::ORB_ObjectIdList &); // copying version -TAO_Export void operator<<= (CORBA::Any &, CORBA::ORB_ObjectIdList*); // noncopying version -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ORB_ObjectIdList *&); // deprecated -TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ORB_ObjectIdList *&); - -// TAO_IDL - Generated from -// be/be_visitor_sequence/cdr_op_ch.cpp:71 +// be\be_visitor_sequence/cdr_op_ch.cpp:71 #if !defined _TAO_CDR_OP_CORBA_ORB_ObjectIdList_H_ #define _TAO_CDR_OP_CORBA_ORB_ObjectIdList_H_ @@ -176,11 +159,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_ORB_ObjectIdList_H_ */ // TAO_IDL - Generated from -// be/be_codegen.cpp:969 - -#if defined (__ACE_INLINE__) -#include "ObjectIdListC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/ObjectIdListC.inl b/TAO/tao/ObjectIdListC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/ObjectIdListC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/Object_Key.pidl b/TAO/tao/Object_Key.pidl index 59bcb1ec683..83a3e77d19a 100644 --- a/TAO/tao/Object_Key.pidl +++ b/TAO/tao/Object_Key.pidl @@ -6,7 +6,7 @@ // The command used to generate code is: // // tao_idl -// -o orig -Ge 1 -St -GT -Gp -Gd -Sc +// -o orig -Ge 1 -St -GT -Gp -Gd -Sc -Sci // -Wb,export_macro=TAO_Export // -Wb,export_macro="tao/TAO_Export" // -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp index 1b7a63d6c31..d531a3b2088 100644 --- a/TAO/tao/Object_KeyC.cpp +++ b/TAO/tao/Object_KeyC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:302 +// be\be_codegen.cpp:291 #include "Object_KeyC.h" @@ -37,10 +37,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "Object_KeyC.inl" -#endif /* !defined INLINE */ - #include "ace/ACE.h" #include "ace/OS_NS_string.h" #include "ace/os_include/os_ctype.h" diff --git a/TAO/tao/Object_KeyC.h b/TAO/tao/Object_KeyC.h index 73fcc712e48..5fb144de4a7 100644 --- a/TAO/tao/Object_KeyC.h +++ b/TAO/tao/Object_KeyC.h @@ -52,13 +52,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -#if defined (TAO_EXPORT_NESTED_CLASSES) -# if defined (TAO_EXPORT_NESTED_MACRO) -# undef TAO_EXPORT_NESTED_MACRO -# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO TAO_Export -#endif /* TAO_EXPORT_NESTED_CLASSES */ - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) @@ -178,11 +171,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_TAO_ObjectKey_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:969 - -#if defined (__ACE_INLINE__) -#include "Object_KeyC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/Object_KeyC.inl b/TAO/tao/Object_KeyC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/Object_KeyC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/OctetSeq.pidl b/TAO/tao/OctetSeq.pidl index 6d45ca31aec..02d7be26f40 100644 --- a/TAO/tao/OctetSeq.pidl +++ b/TAO/tao/OctetSeq.pidl @@ -8,7 +8,7 @@ // The command used to generate code is: // // tao_idl -// -o orig -Ge 1 -GT -GA -Sc -SS +// -o orig -Ge 1 -GT -GA -Sc -SS -Sci // -Wb,export_macro=TAO_Export // -Wb,pre_include="ace/pre.h" // -Wb,post_include="ace/post.h" diff --git a/TAO/tao/OctetSeqA.cpp b/TAO/tao/OctetSeqA.cpp index 8a3a1d31cae..e2e818aa507 100644 --- a/TAO/tao/OctetSeqA.cpp +++ b/TAO/tao/OctetSeqA.cpp @@ -35,18 +35,21 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:914 +// be\be_visitor_typecode/typecode_defn.cpp:925 + +#ifndef _TAO_TYPECODE_CORBA_OctetSeq_GUARD +#define _TAO_TYPECODE_CORBA_OctetSeq_GUARD namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence<::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> CORBA_OctetSeq_0 ( CORBA::tk_sequence, @@ -59,6 +62,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_CORBA_OctetSeq_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -77,7 +82,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/OctetSeqC.cpp b/TAO/tao/OctetSeqC.cpp index 91cf74942f7..e655113d7b4 100644 --- a/TAO/tao/OctetSeqC.cpp +++ b/TAO/tao/OctetSeqC.cpp @@ -37,10 +37,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "OctetSeqC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/OctetSeqC.h b/TAO/tao/OctetSeqC.h index c7f139af3eb..57d39255847 100644 --- a/TAO/tao/OctetSeqC.h +++ b/TAO/tao/OctetSeqC.h @@ -179,11 +179,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_OctetSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "OctetSeqC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/OctetSeqC.inl b/TAO/tao/OctetSeqC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/OctetSeqC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/PI_Forward.pidl b/TAO/tao/PI_Forward.pidl index 2c5915f1b0b..fe2e6f97149 100644 --- a/TAO/tao/PI_Forward.pidl +++ b/TAO/tao/PI_Forward.pidl @@ -8,11 +8,11 @@ * @brief Pre-compiled IDL source for typedefs in the * PortableInterceptor module. * - * This file is used to generate PI_Forward.{h,inl,cpp}, + * This file is used to generate PI_Forward.{h,cpp}, * using the following command: * * tao_idl.exe - * -o orig -Gp -Gd -Ge 1 -GT -Sc + * -o orig -Gp -Gd -Ge 1 -GT -Sc -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include=tao/TAO_Export.h * -Wb,pre_include="ace/pre.h" @@ -21,9 +21,9 @@ * * and then: * - * cp orig/PI_ForwardC.{h,inl,cpp} . + * cp orig/PI_ForwardC.{h,cpp} . * - * The code left in PI_ForwardC.{h,inl,cpp} + * The code left in PI_ForwardC.{h,cpp} * */ diff --git a/TAO/tao/PI_ForwardC.cpp b/TAO/tao/PI_ForwardC.cpp index 569e65ce67c..22dc6792513 100644 --- a/TAO/tao/PI_ForwardC.cpp +++ b/TAO/tao/PI_ForwardC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be/be_codegen.cpp:291 +// be\be_codegen.cpp:291 #include "PI_ForwardC.h" @@ -41,12 +41,8 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "PI_ForwardC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from -// be/be_visitor_arg_traits.cpp:69 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -55,7 +51,7 @@ namespace TAO // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, @@ -75,7 +71,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, @@ -95,7 +91,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, @@ -115,7 +111,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, @@ -135,7 +131,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, @@ -155,7 +151,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, @@ -175,7 +171,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from -// be/be_visitor_root/root.cpp:1528 +// 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 6412eccfbe2..29523430231 100644 --- a/TAO/tao/PI_ForwardC.h +++ b/TAO/tao/PI_ForwardC.h @@ -151,11 +151,7 @@ namespace TAO } // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "PI_ForwardC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/PI_ForwardC.inl b/TAO/tao/PI_ForwardC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/PI_ForwardC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/ParameterMode.pidl b/TAO/tao/ParameterMode.pidl index d793063b961..f172607baf2 100644 --- a/TAO/tao/ParameterMode.pidl +++ b/TAO/tao/ParameterMode.pidl @@ -10,7 +10,7 @@ * used to generate code is: * * tao_idl - * -o orig -Ge 1 -GA -GT -Sc -SS + * -o orig -Ge 1 -GA -GT -Sc -SS -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include="tao/TAO_Export.h" * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/ParameterModeA.cpp b/TAO/tao/ParameterModeA.cpp index 2b90d3a4a38..f0dd4c1a282 100644 --- a/TAO/tao/ParameterModeA.cpp +++ b/TAO/tao/ParameterModeA.cpp @@ -35,7 +35,7 @@ #include "tao/Any_Basic_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/enum_typecode.cpp:34 +// be\be_visitor_typecode/enum_typecode.cpp:34 static char const * const _tao_enumerators_CORBA_ParameterMode[] = { @@ -63,7 +63,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_enum/any_op_cs.cpp:52 +// be\be_visitor_enum/any_op_cs.cpp:52 void operator<<= ( CORBA::Any &_tao_any, @@ -89,19 +89,3 @@ CORBA::Boolean operator>>= ( _tao_elem ); } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - - template class - TAO::Any_Basic_Impl_T< - CORBA::ParameterMode - >; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -# pragma instantiate \ - TAO::Any_Basic_Impl_T< \ - CORBA::ParameterMode \ - > - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/ParameterModeC.cpp b/TAO/tao/ParameterModeC.cpp index 6a26f486832..2c438c1a24d 100644 --- a/TAO/tao/ParameterModeC.cpp +++ b/TAO/tao/ParameterModeC.cpp @@ -36,10 +36,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "ParameterModeC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/ParameterModeC.h b/TAO/tao/ParameterModeC.h index b785d3c7e9f..a7eee507600 100644 --- a/TAO/tao/ParameterModeC.h +++ b/TAO/tao/ParameterModeC.h @@ -107,11 +107,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, CORBA::ParameterMode); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ParameterMode &); // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "ParameterModeC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/ParameterModeC.inl b/TAO/tao/ParameterModeC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/ParameterModeC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/PolicyA.cpp b/TAO/tao/PolicyA.cpp index 08458a84762..becfe23fdad 100644 --- a/TAO/tao/PolicyA.cpp +++ b/TAO/tao/PolicyA.cpp @@ -37,7 +37,7 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, @@ -57,7 +57,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_PolicyError[] = { @@ -85,7 +85,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_InvalidPolicies[] = { @@ -113,7 +113,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:73 +// be\be_visitor_typecode/objref_typecode.cpp:76 static TAO::TypeCode::Objref<char const *, CORBA::tk_objref, @@ -131,7 +131,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:73 +// be\be_visitor_typecode/objref_typecode.cpp:76 static TAO::TypeCode::Objref<char const *, CORBA::tk_local_interface, @@ -149,7 +149,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:73 +// be\be_visitor_typecode/objref_typecode.cpp:76 static TAO::TypeCode::Objref<char const *, CORBA::tk_local_interface, @@ -167,7 +167,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_exception/any_op_cs.cpp:50 +// be\be_visitor_exception/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -252,7 +252,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_exception/any_op_cs.cpp:50 +// be\be_visitor_exception/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -337,7 +337,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:50 +// be\be_visitor_interface/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -392,7 +392,7 @@ operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:50 +// be\be_visitor_interface/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -461,7 +461,7 @@ operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:50 +// be\be_visitor_interface/any_op_cs.cpp:50 template<> CORBA::Boolean diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp index 61a5faad048..e277bf0df85 100644 --- a/TAO/tao/PolicyC.cpp +++ b/TAO/tao/PolicyC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:302 +// be\be_codegen.cpp:291 #include "PolicyC.h" @@ -34,11 +34,6 @@ #include "tao/Exception_Data.h" #include "tao/Invocation_Adapter.h" #include "tao/Object_T.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" @@ -62,7 +57,7 @@ namespace TAO #define _CORBA_POLICY__ARG_TRAITS_CS_ template<> - class TAO_Export Arg_Traits<CORBA::Policy> + class Arg_Traits<CORBA::Policy> : public Object_Arg_Traits_T< CORBA::Policy_ptr, diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h index 093addccca8..df3d9516a65 100644 --- a/TAO/tao/PolicyC.h +++ b/TAO/tao/PolicyC.h @@ -56,13 +56,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -#if defined (TAO_EXPORT_NESTED_CLASSES) -# if defined (TAO_EXPORT_NESTED_MACRO) -# undef TAO_EXPORT_NESTED_MACRO -# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO TAO_Export -#endif /* TAO_EXPORT_NESTED_CLASSES */ - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) @@ -78,9 +71,7 @@ namespace TAO { class Collocation_Proxy_Broker; - template<typename T> class Narrow_Utils; - template<typename T> class AbstractBase_Narrow_Utils; } // TAO_IDL - Generated from @@ -98,7 +89,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_PolicyErrorCode; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyErrorCode; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -179,7 +170,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_PolicyError; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyError; #endif /* end #if !defined */ @@ -237,7 +228,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_InvalidPolicies; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_InvalidPolicies; #endif /* end #if !defined */ @@ -388,7 +379,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Policy; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Policy; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -501,7 +492,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_PolicyManager; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyManager; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -591,7 +582,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_PolicyCurrent; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyCurrent; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -736,7 +727,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:969 +// be\be_codegen.cpp:955 #if defined (__ACE_INLINE__) #include "PolicyC.inl" diff --git a/TAO/tao/Policy_Forward.pidl b/TAO/tao/Policy_Forward.pidl index fefe0460baa..f928069ddf7 100644 --- a/TAO/tao/Policy_Forward.pidl +++ b/TAO/tao/Policy_Forward.pidl @@ -9,7 +9,7 @@ * Policy-related types. * * This file is used to generate the code in - * Policy_ForwardC.{h,inl,cpp}. + * Policy_ForwardC.{h,cpp}. * * The steps to regenerate the code are as follows: * @@ -17,7 +17,7 @@ * command used for this is: * * tao_idl.exe - * -o orig -Ge 1 -GT -GA -Sc -SS + * -o orig -Ge 1 -GT -GA -Sc -SS -Sci * -Wb,export_macro="tao/TAO_Export" * -Wb,pre_include="ace/pre.h" * -Wb,post_include="ace/post.h" @@ -32,7 +32,7 @@ * * Note: The diffs were generated with these commands: * - * for i in Policy_ForwardC.{h,i,cpp}; do + * for i in Policy_ForwardC.{h,cpp}; do * diff -wBbu orig/$i $i; * done > diffs/Policy_Forward.diff */ diff --git a/TAO/tao/Policy_ForwardA.cpp b/TAO/tao/Policy_ForwardA.cpp index 4f079e90379..cff40f277e8 100644 --- a/TAO/tao/Policy_ForwardA.cpp +++ b/TAO/tao/Policy_ForwardA.cpp @@ -37,7 +37,7 @@ #include "tao/Any_Basic_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, @@ -57,23 +57,26 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:914 +// be\be_visitor_typecode/typecode_defn.cpp:925 namespace CORBA { extern ::CORBA::TypeCode_ptr const _tc_Policy; } + +#ifndef _TAO_TYPECODE_CORBA_PolicyList_GUARD +#define _TAO_TYPECODE_CORBA_PolicyList_GUARD namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence<::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> CORBA_PolicyList_0 ( CORBA::tk_sequence, @@ -86,6 +89,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_CORBA_PolicyList_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -104,18 +109,21 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:914 +// be\be_visitor_typecode/typecode_defn.cpp:925 + +#ifndef _TAO_TYPECODE_CORBA_PolicyTypeSeq_GUARD +#define _TAO_TYPECODE_CORBA_PolicyTypeSeq_GUARD namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence<::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> CORBA_PolicyTypeSeq_0 ( CORBA::tk_sequence, @@ -128,6 +136,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_CORBA_PolicyTypeSeq_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -146,7 +156,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_typecode/enum_typecode.cpp:34 +// be\be_visitor_typecode/enum_typecode.cpp:34 static char const * const _tao_enumerators_CORBA_SetOverrideType[] = { @@ -173,7 +183,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -231,7 +241,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -289,7 +299,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_enum/any_op_cs.cpp:52 +// be\be_visitor_enum/any_op_cs.cpp:52 void operator<<= ( CORBA::Any &_tao_any, diff --git a/TAO/tao/Policy_ForwardC.cpp b/TAO/tao/Policy_ForwardC.cpp index a5e7f622afa..cb1d25d6d36 100644 --- a/TAO/tao/Policy_ForwardC.cpp +++ b/TAO/tao/Policy_ForwardC.cpp @@ -36,10 +36,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "Policy_ForwardC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/Policy_ForwardC.h b/TAO/tao/Policy_ForwardC.h index e1f27151aa8..9a409a2a59b 100644 --- a/TAO/tao/Policy_ForwardC.h +++ b/TAO/tao/Policy_ForwardC.h @@ -343,11 +343,7 @@ 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:947 - -#if defined (__ACE_INLINE__) -#include "Policy_ForwardC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/Policy_ForwardC.inl b/TAO/tao/Policy_ForwardC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/Policy_ForwardC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/Pollable.pidl b/TAO/tao/Pollable.pidl index d08b403e407..a621c209a68 100644 --- a/TAO/tao/Pollable.pidl +++ b/TAO/tao/Pollable.pidl @@ -11,7 +11,7 @@ * The command used to generate code from this file is: * * tao_idl - * -o orig -St -Gp -Gd -Ge 1 -GT -SS + * -o orig -St -Gp -Gd -Ge 1 -GT -SS -Sci * -Wb,export_macro=TAO_Export * -Wb,pre_include="ace/pre.h" * -Wb,post_include="ace/post.h" diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp index 7b4645db918..4ed7124d668 100644 --- a/TAO/tao/PollableC.cpp +++ b/TAO/tao/PollableC.cpp @@ -37,10 +37,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "PollableC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/PollableC.h b/TAO/tao/PollableC.h index 2343d832dff..bbd13d9e405 100644 --- a/TAO/tao/PollableC.h +++ b/TAO/tao/PollableC.h @@ -554,11 +554,7 @@ namespace TAO } // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "PollableC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/PollableC.inl b/TAO/tao/PollableC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/PollableC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/PollableS_T.h b/TAO/tao/PollableS_T.h deleted file mode 100644 index 901c6efb19c..00000000000 --- a/TAO/tao/PollableS_T.h +++ /dev/null @@ -1,58 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// TAO_IDL - Generated from -// be\be_codegen.cpp:547 - -#ifndef _TAO_IDL_ORIG_POLLABLES_T_H_ -#define _TAO_IDL_ORIG_POLLABLES_T_H_ - -#include /**/ "ace/pre.h" - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - - -// TAO_IDL - Generated from -// be\be_visitor_root/root_sth.cpp:116 - -namespace POA_CORBA -{ -} // module CORBA - -// TAO_IDL - Generated from -// be\be_codegen.cpp:1096 - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#include /**/ "ace/post.h" -#endif /* ifndef */ - diff --git a/TAO/tao/PortableInterceptor.pidl b/TAO/tao/PortableInterceptor.pidl index 02cfcbf89d4..5b2ee052c68 100644 --- a/TAO/tao/PortableInterceptor.pidl +++ b/TAO/tao/PortableInterceptor.pidl @@ -22,7 +22,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Gp -Gd -Ge 1 -GT -GA -Sc -SS + * -o orig -Gp -Gd -Ge 1 -GT -GA -Sc -SS -Sci * -Wb,export_include="tao/TAO_Export.h" * -Wb,export_macro=TAO_Export * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/PortableInterceptorA.cpp b/TAO/tao/PortableInterceptorA.cpp index 7d290129282..49f46ac8cd2 100644 --- a/TAO/tao/PortableInterceptorA.cpp +++ b/TAO/tao/PortableInterceptorA.cpp @@ -38,7 +38,7 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:73 +// be\be_visitor_typecode/objref_typecode.cpp:76 static TAO::TypeCode::Objref<char const *, CORBA::tk_local_interface, @@ -56,7 +56,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_PortableInterceptor_ForwardRequest[] = { @@ -85,7 +85,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, @@ -105,7 +105,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, @@ -125,7 +125,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_PortableInterceptor_InvalidSlot = 0; static TAO::TypeCode::Struct<char const *, @@ -149,7 +149,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:73 +// be\be_visitor_typecode/objref_typecode.cpp:76 static TAO::TypeCode::Objref<char const *, CORBA::tk_local_interface, @@ -167,7 +167,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:73 +// be\be_visitor_typecode/objref_typecode.cpp:76 static TAO::TypeCode::Objref<char const *, CORBA::tk_local_interface, @@ -185,7 +185,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:73 +// be\be_visitor_typecode/objref_typecode.cpp:76 static TAO::TypeCode::Objref<char const *, CORBA::tk_local_interface, @@ -203,7 +203,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:73 +// be\be_visitor_typecode/objref_typecode.cpp:76 static TAO::TypeCode::Objref<char const *, CORBA::tk_local_interface, @@ -221,7 +221,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:73 +// be\be_visitor_typecode/objref_typecode.cpp:76 static TAO::TypeCode::Objref<char const *, CORBA::tk_local_interface, @@ -239,7 +239,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:73 +// be\be_visitor_typecode/objref_typecode.cpp:76 static TAO::TypeCode::Objref<char const *, CORBA::tk_local_interface, @@ -257,7 +257,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:73 +// be\be_visitor_typecode/objref_typecode.cpp:76 static TAO::TypeCode::Objref<char const *, CORBA::tk_local_interface, @@ -275,7 +275,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, @@ -290,7 +290,7 @@ static TAO::TypeCode::Alias<char const *, &_tao_tc_PortableInterceptor_ORBInitInfo_ObjectId; // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_PortableInterceptor_ORBInitInfo_DuplicateName[] = { @@ -313,7 +313,7 @@ static TAO::TypeCode::Struct<char const *, &_tao_tc_PortableInterceptor_ORBInitInfo_DuplicateName; // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_PortableInterceptor_ORBInitInfo_InvalidName = 0; static TAO::TypeCode::Struct<char const *, @@ -332,7 +332,7 @@ static TAO::TypeCode::Struct<char const *, &_tao_tc_PortableInterceptor_ORBInitInfo_InvalidName; // TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:73 +// be\be_visitor_typecode/objref_typecode.cpp:76 static TAO::TypeCode::Objref<char const *, CORBA::tk_local_interface, @@ -350,7 +350,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:73 +// be\be_visitor_typecode/objref_typecode.cpp:76 static TAO::TypeCode::Objref<char const *, CORBA::tk_local_interface, @@ -368,7 +368,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:50 +// be\be_visitor_interface/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -437,7 +437,7 @@ operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_exception/any_op_cs.cpp:50 +// be\be_visitor_exception/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -522,7 +522,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_exception/any_op_cs.cpp:50 +// be\be_visitor_exception/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -607,7 +607,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:50 +// be\be_visitor_interface/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -676,7 +676,7 @@ operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:50 +// be\be_visitor_interface/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -745,7 +745,7 @@ operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:50 +// be\be_visitor_interface/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -814,7 +814,7 @@ operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:50 +// be\be_visitor_interface/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -883,7 +883,7 @@ operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:50 +// be\be_visitor_interface/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -952,7 +952,7 @@ operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:50 +// be\be_visitor_interface/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -1021,7 +1021,7 @@ operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:50 +// be\be_visitor_interface/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -1090,7 +1090,7 @@ operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:50 +// be\be_visitor_interface/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -1159,7 +1159,7 @@ operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_exception/any_op_cs.cpp:50 +// be\be_visitor_exception/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -1231,7 +1231,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_exception/any_op_cs.cpp:50 +// be\be_visitor_exception/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -1303,7 +1303,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:50 +// be\be_visitor_interface/any_op_cs.cpp:50 template<> CORBA::Boolean diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp index 164a24f1bf9..9c73d79b5d8 100644 --- a/TAO/tao/PortableInterceptorC.cpp +++ b/TAO/tao/PortableInterceptorC.cpp @@ -26,28 +26,18 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:302 +// be\be_codegen.cpp:291 #include "PortableInterceptorC.h" #include "tao/CDR.h" #include "tao/ORB_Core.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__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "PortableInterceptorC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h index c8c0d9da9d9..b14a1884c2a 100644 --- a/TAO/tao/PortableInterceptorC.h +++ b/TAO/tao/PortableInterceptorC.h @@ -69,13 +69,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -#if defined (TAO_EXPORT_NESTED_CLASSES) -# if defined (TAO_EXPORT_NESTED_MACRO) -# undef TAO_EXPORT_NESTED_MACRO -# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO TAO_Export -#endif /* TAO_EXPORT_NESTED_CLASSES */ - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) @@ -93,64 +86,54 @@ namespace Dynamic typedef CORBA::StringSeq ContextList; typedef CORBA::StringSeq RequestContext; } - -// TAO_IDL - Generated from -// be\be_visitor_root/root_ch.cpp:62 - -namespace TAO -{ - class Collocation_Proxy_Broker; - - template<typename T> class Narrow_Utils; - template<typename T> class AbstractBase_Narrow_Utils; -} +// TAO_IDL - Generated from // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 namespace PortableInterceptor { - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const PortableInterceptor::AdapterState HOLDING = 0; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const PortableInterceptor::AdapterState ACTIVE = 1; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const PortableInterceptor::AdapterState DISCARDING = 2; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const PortableInterceptor::AdapterState INACTIVE = 3; - + // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 - + const PortableInterceptor::AdapterState NON_EXISTENT = 4; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR__VAR_OUT_CH_) #define _PORTABLEINTERCEPTOR_INTERCEPTOR__VAR_OUT_CH_ - + class Interceptor; typedef Interceptor *Interceptor_ptr; - + typedef TAO_Objref_Var_T< Interceptor > Interceptor_var; - + typedef TAO_Objref_Out_T< Interceptor @@ -158,73 +141,73 @@ namespace PortableInterceptor Interceptor_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR_CH_) #define _PORTABLEINTERCEPTOR_INTERCEPTOR_CH_ - + class TAO_Export Interceptor : public virtual CORBA::Object { public: typedef Interceptor_ptr _ptr_type; typedef Interceptor_var _var_type; - + // The static operations. static Interceptor_ptr _duplicate (Interceptor_ptr obj); - + static void _tao_release (Interceptor_ptr obj); - + static Interceptor_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Interceptor_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Interceptor_ptr _nil (void) { return static_cast<Interceptor_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual char * name ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void destroy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. Interceptor (void); @@ -243,7 +226,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Interceptor; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Interceptor; // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 @@ -301,7 +284,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ForwardRequest; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ForwardRequest; #endif /* end #if !defined */ @@ -314,7 +297,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ReplyStatus; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ReplyStatus; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -360,7 +343,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_SlotId; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_SlotId; // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 @@ -408,7 +391,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_InvalidSlot; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_InvalidSlot; #endif /* end #if !defined */ @@ -524,7 +507,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Current; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Current; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -757,7 +740,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_RequestInfo; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_RequestInfo; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -941,7 +924,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ClientRequestInfo; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ClientRequestInfo; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -1147,7 +1130,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServerRequestInfo; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServerRequestInfo; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -1294,7 +1277,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ClientRequestInterceptor; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ClientRequestInterceptor; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -1457,7 +1440,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServerRequestInterceptor; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServerRequestInterceptor; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -1569,7 +1552,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_PolicyFactory; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyFactory; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -1914,7 +1897,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ORBInitInfo; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ORBInitInfo; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -2025,7 +2008,7 @@ namespace PortableInterceptor // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ORBInitializer; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ORBInitializer; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -2365,11 +2348,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:969 - -#if defined (__ACE_INLINE__) -#include "PortableInterceptorC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/PortableInterceptorC.inl b/TAO/tao/PortableInterceptorC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/PortableInterceptorC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/Services.pidl b/TAO/tao/Services.pidl index 3df30b4a713..6d8f6f51d1f 100644 --- a/TAO/tao/Services.pidl +++ b/TAO/tao/Services.pidl @@ -8,7 +8,7 @@ // The command used to generate code is: // // tao_idl -// -o orig -Ge 1 -GT -GA -SS +// -o orig -Ge 1 -GT -GA -SS -Sci // -Wb,export_macro="tao/TAO_Export" // -Wb,pre_include="ace/pre.h" // -Wb,post_include="ace/post.h" diff --git a/TAO/tao/ServicesA.cpp b/TAO/tao/ServicesA.cpp index 59724e82239..d8d9d1c4eac 100644 --- a/TAO/tao/ServicesA.cpp +++ b/TAO/tao/ServicesA.cpp @@ -36,7 +36,7 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, @@ -56,7 +56,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, @@ -76,7 +76,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, @@ -96,7 +96,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, @@ -116,18 +116,21 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:914 +// be\be_visitor_typecode/typecode_defn.cpp:925 + +#ifndef _TAO_TYPECODE_CORBA_ServiceOptionSeq_GUARD +#define _TAO_TYPECODE_CORBA_ServiceOptionSeq_GUARD namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence<::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> CORBA_ServiceOptionSeq_0 ( CORBA::tk_sequence, @@ -140,6 +143,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_CORBA_ServiceOptionSeq_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -158,7 +163,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ServiceDetail[] = { @@ -187,18 +192,21 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:914 +// be\be_visitor_typecode/typecode_defn.cpp:925 + +#ifndef _TAO_TYPECODE_CORBA_ServiceDetailSeq_GUARD +#define _TAO_TYPECODE_CORBA_ServiceDetailSeq_GUARD namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence<::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> CORBA_ServiceDetailSeq_0 ( CORBA::tk_sequence, @@ -211,6 +219,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_CORBA_ServiceDetailSeq_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -229,7 +239,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ServiceInformation[] = { @@ -258,7 +268,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -316,7 +326,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -374,7 +384,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -432,7 +442,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/ServicesC.cpp b/TAO/tao/ServicesC.cpp index 48fb6c612de..9e160f04eb5 100644 --- a/TAO/tao/ServicesC.cpp +++ b/TAO/tao/ServicesC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:302 +// be\be_codegen.cpp:291 #include "ServicesC.h" @@ -37,10 +37,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "ServicesC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 @@ -104,7 +100,7 @@ void CORBA::ServiceOptionSeq::_tao_any_destructor ( #endif /* end #if !defined */ // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:68 +// be\be_visitor_structure/structure_cs.cpp:66 void CORBA::ServiceDetail::_tao_any_destructor ( @@ -170,7 +166,7 @@ void CORBA::ServiceDetailSeq::_tao_any_destructor ( #endif /* end #if !defined */ // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:68 +// be\be_visitor_structure/structure_cs.cpp:66 void CORBA::ServiceInformation::_tao_any_destructor ( diff --git a/TAO/tao/ServicesC.h b/TAO/tao/ServicesC.h index be25bcf6909..79e87b74214 100644 --- a/TAO/tao/ServicesC.h +++ b/TAO/tao/ServicesC.h @@ -55,13 +55,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -#if defined (TAO_EXPORT_NESTED_CLASSES) -# if defined (TAO_EXPORT_NESTED_MACRO) -# undef TAO_EXPORT_NESTED_MACRO -# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO TAO_Export -#endif /* TAO_EXPORT_NESTED_CLASSES */ - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) @@ -86,7 +79,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServiceType; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceType; // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:379 @@ -97,7 +90,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServiceOption; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceOption; // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:379 @@ -108,7 +101,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServiceDetailType; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceDetailType; // TAO_IDL - Generated from // be\be_visitor_typedef/typedef_ch.cpp:472 @@ -120,7 +113,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServiceDetailData; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceDetailData; // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 @@ -173,7 +166,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServiceOptionSeq; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceOptionSeq; // TAO_IDL - Generated from // be\be_visitor_constant/constant_ch.cpp:52 @@ -213,7 +206,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServiceDetail; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceDetail; // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_ch.cpp:101 @@ -266,7 +259,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServiceDetailSeq; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceDetailSeq; // TAO_IDL - Generated from // be\be_type.cpp:258 @@ -301,7 +294,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServiceInformation; + extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceInformation; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -395,11 +388,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:969 - -#if defined (__ACE_INLINE__) -#include "ServicesC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/ServicesC.inl b/TAO/tao/ServicesC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/ServicesC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/ShortSeq.pidl b/TAO/tao/ShortSeq.pidl index f7d36f79aaa..7191dba6eb7 100644 --- a/TAO/tao/ShortSeq.pidl +++ b/TAO/tao/ShortSeq.pidl @@ -8,7 +8,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Ge 1 -Sc -GT -GA -SS + * -o orig -Ge 1 -Sc -GT -GA -SS -Sci * -Wb,export_macro=TAO_Export * -Wb,pre_include="ace/pre.h" * -Wb,post_include="ace/post.h" diff --git a/TAO/tao/ShortSeqA.cpp b/TAO/tao/ShortSeqA.cpp index d9c92074821..cfe915728df 100644 --- a/TAO/tao/ShortSeqA.cpp +++ b/TAO/tao/ShortSeqA.cpp @@ -35,18 +35,21 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:914 +// be\be_visitor_typecode/typecode_defn.cpp:925 + +#ifndef _TAO_TYPECODE_CORBA_ShortSeq_GUARD +#define _TAO_TYPECODE_CORBA_ShortSeq_GUARD namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence<::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> CORBA_ShortSeq_0 ( CORBA::tk_sequence, @@ -59,6 +62,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_CORBA_ShortSeq_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -77,7 +82,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/ShortSeqC.cpp b/TAO/tao/ShortSeqC.cpp index e2b2a8b9326..f6e6107f313 100644 --- a/TAO/tao/ShortSeqC.cpp +++ b/TAO/tao/ShortSeqC.cpp @@ -36,10 +36,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "ShortSeqC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/ShortSeqC.h b/TAO/tao/ShortSeqC.h index 32b0bc7eec9..251ee00884c 100644 --- a/TAO/tao/ShortSeqC.h +++ b/TAO/tao/ShortSeqC.h @@ -159,11 +159,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_ShortSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "ShortSeqC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/ShortSeqC.inl b/TAO/tao/ShortSeqC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/ShortSeqC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/StringSeq.pidl b/TAO/tao/StringSeq.pidl index 5a149d65be3..ebcf0b93423 100644 --- a/TAO/tao/StringSeq.pidl +++ b/TAO/tao/StringSeq.pidl @@ -8,7 +8,7 @@ // The command used to generate code is: // // tao_idl -// -o orig -Ge 1 -GT -GA -Sc -SS +// -o orig -Ge 1 -GT -GA -Sc -SS -Sci // -Wb,export_macro=TAO_Export // -Wb,pre_include="ace/pre.h" // -Wb,post_include="ace/post.h" diff --git a/TAO/tao/StringSeqA.cpp b/TAO/tao/StringSeqA.cpp index 9a9a0452755..53b3c9faa4c 100644 --- a/TAO/tao/StringSeqA.cpp +++ b/TAO/tao/StringSeqA.cpp @@ -36,18 +36,21 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:914 +// be\be_visitor_typecode/typecode_defn.cpp:925 + +#ifndef _TAO_TYPECODE_CORBA_StringSeq_GUARD +#define _TAO_TYPECODE_CORBA_StringSeq_GUARD namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence<::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> CORBA_StringSeq_0 ( CORBA::tk_sequence, @@ -60,6 +63,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_CORBA_StringSeq_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -78,7 +83,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/StringSeqC.cpp b/TAO/tao/StringSeqC.cpp index bffb515a8a7..5a90a31da42 100644 --- a/TAO/tao/StringSeqC.cpp +++ b/TAO/tao/StringSeqC.cpp @@ -36,10 +36,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "StringSeqC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/StringSeqC.h b/TAO/tao/StringSeqC.h index eefd454ff5b..1c63a5a32af 100644 --- a/TAO/tao/StringSeqC.h +++ b/TAO/tao/StringSeqC.h @@ -157,11 +157,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_StringSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "StringSeqC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/StringSeqC.inl b/TAO/tao/StringSeqC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/StringSeqC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/TAO.pidl b/TAO/tao/TAO.pidl index e70da8fe03c..ec4973fd13b 100644 --- a/TAO/tao/TAO.pidl +++ b/TAO/tao/TAO.pidl @@ -15,7 +15,7 @@ * this is: * * tao_idl - * -o orig -Gp -Gd -Ge 1 -GT -GA -SS + * -o orig -Gp -Gd -Ge 1 -GT -GA -SS -Sci * -Wb,export_macro=TAO_Export * -Wb,pre_include="ace/pre.h" * -Wb,post_include="ace/post.h" diff --git a/TAO/tao/TAOA.cpp b/TAO/tao/TAOA.cpp index b6d9dcd393a..115ac43ea87 100644 --- a/TAO/tao/TAOA.cpp +++ b/TAO/tao/TAOA.cpp @@ -37,7 +37,7 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, @@ -57,7 +57,7 @@ namespace TAO // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_TAO_BufferingConstraint[] = { @@ -88,7 +88,7 @@ namespace TAO // TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:73 +// be\be_visitor_typecode/objref_typecode.cpp:76 static TAO::TypeCode::Objref<char const *, CORBA::tk_local_interface, @@ -106,7 +106,7 @@ namespace TAO // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -164,7 +164,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:50 +// be\be_visitor_interface/any_op_cs.cpp:50 template<> CORBA::Boolean diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp index 907c5a70939..4ee8148d6dc 100644 --- a/TAO/tao/TAOC.cpp +++ b/TAO/tao/TAOC.cpp @@ -37,10 +37,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "TAOC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 @@ -51,7 +47,7 @@ namespace TAO // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:68 +// be\be_visitor_structure/structure_cs.cpp:66 void TAO::BufferingConstraint::_tao_any_destructor ( diff --git a/TAO/tao/TAOC.h b/TAO/tao/TAOC.h index d29db3c6592..96c25609832 100644 --- a/TAO/tao/TAOC.h +++ b/TAO/tao/TAOC.h @@ -327,11 +327,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:947 - -#if defined (__ACE_INLINE__) -#include "TAOC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/TAOC.inl b/TAO/tao/TAOC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/TAOC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/TAOS_T.h b/TAO/tao/TAOS_T.h deleted file mode 100644 index 60856d4df0b..00000000000 --- a/TAO/tao/TAOS_T.h +++ /dev/null @@ -1,58 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// TAO_IDL - Generated from -// be\be_codegen.cpp:546 - -#ifndef _TAO_IDL_ORIG_TAOS_T_H_ -#define _TAO_IDL_ORIG_TAOS_T_H_ - -#include /**/ "ace/pre.h" - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - - -// TAO_IDL - Generated from -// be\be_visitor_root/root_sth.cpp:116 - -namespace POA_TAO -{ -} // module TAO - -// TAO_IDL - Generated from -// be\be_codegen.cpp:1094 - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#include /**/ "ace/post.h" -#endif /* ifndef */ - diff --git a/TAO/tao/TimeBase.pidl b/TAO/tao/TimeBase.pidl index e7cecf29b7b..d7f56e97a72 100644 --- a/TAO/tao/TimeBase.pidl +++ b/TAO/tao/TimeBase.pidl @@ -11,7 +11,7 @@ * The command used to generate code from this file is: * * tao_idl.exe - * -o orig -Ge 1 -GT -GA -SS + * -o orig -Ge 1 -GT -GA -SS -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include=tao/TAO_Export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/TimeBaseA.cpp b/TAO/tao/TimeBaseA.cpp index 5f1e14543b8..460292f3a71 100644 --- a/TAO/tao/TimeBaseA.cpp +++ b/TAO/tao/TimeBaseA.cpp @@ -35,7 +35,7 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, @@ -55,7 +55,7 @@ namespace TimeBase // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, @@ -75,7 +75,7 @@ namespace TimeBase // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, @@ -95,7 +95,7 @@ namespace TimeBase // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_TimeBase_UtcT[] = { @@ -126,7 +126,7 @@ namespace TimeBase // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_TimeBase_IntervalT[] = { @@ -155,7 +155,7 @@ namespace TimeBase // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( @@ -213,7 +213,7 @@ CORBA::Boolean operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// be\be_visitor_structure/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/TimeBaseC.cpp b/TAO/tao/TimeBaseC.cpp index 81ce90da09c..8f6bd995b31 100644 --- a/TAO/tao/TimeBaseC.cpp +++ b/TAO/tao/TimeBaseC.cpp @@ -36,10 +36,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "TimeBaseC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 @@ -50,7 +46,7 @@ namespace TAO // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:68 +// be\be_visitor_structure/structure_cs.cpp:66 void TimeBase::UtcT::_tao_any_destructor ( @@ -63,7 +59,7 @@ TimeBase::UtcT::_tao_any_destructor ( } // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:68 +// be\be_visitor_structure/structure_cs.cpp:66 void TimeBase::IntervalT::_tao_any_destructor ( diff --git a/TAO/tao/TimeBaseC.h b/TAO/tao/TimeBaseC.h index e48b2057c9f..0a2cfba6716 100644 --- a/TAO/tao/TimeBaseC.h +++ b/TAO/tao/TimeBaseC.h @@ -206,11 +206,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:947 - -#if defined (__ACE_INLINE__) -#include "TimeBaseC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/TimeBaseC.inl b/TAO/tao/TimeBaseC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/TimeBaseC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/TimeBaseS_T.h b/TAO/tao/TimeBaseS_T.h deleted file mode 100644 index 11c6736f660..00000000000 --- a/TAO/tao/TimeBaseS_T.h +++ /dev/null @@ -1,58 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// TAO_IDL - Generated from -// be\be_codegen.cpp:547 - -#ifndef _TAO_IDL_ORIG_TIMEBASES_T_H_ -#define _TAO_IDL_ORIG_TIMEBASES_T_H_ - -#include /**/ "ace/pre.h" - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - - -// TAO_IDL - Generated from -// be\be_visitor_root/root_sth.cpp:116 - -namespace POA_TimeBase -{ -} // module TimeBase - -// TAO_IDL - Generated from -// be\be_codegen.cpp:1096 - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#include /**/ "ace/post.h" -#endif /* ifndef */ - diff --git a/TAO/tao/Typecode_typesC.cpp b/TAO/tao/Typecode_typesC.cpp index 7c5593ac1ba..a924b9f021a 100644 --- a/TAO/tao/Typecode_typesC.cpp +++ b/TAO/tao/Typecode_typesC.cpp @@ -36,10 +36,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "Typecode_typesC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/Typecode_typesC.h b/TAO/tao/Typecode_typesC.h index 2bd7890f04b..af7de895b06 100644 --- a/TAO/tao/Typecode_typesC.h +++ b/TAO/tao/Typecode_typesC.h @@ -139,11 +139,7 @@ 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:947 - -#if defined (__ACE_INLINE__) -#include "Typecode_typesC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/Typecode_typesC.inl b/TAO/tao/Typecode_typesC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/Typecode_typesC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/ULongLongSeq.pidl b/TAO/tao/ULongLongSeq.pidl index 20a3a5e729a..d2fea2291f3 100644 --- a/TAO/tao/ULongLongSeq.pidl +++ b/TAO/tao/ULongLongSeq.pidl @@ -8,7 +8,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Ge 1 -Sc -GT -GA -SS + * -o orig -Ge 1 -Sc -GT -GA -SS -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include=TAO_Export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/ULongLongSeqA.cpp b/TAO/tao/ULongLongSeqA.cpp index d29dd6438c6..09f136090f4 100644 --- a/TAO/tao/ULongLongSeqA.cpp +++ b/TAO/tao/ULongLongSeqA.cpp @@ -35,18 +35,21 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:914 +// be\be_visitor_typecode/typecode_defn.cpp:925 + +#ifndef _TAO_TYPECODE_CORBA_ULongLongSeq_GUARD +#define _TAO_TYPECODE_CORBA_ULongLongSeq_GUARD namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence<::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> CORBA_ULongLongSeq_0 ( CORBA::tk_sequence, @@ -59,6 +62,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_CORBA_ULongLongSeq_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -77,7 +82,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/ULongLongSeqC.cpp b/TAO/tao/ULongLongSeqC.cpp index 5a807918c60..e660dfcec69 100644 --- a/TAO/tao/ULongLongSeqC.cpp +++ b/TAO/tao/ULongLongSeqC.cpp @@ -36,10 +36,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "ULongLongSeqC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/ULongLongSeqC.h b/TAO/tao/ULongLongSeqC.h index 6f0c6a8b224..e2989c299db 100644 --- a/TAO/tao/ULongLongSeqC.h +++ b/TAO/tao/ULongLongSeqC.h @@ -159,11 +159,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_ULongLongSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "ULongLongSeqC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/ULongLongSeqC.inl b/TAO/tao/ULongLongSeqC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/ULongLongSeqC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/ULongSeq.pidl b/TAO/tao/ULongSeq.pidl index 376e2985729..d5728df4437 100644 --- a/TAO/tao/ULongSeq.pidl +++ b/TAO/tao/ULongSeq.pidl @@ -9,7 +9,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Ge 1 -Sc -GT -GA -SS + * -o orig -Ge 1 -Sc -GT -GA -SS -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include=tao/TAO_Export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/ULongSeqA.cpp b/TAO/tao/ULongSeqA.cpp index b4e0ca1c08b..ed5577827b0 100644 --- a/TAO/tao/ULongSeqA.cpp +++ b/TAO/tao/ULongSeqA.cpp @@ -35,18 +35,21 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:914 +// be\be_visitor_typecode/typecode_defn.cpp:925 + +#ifndef _TAO_TYPECODE_CORBA_ULongSeq_GUARD +#define _TAO_TYPECODE_CORBA_ULongSeq_GUARD namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence<::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> CORBA_ULongSeq_0 ( CORBA::tk_sequence, @@ -59,6 +62,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_CORBA_ULongSeq_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -77,7 +82,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/ULongSeqC.cpp b/TAO/tao/ULongSeqC.cpp index 94ac4b27c8d..8f80fdf58b3 100644 --- a/TAO/tao/ULongSeqC.cpp +++ b/TAO/tao/ULongSeqC.cpp @@ -36,10 +36,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "ULongSeqC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/ULongSeqC.h b/TAO/tao/ULongSeqC.h index 65d86041e68..b17ded7d5be 100644 --- a/TAO/tao/ULongSeqC.h +++ b/TAO/tao/ULongSeqC.h @@ -159,11 +159,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_ULongSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "ULongSeqC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/ULongSeqC.inl b/TAO/tao/ULongSeqC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/ULongSeqC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/UShortSeq.pidl b/TAO/tao/UShortSeq.pidl index 395a99424f8..5cbe35361cd 100644 --- a/TAO/tao/UShortSeq.pidl +++ b/TAO/tao/UShortSeq.pidl @@ -8,7 +8,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Ge 1 -Sc -GT -GA -SS + * -o orig -Ge 1 -Sc -GT -GA -SS -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include=tao/TAO_Export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/UShortSeqA.cpp b/TAO/tao/UShortSeqA.cpp index ee72c2337aa..5b90cccd540 100644 --- a/TAO/tao/UShortSeqA.cpp +++ b/TAO/tao/UShortSeqA.cpp @@ -35,18 +35,21 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:914 +// be\be_visitor_typecode/typecode_defn.cpp:925 + +#ifndef _TAO_TYPECODE_CORBA_UShortSeq_GUARD +#define _TAO_TYPECODE_CORBA_UShortSeq_GUARD namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence<::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> CORBA_UShortSeq_0 ( CORBA::tk_sequence, @@ -59,6 +62,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_CORBA_UShortSeq_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -77,7 +82,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/UShortSeqC.cpp b/TAO/tao/UShortSeqC.cpp index f63ca9b525c..322229688a8 100644 --- a/TAO/tao/UShortSeqC.cpp +++ b/TAO/tao/UShortSeqC.cpp @@ -36,10 +36,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "UShortSeqC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/UShortSeqC.h b/TAO/tao/UShortSeqC.h index 33a2ce8d2bd..9dd782c8169 100644 --- a/TAO/tao/UShortSeqC.h +++ b/TAO/tao/UShortSeqC.h @@ -171,11 +171,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_UShortSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "UShortSeqC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/UShortSeqC.inl b/TAO/tao/UShortSeqC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/UShortSeqC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/ValueModifier.pidl b/TAO/tao/ValueModifier.pidl index 91c3ff79f17..5ca6d391dc3 100644 --- a/TAO/tao/ValueModifier.pidl +++ b/TAO/tao/ValueModifier.pidl @@ -10,7 +10,7 @@ * used to generate code is: * * tao_idl - * -o orig -Ge 1 -GT -Sc -St -SS + * -o orig -Ge 1 -GT -Sc -SS -Sci -St * -Wb,export_macro=TAO_Export * -Wb,export_include="tao/TAO_Export.h" * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/ValueModifierC.cpp b/TAO/tao/ValueModifierC.cpp index 8bcd9a69752..5dc8ed0dcdc 100644 --- a/TAO/tao/ValueModifierC.cpp +++ b/TAO/tao/ValueModifierC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:302 +// be\be_codegen.cpp:291 #include "ValueModifierC.h" @@ -36,10 +36,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "ValueModifierC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/ValueModifierC.h b/TAO/tao/ValueModifierC.h index a32c3258290..a780e539276 100644 --- a/TAO/tao/ValueModifierC.h +++ b/TAO/tao/ValueModifierC.h @@ -49,13 +49,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -#if defined (TAO_EXPORT_NESTED_CLASSES) -# if defined (TAO_EXPORT_NESTED_MACRO) -# undef TAO_EXPORT_NESTED_MACRO -# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ -# define TAO_EXPORT_NESTED_MACRO TAO_Export -#endif /* TAO_EXPORT_NESTED_CLASSES */ - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) @@ -111,11 +104,7 @@ namespace TAO } // TAO_IDL - Generated from -// be\be_codegen.cpp:969 - -#if defined (__ACE_INLINE__) -#include "ValueModifierC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/ValueModifierC.inl b/TAO/tao/ValueModifierC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/ValueModifierC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/Visibility.pidl b/TAO/tao/Visibility.pidl index a5503da766b..8148391aaeb 100644 --- a/TAO/tao/Visibility.pidl +++ b/TAO/tao/Visibility.pidl @@ -10,7 +10,7 @@ * used to generate code is: * * tao_idl - * -o orig -SS -Ge 1 -Sc -GA + * -o orig -SS -Ge 1 -Sc -GA -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include="tao/TAO_Export.h" * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/VisibilityA.cpp b/TAO/tao/VisibilityA.cpp index be4685b09a5..dc3c185dbb6 100644 --- a/TAO/tao/VisibilityA.cpp +++ b/TAO/tao/VisibilityA.cpp @@ -33,7 +33,7 @@ #include "tao/Any.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, @@ -51,9 +51,3 @@ namespace CORBA } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/VisibilityC.cpp b/TAO/tao/VisibilityC.cpp index f8648e4f64c..dbc285bb6af 100644 --- a/TAO/tao/VisibilityC.cpp +++ b/TAO/tao/VisibilityC.cpp @@ -36,10 +36,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "VisibilityC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/VisibilityC.h b/TAO/tao/VisibilityC.h index 1ce2222cfa2..7a7270857b7 100644 --- a/TAO/tao/VisibilityC.h +++ b/TAO/tao/VisibilityC.h @@ -99,11 +99,7 @@ namespace TAO } // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "VisibilityC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/VisibilityC.inl b/TAO/tao/VisibilityC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/VisibilityC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/WCharSeq.pidl b/TAO/tao/WCharSeq.pidl index 61be5768836..790627dbc51 100644 --- a/TAO/tao/WCharSeq.pidl +++ b/TAO/tao/WCharSeq.pidl @@ -8,7 +8,7 @@ * The command used to generate code is: * * tao_idl - * -o orig -Ge 1 -Sc -GT -GA -SS + * -o orig -Ge 1 -Sc -GT -GA -SS -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include=TAO_Export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/WCharSeqA.cpp b/TAO/tao/WCharSeqA.cpp index 6181e715172..f3c8d55e497 100644 --- a/TAO/tao/WCharSeqA.cpp +++ b/TAO/tao/WCharSeqA.cpp @@ -35,18 +35,21 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:914 +// be\be_visitor_typecode/typecode_defn.cpp:925 + +#ifndef _TAO_TYPECODE_CORBA_WCharSeq_GUARD +#define _TAO_TYPECODE_CORBA_WCharSeq_GUARD namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence<::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> CORBA_WCharSeq_0 ( CORBA::tk_sequence, @@ -59,6 +62,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_CORBA_WCharSeq_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -77,7 +82,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/WCharSeqC.cpp b/TAO/tao/WCharSeqC.cpp index 94932151d7a..eb74d14fc6d 100644 --- a/TAO/tao/WCharSeqC.cpp +++ b/TAO/tao/WCharSeqC.cpp @@ -36,10 +36,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "WCharSeqC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/WCharSeqC.h b/TAO/tao/WCharSeqC.h index 3db3aae7d63..6e7479f0286 100644 --- a/TAO/tao/WCharSeqC.h +++ b/TAO/tao/WCharSeqC.h @@ -159,11 +159,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_WCharSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "WCharSeqC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/WCharSeqC.inl b/TAO/tao/WCharSeqC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/WCharSeqC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/WStringSeq.pidl b/TAO/tao/WStringSeq.pidl index 6abab1ef344..fc8a6118ee8 100644 --- a/TAO/tao/WStringSeq.pidl +++ b/TAO/tao/WStringSeq.pidl @@ -8,7 +8,7 @@ // The command used to generate code is: // // tao_idl -// -o orig -Ge 1 -GT -GA -Sc -SS +// -o orig -Ge 1 -GT -GA -Sc -SS -Sci // -Wb,export_macro=TAO_Export // -Wb,pre_include="ace/pre.h" // -Wb,post_include="ace/post.h" diff --git a/TAO/tao/WStringSeqA.cpp b/TAO/tao/WStringSeqA.cpp index 30e836e3441..168219790b2 100644 --- a/TAO/tao/WStringSeqA.cpp +++ b/TAO/tao/WStringSeqA.cpp @@ -36,18 +36,21 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:914 +// be\be_visitor_typecode/typecode_defn.cpp:925 + +#ifndef _TAO_TYPECODE_CORBA_WStringSeq_GUARD +#define _TAO_TYPECODE_CORBA_WStringSeq_GUARD namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence<::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> CORBA_WStringSeq_0 ( CORBA::tk_sequence, @@ -60,6 +63,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_CORBA_WStringSeq_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -78,7 +83,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 // Copying insertion. void operator<<= ( diff --git a/TAO/tao/WStringSeqC.cpp b/TAO/tao/WStringSeqC.cpp index 72bbd8b4a6c..db8423b3217 100644 --- a/TAO/tao/WStringSeqC.cpp +++ b/TAO/tao/WStringSeqC.cpp @@ -36,10 +36,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "WStringSeqC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/WStringSeqC.h b/TAO/tao/WStringSeqC.h index f0cc4aba79a..8db77329b4e 100644 --- a/TAO/tao/WStringSeqC.h +++ b/TAO/tao/WStringSeqC.h @@ -157,11 +157,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_WStringSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "WStringSeqC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/WStringSeqC.inl b/TAO/tao/WStringSeqC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/WStringSeqC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/WrongTransaction.pidl b/TAO/tao/WrongTransaction.pidl index 292af6c7908..7c10474355c 100644 --- a/TAO/tao/WrongTransaction.pidl +++ b/TAO/tao/WrongTransaction.pidl @@ -10,7 +10,7 @@ * following command: * * tao_idl - * -o orig -Ge 1 -GT -GA -Sc + * -o orig -Ge 1 -GT -GA -Sc -Sci * -Wb,export_macro=TAO_Export * -Wb,export_include=tao/TAO_Export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/WrongTransactionA.cpp b/TAO/tao/WrongTransactionA.cpp index 3c05235a586..71b91ac2444 100644 --- a/TAO/tao/WrongTransactionA.cpp +++ b/TAO/tao/WrongTransactionA.cpp @@ -35,7 +35,7 @@ #include "tao/Any_Dual_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_CORBA_WrongTransaction = 0; static TAO::TypeCode::Struct<char const *, @@ -59,7 +59,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_exception/any_op_cs.cpp:50 +// be\be_visitor_exception/any_op_cs.cpp:50 template<> CORBA::Boolean diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp index d135ac77efc..adfff4420ac 100644 --- a/TAO/tao/WrongTransactionC.cpp +++ b/TAO/tao/WrongTransactionC.cpp @@ -31,10 +31,6 @@ #include "WrongTransactionC.h" #include "tao/CDR.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" @@ -42,10 +38,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "WrongTransactionC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h index dc4af210e10..fab28b55893 100644 --- a/TAO/tao/WrongTransactionC.h +++ b/TAO/tao/WrongTransactionC.h @@ -142,11 +142,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:947 - -#if defined (__ACE_INLINE__) -#include "WrongTransactionC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/WrongTransactionC.inl b/TAO/tao/WrongTransactionC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/WrongTransactionC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/diffs/Domain.diff b/TAO/tao/diffs/Domain.diff index ec680b04320..f1ee0bbb149 100644 --- a/TAO/tao/diffs/Domain.diff +++ b/TAO/tao/diffs/Domain.diff @@ -1,5 +1,5 @@ ---- orig/DomainC.cpp 2005-02-18 11:42:40.695684800 +0100 -+++ DomainC.cpp 2005-02-18 12:09:59.000000000 +0100 +--- orig/DomainC.cpp 2005-04-08 10:17:39.095897600 +0200 ++++ DomainC.cpp 2005-04-08 10:33:24.000000000 +0200 @@ -1,6 +1,6 @@ // -*- C++ -*- // @@ -21,7 +21,7 @@ #endif /* __BORLANDC__ */ @@ -50,6 +54,44 @@ // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:66 + // be\be_visitor_arg_traits.cpp:69 +// TAO specific stuff. +namespace CORBA @@ -64,8 +64,8 @@ // Arg traits specializations. namespace TAO { ---- orig/DomainC.h 2005-02-18 11:42:40.695684800 +0100 -+++ DomainC.h 2005-02-18 12:09:59.000000000 +0100 +--- orig/DomainC.h 2005-04-08 10:17:39.095897600 +0200 ++++ DomainC.h 2005-04-08 10:33:24.000000000 +0200 @@ -1,6 +1,6 @@ // -*- C++ -*- // diff --git a/TAO/tao/diffs/Object_Key.diff b/TAO/tao/diffs/Object_Key.diff index 4bae0d887fa..8d6a1c4ef59 100644 --- a/TAO/tao/diffs/Object_Key.diff +++ b/TAO/tao/diffs/Object_Key.diff @@ -1,25 +1,17 @@ ---- orig/Object_KeyC.cpp 2005-02-18 11:42:43.930336000 +0100 -+++ Object_KeyC.cpp 2005-02-18 12:10:00.000000000 +0100 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -41,6 +41,10 @@ - #include "Object_KeyC.inl" - #endif /* !defined INLINE */ +--- orig/Object_KeyC.cpp 2005-04-08 10:17:40.978604800 +0200 ++++ Object_KeyC.cpp 2005-04-08 10:17:41.879900800 +0200 +@@ -37,6 +37,10 @@ + #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig + #endif /* __BORLANDC__ */ +#include "ace/ACE.h" +#include "ace/OS_NS_string.h" +#include "ace/os_include/os_ctype.h" + // TAO_IDL - Generated from - // be\be_visitor_arg_traits.cpp:66 + // be\be_visitor_arg_traits.cpp:69 -@@ -92,6 +96,150 @@ +@@ -88,6 +92,150 @@ TAO::ObjectKey::~ObjectKey (void) {} @@ -170,17 +162,9 @@ #endif /* end #if !defined */ // TAO_IDL - Generated from ---- orig/Object_KeyC.h 2005-02-18 11:42:43.930336000 +0100 -+++ Object_KeyC.h 2005-02-18 12:10:00.000000000 +0100 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -124,6 +124,25 @@ +--- orig/Object_KeyC.h 2005-04-08 10:17:40.978604800 +0200 ++++ Object_KeyC.h 2005-04-08 10:17:41.879900800 +0200 +@@ -117,6 +117,25 @@ ) : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {} #endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */ diff --git a/TAO/tao/diffs/OctetSeq.diff b/TAO/tao/diffs/OctetSeq.diff index 1ed00da5d5a..cbdbb910426 100644 --- a/TAO/tao/diffs/OctetSeq.diff +++ b/TAO/tao/diffs/OctetSeq.diff @@ -1,14 +1,6 @@ ---- orig/OctetSeqC.h 2005-02-18 11:42:33.865864000 +0100 -+++ OctetSeqC.h 2005-02-18 12:10:00.000000000 +0100 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -148,6 +148,18 @@ +--- orig/OctetSeqC.h 2005-04-08 10:17:34.108726400 +0200 ++++ OctetSeqC.h 2005-04-08 10:17:41.829828800 +0200 +@@ -141,6 +141,18 @@ { } diff --git a/TAO/tao/diffs/Policy.diff b/TAO/tao/diffs/Policy.diff index 7ab999bd27a..4f3efdfe6b9 100644 --- a/TAO/tao/diffs/Policy.diff +++ b/TAO/tao/diffs/Policy.diff @@ -1,14 +1,6 @@ ---- orig/PolicyC.h 2005-02-18 11:42:38.843020800 +0100 -+++ PolicyC.h 2005-02-18 12:10:00.000000000 +0100 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -338,6 +338,15 @@ +--- orig/PolicyC.h 2005-04-08 10:17:37.633795200 +0200 ++++ PolicyC.h 2005-04-08 10:17:41.709656000 +0200 +@@ -331,6 +331,15 @@ virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -24,17 +16,9 @@ private: TAO::Collocation_Proxy_Broker *the_TAO_Policy_Proxy_Broker_; ---- orig/PolicyC.cpp 2005-02-18 11:42:38.843020800 +0100 -+++ PolicyC.cpp 2005-02-18 12:10:00.000000000 +0100 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -1076,6 +1076,34 @@ +--- orig/PolicyC.cpp 2005-04-08 10:17:37.633795200 +0200 ++++ PolicyC.cpp 2005-04-08 10:17:41.719670400 +0200 +@@ -953,6 +953,34 @@ ); } diff --git a/TAO/tao/diffs/Policy_Forward.diff b/TAO/tao/diffs/Policy_Forward.diff index eadcebb8a60..2d0e1822f84 100644 --- a/TAO/tao/diffs/Policy_Forward.diff +++ b/TAO/tao/diffs/Policy_Forward.diff @@ -1,13 +1,5 @@ ---- orig/Policy_ForwardC.h 2005-02-18 11:42:32.143387200 +0100 -+++ Policy_ForwardC.h 2005-02-18 12:10:00.000000000 +0100 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: +--- orig/Policy_ForwardC.h 2005-04-08 10:17:32.626595200 +0200 ++++ Policy_ForwardC.h 2005-04-08 10:17:41.859872000 +0200 @@ -41,7 +41,6 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ diff --git a/TAO/tao/diffs/PortableInterceptor.diff b/TAO/tao/diffs/PortableInterceptor.diff index cf8cc62471a..15f2f8484b6 100644 --- a/TAO/tao/diffs/PortableInterceptor.diff +++ b/TAO/tao/diffs/PortableInterceptor.diff @@ -1,14 +1,6 @@ ---- orig/PortableInterceptorC.h 2005-02-18 11:42:29.499585600 +0100 -+++ PortableInterceptorC.h 2005-02-18 12:10:00.000000000 +0100 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -57,6 +57,12 @@ +--- orig/PortableInterceptorC.h 2005-04-08 10:17:32.185961600 +0200 ++++ PortableInterceptorC.h 2005-04-08 10:20:18.725433600 +0200 +@@ -58,6 +58,12 @@ #include "tao/orb_typesC.h" #include "tao/PolicyC.h" @@ -21,7 +13,7 @@ #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO #endif -@@ -78,6 +84,15 @@ +@@ -72,6 +78,16 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ @@ -33,11 +25,12 @@ + typedef CORBA::StringSeq ContextList; + typedef CORBA::StringSeq RequestContext; +} ++// TAO_IDL - Generated from + - // TAO_IDL - Generated from - // be\be_visitor_root/root_ch.cpp:62 + // TAO_IDL - Generated from + // be\be_visitor_module/module_ch.cpp:48 -@@ -1326,17 +1341,19 @@ +@@ -1323,17 +1339,19 @@ // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -60,7 +53,7 @@ // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 -@@ -1483,6 +1500,16 @@ +@@ -1482,6 +1500,16 @@ static void _tao_any_destructor (void *); @@ -77,17 +70,9 @@ // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 ---- orig/PortableInterceptorC.cpp 2005-02-18 11:42:29.499585600 +0100 -+++ PortableInterceptorC.cpp 2005-02-18 12:10:00.000000000 +0100 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -1957,6 +1957,18 @@ +--- orig/PortableInterceptorC.cpp 2005-04-08 10:17:32.195976000 +0200 ++++ PortableInterceptorC.cpp 2005-04-08 10:17:41.659584000 +0200 +@@ -1776,6 +1776,18 @@ return false; } diff --git a/TAO/tao/diffs/Typecode_types.diff b/TAO/tao/diffs/Typecode_types.diff index 46dd87ebbf9..55d5c076583 100644 --- a/TAO/tao/diffs/Typecode_types.diff +++ b/TAO/tao/diffs/Typecode_types.diff @@ -1,14 +1,6 @@ ---- orig/Typecode_typesC.h 2005-02-18 11:42:38.332286400 +0100 -+++ Typecode_typesC.h 2005-02-18 12:10:00.000000000 +0100 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -75,26 +75,6 @@ +--- orig/Typecode_typesC.h 2005-04-08 10:17:37.123060800 +0200 ++++ Typecode_typesC.h 2005-04-08 10:17:41.739699200 +0200 +@@ -68,26 +68,6 @@ // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -35,7 +27,7 @@ // TAO_IDL - Generated from // be\be_visitor_enum/enum_ch.cpp:57 -@@ -137,6 +117,11 @@ +@@ -130,6 +110,11 @@ tk_component, tk_home, tk_event @@ -47,7 +39,7 @@ }; typedef TCKind &TCKind_out; -@@ -155,13 +140,6 @@ +@@ -148,13 +133,6 @@ } // TAO_IDL - Generated from @@ -60,4 +52,4 @@ -// 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); diff --git a/TAO/tao/diffs/UShortSeq.diff b/TAO/tao/diffs/UShortSeq.diff index 3bab16bc1d0..1938744506a 100644 --- a/TAO/tao/diffs/UShortSeq.diff +++ b/TAO/tao/diffs/UShortSeq.diff @@ -1,14 +1,6 @@ ---- orig/UShortSeqC.h 2005-02-18 11:42:34.827246400 +0100 -+++ UShortSeqC.h 2005-02-18 12:10:00.000000000 +0100 -@@ -1,6 +1,6 @@ - // -*- C++ -*- - // --// $Id$ -+// $Id$ - - // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** - // TAO and the TAO IDL Compiler have been developed by: -@@ -140,6 +140,18 @@ +--- orig/UShortSeqC.h 2005-04-08 10:17:34.909878400 +0200 ++++ UShortSeqC.h 2005-04-08 10:17:41.759728000 +0200 +@@ -133,6 +133,18 @@ { } diff --git a/TAO/tao/orb_typesA.cpp b/TAO/tao/orb_typesA.cpp index 23f017459fe..01fa470eec8 100644 --- a/TAO/tao/orb_typesA.cpp +++ b/TAO/tao/orb_typesA.cpp @@ -34,7 +34,7 @@ #include "tao/Any.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, @@ -54,7 +54,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, @@ -74,7 +74,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, @@ -94,7 +94,7 @@ namespace CORBA // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, @@ -112,9 +112,3 @@ namespace CORBA } - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/orb_typesC.cpp b/TAO/tao/orb_typesC.cpp index a0fb26ae7f6..526c4eae23c 100644 --- a/TAO/tao/orb_typesC.cpp +++ b/TAO/tao/orb_typesC.cpp @@ -36,10 +36,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "orb_typesC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/orb_typesC.h b/TAO/tao/orb_typesC.h index fa09027703b..fe77c78b774 100644 --- a/TAO/tao/orb_typesC.h +++ b/TAO/tao/orb_typesC.h @@ -125,11 +125,7 @@ namespace TAO } // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "orb_typesC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/orb_typesC.inl b/TAO/tao/orb_typesC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/orb_typesC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - |