diff options
Diffstat (limited to 'TAO/tao/PortableServer/ServantLocatorC.h')
-rw-r--r-- | TAO/tao/PortableServer/ServantLocatorC.h | 47 |
1 files changed, 9 insertions, 38 deletions
diff --git a/TAO/tao/PortableServer/ServantLocatorC.h b/TAO/tao/PortableServer/ServantLocatorC.h index be2020ff060..d0333809f29 100644 --- a/TAO/tao/PortableServer/ServantLocatorC.h +++ b/TAO/tao/PortableServer/ServantLocatorC.h @@ -26,10 +26,10 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:153 +// be\be_codegen.cpp:154 -#ifndef _TAO_IDL_ORIG_SERVANTLOCATORC_H_ -#define _TAO_IDL_ORIG_SERVANTLOCATORC_H_ +#ifndef _TAO_IDL_SERVANTLOCATORC_H_ +#define _TAO_IDL_SERVANTLOCATORC_H_ #include /**/ "ace/pre.h" @@ -57,17 +57,8 @@ #endif #define TAO_EXPORT_MACRO TAO_PortableServer_Export -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option push -w-rvl -w-rch -w-ccc -w-inl -#endif /* __BORLANDC__ */ - // TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:48 +// be\be_visitor_module/module_ch.cpp:49 #if (TAO_HAS_MINIMUM_POA == 0) @@ -132,7 +123,7 @@ namespace PortableServer return static_cast<ServantLocator_ptr> (0); } - static void _tao_any_destructor (void *); + // TAO_IDL - Generated from // be\be_visitor_operation/operation_ch.cpp:46 @@ -189,14 +180,9 @@ namespace PortableServer }; #endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be\be_visitor_typecode/typecode_decl.cpp:44 - - extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ServantLocator; // TAO_IDL - Generated from -// be\be_visitor_module/module_ch.cpp:66 +// be\be_visitor_module/module_ch.cpp:78 } // module PortableServer @@ -207,8 +193,8 @@ namespace PortableServer namespace TAO { -#if !defined (_PORTABLESERVER_SERVANTLOCATOR__TRAITS_CH_) -#define _PORTABLESERVER_SERVANTLOCATOR__TRAITS_CH_ +#if !defined (_PORTABLESERVER_SERVANTLOCATOR__TRAITS_) +#define _PORTABLESERVER_SERVANTLOCATOR__TRAITS_ template<> struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ServantLocator> @@ -229,25 +215,10 @@ namespace TAO #endif /* end #if !defined */ } -// TAO_IDL - Generated from -// be\be_visitor_interface/any_op_ch.cpp:52 - -TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantLocator_ptr); // copying -TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantLocator_ptr *); // non-copying -TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantLocator_ptr &); - #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ // TAO_IDL - Generated from -// be\be_codegen.cpp:955 - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#if defined (__BORLANDC__) -#pragma option pop -#endif /* __BORLANDC__ */ +// be\be_codegen.cpp:1028 #include /**/ "ace/post.h" |