diff options
35 files changed, 270 insertions, 592 deletions
diff --git a/TAO/examples/RTScheduling/FP_SchedulingC.cpp b/TAO/examples/RTScheduling/FP_SchedulingC.cpp index 4bb65eda544..2e638e3f0d1 100644 --- a/TAO/examples/RTScheduling/FP_SchedulingC.cpp +++ b/TAO/examples/RTScheduling/FP_SchedulingC.cpp @@ -44,10 +44,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "FP_SchedulingC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 @@ -99,7 +95,7 @@ FP_Scheduling::SegmentSchedulingParameterPolicy::SegmentSchedulingParameterPolic FP_Scheduling::SegmentSchedulingParameterPolicy::~SegmentSchedulingParameterPolicy (void) {} -void +void FP_Scheduling::SegmentSchedulingParameterPolicy::_tao_any_destructor (void *_tao_void_pointer) { SegmentSchedulingParameterPolicy *_tao_tmp_pointer = @@ -117,10 +113,10 @@ FP_Scheduling::SegmentSchedulingParameterPolicy::_narrow ( { return SegmentSchedulingParameterPolicy::_nil (); } - + SegmentSchedulingParameterPolicy_ptr proxy = dynamic_cast<SegmentSchedulingParameterPolicy_ptr> (_tao_objref); - + return SegmentSchedulingParameterPolicy::_duplicate (proxy); } @@ -134,10 +130,10 @@ FP_Scheduling::SegmentSchedulingParameterPolicy::_unchecked_narrow ( { return SegmentSchedulingParameterPolicy::_nil (); } - + SegmentSchedulingParameterPolicy_ptr proxy = dynamic_cast<SegmentSchedulingParameterPolicy_ptr> (_tao_objref); - + return SegmentSchedulingParameterPolicy::_duplicate (proxy); } @@ -148,7 +144,7 @@ FP_Scheduling::SegmentSchedulingParameterPolicy::_duplicate (SegmentSchedulingPa { obj->_add_ref (); } - + return obj; } diff --git a/TAO/examples/RTScheduling/FP_SchedulingC.h b/TAO/examples/RTScheduling/FP_SchedulingC.h index c1f94a038aa..f3ad08acf91 100644 --- a/TAO/examples/RTScheduling/FP_SchedulingC.h +++ b/TAO/examples/RTScheduling/FP_SchedulingC.h @@ -50,13 +50,13 @@ #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO #endif -#define TAO_EXPORT_MACRO +#define TAO_EXPORT_MACRO #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 +# define TAO_EXPORT_NESTED_MACRO #endif /* TAO_EXPORT_NESTED_CLASSES */ #if defined(_MSC_VER) @@ -68,13 +68,13 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// TAO_IDL - Generated from +// 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; } @@ -84,22 +84,22 @@ namespace TAO namespace FP_Scheduling { - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_FP_SCHEDULING_SEGMENTSCHEDULINGPARAMETERPOLICY__VAR_OUT_CH_) #define _FP_SCHEDULING_SEGMENTSCHEDULINGPARAMETERPOLICY__VAR_OUT_CH_ - + class SegmentSchedulingParameterPolicy; typedef SegmentSchedulingParameterPolicy *SegmentSchedulingParameterPolicy_ptr; - + typedef TAO_Objref_Var_T< SegmentSchedulingParameterPolicy > SegmentSchedulingParameterPolicy_var; - + typedef TAO_Objref_Out_T< SegmentSchedulingParameterPolicy @@ -107,55 +107,55 @@ namespace FP_Scheduling SegmentSchedulingParameterPolicy_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_FP_SCHEDULING_SEGMENTSCHEDULINGPARAMETERPOLICY_CH_) #define _FP_SCHEDULING_SEGMENTSCHEDULINGPARAMETERPOLICY_CH_ - + class SegmentSchedulingParameterPolicy : public virtual ::CORBA::Policy { public: typedef SegmentSchedulingParameterPolicy_ptr _ptr_type; typedef SegmentSchedulingParameterPolicy_var _var_type; - + // The static operations. static SegmentSchedulingParameterPolicy_ptr _duplicate (SegmentSchedulingParameterPolicy_ptr obj); - + static void _tao_release (SegmentSchedulingParameterPolicy_ptr obj); - + static SegmentSchedulingParameterPolicy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static SegmentSchedulingParameterPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static SegmentSchedulingParameterPolicy_ptr _nil (void) { return static_cast<SegmentSchedulingParameterPolicy_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual RTCORBA::Priority value ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void value ( ::RTCORBA::Priority value ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -163,73 +163,73 @@ namespace FP_Scheduling ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::Policy_ptr copy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void destroy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. SegmentSchedulingParameterPolicy (void); - + virtual ~SegmentSchedulingParameterPolicy (void); - + private: // Private and unimplemented for concrete interfaces. SegmentSchedulingParameterPolicy (const SegmentSchedulingParameterPolicy &); - + void operator= (const SegmentSchedulingParameterPolicy &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_SegmentSchedulingParameterPolicy; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_FP_SCHEDULING_FP_SCHEDULER__VAR_OUT_CH_) #define _FP_SCHEDULING_FP_SCHEDULER__VAR_OUT_CH_ - + class FP_Scheduler; typedef FP_Scheduler *FP_Scheduler_ptr; - + typedef TAO_Objref_Var_T< FP_Scheduler > FP_Scheduler_var; - + typedef TAO_Objref_Out_T< FP_Scheduler @@ -237,45 +237,45 @@ namespace FP_Scheduling FP_Scheduler_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_FP_SCHEDULING_FP_SCHEDULER_CH_) #define _FP_SCHEDULING_FP_SCHEDULER_CH_ - + class FP_Scheduler : public virtual ::RTScheduling::Scheduler { public: typedef FP_Scheduler_ptr _ptr_type; typedef FP_Scheduler_var _var_type; - + // The static operations. static FP_Scheduler_ptr _duplicate (FP_Scheduler_ptr obj); - + static void _tao_release (FP_Scheduler_ptr obj); - + static FP_Scheduler_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static FP_Scheduler_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static FP_Scheduler_ptr _nil (void) { return static_cast<FP_Scheduler_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::FP_Scheduling::SegmentSchedulingParameterPolicy_ptr create_segment_scheduling_parameter ( ::RTCORBA::Priority segment_priority ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -283,36 +283,36 @@ namespace FP_Scheduling ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. FP_Scheduler (void); - + virtual ~FP_Scheduler (void); - + private: // Private and unimplemented for concrete interfaces. FP_Scheduler (const FP_Scheduler &); - + void operator= (const FP_Scheduler &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_FP_Scheduler; // TAO_IDL - Generated from @@ -329,7 +329,7 @@ namespace TAO #if !defined (_FP_SCHEDULING_SEGMENTSCHEDULINGPARAMETERPOLICY__TRAITS_CH_) #define _FP_SCHEDULING_SEGMENTSCHEDULINGPARAMETERPOLICY__TRAITS_CH_ - + template<> struct Objref_Traits< ::FP_Scheduling::SegmentSchedulingParameterPolicy> { @@ -350,7 +350,7 @@ namespace TAO #if !defined (_FP_SCHEDULING_FP_SCHEDULER__TRAITS_CH_) #define _FP_SCHEDULING_FP_SCHEDULER__TRAITS_CH_ - + template<> struct Objref_Traits< ::FP_Scheduling::FP_Scheduler> { @@ -387,10 +387,6 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:969 -#if defined (__ACE_INLINE__) -#include "FP_SchedulingC.inl" -#endif /* defined INLINE */ - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/examples/RTScheduling/FP_SchedulingC.inl b/TAO/examples/RTScheduling/FP_SchedulingC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/examples/RTScheduling/FP_SchedulingC.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/examples/RTScheduling/MIF_SchedulingC.cpp b/TAO/examples/RTScheduling/MIF_SchedulingC.cpp index 0729a167920..36a28419faf 100644 --- a/TAO/examples/RTScheduling/MIF_SchedulingC.cpp +++ b/TAO/examples/RTScheduling/MIF_SchedulingC.cpp @@ -44,10 +44,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "MIF_SchedulingC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 @@ -99,7 +95,7 @@ MIF_Scheduling::SegmentSchedulingParameterPolicy::SegmentSchedulingParameterPoli MIF_Scheduling::SegmentSchedulingParameterPolicy::~SegmentSchedulingParameterPolicy (void) {} -void +void MIF_Scheduling::SegmentSchedulingParameterPolicy::_tao_any_destructor (void *_tao_void_pointer) { SegmentSchedulingParameterPolicy *_tao_tmp_pointer = @@ -117,10 +113,10 @@ MIF_Scheduling::SegmentSchedulingParameterPolicy::_narrow ( { return SegmentSchedulingParameterPolicy::_nil (); } - + SegmentSchedulingParameterPolicy_ptr proxy = dynamic_cast<SegmentSchedulingParameterPolicy_ptr> (_tao_objref); - + return SegmentSchedulingParameterPolicy::_duplicate (proxy); } @@ -134,10 +130,10 @@ MIF_Scheduling::SegmentSchedulingParameterPolicy::_unchecked_narrow ( { return SegmentSchedulingParameterPolicy::_nil (); } - + SegmentSchedulingParameterPolicy_ptr proxy = dynamic_cast<SegmentSchedulingParameterPolicy_ptr> (_tao_objref); - + return SegmentSchedulingParameterPolicy::_duplicate (proxy); } @@ -148,7 +144,7 @@ MIF_Scheduling::SegmentSchedulingParameterPolicy::_duplicate (SegmentSchedulingP { obj->_add_ref (); } - + return obj; } diff --git a/TAO/examples/RTScheduling/MIF_SchedulingC.h b/TAO/examples/RTScheduling/MIF_SchedulingC.h index fa06a709109..1adc8bffc0e 100644 --- a/TAO/examples/RTScheduling/MIF_SchedulingC.h +++ b/TAO/examples/RTScheduling/MIF_SchedulingC.h @@ -50,13 +50,13 @@ #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO #endif -#define TAO_EXPORT_MACRO +#define TAO_EXPORT_MACRO #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 +# define TAO_EXPORT_NESTED_MACRO #endif /* TAO_EXPORT_NESTED_CLASSES */ #if defined(_MSC_VER) @@ -68,13 +68,13 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// TAO_IDL - Generated from +// 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; } @@ -84,22 +84,22 @@ namespace TAO namespace MIF_Scheduling { - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_MIF_SCHEDULING_SEGMENTSCHEDULINGPARAMETERPOLICY__VAR_OUT_CH_) #define _MIF_SCHEDULING_SEGMENTSCHEDULINGPARAMETERPOLICY__VAR_OUT_CH_ - + class SegmentSchedulingParameterPolicy; typedef SegmentSchedulingParameterPolicy *SegmentSchedulingParameterPolicy_ptr; - + typedef TAO_Objref_Var_T< SegmentSchedulingParameterPolicy > SegmentSchedulingParameterPolicy_var; - + typedef TAO_Objref_Out_T< SegmentSchedulingParameterPolicy @@ -107,55 +107,55 @@ namespace MIF_Scheduling SegmentSchedulingParameterPolicy_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_MIF_SCHEDULING_SEGMENTSCHEDULINGPARAMETERPOLICY_CH_) #define _MIF_SCHEDULING_SEGMENTSCHEDULINGPARAMETERPOLICY_CH_ - + class SegmentSchedulingParameterPolicy : public virtual ::CORBA::Policy { public: typedef SegmentSchedulingParameterPolicy_ptr _ptr_type; typedef SegmentSchedulingParameterPolicy_var _var_type; - + // The static operations. static SegmentSchedulingParameterPolicy_ptr _duplicate (SegmentSchedulingParameterPolicy_ptr obj); - + static void _tao_release (SegmentSchedulingParameterPolicy_ptr obj); - + static SegmentSchedulingParameterPolicy_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static SegmentSchedulingParameterPolicy_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static SegmentSchedulingParameterPolicy_ptr _nil (void) { return static_cast<SegmentSchedulingParameterPolicy_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual CORBA::Short importance ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void importance ( ::CORBA::Short importance ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -163,73 +163,73 @@ namespace MIF_Scheduling ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::CORBA::Policy_ptr copy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual void destroy ( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. SegmentSchedulingParameterPolicy (void); - + virtual ~SegmentSchedulingParameterPolicy (void); - + private: // Private and unimplemented for concrete interfaces. SegmentSchedulingParameterPolicy (const SegmentSchedulingParameterPolicy &); - + void operator= (const SegmentSchedulingParameterPolicy &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_SegmentSchedulingParameterPolicy; - + // TAO_IDL - Generated from // be\be_interface.cpp:598 #if !defined (_MIF_SCHEDULING_MIF_SCHEDULER__VAR_OUT_CH_) #define _MIF_SCHEDULING_MIF_SCHEDULER__VAR_OUT_CH_ - + class MIF_Scheduler; typedef MIF_Scheduler *MIF_Scheduler_ptr; - + typedef TAO_Objref_Var_T< MIF_Scheduler > MIF_Scheduler_var; - + typedef TAO_Objref_Out_T< MIF_Scheduler @@ -237,45 +237,45 @@ namespace MIF_Scheduling MIF_Scheduler_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_MIF_SCHEDULING_MIF_SCHEDULER_CH_) #define _MIF_SCHEDULING_MIF_SCHEDULER_CH_ - + class MIF_Scheduler : public virtual ::RTScheduling::Scheduler { public: typedef MIF_Scheduler_ptr _ptr_type; typedef MIF_Scheduler_var _var_type; - + // The static operations. static MIF_Scheduler_ptr _duplicate (MIF_Scheduler_ptr obj); - + static void _tao_release (MIF_Scheduler_ptr obj); - + static MIF_Scheduler_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static MIF_Scheduler_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static MIF_Scheduler_ptr _nil (void) { return static_cast<MIF_Scheduler_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 - + virtual ::MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr create_segment_scheduling_parameter ( ::CORBA::Short segment_importance ACE_ENV_ARG_DECL_WITH_DEFAULTS @@ -283,36 +283,36 @@ namespace MIF_Scheduling ACE_THROW_SPEC (( CORBA::SystemException )) = 0; - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:210 - + virtual CORBA::Boolean _is_a ( const char *type_id ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - + protected: // Abstract or local interface only. MIF_Scheduler (void); - + virtual ~MIF_Scheduler (void); - + private: // Private and unimplemented for concrete interfaces. MIF_Scheduler (const MIF_Scheduler &); - + void operator= (const MIF_Scheduler &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_MIF_Scheduler; // TAO_IDL - Generated from @@ -329,7 +329,7 @@ namespace TAO #if !defined (_MIF_SCHEDULING_SEGMENTSCHEDULINGPARAMETERPOLICY__TRAITS_CH_) #define _MIF_SCHEDULING_SEGMENTSCHEDULINGPARAMETERPOLICY__TRAITS_CH_ - + template<> struct Objref_Traits< ::MIF_Scheduling::SegmentSchedulingParameterPolicy> { @@ -350,7 +350,7 @@ namespace TAO #if !defined (_MIF_SCHEDULING_MIF_SCHEDULER__TRAITS_CH_) #define _MIF_SCHEDULING_MIF_SCHEDULER__TRAITS_CH_ - + template<> struct Objref_Traits< ::MIF_Scheduling::MIF_Scheduler> { @@ -387,10 +387,6 @@ namespace TAO // TAO_IDL - Generated from // be\be_codegen.cpp:969 -#if defined (__ACE_INLINE__) -#include "MIF_SchedulingC.inl" -#endif /* defined INLINE */ - #if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/examples/RTScheduling/MIF_SchedulingC.inl b/TAO/examples/RTScheduling/MIF_SchedulingC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/examples/RTScheduling/MIF_SchedulingC.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/orbsvcs/orbsvcs/HTIOP/htiop_endpoints.pidl b/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpoints.pidl index 05757752b43..4a192fe9413 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpoints.pidl +++ b/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpoints.pidl @@ -24,7 +24,7 @@ // is: // // tao_idl -// -Gp -Gd -Ge 1 -Sc -Sa -DCORBA3 \ +// -Gp -Gd -Ge 1 -Sc -Sa -DCORBA3 -Sci \ // -Wb,export_macro=HTIOP_Export \ // -Wb,export_include="HTIOP_Export.h" \ // -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.cpp index a9c1474f1ba..e6a62450951 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.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 "htiop_endpointsC.h" @@ -42,12 +42,8 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "htiop_endpointsC.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 @@ -56,7 +52,7 @@ namespace TAO // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_HTIOP_Endpoint_Info[] = { @@ -81,12 +77,12 @@ static TAO::TypeCode::Struct<char const *, &_tao_tc_HTIOP_Endpoint_Info; // TAO_IDL - Generated from -// be/be_visitor_structure/structure_cs.cpp:68 +// be\be_visitor_structure/structure_cs.cpp:66 // TAO_IDL - Generated from -// be/be_visitor_sequence/sequence_cs.cpp:65 +// be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_HTIOPENDPOINTSEQUENCE_CS_) #define _HTIOPENDPOINTSEQUENCE_CS_ @@ -130,12 +126,12 @@ HTIOPEndpointSequence::~HTIOPEndpointSequence (void) #endif /* end #if !defined */ // 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:924 +// be\be_visitor_typecode/typecode_defn.cpp:925 #ifndef _TAO_TYPECODE_HTIOPEndpointSequence_GUARD @@ -144,7 +140,7 @@ namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> HTIOPEndpointSequence_0 ( CORBA::tk_sequence, @@ -172,7 +168,7 @@ static TAO::TypeCode::Alias<char const *, &_tao_tc_HTIOPEndpointSequence; // 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, @@ -197,7 +193,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_HTIOPEndpointSequence_CPP_ #define _TAO_CDR_OP_HTIOPEndpointSequence_CPP_ diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.h b/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.h index 5672c37417b..03fe5cd0e38 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.h @@ -181,11 +181,7 @@ HTIOP_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_HTIOPEndpointSequence_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:958 - -#if defined (__ACE_INLINE__) -#include "htiop_endpointsC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.inl b/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.pidl b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.pidl index 3f197680003..1891b23e4c4 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.pidl +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpoints.pidl @@ -21,16 +21,12 @@ // is: // // tao_idl -// -Sa -Sc -Gp -Gd -DCORBA3 +// -Sa -Sc -Gp -Gd -DCORBA3 -Sci // -Wb,export_macro=TAO_SSLIOP_Export \ // -Wb,pre_include="ace/pre.h" \ // -Wb,post_include="ace/post.h" \ // ssl_endpoints.pidl // -// Remove the generated code for Any's and CDR's. Rename the files -// as ssl_endpoints.h and ssl_endpoints.cpp -// -// // ================================================================ #ifndef _SSL_ENDPOINTS_IDL_ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.cpp index ca3847bb7be..61930b1b478 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.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 "ssl_endpointsC.h" @@ -41,12 +41,8 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "ssl_endpointsC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from -// be/be_visitor_arg_traits.cpp:69 +// be\be_visitor_arg_traits.cpp:69 // Arg traits specializations. namespace TAO @@ -55,7 +51,7 @@ namespace TAO // TAO_IDL - Generated from -// be/be_visitor_sequence/sequence_cs.cpp:65 +// be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_TAO_SSLENDPOINTSEQUENCE_CS_) #define _TAO_SSLENDPOINTSEQUENCE_CS_ @@ -99,12 +95,12 @@ TAO_SSLEndpointSequence::~TAO_SSLEndpointSequence (void) #endif /* end #if !defined */ // 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:924 +// be\be_visitor_typecode/typecode_defn.cpp:925 #ifndef _TAO_TYPECODE_TAO_SSLEndpointSequence_GUARD @@ -113,7 +109,7 @@ namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> TAO_SSLEndpointSequence_0 ( CORBA::tk_sequence, @@ -141,7 +137,7 @@ static TAO::TypeCode::Alias<char const *, &_tao_tc_TAO_SSLEndpointSequence; // 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_TAO_SSLEndpointSequence_CPP_ #define _TAO_CDR_OP_TAO_SSLEndpointSequence_CPP_ diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.h b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.h index dc0331089c3..8dc99623994 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.h @@ -140,11 +140,7 @@ TAO_SSLIOP_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_TAO_SSLEndpointSequence_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:958 - -#if defined (__ACE_INLINE__) -#include "ssl_endpointsC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/IORManipulation/IOR.pidl b/TAO/tao/IORManipulation/IOR.pidl index ce11258c0d4..4aad0527793 100644 --- a/TAO/tao/IORManipulation/IOR.pidl +++ b/TAO/tao/IORManipulation/IOR.pidl @@ -5,12 +5,12 @@ * * @brief Pre-compiled IDL source for the TAO_IOP namespace. * - * This file was used to generate the code in IORC.{h,i,cpp}. + * This file was used to generate the code in IORC.{h,cpp}. * * To regenerate the code use: * * 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_IORManip_Export \ * -Wb,export_include="ior_manip_export.h" \ * -Wb,pre_include="ace/pre.h" \ diff --git a/TAO/tao/IORManipulation/IORA.cpp b/TAO/tao/IORManipulation/IORA.cpp index 4f07bf44150..d250a9d75a3 100644 --- a/TAO/tao/IORManipulation/IORA.cpp +++ b/TAO/tao/IORManipulation/IORA.cpp @@ -38,7 +38,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_TAO_IOP_EmptyProfileList = 0; static TAO::TypeCode::Struct<char const *, @@ -62,7 +62,7 @@ namespace TAO_IOP // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_TAO_IOP_NotFound = 0; static TAO::TypeCode::Struct<char const *, @@ -86,7 +86,7 @@ namespace TAO_IOP // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_TAO_IOP_Duplicate = 0; static TAO::TypeCode::Struct<char const *, @@ -110,7 +110,7 @@ namespace TAO_IOP // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_TAO_IOP_Invalid_IOR = 0; static TAO::TypeCode::Struct<char const *, @@ -134,7 +134,7 @@ namespace TAO_IOP // TAO_IDL - Generated from -// be/be_visitor_typecode/struct_typecode.cpp:34 +// be\be_visitor_typecode/struct_typecode.cpp:70 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_TAO_IOP_MultiProfileList = 0; static TAO::TypeCode::Struct<char const *, @@ -158,7 +158,7 @@ namespace TAO_IOP // 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, @@ -176,18 +176,21 @@ namespace TAO_IOP // TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:31 +// be\be_visitor_typecode/alias_typecode.cpp:31 // TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:914 +// be\be_visitor_typecode/typecode_defn.cpp:925 + +#ifndef _TAO_TYPECODE_TAO_IOP_TAO_IOR_Manipulation_IORList_GUARD +#define _TAO_TYPECODE_TAO_IOP_TAO_IOR_Manipulation_IORList_GUARD namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> TAO_IOP_TAO_IOR_Manipulation_IORList_0 ( CORBA::tk_sequence, @@ -200,6 +203,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_TAO_IOP_TAO_IOR_Manipulation_IORList_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -213,7 +218,7 @@ static TAO::TypeCode::Alias<char const *, &_tao_tc_TAO_IOP_TAO_IOR_Manipulation_IORList; // 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, @@ -231,7 +236,7 @@ namespace TAO_IOP // 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 @@ -316,7 +321,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 @@ -401,7 +406,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 @@ -486,7 +491,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 @@ -571,7 +576,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 @@ -656,7 +661,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 @@ -725,7 +730,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 @@ -794,7 +799,7 @@ operator>>= ( } // TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 +// be\be_visitor_sequence/any_op_cs.cpp:54 diff --git a/TAO/tao/IORManipulation/IORC.cpp b/TAO/tao/IORManipulation/IORC.cpp index 118b0d81ce9..7244dfabfe1 100644 --- a/TAO/tao/IORManipulation/IORC.cpp +++ b/TAO/tao/IORManipulation/IORC.cpp @@ -31,22 +31,12 @@ #include "IORManip_Loader.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/Sequence_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 "IORC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/IORManipulation/IORC.h b/TAO/tao/IORManipulation/IORC.h index b320e7de37a..a809ca3f296 100644 --- a/TAO/tao/IORManipulation/IORC.h +++ b/TAO/tao/IORManipulation/IORC.h @@ -68,17 +68,6 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// TAO_IDL - Generated from -// be\be_visitor_root/root_ch.cpp:62 - -namespace TAO -{ - class Collocation_Proxy_Broker; - - template<typename T> class Narrow_Utils; - template<typename T> class AbstractBase_Narrow_Utils; -} - // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:48 @@ -131,7 +120,7 @@ namespace TAO_IOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_EmptyProfileList; + extern TAO_IORManip_Export ::CORBA::TypeCode_ptr const _tc_EmptyProfileList; #endif /* end #if !defined */ @@ -181,7 +170,7 @@ namespace TAO_IOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_NotFound; + extern TAO_IORManip_Export ::CORBA::TypeCode_ptr const _tc_NotFound; #endif /* end #if !defined */ @@ -231,7 +220,7 @@ namespace TAO_IOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Duplicate; + extern TAO_IORManip_Export ::CORBA::TypeCode_ptr const _tc_Duplicate; #endif /* end #if !defined */ @@ -281,7 +270,7 @@ namespace TAO_IOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Invalid_IOR; + extern TAO_IORManip_Export ::CORBA::TypeCode_ptr const _tc_Invalid_IOR; #endif /* end #if !defined */ @@ -331,7 +320,7 @@ namespace TAO_IOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_MultiProfileList; + extern TAO_IORManip_Export ::CORBA::TypeCode_ptr const _tc_MultiProfileList; #endif /* end #if !defined */ @@ -483,7 +472,7 @@ namespace TAO_IOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_TAO_IOR_Property; + extern TAO_IORManip_Export ::CORBA::TypeCode_ptr const _tc_TAO_IOR_Property; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -766,7 +755,7 @@ namespace TAO_IOP // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_TAO_IOR_Manipulation; + extern TAO_IORManip_Export ::CORBA::TypeCode_ptr const _tc_TAO_IOR_Manipulation; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -916,11 +905,7 @@ TAO_IORManip_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_IOP::M TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::MultiProfileList &); // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "IORC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/IORManipulation/IORC.inl b/TAO/tao/IORManipulation/IORC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/IORManipulation/IORC.inl +++ /dev/null @@ -1,27 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - diff --git a/TAO/tao/Policy.pidl b/TAO/tao/Policy.pidl index 5ae711c3519..72356bd0300 100644 --- a/TAO/tao/Policy.pidl +++ b/TAO/tao/Policy.pidl @@ -17,7 +17,7 @@ * command used for this is: * * tao_idl.exe - * -o orig -Gp -Gd -Ge 1 -GT -GA + * -o orig -Gp -Gd -Ge 1 -GT -GA -Ssi * -Wb,stub_export_macro=TAO_Export * -Wb,stub_export_include="tao/TAO_Export.h" * -Wb,skel_export_macro=TAO_PortableServer_Export diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp index 13e540750ae..c10a16fefa7 100644 --- a/TAO/tao/PortableServer/PolicyS.cpp +++ b/TAO/tao/PortableServer/PolicyS.cpp @@ -27,7 +27,7 @@ // TAO_IDL - Generated from -// be\be_codegen.cpp:595 +// be\be_codegen.cpp:599 #ifndef _TAO_IDL_ORIG_POLICYS_CPP_ #define _TAO_IDL_ORIG_POLICYS_CPP_ @@ -67,10 +67,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "PolicyS.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 @@ -82,7 +78,7 @@ namespace TAO #define _CORBA_POLICY__SARG_TRAITS_SS_ template<> - class TAO_PortableServer_Export SArg_Traits<CORBA::Policy> + class SArg_Traits<CORBA::Policy> : public Object_SArg_Traits_T< CORBA::Policy_ptr, @@ -107,7 +103,7 @@ namespace TAO #define _CORBA_POLICY__ARG_TRAITS_SS_ template<> - class TAO_PortableServer_Export Arg_Traits<CORBA::Policy> + class Arg_Traits<CORBA::Policy> : public Object_Arg_Traits_T< CORBA::Policy_ptr, @@ -136,7 +132,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_CORBA_Policy_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_CORBA_Policy_Perfect_Hash_OpTable -N lookup */ unsigned int TAO_CORBA_Policy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) { diff --git a/TAO/tao/PortableServer/PolicyS.h b/TAO/tao/PortableServer/PolicyS.h index 5bb799161be..a329243c0a0 100644 --- a/TAO/tao/PortableServer/PolicyS.h +++ b/TAO/tao/PortableServer/PolicyS.h @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:398 +// be\be_codegen.cpp:391 #ifndef _TAO_IDL_ORIG_POLICYS_H_ #define _TAO_IDL_ORIG_POLICYS_H_ @@ -61,12 +61,6 @@ #undef TAO_EXPORT_MACRO #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 */ // TAO_IDL - Generated from // be\be_visitor_module/module_sh.cpp:49 @@ -199,25 +193,25 @@ namespace POA_CORBA /////////////////////////////////////////////////////////////////////// // Strategized Proxy Broker Declaration // - + // TAO_IDL - Generated from // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36 - + class TAO_PortableServer_Export _TAO_Policy_Strategized_Proxy_Broker : public virtual TAO::Collocation_Proxy_Broker { - public: + public: _TAO_Policy_Strategized_Proxy_Broker (void); - + virtual ~_TAO_Policy_Strategized_Proxy_Broker (void); - + TAO::Collocation_Strategy get_strategy ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)); - + void dispatch ( CORBA::Object_ptr obj, @@ -230,34 +224,34 @@ namespace POA_CORBA ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::Exception)); - + static _TAO_Policy_Strategized_Proxy_Broker * the_TAO_Policy_Strategized_Proxy_Broker (void); }; - + // - // End Strategized Proxy Broker Declaration + // End Strategized Proxy Broker Declaration /////////////////////////////////////////////////////////////////////// - - - - // TAO_IDL - Generated from + + + + // TAO_IDL - Generated from // be\be_visitor_interface/direct_proxy_impl_sh.cpp:31 - + /////////////////////////////////////////////////////////////////////// // Direct Impl. Declaration // - + class TAO_PortableServer_Export _TAO_Policy_Direct_Proxy_Impl { public: _TAO_Policy_Direct_Proxy_Impl (void); - + virtual ~_TAO_Policy_Direct_Proxy_Impl (void) {} - + // TAO_IDL - Generated from // be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void _get_policy_type ( TAO_Abstract_ServantBase *servant, @@ -268,10 +262,10 @@ namespace POA_CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void copy ( TAO_Abstract_ServantBase *servant, @@ -282,10 +276,10 @@ namespace POA_CORBA ACE_THROW_SPEC (( CORBA::SystemException )); - + // TAO_IDL - Generated from // be\be_visitor_operation/proxy_impl_xh.cpp:24 - + static void destroy ( TAO_Abstract_ServantBase *servant, @@ -297,26 +291,23 @@ namespace POA_CORBA CORBA::SystemException )); }; - + // // Direct Proxy Impl. Declaration /////////////////////////////////////////////////////////////////////// - - + + // TAO_IDL - Generated from // be\be_visitor_module/module_sh.cpp:80 } // module CORBA -// TAO_IDL - Generated from -// be\be_codegen.cpp:1005 +// TAO_IDL - Generated from +// be\be_codegen.cpp:995 #include "PolicyS_T.h" -#if defined (__ACE_INLINE__) -#include "PolicyS.inl" -#endif /* defined INLINE */ #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/PortableServer/PolicyS.inl b/TAO/tao/PortableServer/PolicyS.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/PortableServer/PolicyS.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/PolicyS_T.cpp b/TAO/tao/PortableServer/PolicyS_T.cpp index 555d0ae2e61..a53bc9459b6 100644 --- a/TAO/tao/PortableServer/PolicyS_T.cpp +++ b/TAO/tao/PortableServer/PolicyS_T.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:691 +// be\be_codegen.cpp:677 #ifndef _TAO_IDL_ORIG_POLICYS_T_CPP_ #define _TAO_IDL_ORIG_POLICYS_T_CPP_ diff --git a/TAO/tao/PortableServer/PolicyS_T.h b/TAO/tao/PortableServer/PolicyS_T.h index 13a6feb65b2..2e8d80a5198 100644 --- a/TAO/tao/PortableServer/PolicyS_T.h +++ b/TAO/tao/PortableServer/PolicyS_T.h @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:554 +// be\be_codegen.cpp:536 #ifndef _TAO_IDL_ORIG_POLICYS_T_H_ #define _TAO_IDL_ORIG_POLICYS_T_H_ @@ -127,7 +127,7 @@ namespace POA_CORBA } // module CORBA // TAO_IDL - Generated from -// be\be_codegen.cpp:1102 +// be\be_codegen.cpp:1096 #if defined (__ACE_INLINE__) #include "PolicyS_T.inl" diff --git a/TAO/tao/RTScheduling/RTScheduler.pidl b/TAO/tao/RTScheduling/RTScheduler.pidl index 03a903e14b0..6f0eb94dda4 100644 --- a/TAO/tao/RTScheduling/RTScheduler.pidl +++ b/TAO/tao/RTScheduling/RTScheduler.pidl @@ -10,11 +10,11 @@ // = DESCRIPTION // Some new data types included for GIOP 1.2 // This file was used to generate the code in -// GIOP*.* The command used to generate code +// RTScheduler*.* The command used to generate code // is: // // tao_idl -// -o orig -GA -Sa -Gp -Gd -Ge 1 -GT +// -o orig -GA -Sa -Gp -Gd -Ge 1 -GT -Sci // -Wb,export_macro=TAO_RTScheduler_Export // -Wb,export_include="rtscheduler_export.h" // -Wb,pre_include="ace/pre.h" diff --git a/TAO/tao/RTScheduling/RTSchedulerA.cpp b/TAO/tao/RTScheduling/RTSchedulerA.cpp index ffcbde6e0b7..ef11e40d4ec 100644 --- a/TAO/tao/RTScheduling/RTSchedulerA.cpp +++ b/TAO/tao/RTScheduling/RTSchedulerA.cpp @@ -36,7 +36,7 @@ #include "tao/Struct_TypeCode.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, @@ -54,7 +54,7 @@ namespace RTScheduling // 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_RTScheduling_DistributableThread_DT_State[] = { @@ -76,7 +76,7 @@ static TAO::TypeCode::Enum<char const *, &_tao_tc_RTScheduling_DistributableThread_DT_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, @@ -94,7 +94,7 @@ namespace RTScheduling // 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_RTScheduling_Current_UNSUPPORTED_SCHEDULING_DISCIPLINE = 0; static TAO::TypeCode::Struct<char const *, @@ -113,18 +113,21 @@ static TAO::TypeCode::Struct<char const *, &_tao_tc_RTScheduling_Current_UNSUPPORTED_SCHEDULING_DISCIPLINE; // 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_RTScheduling_Current_IdType_GUARD +#define _TAO_TYPECODE_RTScheduling_Current_IdType_GUARD namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> RTScheduling_Current_IdType_0 ( CORBA::tk_sequence, @@ -137,6 +140,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_RTScheduling_Current_IdType_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -150,18 +155,21 @@ static TAO::TypeCode::Alias<char const *, &_tao_tc_RTScheduling_Current_IdType; // 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_RTScheduling_Current_NameList_GUARD +#define _TAO_TYPECODE_RTScheduling_Current_NameList_GUARD namespace TAO { namespace TypeCode { - TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, + TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> RTScheduling_Current_NameList_0 ( CORBA::tk_sequence, @@ -174,6 +182,8 @@ namespace TAO } } + +#endif /* _TAO_TYPECODE_RTScheduling_Current_NameList_GUARD */ static TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, CORBA::tk_alias, @@ -187,7 +197,7 @@ static TAO::TypeCode::Alias<char const *, &_tao_tc_RTScheduling_Current_NameList; // 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, @@ -205,7 +215,7 @@ namespace RTScheduling // 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, @@ -223,7 +233,7 @@ namespace RTScheduling // 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_RTScheduling_Scheduler_INCOMPATIBLE_SCHEDULING_DISCIPLINES = 0; static TAO::TypeCode::Struct<char const *, @@ -242,7 +252,7 @@ static TAO::TypeCode::Struct<char const *, &_tao_tc_RTScheduling_Scheduler_INCOMPATIBLE_SCHEDULING_DISCIPLINES; // TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:73 +// be\be_visitor_typecode/objref_typecode.cpp:76 static TAO::TypeCode::Objref<char const *, CORBA::tk_local_interface, diff --git a/TAO/tao/RTScheduling/RTSchedulerC.cpp b/TAO/tao/RTScheduling/RTSchedulerC.cpp index c4fed455fbd..c1b9c180b9d 100644 --- a/TAO/tao/RTScheduling/RTSchedulerC.cpp +++ b/TAO/tao/RTScheduling/RTSchedulerC.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 "RTScheduler.h" @@ -39,25 +39,21 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "RTSchedulerC.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 { // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:492 + // be\be_visitor_arg_traits.cpp:496 #if !defined (_CORBA_POLICYLIST__ARG_TRAITS_CS_) #define _CORBA_POLICYLIST__ARG_TRAITS_CS_ template<> - class TAO_RTScheduler_Export Arg_Traits<CORBA::PolicyList> + class Arg_Traits<CORBA::PolicyList> : public Var_Size_Arg_Traits_T< CORBA::PolicyList, @@ -72,7 +68,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 RTScheduling::ThreadAction. @@ -205,7 +201,7 @@ RTScheduling::ThreadAction::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 RTScheduling::DistributableThread. @@ -338,7 +334,7 @@ RTScheduling::DistributableThread::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 RTScheduling::Current. @@ -374,7 +370,7 @@ TAO::Objref_Traits<RTScheduling::Current>::marshal ( } // TAO_IDL - Generated from -// be/be_visitor_exception/exception_cs.cpp:63 +// be\be_visitor_exception/exception_cs.cpp:63 RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::UNSUPPORTED_SCHEDULING_DISCIPLINE (void) : CORBA::UserException ( @@ -462,7 +458,7 @@ CORBA::TypeCode_ptr RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::_t } // TAO_IDL - Generated from -// be/be_visitor_sequence/sequence_cs.cpp:65 +// be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_RTSCHEDULING_CURRENT_IDTYPE_CS_) #define _RTSCHEDULING_CURRENT_IDTYPE_CS_ @@ -506,7 +502,7 @@ RTScheduling::Current::IdType::~IdType (void) #endif /* end #if !defined */ // TAO_IDL - Generated from -// be/be_visitor_sequence/sequence_cs.cpp:65 +// be\be_visitor_sequence/sequence_cs.cpp:65 #if !defined (_RTSCHEDULING_CURRENT_NAMELIST_CS_) #define _RTSCHEDULING_CURRENT_NAMELIST_CS_ @@ -649,7 +645,7 @@ RTScheduling::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 RTScheduling::ResourceManager. @@ -786,7 +782,7 @@ RTScheduling::ResourceManager::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 RTScheduling::Scheduler. @@ -822,7 +818,7 @@ TAO::Objref_Traits<RTScheduling::Scheduler>::marshal ( } // TAO_IDL - Generated from -// be/be_visitor_exception/exception_cs.cpp:63 +// be\be_visitor_exception/exception_cs.cpp:63 RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES::INCOMPATIBLE_SCHEDULING_DISCIPLINES (void) : CORBA::UserException ( @@ -1007,7 +1003,7 @@ RTScheduling::Scheduler::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/RTScheduling/RTSchedulerC.h b/TAO/tao/RTScheduling/RTSchedulerC.h index 54f9d9f4043..7a6abb041a3 100644 --- a/TAO/tao/RTScheduling/RTSchedulerC.h +++ b/TAO/tao/RTScheduling/RTSchedulerC.h @@ -72,17 +72,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 @@ -201,7 +190,7 @@ namespace RTScheduling // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ThreadAction; + extern TAO_RTScheduler_Export ::CORBA::TypeCode_ptr const _tc_ThreadAction; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -326,7 +315,7 @@ namespace RTScheduling // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_DistributableThread; + extern TAO_RTScheduler_Export ::CORBA::TypeCode_ptr const _tc_DistributableThread; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -678,7 +667,7 @@ namespace RTScheduling // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Current; + extern TAO_RTScheduler_Export ::CORBA::TypeCode_ptr const _tc_Current; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -767,7 +756,7 @@ namespace RTScheduling // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ResourceManager; + extern TAO_RTScheduler_Export ::CORBA::TypeCode_ptr const _tc_ResourceManager; // TAO_IDL - Generated from // be\be_interface.cpp:598 @@ -1161,7 +1150,7 @@ namespace RTScheduling // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Scheduler; + extern TAO_RTScheduler_Export ::CORBA::TypeCode_ptr const _tc_Scheduler; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -1282,11 +1271,7 @@ namespace TAO } // TAO_IDL - Generated from -// be\be_codegen.cpp:947 - -#if defined (__ACE_INLINE__) -#include "RTSchedulerC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/RTScheduling/RTSchedulerC.inl b/TAO/tao/RTScheduling/RTSchedulerC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/RTScheduling/RTSchedulerC.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/TypeCodeFactory/TypeCodeFactory.pidl b/TAO/tao/TypeCodeFactory/TypeCodeFactory.pidl index eee564824c9..864600c7080 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory.pidl +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory.pidl @@ -28,7 +28,7 @@ // 2. Generate the code. The command used to generate code from this // IDL file is: // -// tao_idl -o orig -Sc -Ge 1 -GT -I../.. \ +// tao_idl -o orig -Sc -Ge 1 -GT -I../.. -Sci \ // -Wb,export_macro=TAO_TypeCodeFactory_Export \ // -Wb,export_include=typecodefactory_export.h \ // -Wb,pre_include="ace/pre.h" \ @@ -40,14 +40,12 @@ // 4. Patch the generated files, using // // patch < diffs/TypeCodeFactoryC.h.diff -// patch < diffs/TypeCodeFactoryC.i.diff // patch < diffs/TypeCodeFactoryC.cpp.diff // // If this fails for some reason, the files must be patched // by hand, and the diff files regenerated with // // diff -wbu orig/TypeCodeFactoryC.h TypeCodeFactoryC.h > diffs/TypeCodeFactoryC.h.diff -// diff -wbu orig/TypeCodeFactoryC.i TypeCodeFactoryC.i > diffs/TypeCodeFactoryC.i.diff // diff -wbu orig/TypeCodeFactoryC.cpp TypeCodeFactoryC.cpp > diffs/TypeCodeFactoryC.cpp.diff // // 5. Restore TypeCodeFactory.pidl. diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp index becf3e4b3fb..baa598559d4 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.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<CORBA::TypeCodeFactory>::to_object ( ) const { _tao_elem = CORBA::Object::_duplicate (this->value_); - return 1; + return true; } template<> diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp index aef012f01b5..95f954cf0f8 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.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 "TypeCodeFactoryC.h" @@ -37,10 +37,6 @@ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig #endif /* __BORLANDC__ */ -#if !defined (__ACE_INLINE__) -#include "TypeCodeFactoryC.inl" -#endif /* !defined INLINE */ - // TAO_IDL - Generated from // be\be_visitor_arg_traits.cpp:69 diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h index 5cffedded0f..c664cc78029 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h @@ -56,13 +56,6 @@ #endif #define TAO_EXPORT_MACRO TAO_TypeCodeFactory_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_TypeCodeFactory_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 @@ -426,7 +408,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_TypeCodeFactory; + extern TAO_TypeCodeFactory_Export ::CORBA::TypeCode_ptr const _tc_TypeCodeFactory; // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:66 @@ -470,11 +452,7 @@ TAO_TypeCodeFactory_Export void operator<<= (CORBA::Any &, CORBA::TypeCodeFactor TAO_TypeCodeFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::TypeCodeFactory_ptr &); // TAO_IDL - Generated from -// be\be_codegen.cpp:969 - -#if defined (__ACE_INLINE__) -#include "TypeCodeFactoryC.inl" -#endif /* defined INLINE */ +// be\be_codegen.cpp:955 #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl deleted file mode 100644 index c944d806c1f..00000000000 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.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 - |