diff options
Diffstat (limited to 'TAO/tao/Messaging/MessagingS_T.h')
| -rw-r--r-- | TAO/tao/Messaging/MessagingS_T.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/TAO/tao/Messaging/MessagingS_T.h b/TAO/tao/Messaging/MessagingS_T.h index 361b0ee3ce2..44c33204372 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:566 +// be\be_codegen.cpp:546 #ifndef _TAO_IDL_ORIG_MESSAGINGS_T_H_ #define _TAO_IDL_ORIG_MESSAGINGS_T_H_ @@ -34,9 +34,7 @@ #include /**/ "ace/pre.h" #if defined(_MSC_VER) -#if (_MSC_VER >= 1200) #pragma warning(push) -#endif /* _MSC_VER >= 1200 */ #pragma warning(disable:4250) #endif /* _MSC_VER */ @@ -44,7 +42,6 @@ // TAO_IDL - Generated from // be\be_visitor_root/root_sth.cpp:116 -#if defined (ACE_HAS_USING_KEYWORD) namespace POA_Messaging { @@ -98,13 +95,12 @@ namespace POA_Messaging void operator= (const ReplyHandler_tie &); }; } // module Messaging -#endif /* ACE_HAS_USING_KEYWORD */ // TAO_IDL - Generated from -// be\be_codegen.cpp:1111 +// be\be_codegen.cpp:1094 #if defined (__ACE_INLINE__) -#include "MessagingS_T.i" +#include "MessagingS_T.inl" #endif /* defined INLINE */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) @@ -115,9 +111,10 @@ namespace POA_Messaging #pragma implementation ("MessagingS_T.cpp") #endif /* defined REQUIRED PRAGMA */ -#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ #include /**/ "ace/post.h" #endif /* ifndef */ + |