diff options
Diffstat (limited to 'TAO/tao/CurrentC.h')
| -rw-r--r-- | TAO/tao/CurrentC.h | 81 |
1 files changed, 42 insertions, 39 deletions
diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h index bae17f58713..351feaf0542 100644 --- a/TAO/tao/CurrentC.h +++ b/TAO/tao/CurrentC.h @@ -26,21 +26,24 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:171 +// be\be_codegen.cpp:153 #ifndef _TAO_IDL_ORIG_CURRENTC_H_ #define _TAO_IDL_ORIG_CURRENTC_H_ #include /**/ "ace/pre.h" -#include "tao/Object.h" + +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/TAO_Export.h" +#include "tao/ORB.h" #include "tao/Environment.h" +#include "tao/Object.h" #include "tao/Objref_VarOut_T.h" #if defined (TAO_EXPORT_MACRO) @@ -56,9 +59,7 @@ #endif /* TAO_EXPORT_NESTED_CLASSES */ #if defined(_MSC_VER) -#if (_MSC_VER >= 1200) #pragma warning(push) -#endif /* _MSC_VER >= 1200 */ #pragma warning(disable:4250) #endif /* _MSC_VER */ @@ -66,13 +67,13 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -// TAO_IDL - Generated from -// be\be_visitor_root/root_ch.cpp:63 +// 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; } @@ -82,22 +83,22 @@ namespace TAO namespace CORBA { - + // TAO_IDL - Generated from - // be\be_interface.cpp:611 + // be\be_interface.cpp:598 #if !defined (_CORBA_CURRENT__VAR_OUT_CH_) #define _CORBA_CURRENT__VAR_OUT_CH_ - + class Current; typedef Current *Current_ptr; - + typedef TAO_Objref_Var_T< Current > Current_var; - + typedef TAO_Objref_Out_T< Current @@ -105,69 +106,69 @@ namespace CORBA Current_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_CORBA_CURRENT_CH_) #define _CORBA_CURRENT_CH_ - + class TAO_Export Current : public virtual CORBA::Object { public: typedef Current_ptr _ptr_type; typedef Current_var _var_type; - + // The static operations. static Current_ptr _duplicate (Current_ptr obj); - + static Current_ptr _narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Current_ptr _unchecked_narrow ( CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - + static Current_ptr _nil (void) { - return (Current_ptr)0; + return static_cast<Current_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:208 - + 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. Current (void); - + virtual ~Current (void); - + private: // Private and unimplemented for concrete interfaces. Current (const Current &); - + void operator= (const Current &); }; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:44 - + TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current; // TAO_IDL - Generated from @@ -184,19 +185,19 @@ namespace TAO #if !defined (_CORBA_CURRENT__TRAITS_CH_) #define _CORBA_CURRENT__TRAITS_CH_ - + ACE_TEMPLATE_SPECIALIZATION - struct TAO_Export Objref_Traits<CORBA::Current> + struct TAO_Export Objref_Traits< ::CORBA::Current> { - static CORBA::Current_ptr duplicate ( - CORBA::Current_ptr + static ::CORBA::Current_ptr duplicate ( + ::CORBA::Current_ptr ); static void release ( - CORBA::Current_ptr + ::CORBA::Current_ptr ); - static CORBA::Current_ptr nil (void); + static ::CORBA::Current_ptr nil (void); static CORBA::Boolean marshal ( - CORBA::Current_ptr p, + ::CORBA::Current_ptr p, TAO_OutputCDR & cdr ); }; @@ -212,13 +213,13 @@ TAO_Export void operator<<= (CORBA::Any &, CORBA::Current_ptr *); // non-copying TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Current_ptr &); // TAO_IDL - Generated from -// be\be_codegen.cpp:978 +// be\be_codegen.cpp:961 #if defined (__ACE_INLINE__) -#include "CurrentC.i" +#include "CurrentC.inl" #endif /* defined INLINE */ -#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ @@ -229,3 +230,5 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Current_ptr &) #include /**/ "ace/post.h" #endif /* ifndef */ + + |