summaryrefslogtreecommitdiff
path: root/TAO/tao/ServicesS_T.h
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2004-12-12 13:29:13 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2004-12-12 13:29:13 +0000
commit063cd1bfc3735cf7d849b92e5fbd0fb98d3eb740 (patch)
tree86439d4ee7b1a04a0e2b0cba12fb1c399fd4d9ba /TAO/tao/ServicesS_T.h
parenteb1adff5d74e5e2d8c14ae6b4f973f9bb368d432 (diff)
downloadATCD-063cd1bfc3735cf7d849b92e5fbd0fb98d3eb740.tar.gz
ChangeLogTag: Sun Dec 12 13:28:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/ServicesS_T.h')
-rw-r--r--TAO/tao/ServicesS_T.h13
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 */
+