diff options
| -rw-r--r-- | TAO/CIAO/ChangeLog | 11 | ||||
| -rw-r--r-- | TAO/CIAO/ciao/ComponentsC.h | 33 | ||||
| -rw-r--r-- | TAO/CIAO/ciao/ComponentsS.h | 15 | ||||
| -rw-r--r-- | TAO/CIAO/examples/handcrafted/Hello/hello_executors.h | 1 |
4 files changed, 45 insertions, 15 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 2ece7f26245..ff9610a4b60 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,14 @@ +Tue Nov 4 21:21:06 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * ciao/ComponentsC.h: + * ciao/ComponentsS.h; + + Regenerated these files. Not sure why this is maintained in the repo. + + * examples/handcrafted/Hello/hello_executors.h: + + #include "tao/LocalObject.h" + Tue Nov 04 19:35:10 2003 Nanbor Wang <nanbor@cs.wustl.edu> * COPYING: Added ACE/TAO/CIAO Copyright disclaimer. Thanks to diff --git a/TAO/CIAO/ciao/ComponentsC.h b/TAO/CIAO/ciao/ComponentsC.h index f5c971f5f52..df9032c4caf 100644 --- a/TAO/CIAO/ciao/ComponentsC.h +++ b/TAO/CIAO/ciao/ComponentsC.h @@ -26,24 +26,20 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151 +// be/be_codegen.cpp:150 #ifndef _TAO_IDL_COMPONENTSC_H_ #define _TAO_IDL_COMPONENTSC_H_ - -#include "tao/corba.h" +#include "tao/ORB.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Valuetype/AbstractBase.h" -#include "tao/Valuetype/ValueBase.h" -#include "tao/Valuetype/Value_VarOut_T.h" -#include "tao/Valuetype/Valuetype_Adapter_Impl.h" -#include "tao/Valuetype/ValueFactory.h" -#include "tao/Valuetype/Sequence_T.h" +#include "tao/CDR.h" +#include "tao/Environment.h" +#include "tao/Typecode.h" #include "CCM_ContainerC.h" @@ -71,15 +67,30 @@ #endif /* __BORLANDC__ */ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48 +// be/be_visitor_traits.cpp:50 + +// Traits specializations. +namespace TAO +{ +}; + +// TAO_IDL - Generated from +// be/be_visitor_root/cdr_op.cpp:48 #ifndef __ACE_INLINE__ // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64 +// be/be_visitor_root/cdr_op.cpp:64 #endif /* __ACE_INLINE__ */ +// TAO_IDL - Generated from +// be/be_codegen.cpp:911 + +#if defined (__ACE_INLINE__) +#include "ComponentsC.i" +#endif /* defined INLINE */ + #if defined(_MSC_VER) && (_MSC_VER >= 1200) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/CIAO/ciao/ComponentsS.h b/TAO/CIAO/ciao/ComponentsS.h index afb82e9cb34..84cd3fa0d9f 100644 --- a/TAO/CIAO/ciao/ComponentsS.h +++ b/TAO/CIAO/ciao/ComponentsS.h @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:487 +// be/be_codegen.cpp:390 #ifndef _TAO_IDL_COMPONENTSS_H_ #define _TAO_IDL_COMPONENTSS_H_ @@ -39,11 +39,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Collocation_Proxy_Broker.h" #include "tao/PortableServer/PortableServer.h" #include "tao/PortableServer/Servant_Base.h" -#include "tao/PortableServer/Collocated_Object.h" -#include "tao/PortableServer/ThruPOA_Object_Proxy_Impl.h" -#include "tao/PortableServer/Direct_Object_Proxy_Impl.h" #if defined(_MSC_VER) #if (_MSC_VER >= 1200) @@ -56,6 +54,15 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ +// TAO_IDL - Generated from +// be/be_codegen.cpp:946 + +#include "ComponentsS_T.h" + +#if defined (__ACE_INLINE__) +#include "ComponentsS.i" +#endif /* defined INLINE */ + #if defined(_MSC_VER) && (_MSC_VER >= 1200) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/CIAO/examples/handcrafted/Hello/hello_executors.h b/TAO/CIAO/examples/handcrafted/Hello/hello_executors.h index 322a89dff48..82e1f56c7bc 100644 --- a/TAO/CIAO/examples/handcrafted/Hello/hello_executors.h +++ b/TAO/CIAO/examples/handcrafted/Hello/hello_executors.h @@ -7,6 +7,7 @@ #include "helloEC.h" #include "hello_executors_export.h" +#include "tao/LocalObject.h" class HelloWorld_Impl : public virtual CCM_HelloWorld, |