diff options
Diffstat (limited to 'TAO/tao/CONV_FRAMEC.h')
| -rw-r--r-- | TAO/tao/CONV_FRAMEC.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/TAO/tao/CONV_FRAMEC.h b/TAO/tao/CONV_FRAMEC.h index 250170cfbcf..00586477862 100644 --- a/TAO/tao/CONV_FRAMEC.h +++ b/TAO/tao/CONV_FRAMEC.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_CONV_FRAMEC_H_ #define _TAO_IDL_ORIG_CONV_FRAMEC_H_ #include /**/ "ace/pre.h" -#include "tao/Environment.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" #include "tao/Seq_Out_T.h" @@ -58,9 +61,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 */ @@ -321,13 +322,13 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CONV_FRAME::CodeSet TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetContext &); // TAO_IDL - Generated from -// be\be_codegen.cpp:978 +// be\be_codegen.cpp:963 #if defined (__ACE_INLINE__) -#include "CONV_FRAMEC.i" +#include "CONV_FRAMEC.inl" #endif /* defined INLINE */ -#if defined(_MSC_VER) && (_MSC_VER >= 1200) +#if defined(_MSC_VER) #pragma warning(pop) #endif /* _MSC_VER */ @@ -339,3 +340,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetContext #endif /* ifndef */ + |