summaryrefslogtreecommitdiff
path: root/TAO/tao/ShortSeqC.h
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/ShortSeqC.h')
-rw-r--r--TAO/tao/ShortSeqC.h15
1 files changed, 8 insertions, 7 deletions
diff --git a/TAO/tao/ShortSeqC.h b/TAO/tao/ShortSeqC.h
index ea3c5ee413f..d055abe73af 100644
--- a/TAO/tao/ShortSeqC.h
+++ b/TAO/tao/ShortSeqC.h
@@ -26,20 +26,22 @@
// 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_SHORTSEQC_H_
#define _TAO_IDL_ORIG_SHORTSEQC_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 "tao/TAO_Export.h"
+#include "tao/ORB.h"
#include "tao/Environment.h"
#include "tao/Sequence_T.h"
#include "tao/Seq_Var_T.h"
@@ -58,9 +60,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 */
@@ -166,13 +166,13 @@ TAO_Export CORBA::Boolean operator>> (
#endif /* _TAO_CDR_OP_CORBA_ShortSeq_H_ */
// TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
#if defined (__ACE_INLINE__)
-#include "ShortSeqC.i"
+#include "ShortSeqC.inl"
#endif /* defined INLINE */
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
#pragma warning(pop)
#endif /* _MSC_VER */
@@ -184,3 +184,4 @@ TAO_Export CORBA::Boolean operator>> (
#endif /* ifndef */
+