diff options
Diffstat (limited to 'TAO/tao/Messaging/Messaging_RT_PolicyC.h')
| -rw-r--r-- | TAO/tao/Messaging/Messaging_RT_PolicyC.h | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.h b/TAO/tao/Messaging/Messaging_RT_PolicyC.h index 77d5c0fbe8a..56b2d500918 100644 --- a/TAO/tao/Messaging/Messaging_RT_PolicyC.h +++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.h @@ -26,20 +26,23 @@ // 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_MESSAGING_RT_POLICYC_H_ #define _TAO_IDL_ORIG_MESSAGING_RT_POLICYC_H_ #include /**/ "ace/pre.h" -#include "tao/ORB.h" + +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "messaging_export.h" +#include "tao/ORB.h" +#include "tao/SystemException.h" #include "tao/Environment.h" #include "tao/Object.h" #include "tao/Objref_VarOut_T.h" @@ -60,9 +63,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 */ @@ -71,7 +72,7 @@ #endif /* __BORLANDC__ */ // TAO_IDL - Generated from -// be\be_visitor_root/root_ch.cpp:63 +// be\be_visitor_root/root_ch.cpp:62 namespace TAO { @@ -88,7 +89,7 @@ namespace Messaging { // TAO_IDL - Generated from - // be\be_visitor_typedef/typedef_ch.cpp:342 + // be\be_visitor_typedef/typedef_ch.cpp:379 typedef TimeBase::TimeT Timeout; typedef TimeBase::TimeT_out Timeout_out; @@ -104,7 +105,7 @@ namespace Messaging const CORBA::PolicyType RELATIVE_RT_TIMEOUT_POLICY_TYPE = 32U; // TAO_IDL - Generated from - // be\be_interface.cpp:611 + // be\be_interface.cpp:598 #if !defined (_MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY__VAR_OUT_CH_) #define _MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY__VAR_OUT_CH_ @@ -133,7 +134,7 @@ namespace Messaging #define _MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY_CH_ class TAO_Messaging_Export RelativeRoundtripTimeoutPolicy - : public virtual CORBA::Policy + : public virtual ::CORBA::Policy { public: typedef RelativeRoundtripTimeoutPolicy_ptr _ptr_type; @@ -154,7 +155,7 @@ namespace Messaging static RelativeRoundtripTimeoutPolicy_ptr _nil (void) { - return (RelativeRoundtripTimeoutPolicy_ptr)0; + return static_cast<RelativeRoundtripTimeoutPolicy_ptr> (0); } static void _tao_any_destructor (void *); @@ -236,17 +237,17 @@ namespace TAO #define _MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY__TRAITS_CH_ ACE_TEMPLATE_SPECIALIZATION - struct TAO_Messaging_Export Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy> + struct TAO_Messaging_Export Objref_Traits< ::Messaging::RelativeRoundtripTimeoutPolicy> { - static Messaging::RelativeRoundtripTimeoutPolicy_ptr duplicate ( - Messaging::RelativeRoundtripTimeoutPolicy_ptr + static ::Messaging::RelativeRoundtripTimeoutPolicy_ptr duplicate ( + ::Messaging::RelativeRoundtripTimeoutPolicy_ptr ); static void release ( - Messaging::RelativeRoundtripTimeoutPolicy_ptr + ::Messaging::RelativeRoundtripTimeoutPolicy_ptr ); - static Messaging::RelativeRoundtripTimeoutPolicy_ptr nil (void); + static ::Messaging::RelativeRoundtripTimeoutPolicy_ptr nil (void); static CORBA::Boolean marshal ( - Messaging::RelativeRoundtripTimeoutPolicy_ptr p, + ::Messaging::RelativeRoundtripTimeoutPolicy_ptr p, TAO_OutputCDR & cdr ); }; @@ -262,13 +263,13 @@ 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:978 +// be\be_codegen.cpp:961 #if defined (__ACE_INLINE__) -#include "Messaging_RT_PolicyC.i" +#include "Messaging_RT_PolicyC.inl" #endif /* defined INLINE */ -#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ @@ -280,3 +281,4 @@ TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging:: #endif /* ifndef */ + |