diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-04-08 07:22:34 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-04-08 07:22:34 +0000 |
| commit | ad0838a8628beb23a8324ecc8c0d8a9213db8c14 (patch) | |
| tree | 257ee46d89aa8c859469626f31bdcf7b12122043 /TAO | |
| parent | d264f098583a415a72fd130475ce79c6b4ed63d3 (diff) | |
| download | ATCD-ad0838a8628beb23a8324ecc8c0d8a9213db8c14.tar.gz | |
ChangeLogTag: Fri Apr 8 07:59:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO')
137 files changed, 1038 insertions, 1611 deletions
diff --git a/TAO/tao/IORTable/IORTable.pidl b/TAO/tao/IORTable/IORTable.pidl index 660556e917c..c9f77adff38 100644 --- a/TAO/tao/IORTable/IORTable.pidl +++ b/TAO/tao/IORTable/IORTable.pidl @@ -9,11 +9,11 @@ * @brief Pre-compiled IDL source for the IORTable module. * * This file was used to generate the code in - * IORTable{C,S,S_T}.{h,i,cpp} + * IORTable{C}.{h,cpp} * * The command used to generate code from this file is: * - * tao_idl -o orig -Ge 1 -Sa -St -GT \ + * tao_idl -o orig -Ge 1 -Sa -St -GT -Sci \ * -Wb,export_macro=TAO_IORTable_Export \ * -Wb,export_include=iortable_export.h \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/IORTable/IORTableC.cpp b/TAO/tao/IORTable/IORTableC.cpp index 6281b0f0e86..75bd130a687 100644 --- a/TAO/tao/IORTable/IORTableC.cpp +++ b/TAO/tao/IORTable/IORTableC.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 "IORTable.h" @@ -37,10 +37,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "IORTableC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 @@ -545,7 +541,7 @@ CORBA::Boolean operator>> ( } // TAO_IDL - Generated from -// be\be_visitor_root/root.cpp:1619 +// be\be_visitor_root/root.cpp:1528 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/IORTable/IORTableC.h b/TAO/tao/IORTable/IORTableC.h index 3db82434d40..39812cabbe6 100644 --- a/TAO/tao/IORTable/IORTableC.h +++ b/TAO/tao/IORTable/IORTableC.h @@ -56,13 +56,6 @@ #endif #define TAO_EXPORT_MACRO TAO_IORTable_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_IORTable_Export -#endif /* TAO_EXPORT_NESTED_CLASSES */ - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) @@ -72,17 +65,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 @@ -467,11 +449,7 @@ TAO_IORTable_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IORTable:: TAO_IORTable_Export CORBA::Boolean operator>> (TAO_InputCDR &, IORTable::NotFound &); // TAO_IDL - Generated from -// be\be_codegen.cpp:961 - -#if defined (__ACE_INLINE__) -#include "IORTableC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/IORTable/IORTableC.inl b/TAO/tao/IORTable/IORTableC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/IORTable/IORTableC.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/Messaging.pidl b/TAO/tao/Messaging/Messaging.pidl index a0d26802619..7e2dac7d226 100644 --- a/TAO/tao/Messaging/Messaging.pidl +++ b/TAO/tao/Messaging/Messaging.pidl @@ -11,7 +11,7 @@ * The command used to generate code from this file is: * * tao_idl - * -o orig -Gp -Gd -GT -Ge 1 -GA + * -o orig -Gp -Gd -GT -Ge 1 -GA -Ssi * -Wb,export_macro=TAO_Messaging_Export * -Wb,export_include=messaging_export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/Messaging/MessagingA.cpp b/TAO/tao/Messaging/MessagingA.cpp index 1d39125881a..03994ca4447 100644 --- a/TAO/tao/Messaging/MessagingA.cpp +++ b/TAO/tao/Messaging/MessagingA.cpp @@ -36,7 +36,7 @@ #include "tao/Any_Impl_T.h" // TAO_IDL - Generated from -// be/be_visitor_typecode/value_typecode.cpp:32 +// be\be_visitor_typecode/value_typecode.cpp:50 static TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_Messaging_ExceptionHolder[] = { @@ -69,7 +69,7 @@ namespace Messaging // 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, @@ -87,7 +87,7 @@ namespace Messaging // TAO_IDL - Generated from -// be/be_visitor_valuetype/any_op_cs.cpp:57 +// be\be_visitor_valuetype/any_op_cs.cpp:57 template<> CORBA::Boolean @@ -143,7 +143,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/Messaging/MessagingC.h b/TAO/tao/Messaging/MessagingC.h index f796169ff19..0adfb2e420b 100644 --- a/TAO/tao/Messaging/MessagingC.h +++ b/TAO/tao/Messaging/MessagingC.h @@ -479,7 +479,7 @@ TAO_Messaging_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging TAO_Messaging_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ReplyHandler_ptr &); // TAO_IDL - Generated from -// be\be_codegen.cpp:947 +// be\be_codegen.cpp:955 #if defined (__ACE_INLINE__) #include "MessagingC.inl" diff --git a/TAO/tao/Messaging/MessagingS.cpp b/TAO/tao/Messaging/MessagingS.cpp index e95dadf8a82..324a251880d 100644 --- a/TAO/tao/Messaging/MessagingS.cpp +++ b/TAO/tao/Messaging/MessagingS.cpp @@ -27,7 +27,7 @@ // TAO_IDL - Generated from -// be\be_codegen.cpp:595 +// be\be_codegen.cpp:599 #ifndef _TAO_IDL_ORIG_MESSAGINGS_CPP_ #define _TAO_IDL_ORIG_MESSAGINGS_CPP_ @@ -64,10 +64,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "MessagingS.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 @@ -100,7 +96,7 @@ public: }; /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable -N lookup */ +/* Command-line: c:\ACE\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { diff --git a/TAO/tao/Messaging/MessagingS.h b/TAO/tao/Messaging/MessagingS.h index ad66c86056f..83c5aadc098 100644 --- a/TAO/tao/Messaging/MessagingS.h +++ b/TAO/tao/Messaging/MessagingS.h @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:387 +// be\be_codegen.cpp:391 #ifndef _TAO_IDL_ORIG_MESSAGINGS_H_ #define _TAO_IDL_ORIG_MESSAGINGS_H_ @@ -203,13 +203,10 @@ namespace POA_Messaging } // module Messaging // TAO_IDL - Generated from -// be\be_codegen.cpp:983 +// be\be_codegen.cpp:995 #include "MessagingS_T.h" -#if defined (__ACE_INLINE__) -#include "MessagingS.inl" -#endif /* defined INLINE */ #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/Messaging/MessagingS.inl b/TAO/tao/Messaging/MessagingS.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/Messaging/MessagingS.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/MessagingS_T.cpp b/TAO/tao/Messaging/MessagingS_T.cpp index 32363f74aff..b048d9ff092 100644 --- a/TAO/tao/Messaging/MessagingS_T.cpp +++ b/TAO/tao/Messaging/MessagingS_T.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:669 +// be\be_codegen.cpp:677 #ifndef _TAO_IDL_ORIG_MESSAGINGS_T_CPP_ #define _TAO_IDL_ORIG_MESSAGINGS_T_CPP_ diff --git a/TAO/tao/Messaging/MessagingS_T.h b/TAO/tao/Messaging/MessagingS_T.h index 91dd9097f87..86d55268154 100644 --- a/TAO/tao/Messaging/MessagingS_T.h +++ b/TAO/tao/Messaging/MessagingS_T.h @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:532 +// be\be_codegen.cpp:536 #ifndef _TAO_IDL_ORIG_MESSAGINGS_T_H_ #define _TAO_IDL_ORIG_MESSAGINGS_T_H_ @@ -97,7 +97,7 @@ namespace POA_Messaging } // module Messaging // TAO_IDL - Generated from -// be\be_codegen.cpp:1080 +// be\be_codegen.cpp:1096 #if defined (__ACE_INLINE__) #include "MessagingS_T.inl" diff --git a/TAO/tao/Messaging/Messaging_No_Impl.pidl b/TAO/tao/Messaging/Messaging_No_Impl.pidl index 39d3bdd5d2c..94daadd37b3 100644 --- a/TAO/tao/Messaging/Messaging_No_Impl.pidl +++ b/TAO/tao/Messaging/Messaging_No_Impl.pidl @@ -7,13 +7,13 @@ * $Id$ * * This file was used to generate the code in - * Messaging_No_Impl{C,S,S_T}.{h,i,cpp} and as the name implies is not + * Messaging_No_Impl{C}.{h,cpp} and as the name implies is not * implemented in TAO, yet. * * The command used to generate code from this file is: * * tao_idl - * -o orig -Gp -Gd -Ge 1 -GT -Sc -GA + * -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -Sci * -Wb,export_macro=TAO_Messaging_Export * -Wb,export_include=messaging_export.h * -Wb,pre_include="ace/pre.h" @@ -22,14 +22,14 @@ * * after the file is generated a patch must be applied: * - * cp orig/Messaging_No_Impl{C,S}.{h,inl,cpp} . - * patch < diffs/Messaging.diff + * cp orig/Messaging_No_Impl{C}.{h,cpp} . + * patch < diffs/Messaging_No_Impl.diff * * The patch eliminates cycles in the include dependencies. * * Note: to update the patch file after re-generating the code use: * - * for i in Messaging_No_Impl{C,S}.{h,inl,cpp}; do + * for i in Messaging_No_Impl{C}.{h,cpp}; do * diff -uBbw orig/$i $i; * done > diffs/Messaging_No_Impl.diff */ diff --git a/TAO/tao/Messaging/Messaging_No_ImplA.cpp b/TAO/tao/Messaging/Messaging_No_ImplA.cpp index 154b809d725..3d609b8df8e 100644 --- a/TAO/tao/Messaging/Messaging_No_ImplA.cpp +++ b/TAO/tao/Messaging/Messaging_No_ImplA.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 Messaging // 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 *, @@ -77,7 +77,7 @@ namespace Messaging // 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 *, @@ -97,7 +97,7 @@ namespace Messaging // 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 *, @@ -117,7 +117,7 @@ namespace Messaging // 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, @@ -135,7 +135,7 @@ namespace Messaging // 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_PriorityRange[] = { @@ -164,7 +164,7 @@ namespace Messaging // 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, @@ -182,7 +182,7 @@ namespace Messaging // 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, @@ -200,7 +200,7 @@ namespace Messaging // 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, @@ -218,7 +218,7 @@ namespace Messaging // 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, @@ -236,7 +236,7 @@ namespace Messaging // 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, @@ -254,7 +254,7 @@ namespace Messaging // 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, @@ -272,7 +272,7 @@ namespace Messaging // 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, @@ -290,7 +290,7 @@ namespace Messaging // 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_RoutingTypeRange[] = { @@ -319,7 +319,7 @@ namespace Messaging // 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, @@ -337,7 +337,7 @@ namespace Messaging // 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, @@ -355,7 +355,7 @@ namespace Messaging // 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, @@ -373,7 +373,7 @@ namespace Messaging // 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 @@ -442,7 +442,7 @@ 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<<= ( @@ -500,7 +500,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 @@ -569,7 +569,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 @@ -638,7 +638,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 @@ -707,7 +707,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 @@ -776,7 +776,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 @@ -845,7 +845,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 @@ -914,7 +914,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 @@ -983,7 +983,7 @@ 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<<= ( @@ -1041,7 +1041,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 @@ -1110,7 +1110,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 @@ -1179,7 +1179,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/Messaging/Messaging_No_ImplC.cpp b/TAO/tao/Messaging/Messaging_No_ImplC.cpp index 4ad8ef20180..245a0d875c6 100644 --- a/TAO/tao/Messaging/Messaging_No_ImplC.cpp +++ b/TAO/tao/Messaging/Messaging_No_ImplC.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_No_ImplC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 @@ -196,7 +192,7 @@ Messaging::RebindPolicy::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:68 +// be\be_visitor_structure/structure_cs.cpp:66 void Messaging::PriorityRange::_tao_any_destructor ( @@ -1224,7 +1220,7 @@ Messaging::RelativeRequestTimeoutPolicy::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// be\be_visitor_structure/structure_cs.cpp:68 +// be\be_visitor_structure/structure_cs.cpp:66 void Messaging::RoutingTypeRange::_tao_any_destructor ( diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.h b/TAO/tao/Messaging/Messaging_No_ImplC.h index 9095741261f..e017f82178c 100644 --- a/TAO/tao/Messaging/Messaging_No_ImplC.h +++ b/TAO/tao/Messaging/Messaging_No_ImplC.h @@ -1949,11 +1949,7 @@ TAO_Messaging_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging TAO_Messaging_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::RoutingTypeRange &); // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "Messaging_No_ImplC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.inl b/TAO/tao/Messaging/Messaging_No_ImplC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/Messaging/Messaging_No_ImplC.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/Messaging_RT_Policy.pidl b/TAO/tao/Messaging/Messaging_RT_Policy.pidl index b9b26e80e0a..b5ef012ccf9 100644 --- a/TAO/tao/Messaging/Messaging_RT_Policy.pidl +++ b/TAO/tao/Messaging/Messaging_RT_Policy.pidl @@ -7,12 +7,12 @@ * $Id$ * * This file was used to generate the code in - * Messaging_RT_Policy{C,S,S_T}.{h,i,cpp} + * Messaging_RT_Policy{C}.{h,cpp} * * The command used to generate code from this file is: * * tao_idl - * -o orig -Gp -Gd -Ge 1 -Sc -GA + * -o orig -Gp -Gd -Ge 1 -Sc -GA -Sci * -Wb,export_macro=TAO_Messaging_Export * -Wb,export_include=messaging_export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp b/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp index 215331c2c5a..ac592fe1e87 100644 --- a/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp +++ b/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp @@ -35,7 +35,7 @@ #include "tao/Any_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 Messaging // 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, @@ -73,7 +73,7 @@ namespace Messaging // 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/Messaging/Messaging_RT_PolicyC.cpp b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp index 72a58ea41e2..17e170f8146 100644 --- a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp +++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.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_RT_PolicyC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.h b/TAO/tao/Messaging/Messaging_RT_PolicyC.h index 06f80692e73..dc52d43ff96 100644 --- a/TAO/tao/Messaging/Messaging_RT_PolicyC.h +++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.h @@ -247,11 +247,7 @@ TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::RelativeRoundtri TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::RelativeRoundtripTimeoutPolicy_ptr &); // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "Messaging_RT_PolicyC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.inl b/TAO/tao/Messaging/Messaging_RT_PolicyC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/Messaging/Messaging_RT_PolicyC.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/Messaging_SyncScope_Policy.pidl b/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl index f636293b389..80ee1edc319 100644 --- a/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl +++ b/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl @@ -7,12 +7,12 @@ * $Id$ * * This file was used to generate the code in - * Messaging_SyncScope_Policy{C,S}.{h,i,cpp} + * Messaging_SyncScope_Policy{C}.{h,cpp} * * The command used to generate code from this file is: * * tao_idl - * -o orig -Gp -Gd -Ge 1 -GT -Sc -GA + * -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -Sci * -Wb,export_macro=TAO_Messaging_Export * -Wb,export_include=messaging_export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp b/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp index f443d59c5a2..5315a7b58a5 100644 --- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp +++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.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, @@ -53,7 +53,7 @@ namespace Messaging // 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/Messaging/Messaging_SyncScope_PolicyC.cpp b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp index 90c22a1b819..2b27796711f 100644 --- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp +++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.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_SyncScope_PolicyC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h index 96d4bc09a7b..1d6e6d5c8ac 100644 --- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h +++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h @@ -236,11 +236,7 @@ TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::SyncScopePolicy_ TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::SyncScopePolicy_ptr &); // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "Messaging_SyncScope_PolicyC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.inl b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.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/TAO_Ext.pidl b/TAO/tao/Messaging/TAO_Ext.pidl index 430f833f1bb..4021057482f 100644 --- a/TAO/tao/Messaging/TAO_Ext.pidl +++ b/TAO/tao/Messaging/TAO_Ext.pidl @@ -15,7 +15,7 @@ * this is: * * tao_idl - * -o orig -Gp -Gd -Ge 1 -GT -Sc -GA + * -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -Sci * -Wb,export_macro=TAO_Messaging_Export * -Wb,export_include=messaging_export.h * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/Messaging/TAO_ExtA.cpp b/TAO/tao/Messaging/TAO_ExtA.cpp index a1a31388e1b..6650358a446 100644 --- a/TAO/tao/Messaging/TAO_ExtA.cpp +++ b/TAO/tao/Messaging/TAO_ExtA.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, @@ -53,7 +53,7 @@ namespace TAO // 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/Messaging/TAO_ExtC.cpp b/TAO/tao/Messaging/TAO_ExtC.cpp index a6bbb2e711b..300d04cbdc6 100644 --- a/TAO/tao/Messaging/TAO_ExtC.cpp +++ b/TAO/tao/Messaging/TAO_ExtC.cpp @@ -37,10 +37,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "TAO_ExtC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/Messaging/TAO_ExtC.h b/TAO/tao/Messaging/TAO_ExtC.h index 13f08ae3a30..0ecf3748bcd 100644 --- a/TAO/tao/Messaging/TAO_ExtC.h +++ b/TAO/tao/Messaging/TAO_ExtC.h @@ -236,11 +236,7 @@ TAO_Messaging_Export void operator<<= (CORBA::Any &, TAO::ConnectionTimeoutPolic TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::ConnectionTimeoutPolicy_ptr &); // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "TAO_ExtC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/Messaging/TAO_ExtC.inl b/TAO/tao/Messaging/TAO_ExtC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/Messaging/TAO_ExtC.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/PortableServer/AdapterActivator.pidl b/TAO/tao/PortableServer/AdapterActivator.pidl index d040d036790..7c717798a5b 100644 --- a/TAO/tao/PortableServer/AdapterActivator.pidl +++ b/TAO/tao/PortableServer/AdapterActivator.pidl @@ -9,7 +9,7 @@ * AdapaterActivatorC.{h,inl,cpp}, using the following command: * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -Sci -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/AdapterActivatorA.cpp b/TAO/tao/PortableServer/AdapterActivatorA.cpp index e9bdcc671d6..831c335e095 100644 --- a/TAO/tao/PortableServer/AdapterActivatorA.cpp +++ b/TAO/tao/PortableServer/AdapterActivatorA.cpp @@ -35,8 +35,10 @@ #include "tao/Any.h" #include "tao/Any_Impl_T.h" +#if (TAO_HAS_MINIMUM_POA == 0) + // 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, @@ -54,7 +56,7 @@ namespace PortableServer // 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 @@ -137,3 +139,5 @@ operator>>= ( > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/AdapterActivatorC.cpp b/TAO/tao/PortableServer/AdapterActivatorC.cpp index a99f4c667ed..a4166fc496a 100644 --- a/TAO/tao/PortableServer/AdapterActivatorC.cpp +++ b/TAO/tao/PortableServer/AdapterActivatorC.cpp @@ -37,10 +37,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "AdapterActivatorC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/PortableServer/AdapterActivatorC.h b/TAO/tao/PortableServer/AdapterActivatorC.h index 2f949336a20..698331b2889 100644 --- a/TAO/tao/PortableServer/AdapterActivatorC.h +++ b/TAO/tao/PortableServer/AdapterActivatorC.h @@ -215,11 +215,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Portab #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "AdapterActivatorC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/PortableServer/AdapterActivatorC.inl b/TAO/tao/PortableServer/AdapterActivatorC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/PortableServer/AdapterActivatorC.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/PortableServer/ForwardRequest.pidl b/TAO/tao/PortableServer/ForwardRequest.pidl index d2f17c4addf..6d00db78198 100644 --- a/TAO/tao/PortableServer/ForwardRequest.pidl +++ b/TAO/tao/PortableServer/ForwardRequest.pidl @@ -9,7 +9,7 @@ * ForwardRequestC.{h,inl,cpp}, using the following command: * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -GT -Sc -Sci -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/ForwardRequestA.cpp b/TAO/tao/PortableServer/ForwardRequestA.cpp index fbb7e515709..8710dfd334c 100644 --- a/TAO/tao/PortableServer/ForwardRequestA.cpp +++ b/TAO/tao/PortableServer/ForwardRequestA.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_PortableServer_ForwardRequest[] = { @@ -62,8 +62,10 @@ namespace PortableServer +#if (TAO_HAS_MINIMUM_POA == 0) + // 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 @@ -162,3 +164,5 @@ CORBA::Boolean operator>>= ( > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ForwardRequestC.cpp b/TAO/tao/PortableServer/ForwardRequestC.cpp index 512d1d08395..65f29d9b204 100644 --- a/TAO/tao/PortableServer/ForwardRequestC.cpp +++ b/TAO/tao/PortableServer/ForwardRequestC.cpp @@ -31,10 +31,6 @@ #include "ForwardRequestC.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 "ForwardRequestC.inl" -#endif /* !defined INLINE */ - #if (TAO_HAS_MINIMUM_POA == 0) // TAO_IDL - Generated from diff --git a/TAO/tao/PortableServer/ForwardRequestC.h b/TAO/tao/PortableServer/ForwardRequestC.h index 9e6b64c9e56..1f469455629 100644 --- a/TAO/tao/PortableServer/ForwardRequestC.h +++ b/TAO/tao/PortableServer/ForwardRequestC.h @@ -66,31 +66,31 @@ namespace PortableServer { - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_PORTABLESERVER_FORWARDREQUEST_CH_) #define _PORTABLESERVER_FORWARDREQUEST_CH_ - + class TAO_PortableServer_Export ForwardRequest : public CORBA::UserException { public: - + CORBA::Object_var forward_reference; ForwardRequest (void); ForwardRequest (const ForwardRequest &); ~ForwardRequest (void); ForwardRequest &operator= (const ForwardRequest &); - + static void _tao_any_destructor (void *); - + static ForwardRequest *_downcast (CORBA::Exception *); static const ForwardRequest *_downcast (CORBA::Exception const *); - + static CORBA::Exception *_alloc (void); - + virtual CORBA::Exception *_tao_duplicate (void) const; virtual void _raise (void) const; @@ -99,28 +99,28 @@ namespace PortableServer TAO_OutputCDR & ACE_ENV_ARG_DECL ) const; - + virtual void _tao_decode ( TAO_InputCDR & ACE_ENV_ARG_DECL ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ctor.cpp:66 - + ForwardRequest ( const CORBA::Object_ptr _tao_forward_reference ); - + // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:127 - + virtual CORBA::TypeCode_ptr _tao_type (void) const; }; - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ForwardRequest; #endif /* end #if !defined */ @@ -153,14 +153,10 @@ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Port TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ForwardRequest &); // TAO_IDL - Generated from -// be\be_codegen.cpp:947 +// be\be_codegen.cpp:955 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ -#if defined (__ACE_INLINE__) -#include "ForwardRequestC.inl" -#endif /* defined INLINE */ - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/PortableServer/ForwardRequestC.inl b/TAO/tao/PortableServer/ForwardRequestC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/PortableServer/ForwardRequestC.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/PortableServer/IdAssignmentPolicy.pidl b/TAO/tao/PortableServer/IdAssignmentPolicy.pidl index d47924fcef3..ca5610ad755 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicy.pidl +++ b/TAO/tao/PortableServer/IdAssignmentPolicy.pidl @@ -6,7 +6,7 @@ * @brief Pre-compiled IDL source for the PortableServer module. * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -GT -Sci -Sc -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp b/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp index 5e3586d59df..aae6e8e6de3 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp +++ b/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp @@ -37,7 +37,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_PortableServer_IdAssignmentPolicyValue[] = { @@ -64,7 +64,7 @@ namespace PortableServer // 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, @@ -82,7 +82,7 @@ namespace PortableServer // 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, @@ -110,7 +110,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/PortableServer/IdAssignmentPolicyC.cpp b/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp index 0a3c03514d2..f0d6927581c 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp +++ b/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp @@ -37,10 +37,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "IdAssignmentPolicyC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyC.h b/TAO/tao/PortableServer/IdAssignmentPolicyC.h index ed877b64bcb..57048a38d4d 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicyC.h +++ b/TAO/tao/PortableServer/IdAssignmentPolicyC.h @@ -258,11 +258,7 @@ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableSe TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdAssignmentPolicyValue &); // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "IdAssignmentPolicyC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyC.inl b/TAO/tao/PortableServer/IdAssignmentPolicyC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/PortableServer/IdAssignmentPolicyC.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/PortableServer/IdUniquenessPolicy.pidl b/TAO/tao/PortableServer/IdUniquenessPolicy.pidl index 0ac95d40866..6928a431fe6 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicy.pidl +++ b/TAO/tao/PortableServer/IdUniquenessPolicy.pidl @@ -6,7 +6,7 @@ * @brief Pre-compiled IDL source for the PortableServer module. * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -GT -Sc -Sci -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp b/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp index d7a23c9a355..e1a35f68125 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp +++ b/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp @@ -37,7 +37,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_PortableServer_IdUniquenessPolicyValue[] = { @@ -64,7 +64,7 @@ namespace PortableServer // 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, @@ -82,7 +82,7 @@ namespace PortableServer // 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, @@ -110,7 +110,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/PortableServer/IdUniquenessPolicyC.cpp b/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp index 2d27c2c08a4..a647f46bd40 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp +++ b/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp @@ -37,10 +37,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "IdUniquenessPolicyC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyC.h b/TAO/tao/PortableServer/IdUniquenessPolicyC.h index 143af9a164c..8889b3e82c3 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicyC.h +++ b/TAO/tao/PortableServer/IdUniquenessPolicyC.h @@ -258,11 +258,7 @@ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableSe TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdUniquenessPolicyValue &); // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "IdUniquenessPolicyC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyC.inl b/TAO/tao/PortableServer/IdUniquenessPolicyC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/PortableServer/IdUniquenessPolicyC.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/PortableServer/ImplicitActivationPolicy.pidl b/TAO/tao/PortableServer/ImplicitActivationPolicy.pidl index c03e7eda872..237d5cfedeb 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicy.pidl +++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.pidl @@ -6,7 +6,7 @@ * @brief Pre-compiled IDL source for the PortableServer module. * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -GT -Sc -Sci -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp index 2e34d452b03..9ea25a152cd 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp @@ -36,8 +36,10 @@ #include "tao/Any_Impl_T.h" #include "tao/Any_Basic_Impl_T.h" +#if (TAO_HAS_MINIMUM_POA == 0) + // 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_PortableServer_ImplicitActivationPolicyValue[] = { @@ -64,7 +66,7 @@ namespace PortableServer // 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, @@ -82,7 +84,7 @@ namespace PortableServer // 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, @@ -110,7 +112,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 @@ -203,3 +205,5 @@ operator>>= ( > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp index 2baf292bc3f..24107157e92 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp @@ -37,10 +37,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "ImplicitActivationPolicyC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyC.h b/TAO/tao/PortableServer/ImplicitActivationPolicyC.h index 15f08743afb..f32c6096541 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicyC.h +++ b/TAO/tao/PortableServer/ImplicitActivationPolicyC.h @@ -263,11 +263,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "ImplicitActivationPolicyC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyC.inl b/TAO/tao/PortableServer/ImplicitActivationPolicyC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/PortableServer/ImplicitActivationPolicyC.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/PortableServer/LifespanPolicy.pidl b/TAO/tao/PortableServer/LifespanPolicy.pidl index 7e43a9fe31e..197c620e1e1 100644 --- a/TAO/tao/PortableServer/LifespanPolicy.pidl +++ b/TAO/tao/PortableServer/LifespanPolicy.pidl @@ -6,7 +6,7 @@ * @brief Pre-compiled IDL source for the PortableServer module. * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -Sci -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/LifespanPolicyA.cpp b/TAO/tao/PortableServer/LifespanPolicyA.cpp index e9c97fa9bd1..f5c68819de1 100644 --- a/TAO/tao/PortableServer/LifespanPolicyA.cpp +++ b/TAO/tao/PortableServer/LifespanPolicyA.cpp @@ -37,7 +37,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_PortableServer_LifespanPolicyValue[] = { @@ -64,7 +64,7 @@ namespace PortableServer // 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, @@ -82,7 +82,7 @@ namespace PortableServer // 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, @@ -110,7 +110,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/PortableServer/LifespanPolicyC.cpp b/TAO/tao/PortableServer/LifespanPolicyC.cpp index 6e0d9b7ffd8..e2b9c4a303d 100644 --- a/TAO/tao/PortableServer/LifespanPolicyC.cpp +++ b/TAO/tao/PortableServer/LifespanPolicyC.cpp @@ -37,10 +37,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "LifespanPolicyC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/PortableServer/LifespanPolicyC.h b/TAO/tao/PortableServer/LifespanPolicyC.h index 08950874eb2..cfe619eaabe 100644 --- a/TAO/tao/PortableServer/LifespanPolicyC.h +++ b/TAO/tao/PortableServer/LifespanPolicyC.h @@ -258,11 +258,7 @@ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableSe TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::LifespanPolicyValue &); // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "LifespanPolicyC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/PortableServer/LifespanPolicyC.inl b/TAO/tao/PortableServer/LifespanPolicyC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/PortableServer/LifespanPolicyC.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/PortableServer/POAManager.pidl b/TAO/tao/PortableServer/POAManager.pidl index ce985a06aeb..1b8091f3066 100644 --- a/TAO/tao/PortableServer/POAManager.pidl +++ b/TAO/tao/PortableServer/POAManager.pidl @@ -6,7 +6,7 @@ * @brief Pre-compiled IDL source for the PortableServer module. * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -GT -Sc -Sci -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/POAManagerA.cpp b/TAO/tao/PortableServer/POAManagerA.cpp index b88830a69e9..db4804e820a 100644 --- a/TAO/tao/PortableServer/POAManagerA.cpp +++ b/TAO/tao/PortableServer/POAManagerA.cpp @@ -39,7 +39,7 @@ #include "tao/Any_Basic_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_PortableServer_POAManager_AdapterInactive = 0; static TAO::TypeCode::Struct<char const *, @@ -58,7 +58,7 @@ static TAO::TypeCode::Struct<char const *, &_tao_tc_PortableServer_POAManager_AdapterInactive; // 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_PortableServer_POAManager_State[] = { @@ -82,7 +82,7 @@ static TAO::TypeCode::Enum<char const *, &_tao_tc_PortableServer_POAManager_State; // 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, @@ -100,7 +100,7 @@ namespace PortableServer // 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 @@ -169,7 +169,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 @@ -241,7 +241,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 diff --git a/TAO/tao/PortableServer/POAManagerC.cpp b/TAO/tao/PortableServer/POAManagerC.cpp index 5d8d822ae84..ad89592a905 100644 --- a/TAO/tao/PortableServer/POAManagerC.cpp +++ b/TAO/tao/PortableServer/POAManagerC.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 "POAManagerC.h" @@ -37,12 +37,8 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "POAManagerC.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 @@ -51,7 +47,7 @@ namespace TAO // TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:60 +// be\be_visitor_interface/interface_cs.cpp:60 // Traits specializations for PortableServer::POAManager. @@ -87,7 +83,7 @@ TAO::Objref_Traits<PortableServer::POAManager>::marshal ( } // TAO_IDL - Generated from -// be/be_visitor_exception/exception_cs.cpp:63 +// be\be_visitor_exception/exception_cs.cpp:63 PortableServer::POAManager::AdapterInactive::AdapterInactive (void) : CORBA::UserException ( @@ -287,7 +283,7 @@ PortableServer::POAManager::marshal (TAO_OutputCDR &) } // 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/PortableServer/POAManagerC.h b/TAO/tao/PortableServer/POAManagerC.h index 29403e992cd..5bec8338a54 100644 --- a/TAO/tao/PortableServer/POAManagerC.h +++ b/TAO/tao/PortableServer/POAManagerC.h @@ -342,11 +342,7 @@ TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POAMan TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POAManager::State &); // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "POAManagerC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/PortableServer/POAManagerC.inl b/TAO/tao/PortableServer/POAManagerC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/PortableServer/POAManagerC.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/PortableServer/PS_Current.pidl b/TAO/tao/PortableServer/PS_Current.pidl index 1e472a83af7..b82753dd59d 100644 --- a/TAO/tao/PortableServer/PS_Current.pidl +++ b/TAO/tao/PortableServer/PS_Current.pidl @@ -9,7 +9,7 @@ * PS_CurrentC.{h,inl,cpp}, using the following command: * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -Sci -GT -Sc -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/PS_CurrentA.cpp b/TAO/tao/PortableServer/PS_CurrentA.cpp index 1b256196164..f004700f29a 100644 --- a/TAO/tao/PortableServer/PS_CurrentA.cpp +++ b/TAO/tao/PortableServer/PS_CurrentA.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_PortableServer_Current_NoContext = 0; static TAO::TypeCode::Struct<char const *, @@ -56,7 +56,7 @@ static TAO::TypeCode::Struct<char const *, &_tao_tc_PortableServer_Current_NoContext; // 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, @@ -74,7 +74,7 @@ namespace PortableServer // 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 @@ -143,7 +143,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 diff --git a/TAO/tao/PortableServer/PS_CurrentC.cpp b/TAO/tao/PortableServer/PS_CurrentC.cpp index 5bc142c8630..86baf974afa 100644 --- a/TAO/tao/PortableServer/PS_CurrentC.cpp +++ b/TAO/tao/PortableServer/PS_CurrentC.cpp @@ -31,21 +31,12 @@ #include "PS_CurrentC.h" #include "tao/CDR.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 "PS_CurrentC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/PortableServer/PS_CurrentC.h b/TAO/tao/PortableServer/PS_CurrentC.h index e07f6e0cc50..2a40f6ea5ac 100644 --- a/TAO/tao/PortableServer/PS_CurrentC.h +++ b/TAO/tao/PortableServer/PS_CurrentC.h @@ -292,11 +292,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Portab TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::Current::NoContext *&); // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "PS_CurrentC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/PortableServer/PS_CurrentC.inl b/TAO/tao/PortableServer/PS_CurrentC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/PortableServer/PS_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/PortableServer/PS_Forward.pidl b/TAO/tao/PortableServer/PS_Forward.pidl index 98fec072ed3..0566bd68018 100644 --- a/TAO/tao/PortableServer/PS_Forward.pidl +++ b/TAO/tao/PortableServer/PS_Forward.pidl @@ -9,7 +9,7 @@ * PS_ForwardC.{h,inl,cpp}, using the following command: * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -GT -Sc -Sci -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/PS_ForwardA.cpp b/TAO/tao/PortableServer/PS_ForwardA.cpp index b05904c1c24..c924bba740c 100644 --- a/TAO/tao/PortableServer/PS_ForwardA.cpp +++ b/TAO/tao/PortableServer/PS_ForwardA.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 *, diff --git a/TAO/tao/PortableServer/PS_ForwardC.cpp b/TAO/tao/PortableServer/PS_ForwardC.cpp index 14eca5ec9fb..c73fff57d48 100644 --- a/TAO/tao/PortableServer/PS_ForwardC.cpp +++ b/TAO/tao/PortableServer/PS_ForwardC.cpp @@ -37,10 +37,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "PS_ForwardC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/PortableServer/PS_ForwardC.h b/TAO/tao/PortableServer/PS_ForwardC.h index 50d00fd3868..9e39b774fe4 100644 --- a/TAO/tao/PortableServer/PS_ForwardC.h +++ b/TAO/tao/PortableServer/PS_ForwardC.h @@ -130,11 +130,7 @@ namespace TAO } // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "PS_ForwardC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/PortableServer/PS_ForwardC.inl b/TAO/tao/PortableServer/PS_ForwardC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/PortableServer/PS_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/PortableServer/PortableServer.pidl b/TAO/tao/PortableServer/PortableServer.pidl index 9a814481918..2e1ba2989dd 100644 --- a/TAO/tao/PortableServer/PortableServer.pidl +++ b/TAO/tao/PortableServer/PortableServer.pidl @@ -9,7 +9,7 @@ * PortableServerC.{h,inl,cpp}, using the following command: * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -I$(TAO_ROOT) + * -o orig -Sci -Gp -Gd -Ge 1 -GT -Sc -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/PortableServerA.cpp b/TAO/tao/PortableServer/PortableServerA.cpp index a8439fd24da..e0eb2c3ab56 100644 --- a/TAO/tao/PortableServer/PortableServerA.cpp +++ b/TAO/tao/PortableServer/PortableServerA.cpp @@ -39,18 +39,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 namespace PortableServer { extern ::CORBA::TypeCode_ptr const _tc_POA; } + +#ifndef _TAO_TYPECODE_PortableServer_POAList_GUARD +#define _TAO_TYPECODE_PortableServer_POAList_GUARD namespace TAO { namespace TypeCode @@ -61,13 +64,15 @@ namespace TAO CORBA::tk_sequence, &PortableServer::_tc_POA, 0U); - + ::CORBA::TypeCode_ptr const tc_PortableServer_POAList_0 = &PortableServer_POAList_0; - + } } + +#endif /* _TAO_TYPECODE_PortableServer_POAList_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -76,7 +81,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/PortableServer/POAList:1.0", "POAList", &TAO::TypeCode::tc_PortableServer_POAList_0); - + namespace PortableServer { ::CORBA::TypeCode_ptr const _tc_POAList = @@ -86,7 +91,7 @@ namespace PortableServer // 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_PortableServer_POA_AdapterAlreadyExists = 0; static TAO::TypeCode::Struct<char const *, @@ -100,12 +105,12 @@ static TAO::TypeCode::Struct<char const *, "AdapterAlreadyExists", _tao_fields_PortableServer_POA_AdapterAlreadyExists, 0); - + ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_AdapterAlreadyExists = &_tao_tc_PortableServer_POA_AdapterAlreadyExists; // 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_PortableServer_POA_AdapterNonExistent = 0; static TAO::TypeCode::Struct<char const *, @@ -119,17 +124,17 @@ static TAO::TypeCode::Struct<char const *, "AdapterNonExistent", _tao_fields_PortableServer_POA_AdapterNonExistent, 0); - + ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_AdapterNonExistent = &_tao_tc_PortableServer_POA_AdapterNonExistent; // 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_PortableServer_POA_InvalidPolicy[] = { { "index", &CORBA::_tc_ushort } - + }; static TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, @@ -142,12 +147,14 @@ static TAO::TypeCode::Struct<char const *, "InvalidPolicy", _tao_fields_PortableServer_POA_InvalidPolicy, 1); - + ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_InvalidPolicy = &_tao_tc_PortableServer_POA_InvalidPolicy; // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 + +#if (TAO_HAS_MINIMUM_POA == 0) static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_PortableServer_POA_NoServant = 0; static TAO::TypeCode::Struct<char const *, @@ -161,12 +168,14 @@ static TAO::TypeCode::Struct<char const *, "NoServant", _tao_fields_PortableServer_POA_NoServant, 0); - + ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_NoServant = &_tao_tc_PortableServer_POA_NoServant; +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ + // 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_PortableServer_POA_ObjectAlreadyActive = 0; static TAO::TypeCode::Struct<char const *, @@ -180,12 +189,12 @@ static TAO::TypeCode::Struct<char const *, "ObjectAlreadyActive", _tao_fields_PortableServer_POA_ObjectAlreadyActive, 0); - + ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_ObjectAlreadyActive = &_tao_tc_PortableServer_POA_ObjectAlreadyActive; // 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_PortableServer_POA_ObjectNotActive = 0; static TAO::TypeCode::Struct<char const *, @@ -199,12 +208,12 @@ static TAO::TypeCode::Struct<char const *, "ObjectNotActive", _tao_fields_PortableServer_POA_ObjectNotActive, 0); - + ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_ObjectNotActive = &_tao_tc_PortableServer_POA_ObjectNotActive; // 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_PortableServer_POA_ServantAlreadyActive = 0; static TAO::TypeCode::Struct<char const *, @@ -218,12 +227,12 @@ static TAO::TypeCode::Struct<char const *, "ServantAlreadyActive", _tao_fields_PortableServer_POA_ServantAlreadyActive, 0); - + ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_ServantAlreadyActive = &_tao_tc_PortableServer_POA_ServantAlreadyActive; // 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_PortableServer_POA_ServantNotActive = 0; static TAO::TypeCode::Struct<char const *, @@ -237,12 +246,12 @@ static TAO::TypeCode::Struct<char const *, "ServantNotActive", _tao_fields_PortableServer_POA_ServantNotActive, 0); - + ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_ServantNotActive = &_tao_tc_PortableServer_POA_ServantNotActive; // 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_PortableServer_POA_WrongAdapter = 0; static TAO::TypeCode::Struct<char const *, @@ -256,12 +265,12 @@ static TAO::TypeCode::Struct<char const *, "WrongAdapter", _tao_fields_PortableServer_POA_WrongAdapter, 0); - + ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_WrongAdapter = &_tao_tc_PortableServer_POA_WrongAdapter; // 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_PortableServer_POA_WrongPolicy = 0; static TAO::TypeCode::Struct<char const *, @@ -275,12 +284,12 @@ static TAO::TypeCode::Struct<char const *, "WrongPolicy", _tao_fields_PortableServer_POA_WrongPolicy, 0); - + ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_WrongPolicy = &_tao_tc_PortableServer_POA_WrongPolicy; // 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, @@ -288,7 +297,7 @@ static TAO::TypeCode::Objref<char const *, _tao_tc_PortableServer_POA ( "IDL:omg.org/PortableServer/POA:2.3", "POA"); - + namespace PortableServer { ::CORBA::TypeCode_ptr const _tc_POA = @@ -297,8 +306,8 @@ namespace PortableServer -// TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// TAO_IDL - Generated from +// be\be_visitor_sequence/any_op_cs.cpp:54 @@ -370,7 +379,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 @@ -438,8 +447,8 @@ operator>>= ( ); } -// TAO_IDL - Generated from -// be/be_visitor_exception/any_op_cs.cpp:50 +// TAO_IDL - Generated from +// be\be_visitor_exception/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -510,8 +519,8 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from -// be/be_visitor_exception/any_op_cs.cpp:50 +// TAO_IDL - Generated from +// be\be_visitor_exception/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -582,8 +591,8 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from -// be/be_visitor_exception/any_op_cs.cpp:50 +// TAO_IDL - Generated from +// be\be_visitor_exception/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -654,8 +663,10 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from -// be/be_visitor_exception/any_op_cs.cpp:50 +// TAO_IDL - Generated from +// be\be_visitor_exception/any_op_cs.cpp:50 + +#if (TAO_HAS_MINIMUM_POA == 0) template<> CORBA::Boolean @@ -726,8 +737,10 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from -// be/be_visitor_exception/any_op_cs.cpp:50 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ + +// TAO_IDL - Generated from +// be\be_visitor_exception/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -798,8 +811,8 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from -// be/be_visitor_exception/any_op_cs.cpp:50 +// TAO_IDL - Generated from +// be\be_visitor_exception/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -870,8 +883,8 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from -// be/be_visitor_exception/any_op_cs.cpp:50 +// TAO_IDL - Generated from +// be\be_visitor_exception/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -942,8 +955,8 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from -// be/be_visitor_exception/any_op_cs.cpp:50 +// TAO_IDL - Generated from +// be\be_visitor_exception/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -1014,8 +1027,8 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from -// be/be_visitor_exception/any_op_cs.cpp:50 +// TAO_IDL - Generated from +// be\be_visitor_exception/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -1086,8 +1099,8 @@ CORBA::Boolean operator>>= ( ); } -// TAO_IDL - Generated from -// be/be_visitor_exception/any_op_cs.cpp:50 +// TAO_IDL - Generated from +// be\be_visitor_exception/any_op_cs.cpp:50 template<> CORBA::Boolean @@ -1175,11 +1188,15 @@ CORBA::Boolean operator>>= ( PortableServer::POA::InvalidPolicy >; +#if (TAO_HAS_MINIMUM_POA == 0) + template class TAO::Any_Dual_Impl_T< PortableServer::POA::NoServant >; +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ + template class TAO::Any_Dual_Impl_T< PortableServer::POA::ObjectAlreadyActive @@ -1237,11 +1254,15 @@ CORBA::Boolean operator>>= ( PortableServer::POA::InvalidPolicy \ > +#if (TAO_HAS_MINIMUM_POA == 0) + # pragma instantiate \ TAO::Any_Dual_Impl_T< \ PortableServer::POA::NoServant \ > +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ + # pragma instantiate \ TAO::Any_Dual_Impl_T< \ PortableServer::POA::ObjectAlreadyActive \ @@ -1282,4 +1303,4 @@ CORBA::Boolean operator>>= ( PortableServer::POAList \ > -#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp index 635e442fe20..151c0d5c816 100644 --- a/TAO/tao/PortableServer/PortableServerC.cpp +++ b/TAO/tao/PortableServer/PortableServerC.cpp @@ -32,13 +32,6 @@ #include "PortableServer.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/Sequence_TypeCode.h" -#include "tao/String_TypeCode.h" -#include "tao/Struct_TypeCode.h" #include "tao/Object_Argument_T.h" #include "ace/OS_NS_string.h" @@ -46,10 +39,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "PortableServerC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 @@ -60,7 +49,7 @@ namespace TAO #define _PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_CS_ template<> - class TAO_PortableServer_Export Arg_Traits<PortableServer::AdapterActivator> + class Arg_Traits<PortableServer::AdapterActivator> : public Object_Arg_Traits_T< PortableServer::AdapterActivator_ptr, diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h index 7472c3b710f..1ea08c1b11e 100644 --- a/TAO/tao/PortableServer/PortableServerC.h +++ b/TAO/tao/PortableServer/PortableServerC.h @@ -1381,11 +1381,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Portab TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::WrongPolicy *&); // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "PortableServerC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/PortableServer/PortableServerC.inl b/TAO/tao/PortableServer/PortableServerC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/PortableServer/PortableServerC.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/PortableServer/PortableServer_include.pidl b/TAO/tao/PortableServer/PortableServer_include.pidl index 31f1319c167..dd300389aa6 100644 --- a/TAO/tao/PortableServer/PortableServer_include.pidl +++ b/TAO/tao/PortableServer/PortableServer_include.pidl @@ -15,7 +15,7 @@ * 1. Run the tao_idl compiler on the pidl file. The command used for * this is: * - * tao_idl -o orig -St -Sc -Sp + * tao_idl -o orig -St -Sc -Sp -Sci -SS * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/PortableServer/PortableServer_includeC.h b/TAO/tao/PortableServer/PortableServer_includeC.h index 5c813b75bd5..3bb0f4258ac 100644 --- a/TAO/tao/PortableServer/PortableServer_includeC.h +++ b/TAO/tao/PortableServer/PortableServer_includeC.h @@ -52,13 +52,6 @@ #endif #define TAO_EXPORT_MACRO TAO_PortableServer_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_PortableServer_Export -#endif /* TAO_EXPORT_NESTED_CLASSES */ - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) @@ -77,7 +70,7 @@ namespace TAO } // TAO_IDL - Generated from -// be\be_codegen.cpp:961 +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.pidl b/TAO/tao/PortableServer/RequestProcessingPolicy.pidl index 65272490e72..4799aafc996 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicy.pidl +++ b/TAO/tao/PortableServer/RequestProcessingPolicy.pidl @@ -6,7 +6,7 @@ * @brief Pre-compiled IDL source for the PortableServer module. * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -GT -Sc -Sci -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp b/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp index eac7f4dc12d..b565c1c14ef 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp +++ b/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp @@ -36,8 +36,10 @@ #include "tao/Any_Impl_T.h" #include "tao/Any_Basic_Impl_T.h" +#if (TAO_HAS_MINIMUM_POA == 0) + // 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_PortableServer_RequestProcessingPolicyValue[] = { @@ -65,7 +67,7 @@ namespace PortableServer // 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, @@ -83,7 +85,7 @@ namespace PortableServer // 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, @@ -111,7 +113,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 @@ -204,3 +206,5 @@ operator>>= ( > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp b/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp index f7af5bd7de2..5c14742ca0d 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp +++ b/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp @@ -37,10 +37,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "RequestProcessingPolicyC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyC.h b/TAO/tao/PortableServer/RequestProcessingPolicyC.h index 58868bdd360..49ac5003af9 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicyC.h +++ b/TAO/tao/PortableServer/RequestProcessingPolicyC.h @@ -264,11 +264,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "RequestProcessingPolicyC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyC.inl b/TAO/tao/PortableServer/RequestProcessingPolicyC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/PortableServer/RequestProcessingPolicyC.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/PortableServer/ServantActivator.pidl b/TAO/tao/PortableServer/ServantActivator.pidl index 94792e28695..028743592b2 100644 --- a/TAO/tao/PortableServer/ServantActivator.pidl +++ b/TAO/tao/PortableServer/ServantActivator.pidl @@ -9,7 +9,7 @@ * ServantActivatorC.{h,inl,cpp}, using the following command: * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -GT -Sc -Sci -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/ServantActivatorA.cpp b/TAO/tao/PortableServer/ServantActivatorA.cpp index d80159db02e..2a98822a191 100644 --- a/TAO/tao/PortableServer/ServantActivatorA.cpp +++ b/TAO/tao/PortableServer/ServantActivatorA.cpp @@ -34,8 +34,10 @@ #include "tao/Any.h" #include "tao/Any_Impl_T.h" +#if (TAO_HAS_MINIMUM_POA == 0) + // 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, @@ -53,7 +55,7 @@ namespace PortableServer // 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 @@ -136,3 +138,5 @@ operator>>= ( > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ServantActivatorC.cpp b/TAO/tao/PortableServer/ServantActivatorC.cpp index fbe6d0b69a9..21dd2699adc 100644 --- a/TAO/tao/PortableServer/ServantActivatorC.cpp +++ b/TAO/tao/PortableServer/ServantActivatorC.cpp @@ -38,10 +38,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "ServantActivatorC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/PortableServer/ServantActivatorC.h b/TAO/tao/PortableServer/ServantActivatorC.h index becf91a32f8..d47c4675aa1 100644 --- a/TAO/tao/PortableServer/ServantActivatorC.h +++ b/TAO/tao/PortableServer/ServantActivatorC.h @@ -234,11 +234,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Portab #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "ServantActivatorC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/PortableServer/ServantActivatorC.inl b/TAO/tao/PortableServer/ServantActivatorC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/PortableServer/ServantActivatorC.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/PortableServer/ServantLocator.pidl b/TAO/tao/PortableServer/ServantLocator.pidl index 3203b6578ed..bebc3df1d21 100644 --- a/TAO/tao/PortableServer/ServantLocator.pidl +++ b/TAO/tao/PortableServer/ServantLocator.pidl @@ -9,7 +9,7 @@ * ServantLocatorC.{h,inl,cpp}, using the following command: * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -GT -Sc -Sci -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/ServantLocatorA.cpp b/TAO/tao/PortableServer/ServantLocatorA.cpp index 5bf504f48cb..47f4da53a51 100644 --- a/TAO/tao/PortableServer/ServantLocatorA.cpp +++ b/TAO/tao/PortableServer/ServantLocatorA.cpp @@ -35,8 +35,10 @@ #include "tao/Any.h" #include "tao/Any_Impl_T.h" +#if (TAO_HAS_MINIMUM_POA == 0) + // 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, @@ -54,7 +56,7 @@ namespace PortableServer // 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 @@ -137,3 +139,5 @@ operator>>= ( > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ServantLocatorC.cpp b/TAO/tao/PortableServer/ServantLocatorC.cpp index 38df9de3e49..63ad8460583 100644 --- a/TAO/tao/PortableServer/ServantLocatorC.cpp +++ b/TAO/tao/PortableServer/ServantLocatorC.cpp @@ -38,10 +38,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "ServantLocatorC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/PortableServer/ServantLocatorC.h b/TAO/tao/PortableServer/ServantLocatorC.h index 77d2b5dc03c..cd1c1704b4f 100644 --- a/TAO/tao/PortableServer/ServantLocatorC.h +++ b/TAO/tao/PortableServer/ServantLocatorC.h @@ -239,11 +239,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Portab #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "ServantLocatorC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/PortableServer/ServantLocatorC.inl b/TAO/tao/PortableServer/ServantLocatorC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/PortableServer/ServantLocatorC.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/PortableServer/ServantManager.pidl b/TAO/tao/PortableServer/ServantManager.pidl index 4bb36847cb9..6056fe5b83a 100644 --- a/TAO/tao/PortableServer/ServantManager.pidl +++ b/TAO/tao/PortableServer/ServantManager.pidl @@ -9,7 +9,7 @@ * ServantManagerC.{h,inl,cpp}, using the following command: * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -GT -Sc -Sci -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/ServantManagerA.cpp b/TAO/tao/PortableServer/ServantManagerA.cpp index 3b6cf1be7e0..4e61157c6bb 100644 --- a/TAO/tao/PortableServer/ServantManagerA.cpp +++ b/TAO/tao/PortableServer/ServantManagerA.cpp @@ -34,8 +34,10 @@ #include "tao/Any.h" #include "tao/Any_Impl_T.h" +#if (TAO_HAS_MINIMUM_POA == 0) + // 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, @@ -53,7 +55,7 @@ namespace PortableServer // 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 @@ -136,3 +138,5 @@ operator>>= ( > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/PortableServer/ServantManagerC.cpp b/TAO/tao/PortableServer/ServantManagerC.cpp index 2f25539e56a..30d185091c2 100644 --- a/TAO/tao/PortableServer/ServantManagerC.cpp +++ b/TAO/tao/PortableServer/ServantManagerC.cpp @@ -37,10 +37,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "ServantManagerC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/PortableServer/ServantManagerC.h b/TAO/tao/PortableServer/ServantManagerC.h index 87b36ebf822..24fffffca38 100644 --- a/TAO/tao/PortableServer/ServantManagerC.h +++ b/TAO/tao/PortableServer/ServantManagerC.h @@ -201,11 +201,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Portab #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "ServantManagerC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/PortableServer/ServantManagerC.inl b/TAO/tao/PortableServer/ServantManagerC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/PortableServer/ServantManagerC.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/PortableServer/ServantRetentionPolicy.pidl b/TAO/tao/PortableServer/ServantRetentionPolicy.pidl index 8cd4a33ca3a..66d9e9c0f43 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicy.pidl +++ b/TAO/tao/PortableServer/ServantRetentionPolicy.pidl @@ -6,7 +6,7 @@ * @brief Pre-compiled IDL source for the PortableServer module. * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -GT -Sc -Sci -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp b/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp index e5ca47c256d..721ba8afe6a 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp +++ b/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp @@ -36,8 +36,10 @@ #include "tao/Any_Impl_T.h" #include "tao/Any_Basic_Impl_T.h" +#if (TAO_HAS_MINIMUM_POA == 0) + // 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_PortableServer_ServantRetentionPolicyValue[] = { @@ -64,7 +66,7 @@ namespace PortableServer // 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, @@ -82,7 +84,7 @@ namespace PortableServer // 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, @@ -110,7 +112,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 @@ -203,3 +205,5 @@ operator>>= ( > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +#endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp b/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp index b7e887f1d9d..7b34a88cb84 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp +++ b/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp @@ -37,10 +37,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "ServantRetentionPolicyC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyC.h b/TAO/tao/PortableServer/ServantRetentionPolicyC.h index 22626520015..fdb4f205954 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicyC.h +++ b/TAO/tao/PortableServer/ServantRetentionPolicyC.h @@ -263,11 +263,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "ServantRetentionPolicyC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyC.inl b/TAO/tao/PortableServer/ServantRetentionPolicyC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/PortableServer/ServantRetentionPolicyC.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/PortableServer/ThreadPolicy.pidl b/TAO/tao/PortableServer/ThreadPolicy.pidl index 40eaa688542..480be1332b5 100644 --- a/TAO/tao/PortableServer/ThreadPolicy.pidl +++ b/TAO/tao/PortableServer/ThreadPolicy.pidl @@ -6,7 +6,7 @@ * @brief Pre-compiled IDL source for the PortableServer module. * * tao_idl.exe \ - * -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -I$(TAO_ROOT) + * -o orig -Gp -Gd -Ge 1 -GT -Sc -Sci -GA -I$(TAO_ROOT) * -Wb,export_macro=TAO_PortableServer_Export \ * -Wb,export_include="portableserver_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/PortableServer/ThreadPolicyA.cpp b/TAO/tao/PortableServer/ThreadPolicyA.cpp index 553945165e0..97db8a79b28 100644 --- a/TAO/tao/PortableServer/ThreadPolicyA.cpp +++ b/TAO/tao/PortableServer/ThreadPolicyA.cpp @@ -36,8 +36,10 @@ #include "tao/Any_Impl_T.h" #include "tao/Any_Basic_Impl_T.h" +#if (TAO_HAS_MINIMUM_POA == 0) + // 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_PortableServer_ThreadPolicyValue[] = { @@ -64,7 +66,7 @@ namespace PortableServer // 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, @@ -82,7 +84,7 @@ namespace PortableServer // 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, @@ -110,7 +112,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 @@ -203,3 +205,5 @@ operator>>= ( > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +#endif /* TAO_HAS_MINIMUM_POA == 0 */ diff --git a/TAO/tao/PortableServer/ThreadPolicyC.cpp b/TAO/tao/PortableServer/ThreadPolicyC.cpp index 06b928d850d..26517d1e4ac 100644 --- a/TAO/tao/PortableServer/ThreadPolicyC.cpp +++ b/TAO/tao/PortableServer/ThreadPolicyC.cpp @@ -37,10 +37,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "ThreadPolicyC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/PortableServer/ThreadPolicyC.h b/TAO/tao/PortableServer/ThreadPolicyC.h index b85e9a9d151..4d07eafd5c0 100644 --- a/TAO/tao/PortableServer/ThreadPolicyC.h +++ b/TAO/tao/PortableServer/ThreadPolicyC.h @@ -263,11 +263,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "ThreadPolicyC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/PortableServer/ThreadPolicyC.inl b/TAO/tao/PortableServer/ThreadPolicyC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/PortableServer/ThreadPolicyC.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/PortableServer/diffs/AdapterActivator.diff b/TAO/tao/PortableServer/diffs/AdapterActivator.diff index 3808339cf30..a257d871826 100644 --- a/TAO/tao/PortableServer/diffs/AdapterActivator.diff +++ b/TAO/tao/PortableServer/diffs/AdapterActivator.diff @@ -1,5 +1,13 @@ ---- orig/AdapterActivatorC.h 2005-03-31 13:47:16.478204800 +0200 -+++ AdapterActivatorC.h 2005-03-31 13:48:23.174108800 +0200 +--- orig/AdapterActivatorC.h 2005-04-08 09:05:05.635929600 +0200 ++++ AdapterActivatorC.h 2005-04-08 09:12:54.000000000 +0200 +@@ -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: @@ -66,9 +66,10 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 @@ -19,11 +27,19 @@ +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ + // TAO_IDL - Generated from - // be\be_codegen.cpp:947 + // be\be_codegen.cpp:955 + +--- orig/AdapterActivatorC.cpp 2005-04-08 09:05:05.635929600 +0200 ++++ AdapterActivatorC.cpp 2005-04-08 09:12:54.000000000 +0200 +@@ -1,6 +1,6 @@ + // -*- C++ -*- + // +-// $Id$ ++// $Id$ ---- orig/AdapterActivatorC.cpp 2005-03-31 13:47:16.478204800 +0200 -+++ AdapterActivatorC.cpp 2005-03-31 13:47:23.097723200 +0200 -@@ -44,6 +44,8 @@ + // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** + // TAO and the TAO IDL Compiler have been developed by: +@@ -40,6 +40,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 @@ -32,14 +48,22 @@ // Arg traits specializations. namespace TAO { -@@ -229,3 +231,5 @@ +@@ -225,3 +227,5 @@ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ---- orig/AdapterActivatorA.cpp 2005-03-31 13:47:16.478204800 +0200 -+++ AdapterActivatorA.cpp 2005-03-31 13:47:23.107737600 +0200 +--- orig/AdapterActivatorA.cpp 2005-04-08 09:05:05.635929600 +0200 ++++ AdapterActivatorA.cpp 2005-04-08 09:12:54.000000000 +0200 +@@ -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: @@ -35,6 +35,8 @@ #include "tao/Any.h" #include "tao/Any_Impl_T.h" @@ -47,7 +71,7 @@ +#if (TAO_HAS_MINIMUM_POA == 0) + // TAO_IDL - Generated from - // be\be_visitor_typecode/objref_typecode.cpp:73 + // be\be_visitor_typecode/objref_typecode.cpp:76 @@ -137,3 +139,5 @@ > diff --git a/TAO/tao/PortableServer/diffs/ForwardRequest.diff b/TAO/tao/PortableServer/diffs/ForwardRequest.diff index f0a8791b1e1..8e4b870137f 100644 --- a/TAO/tao/PortableServer/diffs/ForwardRequest.diff +++ b/TAO/tao/PortableServer/diffs/ForwardRequest.diff @@ -1,5 +1,13 @@ ---- orig/ForwardRequestC.h 2005-03-31 13:47:21.174958400 +0200 -+++ ForwardRequestC.h 2005-03-31 13:47:23.698587200 +0200 +--- orig/ForwardRequestC.h 2005-04-08 09:05:08.990753600 +0200 ++++ ForwardRequestC.h 2005-04-08 09:12:54.000000000 +0200 +@@ -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: @@ -59,6 +59,8 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ @@ -11,33 +19,49 @@ @@ -153,6 +155,8 @@ // TAO_IDL - Generated from - // be\be_codegen.cpp:947 + // be\be_codegen.cpp:955 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ + - #if defined (__ACE_INLINE__) - #include "ForwardRequestC.inl" - #endif /* defined INLINE */ ---- orig/ForwardRequestC.cpp 2005-03-31 13:47:21.174958400 +0200 -+++ ForwardRequestC.cpp 2005-03-31 13:47:23.698587200 +0200 -@@ -46,6 +46,8 @@ - #include "ForwardRequestC.inl" - #endif /* !defined INLINE */ + #if defined(_MSC_VER) + #pragma warning(pop) + #endif /* _MSC_VER */ +--- orig/ForwardRequestC.cpp 2005-04-08 09:05:08.990753600 +0200 ++++ ForwardRequestC.cpp 2005-04-08 09:12:54.000000000 +0200 +@@ -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: +@@ -38,6 +38,8 @@ + #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig + #endif /* __BORLANDC__ */ +#if (TAO_HAS_MINIMUM_POA == 0) + // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 -@@ -219,3 +221,5 @@ +@@ -211,3 +213,5 @@ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ---- orig/ForwardRequestA.cpp 2005-03-31 13:47:21.174958400 +0200 -+++ ForwardRequestA.cpp 2005-03-31 13:47:23.698587200 +0200 -@@ -60,6 +60,8 @@ +--- orig/ForwardRequestA.cpp 2005-04-08 09:05:08.990753600 +0200 ++++ ForwardRequestA.cpp 2005-04-08 09:12:54.000000000 +0200 +@@ -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: +@@ -62,6 +62,8 @@ @@ -46,7 +70,7 @@ // TAO_IDL - Generated from // be\be_visitor_exception/any_op_cs.cpp:50 -@@ -160,3 +162,5 @@ +@@ -162,3 +164,5 @@ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff b/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff index b8be654d9f3..ce4cdf8e782 100644 --- a/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff +++ b/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff @@ -1,5 +1,13 @@ ---- orig/ImplicitActivationPolicyC.h 2005-03-31 13:47:17.589803200 +0200 -+++ ImplicitActivationPolicyC.h 2005-03-31 13:47:23.177838400 +0200 +--- orig/ImplicitActivationPolicyC.h 2005-04-08 09:05:06.246808000 +0200 ++++ ImplicitActivationPolicyC.h 2005-04-08 09:12:55.000000000 +0200 +@@ -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: @@ -78,6 +78,7 @@ NO_IMPLICIT_ACTIVATION }; @@ -29,11 +37,19 @@ +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ + // TAO_IDL - Generated from - // be\be_codegen.cpp:947 + // be\be_codegen.cpp:955 + +--- orig/ImplicitActivationPolicyC.cpp 2005-04-08 09:05:06.246808000 +0200 ++++ ImplicitActivationPolicyC.cpp 2005-04-08 09:12:55.000000000 +0200 +@@ -1,6 +1,6 @@ + // -*- C++ -*- + // +-// $Id$ ++// $Id$ ---- orig/ImplicitActivationPolicyC.cpp 2005-03-31 13:47:17.589803200 +0200 -+++ ImplicitActivationPolicyC.cpp 2005-03-31 13:47:23.187852800 +0200 -@@ -44,6 +44,8 @@ + // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** + // TAO and the TAO IDL Compiler have been developed by: +@@ -40,6 +40,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 @@ -42,15 +58,23 @@ // Arg traits specializations. namespace TAO { -@@ -254,3 +256,5 @@ +@@ -250,3 +252,5 @@ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ---- orig/ImplicitActivationPolicyA.cpp 2005-03-31 13:47:17.589803200 +0200 -+++ ImplicitActivationPolicyA.cpp 2005-03-31 13:47:23.197867200 +0200 -@@ -37,6 +37,8 @@ +--- orig/ImplicitActivationPolicyA.cpp 2005-04-08 09:05:06.246808000 +0200 ++++ ImplicitActivationPolicyA.cpp 2005-04-08 09:12:55.000000000 +0200 +@@ -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: +@@ -36,6 +36,8 @@ #include "tao/Any_Impl_T.h" #include "tao/Any_Basic_Impl_T.h" @@ -59,7 +83,7 @@ // TAO_IDL - Generated from // be\be_visitor_typecode/enum_typecode.cpp:34 -@@ -204,3 +206,5 @@ +@@ -203,3 +205,5 @@ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/diffs/POAManager.diff b/TAO/tao/PortableServer/diffs/POAManager.diff index 4915218a623..3b579c59f3f 100644 --- a/TAO/tao/PortableServer/diffs/POAManager.diff +++ b/TAO/tao/PortableServer/diffs/POAManager.diff @@ -1,5 +1,13 @@ ---- orig/POAManagerC.h 2005-03-31 13:47:18.250753600 +0200 -+++ POAManagerC.h 2005-03-31 13:47:23.368112000 +0200 +--- orig/POAManagerC.h 2005-04-08 09:05:06.727499200 +0200 ++++ POAManagerC.h 2005-04-08 09:12:55.000000000 +0200 +@@ -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: @@ -207,6 +207,8 @@ // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 diff --git a/TAO/tao/PortableServer/diffs/PS_Forward.diff b/TAO/tao/PortableServer/diffs/PS_Forward.diff index 57d71bac8a0..9923d1b1c00 100644 --- a/TAO/tao/PortableServer/diffs/PS_Forward.diff +++ b/TAO/tao/PortableServer/diffs/PS_Forward.diff @@ -1,5 +1,13 @@ ---- orig/PS_ForwardC.h 2005-03-31 13:47:19.552625600 +0200 -+++ PS_ForwardC.h 2005-03-31 13:47:23.518328000 +0200 +--- orig/PS_ForwardC.h 2005-04-08 09:05:07.598752000 +0200 ++++ PS_ForwardC.h 2005-04-08 09:12:55.000000000 +0200 +@@ -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: @@ -61,11 +61,25 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ diff --git a/TAO/tao/PortableServer/diffs/PortableServer.diff b/TAO/tao/PortableServer/diffs/PortableServer.diff index d89e2c66577..ad6b94bb713 100644 --- a/TAO/tao/PortableServer/diffs/PortableServer.diff +++ b/TAO/tao/PortableServer/diffs/PortableServer.diff @@ -1,5 +1,13 @@ ---- orig/PortableServerC.h 2005-03-31 13:47:18.991819200 +0200 -+++ PortableServerC.h 2005-03-31 13:47:23.478270400 +0200 +--- orig/PortableServerC.h 2005-04-08 09:05:07.208190400 +0200 ++++ PortableServerC.h 2005-04-08 09:12:55.000000000 +0200 +@@ -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: @@ -36,6 +36,10 @@ #include "ace/config-all.h" @@ -148,13 +156,21 @@ // TAO_IDL - Generated from // be\be_visitor_exception/any_op_ch.cpp:52 -@@ -1370,4 +1399,3 @@ +@@ -1366,4 +1395,3 @@ #endif /* ifndef */ - ---- orig/PortableServerC.cpp 2005-03-31 13:47:18.991819200 +0200 -+++ PortableServerC.cpp 2005-03-31 13:47:23.488284800 +0200 +--- orig/PortableServerC.cpp 2005-04-08 09:05:07.208190400 +0200 ++++ PortableServerC.cpp 2005-04-08 09:12:55.000000000 +0200 +@@ -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: @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 @@ -163,8 +179,8 @@ +#include "PortableServer.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" - #include "tao/Null_RefCount_Policy.h" -@@ -56,7 +56,6 @@ + #include "tao/Object_Argument_T.h" +@@ -45,7 +45,6 @@ // Arg traits specializations. namespace TAO { @@ -172,7 +188,7 @@ #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_CS_) #define _PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_CS_ -@@ -75,7 +74,6 @@ +@@ -64,7 +63,6 @@ #endif /* end #if !defined */ } @@ -180,7 +196,7 @@ // TAO_IDL - Generated from // be\be_visitor_sequence/sequence_cs.cpp:65 -@@ -474,6 +472,8 @@ +@@ -463,6 +461,8 @@ // TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 @@ -189,7 +205,7 @@ PortableServer::POA::NoServant::NoServant (void) : CORBA::UserException ( "IDL:omg.org/PortableServer/POA/NoServant:2.3", -@@ -566,6 +566,8 @@ +@@ -555,6 +555,8 @@ return ::PortableServer::POA::_tc_NoServant; } @@ -198,8 +214,16 @@ // TAO_IDL - Generated from // be\be_visitor_exception/exception_cs.cpp:63 ---- orig/PortableServerA.cpp 2005-03-31 13:47:18.991819200 +0200 -+++ PortableServerA.cpp 2005-03-31 13:47:23.488284800 +0200 +--- orig/PortableServerA.cpp 2005-04-08 09:05:07.208190400 +0200 ++++ PortableServerA.cpp 2005-04-08 09:12:55.000000000 +0200 +@@ -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: @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html @@ -209,25 +233,25 @@ #include "tao/Null_RefCount_Policy.h" #include "tao/TypeCode_Constants.h" #include "tao/Alias_TypeCode.h" -@@ -140,6 +140,8 @@ +@@ -154,6 +154,8 @@ // TAO_IDL - Generated from - // be\be_visitor_typecode/struct_typecode.cpp:34 + // be\be_visitor_typecode/struct_typecode.cpp:70 +#if (TAO_HAS_MINIMUM_POA == 0) + - static TAO::TypeCode::Struct_Field<char const *> const * const _tao_fields_PortableServer_POA_NoServant = 0; + static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_PortableServer_POA_NoServant = 0; static TAO::TypeCode::Struct<char const *, - TAO::TypeCode::Struct_Field<char const *> const *, -@@ -154,6 +156,8 @@ + CORBA::TypeCode_ptr const *, +@@ -170,6 +172,8 @@ ::CORBA::TypeCode_ptr const PortableServer::POA::_tc_NoServant = &_tao_tc_PortableServer_POA_NoServant; +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ + // TAO_IDL - Generated from - // be\be_visitor_typecode/struct_typecode.cpp:34 + // be\be_visitor_typecode/struct_typecode.cpp:70 -@@ -634,6 +638,8 @@ +@@ -662,6 +666,8 @@ // TAO_IDL - Generated from // be\be_visitor_exception/any_op_cs.cpp:50 @@ -236,7 +260,7 @@ template<> CORBA::Boolean TAO::Any_Dual_Impl_T<PortableServer::POA::NoServant>::marshal_value (TAO_OutputCDR &) -@@ -703,6 +709,8 @@ +@@ -731,6 +737,8 @@ ); } @@ -245,7 +269,7 @@ // TAO_IDL - Generated from // be\be_visitor_exception/any_op_cs.cpp:50 -@@ -1152,11 +1160,15 @@ +@@ -1180,11 +1188,15 @@ PortableServer::POA::InvalidPolicy >; @@ -261,7 +285,7 @@ template class TAO::Any_Dual_Impl_T< PortableServer::POA::ObjectAlreadyActive -@@ -1214,11 +1226,15 @@ +@@ -1242,11 +1254,15 @@ PortableServer::POA::InvalidPolicy \ > diff --git a/TAO/tao/PortableServer/diffs/PortableServer_include.diff b/TAO/tao/PortableServer/diffs/PortableServer_include.diff index 49fcd53d43b..c20e354eddd 100644 --- a/TAO/tao/PortableServer/diffs/PortableServer_include.diff +++ b/TAO/tao/PortableServer/diffs/PortableServer_include.diff @@ -1,5 +1,13 @@ ---- orig/PortableServer_includeC.h 2005-03-31 13:47:22.246499200 +0200 -+++ PortableServer_includeC.h 2005-03-31 13:47:23.818760000 +0200 +--- orig/PortableServer_includeC.h 2005-04-08 09:05:09.691761600 +0200 ++++ PortableServer_includeC.h 2005-04-08 09:12:55.000000000 +0200 +@@ -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: @@ -45,7 +45,7 @@ #include "tao/SystemException.h" #include "tao/Environment.h" diff --git a/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff b/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff index cf8bff3e0df..1bbe316b150 100644 --- a/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff +++ b/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff @@ -1,5 +1,13 @@ ---- orig/RequestProcessingPolicyC.h 2005-03-31 13:47:19.893115200 +0200 -+++ RequestProcessingPolicyC.h 2005-03-31 13:47:23.548371200 +0200 +--- orig/RequestProcessingPolicyC.h 2005-04-08 09:05:07.889169600 +0200 ++++ RequestProcessingPolicyC.h 2005-04-08 09:12:55.000000000 +0200 +@@ -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: @@ -79,6 +79,7 @@ USE_SERVANT_MANAGER }; @@ -29,11 +37,19 @@ +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ + // TAO_IDL - Generated from - // be\be_codegen.cpp:947 + // be\be_codegen.cpp:955 + +--- orig/RequestProcessingPolicyC.cpp 2005-04-08 09:05:07.889169600 +0200 ++++ RequestProcessingPolicyC.cpp 2005-04-08 09:12:55.000000000 +0200 +@@ -1,6 +1,6 @@ + // -*- C++ -*- + // +-// $Id$ ++// $Id$ ---- orig/RequestProcessingPolicyC.cpp 2005-03-31 13:47:19.893115200 +0200 -+++ RequestProcessingPolicyC.cpp 2005-03-31 13:47:23.548371200 +0200 -@@ -44,6 +44,8 @@ + // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** + // TAO and the TAO IDL Compiler have been developed by: +@@ -40,6 +40,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 @@ -42,15 +58,23 @@ // Arg traits specializations. namespace TAO { -@@ -254,3 +256,5 @@ +@@ -250,3 +252,5 @@ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ---- orig/RequestProcessingPolicyA.cpp 2005-03-31 13:47:19.893115200 +0200 -+++ RequestProcessingPolicyA.cpp 2005-03-31 13:47:23.548371200 +0200 -@@ -37,6 +37,8 @@ +--- orig/RequestProcessingPolicyA.cpp 2005-04-08 09:05:07.889169600 +0200 ++++ RequestProcessingPolicyA.cpp 2005-04-08 09:12:55.000000000 +0200 +@@ -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: +@@ -36,6 +36,8 @@ #include "tao/Any_Impl_T.h" #include "tao/Any_Basic_Impl_T.h" @@ -59,7 +83,7 @@ // TAO_IDL - Generated from // be\be_visitor_typecode/enum_typecode.cpp:34 -@@ -205,3 +207,5 @@ +@@ -204,3 +206,5 @@ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/diffs/ServantActivator.diff b/TAO/tao/PortableServer/diffs/ServantActivator.diff index 841f8eecb05..9a3621ac62a 100644 --- a/TAO/tao/PortableServer/diffs/ServantActivator.diff +++ b/TAO/tao/PortableServer/diffs/ServantActivator.diff @@ -1,5 +1,13 @@ ---- orig/ServantActivatorC.h 2005-03-31 13:47:20.213576000 +0200 -+++ ServantActivatorC.h 2005-03-31 13:49:46.944564800 +0200 +--- orig/ServantActivatorC.h 2005-04-08 09:05:08.199616000 +0200 ++++ ServantActivatorC.h 2005-04-08 09:12:55.000000000 +0200 +@@ -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: @@ -68,6 +68,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 @@ -16,11 +24,19 @@ +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ + // TAO_IDL - Generated from - // be\be_codegen.cpp:947 + // be\be_codegen.cpp:955 + +--- orig/ServantActivatorC.cpp 2005-04-08 09:05:08.199616000 +0200 ++++ ServantActivatorC.cpp 2005-04-08 09:12:55.000000000 +0200 +@@ -1,6 +1,6 @@ + // -*- C++ -*- + // +-// $Id$ ++// $Id$ ---- orig/ServantActivatorC.cpp 2005-03-31 13:47:20.213576000 +0200 -+++ ServantActivatorC.cpp 2005-03-31 13:47:23.578414400 +0200 -@@ -45,6 +45,8 @@ + // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** + // TAO and the TAO IDL Compiler have been developed by: +@@ -41,6 +41,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 @@ -29,14 +45,22 @@ // Arg traits specializations. namespace TAO { -@@ -234,3 +236,5 @@ +@@ -230,3 +232,5 @@ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ---- orig/ServantActivatorA.cpp 2005-03-31 13:47:20.213576000 +0200 -+++ ServantActivatorA.cpp 2005-03-31 13:47:23.578414400 +0200 +--- orig/ServantActivatorA.cpp 2005-04-08 09:05:08.199616000 +0200 ++++ ServantActivatorA.cpp 2005-04-08 09:12:55.000000000 +0200 +@@ -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: @@ -34,6 +34,8 @@ #include "tao/Any.h" #include "tao/Any_Impl_T.h" @@ -44,7 +68,7 @@ +#if (TAO_HAS_MINIMUM_POA == 0) + // TAO_IDL - Generated from - // be\be_visitor_typecode/objref_typecode.cpp:73 + // be\be_visitor_typecode/objref_typecode.cpp:76 @@ -136,3 +138,5 @@ > diff --git a/TAO/tao/PortableServer/diffs/ServantLocator.diff b/TAO/tao/PortableServer/diffs/ServantLocator.diff index 0e871fba790..c3c7728f2ba 100644 --- a/TAO/tao/PortableServer/diffs/ServantLocator.diff +++ b/TAO/tao/PortableServer/diffs/ServantLocator.diff @@ -1,5 +1,13 @@ ---- orig/ServantLocatorC.h 2005-03-31 13:47:20.564080000 +0200 -+++ ServantLocatorC.h 2005-03-31 13:50:05.040585600 +0200 +--- orig/ServantLocatorC.h 2005-04-08 09:05:08.470004800 +0200 ++++ ServantLocatorC.h 2005-04-08 09:12:55.000000000 +0200 +@@ -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: @@ -69,6 +69,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 @@ -25,11 +33,19 @@ +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ + // TAO_IDL - Generated from - // be\be_codegen.cpp:947 + // be\be_codegen.cpp:955 + +--- orig/ServantLocatorC.cpp 2005-04-08 09:05:08.470004800 +0200 ++++ ServantLocatorC.cpp 2005-04-08 09:12:55.000000000 +0200 +@@ -1,6 +1,6 @@ + // -*- C++ -*- + // +-// $Id$ ++// $Id$ ---- orig/ServantLocatorC.cpp 2005-03-31 13:47:20.564080000 +0200 -+++ ServantLocatorC.cpp 2005-03-31 13:47:23.618472000 +0200 -@@ -45,6 +45,8 @@ + // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** + // TAO and the TAO IDL Compiler have been developed by: +@@ -41,6 +41,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 @@ -38,14 +54,22 @@ // Arg traits specializations. namespace TAO { -@@ -234,3 +236,5 @@ +@@ -230,3 +232,5 @@ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ---- orig/ServantLocatorA.cpp 2005-03-31 13:47:20.564080000 +0200 -+++ ServantLocatorA.cpp 2005-03-31 13:47:23.628486400 +0200 +--- orig/ServantLocatorA.cpp 2005-04-08 09:05:08.470004800 +0200 ++++ ServantLocatorA.cpp 2005-04-08 09:12:55.000000000 +0200 +@@ -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: @@ -35,6 +35,8 @@ #include "tao/Any.h" #include "tao/Any_Impl_T.h" @@ -53,7 +77,7 @@ +#if (TAO_HAS_MINIMUM_POA == 0) + // TAO_IDL - Generated from - // be\be_visitor_typecode/objref_typecode.cpp:73 + // be\be_visitor_typecode/objref_typecode.cpp:76 @@ -137,3 +139,5 @@ > diff --git a/TAO/tao/PortableServer/diffs/ServantManager.diff b/TAO/tao/PortableServer/diffs/ServantManager.diff index ef10860520a..3b24eb9c42a 100644 --- a/TAO/tao/PortableServer/diffs/ServantManager.diff +++ b/TAO/tao/PortableServer/diffs/ServantManager.diff @@ -1,5 +1,13 @@ ---- orig/ServantManagerC.h 2005-03-31 13:47:20.824454400 +0200 -+++ ServantManagerC.h 2005-03-31 13:49:26.244800000 +0200 +--- orig/ServantManagerC.h 2005-04-08 09:05:08.740393600 +0200 ++++ ServantManagerC.h 2005-04-08 09:12:55.000000000 +0200 +@@ -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: @@ -63,6 +63,8 @@ // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 @@ -16,11 +24,19 @@ +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ + // TAO_IDL - Generated from - // be\be_codegen.cpp:947 + // be\be_codegen.cpp:955 + +--- orig/ServantManagerC.cpp 2005-04-08 09:05:08.740393600 +0200 ++++ ServantManagerC.cpp 2005-04-08 09:12:55.000000000 +0200 +@@ -1,6 +1,6 @@ + // -*- C++ -*- + // +-// $Id$ ++// $Id$ ---- orig/ServantManagerC.cpp 2005-03-31 13:47:20.834468800 +0200 -+++ ServantManagerC.cpp 2005-03-31 13:47:23.668544000 +0200 -@@ -49,6 +49,7 @@ + // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** + // TAO and the TAO IDL Compiler have been developed by: +@@ -45,6 +45,7 @@ { } @@ -28,14 +44,22 @@ // TAO_IDL - Generated from // be\be_visitor_interface/interface_cs.cpp:60 -@@ -229,3 +230,5 @@ +@@ -225,3 +226,5 @@ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ---- orig/ServantManagerA.cpp 2005-03-31 13:47:20.834468800 +0200 -+++ ServantManagerA.cpp 2005-03-31 13:47:23.668544000 +0200 +--- orig/ServantManagerA.cpp 2005-04-08 09:05:08.740393600 +0200 ++++ ServantManagerA.cpp 2005-04-08 09:12:55.000000000 +0200 +@@ -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: @@ -34,6 +34,8 @@ #include "tao/Any.h" #include "tao/Any_Impl_T.h" @@ -43,7 +67,7 @@ +#if (TAO_HAS_MINIMUM_POA == 0) + // TAO_IDL - Generated from - // be\be_visitor_typecode/objref_typecode.cpp:73 + // be\be_visitor_typecode/objref_typecode.cpp:76 @@ -136,3 +138,5 @@ > diff --git a/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff b/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff index 82a84da55bb..cedf51239c8 100644 --- a/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff +++ b/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff @@ -1,5 +1,13 @@ ---- orig/ServantRetentionPolicyC.h 2005-03-31 13:47:21.555505600 +0200 -+++ ServantRetentionPolicyC.h 2005-03-31 13:47:23.738644800 +0200 +--- orig/ServantRetentionPolicyC.h 2005-04-08 09:05:09.241113600 +0200 ++++ ServantRetentionPolicyC.h 2005-04-08 09:12:55.000000000 +0200 +@@ -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: @@ -78,6 +78,7 @@ NON_RETAIN }; @@ -29,11 +37,19 @@ +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ + // TAO_IDL - Generated from - // be\be_codegen.cpp:947 + // be\be_codegen.cpp:955 + +--- orig/ServantRetentionPolicyC.cpp 2005-04-08 09:05:09.241113600 +0200 ++++ ServantRetentionPolicyC.cpp 2005-04-08 09:12:55.000000000 +0200 +@@ -1,6 +1,6 @@ + // -*- C++ -*- + // +-// $Id$ ++// $Id$ ---- orig/ServantRetentionPolicyC.cpp 2005-03-31 13:47:21.555505600 +0200 -+++ ServantRetentionPolicyC.cpp 2005-03-31 13:47:23.738644800 +0200 -@@ -44,6 +44,8 @@ + // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** + // TAO and the TAO IDL Compiler have been developed by: +@@ -40,6 +40,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 @@ -42,15 +58,23 @@ // Arg traits specializations. namespace TAO { -@@ -254,3 +256,5 @@ +@@ -250,3 +252,5 @@ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ---- orig/ServantRetentionPolicyA.cpp 2005-03-31 13:47:21.555505600 +0200 -+++ ServantRetentionPolicyA.cpp 2005-03-31 13:47:23.738644800 +0200 -@@ -37,6 +37,8 @@ +--- orig/ServantRetentionPolicyA.cpp 2005-04-08 09:05:09.241113600 +0200 ++++ ServantRetentionPolicyA.cpp 2005-04-08 09:12:55.000000000 +0200 +@@ -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: +@@ -36,6 +36,8 @@ #include "tao/Any_Impl_T.h" #include "tao/Any_Basic_Impl_T.h" @@ -59,7 +83,7 @@ // TAO_IDL - Generated from // be\be_visitor_typecode/enum_typecode.cpp:34 -@@ -204,3 +206,5 @@ +@@ -203,3 +205,5 @@ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/diffs/ThreadPolicy.diff b/TAO/tao/PortableServer/diffs/ThreadPolicy.diff index d577f1470e6..76a7ea55cff 100644 --- a/TAO/tao/PortableServer/diffs/ThreadPolicy.diff +++ b/TAO/tao/PortableServer/diffs/ThreadPolicy.diff @@ -1,5 +1,13 @@ ---- orig/ThreadPolicyC.h 2005-03-31 13:47:21.855937600 +0200 -+++ ThreadPolicyC.h 2005-03-31 13:47:23.778702400 +0200 +--- orig/ThreadPolicyC.h 2005-04-08 09:05:09.511502400 +0200 ++++ ThreadPolicyC.h 2005-04-08 09:12:55.000000000 +0200 +@@ -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: @@ -78,6 +78,7 @@ SINGLE_THREAD_MODEL }; @@ -30,11 +38,19 @@ +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ + // TAO_IDL - Generated from - // be\be_codegen.cpp:947 + // be\be_codegen.cpp:955 + +--- orig/ThreadPolicyC.cpp 2005-04-08 09:05:09.511502400 +0200 ++++ ThreadPolicyC.cpp 2005-04-08 09:12:55.000000000 +0200 +@@ -1,6 +1,6 @@ + // -*- C++ -*- + // +-// $Id$ ++// $Id$ ---- orig/ThreadPolicyC.cpp 2005-03-31 13:47:21.855937600 +0200 -+++ ThreadPolicyC.cpp 2005-03-31 13:47:23.778702400 +0200 -@@ -44,6 +44,8 @@ + // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** + // TAO and the TAO IDL Compiler have been developed by: +@@ -40,6 +40,8 @@ // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 @@ -43,15 +59,23 @@ // Arg traits specializations. namespace TAO { -@@ -254,3 +256,5 @@ +@@ -250,3 +252,5 @@ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ ---- orig/ThreadPolicyA.cpp 2005-03-31 13:47:21.855937600 +0200 -+++ ThreadPolicyA.cpp 2005-03-31 13:47:23.788716800 +0200 -@@ -37,6 +37,8 @@ +--- orig/ThreadPolicyA.cpp 2005-04-08 09:05:09.511502400 +0200 ++++ ThreadPolicyA.cpp 2005-04-08 09:12:55.000000000 +0200 +@@ -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: +@@ -36,6 +36,8 @@ #include "tao/Any_Impl_T.h" #include "tao/Any_Basic_Impl_T.h" @@ -60,7 +84,7 @@ // TAO_IDL - Generated from // be\be_visitor_typecode/enum_typecode.cpp:34 -@@ -204,3 +206,5 @@ +@@ -203,3 +205,5 @@ > #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/RTCORBA/RTCORBA.pidl b/TAO/tao/RTCORBA/RTCORBA.pidl index 39d85285939..82e12701474 100644 --- a/TAO/tao/RTCORBA/RTCORBA.pidl +++ b/TAO/tao/RTCORBA/RTCORBA.pidl @@ -24,7 +24,7 @@ * 1. Run the tao_idl compiler on the pidl file. The command used for * this is: * - * tao_idl -o orig -Gp -Gd -Ge 1 -GT -I../.. + * tao_idl -o orig -Gp -Gd -Ge 1 -GT -Sci -I../.. * -Wb,export_macro=TAO_RTCORBA_Export * -Wb,export_include="rtcorba_export.h" * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/RTCORBA/RTCORBAA.cpp b/TAO/tao/RTCORBA/RTCORBAA.cpp index 457f24a24ed..6e9c584cec5 100644 --- a/TAO/tao/RTCORBA/RTCORBAA.cpp +++ b/TAO/tao/RTCORBA/RTCORBAA.cpp @@ -41,7 +41,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 *, @@ -61,7 +61,7 @@ namespace RTCORBA // 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 *, @@ -81,7 +81,7 @@ namespace RTCORBA // 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 *, @@ -101,7 +101,7 @@ namespace RTCORBA // 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 *, @@ -121,7 +121,7 @@ namespace RTCORBA // 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_RTCORBA_ThreadpoolLane[] = { @@ -151,13 +151,16 @@ namespace RTCORBA // 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_RTCORBA_ThreadpoolLanes_GUARD +#define _TAO_TYPECODE_RTCORBA_ThreadpoolLanes_GUARD namespace TAO { namespace TypeCode @@ -175,6 +178,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_RTCORBA_ThreadpoolLanes_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -193,7 +198,7 @@ namespace RTCORBA // 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_RTCORBA_PriorityModel[] = { @@ -220,7 +225,7 @@ namespace RTCORBA // 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, @@ -238,7 +243,7 @@ namespace RTCORBA // 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, @@ -256,7 +261,7 @@ namespace RTCORBA // 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, @@ -274,7 +279,7 @@ namespace RTCORBA // 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_RTCORBA_Protocol[] = { @@ -304,13 +309,16 @@ namespace RTCORBA // 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_RTCORBA_ProtocolList_GUARD +#define _TAO_TYPECODE_RTCORBA_ProtocolList_GUARD namespace TAO { namespace TypeCode @@ -328,6 +336,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_RTCORBA_ProtocolList_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -346,7 +356,7 @@ namespace RTCORBA // 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, @@ -364,7 +374,7 @@ namespace RTCORBA // 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, @@ -382,7 +392,7 @@ namespace RTCORBA // 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, @@ -400,7 +410,7 @@ namespace RTCORBA // 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, @@ -418,7 +428,7 @@ namespace RTCORBA // 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, @@ -436,7 +446,7 @@ namespace RTCORBA // 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, @@ -454,7 +464,7 @@ namespace RTCORBA // 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, @@ -472,7 +482,7 @@ namespace RTCORBA // 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, @@ -490,7 +500,7 @@ namespace RTCORBA // 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, @@ -508,7 +518,7 @@ namespace RTCORBA // 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_RTCORBA_PriorityBand[] = { @@ -537,13 +547,16 @@ namespace RTCORBA // 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_RTCORBA_PriorityBands_GUARD +#define _TAO_TYPECODE_RTCORBA_PriorityBands_GUARD namespace TAO { namespace TypeCode @@ -561,6 +574,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_RTCORBA_PriorityBands_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -579,7 +594,7 @@ namespace RTCORBA // 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, @@ -597,7 +612,7 @@ namespace RTCORBA // 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, @@ -615,7 +630,7 @@ namespace RTCORBA // 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, @@ -633,7 +648,7 @@ namespace RTCORBA // 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_RTCORBA_RTORB_MutexNotFound = 0; static TAO::TypeCode::Struct<char const *, @@ -652,7 +667,7 @@ static TAO::TypeCode::Struct<char const *, &_tao_tc_RTCORBA_RTORB_MutexNotFound; // 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_RTCORBA_RTORB_InvalidThreadpool = 0; static TAO::TypeCode::Struct<char const *, @@ -671,7 +686,7 @@ static TAO::TypeCode::Struct<char const *, &_tao_tc_RTCORBA_RTORB_InvalidThreadpool; // 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, @@ -689,7 +704,7 @@ namespace RTCORBA // 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<<= ( @@ -747,7 +762,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<<= ( @@ -805,7 +820,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, @@ -833,7 +848,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 @@ -902,7 +917,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 @@ -971,7 +986,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 @@ -1040,7 +1055,7 @@ operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_cs.cpp:54 +// be\be_visitor_structure/any_op_cs.cpp:54 @@ -1112,7 +1127,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 @@ -1184,7 +1199,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 @@ -1253,7 +1268,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 @@ -1322,7 +1337,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 @@ -1391,7 +1406,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 @@ -1460,7 +1475,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 @@ -1529,7 +1544,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 @@ -1598,7 +1613,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 @@ -1667,7 +1682,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 @@ -1736,7 +1751,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 @@ -1805,7 +1820,7 @@ 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<<= ( @@ -1863,7 +1878,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<<= ( @@ -1921,7 +1936,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 @@ -1990,7 +2005,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 @@ -2059,7 +2074,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 @@ -2128,7 +2143,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 @@ -2197,7 +2212,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 @@ -2269,7 +2284,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 diff --git a/TAO/tao/RTCORBA/RTCORBAC.cpp b/TAO/tao/RTCORBA/RTCORBAC.cpp index 6ee5a9ac800..1f640cb20b2 100644 --- a/TAO/tao/RTCORBA/RTCORBAC.cpp +++ b/TAO/tao/RTCORBA/RTCORBAC.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 "RTCORBA.h" @@ -40,12 +40,8 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "RTCORBAC.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 @@ -70,7 +66,7 @@ RTCORBA::ProtocolProperties::_tao_decode (TAO_InputCDR &) } // TAO_IDL - Generated from -// be/be_visitor_structure/structure_cs.cpp:68 +// be\be_visitor_structure/structure_cs.cpp:66 void RTCORBA::ThreadpoolLane::_tao_any_destructor ( @@ -83,7 +79,7 @@ RTCORBA::ThreadpoolLane::_tao_any_destructor ( } // TAO_IDL - Generated from -// be/be_visitor_sequence/sequence_cs.cpp:65 +// be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_RTCORBA_THREADPOOLLANES_CS_) #define _RTCORBA_THREADPOOLLANES_CS_ @@ -136,7 +132,7 @@ void RTCORBA::ThreadpoolLanes::_tao_any_destructor ( #endif /* end #if !defined */ // TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:60 +// be\be_visitor_interface/interface_cs.cpp:60 // Traits specializations for RTCORBA::PriorityModelPolicy. @@ -281,7 +277,7 @@ RTCORBA::PriorityModelPolicy::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:60 +// be\be_visitor_interface/interface_cs.cpp:60 // Traits specializations for RTCORBA::ThreadpoolPolicy. @@ -426,7 +422,7 @@ RTCORBA::ThreadpoolPolicy::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:60 +// be\be_visitor_interface/interface_cs.cpp:60 // Traits specializations for RTCORBA::ProtocolProperties. @@ -567,7 +563,7 @@ RTCORBA::ProtocolProperties::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// be/be_visitor_structure/structure_cs.cpp:68 +// be\be_visitor_structure/structure_cs.cpp:66 void RTCORBA::Protocol::_tao_any_destructor ( @@ -580,7 +576,7 @@ RTCORBA::Protocol::_tao_any_destructor ( } // TAO_IDL - Generated from -// be/be_visitor_sequence/sequence_cs.cpp:65 +// be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_RTCORBA_PROTOCOLLIST_CS_) #define _RTCORBA_PROTOCOLLIST_CS_ @@ -633,7 +629,7 @@ void RTCORBA::ProtocolList::_tao_any_destructor ( #endif /* end #if !defined */ // TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:60 +// be\be_visitor_interface/interface_cs.cpp:60 // Traits specializations for RTCORBA::ServerProtocolPolicy. @@ -778,7 +774,7 @@ RTCORBA::ServerProtocolPolicy::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:60 +// be\be_visitor_interface/interface_cs.cpp:60 // Traits specializations for RTCORBA::ClientProtocolPolicy. @@ -923,7 +919,7 @@ RTCORBA::ClientProtocolPolicy::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:60 +// be\be_visitor_interface/interface_cs.cpp:60 // Traits specializations for RTCORBA::PrivateConnectionPolicy. @@ -1068,7 +1064,7 @@ RTCORBA::PrivateConnectionPolicy::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:60 +// be\be_visitor_interface/interface_cs.cpp:60 // Traits specializations for RTCORBA::TCPProtocolProperties. @@ -1213,7 +1209,7 @@ RTCORBA::TCPProtocolProperties::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:60 +// be\be_visitor_interface/interface_cs.cpp:60 // Traits specializations for RTCORBA::GIOPProtocolProperties. @@ -1358,7 +1354,7 @@ RTCORBA::GIOPProtocolProperties::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:60 +// be\be_visitor_interface/interface_cs.cpp:60 // Traits specializations for RTCORBA::UnixDomainProtocolProperties. @@ -1503,7 +1499,7 @@ RTCORBA::UnixDomainProtocolProperties::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:60 +// be\be_visitor_interface/interface_cs.cpp:60 // Traits specializations for RTCORBA::SharedMemoryProtocolProperties. @@ -1648,7 +1644,7 @@ RTCORBA::SharedMemoryProtocolProperties::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:60 +// be\be_visitor_interface/interface_cs.cpp:60 // Traits specializations for RTCORBA::UserDatagramProtocolProperties. @@ -1793,7 +1789,7 @@ RTCORBA::UserDatagramProtocolProperties::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:60 +// be\be_visitor_interface/interface_cs.cpp:60 // Traits specializations for RTCORBA::StreamControlProtocolProperties. @@ -1938,7 +1934,7 @@ RTCORBA::StreamControlProtocolProperties::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// be/be_visitor_structure/structure_cs.cpp:68 +// be\be_visitor_structure/structure_cs.cpp:66 void RTCORBA::PriorityBand::_tao_any_destructor ( @@ -1951,7 +1947,7 @@ RTCORBA::PriorityBand::_tao_any_destructor ( } // TAO_IDL - Generated from -// be/be_visitor_sequence/sequence_cs.cpp:65 +// be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_RTCORBA_PRIORITYBANDS_CS_) #define _RTCORBA_PRIORITYBANDS_CS_ @@ -2004,7 +2000,7 @@ void RTCORBA::PriorityBands::_tao_any_destructor ( #endif /* end #if !defined */ // TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:60 +// be\be_visitor_interface/interface_cs.cpp:60 // Traits specializations for RTCORBA::PriorityBandedConnectionPolicy. @@ -2149,7 +2145,7 @@ RTCORBA::PriorityBandedConnectionPolicy::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:60 +// be\be_visitor_interface/interface_cs.cpp:60 // Traits specializations for RTCORBA::Current. @@ -2294,7 +2290,7 @@ RTCORBA::Current::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:60 +// be\be_visitor_interface/interface_cs.cpp:60 // Traits specializations for RTCORBA::Mutex. @@ -2435,7 +2431,7 @@ RTCORBA::Mutex::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:60 +// be\be_visitor_interface/interface_cs.cpp:60 // Traits specializations for RTCORBA::RTORB. @@ -2471,7 +2467,7 @@ TAO::Objref_Traits<RTCORBA::RTORB>::marshal ( } // TAO_IDL - Generated from -// be/be_visitor_exception/exception_cs.cpp:63 +// be\be_visitor_exception/exception_cs.cpp:63 RTCORBA::RTORB::MutexNotFound::MutexNotFound (void) : CORBA::UserException ( @@ -2566,7 +2562,7 @@ CORBA::TypeCode_ptr RTCORBA::RTORB::MutexNotFound::_tao_type (void) const } // TAO_IDL - Generated from -// be/be_visitor_exception/exception_cs.cpp:63 +// be\be_visitor_exception/exception_cs.cpp:63 RTCORBA::RTORB::InvalidThreadpool::InvalidThreadpool (void) : CORBA::UserException ( @@ -2766,7 +2762,7 @@ RTCORBA::RTORB::marshal (TAO_OutputCDR &) } // TAO_IDL - Generated from -// be/be_visitor_structure/cdr_op_cs.cpp:61 +// be\be_visitor_structure/cdr_op_cs.cpp:61 CORBA::Boolean operator<< ( TAO_OutputCDR &strm, @@ -2791,7 +2787,7 @@ CORBA::Boolean operator>> ( } // 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_RTCORBA_ThreadpoolLanes_CPP_ #define _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_CPP_ @@ -2863,7 +2859,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_CPP_ */ // TAO_IDL - Generated from -// be/be_visitor_enum/cdr_op_cs.cpp:51 +// be\be_visitor_enum/cdr_op_cs.cpp:51 CORBA::Boolean operator<< (TAO_OutputCDR & strm, RTCORBA::PriorityModel _tao_enumerator) { @@ -2884,7 +2880,7 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, RTCORBA::PriorityModel & _tao_en } // TAO_IDL - Generated from -// be/be_visitor_structure/cdr_op_cs.cpp:61 +// be\be_visitor_structure/cdr_op_cs.cpp:61 CORBA::Boolean operator<< ( TAO_OutputCDR &strm, @@ -2907,7 +2903,7 @@ CORBA::Boolean operator>> ( } // 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_RTCORBA_PriorityBands_CPP_ #define _TAO_CDR_OP_RTCORBA_PriorityBands_CPP_ @@ -2979,7 +2975,7 @@ CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_RTCORBA_PriorityBands_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/RTCORBA/RTCORBAC.h b/TAO/tao/RTCORBA/RTCORBAC.h index d39c6733343..3d0ea00c2b0 100644 --- a/TAO/tao/RTCORBA/RTCORBAC.h +++ b/TAO/tao/RTCORBA/RTCORBAC.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_RTCORBAC_H_ #define _TAO_IDL_ORIG_RTCORBAC_H_ @@ -68,13 +68,6 @@ #endif #define TAO_EXPORT_MACRO TAO_RTCORBA_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_RTCORBA_Export -#endif /* TAO_EXPORT_NESTED_CLASSES */ - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) @@ -84,79 +77,68 @@ #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 +// be\be_visitor_module/module_ch.cpp:48 namespace RTCORBA { // TAO_IDL - Generated from - // be/be_visitor_typedef/typedef_ch.cpp:379 + // be\be_visitor_typedef/typedef_ch.cpp:379 typedef CORBA::Short NativePriority; typedef CORBA::Short_out NativePriority_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_NativePriority; + extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_NativePriority; // TAO_IDL - Generated from - // be/be_visitor_typedef/typedef_ch.cpp:379 + // be\be_visitor_typedef/typedef_ch.cpp:379 typedef CORBA::Short Priority; typedef CORBA::Short_out Priority_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_Priority; + extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_Priority; // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 + // be\be_visitor_constant/constant_ch.cpp:52 const RTCORBA::Priority minPriority = 0; // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 + // be\be_visitor_constant/constant_ch.cpp:52 const RTCORBA::Priority maxPriority = 32767; // TAO_IDL - Generated from - // be/be_visitor_typedef/typedef_ch.cpp:379 + // be\be_visitor_typedef/typedef_ch.cpp:379 typedef CORBA::Long NetworkPriority; typedef CORBA::Long_out NetworkPriority_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_NetworkPriority; + extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_NetworkPriority; // TAO_IDL - Generated from - // be/be_visitor_typedef/typedef_ch.cpp:379 + // be\be_visitor_typedef/typedef_ch.cpp:379 typedef CORBA::ULong ThreadpoolId; typedef CORBA::ULong_out ThreadpoolId_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_ThreadpoolId; + extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_ThreadpoolId; // TAO_IDL - Generated from - // be/be_type.cpp:258 + // be\be_type.cpp:258 struct ThreadpoolLane; @@ -171,7 +153,7 @@ namespace RTCORBA ThreadpoolLane_out; // TAO_IDL - Generated from - // be/be_visitor_structure/structure_ch.cpp:52 + // be\be_visitor_structure/structure_ch.cpp:52 struct TAO_RTCORBA_Export ThreadpoolLane { @@ -184,12 +166,12 @@ namespace RTCORBA }; // 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_ThreadpoolLane; + extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_ThreadpoolLane; // TAO_IDL - Generated from - // be/be_visitor_sequence/sequence_ch.cpp:101 + // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_RTCORBA_THREADPOOLLANES_CH_) #define _RTCORBA_THREADPOOLLANES_CH_ @@ -237,17 +219,17 @@ namespace RTCORBA #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_ThreadpoolLanes; + extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_ThreadpoolLanes; // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 + // be\be_visitor_constant/constant_ch.cpp:52 const CORBA::PolicyType PRIORITY_MODEL_POLICY_TYPE = 40U; // TAO_IDL - Generated from - // be/be_visitor_enum/enum_ch.cpp:57 + // be\be_visitor_enum/enum_ch.cpp:57 enum PriorityModel { @@ -258,12 +240,12 @@ namespace RTCORBA typedef PriorityModel &PriorityModel_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_PriorityModel; + extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_PriorityModel; // TAO_IDL - Generated from - // be/be_interface.cpp:598 + // be\be_interface.cpp:598 #if !defined (_RTCORBA_PRIORITYMODELPOLICY__VAR_OUT_CH_) #define _RTCORBA_PRIORITYMODELPOLICY__VAR_OUT_CH_ @@ -286,7 +268,7 @@ namespace RTCORBA #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:54 + // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_RTCORBA_PRIORITYMODELPOLICY_CH_) #define _RTCORBA_PRIORITYMODELPOLICY_CH_ @@ -321,7 +303,7 @@ namespace RTCORBA static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual ::RTCORBA::PriorityModel priority_model ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -331,7 +313,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual RTCORBA::Priority server_priority ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -341,7 +323,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual ::CORBA::Policy_ptr copy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -351,7 +333,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual void destroy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -361,7 +343,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:210 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -387,17 +369,17 @@ namespace RTCORBA #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_PriorityModelPolicy; + extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_PriorityModelPolicy; // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 + // be\be_visitor_constant/constant_ch.cpp:52 const CORBA::PolicyType THREADPOOL_POLICY_TYPE = 41U; // TAO_IDL - Generated from - // be/be_interface.cpp:598 + // be\be_interface.cpp:598 #if !defined (_RTCORBA_THREADPOOLPOLICY__VAR_OUT_CH_) #define _RTCORBA_THREADPOOLPOLICY__VAR_OUT_CH_ @@ -420,7 +402,7 @@ namespace RTCORBA #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:54 + // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_RTCORBA_THREADPOOLPOLICY_CH_) #define _RTCORBA_THREADPOOLPOLICY_CH_ @@ -455,7 +437,7 @@ namespace RTCORBA static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual RTCORBA::ThreadpoolId threadpool ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -465,7 +447,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual ::CORBA::Policy_ptr copy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -475,7 +457,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual void destroy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -485,7 +467,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:210 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -511,12 +493,12 @@ namespace RTCORBA #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_ThreadpoolPolicy; + extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_ThreadpoolPolicy; // TAO_IDL - Generated from - // be/be_interface.cpp:598 + // be\be_interface.cpp:598 #if !defined (_RTCORBA_PROTOCOLPROPERTIES__VAR_OUT_CH_) #define _RTCORBA_PROTOCOLPROPERTIES__VAR_OUT_CH_ @@ -539,7 +521,7 @@ namespace RTCORBA #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:54 + // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_RTCORBA_PROTOCOLPROPERTIES_CH_) #define _RTCORBA_PROTOCOLPROPERTIES_CH_ @@ -575,7 +557,7 @@ namespace RTCORBA static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:210 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -604,12 +586,12 @@ namespace RTCORBA #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_ProtocolProperties; + extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_ProtocolProperties; // TAO_IDL - Generated from - // be/be_type.cpp:258 + // be\be_type.cpp:258 struct Protocol; @@ -627,7 +609,7 @@ namespace RTCORBA Protocol_out; // TAO_IDL - Generated from - // be/be_visitor_structure/structure_ch.cpp:52 + // be\be_visitor_structure/structure_ch.cpp:52 struct TAO_RTCORBA_Export Protocol { @@ -640,12 +622,12 @@ namespace RTCORBA }; // 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_Protocol; + extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_Protocol; // TAO_IDL - Generated from - // be/be_visitor_sequence/sequence_ch.cpp:101 + // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_RTCORBA_PROTOCOLLIST_CH_) #define _RTCORBA_PROTOCOLLIST_CH_ @@ -693,17 +675,17 @@ namespace RTCORBA #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_ProtocolList; + extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_ProtocolList; // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 + // be\be_visitor_constant/constant_ch.cpp:52 const CORBA::PolicyType SERVER_PROTOCOL_POLICY_TYPE = 42U; // TAO_IDL - Generated from - // be/be_interface.cpp:598 + // be\be_interface.cpp:598 #if !defined (_RTCORBA_SERVERPROTOCOLPOLICY__VAR_OUT_CH_) #define _RTCORBA_SERVERPROTOCOLPOLICY__VAR_OUT_CH_ @@ -726,7 +708,7 @@ namespace RTCORBA #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:54 + // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_RTCORBA_SERVERPROTOCOLPOLICY_CH_) #define _RTCORBA_SERVERPROTOCOLPOLICY_CH_ @@ -761,7 +743,7 @@ namespace RTCORBA static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual ::RTCORBA::ProtocolList * protocols ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -771,7 +753,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual ::CORBA::Policy_ptr copy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -781,7 +763,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual void destroy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -791,7 +773,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:210 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -817,17 +799,17 @@ namespace RTCORBA #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_ServerProtocolPolicy; + extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_ServerProtocolPolicy; // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 + // be\be_visitor_constant/constant_ch.cpp:52 const CORBA::PolicyType CLIENT_PROTOCOL_POLICY_TYPE = 43U; // TAO_IDL - Generated from - // be/be_interface.cpp:598 + // be\be_interface.cpp:598 #if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY__VAR_OUT_CH_) #define _RTCORBA_CLIENTPROTOCOLPOLICY__VAR_OUT_CH_ @@ -850,7 +832,7 @@ namespace RTCORBA #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:54 + // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY_CH_) #define _RTCORBA_CLIENTPROTOCOLPOLICY_CH_ @@ -885,7 +867,7 @@ namespace RTCORBA static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual ::RTCORBA::ProtocolList * protocols ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -895,7 +877,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual ::CORBA::Policy_ptr copy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -905,7 +887,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual void destroy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -915,7 +897,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:210 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -941,17 +923,17 @@ namespace RTCORBA #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_ClientProtocolPolicy; + extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_ClientProtocolPolicy; // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 + // be\be_visitor_constant/constant_ch.cpp:52 const CORBA::PolicyType PRIVATE_CONNECTION_POLICY_TYPE = 44U; // TAO_IDL - Generated from - // be/be_interface.cpp:598 + // be\be_interface.cpp:598 #if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY__VAR_OUT_CH_) #define _RTCORBA_PRIVATECONNECTIONPOLICY__VAR_OUT_CH_ @@ -974,7 +956,7 @@ namespace RTCORBA #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:54 + // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY_CH_) #define _RTCORBA_PRIVATECONNECTIONPOLICY_CH_ @@ -1009,7 +991,7 @@ namespace RTCORBA static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual ::CORBA::Policy_ptr copy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -1019,7 +1001,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual void destroy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -1029,7 +1011,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:210 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -1055,12 +1037,12 @@ namespace RTCORBA #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_PrivateConnectionPolicy; + extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_PrivateConnectionPolicy; // TAO_IDL - Generated from - // be/be_interface.cpp:598 + // be\be_interface.cpp:598 #if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES__VAR_OUT_CH_) #define _RTCORBA_TCPPROTOCOLPROPERTIES__VAR_OUT_CH_ @@ -1083,7 +1065,7 @@ namespace RTCORBA #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:54 + // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES_CH_) #define _RTCORBA_TCPPROTOCOLPROPERTIES_CH_ @@ -1118,7 +1100,7 @@ namespace RTCORBA static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Long send_buffer_size ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -1128,7 +1110,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual void send_buffer_size ( ::CORBA::Long send_buffer_size @@ -1139,7 +1121,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Long recv_buffer_size ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -1149,7 +1131,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual void recv_buffer_size ( ::CORBA::Long recv_buffer_size @@ -1160,7 +1142,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Boolean keep_alive ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -1170,7 +1152,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual void keep_alive ( ::CORBA::Boolean keep_alive @@ -1181,7 +1163,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Boolean dont_route ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -1191,7 +1173,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual void dont_route ( ::CORBA::Boolean dont_route @@ -1202,7 +1184,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Boolean no_delay ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -1212,7 +1194,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual void no_delay ( ::CORBA::Boolean no_delay @@ -1223,7 +1205,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Boolean enable_network_priority ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -1233,7 +1215,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual void enable_network_priority ( ::CORBA::Boolean enable_network_priority @@ -1244,7 +1226,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:210 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -1270,12 +1252,12 @@ namespace RTCORBA #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_TCPProtocolProperties; + extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_TCPProtocolProperties; // TAO_IDL - Generated from - // be/be_interface.cpp:598 + // be\be_interface.cpp:598 #if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES__VAR_OUT_CH_) #define _RTCORBA_GIOPPROTOCOLPROPERTIES__VAR_OUT_CH_ @@ -1298,7 +1280,7 @@ namespace RTCORBA #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:54 + // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES_CH_) #define _RTCORBA_GIOPPROTOCOLPROPERTIES_CH_ @@ -1333,7 +1315,7 @@ namespace RTCORBA static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:210 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -1359,12 +1341,12 @@ namespace RTCORBA #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_GIOPProtocolProperties; + extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_GIOPProtocolProperties; // TAO_IDL - Generated from - // be/be_interface.cpp:598 + // be\be_interface.cpp:598 #if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES__VAR_OUT_CH_) #define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES__VAR_OUT_CH_ @@ -1387,7 +1369,7 @@ namespace RTCORBA #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:54 + // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES_CH_) #define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES_CH_ @@ -1422,7 +1404,7 @@ namespace RTCORBA static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Long send_buffer_size ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -1432,7 +1414,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual void send_buffer_size ( ::CORBA::Long send_buffer_size @@ -1443,7 +1425,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Long recv_buffer_size ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -1453,7 +1435,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual void recv_buffer_size ( ::CORBA::Long recv_buffer_size @@ -1464,7 +1446,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:210 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -1490,12 +1472,12 @@ namespace RTCORBA #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_UnixDomainProtocolProperties; + extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_UnixDomainProtocolProperties; // TAO_IDL - Generated from - // be/be_interface.cpp:598 + // be\be_interface.cpp:598 #if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES__VAR_OUT_CH_) #define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES__VAR_OUT_CH_ @@ -1518,7 +1500,7 @@ namespace RTCORBA #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:54 + // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES_CH_) #define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES_CH_ @@ -1553,7 +1535,7 @@ namespace RTCORBA static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Long send_buffer_size ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -1563,7 +1545,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual void send_buffer_size ( ::CORBA::Long send_buffer_size @@ -1574,7 +1556,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Long recv_buffer_size ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -1584,7 +1566,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual void recv_buffer_size ( ::CORBA::Long recv_buffer_size @@ -1595,7 +1577,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Boolean keep_alive ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -1605,7 +1587,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual void keep_alive ( ::CORBA::Boolean keep_alive @@ -1616,7 +1598,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Boolean dont_route ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -1626,7 +1608,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual void dont_route ( ::CORBA::Boolean dont_route @@ -1637,7 +1619,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Boolean no_delay ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -1647,7 +1629,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual void no_delay ( ::CORBA::Boolean no_delay @@ -1658,7 +1640,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Long preallocate_buffer_size ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -1668,7 +1650,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual void preallocate_buffer_size ( ::CORBA::Long preallocate_buffer_size @@ -1679,7 +1661,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual char * mmap_filename ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -1689,7 +1671,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual void mmap_filename ( const char * mmap_filename @@ -1700,7 +1682,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual char * mmap_lockname ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -1710,7 +1692,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual void mmap_lockname ( const char * mmap_lockname @@ -1721,7 +1703,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:210 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -1747,12 +1729,12 @@ namespace RTCORBA #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_SharedMemoryProtocolProperties; + extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_SharedMemoryProtocolProperties; // TAO_IDL - Generated from - // be/be_interface.cpp:598 + // be\be_interface.cpp:598 #if !defined (_RTCORBA_USERDATAGRAMPROTOCOLPROPERTIES__VAR_OUT_CH_) #define _RTCORBA_USERDATAGRAMPROTOCOLPROPERTIES__VAR_OUT_CH_ @@ -1775,7 +1757,7 @@ namespace RTCORBA #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:54 + // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_RTCORBA_USERDATAGRAMPROTOCOLPROPERTIES_CH_) #define _RTCORBA_USERDATAGRAMPROTOCOLPROPERTIES_CH_ @@ -1810,7 +1792,7 @@ namespace RTCORBA static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Boolean enable_network_priority ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -1820,7 +1802,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual void enable_network_priority ( ::CORBA::Boolean enable_network_priority @@ -1831,7 +1813,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:210 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -1857,12 +1839,12 @@ namespace RTCORBA #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_UserDatagramProtocolProperties; + extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_UserDatagramProtocolProperties; // TAO_IDL - Generated from - // be/be_interface.cpp:598 + // be\be_interface.cpp:598 #if !defined (_RTCORBA_STREAMCONTROLPROTOCOLPROPERTIES__VAR_OUT_CH_) #define _RTCORBA_STREAMCONTROLPROTOCOLPROPERTIES__VAR_OUT_CH_ @@ -1885,7 +1867,7 @@ namespace RTCORBA #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:54 + // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_RTCORBA_STREAMCONTROLPROTOCOLPROPERTIES_CH_) #define _RTCORBA_STREAMCONTROLPROTOCOLPROPERTIES_CH_ @@ -1920,7 +1902,7 @@ namespace RTCORBA static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Long send_buffer_size ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -1930,7 +1912,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual void send_buffer_size ( ::CORBA::Long send_buffer_size @@ -1941,7 +1923,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Long recv_buffer_size ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -1951,7 +1933,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual void recv_buffer_size ( ::CORBA::Long recv_buffer_size @@ -1962,7 +1944,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Boolean keep_alive ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -1972,7 +1954,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual void keep_alive ( ::CORBA::Boolean keep_alive @@ -1983,7 +1965,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Boolean dont_route ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -1993,7 +1975,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual void dont_route ( ::CORBA::Boolean dont_route @@ -2004,7 +1986,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Boolean no_delay ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -2014,7 +1996,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual void no_delay ( ::CORBA::Boolean no_delay @@ -2025,7 +2007,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Boolean enable_network_priority ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -2035,7 +2017,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual void enable_network_priority ( ::CORBA::Boolean enable_network_priority @@ -2046,7 +2028,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:210 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -2072,12 +2054,12 @@ namespace RTCORBA #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_StreamControlProtocolProperties; + extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_StreamControlProtocolProperties; // TAO_IDL - Generated from - // be/be_type.cpp:258 + // be\be_type.cpp:258 struct PriorityBand; @@ -2092,7 +2074,7 @@ namespace RTCORBA PriorityBand_out; // TAO_IDL - Generated from - // be/be_visitor_structure/structure_ch.cpp:52 + // be\be_visitor_structure/structure_ch.cpp:52 struct TAO_RTCORBA_Export PriorityBand { @@ -2104,12 +2086,12 @@ namespace RTCORBA }; // 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_PriorityBand; + extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_PriorityBand; // TAO_IDL - Generated from - // be/be_visitor_sequence/sequence_ch.cpp:101 + // be\be_visitor_sequence/sequence_ch.cpp:101 #if !defined (_RTCORBA_PRIORITYBANDS_CH_) #define _RTCORBA_PRIORITYBANDS_CH_ @@ -2157,17 +2139,17 @@ namespace RTCORBA #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_PriorityBands; + extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_PriorityBands; // TAO_IDL - Generated from - // be/be_visitor_constant/constant_ch.cpp:52 + // be\be_visitor_constant/constant_ch.cpp:52 const CORBA::PolicyType PRIORITY_BANDED_CONNECTION_POLICY_TYPE = 45U; // TAO_IDL - Generated from - // be/be_interface.cpp:598 + // be\be_interface.cpp:598 #if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__VAR_OUT_CH_) #define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__VAR_OUT_CH_ @@ -2190,7 +2172,7 @@ namespace RTCORBA #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:54 + // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY_CH_) #define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY_CH_ @@ -2225,7 +2207,7 @@ namespace RTCORBA static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual ::RTCORBA::PriorityBands * priority_bands ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -2235,7 +2217,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual ::CORBA::Policy_ptr copy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -2245,7 +2227,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual void destroy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -2255,7 +2237,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:210 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -2281,12 +2263,12 @@ namespace RTCORBA #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_PriorityBandedConnectionPolicy; + extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_PriorityBandedConnectionPolicy; // TAO_IDL - Generated from - // be/be_interface.cpp:598 + // be\be_interface.cpp:598 #if !defined (_RTCORBA_CURRENT__VAR_OUT_CH_) #define _RTCORBA_CURRENT__VAR_OUT_CH_ @@ -2309,7 +2291,7 @@ namespace RTCORBA #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:54 + // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_RTCORBA_CURRENT_CH_) #define _RTCORBA_CURRENT_CH_ @@ -2344,7 +2326,7 @@ namespace RTCORBA static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual RTCORBA::Priority the_priority ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -2354,7 +2336,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual void the_priority ( ::RTCORBA::Priority the_priority @@ -2365,7 +2347,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:210 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -2391,12 +2373,12 @@ namespace RTCORBA #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_Current; + extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_Current; // TAO_IDL - Generated from - // be/be_interface.cpp:598 + // be\be_interface.cpp:598 #if !defined (_RTCORBA_MUTEX__VAR_OUT_CH_) #define _RTCORBA_MUTEX__VAR_OUT_CH_ @@ -2419,7 +2401,7 @@ namespace RTCORBA #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:54 + // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_RTCORBA_MUTEX_CH_) #define _RTCORBA_MUTEX_CH_ @@ -2454,7 +2436,7 @@ namespace RTCORBA static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual void lock ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -2464,7 +2446,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual void unlock ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -2474,7 +2456,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual CORBA::Boolean try_lock ( ::TimeBase::TimeT max_wait @@ -2485,7 +2467,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:210 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -2511,12 +2493,12 @@ namespace RTCORBA #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_Mutex; + extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_Mutex; // TAO_IDL - Generated from - // be/be_interface.cpp:598 + // be\be_interface.cpp:598 #if !defined (_RTCORBA_RTORB__VAR_OUT_CH_) #define _RTCORBA_RTORB__VAR_OUT_CH_ @@ -2539,7 +2521,7 @@ namespace RTCORBA #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:54 + // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_RTCORBA_RTORB_CH_) #define _RTCORBA_RTORB_CH_ @@ -2574,7 +2556,7 @@ namespace RTCORBA static void _tao_any_destructor (void *); // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual ::RTCORBA::Mutex_ptr create_mutex ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -2584,7 +2566,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual void destroy_mutex ( ::RTCORBA::Mutex_ptr the_mutex @@ -2595,7 +2577,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_exception/exception_ch.cpp:51 + // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_RTCORBA_RTORB_MUTEXNOTFOUND_CH_) #define _RTCORBA_RTORB_MUTEXNOTFOUND_CH_ @@ -2632,20 +2614,20 @@ namespace RTCORBA ); // TAO_IDL - Generated from - // be/be_visitor_exception/exception_ch.cpp:127 + // be\be_visitor_exception/exception_ch.cpp:127 virtual CORBA::TypeCode_ptr _tao_type (void) const; }; // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:44 + // be\be_visitor_typecode/typecode_decl.cpp:44 static ::CORBA::TypeCode_ptr const _tc_MutexNotFound; #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual ::RTCORBA::Mutex_ptr create_named_mutex ( const char * name, @@ -2657,7 +2639,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual ::RTCORBA::Mutex_ptr open_named_mutex ( const char * name @@ -2669,7 +2651,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual ::RTCORBA::TCPProtocolProperties_ptr create_tcp_protocol_properties ( ::CORBA::Long send_buffer_size, @@ -2685,7 +2667,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual ::RTCORBA::UnixDomainProtocolProperties_ptr create_unix_domain_protocol_properties ( ::CORBA::Long send_buffer_size, @@ -2697,7 +2679,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual ::RTCORBA::SharedMemoryProtocolProperties_ptr create_shared_memory_protocol_properties ( ::CORBA::Long send_buffer_size, @@ -2715,7 +2697,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual ::RTCORBA::UserDatagramProtocolProperties_ptr create_user_datagram_protocol_properties ( ::CORBA::Boolean enable_network_priority @@ -2726,7 +2708,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual ::RTCORBA::StreamControlProtocolProperties_ptr create_stream_control_protocol_properties ( ::CORBA::Long send_buffer_size, @@ -2742,7 +2724,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_exception/exception_ch.cpp:51 + // be\be_visitor_exception/exception_ch.cpp:51 #if !defined (_RTCORBA_RTORB_INVALIDTHREADPOOL_CH_) #define _RTCORBA_RTORB_INVALIDTHREADPOOL_CH_ @@ -2779,20 +2761,20 @@ namespace RTCORBA ); // TAO_IDL - Generated from - // be/be_visitor_exception/exception_ch.cpp:127 + // be\be_visitor_exception/exception_ch.cpp:127 virtual CORBA::TypeCode_ptr _tao_type (void) const; }; // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:44 + // be\be_visitor_typecode/typecode_decl.cpp:44 static ::CORBA::TypeCode_ptr const _tc_InvalidThreadpool; #endif /* end #if !defined */ // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual RTCORBA::ThreadpoolId create_threadpool ( ::CORBA::ULong stacksize, @@ -2809,7 +2791,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual RTCORBA::ThreadpoolId create_threadpool_with_lanes ( ::CORBA::ULong stacksize, @@ -2825,7 +2807,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual void destroy_threadpool ( ::RTCORBA::ThreadpoolId threadpool @@ -2837,7 +2819,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual ::RTCORBA::PriorityModelPolicy_ptr create_priority_model_policy ( ::RTCORBA::PriorityModel priority_model, @@ -2849,7 +2831,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual ::RTCORBA::ThreadpoolPolicy_ptr create_threadpool_policy ( ::RTCORBA::ThreadpoolId threadpool @@ -2860,7 +2842,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual ::RTCORBA::PriorityBandedConnectionPolicy_ptr create_priority_banded_connection_policy ( const ::RTCORBA::PriorityBands & priority_bands @@ -2871,7 +2853,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual ::RTCORBA::ServerProtocolPolicy_ptr create_server_protocol_policy ( const ::RTCORBA::ProtocolList & protocols @@ -2882,7 +2864,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual ::RTCORBA::ClientProtocolPolicy_ptr create_client_protocol_policy ( const ::RTCORBA::ProtocolList & protocols @@ -2893,7 +2875,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 + // be\be_visitor_operation/operation_ch.cpp:46 virtual ::RTCORBA::PrivateConnectionPolicy_ptr create_private_connection_policy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS @@ -2903,7 +2885,7 @@ namespace RTCORBA )) = 0; // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:210 + // be\be_visitor_interface/interface_ch.cpp:210 virtual CORBA::Boolean _is_a ( const char *type_id @@ -2929,17 +2911,17 @@ namespace RTCORBA #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_RTORB; + extern TAO_RTCORBA_Export ::CORBA::TypeCode_ptr const _tc_RTORB; // TAO_IDL - Generated from -// be/be_visitor_module/module_ch.cpp:66 +// be\be_visitor_module/module_ch.cpp:66 } // module RTCORBA // TAO_IDL - Generated from -// be/be_visitor_traits.cpp:59 +// be\be_visitor_traits.cpp:59 // Traits specializations. namespace TAO @@ -3283,7 +3265,7 @@ namespace TAO } // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_ch.cpp:52 +// be\be_visitor_structure/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::ThreadpoolLane &); // copying version TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ThreadpoolLane*); // noncopying version @@ -3291,7 +3273,7 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Thre TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::ThreadpoolLane *&); // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_ch.cpp:52 +// be\be_visitor_sequence/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::ThreadpoolLanes &); // copying version TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ThreadpoolLanes*); // noncopying version @@ -3299,34 +3281,34 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Thre TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::ThreadpoolLanes *&); // TAO_IDL - Generated from -// be/be_visitor_enum/any_op_ch.cpp:51 +// be\be_visitor_enum/any_op_ch.cpp:51 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityModel); TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::PriorityModel &); // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_ch.cpp:52 +// be\be_visitor_interface/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityModelPolicy_ptr); // copying TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityModelPolicy_ptr *); // non-copying TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::PriorityModelPolicy_ptr &); // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_ch.cpp:52 +// be\be_visitor_interface/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ThreadpoolPolicy_ptr); // copying TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ThreadpoolPolicy_ptr *); // non-copying TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::ThreadpoolPolicy_ptr &); // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_ch.cpp:52 +// be\be_visitor_interface/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ProtocolProperties_ptr); // copying TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ProtocolProperties_ptr *); // non-copying TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::ProtocolProperties_ptr &); // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_ch.cpp:52 +// be\be_visitor_structure/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::Protocol &); // copying version TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::Protocol*); // noncopying version @@ -3334,7 +3316,7 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Prot TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::Protocol *&); // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_ch.cpp:52 +// be\be_visitor_sequence/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::ProtocolList &); // copying version TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ProtocolList*); // noncopying version @@ -3342,70 +3324,70 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Prot TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::ProtocolList *&); // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_ch.cpp:52 +// be\be_visitor_interface/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ServerProtocolPolicy_ptr); // copying TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ServerProtocolPolicy_ptr *); // non-copying TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::ServerProtocolPolicy_ptr &); // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_ch.cpp:52 +// be\be_visitor_interface/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ClientProtocolPolicy_ptr); // copying TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ClientProtocolPolicy_ptr *); // non-copying TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::ClientProtocolPolicy_ptr &); // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_ch.cpp:52 +// be\be_visitor_interface/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PrivateConnectionPolicy_ptr); // copying TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PrivateConnectionPolicy_ptr *); // non-copying TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::PrivateConnectionPolicy_ptr &); // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_ch.cpp:52 +// be\be_visitor_interface/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::TCPProtocolProperties_ptr); // copying TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::TCPProtocolProperties_ptr *); // non-copying TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::TCPProtocolProperties_ptr &); // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_ch.cpp:52 +// be\be_visitor_interface/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::GIOPProtocolProperties_ptr); // copying TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::GIOPProtocolProperties_ptr *); // non-copying TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::GIOPProtocolProperties_ptr &); // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_ch.cpp:52 +// be\be_visitor_interface/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::UnixDomainProtocolProperties_ptr); // copying TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::UnixDomainProtocolProperties_ptr *); // non-copying TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::UnixDomainProtocolProperties_ptr &); // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_ch.cpp:52 +// be\be_visitor_interface/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::SharedMemoryProtocolProperties_ptr); // copying TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::SharedMemoryProtocolProperties_ptr *); // non-copying TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::SharedMemoryProtocolProperties_ptr &); // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_ch.cpp:52 +// be\be_visitor_interface/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::UserDatagramProtocolProperties_ptr); // copying TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::UserDatagramProtocolProperties_ptr *); // non-copying TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::UserDatagramProtocolProperties_ptr &); // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_ch.cpp:52 +// be\be_visitor_interface/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::StreamControlProtocolProperties_ptr); // copying TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::StreamControlProtocolProperties_ptr *); // non-copying TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::StreamControlProtocolProperties_ptr &); // TAO_IDL - Generated from -// be/be_visitor_structure/any_op_ch.cpp:52 +// be\be_visitor_structure/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::PriorityBand &); // copying version TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityBand*); // noncopying version @@ -3413,7 +3395,7 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Prio TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::PriorityBand *&); // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_ch.cpp:52 +// be\be_visitor_sequence/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::PriorityBands &); // copying version TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityBands*); // noncopying version @@ -3421,35 +3403,35 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Prio TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::PriorityBands *&); // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_ch.cpp:52 +// be\be_visitor_interface/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityBandedConnectionPolicy_ptr); // copying TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityBandedConnectionPolicy_ptr *); // non-copying TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::PriorityBandedConnectionPolicy_ptr &); // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_ch.cpp:52 +// be\be_visitor_interface/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::Current_ptr); // copying TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::Current_ptr *); // non-copying TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Current_ptr &); // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_ch.cpp:52 +// be\be_visitor_interface/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::Mutex_ptr); // copying TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::Mutex_ptr *); // non-copying TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Mutex_ptr &); // TAO_IDL - Generated from -// be/be_visitor_interface/any_op_ch.cpp:52 +// be\be_visitor_interface/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::RTORB_ptr); // copying TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::RTORB_ptr *); // non-copying TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::RTORB_ptr &); // TAO_IDL - Generated from -// be/be_visitor_exception/any_op_ch.cpp:52 +// be\be_visitor_exception/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::RTORB::MutexNotFound &); // copying version TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::RTORB::MutexNotFound*); // noncopying version @@ -3457,7 +3439,7 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::RTOR TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::RTORB::MutexNotFound *&); // TAO_IDL - Generated from -// be/be_visitor_exception/any_op_ch.cpp:52 +// be\be_visitor_exception/any_op_ch.cpp:52 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::RTORB::InvalidThreadpool &); // copying version TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::RTORB::InvalidThreadpool*); // noncopying version @@ -3465,13 +3447,13 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::RTOR TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::RTORB::InvalidThreadpool *&); // TAO_IDL - Generated from -// be/be_visitor_structure/cdr_op_ch.cpp:54 +// be\be_visitor_structure/cdr_op_ch.cpp:54 TAO_RTCORBA_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const RTCORBA::ThreadpoolLane &); TAO_RTCORBA_Export CORBA::Boolean operator>> (TAO_InputCDR &, RTCORBA::ThreadpoolLane &); // 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_RTCORBA_ThreadpoolLanes_H_ #define _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_H_ @@ -3488,19 +3470,19 @@ TAO_RTCORBA_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_H_ */ // TAO_IDL - Generated from -// be/be_visitor_enum/cdr_op_ch.cpp:50 +// be\be_visitor_enum/cdr_op_ch.cpp:50 TAO_RTCORBA_Export CORBA::Boolean operator<< (TAO_OutputCDR &, RTCORBA::PriorityModel); TAO_RTCORBA_Export CORBA::Boolean operator>> (TAO_InputCDR &, RTCORBA::PriorityModel &); // TAO_IDL - Generated from -// be/be_visitor_structure/cdr_op_ch.cpp:54 +// be\be_visitor_structure/cdr_op_ch.cpp:54 TAO_RTCORBA_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const RTCORBA::PriorityBand &); TAO_RTCORBA_Export CORBA::Boolean operator>> (TAO_InputCDR &, RTCORBA::PriorityBand &); // 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_RTCORBA_PriorityBands_H_ #define _TAO_CDR_OP_RTCORBA_PriorityBands_H_ @@ -3517,11 +3499,7 @@ TAO_RTCORBA_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_RTCORBA_PriorityBands_H_ */ // TAO_IDL - Generated from -// be/be_codegen.cpp:969 - -#if defined (__ACE_INLINE__) -#include "RTCORBAC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/RTCORBA/RTCORBAC.inl b/TAO/tao/RTCORBA/RTCORBAC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/RTCORBA/RTCORBAC.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/RTPortableServer/RTPortableServer.pidl b/TAO/tao/RTPortableServer/RTPortableServer.pidl index 2058dc1bf09..33d2fd47e6c 100644 --- a/TAO/tao/RTPortableServer/RTPortableServer.pidl +++ b/TAO/tao/RTPortableServer/RTPortableServer.pidl @@ -5,14 +5,14 @@ * * @brief Pre-compiled IDL source for the RTPortableServer module. * - * This file was used to generate the code in RTPortableServerC.{h,i,cpp} + * This file was used to generate the code in RTPortableServerC.{h,cpp} * The steps to regenerate the code are as follows: * * 1. Run the tao_idl compiler on the pidl file. The command used for * this is: * * tao_idl - * -o orig -Ge 1 -GT -GA -Sc + * -o orig -Ge 1 -GT -GA -Sc -Sci * -Wb,export_macro=TAO_RTPortableServer_Export * -Wb,export_include="rtportableserver_export.h" * -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/RTPortableServer/RTPortableServerA.cpp b/TAO/tao/RTPortableServer/RTPortableServerA.cpp index 786ceb9746f..e5f8e97f710 100644 --- a/TAO/tao/RTPortableServer/RTPortableServerA.cpp +++ b/TAO/tao/RTPortableServer/RTPortableServerA.cpp @@ -36,7 +36,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, @@ -63,7 +63,7 @@ TAO::Any_Impl_T<RTPortableServer::POA>::to_object ( ) const { _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; + return true; } template<> diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.cpp b/TAO/tao/RTPortableServer/RTPortableServerC.cpp index e18d5709066..b2f2f5aef35 100644 --- a/TAO/tao/RTPortableServer/RTPortableServerC.cpp +++ b/TAO/tao/RTPortableServer/RTPortableServerC.cpp @@ -38,10 +38,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "RTPortableServerC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.h b/TAO/tao/RTPortableServer/RTPortableServerC.h index 7c29a8f73b6..3ea7dfd3b4e 100644 --- a/TAO/tao/RTPortableServer/RTPortableServerC.h +++ b/TAO/tao/RTPortableServer/RTPortableServerC.h @@ -64,17 +64,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 @@ -225,7 +214,7 @@ namespace RTPortableServer // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_POA; + extern TAO_RTPortableServer_Export ::CORBA::TypeCode_ptr const _tc_POA; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -269,11 +258,7 @@ TAO_RTPortableServer_Export void operator<<= (CORBA::Any &, RTPortableServer::PO TAO_RTPortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTPortableServer::POA_ptr &); // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "RTPortableServerC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.inl b/TAO/tao/RTPortableServer/RTPortableServerC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/RTPortableServer/RTPortableServerC.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 - |