diff options
author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-08-23 04:40:18 +0000 |
---|---|---|
committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-08-23 04:40:18 +0000 |
commit | 4fb64fbbcfc5c38794c4f4faa81c2161fece9fc6 (patch) | |
tree | 08376449bdb2b9329a9dee87bfd874dbe723eaf4 | |
parent | 6faa2e164bbcf82c839d337a9dd2f288ba8066c9 (diff) | |
download | ATCD-4fb64fbbcfc5c38794c4f4faa81c2161fece9fc6.tar.gz |
ChangeLogTag:Mon Aug 22 21:33:37 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
45 files changed, 113 insertions, 20 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 42b0869aa67..7bdb4e62777 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,62 @@ +Mon Aug 22 21:33:37 2005 Ossama Othman <ossama@dre.vanderbilt.edu> + + * tao/Typecode_typesC.h: + + Removed unnecessary include directives. They were causing + headers to be included that prematurely caused some templates to + be parsed before all non-dependent names were parsed. Addresses + g++ 3.4.x or better compile-time errors. + + * tao/AnyTypeCode/BooleanSeqA.h: + * tao/AnyTypeCode/BoundsA.h: + * tao/AnyTypeCode/CONV_FRAMEA.h: + * tao/AnyTypeCode/CharSeqA.h: + * tao/AnyTypeCode/CurrentA.h: + * tao/AnyTypeCode/DomainA.h: + * tao/AnyTypeCode/DoubleSeqA.h: + * tao/AnyTypeCode/DynamicC.h: + * tao/AnyTypeCode/Dynamic_ParameterC.h: + * tao/AnyTypeCode/FloatSeqA.h: + * tao/AnyTypeCode/GIOPA.h: + * tao/AnyTypeCode/IIOPA.h: + * tao/AnyTypeCode/IIOP_EndpointsA.h: + * tao/AnyTypeCode/IOPA.h: + * tao/AnyTypeCode/IOP_IORA.h: + * tao/AnyTypeCode/LongDoubleSeqA.h: + * tao/AnyTypeCode/LongLongSeqA.h: + * tao/AnyTypeCode/LongSeqA.h: + * tao/AnyTypeCode/Messaging_PolicyValueA.h: + * tao/AnyTypeCode/NVList.h: + * tao/AnyTypeCode/ObjectIdListA.h: + * tao/AnyTypeCode/OctetSeqA.h: + * tao/AnyTypeCode/PI_ForwardA.h: + * tao/AnyTypeCode/ParameterModeA.h: + * tao/AnyTypeCode/PolicyA.h: + * tao/AnyTypeCode/Policy_ForwardA.h: + * tao/AnyTypeCode/PortableInterceptorA.h: + * tao/AnyTypeCode/ServicesA.h: + * tao/AnyTypeCode/ShortSeqA.h: + * tao/AnyTypeCode/StringSeqA.h: + * tao/AnyTypeCode/SystemExceptionA.h: + * tao/AnyTypeCode/TAOA.h: + * tao/AnyTypeCode/TimeBaseA.h: + * tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp: + * tao/AnyTypeCode/ULongLongSeqA.h: + * tao/AnyTypeCode/ULongSeqA.h: + * tao/AnyTypeCode/UShortSeqA.h: + * tao/AnyTypeCode/ValueModifierA.h: + * tao/AnyTypeCode/VisibilityA.h: + * tao/AnyTypeCode/WCharSeqA.h: + * tao/AnyTypeCode/WStringSeqA.h: + * tao/AnyTypeCode/WrongTransactionA.h: + * tao/AnyTypeCode/orb_typesA.h: + + Reordered include directives to make sure all necessary + non-dependent names are parsed before the templates that use + them. In the case of the "*A.h" files, this is a temporary + work-around until TAO_IDL is updated. Addresses g++ 3.4.x or + better compile-time errors. + Mon Aug 22 21:05:36 2005 Ossama Othman <ossama@dre.vanderbilt.edu> * TAO_IDL/be/be_codegen.cpp (gen_stub_hdr_includes): diff --git a/TAO/tao/AnyTypeCode/BooleanSeqA.h b/TAO/tao/AnyTypeCode/BooleanSeqA.h index 3f62afae6af..673ea6cfc28 100644 --- a/TAO/tao/AnyTypeCode/BooleanSeqA.h +++ b/TAO/tao/AnyTypeCode/BooleanSeqA.h @@ -34,6 +34,7 @@ #include /**/ "ace/pre.h" #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/BooleanSeqC.h" diff --git a/TAO/tao/AnyTypeCode/BoundsA.h b/TAO/tao/AnyTypeCode/BoundsA.h index c5af5d83cd1..c3f5f3658a2 100644 --- a/TAO/tao/AnyTypeCode/BoundsA.h +++ b/TAO/tao/AnyTypeCode/BoundsA.h @@ -41,6 +41,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/ORB.h" #include "tao/Environment.h" diff --git a/TAO/tao/AnyTypeCode/CONV_FRAMEA.h b/TAO/tao/AnyTypeCode/CONV_FRAMEA.h index bb7e487b8aa..cbc76dd89aa 100644 --- a/TAO/tao/AnyTypeCode/CONV_FRAMEA.h +++ b/TAO/tao/AnyTypeCode/CONV_FRAMEA.h @@ -34,6 +34,7 @@ #include /**/ "ace/pre.h" #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/CONV_FRAMEC.h" diff --git a/TAO/tao/AnyTypeCode/CharSeqA.h b/TAO/tao/AnyTypeCode/CharSeqA.h index d1c16850515..09187bfb697 100644 --- a/TAO/tao/AnyTypeCode/CharSeqA.h +++ b/TAO/tao/AnyTypeCode/CharSeqA.h @@ -41,6 +41,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/CharSeqC.h" #if defined (TAO_EXPORT_MACRO) diff --git a/TAO/tao/AnyTypeCode/CurrentA.h b/TAO/tao/AnyTypeCode/CurrentA.h index a0181c446fc..e045f6a2882 100644 --- a/TAO/tao/AnyTypeCode/CurrentA.h +++ b/TAO/tao/AnyTypeCode/CurrentA.h @@ -34,6 +34,7 @@ #include /**/ "ace/pre.h" #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/CurrentC.h" diff --git a/TAO/tao/AnyTypeCode/DomainA.h b/TAO/tao/AnyTypeCode/DomainA.h index ce670f10eee..9f8660d3545 100644 --- a/TAO/tao/AnyTypeCode/DomainA.h +++ b/TAO/tao/AnyTypeCode/DomainA.h @@ -41,6 +41,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/DomainC.h" #if defined (TAO_EXPORT_MACRO) diff --git a/TAO/tao/AnyTypeCode/DoubleSeqA.h b/TAO/tao/AnyTypeCode/DoubleSeqA.h index d1b05d95dc3..3e961e169fd 100644 --- a/TAO/tao/AnyTypeCode/DoubleSeqA.h +++ b/TAO/tao/AnyTypeCode/DoubleSeqA.h @@ -41,6 +41,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/DoubleSeqC.h" #if defined (TAO_EXPORT_MACRO) diff --git a/TAO/tao/AnyTypeCode/DynamicC.h b/TAO/tao/AnyTypeCode/DynamicC.h index 17f4b599d19..76b095d02f0 100644 --- a/TAO/tao/AnyTypeCode/DynamicC.h +++ b/TAO/tao/AnyTypeCode/DynamicC.h @@ -41,17 +41,17 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" -#include "tao/ORB.h" -#include "tao/Environment.h" #include "tao/AnyTypeCode/TypeCode.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" +#include "tao/AnyTypeCode/Dynamic_ParameterC.h" +#include "tao/ORB.h" +#include "tao/Environment.h" #include "tao/Sequence_T.h" #include "tao/Objref_VarOut_T.h" #include "tao/Seq_Var_T.h" #include "tao/Seq_Out_T.h" #include "tao/StringSeqC.h" -#include "tao/AnyTypeCode/Dynamic_ParameterC.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO diff --git a/TAO/tao/AnyTypeCode/Dynamic_ParameterC.h b/TAO/tao/AnyTypeCode/Dynamic_ParameterC.h index 7c817d56670..1647bfc6b91 100644 --- a/TAO/tao/AnyTypeCode/Dynamic_ParameterC.h +++ b/TAO/tao/AnyTypeCode/Dynamic_ParameterC.h @@ -41,10 +41,10 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" -#include "tao/ORB.h" -#include "tao/Environment.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Any.h" +#include "tao/ORB.h" +#include "tao/Environment.h" #include "tao/VarOut_T.h" #include "tao/ParameterModeC.h" diff --git a/TAO/tao/AnyTypeCode/FloatSeqA.h b/TAO/tao/AnyTypeCode/FloatSeqA.h index 170afcdd2ca..4838f606d32 100644 --- a/TAO/tao/AnyTypeCode/FloatSeqA.h +++ b/TAO/tao/AnyTypeCode/FloatSeqA.h @@ -34,6 +34,7 @@ #include /**/ "ace/pre.h" #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/FloatSeqC.h" diff --git a/TAO/tao/AnyTypeCode/GIOPA.h b/TAO/tao/AnyTypeCode/GIOPA.h index e314e72e9e2..b6b51cc4f1b 100644 --- a/TAO/tao/AnyTypeCode/GIOPA.h +++ b/TAO/tao/AnyTypeCode/GIOPA.h @@ -34,6 +34,7 @@ #include /**/ "ace/pre.h" #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/GIOPC.h" #include "tao/AnyTypeCode/IOP_IORA.h" #include "tao/AnyTypeCode/OctetSeqA.h" diff --git a/TAO/tao/AnyTypeCode/IIOPA.h b/TAO/tao/AnyTypeCode/IIOPA.h index 011f510ff52..58fc4b53f3a 100644 --- a/TAO/tao/AnyTypeCode/IIOPA.h +++ b/TAO/tao/AnyTypeCode/IIOPA.h @@ -34,6 +34,7 @@ #include /**/ "ace/pre.h" #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/IIOPC.h" diff --git a/TAO/tao/AnyTypeCode/IIOP_EndpointsA.h b/TAO/tao/AnyTypeCode/IIOP_EndpointsA.h index 2700971cce7..b62fc8976f1 100644 --- a/TAO/tao/AnyTypeCode/IIOP_EndpointsA.h +++ b/TAO/tao/AnyTypeCode/IIOP_EndpointsA.h @@ -41,6 +41,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/IIOP_EndpointsC.h" #if defined (TAO_EXPORT_MACRO) diff --git a/TAO/tao/AnyTypeCode/IOPA.h b/TAO/tao/AnyTypeCode/IOPA.h index 713cf4e330a..173b775caf5 100644 --- a/TAO/tao/AnyTypeCode/IOPA.h +++ b/TAO/tao/AnyTypeCode/IOPA.h @@ -34,6 +34,7 @@ #include /**/ "ace/pre.h" #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/IOPC.h" #include "tao/AnyTypeCode/IOP_IORA.h" diff --git a/TAO/tao/AnyTypeCode/IOP_IORA.h b/TAO/tao/AnyTypeCode/IOP_IORA.h index 65300fca9e5..081015c697f 100644 --- a/TAO/tao/AnyTypeCode/IOP_IORA.h +++ b/TAO/tao/AnyTypeCode/IOP_IORA.h @@ -34,6 +34,7 @@ #include /**/ "ace/pre.h" #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/IOP_IORC.h" #include "tao/AnyTypeCode/OctetSeqA.h" diff --git a/TAO/tao/AnyTypeCode/LongDoubleSeqA.h b/TAO/tao/AnyTypeCode/LongDoubleSeqA.h index 6003f619bed..1462f4a097c 100644 --- a/TAO/tao/AnyTypeCode/LongDoubleSeqA.h +++ b/TAO/tao/AnyTypeCode/LongDoubleSeqA.h @@ -41,6 +41,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/LongDoubleSeqC.h" #if defined (TAO_EXPORT_MACRO) diff --git a/TAO/tao/AnyTypeCode/LongLongSeqA.h b/TAO/tao/AnyTypeCode/LongLongSeqA.h index cb47442c065..ba99c7410b9 100644 --- a/TAO/tao/AnyTypeCode/LongLongSeqA.h +++ b/TAO/tao/AnyTypeCode/LongLongSeqA.h @@ -41,6 +41,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/LongLongSeqC.h" #if defined (TAO_EXPORT_MACRO) diff --git a/TAO/tao/AnyTypeCode/LongSeqA.h b/TAO/tao/AnyTypeCode/LongSeqA.h index 8112599206e..29beb356664 100644 --- a/TAO/tao/AnyTypeCode/LongSeqA.h +++ b/TAO/tao/AnyTypeCode/LongSeqA.h @@ -41,6 +41,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/LongSeqC.h" #if defined (TAO_EXPORT_MACRO) diff --git a/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.h b/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.h index 839a7072eb8..f6d5e0d7474 100644 --- a/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.h +++ b/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.h @@ -41,6 +41,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/Messaging_PolicyValueC.h" #if defined (TAO_EXPORT_MACRO) diff --git a/TAO/tao/AnyTypeCode/NVList.h b/TAO/tao/AnyTypeCode/NVList.h index cf22d62f7cb..0b7cf469847 100644 --- a/TAO/tao/AnyTypeCode/NVList.h +++ b/TAO/tao/AnyTypeCode/NVList.h @@ -22,14 +22,16 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" +#include "tao/AnyTypeCode/Any.h" +#include "tao/AnyTypeCode/NVList_Adapter_Impl.h" + +#include "tao/Environment.h" + #include "ace/Unbounded_Queue.h" #include "ace/Thread_Mutex.h" #include "ace/Atomic_Op.h" -#include "tao/Environment.h" -#include "tao/AnyTypeCode/AnyTypeCode_methods.h" -#include "tao/AnyTypeCode/Any.h" -#include "tao/AnyTypeCode/NVList_Adapter_Impl.h" class TAO_ORB_Core; class TAO_InputCDR; diff --git a/TAO/tao/AnyTypeCode/ObjectIdListA.h b/TAO/tao/AnyTypeCode/ObjectIdListA.h index 9d3786b9f0b..1fedb3c212a 100644 --- a/TAO/tao/AnyTypeCode/ObjectIdListA.h +++ b/TAO/tao/AnyTypeCode/ObjectIdListA.h @@ -41,6 +41,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/ObjectIdListC.h" #if defined (TAO_EXPORT_MACRO) diff --git a/TAO/tao/AnyTypeCode/OctetSeqA.h b/TAO/tao/AnyTypeCode/OctetSeqA.h index a38ca95d79b..159132d2448 100644 --- a/TAO/tao/AnyTypeCode/OctetSeqA.h +++ b/TAO/tao/AnyTypeCode/OctetSeqA.h @@ -34,6 +34,7 @@ #include /**/ "ace/pre.h" #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/OctetSeqC.h" diff --git a/TAO/tao/AnyTypeCode/PI_ForwardA.h b/TAO/tao/AnyTypeCode/PI_ForwardA.h index 7d24a7c85b2..70124737301 100644 --- a/TAO/tao/AnyTypeCode/PI_ForwardA.h +++ b/TAO/tao/AnyTypeCode/PI_ForwardA.h @@ -41,6 +41,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/ORB.h" #include "tao/Environment.h" diff --git a/TAO/tao/AnyTypeCode/ParameterModeA.h b/TAO/tao/AnyTypeCode/ParameterModeA.h index e4743d93fe9..85dbb46597e 100644 --- a/TAO/tao/AnyTypeCode/ParameterModeA.h +++ b/TAO/tao/AnyTypeCode/ParameterModeA.h @@ -41,6 +41,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/ParameterModeC.h" #if defined (TAO_EXPORT_MACRO) diff --git a/TAO/tao/AnyTypeCode/PolicyA.h b/TAO/tao/AnyTypeCode/PolicyA.h index 5e23908db1a..feae0030ce9 100644 --- a/TAO/tao/AnyTypeCode/PolicyA.h +++ b/TAO/tao/AnyTypeCode/PolicyA.h @@ -41,6 +41,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/PolicyC.h" #if defined (TAO_EXPORT_MACRO) diff --git a/TAO/tao/AnyTypeCode/Policy_ForwardA.h b/TAO/tao/AnyTypeCode/Policy_ForwardA.h index 4aa867f9662..88c0b82f339 100644 --- a/TAO/tao/AnyTypeCode/Policy_ForwardA.h +++ b/TAO/tao/AnyTypeCode/Policy_ForwardA.h @@ -34,6 +34,7 @@ #include /**/ "ace/pre.h" #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/Policy_ForwardC.h" diff --git a/TAO/tao/AnyTypeCode/PortableInterceptorA.h b/TAO/tao/AnyTypeCode/PortableInterceptorA.h index b342d9102e2..e257fccb813 100644 --- a/TAO/tao/AnyTypeCode/PortableInterceptorA.h +++ b/TAO/tao/AnyTypeCode/PortableInterceptorA.h @@ -34,9 +34,9 @@ #include /**/ "ace/pre.h" #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" -#include "tao/PortableInterceptorC.h" #include "tao/AnyTypeCode/PI_ForwardA.h" #include "tao/AnyTypeCode/Messaging_SyncScopeA.h" +#include "tao/PortableInterceptorC.h" // TAO_IDL - Generated from diff --git a/TAO/tao/AnyTypeCode/ServicesA.h b/TAO/tao/AnyTypeCode/ServicesA.h index 799f824e86c..87b6aca143f 100644 --- a/TAO/tao/AnyTypeCode/ServicesA.h +++ b/TAO/tao/AnyTypeCode/ServicesA.h @@ -34,8 +34,8 @@ #include /**/ "ace/pre.h" #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" -#include "tao/ServicesC.h" #include "tao/AnyTypeCode/OctetSeqA.h" +#include "tao/ServicesC.h" // TAO_IDL - Generated from diff --git a/TAO/tao/AnyTypeCode/ShortSeqA.h b/TAO/tao/AnyTypeCode/ShortSeqA.h index 11878875053..f3f6f53c485 100644 --- a/TAO/tao/AnyTypeCode/ShortSeqA.h +++ b/TAO/tao/AnyTypeCode/ShortSeqA.h @@ -34,6 +34,7 @@ #include /**/ "ace/pre.h" #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/ShortSeqC.h" diff --git a/TAO/tao/AnyTypeCode/StringSeqA.h b/TAO/tao/AnyTypeCode/StringSeqA.h index 91054f86fea..a97892b5181 100644 --- a/TAO/tao/AnyTypeCode/StringSeqA.h +++ b/TAO/tao/AnyTypeCode/StringSeqA.h @@ -34,6 +34,7 @@ #include /**/ "ace/pre.h" #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/StringSeqC.h" diff --git a/TAO/tao/AnyTypeCode/SystemExceptionA.h b/TAO/tao/AnyTypeCode/SystemExceptionA.h index 3cdb34ebf76..75fc6dfd459 100644 --- a/TAO/tao/AnyTypeCode/SystemExceptionA.h +++ b/TAO/tao/AnyTypeCode/SystemExceptionA.h @@ -17,6 +17,7 @@ #include /**/ "ace/pre.h" #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/SystemException.h" namespace CORBA diff --git a/TAO/tao/AnyTypeCode/TAOA.h b/TAO/tao/AnyTypeCode/TAOA.h index 635bc26d982..131c8b6eff0 100644 --- a/TAO/tao/AnyTypeCode/TAOA.h +++ b/TAO/tao/AnyTypeCode/TAOA.h @@ -34,10 +34,10 @@ #include /**/ "ace/pre.h" #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" -#include "tao/TAOC.h" #include "tao/AnyTypeCode/PolicyA.h" #include "tao/AnyTypeCode/TimeBaseA.h" #include "tao/AnyTypeCode/Messaging_SyncScopeA.h" +#include "tao/TAOC.h" // TAO_IDL - Generated from diff --git a/TAO/tao/AnyTypeCode/TimeBaseA.h b/TAO/tao/AnyTypeCode/TimeBaseA.h index 3ae7d0e15aa..c75cc8715c4 100644 --- a/TAO/tao/AnyTypeCode/TimeBaseA.h +++ b/TAO/tao/AnyTypeCode/TimeBaseA.h @@ -41,6 +41,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/TimeBaseC.h" #if defined (TAO_EXPORT_MACRO) diff --git a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp index a63a4164bc4..3ad634f15a7 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp @@ -2,8 +2,6 @@ #include "TypeCode_CDR_Extraction.h" -#include "tao/CDR.h" - #include "TypeCode_Constants.h" #include "True_RefCount_Policy.h" @@ -23,6 +21,8 @@ #include "TypeCode_Struct_Field.h" #include "TypeCode_Value_Field.h" +#include "tao/CDR.h" + #include "ace/Array_Base.h" diff --git a/TAO/tao/AnyTypeCode/ULongLongSeqA.h b/TAO/tao/AnyTypeCode/ULongLongSeqA.h index 0c764c543e3..bcde4e12519 100644 --- a/TAO/tao/AnyTypeCode/ULongLongSeqA.h +++ b/TAO/tao/AnyTypeCode/ULongLongSeqA.h @@ -34,6 +34,7 @@ #include /**/ "ace/pre.h" #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/ULongLongSeqC.h" diff --git a/TAO/tao/AnyTypeCode/ULongSeqA.h b/TAO/tao/AnyTypeCode/ULongSeqA.h index 6d4f4ab8494..f093cec9617 100644 --- a/TAO/tao/AnyTypeCode/ULongSeqA.h +++ b/TAO/tao/AnyTypeCode/ULongSeqA.h @@ -34,6 +34,7 @@ #include /**/ "ace/pre.h" #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/ULongSeqC.h" diff --git a/TAO/tao/AnyTypeCode/UShortSeqA.h b/TAO/tao/AnyTypeCode/UShortSeqA.h index 820b8080424..59de79c234c 100644 --- a/TAO/tao/AnyTypeCode/UShortSeqA.h +++ b/TAO/tao/AnyTypeCode/UShortSeqA.h @@ -41,6 +41,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/UShortSeqC.h" #if defined (TAO_EXPORT_MACRO) diff --git a/TAO/tao/AnyTypeCode/ValueModifierA.h b/TAO/tao/AnyTypeCode/ValueModifierA.h index 056c927ee4c..479dc4c4052 100644 --- a/TAO/tao/AnyTypeCode/ValueModifierA.h +++ b/TAO/tao/AnyTypeCode/ValueModifierA.h @@ -41,6 +41,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/AnyTypeCode/ValueModifierC.h" #if defined (TAO_EXPORT_MACRO) diff --git a/TAO/tao/AnyTypeCode/VisibilityA.h b/TAO/tao/AnyTypeCode/VisibilityA.h index c017677e438..04f9ebde904 100644 --- a/TAO/tao/AnyTypeCode/VisibilityA.h +++ b/TAO/tao/AnyTypeCode/VisibilityA.h @@ -41,6 +41,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/AnyTypeCode/VisibilityC.h" #if defined (TAO_EXPORT_MACRO) diff --git a/TAO/tao/AnyTypeCode/WCharSeqA.h b/TAO/tao/AnyTypeCode/WCharSeqA.h index 105a283a9ea..e3795007d7b 100644 --- a/TAO/tao/AnyTypeCode/WCharSeqA.h +++ b/TAO/tao/AnyTypeCode/WCharSeqA.h @@ -34,6 +34,7 @@ #include /**/ "ace/pre.h" #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/WCharSeqC.h" diff --git a/TAO/tao/AnyTypeCode/WStringSeqA.h b/TAO/tao/AnyTypeCode/WStringSeqA.h index a78c90dfdec..999422e8375 100644 --- a/TAO/tao/AnyTypeCode/WStringSeqA.h +++ b/TAO/tao/AnyTypeCode/WStringSeqA.h @@ -34,6 +34,7 @@ #include /**/ "ace/pre.h" #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/WStringSeqC.h" diff --git a/TAO/tao/AnyTypeCode/WrongTransactionA.h b/TAO/tao/AnyTypeCode/WrongTransactionA.h index ad9a3e7cedb..08bce947959 100644 --- a/TAO/tao/AnyTypeCode/WrongTransactionA.h +++ b/TAO/tao/AnyTypeCode/WrongTransactionA.h @@ -41,6 +41,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/WrongTransactionC.h" #if defined (TAO_EXPORT_MACRO) diff --git a/TAO/tao/AnyTypeCode/orb_typesA.h b/TAO/tao/AnyTypeCode/orb_typesA.h index ca3709243f9..1585e465596 100644 --- a/TAO/tao/AnyTypeCode/orb_typesA.h +++ b/TAO/tao/AnyTypeCode/orb_typesA.h @@ -34,6 +34,7 @@ #include /**/ "ace/pre.h" #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" +#include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/orb_typesC.h" diff --git a/TAO/tao/Typecode_typesC.h b/TAO/tao/Typecode_typesC.h index 80c0d60f0dc..3d411afc9e6 100644 --- a/TAO/tao/Typecode_typesC.h +++ b/TAO/tao/Typecode_typesC.h @@ -33,17 +33,13 @@ #include /**/ "ace/pre.h" - -#include "ace/config-all.h" +#include "tao/TAO_Export.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/Objref_VarOut_T.h" +#include "tao/Basic_Types.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO |