diff options
Diffstat (limited to 'TAO/tao/ServicesS_T.h')
-rw-r--r-- | TAO/tao/ServicesS_T.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/TAO/tao/ServicesS_T.h b/TAO/tao/ServicesS_T.h index d24670f6a4e..e607bee4a56 100644 --- a/TAO/tao/ServicesS_T.h +++ b/TAO/tao/ServicesS_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_SERVICESS_T_H_ #define _TAO_IDL_ORIG_SERVICESS_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,17 +42,15 @@ // TAO_IDL - Generated from // be\be_visitor_root/root_sth.cpp:116 -#if defined (ACE_HAS_USING_KEYWORD) namespace POA_CORBA { } // module CORBA -#endif /* ACE_HAS_USING_KEYWORD */ // TAO_IDL - Generated from -// be\be_codegen.cpp:1111 +// be\be_codegen.cpp:1094 #if defined (__ACE_INLINE__) -#include "ServicesS_T.i" +#include "ServicesS_T.inl" #endif /* defined INLINE */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) @@ -65,9 +61,10 @@ namespace POA_CORBA #pragma implementation ("ServicesS_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 */ + |