diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-03-10 07:19:20 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-03-10 07:19:20 +0000 |
| commit | 09391ca1718ce13201bb361ed31b7eab80d1f139 (patch) | |
| tree | 2f7e3ba21d4b6b36351a050b2143b235f77679dd /TAO | |
| parent | b02c46d2b884cb5c507cfac701587ffcf7c01915 (diff) | |
| download | ATCD-09391ca1718ce13201bb361ed31b7eab80d1f139.tar.gz | |
ChangeLogTag: Fri Mar 10 07:09:22 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO')
1079 files changed, 2509 insertions, 2499 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index ef8d6f968fa..909396b6019 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,13 @@ +Fri Mar 10 07:09:22 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + + * tao/...*.cpp: + * tao/...*.h: + * tao/...*.i: + * tao/...*.inl: + + Add "tao/..." prefix to #includes of *.h, *.i, *.inl, and + template *.cpp files found in ${TAO_ROOT}/tao. + Thu Mar 9 16:04:22 UTC 2006 Simon McQueen <sm@prismtech.com> * TAO_IDL/be/be_visitor_ami_pre_proc.cpp: diff --git a/TAO/tao/Acceptor_Impl.cpp b/TAO/tao/Acceptor_Impl.cpp index 408fa54548f..f1b5d150049 100644 --- a/TAO/tao/Acceptor_Impl.cpp +++ b/TAO/tao/Acceptor_Impl.cpp @@ -25,13 +25,13 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Thread_Per_Connection_Handler.h" -#include "Server_Strategy_Factory.h" -#include "ORB_Core.h" -#include "Transport_Cache_Manager.h" -#include "Thread_Lane_Resources.h" -#include "Transport.h" -#include "debug.h" +#include "tao/Thread_Per_Connection_Handler.h" +#include "tao/Server_Strategy_Factory.h" +#include "tao/ORB_Core.h" +#include "tao/Transport_Cache_Manager.h" +#include "tao/Thread_Lane_Resources.h" +#include "tao/Transport.h" +#include "tao/debug.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Adapter.cpp b/TAO/tao/Adapter.cpp index 274ca2fa5f8..d85ab3b7bac 100644 --- a/TAO/tao/Adapter.cpp +++ b/TAO/tao/Adapter.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Adapter.h" +#include "tao/Adapter.h" ACE_RCSID (tao, Adapter, diff --git a/TAO/tao/Adapter_Factory.cpp b/TAO/tao/Adapter_Factory.cpp index 16bad03fa2b..104a5662569 100644 --- a/TAO/tao/Adapter_Factory.cpp +++ b/TAO/tao/Adapter_Factory.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Adapter_Factory.h" +#include "tao/Adapter_Factory.h" // **************************************************************** diff --git a/TAO/tao/Adapter_Registry.cpp b/TAO/tao/Adapter_Registry.cpp index 3004f736f73..4096cb515bb 100644 --- a/TAO/tao/Adapter_Registry.cpp +++ b/TAO/tao/Adapter_Registry.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "Object.h" -#include "Stub.h" -#include "Adapter_Registry.h" -#include "Adapter.h" -#include "SystemException.h" -#include "debug.h" +#include "tao/Object.h" +#include "tao/Stub.h" +#include "tao/Adapter_Registry.h" +#include "tao/Adapter.h" +#include "tao/SystemException.h" +#include "tao/debug.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp index 5ab5c5b0655..46baeb1705f 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "Alias_TypeCode_Static.h" +#include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #ifndef __ACE_INLINE__ -# include "Alias_TypeCode_Static.inl" +# include "tao/AnyTypeCode/Alias_TypeCode_Static.inl" #endif /* !__ACE_INLINE__ */ -#include "TypeCode_Traits.h" +#include "tao/AnyTypeCode/TypeCode_Traits.h" #include "tao/ORB_Core.h" #include "tao/CDR.h" diff --git a/TAO/tao/AnyTypeCode/AnySeqA.cpp b/TAO/tao/AnyTypeCode/AnySeqA.cpp index 4c1e7a8cc17..f379a5330db 100644 --- a/TAO/tao/AnyTypeCode/AnySeqA.cpp +++ b/TAO/tao/AnyTypeCode/AnySeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "AnySeqA.h" +#include "tao/AnyTypeCode/AnySeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/AnySeqC.cpp b/TAO/tao/AnyTypeCode/AnySeqC.cpp index c196a0061f1..da850503e43 100644 --- a/TAO/tao/AnyTypeCode/AnySeqC.cpp +++ b/TAO/tao/AnyTypeCode/AnySeqC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "AnySeqC.h" +#include "tao/AnyTypeCode/AnySeqC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) diff --git a/TAO/tao/AnyTypeCode/Any_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Impl.cpp index c4978873c83..d51a2539146 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl.cpp +++ b/TAO/tao/AnyTypeCode/Any_Impl.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "Any_Impl.h" -#include "TypeCode.h" -#include "Marshal.h" +#include "tao/AnyTypeCode/Any_Impl.h" +#include "tao/AnyTypeCode/TypeCode.h" +#include "tao/AnyTypeCode/Marshal.h" #include "tao/CORBA_String.h" #include "tao/SystemException.h" diff --git a/TAO/tao/AnyTypeCode/Any_SystemException.cpp b/TAO/tao/AnyTypeCode/Any_SystemException.cpp index 10b16c4f411..2a22d8f256c 100644 --- a/TAO/tao/AnyTypeCode/Any_SystemException.cpp +++ b/TAO/tao/AnyTypeCode/Any_SystemException.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "Any_SystemException.h" -#include "Any.h" -#include "Any_Unknown_IDL_Type.h" -#include "Marshal.h" -#include "TypeCode.h" +#include "tao/AnyTypeCode/Any_SystemException.h" +#include "tao/AnyTypeCode/Any.h" +#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" +#include "tao/AnyTypeCode/Marshal.h" +#include "tao/AnyTypeCode/TypeCode.h" #include "tao/CDR.h" #include "tao/Exception.h" diff --git a/TAO/tao/AnyTypeCode/BooleanSeqA.cpp b/TAO/tao/AnyTypeCode/BooleanSeqA.cpp index 8d3cc5f1e67..99a63b8332a 100644 --- a/TAO/tao/AnyTypeCode/BooleanSeqA.cpp +++ b/TAO/tao/AnyTypeCode/BooleanSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "BooleanSeqA.h" +#include "tao/AnyTypeCode/BooleanSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/BoundsA.cpp b/TAO/tao/AnyTypeCode/BoundsA.cpp index 7b732bb6a31..40891d21c2e 100644 --- a/TAO/tao/AnyTypeCode/BoundsA.cpp +++ b/TAO/tao/AnyTypeCode/BoundsA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "BoundsA.h" +#include "tao/AnyTypeCode/BoundsA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/BoundsC.cpp b/TAO/tao/AnyTypeCode/BoundsC.cpp index e91e8fe16e2..a4e520aa372 100644 --- a/TAO/tao/AnyTypeCode/BoundsC.cpp +++ b/TAO/tao/AnyTypeCode/BoundsC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "BoundsA.h" +#include "tao/AnyTypeCode/BoundsA.h" #include "tao/CDR.h" #include "tao/SystemException.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/AnyTypeCode/CONV_FRAMEA.cpp b/TAO/tao/AnyTypeCode/CONV_FRAMEA.cpp index 4d410922070..91fc0a664e3 100644 --- a/TAO/tao/AnyTypeCode/CONV_FRAMEA.cpp +++ b/TAO/tao/AnyTypeCode/CONV_FRAMEA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "CONV_FRAMEA.h" +#include "tao/AnyTypeCode/CONV_FRAMEA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/CharSeqA.cpp b/TAO/tao/AnyTypeCode/CharSeqA.cpp index 041ec3e8b2c..eb3fd68c0e9 100644 --- a/TAO/tao/AnyTypeCode/CharSeqA.cpp +++ b/TAO/tao/AnyTypeCode/CharSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "CharSeqA.h" +#include "tao/AnyTypeCode/CharSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/CurrentA.cpp b/TAO/tao/AnyTypeCode/CurrentA.cpp index 9fc5479bba6..0501cc64e20 100644 --- a/TAO/tao/AnyTypeCode/CurrentA.cpp +++ b/TAO/tao/AnyTypeCode/CurrentA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "CurrentA.h" +#include "tao/AnyTypeCode/CurrentA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/DomainA.cpp b/TAO/tao/AnyTypeCode/DomainA.cpp index 4b00c38c490..6f6db000bc2 100644 --- a/TAO/tao/AnyTypeCode/DomainA.cpp +++ b/TAO/tao/AnyTypeCode/DomainA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "DomainA.h" +#include "tao/AnyTypeCode/DomainA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/DoubleSeqA.cpp b/TAO/tao/AnyTypeCode/DoubleSeqA.cpp index dc10da0c3e3..a67a84fb0b5 100644 --- a/TAO/tao/AnyTypeCode/DoubleSeqA.cpp +++ b/TAO/tao/AnyTypeCode/DoubleSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "DoubleSeqA.h" +#include "tao/AnyTypeCode/DoubleSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/DynamicA.cpp b/TAO/tao/AnyTypeCode/DynamicA.cpp index 5c36a5e2a2b..4f17ea24008 100644 --- a/TAO/tao/AnyTypeCode/DynamicA.cpp +++ b/TAO/tao/AnyTypeCode/DynamicA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "DynamicA.h" +#include "tao/AnyTypeCode/DynamicA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/DynamicC.cpp b/TAO/tao/AnyTypeCode/DynamicC.cpp index a6ef9567128..bb693ede9b8 100644 --- a/TAO/tao/AnyTypeCode/DynamicC.cpp +++ b/TAO/tao/AnyTypeCode/DynamicC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "DynamicC.h" +#include "tao/AnyTypeCode/DynamicC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) diff --git a/TAO/tao/AnyTypeCode/Dynamic_ParameterA.cpp b/TAO/tao/AnyTypeCode/Dynamic_ParameterA.cpp index d126358eec2..6376ab32799 100644 --- a/TAO/tao/AnyTypeCode/Dynamic_ParameterA.cpp +++ b/TAO/tao/AnyTypeCode/Dynamic_ParameterA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "Dynamic_ParameterA.h" +#include "tao/AnyTypeCode/Dynamic_ParameterA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/Dynamic_ParameterC.cpp b/TAO/tao/AnyTypeCode/Dynamic_ParameterC.cpp index 6d81b22763f..093e3c79f27 100644 --- a/TAO/tao/AnyTypeCode/Dynamic_ParameterC.cpp +++ b/TAO/tao/AnyTypeCode/Dynamic_ParameterC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "Dynamic_ParameterC.h" +#include "tao/AnyTypeCode/Dynamic_ParameterC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp index df85c18930a..1294bdd0fe6 100644 --- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "Empty_Param_TypeCode.h" +#include "tao/AnyTypeCode/Empty_Param_TypeCode.h" #ifndef __ACE_INLINE__ -# include "Empty_Param_TypeCode.inl" +# include "tao/AnyTypeCode/Empty_Param_TypeCode.inl" #endif /* !__ACE_INLINE__ */ diff --git a/TAO/tao/AnyTypeCode/ExceptionA.cpp b/TAO/tao/AnyTypeCode/ExceptionA.cpp index 19fb7d2aa3f..138d2bc2b6d 100644 --- a/TAO/tao/AnyTypeCode/ExceptionA.cpp +++ b/TAO/tao/AnyTypeCode/ExceptionA.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "ExceptionA.h" -#include "Any_Dual_Impl_T.h" +#include "tao/AnyTypeCode/ExceptionA.h" +#include "tao/AnyTypeCode/Any_Dual_Impl_T.h" #include "tao/SystemException.h" #include "tao/Environment.h" #include "tao/ORB_Constants.h" diff --git a/TAO/tao/AnyTypeCode/FloatSeqA.cpp b/TAO/tao/AnyTypeCode/FloatSeqA.cpp index e5367367291..4f33cff12e0 100644 --- a/TAO/tao/AnyTypeCode/FloatSeqA.cpp +++ b/TAO/tao/AnyTypeCode/FloatSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "FloatSeqA.h" +#include "tao/AnyTypeCode/FloatSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/GIOPA.cpp b/TAO/tao/AnyTypeCode/GIOPA.cpp index 42a140aaba8..6e5788601b7 100644 --- a/TAO/tao/AnyTypeCode/GIOPA.cpp +++ b/TAO/tao/AnyTypeCode/GIOPA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "GIOPA.h" +#include "tao/AnyTypeCode/GIOPA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/IIOPA.cpp b/TAO/tao/AnyTypeCode/IIOPA.cpp index 6140bd06712..0af44ddaac6 100644 --- a/TAO/tao/AnyTypeCode/IIOPA.cpp +++ b/TAO/tao/AnyTypeCode/IIOPA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "IIOPA.h" +#include "tao/AnyTypeCode/IIOPA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/IIOP_EndpointsA.cpp b/TAO/tao/AnyTypeCode/IIOP_EndpointsA.cpp index 10256a34999..ce4520e630a 100644 --- a/TAO/tao/AnyTypeCode/IIOP_EndpointsA.cpp +++ b/TAO/tao/AnyTypeCode/IIOP_EndpointsA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "IIOP_EndpointsA.h" +#include "tao/AnyTypeCode/IIOP_EndpointsA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/IOPA.cpp b/TAO/tao/AnyTypeCode/IOPA.cpp index 77398cd1a3b..a6f7e67bc7c 100644 --- a/TAO/tao/AnyTypeCode/IOPA.cpp +++ b/TAO/tao/AnyTypeCode/IOPA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "IOPA.h" +#include "tao/AnyTypeCode/IOPA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/IOP_IORA.cpp b/TAO/tao/AnyTypeCode/IOP_IORA.cpp index 31c78cf12db..0538c9143dc 100644 --- a/TAO/tao/AnyTypeCode/IOP_IORA.cpp +++ b/TAO/tao/AnyTypeCode/IOP_IORA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "IOP_IORA.h" +#include "tao/AnyTypeCode/IOP_IORA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/LongDoubleSeqA.cpp b/TAO/tao/AnyTypeCode/LongDoubleSeqA.cpp index 0966b1b396b..61f889f87c9 100644 --- a/TAO/tao/AnyTypeCode/LongDoubleSeqA.cpp +++ b/TAO/tao/AnyTypeCode/LongDoubleSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "LongDoubleSeqA.h" +#include "tao/AnyTypeCode/LongDoubleSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/LongLongSeqA.cpp b/TAO/tao/AnyTypeCode/LongLongSeqA.cpp index f971189e9d1..1546a6a5106 100644 --- a/TAO/tao/AnyTypeCode/LongLongSeqA.cpp +++ b/TAO/tao/AnyTypeCode/LongLongSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "LongLongSeqA.h" +#include "tao/AnyTypeCode/LongLongSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/LongSeqA.cpp b/TAO/tao/AnyTypeCode/LongSeqA.cpp index 69b05a2d208..fdf7bc45be2 100644 --- a/TAO/tao/AnyTypeCode/LongSeqA.cpp +++ b/TAO/tao/AnyTypeCode/LongSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "LongSeqA.h" +#include "tao/AnyTypeCode/LongSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.cpp b/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.cpp index 0d928705b16..345f3034f92 100644 --- a/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.cpp +++ b/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "Messaging_PolicyValueA.h" +#include "tao/AnyTypeCode/Messaging_PolicyValueA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/NVList.cpp b/TAO/tao/AnyTypeCode/NVList.cpp index 1aed606a606..492bd605ed7 100644 --- a/TAO/tao/AnyTypeCode/NVList.cpp +++ b/TAO/tao/AnyTypeCode/NVList.cpp @@ -3,11 +3,11 @@ // Implementation of Named Value List and NamedValue classes -#include "NVList.h" -#include "BoundsC.h" -#include "TypeCode.h" -#include "Marshal.h" -#include "Any_Impl.h" +#include "tao/AnyTypeCode/NVList.h" +#include "tao/AnyTypeCode/BoundsC.h" +#include "tao/AnyTypeCode/TypeCode.h" +#include "tao/AnyTypeCode/Marshal.h" +#include "tao/AnyTypeCode/Any_Impl.h" #include "tao/SystemException.h" #include "tao/CORBA_String.h" @@ -18,7 +18,7 @@ #include "ace/Log_Msg.h" #if !defined (__ACE_INLINE__) -# include "NVList.inl" +# include "tao/AnyTypeCode/NVList.inl" #endif /* ! __ACE_INLINE__ */ ACE_RCSID (tao, diff --git a/TAO/tao/AnyTypeCode/ObjectIdListA.cpp b/TAO/tao/AnyTypeCode/ObjectIdListA.cpp index 9d7b92bc032..5e1c5439010 100644 --- a/TAO/tao/AnyTypeCode/ObjectIdListA.cpp +++ b/TAO/tao/AnyTypeCode/ObjectIdListA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "ObjectIdListA.h" +#include "tao/AnyTypeCode/ObjectIdListA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/OctetSeqA.cpp b/TAO/tao/AnyTypeCode/OctetSeqA.cpp index b7ca2bd3f1b..dd6b7864968 100644 --- a/TAO/tao/AnyTypeCode/OctetSeqA.cpp +++ b/TAO/tao/AnyTypeCode/OctetSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "OctetSeqA.h" +#include "tao/AnyTypeCode/OctetSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/PI_ForwardA.cpp b/TAO/tao/AnyTypeCode/PI_ForwardA.cpp index 6e5378dd7f5..fe43b76ce42 100644 --- a/TAO/tao/AnyTypeCode/PI_ForwardA.cpp +++ b/TAO/tao/AnyTypeCode/PI_ForwardA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "PI_ForwardA.h" +#include "tao/AnyTypeCode/PI_ForwardA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/ParameterModeA.cpp b/TAO/tao/AnyTypeCode/ParameterModeA.cpp index fe5ef92a2b9..b4a65bb1787 100644 --- a/TAO/tao/AnyTypeCode/ParameterModeA.cpp +++ b/TAO/tao/AnyTypeCode/ParameterModeA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "ParameterModeA.h" +#include "tao/AnyTypeCode/ParameterModeA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/PolicyA.cpp b/TAO/tao/AnyTypeCode/PolicyA.cpp index 8fbbcda2440..9d49724bc2f 100644 --- a/TAO/tao/AnyTypeCode/PolicyA.cpp +++ b/TAO/tao/AnyTypeCode/PolicyA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "PolicyA.h" +#include "tao/AnyTypeCode/PolicyA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/Policy_ForwardA.cpp b/TAO/tao/AnyTypeCode/Policy_ForwardA.cpp index f62c7cd0f48..93e73bc4856 100644 --- a/TAO/tao/AnyTypeCode/Policy_ForwardA.cpp +++ b/TAO/tao/AnyTypeCode/Policy_ForwardA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "Policy_ForwardA.h" +#include "tao/AnyTypeCode/Policy_ForwardA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/PortableInterceptorA.cpp b/TAO/tao/AnyTypeCode/PortableInterceptorA.cpp index 0ffe043ddbe..166de771bb6 100644 --- a/TAO/tao/AnyTypeCode/PortableInterceptorA.cpp +++ b/TAO/tao/AnyTypeCode/PortableInterceptorA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "PortableInterceptorA.h" +#include "tao/AnyTypeCode/PortableInterceptorA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/ServicesA.cpp b/TAO/tao/AnyTypeCode/ServicesA.cpp index d78416fda23..0030c4e2c44 100644 --- a/TAO/tao/AnyTypeCode/ServicesA.cpp +++ b/TAO/tao/AnyTypeCode/ServicesA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "ServicesA.h" +#include "tao/AnyTypeCode/ServicesA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/ShortSeqA.cpp b/TAO/tao/AnyTypeCode/ShortSeqA.cpp index 0d53bc9e6b1..f876b863891 100644 --- a/TAO/tao/AnyTypeCode/ShortSeqA.cpp +++ b/TAO/tao/AnyTypeCode/ShortSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "ShortSeqA.h" +#include "tao/AnyTypeCode/ShortSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/StringSeqA.cpp b/TAO/tao/AnyTypeCode/StringSeqA.cpp index 21954b9b072..1016edf61df 100644 --- a/TAO/tao/AnyTypeCode/StringSeqA.cpp +++ b/TAO/tao/AnyTypeCode/StringSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "StringSeqA.h" +#include "tao/AnyTypeCode/StringSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/SystemExceptionA.cpp b/TAO/tao/AnyTypeCode/SystemExceptionA.cpp index 2e9deae0936..c11f3984ef3 100644 --- a/TAO/tao/AnyTypeCode/SystemExceptionA.cpp +++ b/TAO/tao/AnyTypeCode/SystemExceptionA.cpp @@ -1,14 +1,14 @@ // $Id$ -#include "SystemExceptionA.h" -#include "Any_SystemException.h" -#include "Any_Dual_Impl_T.h" -#include "TypeCode.h" -#include "TypeCode_Constants.h" -#include "Enum_TypeCode_Static.h" -#include "TypeCode_Struct_Field.h" -#include "Struct_TypeCode_Static.h" -#include "Null_RefCount_Policy.h" +#include "tao/AnyTypeCode/SystemExceptionA.h" +#include "tao/AnyTypeCode/Any_SystemException.h" +#include "tao/AnyTypeCode/Any_Dual_Impl_T.h" +#include "tao/AnyTypeCode/TypeCode.h" +#include "tao/AnyTypeCode/TypeCode_Constants.h" +#include "tao/AnyTypeCode/Enum_TypeCode_Static.h" +#include "tao/AnyTypeCode/TypeCode_Struct_Field.h" +#include "tao/AnyTypeCode/Struct_TypeCode_Static.h" +#include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/CORBA_String.h" diff --git a/TAO/tao/AnyTypeCode/TAOA.cpp b/TAO/tao/AnyTypeCode/TAOA.cpp index 30e6a7c5c12..cf036da5c50 100644 --- a/TAO/tao/AnyTypeCode/TAOA.cpp +++ b/TAO/tao/AnyTypeCode/TAOA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "TAOA.h" +#include "tao/AnyTypeCode/TAOA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/TimeBaseA.cpp b/TAO/tao/AnyTypeCode/TimeBaseA.cpp index 2752e747339..1cb54f59417 100644 --- a/TAO/tao/AnyTypeCode/TimeBaseA.cpp +++ b/TAO/tao/AnyTypeCode/TimeBaseA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "TimeBaseA.h" +#include "tao/AnyTypeCode/TimeBaseA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp b/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp index 79191d3b8ec..2c7190d82bf 100644 --- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp +++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "True_RefCount_Policy.h" +#include "tao/AnyTypeCode/True_RefCount_Policy.h" #ifndef __ACE_INLINE__ # include "True_RefCount_Policy.inl" diff --git a/TAO/tao/AnyTypeCode/TypeCode.cpp b/TAO/tao/AnyTypeCode/TypeCode.cpp index 6b13533dde8..4af8e87ee16 100644 --- a/TAO/tao/AnyTypeCode/TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "TypeCode.h" +#include "tao/AnyTypeCode/TypeCode.h" ACE_RCSID (tao, TypeCode, @@ -8,7 +8,7 @@ ACE_RCSID (tao, #if !defined (__ACE_INLINE__) -# include "TypeCode.inl" +# include "tao/AnyTypeCode/TypeCode.inl" #endif /* ! __ACE_INLINE__ */ #include "tao/SystemException.h" diff --git a/TAO/tao/AnyTypeCode/TypeCodeA.cpp b/TAO/tao/AnyTypeCode/TypeCodeA.cpp index a2e10057e0a..aa229493ecc 100644 --- a/TAO/tao/AnyTypeCode/TypeCodeA.cpp +++ b/TAO/tao/AnyTypeCode/TypeCodeA.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "Struct_TypeCode_Static.h" -#include "Null_RefCount_Policy.h" +#include "tao/AnyTypeCode/Struct_TypeCode_Static.h" +#include "tao/AnyTypeCode/Null_RefCount_Policy.h" ACE_RCSID (tao, diff --git a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp index 7f6492d8bf4..769d6760258 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp @@ -1,26 +1,26 @@ // $Id$ -#include "TypeCode_CDR_Extraction.h" - -#include "TypeCode_Constants.h" -#include "True_RefCount_Policy.h" - -#include "Alias_TypeCode.h" -#include "Enum_TypeCode.h" -#include "Fixed_TypeCode.h" -#include "Objref_TypeCode.h" -#include "Sequence_TypeCode.h" -#include "String_TypeCode.h" -#include "Struct_TypeCode.h" -#include "Union_TypeCode.h" -#include "Value_TypeCode.h" -#include "Any.h" - -#include "Recursive_Type_TypeCode.h" - -#include "TypeCode_Case_T.h" -#include "TypeCode_Struct_Field.h" -#include "TypeCode_Value_Field.h" +#include "tao/AnyTypeCode/TypeCode_CDR_Extraction.h" + +#include "tao/AnyTypeCode/TypeCode_Constants.h" +#include "tao/AnyTypeCode/True_RefCount_Policy.h" + +#include "tao/AnyTypeCode/Alias_TypeCode.h" +#include "tao/AnyTypeCode/Enum_TypeCode.h" +#include "tao/AnyTypeCode/Fixed_TypeCode.h" +#include "tao/AnyTypeCode/Objref_TypeCode.h" +#include "tao/AnyTypeCode/Sequence_TypeCode.h" +#include "tao/AnyTypeCode/String_TypeCode.h" +#include "tao/AnyTypeCode/Struct_TypeCode.h" +#include "tao/AnyTypeCode/Union_TypeCode.h" +#include "tao/AnyTypeCode/Value_TypeCode.h" +#include "tao/AnyTypeCode/Any.h" + +#include "tao/AnyTypeCode/Recursive_Type_TypeCode.h" + +#include "tao/AnyTypeCode/TypeCode_Case_T.h" +#include "tao/AnyTypeCode/TypeCode_Struct_Field.h" +#include "tao/AnyTypeCode/TypeCode_Value_Field.h" #include "tao/CDR.h" diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp index 0aff8144611..67edee2d6b8 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp @@ -3,7 +3,7 @@ #ifndef TAO_TYPECODE_CASE_CPP #define TAO_TYPECODE_CASE_CPP -#include "TypeCode_Case_Base_T.h" +#include "tao/AnyTypeCode/TypeCode_Case_Base_T.h" #include "ace/OS_NS_string.h" #ifndef __ACE_INLINE__ diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp index 1059713ccff..fc7533e98ae 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp @@ -3,7 +3,7 @@ #ifndef TAO_TYPECODE_CASE_T_CPP #define TAO_TYPECODE_CASE_T_CPP -#include "TypeCode_Case_T.h" +#include "tao/AnyTypeCode/TypeCode_Case_T.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" diff --git a/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp b/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp index 9244b07fb1e..eb9bd81746b 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "TypeCode_Constants.h" +#include "tao/AnyTypeCode/TypeCode_Constants.h" ACE_RCSID (tao, @@ -9,10 +9,10 @@ ACE_RCSID (tao, "$Id$") -#include "Null_RefCount_Policy.h" -#include "Empty_Param_TypeCode.h" -#include "Objref_TypeCode_Static.h" -#include "String_TypeCode_Static.h" +#include "tao/AnyTypeCode/Null_RefCount_Policy.h" +#include "tao/AnyTypeCode/Empty_Param_TypeCode.h" +#include "tao/AnyTypeCode/Objref_TypeCode_Static.h" +#include "tao/AnyTypeCode/String_TypeCode_Static.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/ULongLongSeqA.cpp b/TAO/tao/AnyTypeCode/ULongLongSeqA.cpp index 43420cd5280..5773812563a 100644 --- a/TAO/tao/AnyTypeCode/ULongLongSeqA.cpp +++ b/TAO/tao/AnyTypeCode/ULongLongSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "ULongLongSeqA.h" +#include "tao/AnyTypeCode/ULongLongSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/ULongSeqA.cpp b/TAO/tao/AnyTypeCode/ULongSeqA.cpp index 74f062c1853..7acfbea8976 100644 --- a/TAO/tao/AnyTypeCode/ULongSeqA.cpp +++ b/TAO/tao/AnyTypeCode/ULongSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "ULongSeqA.h" +#include "tao/AnyTypeCode/ULongSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/UShortSeqA.cpp b/TAO/tao/AnyTypeCode/UShortSeqA.cpp index 75fb6904f92..582d15d69d0 100644 --- a/TAO/tao/AnyTypeCode/UShortSeqA.cpp +++ b/TAO/tao/AnyTypeCode/UShortSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "UShortSeqA.h" +#include "tao/AnyTypeCode/UShortSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp index 9e15686eb18..a61b99d9b08 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp @@ -3,15 +3,15 @@ #ifndef TAO_UNION_TYPECODE_CPP #define TAO_UNION_TYPECODE_CPP -#include "Union_TypeCode.h" -#include "TypeCode_Case_Base_T.h" +#include "tao/AnyTypeCode/Union_TypeCode.h" +#include "tao/AnyTypeCode/TypeCode_Case_Base_T.h" #ifndef __ACE_INLINE__ -# include "Union_TypeCode.inl" +# include "tao/AnyTypeCode/Union_TypeCode.inl" #endif /* !__ACE_INLINE__ */ #include "tao/SystemException.h" -#include "Any.h" +#include "tao/AnyTypeCode/Any.h" #include "ace/Value_Ptr.h" diff --git a/TAO/tao/AnyTypeCode/ValueModifierA.cpp b/TAO/tao/AnyTypeCode/ValueModifierA.cpp index 81d564143bf..5f23127315a 100644 --- a/TAO/tao/AnyTypeCode/ValueModifierA.cpp +++ b/TAO/tao/AnyTypeCode/ValueModifierA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "ValueModifierA.h" +#include "tao/AnyTypeCode/ValueModifierA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" diff --git a/TAO/tao/AnyTypeCode/ValueModifierC.cpp b/TAO/tao/AnyTypeCode/ValueModifierC.cpp index de4da3c7377..9606aaf3d1b 100644 --- a/TAO/tao/AnyTypeCode/ValueModifierC.cpp +++ b/TAO/tao/AnyTypeCode/ValueModifierC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "ValueModifierC.h" +#include "tao/AnyTypeCode/ValueModifierC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) diff --git a/TAO/tao/AnyTypeCode/VisibilityA.cpp b/TAO/tao/AnyTypeCode/VisibilityA.cpp index 8e56a0113f1..ce31b456908 100644 --- a/TAO/tao/AnyTypeCode/VisibilityA.cpp +++ b/TAO/tao/AnyTypeCode/VisibilityA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "VisibilityA.h" +#include "tao/AnyTypeCode/VisibilityA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/VisibilityC.cpp b/TAO/tao/AnyTypeCode/VisibilityC.cpp index 0fb49012231..d8c674edc02 100644 --- a/TAO/tao/AnyTypeCode/VisibilityC.cpp +++ b/TAO/tao/AnyTypeCode/VisibilityC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "VisibilityC.h" +#include "tao/AnyTypeCode/VisibilityC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) diff --git a/TAO/tao/AnyTypeCode/WCharSeqA.cpp b/TAO/tao/AnyTypeCode/WCharSeqA.cpp index 9f735b31b0c..978836022a6 100644 --- a/TAO/tao/AnyTypeCode/WCharSeqA.cpp +++ b/TAO/tao/AnyTypeCode/WCharSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "WCharSeqA.h" +#include "tao/AnyTypeCode/WCharSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/WStringSeqA.cpp b/TAO/tao/AnyTypeCode/WStringSeqA.cpp index c49b1395340..f3f468704e4 100644 --- a/TAO/tao/AnyTypeCode/WStringSeqA.cpp +++ b/TAO/tao/AnyTypeCode/WStringSeqA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "WStringSeqA.h" +#include "tao/AnyTypeCode/WStringSeqA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/WrongTransactionA.cpp b/TAO/tao/AnyTypeCode/WrongTransactionA.cpp index 57c00799f56..9c6fd0a62f2 100644 --- a/TAO/tao/AnyTypeCode/WrongTransactionA.cpp +++ b/TAO/tao/AnyTypeCode/WrongTransactionA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "WrongTransactionA.h" +#include "tao/AnyTypeCode/WrongTransactionA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/orb_typesA.cpp b/TAO/tao/AnyTypeCode/orb_typesA.cpp index c704c87e805..e1967ebdfd8 100644 --- a/TAO/tao/AnyTypeCode/orb_typesA.cpp +++ b/TAO/tao/AnyTypeCode/orb_typesA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "orb_typesA.h" +#include "tao/AnyTypeCode/orb_typesA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/AnyTypeCode/skip.cpp b/TAO/tao/AnyTypeCode/skip.cpp index 171577f3518..385d54b5e1f 100644 --- a/TAO/tao/AnyTypeCode/skip.cpp +++ b/TAO/tao/AnyTypeCode/skip.cpp @@ -19,10 +19,10 @@ // // ============================================================================ -#include "Marshal.h" -#include "TypeCode.h" -#include "Any_Unknown_IDL_Type.h" -#include "Any.h" +#include "tao/AnyTypeCode/Marshal.h" +#include "tao/AnyTypeCode/TypeCode.h" +#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" +#include "tao/AnyTypeCode/Any.h" #include "tao/debug.h" #include "tao/Valuetype_Adapter.h" diff --git a/TAO/tao/Asynch_Queued_Message.cpp b/TAO/tao/Asynch_Queued_Message.cpp index 457b875e91d..74412e8db1a 100644 --- a/TAO/tao/Asynch_Queued_Message.cpp +++ b/TAO/tao/Asynch_Queued_Message.cpp @@ -1,6 +1,6 @@ -#include "Asynch_Queued_Message.h" -#include "debug.h" -#include "ORB_Core.h" +#include "tao/Asynch_Queued_Message.h" +#include "tao/debug.h" +#include "tao/ORB_Core.h" #include "ace/OS_Memory.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp index 9265d2dc641..a4943a47b04 100644 --- a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp +++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp @@ -1,6 +1,6 @@ -#include "BiDir_ORBInitializer.h" -#include "BiDirGIOP.h" -#include "BiDirPolicy_Validator.h" +#include "tao/BiDir_GIOP/BiDir_ORBInitializer.h" +#include "tao/BiDir_GIOP/BiDirGIOP.h" +#include "tao/BiDir_GIOP/BiDirPolicy_Validator.h" #include "tao/ORB_Core.h" #include "tao/debug.h" #include "tao/ORBInitializer_Registry.h" diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.h b/TAO/tao/BiDir_GIOP/BiDirGIOP.h index 40d23522b8e..c1cafd48fa3 100644 --- a/TAO/tao/BiDir_GIOP/BiDirGIOP.h +++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.h @@ -17,7 +17,7 @@ #define TAO_BIDIR_GIOP_H #include /**/ "ace/pre.h" -#include "bidirgiop_export.h" +#include "tao/BiDir_GIOP/bidirgiop_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -74,7 +74,7 @@ ACE_FACTORY_DECLARE (TAO_BiDirGIOP, TAO_BiDirGIOP_Loader) #define TAO_BIDIRGIOP_SAFE_INCLUDE -#include "BiDirPolicyC.h" +#include "tao/BiDir_GIOP/BiDirPolicyC.h" #undef TAO_BIDIRGIOP_SAFE_INCLUDE #include /**/ "ace/post.h" diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp index 171504cd4e7..07fe0de4a78 100644 --- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp +++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "BiDirGIOP.h" +#include "tao/BiDir_GIOP/BiDirGIOP.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.h b/TAO/tao/BiDir_GIOP/BiDirPolicyC.h index b6c8a1c5647..c1661c9c707 100644 --- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.h +++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.h @@ -43,7 +43,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "bidirgiop_export.h" +#include "tao/BiDir_GIOP/bidirgiop_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp index 5c54b772cb8..af719c05a24 100644 --- a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp +++ b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp @@ -1,5 +1,5 @@ -#include "BiDirPolicy_Validator.h" -#include "BiDir_Policy_i.h" +#include "tao/BiDir_GIOP/BiDirPolicy_Validator.h" +#include "tao/BiDir_GIOP/BiDir_Policy_i.h" #include "tao/Policy_Set.h" #include "tao/ORB_Core.h" diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h index 2c09d0baf67..106b1a834c8 100644 --- a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h +++ b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h @@ -18,7 +18,7 @@ #define TAO_BIDIR_POLICY_VALIDATOR_H_ #include /**/ "ace/pre.h" -#include "bidirgiop_export.h" +#include "tao/BiDir_GIOP/bidirgiop_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp index e2f4f2bb696..2aff9aa8432 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp +++ b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "BiDir_ORBInitializer.h" -#include "BiDir_PolicyFactory.h" -#include "BiDirGIOP.h" +#include "tao/BiDir_GIOP/BiDir_ORBInitializer.h" +#include "tao/BiDir_GIOP/BiDir_PolicyFactory.h" +#include "tao/BiDir_GIOP/BiDirGIOP.h" #include "tao/ORB_Constants.h" diff --git a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h index 3719942c697..b09a94da506 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h +++ b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "bidirgiop_export.h" +#include "tao/BiDir_GIOP/bidirgiop_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp index 10b5d64dcf2..98ef7218f99 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp +++ b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp @@ -1,6 +1,6 @@ -#include "BiDir_PolicyFactory.h" -#include "BiDirGIOP.h" -#include "BiDir_Policy_i.h" +#include "tao/BiDir_GIOP/BiDir_PolicyFactory.h" +#include "tao/BiDir_GIOP/BiDirGIOP.h" +#include "tao/BiDir_GIOP/BiDir_Policy_i.h" #include "tao/ORB_Constants.h" #include "tao/AnyTypeCode/Any.h" diff --git a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h index d9689c37dd2..9a4175257b5 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h +++ b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "bidirgiop_export.h" +#include "tao/BiDir_GIOP/bidirgiop_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp index c902c6aa47a..926dbcf223e 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp +++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "BiDir_Policy_i.h" +#include "tao/BiDir_GIOP/BiDir_Policy_i.h" #include "tao/Stub.h" #include "tao/debug.h" diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h index 96fe1b1d278..93ef62f6c19 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h +++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h @@ -13,13 +13,13 @@ #ifndef TAO_BIDIR_POLICY_I_H #define TAO_BIDIR_POLICY_I_H #include /**/ "ace/pre.h" -#include "bidirgiop_export.h" +#include "tao/BiDir_GIOP/bidirgiop_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "BiDirGIOP.h" +#include "tao/BiDir_GIOP/BiDirGIOP.h" #include "tao/LocalObject.h" #if defined(_MSC_VER) diff --git a/TAO/tao/Block_Flushing_Strategy.cpp b/TAO/tao/Block_Flushing_Strategy.cpp index e06a0c2dc6d..c56ecbe7ef0 100644 --- a/TAO/tao/Block_Flushing_Strategy.cpp +++ b/TAO/tao/Block_Flushing_Strategy.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "Block_Flushing_Strategy.h" -#include "Transport.h" -#include "Queued_Message.h" +#include "tao/Block_Flushing_Strategy.h" +#include "tao/Transport.h" +#include "tao/Queued_Message.h" ACE_RCSID(tao, Block_Flushing_Strategy, "$Id$") diff --git a/TAO/tao/Block_Flushing_Strategy.h b/TAO/tao/Block_Flushing_Strategy.h index 7a157c5cf34..835b97755e7 100644 --- a/TAO/tao/Block_Flushing_Strategy.h +++ b/TAO/tao/Block_Flushing_Strategy.h @@ -14,7 +14,7 @@ #define TAO_BLOCK_FLUSHING_STRATEGY_H #include /**/ "ace/pre.h" -#include "Flushing_Strategy.h" +#include "tao/Flushing_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/Blocked_Connect_Strategy.cpp b/TAO/tao/Blocked_Connect_Strategy.cpp index e8817a80561..9317a128679 100644 --- a/TAO/tao/Blocked_Connect_Strategy.cpp +++ b/TAO/tao/Blocked_Connect_Strategy.cpp @@ -1,5 +1,5 @@ -#include "Blocked_Connect_Strategy.h" -#include "Connection_Handler.h" +#include "tao/Blocked_Connect_Strategy.h" +#include "tao/Connection_Handler.h" #include "ace/Synch_Options.h" diff --git a/TAO/tao/Blocked_Connect_Strategy.h b/TAO/tao/Blocked_Connect_Strategy.h index 723868455ce..9c547ebfc23 100644 --- a/TAO/tao/Blocked_Connect_Strategy.h +++ b/TAO/tao/Blocked_Connect_Strategy.h @@ -14,7 +14,7 @@ #define TAO_BLOCKED_CONNECT_STRATEGY_H #include /**/ "ace/pre.h" -#include "Connect_Strategy.h" +#include "tao/Connect_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/BooleanSeqC.cpp b/TAO/tao/BooleanSeqC.cpp index 5d4f05119ce..1b8ef457532 100644 --- a/TAO/tao/BooleanSeqC.cpp +++ b/TAO/tao/BooleanSeqC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "BooleanSeqC.h" +#include "tao/BooleanSeqC.h" #include "tao/CDR.h" // TAO_IDL - Generated from diff --git a/TAO/tao/Buffering_Constraint_Policy.cpp b/TAO/tao/Buffering_Constraint_Policy.cpp index 8f1ae69c489..89c04ea640a 100644 --- a/TAO/tao/Buffering_Constraint_Policy.cpp +++ b/TAO/tao/Buffering_Constraint_Policy.cpp @@ -4,8 +4,8 @@ #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) -#include "TAOC.h" -#include "SystemException.h" +#include "tao/TAOC.h" +#include "tao/SystemException.h" ACE_RCSID (tao, Buffering_Constraint_Policy, diff --git a/TAO/tao/CONV_FRAMEC.cpp b/TAO/tao/CONV_FRAMEC.cpp index f7036582853..42f84796b58 100644 --- a/TAO/tao/CONV_FRAMEC.cpp +++ b/TAO/tao/CONV_FRAMEC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:288 -#include "CONV_FRAMEC.h" +#include "tao/CONV_FRAMEC.h" #include "tao/CDR.h" // TAO_IDL - Generated from diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp index 44babb5e141..9192b99c8a4 100644 --- a/TAO/tao/CORBALOC_Parser.cpp +++ b/TAO/tao/CORBALOC_Parser.cpp @@ -1,10 +1,10 @@ -#include "CORBALOC_Parser.h" -#include "ORB_Core.h" -#include "Stub.h" -#include "MProfile.h" -#include "Connector_Registry.h" -#include "Transport_Connector.h" -#include "Protocol_Factory.h" +#include "tao/CORBALOC_Parser.h" +#include "tao/ORB_Core.h" +#include "tao/Stub.h" +#include "tao/MProfile.h" +#include "tao/Connector_Registry.h" +#include "tao/Transport_Connector.h" +#include "tao/Protocol_Factory.h" #include "tao/debug.h" #include "ace/Vector_T.h" #include "ace/INET_Addr.h" @@ -13,7 +13,7 @@ #include "ace/os_include/os_netdb.h" #if !defined(__ACE_INLINE__) -#include "CORBALOC_Parser.i" +#include "tao/CORBALOC_Parser.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (tao, diff --git a/TAO/tao/CORBALOC_Parser.h b/TAO/tao/CORBALOC_Parser.h index c99631771ae..b9ecab51756 100644 --- a/TAO/tao/CORBALOC_Parser.h +++ b/TAO/tao/CORBALOC_Parser.h @@ -96,7 +96,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "CORBALOC_Parser.i" +# include "tao/CORBALOC_Parser.i" #endif /* __ACE_INLINE__ */ ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_CORBALOC_Parser) diff --git a/TAO/tao/CORBANAME_Parser.cpp b/TAO/tao/CORBANAME_Parser.cpp index 91df382a322..bfc2eca66a7 100644 --- a/TAO/tao/CORBANAME_Parser.cpp +++ b/TAO/tao/CORBANAME_Parser.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "CORBANAME_Parser.h" -#include "ORB.h" -#include "Object.h" -#include "SystemException.h" -#include "UB_String_Arguments.h" -#include "Invocation_Adapter.h" -#include "debug.h" +#include "tao/CORBANAME_Parser.h" +#include "tao/ORB.h" +#include "tao/Object.h" +#include "tao/SystemException.h" +#include "tao/UB_String_Arguments.h" +#include "tao/Invocation_Adapter.h" +#include "tao/debug.h" #include "ace/Log_Msg.h" #include "ace/SString.h" diff --git a/TAO/tao/CORBA_String.cpp b/TAO/tao/CORBA_String.cpp index f8889735ce5..583be67aded 100644 --- a/TAO/tao/CORBA_String.cpp +++ b/TAO/tao/CORBA_String.cpp @@ -1,5 +1,5 @@ -#include "CORBA_String.h" -#include "Managed_Types.h" +#include "tao/CORBA_String.h" +#include "tao/Managed_Types.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_wchar.h" diff --git a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp index 7d791837473..a2cf1ceafe1 100644 --- a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp +++ b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "CSD_Default_Servant_Dispatcher.h" -#include "CSD_POA.h" -#include "CSD_Strategy_Repository.h" +#include "tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h" +#include "tao/CSD_Framework/CSD_POA.h" +#include "tao/CSD_Framework/CSD_Strategy_Repository.h" #include "ace/Dynamic_Service.h" ACE_RCSID(CSD_Framework, diff --git a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h index 69caa2e3a9d..ed78621d075 100644 --- a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h +++ b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h @@ -14,7 +14,7 @@ #define TAO_CSD_DEFAULT_SERVANT_DISPATCHER_H #include /**/ "ace/pre.h" -#include "CSD_FW_Export.h" +#include "tao/CSD_Framework/CSD_FW_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp index 8d4f86f84ce..f8cc7c0d008 100644 --- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp +++ b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "CSD_FW_Server_Request_Wrapper.h" +#include "tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" -#include "ORB_Core.h" +#include "tao/ORB_Core.h" #include "tao/Transport.h" #include "tao/CDR.h" @@ -12,7 +12,7 @@ ACE_RCSID (CSD_Framework, "$Id$") #if !defined (__ACE_INLINE__) -# include "CSD_FW_Server_Request_Wrapper.inl" +# include "tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.inl" #endif /* ! __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h index 67ec7467ec4..e76b4090487 100644 --- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h +++ b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "CSD_FW_Export.h" +#include "tao/CSD_Framework/CSD_FW_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -123,7 +123,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "CSD_FW_Server_Request_Wrapper.inl" +# include "tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/CSD_Framework/CSD_FrameworkA.cpp b/TAO/tao/CSD_Framework/CSD_FrameworkA.cpp index befdbb62572..267e866b903 100644 --- a/TAO/tao/CSD_Framework/CSD_FrameworkA.cpp +++ b/TAO/tao/CSD_Framework/CSD_FrameworkA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "CSD_FrameworkA.h" +#include "tao/CSD_Framework/CSD_FrameworkA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/CSD_Framework/CSD_FrameworkA.h b/TAO/tao/CSD_Framework/CSD_FrameworkA.h index d3e730f09c6..da09d57dec2 100644 --- a/TAO/tao/CSD_Framework/CSD_FrameworkA.h +++ b/TAO/tao/CSD_Framework/CSD_FrameworkA.h @@ -33,8 +33,8 @@ #include /**/ "ace/pre.h" -#include "CSD_FW_Export.h" -#include "CSD_FrameworkC.h" +#include "tao/CSD_Framework/CSD_FW_Export.h" +#include "tao/CSD_Framework/CSD_FrameworkC.h" //#include "tao/PortableServer/PortableServerA.h" diff --git a/TAO/tao/CSD_Framework/CSD_FrameworkC.cpp b/TAO/tao/CSD_Framework/CSD_FrameworkC.cpp index 3066545bcd9..e4899682ad2 100644 --- a/TAO/tao/CSD_Framework/CSD_FrameworkC.cpp +++ b/TAO/tao/CSD_Framework/CSD_FrameworkC.cpp @@ -29,7 +29,7 @@ // .\be\be_codegen.cpp:277 -#include "CSD_FrameworkC.h" +#include "tao/CSD_Framework/CSD_FrameworkC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/CSD_Framework/CSD_FrameworkC.h b/TAO/tao/CSD_Framework/CSD_FrameworkC.h index 080f13c4bf3..e78eaf949ae 100644 --- a/TAO/tao/CSD_Framework/CSD_FrameworkC.h +++ b/TAO/tao/CSD_Framework/CSD_FrameworkC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "CSD_FW_Export.h" +#include "tao/CSD_Framework/CSD_FW_Export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" diff --git a/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp b/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp index 14e3f377dff..99094e9e166 100644 --- a/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp +++ b/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "CSD_Framework_Loader.h" -#include "CSD_Object_Adapter_Factory.h" -#include "CSD_Strategy_Repository.h" +#include "tao/CSD_Framework/CSD_Framework_Loader.h" +#include "tao/CSD_Framework/CSD_Object_Adapter_Factory.h" +#include "tao/CSD_Framework/CSD_Strategy_Repository.h" #include "ace/Dynamic_Service.h" ACE_RCSID (CSD_Framework, diff --git a/TAO/tao/CSD_Framework/CSD_Framework_Loader.h b/TAO/tao/CSD_Framework/CSD_Framework_Loader.h index 94aeae3a4fc..44aa1f5c73c 100644 --- a/TAO/tao/CSD_Framework/CSD_Framework_Loader.h +++ b/TAO/tao/CSD_Framework/CSD_Framework_Loader.h @@ -16,7 +16,7 @@ #define TAO_CSD_FRAMEWORK_LOADER_H #include /**/ "ace/pre.h" -#include "CSD_FW_Export.h" +#include "tao/CSD_Framework/CSD_FW_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp b/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp index 46a962991e1..b67ea4bbc08 100644 --- a/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp +++ b/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp @@ -1,5 +1,5 @@ // $Id$ -#include "CSD_ORBInitializer.h" +#include "tao/CSD_Framework/CSD_ORBInitializer.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 @@ -7,7 +7,7 @@ ACE_RCSID (CSD_Framework, CSD_ORBInitializer, "$Id$") -#include "CSD_Object_Adapter_Factory.h" +#include "tao/CSD_Framework/CSD_Object_Adapter_Factory.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_ORBInitializer.h b/TAO/tao/CSD_Framework/CSD_ORBInitializer.h index b3a30ed60fc..8d6aa8a03e5 100644 --- a/TAO/tao/CSD_Framework/CSD_ORBInitializer.h +++ b/TAO/tao/CSD_Framework/CSD_ORBInitializer.h @@ -20,7 +20,7 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "CSD_FW_Export.h" +#include "tao/CSD_Framework/CSD_FW_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp b/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp index fec899dbe21..ed74e7c413b 100644 --- a/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp +++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "CSD_Object_Adapter.h" -#include "CSD_Strategy_Proxy.h" -#include "CSD_POA.h" +#include "tao/CSD_Framework/CSD_Object_Adapter.h" +#include "tao/CSD_Framework/CSD_Strategy_Proxy.h" +#include "tao/CSD_Framework/CSD_POA.h" ACE_RCSID (CSD_Framework, CSD_Object_Adapter, diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter.h b/TAO/tao/CSD_Framework/CSD_Object_Adapter.h index 3656968be9a..34016654cba 100644 --- a/TAO/tao/CSD_Framework/CSD_Object_Adapter.h +++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter.h @@ -15,7 +15,7 @@ #define TAO_CSD_OBJECT_ADAPTER_H #include /**/ "ace/pre.h" -#include "CSD_FW_Export.h" +#include "tao/CSD_Framework/CSD_FW_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp index 497bab649b3..fa06817ec2c 100644 --- a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp +++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "CSD_Object_Adapter_Factory.h" -#include "CSD_Strategy_Repository.h" -#include "CSD_Object_Adapter.h" -#include "CSD_ORBInitializer.h" -#include "CSD_Default_Servant_Dispatcher.h" +#include "tao/CSD_Framework/CSD_Object_Adapter_Factory.h" +#include "tao/CSD_Framework/CSD_Strategy_Repository.h" +#include "tao/CSD_Framework/CSD_Object_Adapter.h" +#include "tao/CSD_Framework/CSD_ORBInitializer.h" +#include "tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h" #include "tao/ORB_Core.h" #include "tao/ORBInitializer_Registry.h" #include "ace/Dynamic_Service.h" diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.h b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.h index 9e37ac9b20c..7914266c53c 100644 --- a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.h +++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.h @@ -15,7 +15,7 @@ #define TAO_CSD_OBJECT_ADAPTER_FACTORY_H #include /**/ "ace/pre.h" -#include "CSD_FW_Export.h" +#include "tao/CSD_Framework/CSD_FW_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/CSD_Framework/CSD_POA.cpp b/TAO/tao/CSD_Framework/CSD_POA.cpp index 01a35135a6f..fb4d9c69869 100644 --- a/TAO/tao/CSD_Framework/CSD_POA.cpp +++ b/TAO/tao/CSD_Framework/CSD_POA.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "CSD_POA.h" -#include "CSD_Strategy_Repository.h" -#include "CSD_Strategy_Base.h" +#include "tao/CSD_Framework/CSD_POA.h" +#include "tao/CSD_Framework/CSD_Strategy_Repository.h" +#include "tao/CSD_Framework/CSD_Strategy_Base.h" #include "ace/Dynamic_Service.h" @@ -11,7 +11,7 @@ ACE_RCSID (CSD_Framework, "$Id$") #if !defined (__ACE_INLINE__) -# include "CSD_POA.inl" +# include "tao/CSD_Framework/CSD_POA.inl" #endif /* ! __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_POA.h b/TAO/tao/CSD_Framework/CSD_POA.h index 8567e19caab..7bf2c338e0d 100644 --- a/TAO/tao/CSD_Framework/CSD_POA.h +++ b/TAO/tao/CSD_Framework/CSD_POA.h @@ -15,14 +15,14 @@ #include /**/ "ace/pre.h" -#include "CSD_FW_Export.h" +#include "tao/CSD_Framework/CSD_FW_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/PortableServer/Regular_POA.h" -#include "CSD_Strategy_Proxy.h" +#include "tao/CSD_Framework/CSD_Strategy_Proxy.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -102,7 +102,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "CSD_POA.inl" +# include "tao/CSD_Framework/CSD_POA.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp b/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp index f6bd938ad4a..aa641fe9bc7 100644 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp +++ b/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "CSD_Strategy_Base.h" -#include "CSD_POA.h" -#include "CSD_Strategy_Proxy.h" +#include "tao/CSD_Framework/CSD_Strategy_Base.h" +#include "tao/CSD_Framework/CSD_POA.h" +#include "tao/CSD_Framework/CSD_Strategy_Proxy.h" #include "tao/PortableServer/Root_POA.h" #include "tao/PortableServer/POAManager.h" #include "tao/PortableServer/Servant_Base.h" @@ -13,7 +13,7 @@ ACE_RCSID (CSD_Framework, "$Id$") #if !defined (__ACE_INLINE__) -# include "CSD_Strategy_Base.inl" +# include "tao/CSD_Framework/CSD_Strategy_Base.inl" #endif /* ! __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.h b/TAO/tao/CSD_Framework/CSD_Strategy_Base.h index d31749b6268..d65753a27f7 100644 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.h +++ b/TAO/tao/CSD_Framework/CSD_Strategy_Base.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "CSD_FW_Export.h" +#include "tao/CSD_Framework/CSD_FW_Export.h" #include "tao/PortableServer/PortableServer.h" #include "tao/PortableServer/Servant_Upcall.h" @@ -28,7 +28,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "CSD_FrameworkC.h" +#include "tao/CSD_Framework/CSD_FrameworkC.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -166,7 +166,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "CSD_Strategy_Base.inl" +# include "tao/CSD_Framework/CSD_Strategy_Base.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.cpp b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.cpp index 8e4915b8e92..b163134be56 100644 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.cpp +++ b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "CSD_Strategy_Proxy.h" +#include "tao/CSD_Framework/CSD_Strategy_Proxy.h" #include "tao/TAO_Server_Request.h" #include "tao/debug.h" @@ -10,7 +10,7 @@ ACE_RCSID (CSD_Framework, #if !defined (__ACE_INLINE__) -# include "CSD_Strategy_Proxy.inl" +# include "tao/CSD_Framework/CSD_Strategy_Proxy.inl" #endif /* ! __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h index 342d7bd86f0..959a7cb9ebb 100644 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h +++ b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "CSD_FW_Export.h" +#include "tao/CSD_Framework/CSD_FW_Export.h" #include "tao/PortableServer/PortableServer.h" #include "tao/PortableServer/Servant_Upcall.h" @@ -24,7 +24,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "CSD_Strategy_Base.h" +#include "tao/CSD_Framework/CSD_Strategy_Base.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -106,7 +106,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "CSD_Strategy_Proxy.inl" +# include "tao/CSD_Framework/CSD_Strategy_Proxy.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp b/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp index 704062cb6a7..5a169516bf5 100644 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp +++ b/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "CSD_Strategy_Repository.h" +#include "tao/CSD_Framework/CSD_Strategy_Repository.h" #include "tao/debug.h" ACE_RCSID (CSD_Framework, diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.h b/TAO/tao/CSD_Framework/CSD_Strategy_Repository.h index c22313a020f..7e50fe5f62f 100644 --- a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.h +++ b/TAO/tao/CSD_Framework/CSD_Strategy_Repository.h @@ -15,8 +15,8 @@ #include /**/ "ace/pre.h" -#include "CSD_FW_Export.h" -#include "CSD_FrameworkC.h" +#include "tao/CSD_Framework/CSD_FW_Export.h" +#include "tao/CSD_Framework/CSD_FrameworkC.h" #include "ace/Service_Object.h" #include "ace/Service_Config.h" #include "ace/Synch.h" diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp index 999dd657ab5..35b6b316012 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp @@ -1,14 +1,14 @@ // $Id$ -#include "CSD_TP_Cancel_Visitor.h" -#include "CSD_TP_Request.h" +#include "tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h" +#include "tao/CSD_ThreadPool/CSD_TP_Request.h" ACE_RCSID (CSD_TP, Cancel_Visitor, "$Id$") #if !defined (__ACE_INLINE__) -# include "CSD_TP_Cancel_Visitor.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl" #endif /* ! __ACE_INLINE__ */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h index c998dfe947c..d9b2472e507 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h @@ -15,14 +15,14 @@ #include /**/ "ace/pre.h" -#include "CSD_TP_Export.h" +#include "tao/CSD_ThreadPool/CSD_TP_Export.h" #include "tao/PortableServer/Servant_Base.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "CSD_TP_Queue_Visitor.h" +#include "tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -79,7 +79,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "CSD_TP_Cancel_Visitor.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp index bd78dc95b03..0e4c596f682 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp @@ -1,13 +1,13 @@ // $Id$ -#include "CSD_TP_Collocated_Asynch_Request.h" +#include "tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h" ACE_RCSID (CSD_ThreadPool, TP_Collocated_Asynch_Request, "$Id$") #if !defined (__ACE_INLINE__) -# include "CSD_TP_Collocated_Asynch_Request.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.inl" #endif /* ! __ACE_INLINE__ */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h index e17f39c8611..6cfa149f73a 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "CSD_TP_Export.h" +#include "tao/CSD_ThreadPool/CSD_TP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "CSD_TP_Corba_Request.h" +#include "tao/CSD_ThreadPool/CSD_TP_Corba_Request.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -82,7 +82,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "CSD_TP_Collocated_Asynch_Request.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp index 366a376ac98..31c6c32e1a7 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "CSD_TP_Collocated_Synch_Request.h" +#include "tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h" ACE_RCSID (CSD_ThreadPool, TP_Collocated_Synch_Request, @@ -9,7 +9,7 @@ ACE_RCSID (CSD_ThreadPool, #include "tao/ORB_Core.h" #if !defined (__ACE_INLINE__) -# include "CSD_TP_Collocated_Synch_Request.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl" #endif /* ! __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h index 182604610ed..cad5fa52bd5 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h @@ -15,14 +15,14 @@ #include /**/ "ace/pre.h" -#include "CSD_TP_Export.h" +#include "tao/CSD_ThreadPool/CSD_TP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "CSD_TP_Corba_Request.h" -#include "CSD_TP_Synch_Helper.h" +#include "tao/CSD_ThreadPool/CSD_TP_Corba_Request.h" +#include "tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h" #include "tao/Exception.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -101,7 +101,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "CSD_TP_Collocated_Synch_Request.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp index 37004cab053..70f43c863c7 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "CSD_TP_Collocated_Synch_With_Server_Request.h" +#include "tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h" ACE_RCSID (CSD_ThreadPool, TP_Collocated_Synch_With_Server_Request, @@ -9,7 +9,7 @@ ACE_RCSID (CSD_ThreadPool, #include "tao/Exception.h" #if !defined (__ACE_INLINE__) -# include "CSD_TP_Collocated_Synch_With_Server_Request.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl" #endif /* ! __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h index fd6e0549149..0b54d87ed06 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h @@ -15,14 +15,14 @@ #include /**/ "ace/pre.h" -#include "CSD_TP_Export.h" +#include "tao/CSD_ThreadPool/CSD_TP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "CSD_TP_Corba_Request.h" -#include "CSD_TP_Synch_Helper.h" +#include "tao/CSD_ThreadPool/CSD_TP_Corba_Request.h" +#include "tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -102,7 +102,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "CSD_TP_Collocated_Synch_With_Server_Request.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.cpp index a2fea7af822..ff2aa4709c9 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.cpp @@ -1,13 +1,13 @@ // $Id$ -#include "CSD_TP_Corba_Request.h" +#include "tao/CSD_ThreadPool/CSD_TP_Corba_Request.h" ACE_RCSID (CSD_ThreadPool, TP_Corba_Request, "$Id$") #if !defined (__ACE_INLINE__) -# include "CSD_TP_Corba_Request.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl" #endif /* ! __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h index 39f01215a13..2e0a6c7996f 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "CSD_TP_Export.h" +#include "tao/CSD_ThreadPool/CSD_TP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "CSD_TP_Request.h" +#include "tao/CSD_ThreadPool/CSD_TP_Request.h" #include "tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h" #include "tao/PortableServer/PortableServer.h" #include "tao/PortableServer/Servant_Base.h" @@ -95,7 +95,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "CSD_TP_Corba_Request.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp index ef6cbc5f08b..6765f02eff6 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp @@ -1,13 +1,13 @@ // $Id$ -#include "CSD_TP_Custom_Asynch_Request.h" +#include "tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h" ACE_RCSID (CSD_ThreadPool, TP_Custom_Asynch_Request, "$Id$") #if !defined (__ACE_INLINE__) -# include "CSD_TP_Custom_Asynch_Request.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.inl" #endif /* ! __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h index 0c8727ef683..aed6d8f88f5 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "CSD_TP_Export.h" +#include "tao/CSD_ThreadPool/CSD_TP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "CSD_TP_Custom_Request.h" +#include "tao/CSD_ThreadPool/CSD_TP_Custom_Request.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -71,7 +71,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "CSD_TP_Custom_Asynch_Request.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.cpp index 9ccb075f427..fbe24fc0c53 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.cpp @@ -1,13 +1,13 @@ // $Id$ -#include "CSD_TP_Custom_Request.h" +#include "tao/CSD_ThreadPool/CSD_TP_Custom_Request.h" ACE_RCSID (CSD_ThreadPool, TP_Custom_Request, "$Id$") #if !defined (__ACE_INLINE__) -# include "CSD_TP_Custom_Request.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Custom_Request.inl" #endif /* ! __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h index 14ed79db65a..c4c5bcbb0b4 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h @@ -15,14 +15,14 @@ #include /**/ "ace/pre.h" -#include "CSD_TP_Export.h" +#include "tao/CSD_ThreadPool/CSD_TP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "CSD_TP_Request.h" -#include "CSD_TP_Custom_Request_Operation.h" +#include "tao/CSD_ThreadPool/CSD_TP_Request.h" +#include "tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h" #include "tao/PortableServer/Servant_Base.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -73,7 +73,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "CSD_TP_Custom_Request.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Custom_Request.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.cpp index 16ffe49d223..e2702b6c5a5 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.cpp @@ -1,13 +1,13 @@ // $Id$ -#include "CSD_TP_Custom_Request_Operation.h" +#include "tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h" ACE_RCSID (CSD_ThreadPool, TP_Custom_Request_Operation, "$Id$") #if !defined (__ACE_INLINE__) -# include "CSD_TP_Custom_Request_Operation.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl" #endif /* ! __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h index 42fcba277f5..e3b85853f9f 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "CSD_TP_Export.h" +#include "tao/CSD_ThreadPool/CSD_TP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -91,7 +91,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "CSD_TP_Custom_Request_Operation.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.cpp index 876cfd71c6b..287e516d7b4 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.cpp @@ -1,13 +1,13 @@ // $Id$ -#include "CSD_TP_Custom_Synch_Request.h" +#include "tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h" ACE_RCSID (CSD_ThreadPool, TP_Custom_Synch_Request, "$Id$") #if !defined (__ACE_INLINE__) -# include "CSD_TP_Custom_Synch_Request.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.inl" #endif /* ! __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h index 87c63df2318..02d66b20597 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h @@ -15,14 +15,14 @@ #include /**/ "ace/pre.h" -#include "CSD_TP_Export.h" +#include "tao/CSD_ThreadPool/CSD_TP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "CSD_TP_Custom_Request.h" -#include "CSD_TP_Synch_Helper.h" +#include "tao/CSD_ThreadPool/CSD_TP_Custom_Request.h" +#include "tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -84,7 +84,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "CSD_TP_Custom_Synch_Request.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.cpp index d74be701c28..aeb5454c252 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.cpp @@ -1,13 +1,13 @@ // $Id$ -#include "CSD_TP_Dispatchable_Visitor.h" +#include "tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h" ACE_RCSID (CSD_TP, Dispatchable_Visitor, "$Id$") #if !defined (__ACE_INLINE__) -# include "CSD_TP_Dispatchable_Visitor.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.inl" #endif /* ! __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h index b9e3d32c4a8..01aea59828a 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h @@ -15,14 +15,14 @@ #include /**/ "ace/pre.h" -#include "CSD_TP_Export.h" +#include "tao/CSD_ThreadPool/CSD_TP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "CSD_TP_Queue_Visitor.h" -#include "CSD_TP_Request.h" +#include "tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h" +#include "tao/CSD_ThreadPool/CSD_TP_Request.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -86,7 +86,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "CSD_TP_Dispatchable_Visitor.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.cpp index e01a6988ede..cb7b0ecf8e1 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.cpp @@ -1,15 +1,15 @@ // $Id$ -#include "CSD_TP_Queue.h" -#include "CSD_TP_Request.h" -#include "CSD_TP_Queue_Visitor.h" +#include "tao/CSD_ThreadPool/CSD_TP_Queue.h" +#include "tao/CSD_ThreadPool/CSD_TP_Request.h" +#include "tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h" ACE_RCSID (CSD_ThreadPool, TP_Queue, "$Id$") #if !defined (__ACE_INLINE__) -# include "CSD_TP_Queue.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Queue.inl" #endif /* ! __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.h index 2e31e613ceb..9912c0e613a 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "CSD_TP_Export.h" +#include "tao/CSD_ThreadPool/CSD_TP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -93,7 +93,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "CSD_TP_Queue.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Queue.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.cpp index 09adeff7561..3ede8818521 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.cpp @@ -1,13 +1,13 @@ // $Id$ -#include "CSD_TP_Queue_Visitor.h" +#include "tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h" ACE_RCSID (CSD_ThreadPool, TP_Queue_Visitor, "$Id$") #if !defined (__ACE_INLINE__) -# include "CSD_TP_Queue_Visitor.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.inl" #endif /* ! __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h index e7abb4fc16a..f86467ae64d 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "CSD_TP_Export.h" +#include "tao/CSD_ThreadPool/CSD_TP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -71,7 +71,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "CSD_TP_Queue_Visitor.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp index 0796ca68b72..45529af5802 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp @@ -1,13 +1,13 @@ // $Id$ -#include "CSD_TP_Remote_Request.h" +#include "tao/CSD_ThreadPool/CSD_TP_Remote_Request.h" ACE_RCSID (CSD_ThreadPool, TP_Remote_Request, "$Id$") #if !defined (__ACE_INLINE__) -# include "CSD_TP_Remote_Request.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Remote_Request.inl" #endif /* ! __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.h index 872001b8f7a..57303e81e91 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "CSD_TP_Export.h" +#include "tao/CSD_ThreadPool/CSD_TP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "CSD_TP_Corba_Request.h" +#include "tao/CSD_ThreadPool/CSD_TP_Corba_Request.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -94,7 +94,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "CSD_TP_Remote_Request.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Remote_Request.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.cpp index 68fb44886df..e1926f93e8b 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.cpp @@ -1,13 +1,13 @@ // $Id$ -#include "CSD_TP_Request.h" +#include "tao/CSD_ThreadPool/CSD_TP_Request.h" ACE_RCSID (CSD_ThreadPool, TP_Request, "$Id$") #if !defined (__ACE_INLINE__) -# include "CSD_TP_Request.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Request.inl" #endif /* ! __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h index 61e3166c599..104d741d3b9 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "CSD_TP_Export.h" +#include "tao/CSD_ThreadPool/CSD_TP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "CSD_TP_Servant_State.h" +#include "tao/CSD_ThreadPool/CSD_TP_Servant_State.h" #include "tao/PortableServer/Servant_Base.h" #include "tao/Intrusive_Ref_Count_Base_T.h" #include "tao/Intrusive_Ref_Count_Handle_T.h" @@ -128,7 +128,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "CSD_TP_Request.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Request.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.cpp index d658e32cd56..28fbc8da7ba 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.cpp @@ -1,13 +1,13 @@ // $Id$ -#include "CSD_TP_Servant_State.h" +#include "tao/CSD_ThreadPool/CSD_TP_Servant_State.h" ACE_RCSID (CSD_TP, Servant_State, "$Id$") #if !defined (__ACE_INLINE__) -# include "CSD_TP_Servant_State.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Servant_State.inl" #endif /* ! __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h index 4b86d0313a4..dbfebedb64c 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "CSD_TP_Export.h" +#include "tao/CSD_ThreadPool/CSD_TP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -84,7 +84,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "CSD_TP_Servant_State.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Servant_State.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.cpp index d6d34c6c6c2..846f3a6e723 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "CSD_TP_Servant_State_Map.h" +#include "tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h" ACE_RCSID (CSD_TP, Servant_State_Map, "$Id$") #if !defined (__ACE_INLINE__) -# include "CSD_TP_Servant_State_Map.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl" #endif /* ! __ACE_INLINE__ */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h index ce5d1a44832..e6726098b72 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "CSD_TP_Export.h" +#include "tao/CSD_ThreadPool/CSD_TP_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "CSD_TP_Servant_State.h" +#include "tao/CSD_ThreadPool/CSD_TP_Servant_State.h" #include "tao/PortableServer/PortableServer.h" #include "ace/Hash_Map_Manager.h" #include "ace/Synch.h" @@ -87,7 +87,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "CSD_TP_Servant_State_Map.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp index 9f33bbc5b4b..1a9c86ec8da 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "CSD_TP_Strategy.h" -#include "CSD_TP_Remote_Request.h" -#include "CSD_TP_Collocated_Synch_Request.h" -#include "CSD_TP_Collocated_Asynch_Request.h" -#include "CSD_TP_Custom_Synch_Request.h" -#include "CSD_TP_Custom_Asynch_Request.h" -#include "CSD_TP_Collocated_Synch_With_Server_Request.h" +#include "tao/CSD_ThreadPool/CSD_TP_Strategy.h" +#include "tao/CSD_ThreadPool/CSD_TP_Remote_Request.h" +#include "tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h" +#include "tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h" +#include "tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h" +#include "tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h" +#include "tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h" #include "ace/Trace.h" ACE_RCSID (CSD_ThreadPool, @@ -14,7 +14,7 @@ ACE_RCSID (CSD_ThreadPool, "$Id$") #if !defined (__ACE_INLINE__) -# include "CSD_TP_Strategy.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Strategy.inl" #endif /* ! __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h index f75dbedbc1a..fe249cb3e33 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h @@ -15,10 +15,10 @@ #include /**/ "ace/pre.h" -#include "CSD_TP_Export.h" +#include "tao/CSD_ThreadPool/CSD_TP_Export.h" -#include "CSD_TP_Task.h" -#include "CSD_TP_Servant_State_Map.h" +#include "tao/CSD_ThreadPool/CSD_TP_Task.h" +#include "tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -202,7 +202,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "CSD_TP_Strategy.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Strategy.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp index 86f2a07477f..71aa9aa9b8c 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "CSD_TP_Strategy_Factory.h" -#include "CSD_TP_Strategy.h" -#include "CSD_ThreadPool.h" +#include "tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.h" +#include "tao/CSD_ThreadPool/CSD_TP_Strategy.h" +#include "tao/CSD_ThreadPool/CSD_ThreadPool.h" #include "tao/CSD_Framework/CSD_Strategy_Repository.h" #include "tao/debug.h" #include "ace/Dynamic_Service.h" diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.h index b0035d40cd4..abc3da5b005 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "CSD_TP_Export.h" +#include "tao/CSD_ThreadPool/CSD_TP_Export.h" #include "tao/Versioned_Namespace.h" #include "ace/Service_Object.h" #include "ace/Service_Config.h" diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.cpp index b3b241ec8f8..79a0a195097 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "CSD_TP_Synch_Helper.h" +#include "tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h" ACE_RCSID (CSD_ThreadPool, TP_Synch_Helper, "$Id$") #if !defined (__ACE_INLINE__) -# include "CSD_TP_Synch_Helper.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl" #endif /* ! __ACE_INLINE__ */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h index 799a44961da..2056f1ab032 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "CSD_TP_Export.h" +#include "tao/CSD_ThreadPool/CSD_TP_Export.h" #include "tao/Condition.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -102,7 +102,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "CSD_TP_Synch_Helper.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp index 260c8cde811..c2411f80125 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp @@ -1,16 +1,16 @@ // $Id$ -#include "CSD_TP_Task.h" -#include "CSD_TP_Request.h" -#include "CSD_TP_Dispatchable_Visitor.h" -#include "CSD_TP_Cancel_Visitor.h" +#include "tao/CSD_ThreadPool/CSD_TP_Task.h" +#include "tao/CSD_ThreadPool/CSD_TP_Request.h" +#include "tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h" +#include "tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h" ACE_RCSID (CSD_ThreadPool, TP_Task, "$Id$") #if !defined (__ACE_INLINE__) -# include "CSD_TP_Task.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Task.inl" #endif /* ! __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h index b9fd7536a7b..c3192e58cf9 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h @@ -15,9 +15,9 @@ #include /**/ "ace/pre.h" -#include "CSD_TP_Export.h" +#include "tao/CSD_ThreadPool/CSD_TP_Export.h" -#include "CSD_TP_Queue.h" +#include "tao/CSD_ThreadPool/CSD_TP_Queue.h" #include "tao/PortableServer/PortableServer.h" #include "tao/Condition.h" @@ -154,7 +154,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "CSD_TP_Task.inl" +# include "tao/CSD_ThreadPool/CSD_TP_Task.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.cpp b/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.cpp index 0e757df159d..2ae022711f5 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "CSD_ThreadPool.h" -#include "CSD_TP_Strategy_Factory.h" +#include "tao/CSD_ThreadPool/CSD_ThreadPool.h" +#include "tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.h" #include "tao/CSD_Framework/CSD_Framework_Loader.h" #include "tao/debug.h" #include "ace/Dynamic_Service.h" diff --git a/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.h b/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.h index 173234d00b1..bb1bd448284 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.h +++ b/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "CSD_TP_Export.h" +#include "tao/CSD_ThreadPool/CSD_TP_Export.h" #include "tao/Versioned_Namespace.h" #include "ace/Service_Object.h" #include "ace/Service_Config.h" diff --git a/TAO/tao/CharSeqC.cpp b/TAO/tao/CharSeqC.cpp index 69b75db6242..dda2d2a7878 100644 --- a/TAO/tao/CharSeqC.cpp +++ b/TAO/tao/CharSeqC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "CharSeqC.h" +#include "tao/CharSeqC.h" #include "tao/CDR.h" // TAO_IDL - Generated from diff --git a/TAO/tao/Cleanup_Func_Registry.cpp b/TAO/tao/Cleanup_Func_Registry.cpp index d9f2b510c78..9b89b0f32d8 100644 --- a/TAO/tao/Cleanup_Func_Registry.cpp +++ b/TAO/tao/Cleanup_Func_Registry.cpp @@ -1,7 +1,7 @@ -#include "Cleanup_Func_Registry.h" +#include "tao/Cleanup_Func_Registry.h" #if !defined (__ACE_INLINE__) -# include "Cleanup_Func_Registry.inl" +# include "tao/Cleanup_Func_Registry.inl" #endif /* __ACE_INLINE__ */ #include "ace/Log_Msg.h" diff --git a/TAO/tao/Cleanup_Func_Registry.h b/TAO/tao/Cleanup_Func_Registry.h index 1f497887a41..cc2c6162c97 100644 --- a/TAO/tao/Cleanup_Func_Registry.h +++ b/TAO/tao/Cleanup_Func_Registry.h @@ -83,7 +83,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "Cleanup_Func_Registry.inl" +# include "tao/Cleanup_Func_Registry.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/ClientRequestInterceptor_Adapter.cpp b/TAO/tao/ClientRequestInterceptor_Adapter.cpp index 5788e639226..bf3d334201e 100644 --- a/TAO/tao/ClientRequestInterceptor_Adapter.cpp +++ b/TAO/tao/ClientRequestInterceptor_Adapter.cpp @@ -1,4 +1,4 @@ -#include "ClientRequestInterceptor_Adapter.h" +#include "tao/ClientRequestInterceptor_Adapter.h" ACE_RCSID (tao, ClientInterceptorAdapter, diff --git a/TAO/tao/ClientRequestInterceptor_Adapter.h b/TAO/tao/ClientRequestInterceptor_Adapter.h index 4e9220a98f7..0a5c83b8b94 100644 --- a/TAO/tao/ClientRequestInterceptor_Adapter.h +++ b/TAO/tao/ClientRequestInterceptor_Adapter.h @@ -20,7 +20,7 @@ #include /**/ "ace/pre.h" -#include "TAO_Export.h" +#include "tao/TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/ClientRequestInterceptor_Adapter_Factory.cpp b/TAO/tao/ClientRequestInterceptor_Adapter_Factory.cpp index 6dab162930d..ee3178eea83 100644 --- a/TAO/tao/ClientRequestInterceptor_Adapter_Factory.cpp +++ b/TAO/tao/ClientRequestInterceptor_Adapter_Factory.cpp @@ -1,4 +1,4 @@ -#include "ClientRequestInterceptor_Adapter_Factory.h" +#include "tao/ClientRequestInterceptor_Adapter_Factory.h" ACE_RCSID (tao, ClientRequestInterceptorAdapterFactory, diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp index ab295537c41..215bac88618 100644 --- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp +++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "CDR_Encaps_Codec.h" +#include "tao/CodecFactory/CDR_Encaps_Codec.h" #include "tao/CDR.h" #include "tao/OctetSeqC.h" diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.h b/TAO/tao/CodecFactory/CDR_Encaps_Codec.h index 34f530c9e4f..37672c1e4de 100644 --- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.h +++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "IOP_Codec_includeC.h" +#include "tao/CodecFactory/IOP_Codec_includeC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/CodecFactory/CodecFactory.cpp b/TAO/tao/CodecFactory/CodecFactory.cpp index ffc42bab5f4..f532539a4fd 100644 --- a/TAO/tao/CodecFactory/CodecFactory.cpp +++ b/TAO/tao/CodecFactory/CodecFactory.cpp @@ -8,8 +8,8 @@ */ // ================================================================= -#include "CodecFactory.h" -#include "CodecFactory_impl.h" +#include "tao/CodecFactory/CodecFactory.h" +#include "tao/CodecFactory/CodecFactory_impl.h" #include "tao/ORB.h" #include "tao/debug.h" diff --git a/TAO/tao/CodecFactory/CodecFactory.h b/TAO/tao/CodecFactory/CodecFactory.h index 627045e8844..230914bbbac 100644 --- a/TAO/tao/CodecFactory/CodecFactory.h +++ b/TAO/tao/CodecFactory/CodecFactory.h @@ -16,14 +16,14 @@ #include /**/ "ace/pre.h" -#include "codecfactory_export.h" +#include "tao/CodecFactory/codecfactory_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #define TAO_CODECFACTORY_SAFE_INCLUDE -#include "IOP_CodecC.h" +#include "tao/CodecFactory/IOP_CodecC.h" #undef TAO_CODECFACTORY_SAFE_INCLUDE #include "tao/Object_Loader.h" diff --git a/TAO/tao/CodecFactory/CodecFactory_impl.cpp b/TAO/tao/CodecFactory/CodecFactory_impl.cpp index e6f8aee023d..2b1462c9693 100644 --- a/TAO/tao/CodecFactory/CodecFactory_impl.cpp +++ b/TAO/tao/CodecFactory/CodecFactory_impl.cpp @@ -2,8 +2,8 @@ // // $Id$ -#include "CodecFactory_impl.h" -#include "CDR_Encaps_Codec.h" +#include "tao/CodecFactory/CodecFactory_impl.h" +#include "tao/CodecFactory/CDR_Encaps_Codec.h" #include "tao/SystemException.h" #include "tao/ORB_Constants.h" #include "tao/ORB_Core.h" diff --git a/TAO/tao/CodecFactory/CodecFactory_impl.h b/TAO/tao/CodecFactory/CodecFactory_impl.h index fd9660b2d75..ba0859f667b 100644 --- a/TAO/tao/CodecFactory/CodecFactory_impl.h +++ b/TAO/tao/CodecFactory/CodecFactory_impl.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "IOP_Codec_includeC.h" +#include "tao/CodecFactory/IOP_Codec_includeC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/CodecFactory/IOP_CodecC.cpp b/TAO/tao/CodecFactory/IOP_CodecC.cpp index 552e7be42a3..0445a72c755 100644 --- a/TAO/tao/CodecFactory/IOP_CodecC.cpp +++ b/TAO/tao/CodecFactory/IOP_CodecC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "CodecFactory.h" +#include "tao/CodecFactory/CodecFactory.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/Codeset/Codeset.cpp b/TAO/tao/Codeset/Codeset.cpp index b19441d037a..c946ad4c3b5 100644 --- a/TAO/tao/Codeset/Codeset.cpp +++ b/TAO/tao/Codeset/Codeset.cpp @@ -10,10 +10,10 @@ */ // ================================================================= -#include "Codeset.h" -#include "Codeset_Manager_Factory.h" -#include "UTF8_Latin1_Factory.h" -#include "UTF16_BOM_Factory.h" +#include "tao/Codeset/Codeset.h" +#include "tao/Codeset/Codeset_Manager_Factory.h" +#include "tao/Codeset/UTF8_Latin1_Factory.h" +#include "tao/Codeset/UTF16_BOM_Factory.h" #include "ace/Dynamic_Service.h" diff --git a/TAO/tao/Codeset/Codeset.h b/TAO/tao/Codeset/Codeset.h index c13934eddd1..73dc459283d 100644 --- a/TAO/tao/Codeset/Codeset.h +++ b/TAO/tao/Codeset/Codeset.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "codeset_export.h" +#include "tao/Codeset/codeset_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/Codeset/Codeset_Descriptor.cpp b/TAO/tao/Codeset/Codeset_Descriptor.cpp index 4d6f1a39510..89e687db0d4 100644 --- a/TAO/tao/Codeset/Codeset_Descriptor.cpp +++ b/TAO/tao/Codeset/Codeset_Descriptor.cpp @@ -17,8 +17,8 @@ // // ============================================================================ -#include "Codeset_Descriptor.h" -#include "Codeset_Translator_Factory.h" +#include "tao/Codeset/Codeset_Descriptor.h" +#include "tao/Codeset/Codeset_Translator_Factory.h" #include "ace/Codeset_Registry.h" #include "ace/Log_Msg.h" diff --git a/TAO/tao/Codeset/Codeset_Descriptor.h b/TAO/tao/Codeset/Codeset_Descriptor.h index cbfc3c2035b..a0a8b89363c 100644 --- a/TAO/tao/Codeset/Codeset_Descriptor.h +++ b/TAO/tao/Codeset/Codeset_Descriptor.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "codeset_export.h" +#include "tao/Codeset/codeset_export.h" #include "ace/CDR_Base.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/tao/Codeset/Codeset_Manager_Factory.cpp b/TAO/tao/Codeset/Codeset_Manager_Factory.cpp index bb9c9f2ffae..6becf8963c0 100644 --- a/TAO/tao/Codeset/Codeset_Manager_Factory.cpp +++ b/TAO/tao/Codeset/Codeset_Manager_Factory.cpp @@ -11,9 +11,9 @@ */ // ================================================================= -#include "Codeset_Manager_Factory.h" +#include "tao/Codeset/Codeset_Manager_Factory.h" #include "ace/Service_Config.h" -#include "Codeset_Manager_i.h" +#include "tao/Codeset/Codeset_Manager_i.h" ACE_RCSID (Codeset, Codeset_Manager_Factory, "$Id$") diff --git a/TAO/tao/Codeset/Codeset_Manager_Factory.h b/TAO/tao/Codeset/Codeset_Manager_Factory.h index 2645fe28c59..4651728556b 100644 --- a/TAO/tao/Codeset/Codeset_Manager_Factory.h +++ b/TAO/tao/Codeset/Codeset_Manager_Factory.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "codeset_export.h" +#include "tao/Codeset/codeset_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/Codeset/Codeset_Manager_i.cpp b/TAO/tao/Codeset/Codeset_Manager_i.cpp index 66be86c49de..25f8d360848 100644 --- a/TAO/tao/Codeset/Codeset_Manager_i.cpp +++ b/TAO/tao/Codeset/Codeset_Manager_i.cpp @@ -9,10 +9,10 @@ #include "tao/CDR.h" #include "tao/ORB_Core.h" -#include "Codeset_Descriptor.h" -#include "Codeset_Manager_i.h" -#include "Codeset_Translator_Factory.h" -#include "Codeset.h" +#include "tao/Codeset/Codeset_Descriptor.h" +#include "tao/Codeset/Codeset_Manager_i.h" +#include "tao/Codeset/Codeset_Translator_Factory.h" +#include "tao/Codeset/Codeset.h" #include "ace/Dynamic_Service.h" #include "ace/Codeset_Registry.h" diff --git a/TAO/tao/Codeset/Codeset_Manager_i.h b/TAO/tao/Codeset/Codeset_Manager_i.h index c5acc4d9280..f5ca8491ca3 100644 --- a/TAO/tao/Codeset/Codeset_Manager_i.h +++ b/TAO/tao/Codeset/Codeset_Manager_i.h @@ -25,8 +25,8 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Unbounded_Set.h" -#include "codeset_export.h" -#include "Codeset_Descriptor.h" +#include "tao/Codeset/codeset_export.h" +#include "tao/Codeset/Codeset_Descriptor.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory.cpp b/TAO/tao/Codeset/Codeset_Translator_Factory.cpp index b8494538472..bd3a915c51d 100644 --- a/TAO/tao/Codeset/Codeset_Translator_Factory.cpp +++ b/TAO/tao/Codeset/Codeset_Translator_Factory.cpp @@ -17,7 +17,7 @@ // // ============================================================================ -#include "Codeset_Translator_Factory.h" +#include "tao/Codeset/Codeset_Translator_Factory.h" #include "tao/CDR.h" ACE_RCSID (Codeset, diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory.h b/TAO/tao/Codeset/Codeset_Translator_Factory.h index 1440bccd9ca..518a168de63 100644 --- a/TAO/tao/Codeset/Codeset_Translator_Factory.h +++ b/TAO/tao/Codeset/Codeset_Translator_Factory.h @@ -22,7 +22,7 @@ #include "tao/CONV_FRAMEC.h" #include "tao/Codeset_Translator_Base.h" -#include "codeset_export.h" +#include "tao/Codeset/codeset_export.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp b/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp index 92afb536bb0..734417e9934 100644 --- a/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp +++ b/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp @@ -18,7 +18,7 @@ #ifndef TAO_CODESET_TRANSLATOR_FACTORY_T_CPP #define TAO_CODESET_TRANSLATOR_FACTORY_T_CPP -#include "Codeset_Translator_Factory_T.h" +#include "tao/Codeset/Codeset_Translator_Factory_T.h" #include "tao/debug.h" #include "tao/CDR.h" diff --git a/TAO/tao/Codeset/Codeset_Translator_Factory_T.h b/TAO/tao/Codeset/Codeset_Translator_Factory_T.h index 1548fbf8b8d..ce5a902c7fe 100644 --- a/TAO/tao/Codeset/Codeset_Translator_Factory_T.h +++ b/TAO/tao/Codeset/Codeset_Translator_Factory_T.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "Codeset_Translator_Factory.h" +#include "tao/Codeset/Codeset_Translator_Factory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -74,7 +74,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_LACKS_PRAGMA_ONCE */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Codeset_Translator_Factory_T.cpp" +#include "tao/Codeset/Codeset_Translator_Factory_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/tao/Codeset/UTF16_BOM_Factory.cpp b/TAO/tao/Codeset/UTF16_BOM_Factory.cpp index 72fae8e36bd..1140d84a6bb 100644 --- a/TAO/tao/Codeset/UTF16_BOM_Factory.cpp +++ b/TAO/tao/Codeset/UTF16_BOM_Factory.cpp @@ -18,7 +18,7 @@ // ============================================================================ #include "tao/debug.h" -#include "UTF16_BOM_Factory.h" +#include "tao/Codeset/UTF16_BOM_Factory.h" #include "ace/OS_NS_strings.h" #include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" diff --git a/TAO/tao/Codeset/UTF16_BOM_Factory.h b/TAO/tao/Codeset/UTF16_BOM_Factory.h index bebd2c322cc..a72652a7458 100644 --- a/TAO/tao/Codeset/UTF16_BOM_Factory.h +++ b/TAO/tao/Codeset/UTF16_BOM_Factory.h @@ -22,10 +22,10 @@ #include /**/ "ace/pre.h" #include "ace/Service_Config.h" -#include "Codeset_Translator_Factory.h" +#include "tao/Codeset/Codeset_Translator_Factory.h" -#include "UTF16_BOM_Translator.h" -#include "codeset_export.h" +#include "tao/Codeset/UTF16_BOM_Translator.h" +#include "tao/Codeset/codeset_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Codeset/UTF16_BOM_Translator.cpp b/TAO/tao/Codeset/UTF16_BOM_Translator.cpp index 357e9f8b97f..6f54540faf2 100644 --- a/TAO/tao/Codeset/UTF16_BOM_Translator.cpp +++ b/TAO/tao/Codeset/UTF16_BOM_Translator.cpp @@ -12,7 +12,7 @@ // // ============================================================================ -#include "UTF16_BOM_Translator.h" +#include "tao/Codeset/UTF16_BOM_Translator.h" #include "ace/OS_Memory.h" #include "tao/debug.h" #include "ace/Log_Msg.h" diff --git a/TAO/tao/Codeset/UTF16_BOM_Translator.h b/TAO/tao/Codeset/UTF16_BOM_Translator.h index e0f5dd7846a..6dbe046621d 100644 --- a/TAO/tao/Codeset/UTF16_BOM_Translator.h +++ b/TAO/tao/Codeset/UTF16_BOM_Translator.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "codeset_export.h" +#include "tao/Codeset/codeset_export.h" #include "tao/Versioned_Namespace.h" #include "ace/CDR_Stream.h" diff --git a/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp b/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp index 36acbe9ba16..2298e093c7d 100644 --- a/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp +++ b/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp @@ -2,7 +2,7 @@ #include "tao/debug.h" #include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" -#include "UTF8_Latin1_Factory.h" +#include "tao/Codeset/UTF8_Latin1_Factory.h" ACE_STATIC_SVC_DEFINE (TAO_UTF8_Latin1_Factory, ACE_TEXT ("UTF8_Latin1_Factory"), diff --git a/TAO/tao/Codeset/UTF8_Latin1_Factory.h b/TAO/tao/Codeset/UTF8_Latin1_Factory.h index 68c0e78b4c7..292333ad7e0 100644 --- a/TAO/tao/Codeset/UTF8_Latin1_Factory.h +++ b/TAO/tao/Codeset/UTF8_Latin1_Factory.h @@ -5,11 +5,11 @@ #define UTF8_LATIN1_FACTORY_H #include /**/ "ace/pre.h" -#include "codeset_export.h" +#include "tao/Codeset/codeset_export.h" #include "ace/Service_Config.h" -#include "Codeset_Translator_Factory.h" +#include "tao/Codeset/Codeset_Translator_Factory.h" -#include "UTF8_Latin1_Translator.h" +#include "tao/Codeset/UTF8_Latin1_Translator.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp b/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp index 619e9c1b92f..204a1dc0bd6 100644 --- a/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp +++ b/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp @@ -17,7 +17,7 @@ // Phil Mesnier <mesnier_p@ociweb.com> // // ============================================================================ -#include "UTF8_Latin1_Translator.h" +#include "tao/Codeset/UTF8_Latin1_Translator.h" #include "tao/debug.h" #include "ace/OS_Memory.h" diff --git a/TAO/tao/Codeset/UTF8_Latin1_Translator.h b/TAO/tao/Codeset/UTF8_Latin1_Translator.h index 6fc741a1c4e..791ea994d43 100644 --- a/TAO/tao/Codeset/UTF8_Latin1_Translator.h +++ b/TAO/tao/Codeset/UTF8_Latin1_Translator.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "codeset_export.h" +#include "tao/Codeset/codeset_export.h" #include "tao/Versioned_Namespace.h" #include "ace/CDR_Stream.h" diff --git a/TAO/tao/Codeset_Manager.cpp b/TAO/tao/Codeset_Manager.cpp index 99e61a67509..0402bfc6aea 100644 --- a/TAO/tao/Codeset_Manager.cpp +++ b/TAO/tao/Codeset_Manager.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "Codeset_Manager.h" -#include "Codeset_Descriptor_Base.h" +#include "tao/Codeset_Manager.h" +#include "tao/Codeset_Descriptor_Base.h" ACE_RCSID (tao, Codeset_Manager, diff --git a/TAO/tao/Codeset_Manager_Factory_Base.cpp b/TAO/tao/Codeset_Manager_Factory_Base.cpp index 588bdcc2037..c7361b99079 100644 --- a/TAO/tao/Codeset_Manager_Factory_Base.cpp +++ b/TAO/tao/Codeset_Manager_Factory_Base.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "ORB_Core.h" -#include "Codeset_Manager.h" -#include "Codeset_Manager_Factory_Base.h" +#include "tao/ORB_Core.h" +#include "tao/Codeset_Manager.h" +#include "tao/Codeset_Manager_Factory_Base.h" ACE_RCSID (tao, Codeset_Manager_Factory_Base, diff --git a/TAO/tao/Codeset_Translator_Base.cpp b/TAO/tao/Codeset_Translator_Base.cpp index bb4691a33d2..e72a02359f3 100644 --- a/TAO/tao/Codeset_Translator_Base.cpp +++ b/TAO/tao/Codeset_Translator_Base.cpp @@ -17,7 +17,7 @@ // // ===================================================================== -#include "Codeset_Translator_Base.h" +#include "tao/Codeset_Translator_Base.h" ACE_RCSID (tao, Codeset_Translator_Base, diff --git a/TAO/tao/Collocated_Invocation.cpp b/TAO/tao/Collocated_Invocation.cpp index 50f030251c2..6bb999a0a4a 100644 --- a/TAO/tao/Collocated_Invocation.cpp +++ b/TAO/tao/Collocated_Invocation.cpp @@ -1,13 +1,13 @@ -#include "Collocated_Invocation.h" -#include "Collocation_Proxy_Broker.h" -#include "ORB_Core.h" -#include "Request_Dispatcher.h" -#include "TAO_Server_Request.h" -#include "Stub.h" -#include "operation_details.h" +#include "tao/Collocated_Invocation.h" +#include "tao/Collocation_Proxy_Broker.h" +#include "tao/ORB_Core.h" +#include "tao/Request_Dispatcher.h" +#include "tao/TAO_Server_Request.h" +#include "tao/Stub.h" +#include "tao/operation_details.h" #if TAO_HAS_INTERCEPTORS == 1 -# include "PortableInterceptorC.h" +# include "tao/PortableInterceptorC.h" #endif /*TAO_HAS_INTERCEPTORS */ ACE_RCSID (tao, diff --git a/TAO/tao/Collocation_Proxy_Broker.cpp b/TAO/tao/Collocation_Proxy_Broker.cpp index e9a228532b4..e2c0653139f 100644 --- a/TAO/tao/Collocation_Proxy_Broker.cpp +++ b/TAO/tao/Collocation_Proxy_Broker.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Collocation_Proxy_Broker.h" +#include "tao/Collocation_Proxy_Broker.h" ACE_RCSID (tao, diff --git a/TAO/tao/Condition.cpp b/TAO/tao/Condition.cpp index 454880a3049..06e17912045 100644 --- a/TAO/tao/Condition.cpp +++ b/TAO/tao/Condition.cpp @@ -2,7 +2,7 @@ #ifndef TAO_CONDITION_CPP #define TAO_CONDITION_CPP -#include "Condition.h" +#include "tao/Condition.h" #include "ace/Log_Msg.h" #if !defined (__ACE_INLINE__) diff --git a/TAO/tao/Condition.h b/TAO/tao/Condition.h index 2d5afdbfc9b..5a1d1bada70 100644 --- a/TAO/tao/Condition.h +++ b/TAO/tao/Condition.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "orbconf.h" +#include "tao/orbconf.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -112,11 +112,11 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Condition.inl" +#include "tao/Condition.inl" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Condition.cpp" +#include "tao/Condition.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/tao/Connect_Strategy.cpp b/TAO/tao/Connect_Strategy.cpp index a60ae9b4d08..2299f775d46 100644 --- a/TAO/tao/Connect_Strategy.cpp +++ b/TAO/tao/Connect_Strategy.cpp @@ -1,4 +1,4 @@ -#include "Connect_Strategy.h" +#include "tao/Connect_Strategy.h" ACE_RCSID (tao, Connect_Strategy, diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp index 42094e4ccf9..0b190b16c95 100644 --- a/TAO/tao/Connection_Handler.cpp +++ b/TAO/tao/Connection_Handler.cpp @@ -1,11 +1,11 @@ //$Id$ -#include "Connection_Handler.h" -#include "ORB_Core.h" -#include "debug.h" -#include "Resume_Handle.h" -#include "Transport.h" -#include "Wait_Strategy.h" +#include "tao/Connection_Handler.h" +#include "tao/ORB_Core.h" +#include "tao/debug.h" +#include "tao/Resume_Handle.h" +#include "tao/Transport.h" +#include "tao/Wait_Strategy.h" #include "ace/SOCK.h" #include "ace/Reactor.h" diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp index 7fa060482db..561ad8d1cd1 100644 --- a/TAO/tao/CurrentC.cpp +++ b/TAO/tao/CurrentC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:288 -#include "CurrentC.h" +#include "tao/CurrentC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/DLL_Parser.cpp b/TAO/tao/DLL_Parser.cpp index ed69ac6de33..753ae4496d7 100644 --- a/TAO/tao/DLL_Parser.cpp +++ b/TAO/tao/DLL_Parser.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "DLL_Parser.h" -#include "Object_Loader.h" -#include "Object.h" -#include "Environment.h" -#include "ORB_Constants.h" -#include "SystemException.h" +#include "tao/DLL_Parser.h" +#include "tao/Object_Loader.h" +#include "tao/Object.h" +#include "tao/Environment.h" +#include "tao/ORB_Constants.h" +#include "tao/SystemException.h" #include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" diff --git a/TAO/tao/Default_Protocols_Hooks.cpp b/TAO/tao/Default_Protocols_Hooks.cpp index 4da1ad84a01..a06a1307aba 100644 --- a/TAO/tao/Default_Protocols_Hooks.cpp +++ b/TAO/tao/Default_Protocols_Hooks.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Default_Protocols_Hooks.h" +#include "tao/Default_Protocols_Hooks.h" #include "ace/Log_Msg.h" ACE_RCSID (tao, diff --git a/TAO/tao/Default_Stub_Factory.cpp b/TAO/tao/Default_Stub_Factory.cpp index 9ce338efb56..180a81b60e4 100644 --- a/TAO/tao/Default_Stub_Factory.cpp +++ b/TAO/tao/Default_Stub_Factory.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "Default_Stub_Factory.h" -#include "Stub.h" -#include "ORB_Constants.h" -#include "SystemException.h" +#include "tao/Default_Stub_Factory.h" +#include "tao/Stub.h" +#include "tao/ORB_Constants.h" +#include "tao/SystemException.h" #include "ace/Log_Msg.h" diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp index d6c21e23ef2..4aecd1c6583 100644 --- a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp +++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "Default_Thread_Lane_Resources_Manager.h" -#include "Thread_Lane_Resources.h" -#include "Exception.h" -#include "Environment.h" -#include "ORB_Core.h" +#include "tao/Default_Thread_Lane_Resources_Manager.h" +#include "tao/Thread_Lane_Resources.h" +#include "tao/Exception.h" +#include "tao/Environment.h" +#include "tao/ORB_Core.h" #include "ace/Log_Msg.h" diff --git a/TAO/tao/Domain/DomainS.cpp b/TAO/tao/Domain/DomainS.cpp index ca00470e5e8..b17f2e46588 100644 --- a/TAO/tao/Domain/DomainS.cpp +++ b/TAO/tao/Domain/DomainS.cpp @@ -33,7 +33,7 @@ #define _TAO_IDL_ORIG_DOMAINS_CPP_ -#include "DomainS.h" +#include "tao/Domain/DomainS.h" #include "tao/PortableServer/Operation_Table_Perfect_Hash.h" #include "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h" #include "tao/PortableServer/Upcall_Command.h" @@ -69,7 +69,7 @@ #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) -#include "DomainS.inl" +#include "tao/Domain/DomainS.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from diff --git a/TAO/tao/Domain/DomainS.h b/TAO/tao/Domain/DomainS.h index 8aef6169380..0983a05f4fd 100644 --- a/TAO/tao/Domain/DomainS.h +++ b/TAO/tao/Domain/DomainS.h @@ -54,7 +54,7 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -#include "domain_export.h" +#include "tao/Domain/domain_export.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -485,10 +485,10 @@ namespace POA_CORBA TAO_END_VERSIONED_NAMESPACE_DECL -#include "DomainS_T.h" +#include "tao/Domain/DomainS_T.h" #if defined (__ACE_INLINE__) -#include "DomainS.inl" +#include "tao/Domain/DomainS.inl" #endif /* defined INLINE */ #if defined(_MSC_VER) diff --git a/TAO/tao/Domain/DomainS_T.cpp b/TAO/tao/Domain/DomainS_T.cpp index 951f03175c1..1cf3d0d6643 100644 --- a/TAO/tao/Domain/DomainS_T.cpp +++ b/TAO/tao/Domain/DomainS_T.cpp @@ -31,10 +31,10 @@ #ifndef _TAO_IDL_ORIG_DOMAINS_T_CPP_ #define _TAO_IDL_ORIG_DOMAINS_T_CPP_ -#include "DomainS_T.h" +#include "tao/Domain/DomainS_T.h" #if !defined (__ACE_INLINE__) -#include "DomainS_T.inl" +#include "tao/Domain/DomainS_T.inl" #endif /* !defined INLINE */ diff --git a/TAO/tao/Domain/DomainS_T.h b/TAO/tao/Domain/DomainS_T.h index d4660ac1e44..253698af938 100644 --- a/TAO/tao/Domain/DomainS_T.h +++ b/TAO/tao/Domain/DomainS_T.h @@ -206,11 +206,11 @@ namespace POA_CORBA TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "DomainS_T.inl" +#include "tao/Domain/DomainS_T.inl" #endif /* defined INLINE */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "DomainS_T.cpp" +#include "tao/Domain/DomainS_T.cpp" #endif /* defined REQUIRED SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp index d28bb2b7f00..2b7a87fb286 100644 --- a/TAO/tao/DomainC.cpp +++ b/TAO/tao/DomainC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "DomainC.h" +#include "tao/DomainC.h" #include "tao/CDR.h" #include "tao/Invocation_Adapter.h" #include "tao/Object_T.h" @@ -48,7 +48,7 @@ #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) -#include "DomainC.inl" +#include "tao/DomainC.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h index f09fd9758c1..a45d7c4d805 100644 --- a/TAO/tao/DomainC.h +++ b/TAO/tao/DomainC.h @@ -483,7 +483,7 @@ TAO_Export CORBA::Boolean operator>> ( TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "DomainC.inl" +#include "tao/DomainC.inl" #endif /* defined INLINE */ #if defined(_MSC_VER) diff --git a/TAO/tao/DoubleSeqC.cpp b/TAO/tao/DoubleSeqC.cpp index a41b7664f0f..36f7fbb7cc5 100644 --- a/TAO/tao/DoubleSeqC.cpp +++ b/TAO/tao/DoubleSeqC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "DoubleSeqC.h" +#include "tao/DoubleSeqC.h" #include "tao/CDR.h" // TAO_IDL - Generated from diff --git a/TAO/tao/DynamicAny/DynAnyFactory.cpp b/TAO/tao/DynamicAny/DynAnyFactory.cpp index 6030bc71242..8f6c231ac2a 100644 --- a/TAO/tao/DynamicAny/DynAnyFactory.cpp +++ b/TAO/tao/DynamicAny/DynAnyFactory.cpp @@ -9,14 +9,14 @@ //============================================================================= -#include "DynAnyFactory.h" - -#include "DynAny_i.h" -#include "DynStruct_i.h" -#include "DynSequence_i.h" -#include "DynEnum_i.h" -#include "DynArray_i.h" -#include "DynUnion_i.h" +#include "tao/DynamicAny/DynAnyFactory.h" + +#include "tao/DynamicAny/DynAny_i.h" +#include "tao/DynamicAny/DynStruct_i.h" +#include "tao/DynamicAny/DynSequence_i.h" +#include "tao/DynamicAny/DynEnum_i.h" +#include "tao/DynamicAny/DynArray_i.h" +#include "tao/DynamicAny/DynUnion_i.h" #include "ace/Auto_Ptr.h" diff --git a/TAO/tao/DynamicAny/DynAnyFactory.h b/TAO/tao/DynamicAny/DynAnyFactory.h index 1afe1bfd236..f37cda716b8 100644 --- a/TAO/tao/DynamicAny/DynAnyFactory.h +++ b/TAO/tao/DynamicAny/DynAnyFactory.h @@ -17,7 +17,7 @@ #define TAO_DYNANYFACTORY_H #include /**/ "ace/pre.h" -#include "DynamicAny.h" +#include "tao/DynamicAny/DynamicAny.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp index 5f3ac34890e..796cc529bd3 100644 --- a/TAO/tao/DynamicAny/DynAny_i.cpp +++ b/TAO/tao/DynamicAny/DynAny_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "DynAny_i.h" -#include "DynAnyFactory.h" +#include "tao/DynamicAny/DynAny_i.h" +#include "tao/DynamicAny/DynAnyFactory.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" #include "tao/CDR.h" #include "ace/OS_NS_wchar.h" diff --git a/TAO/tao/DynamicAny/DynAny_i.h b/TAO/tao/DynamicAny/DynAny_i.h index bb53397cd53..89c96f90350 100644 --- a/TAO/tao/DynamicAny/DynAny_i.h +++ b/TAO/tao/DynamicAny/DynAny_i.h @@ -17,13 +17,13 @@ #define TAO_DYNANY_I_H #include /**/ "ace/pre.h" -#include "DynamicAny.h" +#include "tao/DynamicAny/DynamicAny.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "DynCommon.h" +#include "tao/DynamicAny/DynCommon.h" #include "tao/LocalObject.h" #if defined (_MSC_VER) diff --git a/TAO/tao/DynamicAny/DynArray_i.cpp b/TAO/tao/DynamicAny/DynArray_i.cpp index e40f59b7940..d45269d130e 100644 --- a/TAO/tao/DynamicAny/DynArray_i.cpp +++ b/TAO/tao/DynamicAny/DynArray_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "DynArray_i.h" -#include "DynAnyFactory.h" +#include "tao/DynamicAny/DynArray_i.h" +#include "tao/DynamicAny/DynAnyFactory.h" #include "tao/AnyTypeCode/Marshal.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" #include "tao/CDR.h" diff --git a/TAO/tao/DynamicAny/DynArray_i.h b/TAO/tao/DynamicAny/DynArray_i.h index 70bb46375dd..8e28d989cae 100644 --- a/TAO/tao/DynamicAny/DynArray_i.h +++ b/TAO/tao/DynamicAny/DynArray_i.h @@ -17,13 +17,13 @@ #define TAO_DYNARRAY_I_H #include /**/ "ace/pre.h" -#include "DynamicAny.h" +#include "tao/DynamicAny/DynamicAny.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "DynCommon.h" +#include "tao/DynamicAny/DynCommon.h" #include "tao/LocalObject.h" #include "ace/Containers.h" diff --git a/TAO/tao/DynamicAny/DynCommon.cpp b/TAO/tao/DynamicAny/DynCommon.cpp index 7f6384cd0e2..b4f5f05dfb5 100644 --- a/TAO/tao/DynamicAny/DynCommon.cpp +++ b/TAO/tao/DynamicAny/DynCommon.cpp @@ -1,13 +1,13 @@ // $Id$ -#include "DynCommon.h" -#include "DynAnyFactory.h" -#include "DynAny_i.h" -#include "DynArray_i.h" -#include "DynEnum_i.h" -#include "DynSequence_i.h" -#include "DynStruct_i.h" -#include "DynUnion_i.h" +#include "tao/DynamicAny/DynCommon.h" +#include "tao/DynamicAny/DynAnyFactory.h" +#include "tao/DynamicAny/DynAny_i.h" +#include "tao/DynamicAny/DynArray_i.h" +#include "tao/DynamicAny/DynEnum_i.h" +#include "tao/DynamicAny/DynSequence_i.h" +#include "tao/DynamicAny/DynStruct_i.h" +#include "tao/DynamicAny/DynUnion_i.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" #include "tao/CDR.h" #include "ace/OS_NS_wchar.h" diff --git a/TAO/tao/DynamicAny/DynCommon.h b/TAO/tao/DynamicAny/DynCommon.h index 4096e3c4457..dccc16e617a 100644 --- a/TAO/tao/DynamicAny/DynCommon.h +++ b/TAO/tao/DynamicAny/DynCommon.h @@ -15,7 +15,7 @@ #define TAO_DYNCOMMON_H #include /**/ "ace/pre.h" -#include "DynamicAny.h" +#include "tao/DynamicAny/DynamicAny.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/DynamicAny/DynEnum_i.cpp b/TAO/tao/DynamicAny/DynEnum_i.cpp index c11c344f9d8..d575d5e911a 100644 --- a/TAO/tao/DynamicAny/DynEnum_i.cpp +++ b/TAO/tao/DynamicAny/DynEnum_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "DynEnum_i.h" -#include "DynAnyFactory.h" +#include "tao/DynamicAny/DynEnum_i.h" +#include "tao/DynamicAny/DynAnyFactory.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" #include "tao/CDR.h" diff --git a/TAO/tao/DynamicAny/DynEnum_i.h b/TAO/tao/DynamicAny/DynEnum_i.h index 7b0cdea8892..6732653721e 100644 --- a/TAO/tao/DynamicAny/DynEnum_i.h +++ b/TAO/tao/DynamicAny/DynEnum_i.h @@ -17,13 +17,13 @@ #define TAO_DYNENUM_I_H #include /**/ "ace/pre.h" -#include "DynamicAny.h" +#include "tao/DynamicAny/DynamicAny.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "DynCommon.h" +#include "tao/DynamicAny/DynCommon.h" #include "tao/LocalObject.h" #include "ace/Containers.h" diff --git a/TAO/tao/DynamicAny/DynSequence_i.cpp b/TAO/tao/DynamicAny/DynSequence_i.cpp index 19471656ecd..1394204164e 100644 --- a/TAO/tao/DynamicAny/DynSequence_i.cpp +++ b/TAO/tao/DynamicAny/DynSequence_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "DynSequence_i.h" -#include "DynAnyFactory.h" +#include "tao/DynamicAny/DynSequence_i.h" +#include "tao/DynamicAny/DynAnyFactory.h" #include "tao/AnyTypeCode/Marshal.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" #include "tao/CDR.h" diff --git a/TAO/tao/DynamicAny/DynSequence_i.h b/TAO/tao/DynamicAny/DynSequence_i.h index e3f52c95cce..e9763e95e5f 100644 --- a/TAO/tao/DynamicAny/DynSequence_i.h +++ b/TAO/tao/DynamicAny/DynSequence_i.h @@ -17,13 +17,13 @@ #define TAO_DYNSEQUENCE_I_H #include /**/ "ace/pre.h" -#include "DynamicAny.h" +#include "tao/DynamicAny/DynamicAny.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "DynCommon.h" +#include "tao/DynamicAny/DynCommon.h" #include "tao/LocalObject.h" #include "ace/Containers.h" diff --git a/TAO/tao/DynamicAny/DynStruct_i.cpp b/TAO/tao/DynamicAny/DynStruct_i.cpp index e84a8140d31..5073f7796e6 100644 --- a/TAO/tao/DynamicAny/DynStruct_i.cpp +++ b/TAO/tao/DynamicAny/DynStruct_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "DynStruct_i.h" -#include "DynAnyFactory.h" +#include "tao/DynamicAny/DynStruct_i.h" +#include "tao/DynamicAny/DynAnyFactory.h" #include "tao/AnyTypeCode/Marshal.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" #include "tao/CDR.h" diff --git a/TAO/tao/DynamicAny/DynStruct_i.h b/TAO/tao/DynamicAny/DynStruct_i.h index d90d3213671..62e9ecf7e1f 100644 --- a/TAO/tao/DynamicAny/DynStruct_i.h +++ b/TAO/tao/DynamicAny/DynStruct_i.h @@ -17,13 +17,13 @@ #define TAO_DYNSTRUCT_I_H #include /**/ "ace/pre.h" -#include "DynamicAny.h" +#include "tao/DynamicAny/DynamicAny.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "DynCommon.h" +#include "tao/DynamicAny/DynCommon.h" #include "tao/LocalObject.h" #include "ace/Containers.h" diff --git a/TAO/tao/DynamicAny/DynUnion_i.cpp b/TAO/tao/DynamicAny/DynUnion_i.cpp index aeefb5c4273..60745e23849 100644 --- a/TAO/tao/DynamicAny/DynUnion_i.cpp +++ b/TAO/tao/DynamicAny/DynUnion_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "DynUnion_i.h" -#include "DynAnyFactory.h" +#include "tao/DynamicAny/DynUnion_i.h" +#include "tao/DynamicAny/DynAnyFactory.h" #include "tao/AnyTypeCode/Marshal.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" #include "tao/CDR.h" diff --git a/TAO/tao/DynamicAny/DynUnion_i.h b/TAO/tao/DynamicAny/DynUnion_i.h index a7d800d61ee..c7aa9c1377e 100644 --- a/TAO/tao/DynamicAny/DynUnion_i.h +++ b/TAO/tao/DynamicAny/DynUnion_i.h @@ -17,13 +17,13 @@ #define TAO_DYNUNION_I_H #include /**/ "ace/pre.h" -#include "DynamicAny.h" +#include "tao/DynamicAny/DynamicAny.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "DynCommon.h" +#include "tao/DynamicAny/DynCommon.h" #include "tao/LocalObject.h" #if defined (_MSC_VER) diff --git a/TAO/tao/DynamicAny/DynamicAny.cpp b/TAO/tao/DynamicAny/DynamicAny.cpp index cb52a4aa968..2bf234a3a27 100644 --- a/TAO/tao/DynamicAny/DynamicAny.cpp +++ b/TAO/tao/DynamicAny/DynamicAny.cpp @@ -9,8 +9,8 @@ //============================================================================= -#include "DynamicAny.h" -#include "DynAnyFactory.h" +#include "tao/DynamicAny/DynamicAny.h" +#include "tao/DynamicAny/DynAnyFactory.h" ACE_RCSID(DynamicAny, DynamicAny, "$Id$") diff --git a/TAO/tao/DynamicAny/DynamicAny.h b/TAO/tao/DynamicAny/DynamicAny.h index aa641816e4f..652f52939f9 100644 --- a/TAO/tao/DynamicAny/DynamicAny.h +++ b/TAO/tao/DynamicAny/DynamicAny.h @@ -15,10 +15,10 @@ #define TAO_DYNAMICANY_H #include /**/ "ace/pre.h" -#include "dynamicany_export.h" +#include "tao/DynamicAny/dynamicany_export.h" #define TAO_DYNAMICANY_SAFE_INCLUDE -#include "DynamicAnyC.h" +#include "tao/DynamicAny/DynamicAnyC.h" #undef TAO_DYNAMICANY_SAFE_INCLUDE #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/tao/DynamicAny/DynamicAnyC.cpp b/TAO/tao/DynamicAny/DynamicAnyC.cpp index 98ce898fd22..0ddb61243f5 100644 --- a/TAO/tao/DynamicAny/DynamicAnyC.cpp +++ b/TAO/tao/DynamicAny/DynamicAnyC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "DynamicAny.h" +#include "tao/DynamicAny/DynamicAny.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/DynamicAny/DynamicAnyC.h b/TAO/tao/DynamicAny/DynamicAnyC.h index da68eeab800..4aebbe120c5 100644 --- a/TAO/tao/DynamicAny/DynamicAnyC.h +++ b/TAO/tao/DynamicAny/DynamicAnyC.h @@ -44,7 +44,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "dynamicany_export.h" +#include "tao/DynamicAny/dynamicany_export.h" #include "tao/AnyTypeCode/TypeCode.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Any.h" diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp index 3bdd818e652..3edab19588b 100644 --- a/TAO/tao/DynamicInterface/Context.cpp +++ b/TAO/tao/DynamicInterface/Context.cpp @@ -1,4 +1,4 @@ -#include "Context.h" +#include "tao/DynamicInterface/Context.h" ACE_RCSID (DynamicInterface, Context, @@ -12,7 +12,7 @@ ACE_RCSID (DynamicInterface, #include "ace/Guard_T.h" #if !defined (__ACE_INLINE__) -# include "Context.inl" +# include "tao/DynamicInterface/Context.inl" #endif /* ! __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/Context.h b/TAO/tao/DynamicInterface/Context.h index 94d79182490..9f58f19cb4b 100644 --- a/TAO/tao/DynamicInterface/Context.h +++ b/TAO/tao/DynamicInterface/Context.h @@ -19,13 +19,13 @@ #include /**/ "ace/pre.h" -#include "dynamicinterface_export.h" +#include "tao/DynamicInterface/dynamicinterface_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "DII_CORBA_methods.h" +#include "tao/DynamicInterface/DII_CORBA_methods.h" #include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/Pseudo_VarOut_T.h" @@ -199,7 +199,7 @@ namespace CORBA TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "Context.inl" +# include "tao/DynamicInterface/Context.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/DynamicInterface/DII_Arguments.cpp b/TAO/tao/DynamicInterface/DII_Arguments.cpp index 9cb6e6609c9..d72c4f43420 100644 --- a/TAO/tao/DynamicInterface/DII_Arguments.cpp +++ b/TAO/tao/DynamicInterface/DII_Arguments.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "DII_Arguments.h" +#include "tao/DynamicInterface/DII_Arguments.h" #include "tao/AnyTypeCode/NVList.h" #include "tao/AnyTypeCode/Any_Impl.h" @@ -14,7 +14,7 @@ ACE_RCSID (DynamicInterface, "$Id$") #if !defined (__ACE_INLINE__) -# include "DII_Arguments.inl" +# include "tao/DynamicInterface/DII_Arguments.inl" #endif /* ! __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/DII_Arguments.h b/TAO/tao/DynamicInterface/DII_Arguments.h index e56bab475ee..6f362d7a099 100644 --- a/TAO/tao/DynamicInterface/DII_Arguments.h +++ b/TAO/tao/DynamicInterface/DII_Arguments.h @@ -91,7 +91,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "DII_Arguments.inl" +# include "tao/DynamicInterface/DII_Arguments.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/DynamicInterface/DII_Invocation.cpp b/TAO/tao/DynamicInterface/DII_Invocation.cpp index 6d64acc8b43..6a75d25ad6a 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation.cpp +++ b/TAO/tao/DynamicInterface/DII_Invocation.cpp @@ -3,12 +3,12 @@ #include "tao/AnyTypeCode/DynamicC.h" #include "tao/AnyTypeCode/TypeCode.h" -#include "DII_Invocation.h" -#include "Unknown_User_Exception.h" -#include "DII_Arguments.h" -#include "ExceptionList.h" -#include "Request.h" -#include "DII_Reply_Dispatcher.h" +#include "tao/DynamicInterface/DII_Invocation.h" +#include "tao/DynamicInterface/Unknown_User_Exception.h" +#include "tao/DynamicInterface/DII_Arguments.h" +#include "tao/DynamicInterface/ExceptionList.h" +#include "tao/DynamicInterface/Request.h" +#include "tao/DynamicInterface/DII_Reply_Dispatcher.h" #include "tao/operation_details.h" #include "tao/Invocation_Utils.h" diff --git a/TAO/tao/DynamicInterface/DII_Invocation.h b/TAO/tao/DynamicInterface/DII_Invocation.h index 04b63d9abb3..ba3a5a6be66 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation.h +++ b/TAO/tao/DynamicInterface/DII_Invocation.h @@ -19,7 +19,7 @@ #include /**/ "ace/pre.h" -#include "dynamicinterface_export.h" +#include "tao/DynamicInterface/dynamicinterface_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp index b44347d3158..29c7650b574 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp +++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp @@ -1,7 +1,7 @@ //$Id$ -#include "DII_Invocation_Adapter.h" -#include "DII_Invocation.h" -#include "DII_Reply_Dispatcher.h" +#include "tao/DynamicInterface/DII_Invocation_Adapter.h" +#include "tao/DynamicInterface/DII_Invocation.h" +#include "tao/DynamicInterface/DII_Reply_Dispatcher.h" #include "tao/Exception.h" #include "tao/ORB_Constants.h" @@ -9,7 +9,7 @@ #include "tao/Transport.h" #include "tao/Transport.h" #include "tao/Pluggable_Messaging.h" -#include "Request.h" +#include "tao/DynamicInterface/Request.h" #include "ace/os_include/os_errno.h" diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp index 69d31fe22bb..877570d611a 100644 --- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp +++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "DII_Reply_Dispatcher.h" -#include "Request.h" +#include "tao/DynamicInterface/DII_Reply_Dispatcher.h" +#include "tao/DynamicInterface/Request.h" #include "tao/Environment.h" #include "tao/debug.h" #include "tao/ORB_Core.h" diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h index 10a3efdea14..cb450106c5d 100644 --- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h +++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "dynamicinterface_export.h" +#include "tao/DynamicInterface/dynamicinterface_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp index ae158ff2f19..a23c6c4e06e 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp +++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "Dynamic_Adapter_Impl.h" +#include "tao/DynamicInterface/Dynamic_Adapter_Impl.h" ACE_RCSID(DynamicInterface, TAO_Dynamic_Adapter_Impl, "$Id$") -#include "Request.h" -#include "Server_Request.h" +#include "tao/DynamicInterface/Request.h" +#include "tao/DynamicInterface/Server_Request.h" #include "tao/ORB_Core.h" #include "tao/Exception.h" diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h index 08d704f84ee..9537488f66c 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h +++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h @@ -28,7 +28,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "dynamicinterface_export.h" +#include "tao/DynamicInterface/dynamicinterface_export.h" #include "ace/Service_Config.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp index fa00ff9b9f3..6f9aa2d6bf7 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp +++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp @@ -1,11 +1,11 @@ -#include "Dynamic_Implementation.h" +#include "tao/DynamicInterface/Dynamic_Implementation.h" ACE_RCSID (DynamicInterface, Dynamic_Implementation, "$Id$") -#include "Server_Request.h" +#include "tao/DynamicInterface/Server_Request.h" #include "tao/ORB_Core.h" #include "tao/TSS_Resources.h" #include "tao/IFR_Client_Adapter.h" diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.h b/TAO/tao/DynamicInterface/Dynamic_Implementation.h index 9418610635c..b9c17c21ea2 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Implementation.h +++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.h @@ -23,7 +23,7 @@ #include /**/ "ace/pre.h" -#include "dynamicinterface_export.h" +#include "tao/DynamicInterface/dynamicinterface_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/DynamicInterface/ExceptionList.cpp b/TAO/tao/DynamicInterface/ExceptionList.cpp index 47b05341e21..41c1d44d322 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.cpp +++ b/TAO/tao/DynamicInterface/ExceptionList.cpp @@ -1,4 +1,4 @@ -#include "ExceptionList.h" +#include "tao/DynamicInterface/ExceptionList.h" ACE_RCSID (DynamicInterface, ExceptionList, @@ -9,7 +9,7 @@ ACE_RCSID (DynamicInterface, #include "tao/SystemException.h" #if !defined (__ACE_INLINE__) -# include "ExceptionList.inl" +# include "tao/DynamicInterface/ExceptionList.inl" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/ExceptionList.h b/TAO/tao/DynamicInterface/ExceptionList.h index 3171f94ee06..3fdca028ca5 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.h +++ b/TAO/tao/DynamicInterface/ExceptionList.h @@ -24,13 +24,13 @@ #include /**/ "ace/pre.h" -#include "dynamicinterface_export.h" +#include "tao/DynamicInterface/dynamicinterface_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "DII_CORBA_methods.h" +#include "tao/DynamicInterface/DII_CORBA_methods.h" #include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/orbconf.h" #include "tao/Basic_Types.h" @@ -128,7 +128,7 @@ namespace CORBA TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "ExceptionList.inl" +# include "tao/DynamicInterface/ExceptionList.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp index 1c30f20f061..b0e72b0e6b3 100644 --- a/TAO/tao/DynamicInterface/Request.cpp +++ b/TAO/tao/DynamicInterface/Request.cpp @@ -1,14 +1,14 @@ // $Id$ -#include "Request.h" +#include "tao/DynamicInterface/Request.h" ACE_RCSID (DynamicInterface, Request, "$Id$") -#include "DII_Invocation_Adapter.h" -#include "DII_Arguments.h" -#include "Context.h" +#include "tao/DynamicInterface/DII_Invocation_Adapter.h" +#include "tao/DynamicInterface/DII_Arguments.h" +#include "tao/DynamicInterface/Context.h" #include "tao/AnyTypeCode/NVList.h" #include "tao/Object.h" @@ -19,7 +19,7 @@ ACE_RCSID (DynamicInterface, #include "ace/OS_NS_string.h" #if !defined (__ACE_INLINE__) -# include "Request.inl" +# include "tao/DynamicInterface/Request.inl" #endif /* ! __ACE_INLINE__ */ diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h index 78d6bf7c37a..2c119dca9b3 100644 --- a/TAO/tao/DynamicInterface/Request.h +++ b/TAO/tao/DynamicInterface/Request.h @@ -27,9 +27,9 @@ // To force execution of the static constructor // that registers the dynamic service object. -#include "Dynamic_Adapter_Impl.h" +#include "tao/DynamicInterface/Dynamic_Adapter_Impl.h" -#include "ExceptionList.h" +#include "tao/DynamicInterface/ExceptionList.h" #include "tao/ORB.h" #include "tao/Environment.h" @@ -271,7 +271,7 @@ namespace CORBA TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "Request.inl" +# include "tao/DynamicInterface/Request.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp index d3c760c2c17..57c440c55db 100644 --- a/TAO/tao/DynamicInterface/Server_Request.cpp +++ b/TAO/tao/DynamicInterface/Server_Request.cpp @@ -2,7 +2,7 @@ // Implementation of the Dynamic Server Skeleton Interface. -#include "Server_Request.h" +#include "tao/DynamicInterface/Server_Request.h" ACE_RCSID (DynamicInterface, Server_Request, @@ -16,7 +16,7 @@ ACE_RCSID (DynamicInterface, #include "tao/SystemException.h" #if !defined (__ACE_INLINE__) -# include "Server_Request.inl" +# include "tao/DynamicInterface/Server_Request.inl" #endif /* ! __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/Server_Request.h b/TAO/tao/DynamicInterface/Server_Request.h index 4145cc1d2cd..288c43761a3 100644 --- a/TAO/tao/DynamicInterface/Server_Request.h +++ b/TAO/tao/DynamicInterface/Server_Request.h @@ -24,7 +24,7 @@ #include /**/ "ace/pre.h" -#include "Context.h" +#include "tao/DynamicInterface/Context.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -32,7 +32,7 @@ // To force execution of the static constructor // that registers the dynamic service object. -#include "Dynamic_Adapter_Impl.h" +#include "tao/DynamicInterface/Dynamic_Adapter_Impl.h" #include "tao/TAO_Server_Request.h" #include "tao/CDR.h" @@ -177,7 +177,7 @@ namespace CORBA TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "Server_Request.inl" +# include "tao/DynamicInterface/Server_Request.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp index 7c7326dd688..81d9935832f 100644 --- a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp +++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Unknown_User_Exception.h" +#include "tao/DynamicInterface/Unknown_User_Exception.h" #include "tao/AnyTypeCode/Any.h" #include "tao/Environment.h" diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.h b/TAO/tao/DynamicInterface/Unknown_User_Exception.h index 763920d0678..ab618060852 100644 --- a/TAO/tao/DynamicInterface/Unknown_User_Exception.h +++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.h @@ -20,7 +20,7 @@ #include /**/ "ace/pre.h" -#include "dynamicinterface_export.h" +#include "tao/DynamicInterface/dynamicinterface_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp index 367d67fa99c..62b2ef0b142 100644 --- a/TAO/tao/Environment.cpp +++ b/TAO/tao/Environment.cpp @@ -1,7 +1,7 @@ -#include "Environment.h" -#include "ORB_Core.h" -#include "SystemException.h" -#include "default_environment.h" +#include "tao/Environment.h" +#include "tao/ORB_Core.h" +#include "tao/SystemException.h" +#include "tao/default_environment.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp index ecf9ac7d2dd..16f65716ead 100644 --- a/TAO/tao/Exception.cpp +++ b/TAO/tao/Exception.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "Exception.h" -#include "SystemException.h" -#include "Environment.h" -#include "ORB_Constants.h" -#include "CORBA_String.h" -#include "CDR.h" -#include "debug.h" +#include "tao/Exception.h" +#include "tao/SystemException.h" +#include "tao/Environment.h" +#include "tao/ORB_Constants.h" +#include "tao/CORBA_String.h" +#include "tao/CDR.h" +#include "tao/debug.h" #include "ace/Malloc.h" #include "ace/SString.h" diff --git a/TAO/tao/Exclusive_TMS.cpp b/TAO/tao/Exclusive_TMS.cpp index 9780a4bdf66..765309003cc 100644 --- a/TAO/tao/Exclusive_TMS.cpp +++ b/TAO/tao/Exclusive_TMS.cpp @@ -3,7 +3,7 @@ #include "tao/Exclusive_TMS.h" #include "tao/Reply_Dispatcher.h" #include "tao/debug.h" -#include "Transport.h" +#include "tao/Transport.h" ACE_RCSID (tao, Exclusive_TMS, diff --git a/TAO/tao/FILE_Parser.cpp b/TAO/tao/FILE_Parser.cpp index 4f944be4cf2..b092eea96be 100644 --- a/TAO/tao/FILE_Parser.cpp +++ b/TAO/tao/FILE_Parser.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "FILE_Parser.h" +#include "tao/FILE_Parser.h" #include "tao/ORB.h" #include "tao/Environment.h" #include "tao/Object.h" diff --git a/TAO/tao/FlResource_Factory.cpp b/TAO/tao/FlResource_Factory.cpp index 75ca24a18cd..ebdd37f545e 100644 --- a/TAO/tao/FlResource_Factory.cpp +++ b/TAO/tao/FlResource_Factory.cpp @@ -1,7 +1,7 @@ //$Id$ -#include "FlResource_Factory.h" -#include "debug.h" +#include "tao/FlResource_Factory.h" +#include "tao/debug.h" #include "ace/FlReactor.h" ACE_RCSID( TAO_FlResource, diff --git a/TAO/tao/FlResource_Loader.cpp b/TAO/tao/FlResource_Loader.cpp index a89d677b0a2..c5dbe7131eb 100644 --- a/TAO/tao/FlResource_Loader.cpp +++ b/TAO/tao/FlResource_Loader.cpp @@ -1,7 +1,7 @@ //$Id$ -#include "FlResource_Loader.h" -#include "ORB_Core.h" -#include "FlResource_Factory.h" +#include "tao/FlResource_Loader.h" +#include "tao/ORB_Core.h" +#include "tao/FlResource_Factory.h" ACE_RCSID( TAO_FlResource, FlResource_Loader, diff --git a/TAO/tao/FloatSeqC.cpp b/TAO/tao/FloatSeqC.cpp index d8e51057f79..d5c32aa2f78 100644 --- a/TAO/tao/FloatSeqC.cpp +++ b/TAO/tao/FloatSeqC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "FloatSeqC.h" +#include "tao/FloatSeqC.h" #include "tao/CDR.h" // TAO_IDL - Generated from diff --git a/TAO/tao/Flushing_Strategy.cpp b/TAO/tao/Flushing_Strategy.cpp index 343515498b3..6d66ee99975 100644 --- a/TAO/tao/Flushing_Strategy.cpp +++ b/TAO/tao/Flushing_Strategy.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Flushing_Strategy.h" +#include "tao/Flushing_Strategy.h" ACE_RCSID (tao, Flushing_Strategy, diff --git a/TAO/tao/GIOPC.cpp b/TAO/tao/GIOPC.cpp index 99f4c435e1c..505bb143157 100644 --- a/TAO/tao/GIOPC.cpp +++ b/TAO/tao/GIOPC.cpp @@ -29,13 +29,13 @@ // be\be_codegen.cpp:288 -#include "GIOPC.h" +#include "tao/GIOPC.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" #include "ace/OS_NS_string.h" #if !defined (__ACE_INLINE__) -#include "GIOPC.inl" +#include "tao/GIOPC.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from diff --git a/TAO/tao/GIOPC.h b/TAO/tao/GIOPC.h index aad096b072f..cdc438390d5 100644 --- a/TAO/tao/GIOPC.h +++ b/TAO/tao/GIOPC.h @@ -270,7 +270,7 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::TargetAddress &); TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "GIOPC.inl" +#include "tao/GIOPC.inl" #endif /* defined INLINE */ #if defined(_MSC_VER) diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp index 8531e4cd6a6..9e95891f644 100644 --- a/TAO/tao/GIOP_Message_Base.cpp +++ b/TAO/tao/GIOP_Message_Base.cpp @@ -1,17 +1,17 @@ // $Id$ -#include "GIOP_Message_Base.h" -#include "operation_details.h" -#include "debug.h" -#include "ORB_Core.h" -#include "TAO_Server_Request.h" -#include "GIOP_Message_Locate_Header.h" -#include "Transport.h" -#include "Transport_Mux_Strategy.h" -#include "LF_Strategy.h" -#include "Request_Dispatcher.h" -#include "Codeset_Manager.h" -#include "SystemException.h" +#include "tao/GIOP_Message_Base.h" +#include "tao/operation_details.h" +#include "tao/debug.h" +#include "tao/ORB_Core.h" +#include "tao/TAO_Server_Request.h" +#include "tao/GIOP_Message_Locate_Header.h" +#include "tao/Transport.h" +#include "tao/Transport_Mux_Strategy.h" +#include "tao/LF_Strategy.h" +#include "tao/Request_Dispatcher.h" +#include "tao/Codeset_Manager.h" +#include "tao/SystemException.h" /* * Hook to add additional include files during specializations. diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp index 29a4e8aaf8d..5fbca6302d3 100644 --- a/TAO/tao/GIOP_Message_Lite.cpp +++ b/TAO/tao/GIOP_Message_Lite.cpp @@ -1,17 +1,17 @@ //$Id$ -#include "GIOP_Message_Lite.h" -#include "debug.h" -#include "TAOC.h" -#include "ORB_Core.h" -#include "operation_details.h" -#include "TAO_Server_Request.h" -#include "GIOP_Message_Locate_Header.h" -#include "LF_Strategy.h" -#include "Transport.h" -#include "Transport_Mux_Strategy.h" -#include "Codeset_Manager.h" -#include "SystemException.h" +#include "tao/GIOP_Message_Lite.h" +#include "tao/debug.h" +#include "tao/TAOC.h" +#include "tao/ORB_Core.h" +#include "tao/operation_details.h" +#include "tao/TAO_Server_Request.h" +#include "tao/GIOP_Message_Locate_Header.h" +#include "tao/LF_Strategy.h" +#include "tao/Transport.h" +#include "tao/Transport_Mux_Strategy.h" +#include "tao/Codeset_Manager.h" +#include "tao/SystemException.h" ACE_RCSID (tao, GIOP_Message_Lite, diff --git a/TAO/tao/GIOP_Message_Version.cpp b/TAO/tao/GIOP_Message_Version.cpp index 78a90520dcf..b7935f7ac71 100644 --- a/TAO/tao/GIOP_Message_Version.cpp +++ b/TAO/tao/GIOP_Message_Version.cpp @@ -1,5 +1,5 @@ //$Id$ -# include "GIOP_Message_Version.h" +# include "tao/GIOP_Message_Version.h" #if !defined (__ACE_INLINE__) # include "tao/GIOP_Message_Version.inl" diff --git a/TAO/tao/IFR_Client/IFR_BaseC.cpp b/TAO/tao/IFR_Client/IFR_BaseC.cpp index ed675318654..a684ebb3841 100644 --- a/TAO/tao/IFR_Client/IFR_BaseC.cpp +++ b/TAO/tao/IFR_Client/IFR_BaseC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:293 -#include "IFR_BaseC.h" +#include "tao/IFR_Client/IFR_BaseC.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/orb_typesA.h" #include "tao/AnyTypeCode/Typecode_typesA.h" @@ -60,7 +60,7 @@ #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) -#include "IFR_BaseC.inl" +#include "tao/IFR_Client/IFR_BaseC.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from diff --git a/TAO/tao/IFR_Client/IFR_BaseC.h b/TAO/tao/IFR_Client/IFR_BaseC.h index 44b8f9774a3..774ff7f019f 100644 --- a/TAO/tao/IFR_Client/IFR_BaseC.h +++ b/TAO/tao/IFR_Client/IFR_BaseC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ifr_client_export.h" +#include "tao/IFR_Client/ifr_client_export.h" #include "tao/AnyTypeCode/TypeCode.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Any.h" @@ -4110,7 +4110,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::TypeDesc TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "IFR_BaseC.inl" +#include "tao/IFR_Client/IFR_BaseC.inl" #endif /* defined INLINE */ #if defined(_MSC_VER) diff --git a/TAO/tao/IFR_Client/IFR_BaseS.h b/TAO/tao/IFR_Client/IFR_BaseS.h index b7a196d3491..0dd9ad297a6 100644 --- a/TAO/tao/IFR_Client/IFR_BaseS.h +++ b/TAO/tao/IFR_Client/IFR_BaseS.h @@ -33,7 +33,7 @@ #include /**/ "ace/pre.h" -#include "IFR_BaseC.h" +#include "tao/IFR_Client/IFR_BaseC.h" #include "tao/orb_typesS.h" #include "tao/Typecode_typesS.h" diff --git a/TAO/tao/IFR_Client/IFR_BasicC.cpp b/TAO/tao/IFR_Client/IFR_BasicC.cpp index 9a9798f829b..73a0a993997 100644 --- a/TAO/tao/IFR_Client/IFR_BasicC.cpp +++ b/TAO/tao/IFR_Client/IFR_BasicC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:293 -#include "IFR_BasicC.h" +#include "tao/IFR_Client/IFR_BasicC.h" #include "tao/CDR.h" #include "tao/IFR_Client/IFR_BaseC.h" #include "tao/AnyTypeCode/orb_typesA.h" @@ -62,7 +62,7 @@ #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) -#include "IFR_BasicC.inl" +#include "tao/IFR_Client/IFR_BasicC.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from diff --git a/TAO/tao/IFR_Client/IFR_BasicC.h b/TAO/tao/IFR_Client/IFR_BasicC.h index c9fc4cbcea1..268be82f290 100644 --- a/TAO/tao/IFR_Client/IFR_BasicC.h +++ b/TAO/tao/IFR_Client/IFR_BasicC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ifr_client_export.h" +#include "tao/IFR_Client/ifr_client_export.h" #include "tao/AnyTypeCode/TypeCode.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Any.h" @@ -5692,7 +5692,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExtLocal TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "IFR_BasicC.inl" +#include "tao/IFR_Client/IFR_BasicC.inl" #endif /* defined INLINE */ #if defined(_MSC_VER) diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp index fea0ea9ff62..2afc5ef4960 100644 --- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp +++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "IFR_Client_Adapter_Impl.h" -#include "IFR_BasicC.h" +#include "tao/IFR_Client/IFR_Client_Adapter_Impl.h" +#include "tao/IFR_Client/IFR_BasicC.h" #include "tao/AnyTypeCode/NVList.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h index 6fba1212ee1..e3cfcd6b22d 100644 --- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h +++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "ifr_client_export.h" +#include "tao/IFR_Client/ifr_client_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp index 5764d2ac56f..a6c2ff11eed 100644 --- a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp +++ b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp @@ -30,7 +30,7 @@ #include "tao/AnyTypeCode/orb_typesA.h" -#include "IFR_ComponentsC.h" +#include "tao/IFR_Client/IFR_ComponentsC.h" #include "tao/CDR.h" #include "tao/IFR_Client/IFR_ExtendedC.h" #include "tao/Invocation_Adapter.h" @@ -58,7 +58,7 @@ #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) -#include "IFR_ComponentsC.inl" +#include "tao/IFR_Client/IFR_ComponentsC.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.h b/TAO/tao/IFR_Client/IFR_ComponentsC.h index 3c1eec96f17..f952df4b02e 100644 --- a/TAO/tao/IFR_Client/IFR_ComponentsC.h +++ b/TAO/tao/IFR_Client/IFR_ComponentsC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ifr_client_export.h" +#include "tao/IFR_Client/ifr_client_export.h" #include "tao/AnyTypeCode/TypeCode.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/ORB.h" @@ -3107,7 +3107,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Componen TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "IFR_ComponentsC.inl" +#include "tao/IFR_Client/IFR_ComponentsC.inl" #endif /* defined INLINE */ #if defined(_MSC_VER) diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp index 77820fd693d..934ef4659d8 100644 --- a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp +++ b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp @@ -32,7 +32,7 @@ #include "tao/AnyTypeCode/VisibilityA.h" #include "tao/AnyTypeCode/ValueModifierA.h" #include "tao/AnyTypeCode/orb_typesA.h" -#include "IFR_ExtendedC.h" +#include "tao/IFR_Client/IFR_ExtendedC.h" #include "tao/CDR.h" #include "tao/IFR_Client/IFR_BasicC.h" #include "tao/Invocation_Adapter.h" @@ -60,7 +60,7 @@ #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) -#include "IFR_ExtendedC.inl" +#include "tao/IFR_Client/IFR_ExtendedC.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.h b/TAO/tao/IFR_Client/IFR_ExtendedC.h index d42a5de4728..45d3c8e1a9b 100644 --- a/TAO/tao/IFR_Client/IFR_ExtendedC.h +++ b/TAO/tao/IFR_Client/IFR_ExtendedC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ifr_client_export.h" +#include "tao/IFR_Client/ifr_client_export.h" #include "tao/AnyTypeCode/TypeCode.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/ORB.h" @@ -1556,7 +1556,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ValueBox TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "IFR_ExtendedC.inl" +#include "tao/IFR_Client/IFR_ExtendedC.inl" #endif /* defined INLINE */ #if defined(_MSC_VER) diff --git a/TAO/tao/IIOPC.cpp b/TAO/tao/IIOPC.cpp index 46c1cce05ed..045812848c1 100644 --- a/TAO/tao/IIOPC.cpp +++ b/TAO/tao/IIOPC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:288 -#include "IIOPC.h" +#include "tao/IIOPC.h" #include "tao/CDR.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp index 14a6896c02c..0d37b37f116 100644 --- a/TAO/tao/IIOP_Connection_Handler.cpp +++ b/TAO/tao/IIOP_Connection_Handler.cpp @@ -1,13 +1,13 @@ -#include "IIOP_Connection_Handler.h" -#include "debug.h" -#include "ORB_Core.h" -#include "IIOP_Transport.h" -#include "IIOP_Endpoint.h" -#include "IIOPC.h" -#include "Thread_Lane_Resources.h" -#include "Base_Transport_Property.h" -#include "Protocols_Hooks.h" -#include "Wait_Strategy.h" +#include "tao/IIOP_Connection_Handler.h" +#include "tao/debug.h" +#include "tao/ORB_Core.h" +#include "tao/IIOP_Transport.h" +#include "tao/IIOP_Endpoint.h" +#include "tao/IIOPC.h" +#include "tao/Thread_Lane_Resources.h" +#include "tao/Base_Transport_Property.h" +#include "tao/Protocols_Hooks.h" +#include "tao/Wait_Strategy.h" #include "ace/os_include/netinet/os_tcp.h" #include "ace/os_include/os_netdb.h" diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index 27bbe5026ff..802cdc97241 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -1,15 +1,15 @@ -#include "IIOP_Connector.h" -#include "IIOP_Profile.h" -#include "debug.h" -#include "ORB_Core.h" -#include "Environment.h" -#include "Protocols_Hooks.h" -#include "Connect_Strategy.h" -#include "Thread_Lane_Resources.h" -#include "Profile_Transport_Resolver.h" -#include "Transport.h" -#include "Wait_Strategy.h" -#include "SystemException.h" +#include "tao/IIOP_Connector.h" +#include "tao/IIOP_Profile.h" +#include "tao/debug.h" +#include "tao/ORB_Core.h" +#include "tao/Environment.h" +#include "tao/Protocols_Hooks.h" +#include "tao/Connect_Strategy.h" +#include "tao/Thread_Lane_Resources.h" +#include "tao/Profile_Transport_Resolver.h" +#include "tao/Transport.h" +#include "tao/Wait_Strategy.h" +#include "tao/SystemException.h" #include "ace/OS_NS_strings.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/IIOP_Endpoint.cpp b/TAO/tao/IIOP_Endpoint.cpp index 28cdaa075e9..5f5600ba676 100644 --- a/TAO/tao/IIOP_Endpoint.cpp +++ b/TAO/tao/IIOP_Endpoint.cpp @@ -4,10 +4,10 @@ */ //@@ TAO_ENDPOINT_SPL_COPY_HOOK_START -#include "IIOP_Endpoint.h" -#include "IOP_IORC.h" -#include "debug.h" -#include "ORB_Core.h" +#include "tao/IIOP_Endpoint.h" +#include "tao/IOP_IORC.h" +#include "tao/debug.h" +#include "tao/ORB_Core.h" #include "ace/Log_Msg.h" #include "ace/Guard_T.h" diff --git a/TAO/tao/IIOP_EndpointsC.cpp b/TAO/tao/IIOP_EndpointsC.cpp index d06e6eac543..8d233088ee4 100644 --- a/TAO/tao/IIOP_EndpointsC.cpp +++ b/TAO/tao/IIOP_EndpointsC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "IIOP_EndpointsC.h" +#include "tao/IIOP_EndpointsC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) diff --git a/TAO/tao/IIOP_Factory.cpp b/TAO/tao/IIOP_Factory.cpp index 8f2baeba879..041377b6051 100644 --- a/TAO/tao/IIOP_Factory.cpp +++ b/TAO/tao/IIOP_Factory.cpp @@ -1,7 +1,7 @@ -#include "IIOP_Factory.h" -#include "IIOP_Acceptor.h" -#include "IIOP_Connector.h" -#include "IOP_IORC.h" +#include "tao/IIOP_Factory.h" +#include "tao/IIOP_Acceptor.h" +#include "tao/IIOP_Connector.h" +#include "tao/IOP_IORC.h" #include "ace/OS_NS_strings.h" diff --git a/TAO/tao/IIOP_Lite_Factory.cpp b/TAO/tao/IIOP_Lite_Factory.cpp index 65157f45b23..6e64599620f 100644 --- a/TAO/tao/IIOP_Lite_Factory.cpp +++ b/TAO/tao/IIOP_Lite_Factory.cpp @@ -1,7 +1,7 @@ -#include "IIOP_Lite_Factory.h" -#include "IIOP_Acceptor.h" -#include "IIOP_Connector.h" -#include "IOP_IORC.h" +#include "tao/IIOP_Lite_Factory.h" +#include "tao/IIOP_Acceptor.h" +#include "tao/IIOP_Connector.h" +#include "tao/IOP_IORC.h" #include "ace/OS_NS_strings.h" diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp index 79982565151..9d454003bfe 100644 --- a/TAO/tao/IIOP_Transport.cpp +++ b/TAO/tao/IIOP_Transport.cpp @@ -1,15 +1,15 @@ -#include "IIOP_Transport.h" -#include "IIOP_Acceptor.h" -#include "IIOPC.h" -#include "Acceptor_Registry.h" -#include "operation_details.h" -#include "Wait_Strategy.h" -#include "debug.h" -#include "GIOP_Message_Base.h" -#include "Protocols_Hooks.h" -#include "ORB_Core.h" -#include "Thread_Lane_Resources.h" -#include "Transport_Mux_Strategy.h" +#include "tao/IIOP_Transport.h" +#include "tao/IIOP_Acceptor.h" +#include "tao/IIOPC.h" +#include "tao/Acceptor_Registry.h" +#include "tao/operation_details.h" +#include "tao/Wait_Strategy.h" +#include "tao/debug.h" +#include "tao/GIOP_Message_Base.h" +#include "tao/Protocols_Hooks.h" +#include "tao/ORB_Core.h" +#include "tao/Thread_Lane_Resources.h" +#include "tao/Transport_Mux_Strategy.h" ACE_RCSID (tao, IIOP_Transport, diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp index 6774ddcb1e1..24da4f71609 100644 --- a/TAO/tao/IOPC.cpp +++ b/TAO/tao/IOPC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:288 -#include "IOPC.h" +#include "tao/IOPC.h" #include "tao/CDR.h" // TAO_IDL - Generated from diff --git a/TAO/tao/IOP_IORC.cpp b/TAO/tao/IOP_IORC.cpp index 2090ea94b73..45323b2f40c 100644 --- a/TAO/tao/IOP_IORC.cpp +++ b/TAO/tao/IOP_IORC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:288 -#include "IOP_IORC.h" +#include "tao/IOP_IORC.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" diff --git a/TAO/tao/IORInterceptor/IORInfo.cpp b/TAO/tao/IORInterceptor/IORInfo.cpp index 873b0d8426b..8c9f231166f 100644 --- a/TAO/tao/IORInterceptor/IORInfo.cpp +++ b/TAO/tao/IORInterceptor/IORInfo.cpp @@ -1,4 +1,4 @@ -#include "IORInfo.h" +#include "tao/IORInterceptor/IORInfo.h" #include "tao/PortableServer/Root_POA.h" #include "tao/PolicyC.h" @@ -11,7 +11,7 @@ ACE_RCSID (IORInterceptor, "$Id$") #if !defined (__ACE_INLINE__) -# include "IORInfo.inl" +# include "tao/IORInterceptor/IORInfo.inl" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORInterceptor/IORInfo.h b/TAO/tao/IORInterceptor/IORInfo.h index c7e7978eb9d..d0314b30f7e 100644 --- a/TAO/tao/IORInterceptor/IORInfo.h +++ b/TAO/tao/IORInterceptor/IORInfo.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "IORInfoC.h" +#include "tao/IORInterceptor/IORInfoC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -161,7 +161,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "IORInfo.inl" +# include "tao/IORInterceptor/IORInfo.inl" #endif /* __ACE_INLINE__ */ #if defined(_MSC_VER) diff --git a/TAO/tao/IORInterceptor/IORInfoC.cpp b/TAO/tao/IORInterceptor/IORInfoC.cpp index f2158657ac4..877d38025ea 100644 --- a/TAO/tao/IORInterceptor/IORInfoC.cpp +++ b/TAO/tao/IORInterceptor/IORInfoC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "IORInfoC.h" +#include "tao/IORInterceptor/IORInfoC.h" #include "tao/CDR.h" #include "tao/Object_Argument_T.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/IORInterceptor/IORInfoC.h b/TAO/tao/IORInterceptor/IORInfoC.h index cd478a109df..80b0ab75f1d 100644 --- a/TAO/tao/IORInterceptor/IORInfoC.h +++ b/TAO/tao/IORInterceptor/IORInfoC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "iorinterceptor_export.h" +#include "tao/IORInterceptor/iorinterceptor_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.cpp b/TAO/tao/IORInterceptor/IORInterceptorC.cpp index fa92df1631d..684f5361ebc 100644 --- a/TAO/tao/IORInterceptor/IORInterceptorC.cpp +++ b/TAO/tao/IORInterceptor/IORInterceptorC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "IORInterceptor.h" +#include "tao/IORInterceptor/IORInterceptor.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.h b/TAO/tao/IORInterceptor/IORInterceptorC.h index fccb04aadac..7f78cfe946f 100644 --- a/TAO/tao/IORInterceptor/IORInterceptorC.h +++ b/TAO/tao/IORInterceptor/IORInterceptorC.h @@ -43,7 +43,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "iorinterceptor_export.h" +#include "tao/IORInterceptor/iorinterceptor_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp index 3fd442c9c49..a917dc798d4 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp +++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "IORInterceptor_Adapter_Impl.h" -#include "IORInterceptor_Adapter_Factory_Impl.h" +#include "tao/IORInterceptor/IORInterceptor_Adapter_Impl.h" +#include "tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h" #include "tao/ORB_Core.h" diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h index 26f6bcc90ca..a08507cd6a6 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h +++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "iorinterceptor_export.h" +#include "tao/IORInterceptor/iorinterceptor_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp index 4e9ecb68d5a..b3f22718550 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp +++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "IORInterceptor_Adapter_Impl.h" -#include "IORInfo.h" +#include "tao/IORInterceptor/IORInterceptor_Adapter_Impl.h" +#include "tao/IORInterceptor/IORInfo.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" #include "tao/PI/PI.h" diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h index 949f4be9611..6257c699b9a 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h +++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "iorinterceptor_export.h" +#include "tao/IORInterceptor/iorinterceptor_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,7 +25,7 @@ #include "tao/IORInterceptor/IORInterceptor.h" #include "tao/IORInterceptor_Adapter.h" #include "tao/PI/Interceptor_List_T.h" -#include "IORInterceptor_Details.h" +#include "tao/IORInterceptor/IORInterceptor_Details.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Details.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Details.cpp index c619ca9039f..77835d4cfd0 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor_Details.cpp +++ b/TAO/tao/IORInterceptor/IORInterceptor_Details.cpp @@ -1,4 +1,4 @@ -#include "IORInterceptor_Details.h" +#include "tao/IORInterceptor/IORInterceptor_Details.h" ACE_RCSID (IORInterceptor, IORInterceptor_Details, diff --git a/TAO/tao/IORManipulation/IORA.cpp b/TAO/tao/IORManipulation/IORA.cpp index 180ea97f604..4f66fb1a1c5 100644 --- a/TAO/tao/IORManipulation/IORA.cpp +++ b/TAO/tao/IORManipulation/IORA.cpp @@ -32,7 +32,7 @@ #include "tao/AnyTypeCode/Sequence_TypeCode_Static.h" #include "tao/AnyTypeCode/Struct_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Struct_Field.h" -#include "IORManip_Loader.h" +#include "tao/IORManipulation/IORManip_Loader.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" diff --git a/TAO/tao/IORManipulation/IORC.cpp b/TAO/tao/IORManipulation/IORC.cpp index 20c641906d5..b30c619e153 100644 --- a/TAO/tao/IORManipulation/IORC.cpp +++ b/TAO/tao/IORManipulation/IORC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "IORManip_Loader.h" +#include "tao/IORManipulation/IORManip_Loader.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/IORManipulation/IORC.h b/TAO/tao/IORManipulation/IORC.h index b7160ffbf98..2c6bb305c61 100644 --- a/TAO/tao/IORManipulation/IORC.h +++ b/TAO/tao/IORManipulation/IORC.h @@ -44,7 +44,7 @@ #error "You should not include IORC.h directly, use IORManip_Loader.h" #endif /* !TAO_IORMANIP_SAFE_INCLUDE */ -#include "ior_manip_export.h" +#include "tao/IORManipulation/ior_manip_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" diff --git a/TAO/tao/IORManipulation/IORManip_Loader.cpp b/TAO/tao/IORManipulation/IORManip_Loader.cpp index 23d13201fbb..eceb6b0b06b 100644 --- a/TAO/tao/IORManipulation/IORManip_Loader.cpp +++ b/TAO/tao/IORManipulation/IORManip_Loader.cpp @@ -1,5 +1,5 @@ -#include "IORManip_Loader.h" -#include "IORManipulation.h" +#include "tao/IORManipulation/IORManip_Loader.h" +#include "tao/IORManipulation/IORManipulation.h" #include "ace/Log_Msg.h" diff --git a/TAO/tao/IORManipulation/IORManip_Loader.h b/TAO/tao/IORManipulation/IORManip_Loader.h index 0245866c504..fc45a394fae 100644 --- a/TAO/tao/IORManipulation/IORManip_Loader.h +++ b/TAO/tao/IORManipulation/IORManip_Loader.h @@ -19,7 +19,7 @@ #define TAO_IORMANIP_LOADER_H #include /**/ "ace/pre.h" -#include "ior_manip_export.h" +#include "tao/IORManipulation/ior_manip_export.h" #include "tao/Object_Loader.h" #include "ace/Service_Config.h" @@ -55,7 +55,7 @@ ACE_STATIC_SVC_DECLARE (TAO_IORManip_Loader) ACE_FACTORY_DECLARE (TAO_IORManip, TAO_IORManip_Loader) #define TAO_IORMANIP_SAFE_INCLUDE -#include "IORC.h" +#include "tao/IORManipulation/IORC.h" #undef TAO_IORMANIP_SAFE_INCLUDE #include /**/ "ace/post.h" diff --git a/TAO/tao/IORManipulation/IORManipulation.cpp b/TAO/tao/IORManipulation/IORManipulation.cpp index 5f4f325d730..079f942eee2 100644 --- a/TAO/tao/IORManipulation/IORManipulation.cpp +++ b/TAO/tao/IORManipulation/IORManipulation.cpp @@ -1,4 +1,4 @@ -#include "IORManipulation.h" +#include "tao/IORManipulation/IORManipulation.h" #include "tao/MProfile.h" #include "tao/Profile.h" diff --git a/TAO/tao/IORManipulation/IORManipulation.h b/TAO/tao/IORManipulation/IORManipulation.h index 198c52877da..9ad320bc8d0 100644 --- a/TAO/tao/IORManipulation/IORManipulation.h +++ b/TAO/tao/IORManipulation/IORManipulation.h @@ -23,13 +23,13 @@ #include /**/ "ace/pre.h" #include "tao/LocalObject.h" -#include "IORManip_Loader.h" +#include "tao/IORManipulation/IORManip_Loader.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "IORC.h" +#include "tao/IORManipulation/IORC.h" #if defined(_MSC_VER) #pragma warning(push) diff --git a/TAO/tao/IORTable/IORTable.cpp b/TAO/tao/IORTable/IORTable.cpp index c4e1a4dc696..e43ccf18b34 100644 --- a/TAO/tao/IORTable/IORTable.cpp +++ b/TAO/tao/IORTable/IORTable.cpp @@ -11,8 +11,8 @@ */ // ================================================================= -#include "IORTable.h" -#include "Table_Adapter.h" +#include "tao/IORTable/IORTable.h" +#include "tao/IORTable/Table_Adapter.h" ACE_RCSID (IORTable, IORTable, "$Id$") diff --git a/TAO/tao/IORTable/IORTable.h b/TAO/tao/IORTable/IORTable.h index 8caa28cbeeb..7bae99afdb1 100644 --- a/TAO/tao/IORTable/IORTable.h +++ b/TAO/tao/IORTable/IORTable.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "iortable_export.h" +#include "tao/IORTable/iortable_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -40,7 +40,7 @@ TAO_Requires_IORTable_Initializer = TAO_IORTable_Initializer::init (); TAO_END_VERSIONED_NAMESPACE_DECL #define TAO_IORTABLE_SAFE_INCLUDE -#include "IORTableC.h" +#include "tao/IORTable/IORTableC.h" #undef TAO_IORTABLE_SAFE_INCLUDE #include /**/ "ace/post.h" diff --git a/TAO/tao/IORTable/IORTableC.cpp b/TAO/tao/IORTable/IORTableC.cpp index 63c820ac1b1..ce5ed991f03 100644 --- a/TAO/tao/IORTable/IORTableC.cpp +++ b/TAO/tao/IORTable/IORTableC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "IORTable.h" +#include "tao/IORTable/IORTable.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/IORTable/IORTableC.h b/TAO/tao/IORTable/IORTableC.h index 19f09fa7d59..fcd0a17bdfc 100644 --- a/TAO/tao/IORTable/IORTableC.h +++ b/TAO/tao/IORTable/IORTableC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "iortable_export.h" +#include "tao/IORTable/iortable_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" diff --git a/TAO/tao/IORTable/IOR_Table_Impl.cpp b/TAO/tao/IORTable/IOR_Table_Impl.cpp index 201a27a4e47..bb3b678e397 100644 --- a/TAO/tao/IORTable/IOR_Table_Impl.cpp +++ b/TAO/tao/IORTable/IOR_Table_Impl.cpp @@ -7,7 +7,7 @@ * */ -#include "IOR_Table_Impl.h" +#include "tao/IORTable/IOR_Table_Impl.h" #include "ace/Guard_T.h" ACE_RCSID (IORTable, diff --git a/TAO/tao/IORTable/IOR_Table_Impl.h b/TAO/tao/IORTable/IOR_Table_Impl.h index 621cf250d6a..15ca6d6cc3f 100644 --- a/TAO/tao/IORTable/IOR_Table_Impl.h +++ b/TAO/tao/IORTable/IOR_Table_Impl.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "IORTable.h" +#include "tao/IORTable/IORTable.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/IORTable/Table_Adapter.cpp b/TAO/tao/IORTable/Table_Adapter.cpp index de2e8ac43d2..dbfbc20990a 100644 --- a/TAO/tao/IORTable/Table_Adapter.cpp +++ b/TAO/tao/IORTable/Table_Adapter.cpp @@ -7,8 +7,8 @@ * */ -#include "Table_Adapter.h" -#include "IOR_Table_Impl.h" +#include "tao/IORTable/Table_Adapter.h" +#include "tao/IORTable/IOR_Table_Impl.h" #include "tao/ORB_Core.h" #include "tao/Object.h" #include "tao/Stub.h" diff --git a/TAO/tao/IORTable/Table_Adapter.h b/TAO/tao/IORTable/Table_Adapter.h index 7af6774634e..f01ebe13e64 100644 --- a/TAO/tao/IORTable/Table_Adapter.h +++ b/TAO/tao/IORTable/Table_Adapter.h @@ -15,7 +15,7 @@ #define TAO_TABLE_ADAPTER_H #include /**/ "ace/pre.h" -#include "iortable_export.h" +#include "tao/IORTable/iortable_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/ImR_Client/ImR_Client.cpp b/TAO/tao/ImR_Client/ImR_Client.cpp index 96b4c8a282c..47fc9c960fe 100644 --- a/TAO/tao/ImR_Client/ImR_Client.cpp +++ b/TAO/tao/ImR_Client/ImR_Client.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ImR_Client.h" +#include "tao/ImR_Client/ImR_Client.h" #include "tao/debug.h" #include "tao/ORB_Core.h" diff --git a/TAO/tao/ImR_Client/ImR_Client.h b/TAO/tao/ImR_Client/ImR_Client.h index 0bf7db133a2..cf1e19b7f92 100644 --- a/TAO/tao/ImR_Client/ImR_Client.h +++ b/TAO/tao/ImR_Client/ImR_Client.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "imr_client_export.h" +#include "tao/ImR_Client/imr_client_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/ImR_Client/ImplRepoC.cpp b/TAO/tao/ImR_Client/ImplRepoC.cpp index 897f264f2db..d18206701dc 100644 --- a/TAO/tao/ImR_Client/ImplRepoC.cpp +++ b/TAO/tao/ImR_Client/ImplRepoC.cpp @@ -38,7 +38,7 @@ #include "tao/AnyTypeCode/String_TypeCode_Static.h" #include "tao/AnyTypeCode/Struct_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Struct_Field.h" -#include "ImplRepoC.h" +#include "tao/ImR_Client/ImplRepoC.h" #include "tao/CDR.h" #include "tao/Exception_Data.h" #include "tao/Invocation_Adapter.h" @@ -55,7 +55,7 @@ #include "ace/OS_NS_string.h" #if !defined (__ACE_INLINE__) -#include "ImplRepoC.inl" +#include "tao/ImR_Client/ImplRepoC.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from diff --git a/TAO/tao/ImR_Client/ImplRepoC.h b/TAO/tao/ImR_Client/ImplRepoC.h index 748bb20eb98..b683f485825 100644 --- a/TAO/tao/ImR_Client/ImplRepoC.h +++ b/TAO/tao/ImR_Client/ImplRepoC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "imr_client_export.h" +#include "tao/ImR_Client/imr_client_export.h" #include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/ORB.h" #include "tao/SystemException.h" @@ -1095,7 +1095,7 @@ TAO_IMR_Client_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, Implementatio TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "ImplRepoC.inl" +#include "tao/ImR_Client/ImplRepoC.inl" #endif /* defined INLINE */ #include /**/ "ace/post.h" diff --git a/TAO/tao/ImR_Client/ImplRepoS.cpp b/TAO/tao/ImR_Client/ImplRepoS.cpp index 8d26c369368..effee70d815 100644 --- a/TAO/tao/ImR_Client/ImplRepoS.cpp +++ b/TAO/tao/ImR_Client/ImplRepoS.cpp @@ -33,7 +33,7 @@ #define _TAO_IDL_ORIG_IMPLREPOS_CPP_ -#include "ImplRepoS.h" +#include "tao/ImR_Client/ImplRepoS.h" #include "tao/PortableServer/Operation_Table_Perfect_Hash.h" #include "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h" #include "tao/PortableServer/Upcall_Command.h" diff --git a/TAO/tao/ImR_Client/ImplRepoS.h b/TAO/tao/ImR_Client/ImplRepoS.h index e3d670bd35e..6978c642426 100644 --- a/TAO/tao/ImR_Client/ImplRepoS.h +++ b/TAO/tao/ImR_Client/ImplRepoS.h @@ -33,7 +33,7 @@ #include /**/ "ace/pre.h" -#include "ImplRepoC.h" +#include "tao/ImR_Client/ImplRepoC.h" #include "tao/ImR_Client/ServerObjectS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/tao/ImR_Client/ServerObjectC.cpp b/TAO/tao/ImR_Client/ServerObjectC.cpp index a758031bc82..1d4d4afce68 100644 --- a/TAO/tao/ImR_Client/ServerObjectC.cpp +++ b/TAO/tao/ImR_Client/ServerObjectC.cpp @@ -33,7 +33,7 @@ #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" -#include "ServerObjectC.h" +#include "tao/ImR_Client/ServerObjectC.h" #include "tao/CDR.h" #include "tao/Exception_Data.h" #include "tao/Invocation_Adapter.h" @@ -44,7 +44,7 @@ #include "ace/OS_NS_string.h" #if !defined (__ACE_INLINE__) -#include "ServerObjectC.inl" +#include "tao/ImR_Client/ServerObjectC.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from diff --git a/TAO/tao/ImR_Client/ServerObjectC.h b/TAO/tao/ImR_Client/ServerObjectC.h index 991a4b47010..5458d8ed88c 100644 --- a/TAO/tao/ImR_Client/ServerObjectC.h +++ b/TAO/tao/ImR_Client/ServerObjectC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "imr_client_export.h" +#include "tao/ImR_Client/imr_client_export.h" #include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/ORB.h" #include "tao/SystemException.h" @@ -279,7 +279,7 @@ TAO_IMR_Client_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, Implementatio TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "ServerObjectC.inl" +#include "tao/ImR_Client/ServerObjectC.inl" #endif /* defined INLINE */ #include /**/ "ace/post.h" diff --git a/TAO/tao/ImR_Client/ServerObjectS.cpp b/TAO/tao/ImR_Client/ServerObjectS.cpp index ef38543d4b9..e8e9f8bc894 100644 --- a/TAO/tao/ImR_Client/ServerObjectS.cpp +++ b/TAO/tao/ImR_Client/ServerObjectS.cpp @@ -33,7 +33,7 @@ #define _TAO_IDL_ORIG_SERVEROBJECTS_CPP_ -#include "ServerObjectS.h" +#include "tao/ImR_Client/ServerObjectS.h" #include "tao/PortableServer/Operation_Table_Perfect_Hash.h" #include "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h" #include "tao/PortableServer/Upcall_Command.h" diff --git a/TAO/tao/ImR_Client/ServerObjectS.h b/TAO/tao/ImR_Client/ServerObjectS.h index c161372e2af..06fabb5401b 100644 --- a/TAO/tao/ImR_Client/ServerObjectS.h +++ b/TAO/tao/ImR_Client/ServerObjectS.h @@ -33,7 +33,7 @@ #include /**/ "ace/pre.h" -#include "ServerObjectC.h" +#include "tao/ImR_Client/ServerObjectC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/ImR_Client/ServerObject_i.cpp b/TAO/tao/ImR_Client/ServerObject_i.cpp index 473a7368e90..8e777df8a31 100644 --- a/TAO/tao/ImR_Client/ServerObject_i.cpp +++ b/TAO/tao/ImR_Client/ServerObject_i.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ServerObject_i.h" +#include "tao/ImR_Client/ServerObject_i.h" #include "tao/PortableServer/Root_POA.h" #include "tao/orbconf.h" diff --git a/TAO/tao/Incoming_Message_Queue.cpp b/TAO/tao/Incoming_Message_Queue.cpp index 02f5f2a12f8..654a385d469 100644 --- a/TAO/tao/Incoming_Message_Queue.cpp +++ b/TAO/tao/Incoming_Message_Queue.cpp @@ -1,12 +1,12 @@ -#include "Incoming_Message_Queue.h" -#include "debug.h" +#include "tao/Incoming_Message_Queue.h" +#include "tao/debug.h" #include "ace/Log_Msg.h" #include "ace/Malloc_Base.h" #if !defined (__ACE_INLINE__) -# include "Incoming_Message_Queue.inl" +# include "tao/Incoming_Message_Queue.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Incoming_Message_Queue.h b/TAO/tao/Incoming_Message_Queue.h index 49eea032723..18d324dd349 100644 --- a/TAO/tao/Incoming_Message_Queue.h +++ b/TAO/tao/Incoming_Message_Queue.h @@ -195,7 +195,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "Incoming_Message_Queue.inl" +# include "tao/Incoming_Message_Queue.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Incoming_Message_Stack.cpp b/TAO/tao/Incoming_Message_Stack.cpp index e3c766c0902..8f704b65d9d 100644 --- a/TAO/tao/Incoming_Message_Stack.cpp +++ b/TAO/tao/Incoming_Message_Stack.cpp @@ -1,8 +1,8 @@ -# include "Incoming_Message_Stack.h" +# include "tao/Incoming_Message_Stack.h" #if !defined (__ACE_INLINE__) -# include "Incoming_Message_Stack.inl" +# include "tao/Incoming_Message_Stack.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (tao, diff --git a/TAO/tao/Incoming_Message_Stack.h b/TAO/tao/Incoming_Message_Stack.h index db6f5a7a912..81f268aa2cb 100755 --- a/TAO/tao/Incoming_Message_Stack.h +++ b/TAO/tao/Incoming_Message_Stack.h @@ -82,7 +82,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "Incoming_Message_Stack.inl" +# include "tao/Incoming_Message_Stack.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Intrusive_Ref_Count_Base_T.cpp b/TAO/tao/Intrusive_Ref_Count_Base_T.cpp index 482b9545346..2e25bad2b53 100644 --- a/TAO/tao/Intrusive_Ref_Count_Base_T.cpp +++ b/TAO/tao/Intrusive_Ref_Count_Base_T.cpp @@ -3,7 +3,7 @@ #ifndef TAO_INTRUSIVE_REF_COUNT_BASE_T_CPP #define TAO_INTRUSIVE_REF_COUNT_BASE_T_CPP -#include "Intrusive_Ref_Count_Base_T.h" +#include "tao/Intrusive_Ref_Count_Base_T.h" #if !defined (__ACE_INLINE__) #include "tao/Intrusive_Ref_Count_Base_T.inl" diff --git a/TAO/tao/Intrusive_Ref_Count_Base_T.h b/TAO/tao/Intrusive_Ref_Count_Base_T.h index e0df6c0c5d2..6c596d8f0f8 100644 --- a/TAO/tao/Intrusive_Ref_Count_Base_T.h +++ b/TAO/tao/Intrusive_Ref_Count_Base_T.h @@ -64,11 +64,11 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Intrusive_Ref_Count_Base_T.inl" +#include "tao/Intrusive_Ref_Count_Base_T.inl" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Intrusive_Ref_Count_Base_T.cpp" +#include "tao/Intrusive_Ref_Count_Base_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/tao/Intrusive_Ref_Count_Handle_T.cpp b/TAO/tao/Intrusive_Ref_Count_Handle_T.cpp index 3acff130173..5c8d02b76ba 100644 --- a/TAO/tao/Intrusive_Ref_Count_Handle_T.cpp +++ b/TAO/tao/Intrusive_Ref_Count_Handle_T.cpp @@ -3,7 +3,7 @@ #ifndef TAO_INTRUSIVE_REF_COUNT_HANDLE_T_CPP #define TAO_INTRUSIVE_REF_COUNT_HANDLE_T_CPP -#include "Intrusive_Ref_Count_Handle_T.h" +#include "tao/Intrusive_Ref_Count_Handle_T.h" #if !defined (__ACE_INLINE__) #include "tao/Intrusive_Ref_Count_Handle_T.inl" diff --git a/TAO/tao/Intrusive_Ref_Count_Handle_T.h b/TAO/tao/Intrusive_Ref_Count_Handle_T.h index fab5c62cb0e..5138d3ad281 100644 --- a/TAO/tao/Intrusive_Ref_Count_Handle_T.h +++ b/TAO/tao/Intrusive_Ref_Count_Handle_T.h @@ -143,11 +143,11 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Intrusive_Ref_Count_Handle_T.inl" +#include "tao/Intrusive_Ref_Count_Handle_T.inl" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Intrusive_Ref_Count_Handle_T.cpp" +#include "tao/Intrusive_Ref_Count_Handle_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp index f6edfb7f910..9d2cdb49e55 100644 --- a/TAO/tao/Invocation_Adapter.cpp +++ b/TAO/tao/Invocation_Adapter.cpp @@ -1,16 +1,16 @@ //$Id$ -#include "Invocation_Adapter.h" -#include "Profile_Transport_Resolver.h" -#include "operation_details.h" -#include "Stub.h" -#include "ORB_Core.h" -#include "Synch_Invocation.h" -#include "debug.h" -#include "Collocated_Invocation.h" -#include "Transport.h" -#include "Transport_Mux_Strategy.h" -#include "Collocation_Proxy_Broker.h" +#include "tao/Invocation_Adapter.h" +#include "tao/Profile_Transport_Resolver.h" +#include "tao/operation_details.h" +#include "tao/Stub.h" +#include "tao/ORB_Core.h" +#include "tao/Synch_Invocation.h" +#include "tao/debug.h" +#include "tao/Collocated_Invocation.h" +#include "tao/Transport.h" +#include "tao/Transport_Mux_Strategy.h" +#include "tao/Collocation_Proxy_Broker.h" #if !defined (__ACE_INLINE__) # include "tao/Invocation_Adapter.inl" diff --git a/TAO/tao/Invocation_Base.cpp b/TAO/tao/Invocation_Base.cpp index bc2d641348f..dd2ab25d2cf 100644 --- a/TAO/tao/Invocation_Base.cpp +++ b/TAO/tao/Invocation_Base.cpp @@ -1,19 +1,19 @@ -#include "Invocation_Base.h" -#include "Stub.h" -#include "operation_details.h" -#include "ORB_Core.h" -#include "SystemException.h" -#include "PortableInterceptor.h" /* Must always be visible. */ +#include "tao/Invocation_Base.h" +#include "tao/Stub.h" +#include "tao/operation_details.h" +#include "tao/ORB_Core.h" +#include "tao/SystemException.h" +#include "tao/PortableInterceptor.h" /* Must always be visible. */ #include "ace/Dynamic_Service.h" #if TAO_HAS_INTERCEPTORS == 1 -# include "PortableInterceptorC.h" -# include "ClientRequestInterceptor_Adapter_Factory.h" +# include "tao/PortableInterceptorC.h" +# include "tao/ClientRequestInterceptor_Adapter_Factory.h" #endif /* TAO_HAS_INTERCEPTORS == 1*/ #if !defined (__ACE_INLINE__) -# include "Invocation_Base.inl" +# include "tao/Invocation_Base.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Invocation_Base.h b/TAO/tao/Invocation_Base.h index 0d497371678..328127e9dc0 100644 --- a/TAO/tao/Invocation_Base.h +++ b/TAO/tao/Invocation_Base.h @@ -243,7 +243,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "Invocation_Base.inl" +# include "tao/Invocation_Base.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Invocation_Endpoint_Selectors.cpp b/TAO/tao/Invocation_Endpoint_Selectors.cpp index 353b0497203..6d6c0957427 100644 --- a/TAO/tao/Invocation_Endpoint_Selectors.cpp +++ b/TAO/tao/Invocation_Endpoint_Selectors.cpp @@ -4,10 +4,10 @@ #include "tao/Profile.h" #include "tao/ORB_Core.h" #include "tao/IIOP_Endpoint.h" -#include "Base_Transport_Property.h" -#include "Profile_Transport_Resolver.h" -#include "ORB_Constants.h" -#include "SystemException.h" +#include "tao/Base_Transport_Property.h" +#include "tao/Profile_Transport_Resolver.h" +#include "tao/ORB_Constants.h" +#include "tao/SystemException.h" ACE_RCSID (tao, Invocation_Endpoint_Selectors, diff --git a/TAO/tao/LF_CH_Event.cpp b/TAO/tao/LF_CH_Event.cpp index 267ea7f2b68..4e73d328828 100644 --- a/TAO/tao/LF_CH_Event.cpp +++ b/TAO/tao/LF_CH_Event.cpp @@ -1,4 +1,4 @@ -#include "LF_CH_Event.h" +#include "tao/LF_CH_Event.h" ACE_RCSID(tao, LF_Invocation_Event, diff --git a/TAO/tao/LF_CH_Event.h b/TAO/tao/LF_CH_Event.h index 7e1c49deeae..2a92f9007ab 100644 --- a/TAO/tao/LF_CH_Event.h +++ b/TAO/tao/LF_CH_Event.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "LF_Event.h" +#include "tao/LF_Event.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/LF_Connect_Strategy.cpp b/TAO/tao/LF_Connect_Strategy.cpp index f478faba32c..d1d71b550e3 100644 --- a/TAO/tao/LF_Connect_Strategy.cpp +++ b/TAO/tao/LF_Connect_Strategy.cpp @@ -1,9 +1,9 @@ -#include "LF_Connect_Strategy.h" -#include "Connection_Handler.h" -#include "LF_Follower.h" -#include "Leader_Follower.h" -#include "Transport.h" -#include "ORB_Core.h" +#include "tao/LF_Connect_Strategy.h" +#include "tao/Connection_Handler.h" +#include "tao/LF_Follower.h" +#include "tao/Leader_Follower.h" +#include "tao/Transport.h" +#include "tao/ORB_Core.h" #include "ace/Synch_Options.h" ACE_RCSID(tao, diff --git a/TAO/tao/LF_Connect_Strategy.h b/TAO/tao/LF_Connect_Strategy.h index 4ff1c8e1fbd..4cff8ed7976 100644 --- a/TAO/tao/LF_Connect_Strategy.h +++ b/TAO/tao/LF_Connect_Strategy.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "Connect_Strategy.h" +#include "tao/Connect_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/LF_Event.cpp b/TAO/tao/LF_Event.cpp index 933a1c8fd95..cc69d6fcea3 100644 --- a/TAO/tao/LF_Event.cpp +++ b/TAO/tao/LF_Event.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "LF_Event.h" -#include "LF_Follower.h" -#include "Leader_Follower.h" +#include "tao/LF_Event.h" +#include "tao/LF_Follower.h" +#include "tao/Leader_Follower.h" #include "ace/Guard_T.h" #if !defined (__ACE_INLINE__) diff --git a/TAO/tao/LF_Event.h b/TAO/tao/LF_Event.h index 63d2ff59d38..678be63cb3c 100644 --- a/TAO/tao/LF_Event.h +++ b/TAO/tao/LF_Event.h @@ -146,7 +146,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "LF_Event.inl" +# include "tao/LF_Event.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/LF_Invocation_Event.cpp b/TAO/tao/LF_Invocation_Event.cpp index dfabf54471a..fc42ec084fc 100644 --- a/TAO/tao/LF_Invocation_Event.cpp +++ b/TAO/tao/LF_Invocation_Event.cpp @@ -1,5 +1,5 @@ // -*- C++ -*- -#include "LF_Invocation_Event.h" +#include "tao/LF_Invocation_Event.h" ACE_RCSID(tao, LF_Invocation_Event, diff --git a/TAO/tao/LF_Invocation_Event.h b/TAO/tao/LF_Invocation_Event.h index 635acf16236..a3db772d40d 100644 --- a/TAO/tao/LF_Invocation_Event.h +++ b/TAO/tao/LF_Invocation_Event.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "LF_Event.h" +#include "tao/LF_Event.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/LRU_Connection_Purging_Strategy.cpp b/TAO/tao/LRU_Connection_Purging_Strategy.cpp index cdff7060b82..2b2b1f9472a 100644 --- a/TAO/tao/LRU_Connection_Purging_Strategy.cpp +++ b/TAO/tao/LRU_Connection_Purging_Strategy.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "LRU_Connection_Purging_Strategy.h" -#include "Transport.h" +#include "tao/LRU_Connection_Purging_Strategy.h" +#include "tao/Transport.h" ACE_RCSID (tao, LRU_Connection_Purging_Strategy, diff --git a/TAO/tao/Leader_Follower_Flushing_Strategy.h b/TAO/tao/Leader_Follower_Flushing_Strategy.h index db460e4bdea..421ec7a591f 100644 --- a/TAO/tao/Leader_Follower_Flushing_Strategy.h +++ b/TAO/tao/Leader_Follower_Flushing_Strategy.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "Flushing_Strategy.h" +#include "tao/Flushing_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/LocalObject.cpp b/TAO/tao/LocalObject.cpp index d5ff42f7401..9a7368f9ec4 100644 --- a/TAO/tao/LocalObject.cpp +++ b/TAO/tao/LocalObject.cpp @@ -1,14 +1,14 @@ // $Id$ -#include "LocalObject.h" +#include "tao/LocalObject.h" #if !defined (__ACE_INLINE__) -# include "LocalObject.i" +# include "tao/LocalObject.i" #endif /* ! __ACE_INLINE__ */ -#include "SystemException.h" -#include "debug.h" -#include "ORB_Constants.h" +#include "tao/SystemException.h" +#include "tao/debug.h" +#include "tao/ORB_Constants.h" #include "ace/Log_Msg.h" #include "ace/Guard_T.h" diff --git a/TAO/tao/LocalObject.h b/TAO/tao/LocalObject.h index 19aad779f2f..de2269da01b 100644 --- a/TAO/tao/LocalObject.h +++ b/TAO/tao/LocalObject.h @@ -29,7 +29,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Object.h" +#include "tao/Object.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -262,7 +262,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "LocalObject.i" +# include "tao/LocalObject.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/LocateRequest_Invocation.cpp b/TAO/tao/LocateRequest_Invocation.cpp index 746287c221b..dac9e76cec7 100644 --- a/TAO/tao/LocateRequest_Invocation.cpp +++ b/TAO/tao/LocateRequest_Invocation.cpp @@ -1,13 +1,13 @@ -#include "LocateRequest_Invocation.h" -#include "Profile_Transport_Resolver.h" -#include "operation_details.h" -#include "Stub.h" -#include "Bind_Dispatcher_Guard.h" -#include "Transport.h" -#include "Synch_Reply_Dispatcher.h" -#include "GIOP_Utils.h" -#include "Profile.h" -#include "ORB_Constants.h" +#include "tao/LocateRequest_Invocation.h" +#include "tao/Profile_Transport_Resolver.h" +#include "tao/operation_details.h" +#include "tao/Stub.h" +#include "tao/Bind_Dispatcher_Guard.h" +#include "tao/Transport.h" +#include "tao/Synch_Reply_Dispatcher.h" +#include "tao/GIOP_Utils.h" +#include "tao/Profile.h" +#include "tao/ORB_Constants.h" #include "ace/Countdown_Time.h" diff --git a/TAO/tao/LocateRequest_Invocation_Adapter.cpp b/TAO/tao/LocateRequest_Invocation_Adapter.cpp index 63d9c1b79b8..2d2e89c2f4f 100644 --- a/TAO/tao/LocateRequest_Invocation_Adapter.cpp +++ b/TAO/tao/LocateRequest_Invocation_Adapter.cpp @@ -1,10 +1,10 @@ -#include "LocateRequest_Invocation_Adapter.h" -#include "Profile_Transport_Resolver.h" -#include "operation_details.h" -#include "LocateRequest_Invocation.h" -#include "Transport.h" -#include "Transport_Mux_Strategy.h" -#include "ORB_Core.h" +#include "tao/LocateRequest_Invocation_Adapter.h" +#include "tao/Profile_Transport_Resolver.h" +#include "tao/operation_details.h" +#include "tao/LocateRequest_Invocation.h" +#include "tao/Transport.h" +#include "tao/Transport_Mux_Strategy.h" +#include "tao/ORB_Core.h" ACE_RCSID (tao, LocateRequest_Invocation_Adapter, diff --git a/TAO/tao/LongDoubleSeqC.cpp b/TAO/tao/LongDoubleSeqC.cpp index 200390bb76d..517b32ce0b5 100644 --- a/TAO/tao/LongDoubleSeqC.cpp +++ b/TAO/tao/LongDoubleSeqC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "LongDoubleSeqC.h" +#include "tao/LongDoubleSeqC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) diff --git a/TAO/tao/LongLongSeqC.cpp b/TAO/tao/LongLongSeqC.cpp index ffb82e048b9..0d0d0edc761 100644 --- a/TAO/tao/LongLongSeqC.cpp +++ b/TAO/tao/LongLongSeqC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "LongLongSeqC.h" +#include "tao/LongLongSeqC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) diff --git a/TAO/tao/LongSeqC.cpp b/TAO/tao/LongSeqC.cpp index 8c40c6bf9bb..9bcd5e632d1 100644 --- a/TAO/tao/LongSeqC.cpp +++ b/TAO/tao/LongSeqC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "LongSeqC.h" +#include "tao/LongSeqC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) diff --git a/TAO/tao/MCAST_Parser.cpp b/TAO/tao/MCAST_Parser.cpp index bc60a51a6a1..08a25649f56 100644 --- a/TAO/tao/MCAST_Parser.cpp +++ b/TAO/tao/MCAST_Parser.cpp @@ -1,9 +1,9 @@ -#include "MCAST_Parser.h" -#include "default_ports.h" -#include "ORB_Core.h" -#include "ORB.h" -#include "Environment.h" -#include "debug.h" +#include "tao/MCAST_Parser.h" +#include "tao/default_ports.h" +#include "tao/ORB_Core.h" +#include "tao/ORB.h" +#include "tao/Environment.h" +#include "tao/debug.h" #include "ace/SOCK_Acceptor.h" #include "ace/SOCK_Dgram.h" @@ -11,7 +11,7 @@ #include "ace/OS_NS_string.h" #if !defined(__ACE_INLINE__) -#include "MCAST_Parser.i" +#include "tao/MCAST_Parser.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/MCAST_Parser.h b/TAO/tao/MCAST_Parser.h index d1e1bfb1879..e4fc9560cd1 100644 --- a/TAO/tao/MCAST_Parser.h +++ b/TAO/tao/MCAST_Parser.h @@ -90,7 +90,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "MCAST_Parser.i" +# include "tao/MCAST_Parser.i" #endif /* __ACE_INLINE__ */ ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_MCAST_Parser) diff --git a/TAO/tao/Messaging/AMH_Response_Handler.h b/TAO/tao/Messaging/AMH_Response_Handler.h index 06be64337b8..738afa35200 100644 --- a/TAO/tao/Messaging/AMH_Response_Handler.h +++ b/TAO/tao/Messaging/AMH_Response_Handler.h @@ -13,7 +13,7 @@ #ifndef TAO_AMH_RESPONSE_HANDLER_H #define TAO_AMH_RESPONSE_HANDLER_H -#include "messaging_export.h" +#include "tao/Messaging/messaging_export.h" #include "tao/Allocator.h" #include "tao/Service_Context.h" diff --git a/TAO/tao/Messaging/Asynch_Invocation.cpp b/TAO/tao/Messaging/Asynch_Invocation.cpp index 32e740ca52c..893cab4df34 100644 --- a/TAO/tao/Messaging/Asynch_Invocation.cpp +++ b/TAO/tao/Messaging/Asynch_Invocation.cpp @@ -1,7 +1,7 @@ //$Id$ -#include "Asynch_Invocation.h" -#include "Asynch_Reply_Dispatcher.h" +#include "tao/Messaging/Asynch_Invocation.h" +#include "tao/Messaging/Asynch_Reply_Dispatcher.h" #include "tao/Profile_Transport_Resolver.h" #include "tao/Invocation_Utils.h" diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp index 95a8db3e29e..2aac8d8e9fd 100644 --- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp +++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp @@ -1,7 +1,7 @@ //$Id$ -#include "Asynch_Invocation_Adapter.h" -#include "Asynch_Reply_Dispatcher.h" -#include "Asynch_Invocation.h" +#include "tao/Messaging/Asynch_Invocation_Adapter.h" +#include "tao/Messaging/Asynch_Reply_Dispatcher.h" +#include "tao/Messaging/Asynch_Invocation.h" #include "tao/Profile_Transport_Resolver.h" #include "tao/operation_details.h" diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp index b1400a7d347..abdf3431e37 100644 --- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp +++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Asynch_Reply_Dispatcher.h" +#include "tao/Messaging/Asynch_Reply_Dispatcher.h" #include "tao/Pluggable_Messaging_Utils.h" #include "tao/ORB_Core.h" diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h index 2d08c925797..5b315547813 100644 --- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h +++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h @@ -16,13 +16,13 @@ #define TAO_ASYNCH_REPLY_DISPATCHER_H #include /**/ "ace/pre.h" -#include "Messaging.h" +#include "tao/Messaging/Messaging.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Asynch_Timeout_Handler.h" +#include "tao/Messaging/Asynch_Timeout_Handler.h" #include "tao/Asynch_Reply_Dispatcher_Base.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp b/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp index 97715bf8494..f72a1d46d85 100644 --- a/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp +++ b/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "Asynch_Timeout_Handler.h" +#include "tao/Messaging/Asynch_Timeout_Handler.h" -#include "Asynch_Reply_Dispatcher.h" +#include "tao/Messaging/Asynch_Reply_Dispatcher.h" #include "tao/Transport_Mux_Strategy.h" #include "ace/Reactor.h" diff --git a/TAO/tao/Messaging/Asynch_Timeout_Handler.h b/TAO/tao/Messaging/Asynch_Timeout_Handler.h index 3cb462d70b8..9b8a55eb8c2 100644 --- a/TAO/tao/Messaging/Asynch_Timeout_Handler.h +++ b/TAO/tao/Messaging/Asynch_Timeout_Handler.h @@ -19,7 +19,7 @@ #include /**/ "ace/pre.h" -#include "messaging_export.h" +#include "tao/Messaging/messaging_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp index ca3ab359a8d..4eaaa3bdc12 100644 --- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp +++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp @@ -1,5 +1,5 @@ //$Id$ -#include "Connection_Timeout_Policy_i.h" +#include "tao/Messaging/Connection_Timeout_Policy_i.h" #include "tao/ORB_Core.h" #include "tao/Stub.h" #include "tao/debug.h" diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h index 1bbfad80023..9e334a307a7 100644 --- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h +++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h @@ -21,7 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "TAO_ExtC.h" +#include "tao/Messaging/TAO_ExtC.h" #include "tao/LocalObject.h" #if defined(_MSC_VER) diff --git a/TAO/tao/Messaging/ExceptionHolderA.cpp b/TAO/tao/Messaging/ExceptionHolderA.cpp index 416dd45a937..99273a726d0 100644 --- a/TAO/tao/Messaging/ExceptionHolderA.cpp +++ b/TAO/tao/Messaging/ExceptionHolderA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "ExceptionHolderA.h" +#include "tao/Messaging/ExceptionHolderA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/Messaging/ExceptionHolderA.h b/TAO/tao/Messaging/ExceptionHolderA.h index 6559e3120ee..2efc2998af0 100644 --- a/TAO/tao/Messaging/ExceptionHolderA.h +++ b/TAO/tao/Messaging/ExceptionHolderA.h @@ -33,7 +33,7 @@ #include /**/ "ace/pre.h" -#include "messaging_export.h" +#include "tao/Messaging/messaging_export.h" #include "tao/Messaging/ExceptionHolderC.h" #include "tao/AnyTypeCode/OctetSeqA.h" #include "tao/AnyTypeCode/DynamicA.h" diff --git a/TAO/tao/Messaging/ExceptionHolderC.cpp b/TAO/tao/Messaging/ExceptionHolderC.cpp index 49c287cc953..3673c01c5a8 100644 --- a/TAO/tao/Messaging/ExceptionHolderC.cpp +++ b/TAO/tao/Messaging/ExceptionHolderC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "ExceptionHolderC.h" +#include "tao/Messaging/ExceptionHolderC.h" #include "tao/CDR.h" #include "tao/Valuetype/ValueFactory.h" #include "tao/ORB_Core.h" @@ -38,7 +38,7 @@ #if !defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER) #if !defined (__ACE_INLINE__) -#include "ExceptionHolderC.inl" +#include "tao/Messaging/ExceptionHolderC.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from diff --git a/TAO/tao/Messaging/ExceptionHolderC.h b/TAO/tao/Messaging/ExceptionHolderC.h index d5544db28f9..37848e2adcf 100644 --- a/TAO/tao/Messaging/ExceptionHolderC.h +++ b/TAO/tao/Messaging/ExceptionHolderC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "messaging_export.h" +#include "tao/Messaging/messaging_export.h" #include "tao/Valuetype/ValueBase.h" #include "tao/Valuetype/Valuetype_Adapter_Impl.h" #include "tao/ORB.h" @@ -286,7 +286,7 @@ TAO_Messaging_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Exc TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "ExceptionHolderC.inl" +#include "tao/Messaging/ExceptionHolderC.inl" #endif /* defined INLINE */ #endif diff --git a/TAO/tao/Messaging/Messaging.cpp b/TAO/tao/Messaging/Messaging.cpp index b695b68db5c..6f34e95f288 100644 --- a/TAO/tao/Messaging/Messaging.cpp +++ b/TAO/tao/Messaging/Messaging.cpp @@ -1,8 +1,8 @@ // -*- C++ -*- // $Id$ -#include "Messaging.h" -#include "Messaging_Loader.h" +#include "tao/Messaging/Messaging.h" +#include "tao/Messaging/Messaging_Loader.h" #include "tao/Exception_Data.h" #include "tao/debug.h" diff --git a/TAO/tao/Messaging/Messaging.h b/TAO/tao/Messaging/Messaging.h index 5dcfeeb49ee..4c4647e5432 100644 --- a/TAO/tao/Messaging/Messaging.h +++ b/TAO/tao/Messaging/Messaging.h @@ -17,14 +17,14 @@ #include /**/ "ace/pre.h" -#include "messaging_export.h" +#include "tao/Messaging/messaging_export.h" #define TAO_MESSAGING_SAFE_INCLUDE -#include "MessagingC.h" +#include "tao/Messaging/MessagingC.h" #undef TAO_MESSAGING_SAFE_INCLUDE -#include "MessagingA.h" -#include "TAO_ExtC.h" +#include "tao/Messaging/MessagingA.h" +#include "tao/Messaging/TAO_ExtC.h" #include "tao/TAOC.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/MessagingA.cpp b/TAO/tao/Messaging/MessagingA.cpp index fd18b39c162..d54d9ed1a34 100644 --- a/TAO/tao/Messaging/MessagingA.cpp +++ b/TAO/tao/Messaging/MessagingA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "Messaging.h" +#include "tao/Messaging/Messaging.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/Messaging/MessagingA.h b/TAO/tao/Messaging/MessagingA.h index 99c4e29ed37..05db49af523 100644 --- a/TAO/tao/Messaging/MessagingA.h +++ b/TAO/tao/Messaging/MessagingA.h @@ -33,7 +33,7 @@ #include /**/ "ace/pre.h" -#include "messaging_export.h" +#include "tao/Messaging/messaging_export.h" #include "tao/Messaging/MessagingC.h" #include "tao/Messaging/Messaging_SyncScope_PolicyA.h" #include "tao/Messaging/Messaging_RT_PolicyA.h" diff --git a/TAO/tao/Messaging/MessagingC.cpp b/TAO/tao/Messaging/MessagingC.cpp index 3916b1bb0e9..e8c429787c5 100644 --- a/TAO/tao/Messaging/MessagingC.cpp +++ b/TAO/tao/Messaging/MessagingC.cpp @@ -29,13 +29,13 @@ // be\be_codegen.cpp:277 -#include "Messaging.h" +#include "tao/Messaging/Messaging.h" #include "tao/CDR.h" #include "tao/Object_T.h" #include "ace/OS_NS_string.h" #if !defined (__ACE_INLINE__) -#include "MessagingC.inl" +#include "tao/Messaging/MessagingC.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from diff --git a/TAO/tao/Messaging/MessagingC.h b/TAO/tao/Messaging/MessagingC.h index 55375f75eab..ed12276ef97 100644 --- a/TAO/tao/Messaging/MessagingC.h +++ b/TAO/tao/Messaging/MessagingC.h @@ -44,7 +44,7 @@ #error "You should not include MessagingC.h directly, use Messaging.h" #endif /* !TAO_MESSAGING_SAFE_INCLUDE */ -#include "messaging_export.h" +#include "tao/Messaging/messaging_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" @@ -245,7 +245,7 @@ TAO_Messaging_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Rep TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "MessagingC.inl" +#include "tao/Messaging/MessagingC.inl" #endif /* defined INLINE */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Messaging/MessagingS.cpp b/TAO/tao/Messaging/MessagingS.cpp index 714f9cfac20..913acc12d64 100644 --- a/TAO/tao/Messaging/MessagingS.cpp +++ b/TAO/tao/Messaging/MessagingS.cpp @@ -33,7 +33,7 @@ #define _TAO_IDL_MESSAGINGS_CPP_ -#include "MessagingS.h" +#include "tao/Messaging/MessagingS.h" #include "tao/PortableServer/Operation_Table_Perfect_Hash.h" #include "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h" #include "tao/PortableServer/Upcall_Command.h" diff --git a/TAO/tao/Messaging/MessagingS.h b/TAO/tao/Messaging/MessagingS.h index 47e30a286a6..7c5f68e5eee 100644 --- a/TAO/tao/Messaging/MessagingS.h +++ b/TAO/tao/Messaging/MessagingS.h @@ -33,7 +33,7 @@ #include /**/ "ace/pre.h" -#include "Messaging.h" +#include "tao/Messaging/Messaging.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -205,7 +205,7 @@ namespace POA_Messaging TAO_END_VERSIONED_NAMESPACE_DECL -#include "MessagingS_T.h" +#include "tao/Messaging/MessagingS_T.h" #include /**/ "ace/post.h" diff --git a/TAO/tao/Messaging/MessagingS_T.cpp b/TAO/tao/Messaging/MessagingS_T.cpp index 1f53170dde1..c7390c0ad31 100644 --- a/TAO/tao/Messaging/MessagingS_T.cpp +++ b/TAO/tao/Messaging/MessagingS_T.cpp @@ -31,10 +31,10 @@ #ifndef _TAO_IDL_MESSAGINGS_T_CPP_ #define _TAO_IDL_MESSAGINGS_T_CPP_ -#include "MessagingS_T.h" +#include "tao/Messaging/MessagingS_T.h" #if !defined (__ACE_INLINE__) -#include "MessagingS_T.inl" +#include "tao/Messaging/MessagingS_T.inl" #endif /* !defined INLINE */ diff --git a/TAO/tao/Messaging/MessagingS_T.h b/TAO/tao/Messaging/MessagingS_T.h index 46541951dbb..c111885476a 100644 --- a/TAO/tao/Messaging/MessagingS_T.h +++ b/TAO/tao/Messaging/MessagingS_T.h @@ -98,11 +98,11 @@ namespace POA_Messaging TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "MessagingS_T.inl" +#include "tao/Messaging/MessagingS_T.inl" #endif /* defined INLINE */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "MessagingS_T.cpp" +#include "tao/Messaging/MessagingS_T.cpp" #endif /* defined REQUIRED SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/tao/Messaging/Messaging_Loader.cpp b/TAO/tao/Messaging/Messaging_Loader.cpp index 6d7cf2766e1..81555edbf4a 100644 --- a/TAO/tao/Messaging/Messaging_Loader.cpp +++ b/TAO/tao/Messaging/Messaging_Loader.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "Messaging_Loader.h" -#include "Messaging_ORBInitializer.h" +#include "tao/Messaging/Messaging_Loader.h" +#include "tao/Messaging/Messaging_ORBInitializer.h" #include "tao/debug.h" #include "tao/ORB_Core.h" diff --git a/TAO/tao/Messaging/Messaging_Loader.h b/TAO/tao/Messaging/Messaging_Loader.h index ed479d13e99..d15ee63f1c7 100644 --- a/TAO/tao/Messaging/Messaging_Loader.h +++ b/TAO/tao/Messaging/Messaging_Loader.h @@ -13,7 +13,7 @@ #include /**/ "ace/pre.h" -#include "messaging_export.h" +#include "tao/Messaging/messaging_export.h" #include "ace/Service_Object.h" #include "ace/Service_Config.h" diff --git a/TAO/tao/Messaging/Messaging_No_ImplA.cpp b/TAO/tao/Messaging/Messaging_No_ImplA.cpp index 8e39beebd03..bd636c617ee 100644 --- a/TAO/tao/Messaging/Messaging_No_ImplA.cpp +++ b/TAO/tao/Messaging/Messaging_No_ImplA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "Messaging_No_ImplA.h" +#include "tao/Messaging/Messaging_No_ImplA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/Messaging/Messaging_No_ImplA.h b/TAO/tao/Messaging/Messaging_No_ImplA.h index f6f30be698c..e11e3273d6c 100644 --- a/TAO/tao/Messaging/Messaging_No_ImplA.h +++ b/TAO/tao/Messaging/Messaging_No_ImplA.h @@ -33,7 +33,7 @@ #include /**/ "ace/pre.h" -#include "messaging_export.h" +#include "tao/Messaging/messaging_export.h" #include "tao/Messaging/Messaging_No_ImplC.h" #include "tao/AnyTypeCode/TimeBaseA.h" #include "tao/AnyTypeCode/PolicyA.h" diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.cpp b/TAO/tao/Messaging/Messaging_No_ImplC.cpp index 8ba47ccb99a..9615102b4f1 100644 --- a/TAO/tao/Messaging/Messaging_No_ImplC.cpp +++ b/TAO/tao/Messaging/Messaging_No_ImplC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "Messaging_No_ImplC.h" +#include "tao/Messaging/Messaging_No_ImplC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.h b/TAO/tao/Messaging/Messaging_No_ImplC.h index 87552735230..ba97ba1885e 100644 --- a/TAO/tao/Messaging/Messaging_No_ImplC.h +++ b/TAO/tao/Messaging/Messaging_No_ImplC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "messaging_export.h" +#include "tao/Messaging/messaging_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" diff --git a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp index 883d41db86b..16196807c78 100644 --- a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp +++ b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp @@ -1,11 +1,11 @@ // -*- C++ -*- -#include "Messaging_ORBInitializer.h" +#include "tao/Messaging/Messaging_ORBInitializer.h" -#include "Messaging_Policy_i.h" -#include "Connection_Timeout_Policy_i.h" -#include "Messaging_PolicyFactory.h" -#include "ExceptionHolder_i.h" +#include "tao/Messaging/Messaging_Policy_i.h" +#include "tao/Messaging/Connection_Timeout_Policy_i.h" +#include "tao/Messaging/Messaging_PolicyFactory.h" +#include "tao/Messaging/ExceptionHolder_i.h" #include "tao/ORB_Core.h" #include "tao/PI/ORBInitInfo.h" #include "tao/Valuetype/ValueFactory.h" diff --git a/TAO/tao/Messaging/Messaging_ORBInitializer.h b/TAO/tao/Messaging/Messaging_ORBInitializer.h index d937d417ad4..e5d57c2a72d 100644 --- a/TAO/tao/Messaging/Messaging_ORBInitializer.h +++ b/TAO/tao/Messaging/Messaging_ORBInitializer.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "messaging_export.h" +#include "tao/Messaging/messaging_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/Messaging/Messaging_PolicyFactory.cpp b/TAO/tao/Messaging/Messaging_PolicyFactory.cpp index 936c6fb5807..7fcda386a8b 100644 --- a/TAO/tao/Messaging/Messaging_PolicyFactory.cpp +++ b/TAO/tao/Messaging/Messaging_PolicyFactory.cpp @@ -1,11 +1,11 @@ -#include "Messaging_PolicyFactory.h" +#include "tao/Messaging/Messaging_PolicyFactory.h" ACE_RCSID (Messaging, Messaging_PolicyFactory, "$Id$") -#include "Messaging_Policy_i.h" -#include "Connection_Timeout_Policy_i.h" +#include "tao/Messaging/Messaging_Policy_i.h" +#include "tao/Messaging/Connection_Timeout_Policy_i.h" #include "tao/PolicyC.h" #include "tao/Buffering_Constraint_Policy.h" diff --git a/TAO/tao/Messaging/Messaging_PolicyFactory.h b/TAO/tao/Messaging/Messaging_PolicyFactory.h index a4e5d6e2aea..c2b36ed1a43 100644 --- a/TAO/tao/Messaging/Messaging_PolicyFactory.h +++ b/TAO/tao/Messaging/Messaging_PolicyFactory.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "messaging_export.h" +#include "tao/Messaging/messaging_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/Messaging/Messaging_Policy_i.cpp b/TAO/tao/Messaging/Messaging_Policy_i.cpp index 176ef89ab16..025f6018620 100644 --- a/TAO/tao/Messaging/Messaging_Policy_i.cpp +++ b/TAO/tao/Messaging/Messaging_Policy_i.cpp @@ -6,7 +6,7 @@ #include "tao/AnyTypeCode/Any.h" #if ! defined (__ACE_INLINE__) -#include "Messaging_Policy_i.i" +#include "tao/Messaging/Messaging_Policy_i.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (Messaging, diff --git a/TAO/tao/Messaging/Messaging_Policy_i.h b/TAO/tao/Messaging/Messaging_Policy_i.h index 38fd268ca99..588ea35d89b 100644 --- a/TAO/tao/Messaging/Messaging_Policy_i.h +++ b/TAO/tao/Messaging/Messaging_Policy_i.h @@ -156,7 +156,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Messaging_Policy_i.i" +#include "tao/Messaging/Messaging_Policy_i.i" #endif /* __ACE_INLINE__ */ #if defined(_MSC_VER) diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp b/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp index 16c8f6c7d0e..21854a2d37a 100644 --- a/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp +++ b/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "Messaging_RT_PolicyA.h" +#include "tao/Messaging/Messaging_RT_PolicyA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyA.h b/TAO/tao/Messaging/Messaging_RT_PolicyA.h index 3157100a186..97eb8c77a6a 100644 --- a/TAO/tao/Messaging/Messaging_RT_PolicyA.h +++ b/TAO/tao/Messaging/Messaging_RT_PolicyA.h @@ -33,7 +33,7 @@ #include /**/ "ace/pre.h" -#include "messaging_export.h" +#include "tao/Messaging/messaging_export.h" #include "tao/Messaging/Messaging_RT_PolicyC.h" #include "tao/AnyTypeCode/TimeBaseA.h" #include "tao/AnyTypeCode/PolicyA.h" diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp index 3e602455741..9fef86e1a69 100644 --- a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp +++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "Messaging_RT_PolicyC.h" +#include "tao/Messaging/Messaging_RT_PolicyC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.h b/TAO/tao/Messaging/Messaging_RT_PolicyC.h index 13ede4c1d54..7c084869fb8 100644 --- a/TAO/tao/Messaging/Messaging_RT_PolicyC.h +++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "messaging_export.h" +#include "tao/Messaging/messaging_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp b/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp index a09d5f5cd7d..a431f947a2c 100644 --- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp +++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "Messaging_SyncScope_PolicyA.h" +#include "tao/Messaging/Messaging_SyncScope_PolicyA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.h b/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.h index ba6ac73fb6d..f330605f5b5 100644 --- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.h +++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.h @@ -33,7 +33,7 @@ #include /**/ "ace/pre.h" -#include "messaging_export.h" +#include "tao/Messaging/messaging_export.h" #include "tao/Messaging/Messaging_SyncScope_PolicyC.h" #include "tao/AnyTypeCode/PolicyA.h" #include "tao/AnyTypeCode/Messaging_SyncScopeA.h" diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp index b58c9d4516b..df474e3ac0e 100644 --- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp +++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "Messaging_SyncScope_PolicyC.h" +#include "tao/Messaging/Messaging_SyncScope_PolicyC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h index 3452a884ae4..c22a5b02446 100644 --- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h +++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "messaging_export.h" +#include "tao/Messaging/messaging_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" diff --git a/TAO/tao/Messaging/OldExceptionHolderA.cpp b/TAO/tao/Messaging/OldExceptionHolderA.cpp index 467fb084ecb..133a1701ad9 100644 --- a/TAO/tao/Messaging/OldExceptionHolderA.cpp +++ b/TAO/tao/Messaging/OldExceptionHolderA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "OldExceptionHolderA.h" +#include "tao/Messaging/OldExceptionHolderA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/Messaging/OldExceptionHolderA.h b/TAO/tao/Messaging/OldExceptionHolderA.h index f7b5a946231..11613cef0bd 100644 --- a/TAO/tao/Messaging/OldExceptionHolderA.h +++ b/TAO/tao/Messaging/OldExceptionHolderA.h @@ -33,7 +33,7 @@ #include /**/ "ace/pre.h" -#include "messaging_export.h" +#include "tao/Messaging/messaging_export.h" #include "tao/Messaging/OldExceptionHolderC.h" #include "tao/AnyTypeCode/OctetSeqA.h" diff --git a/TAO/tao/Messaging/OldExceptionHolderC.cpp b/TAO/tao/Messaging/OldExceptionHolderC.cpp index c3aca20ad91..e26cccea3c6 100644 --- a/TAO/tao/Messaging/OldExceptionHolderC.cpp +++ b/TAO/tao/Messaging/OldExceptionHolderC.cpp @@ -29,12 +29,12 @@ // be\be_codegen.cpp:277 -#include "OldExceptionHolderC.h" +#include "tao/Messaging/OldExceptionHolderC.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" #if !defined (__ACE_INLINE__) -#include "OldExceptionHolderC.inl" +#include "tao/Messaging/OldExceptionHolderC.inl" #endif /* !defined INLINE */ #if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER) diff --git a/TAO/tao/Messaging/OldExceptionHolderC.h b/TAO/tao/Messaging/OldExceptionHolderC.h index b756d8a1107..a3bcc4ed8bb 100644 --- a/TAO/tao/Messaging/OldExceptionHolderC.h +++ b/TAO/tao/Messaging/OldExceptionHolderC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "messaging_export.h" +#include "tao/Messaging/messaging_export.h" #include "tao/Valuetype/ValueBase.h" #include "tao/Valuetype/Valuetype_Adapter_Impl.h" #include "tao/Valuetype/ValueFactory.h" @@ -293,7 +293,7 @@ TAO_Messaging_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Exc TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "OldExceptionHolderC.inl" +#include "tao/Messaging/OldExceptionHolderC.inl" #endif /* defined INLINE */ #endif /* */ diff --git a/TAO/tao/Messaging/PollableC.cpp b/TAO/tao/Messaging/PollableC.cpp index 7e2dc81be54..71789ae1651 100644 --- a/TAO/tao/Messaging/PollableC.cpp +++ b/TAO/tao/Messaging/PollableC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "PollableC.h" +#include "tao/Messaging/PollableC.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/Messaging/PollableC.h b/TAO/tao/Messaging/PollableC.h index 2dadea5c4bd..a8a9e8e9011 100644 --- a/TAO/tao/Messaging/PollableC.h +++ b/TAO/tao/Messaging/PollableC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "messaging_export.h" +#include "tao/Messaging/messaging_export.h" #include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/ORB.h" #include "tao/SystemException.h" diff --git a/TAO/tao/Messaging/TAO_ExtA.cpp b/TAO/tao/Messaging/TAO_ExtA.cpp index 73955e1533d..66682024c37 100644 --- a/TAO/tao/Messaging/TAO_ExtA.cpp +++ b/TAO/tao/Messaging/TAO_ExtA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "TAO_ExtA.h" +#include "tao/Messaging/TAO_ExtA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/Messaging/TAO_ExtA.h b/TAO/tao/Messaging/TAO_ExtA.h index 2655e7a426a..a0d32a204b9 100644 --- a/TAO/tao/Messaging/TAO_ExtA.h +++ b/TAO/tao/Messaging/TAO_ExtA.h @@ -33,7 +33,7 @@ #include /**/ "ace/pre.h" -#include "messaging_export.h" +#include "tao/Messaging/messaging_export.h" #include "tao/Messaging/TAO_ExtC.h" #include "tao/AnyTypeCode/PolicyA.h" #include "tao/AnyTypeCode/TimeBaseA.h" diff --git a/TAO/tao/Messaging/TAO_ExtC.cpp b/TAO/tao/Messaging/TAO_ExtC.cpp index a5e3dd66e03..03b5f8f2aa8 100644 --- a/TAO/tao/Messaging/TAO_ExtC.cpp +++ b/TAO/tao/Messaging/TAO_ExtC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "TAO_ExtC.h" +#include "tao/Messaging/TAO_ExtC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/Messaging/TAO_ExtC.h b/TAO/tao/Messaging/TAO_ExtC.h index 1e08d457080..630976761af 100644 --- a/TAO/tao/Messaging/TAO_ExtC.h +++ b/TAO/tao/Messaging/TAO_ExtC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "messaging_export.h" +#include "tao/Messaging/messaging_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" diff --git a/TAO/tao/Messaging_PolicyValueC.cpp b/TAO/tao/Messaging_PolicyValueC.cpp index 1cfb6fa1707..d9e437f2c76 100644 --- a/TAO/tao/Messaging_PolicyValueC.cpp +++ b/TAO/tao/Messaging_PolicyValueC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "Messaging_PolicyValueC.h" +#include "tao/Messaging_PolicyValueC.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" diff --git a/TAO/tao/Messaging_SyncScopeC.cpp b/TAO/tao/Messaging_SyncScopeC.cpp index 3a1bd37b406..3b1402d9033 100644 --- a/TAO/tao/Messaging_SyncScopeC.cpp +++ b/TAO/tao/Messaging_SyncScopeC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "Messaging_SyncScopeC.h" +#include "tao/Messaging_SyncScopeC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) diff --git a/TAO/tao/Muxed_TMS.cpp b/TAO/tao/Muxed_TMS.cpp index 8afed3554fe..68df7c44eb5 100644 --- a/TAO/tao/Muxed_TMS.cpp +++ b/TAO/tao/Muxed_TMS.cpp @@ -3,9 +3,9 @@ #include "tao/Muxed_TMS.h" #include "tao/Reply_Dispatcher.h" #include "tao/debug.h" -#include "Transport.h" -#include "ORB_Core.h" -#include "Client_Strategy_Factory.h" +#include "tao/Transport.h" +#include "tao/ORB_Core.h" +#include "tao/Client_Strategy_Factory.h" ACE_RCSID (tao, Muxed_TMS, diff --git a/TAO/tao/New_Leader_Generator.cpp b/TAO/tao/New_Leader_Generator.cpp index 5b540d4df6c..5edd8e55e60 100644 --- a/TAO/tao/New_Leader_Generator.cpp +++ b/TAO/tao/New_Leader_Generator.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "New_Leader_Generator.h" +#include "tao/New_Leader_Generator.h" ACE_RCSID (tao, diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index aadec2a4e02..a4554a2ed2b 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -1,37 +1,37 @@ // "$Id$" -#include "ORB.h" +#include "tao/ORB.h" ACE_RCSID (tao, ORB, "$Id$") -#include "ORB_Table.h" -#include "Connector_Registry.h" -#include "IOR_Parser.h" -#include "Stub.h" -#include "ORB_Core.h" -#include "ORB_Core_TSS_Resources.h" -#include "TAO_Internal.h" -#include "Dynamic_Adapter.h" -#include "Profile.h" -#include "default_ports.h" -#include "ORBInitializer_Registry_Adapter.h" -#include "PolicyFactory_Registry_Adapter.h" -#include "NVList_Adapter.h" -#include "TAO_Singleton_Manager.h" -#include "Policy_Current.h" -#include "Policy_Manager.h" -#include "Valuetype_Adapter.h" -#include "IFR_Client_Adapter.h" -#include "TypeCodeFactory_Adapter.h" -#include "debug.h" -#include "CDR.h" -#include "SystemException.h" -#include "default_environment.h" +#include "tao/ORB_Table.h" +#include "tao/Connector_Registry.h" +#include "tao/IOR_Parser.h" +#include "tao/Stub.h" +#include "tao/ORB_Core.h" +#include "tao/ORB_Core_TSS_Resources.h" +#include "tao/TAO_Internal.h" +#include "tao/Dynamic_Adapter.h" +#include "tao/Profile.h" +#include "tao/default_ports.h" +#include "tao/ORBInitializer_Registry_Adapter.h" +#include "tao/PolicyFactory_Registry_Adapter.h" +#include "tao/NVList_Adapter.h" +#include "tao/TAO_Singleton_Manager.h" +#include "tao/Policy_Current.h" +#include "tao/Policy_Manager.h" +#include "tao/Valuetype_Adapter.h" +#include "tao/IFR_Client_Adapter.h" +#include "tao/TypeCodeFactory_Adapter.h" +#include "tao/debug.h" +#include "tao/CDR.h" +#include "tao/SystemException.h" +#include "tao/default_environment.h" #if !defined (__ACE_INLINE__) -# include "ORB.i" +# include "tao/ORB.i" #endif /* ! __ACE_INLINE__ */ #include "ace/Dynamic_Service.h" diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index 55c9d7b0841..a02b90d56da 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -19,20 +19,20 @@ #include /**/ "ace/pre.h" -#include "UserException.h" +#include "tao/UserException.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orb_typesC.h" -#include "objectid.h" -#include "CORBA_methods.h" -#include "VarOut_T.h" -#include "Seq_Var_T.h" -#include "Seq_Out_T.h" -#include "Sequence_T.h" -#include "Policy_ForwardC.h" +#include "tao/orb_typesC.h" +#include "tao/objectid.h" +#include "tao/CORBA_methods.h" +#include "tao/VarOut_T.h" +#include "tao/Seq_Var_T.h" +#include "tao/Seq_Out_T.h" +#include "tao/Sequence_T.h" +#include "tao/Policy_ForwardC.h" #include "ace/Thread_Mutex.h" #include "ace/Guard_T.h" diff --git a/TAO/tao/ORBInitializer_Registry.cpp b/TAO/tao/ORBInitializer_Registry.cpp index 5f1646ae7b6..0d88b73a39c 100644 --- a/TAO/tao/ORBInitializer_Registry.cpp +++ b/TAO/tao/ORBInitializer_Registry.cpp @@ -1,10 +1,10 @@ -#include "ORBInitializer_Registry.h" -#include "ORBInitializer_Registry_Adapter.h" -#include "PortableInterceptorC.h" -#include "ORB.h" -#include "ORB_Constants.h" -#include "TAO_Singleton_Manager.h" -#include "SystemException.h" +#include "tao/ORBInitializer_Registry.h" +#include "tao/ORBInitializer_Registry_Adapter.h" +#include "tao/PortableInterceptorC.h" +#include "tao/ORB.h" +#include "tao/ORB_Constants.h" +#include "tao/TAO_Singleton_Manager.h" +#include "tao/SystemException.h" #include "ace/Service_Config.h" #include "ace/Dynamic_Service.h" diff --git a/TAO/tao/ORBInitializer_Registry_Adapter.cpp b/TAO/tao/ORBInitializer_Registry_Adapter.cpp index c55f31a03c2..1798764e211 100644 --- a/TAO/tao/ORBInitializer_Registry_Adapter.cpp +++ b/TAO/tao/ORBInitializer_Registry_Adapter.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ORBInitializer_Registry_Adapter.h" +#include "tao/ORBInitializer_Registry_Adapter.h" ACE_RCSID (tao, ORBInitializer_Registry_Adapter, diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 51ad4c9e13c..d5f0cfee092 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -1,45 +1,45 @@ // $Id$ -#include "ORB_Core.h" -#include "ORB_Core_TSS_Resources.h" -#include "ORB_Table.h" -#include "TAO_Internal.h" -#include "default_server.h" -#include "Profile.h" -#include "Stub.h" -#include "LF_Follower.h" -#include "Leader_Follower.h" -#include "LF_Event_Loop_Thread_Helper.h" -#include "Connector_Registry.h" -#include "Transport_Queueing_Strategies.h" -#include "Object_Loader.h" -#include "ObjectIdListC.h" -#include "BiDir_Adapter.h" -#include "Collocation_Resolver.h" -#include "Flushing_Strategy.h" -#include "Request_Dispatcher.h" -#include "Stub_Factory.h" -#include "Thread_Lane_Resources.h" -#include "Thread_Lane_Resources_Manager.h" -#include "TSS_Resources.h" -#include "Protocols_Hooks.h" -#include "IORInterceptor_Adapter.h" -#include "IORInterceptor_Adapter_Factory.h" -#include "debug.h" -#include "TAOC.h" -#include "Endpoint_Selector_Factory.h" -#include "Client_Strategy_Factory.h" -#include "Adapter_Factory.h" -#include "Adapter.h" -#include "GUIResource_Factory.h" -#include "PolicyFactory_Registry_Adapter.h" -#include "PolicyFactory_Registry_Factory.h" -#include "ORBInitializer_Registry_Adapter.h" -#include "Codeset_Manager.h" +#include "tao/ORB_Core.h" +#include "tao/ORB_Core_TSS_Resources.h" +#include "tao/ORB_Table.h" +#include "tao/TAO_Internal.h" +#include "tao/default_server.h" +#include "tao/Profile.h" +#include "tao/Stub.h" +#include "tao/LF_Follower.h" +#include "tao/Leader_Follower.h" +#include "tao/LF_Event_Loop_Thread_Helper.h" +#include "tao/Connector_Registry.h" +#include "tao/Transport_Queueing_Strategies.h" +#include "tao/Object_Loader.h" +#include "tao/ObjectIdListC.h" +#include "tao/BiDir_Adapter.h" +#include "tao/Collocation_Resolver.h" +#include "tao/Flushing_Strategy.h" +#include "tao/Request_Dispatcher.h" +#include "tao/Stub_Factory.h" +#include "tao/Thread_Lane_Resources.h" +#include "tao/Thread_Lane_Resources_Manager.h" +#include "tao/TSS_Resources.h" +#include "tao/Protocols_Hooks.h" +#include "tao/IORInterceptor_Adapter.h" +#include "tao/IORInterceptor_Adapter_Factory.h" +#include "tao/debug.h" +#include "tao/TAOC.h" +#include "tao/Endpoint_Selector_Factory.h" +#include "tao/Client_Strategy_Factory.h" +#include "tao/Adapter_Factory.h" +#include "tao/Adapter.h" +#include "tao/GUIResource_Factory.h" +#include "tao/PolicyFactory_Registry_Adapter.h" +#include "tao/PolicyFactory_Registry_Factory.h" +#include "tao/ORBInitializer_Registry_Adapter.h" +#include "tao/Codeset_Manager.h" #if (TAO_HAS_CORBA_MESSAGING == 1) -#include "Policy_Manager.h" -#include "Policy_Current.h" +#include "tao/Policy_Manager.h" +#include "tao/Policy_Current.h" #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ #include "ace/Reactor.h" @@ -68,7 +68,7 @@ #if !defined (__ACE_INLINE__) -# include "ORB_Core.i" +# include "tao/ORB_Core.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID (tao, diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index b1cf1e4aa3b..1b609460548 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -1397,7 +1397,7 @@ TAO_Export TAO_ORB_Core * TAO_ORB_Core_instance (void); TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "ORB_Core.i" +# include "tao/ORB_Core.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/ORB_Core_Auto_Ptr.cpp b/TAO/tao/ORB_Core_Auto_Ptr.cpp index 79a3ab24c05..068897c2c38 100644 --- a/TAO/tao/ORB_Core_Auto_Ptr.cpp +++ b/TAO/tao/ORB_Core_Auto_Ptr.cpp @@ -1,8 +1,8 @@ -#include "ORB_Core_Auto_Ptr.h" -#include "ORB_Core.h" +#include "tao/ORB_Core_Auto_Ptr.h" +#include "tao/ORB_Core.h" #if !defined (__ACE_INLINE__) -# include "ORB_Core_Auto_Ptr.inl" +# include "tao/ORB_Core_Auto_Ptr.inl" #endif /* !__ACE_INLINE */ ACE_RCSID (tao, diff --git a/TAO/tao/ORB_Core_Auto_Ptr.h b/TAO/tao/ORB_Core_Auto_Ptr.h index bdd016a35c1..19de5c918f1 100644 --- a/TAO/tao/ORB_Core_Auto_Ptr.h +++ b/TAO/tao/ORB_Core_Auto_Ptr.h @@ -71,7 +71,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "ORB_Core_Auto_Ptr.inl" +# include "tao/ORB_Core_Auto_Ptr.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/ORB_Table.cpp b/TAO/tao/ORB_Table.cpp index 27f48d6ee35..8624370348c 100644 --- a/TAO/tao/ORB_Table.cpp +++ b/TAO/tao/ORB_Table.cpp @@ -1,9 +1,9 @@ -#include "ORB_Table.h" -#include "ORB_Core.h" -#include "TAO_Singleton.h" +#include "tao/ORB_Table.h" +#include "tao/ORB_Core.h" +#include "tao/TAO_Singleton.h" #if !defined (__ACE_INLINE__) -# include "ORB_Table.inl" +# include "tao/ORB_Table.inl" #endif /* ! __ACE_INLINE__ */ #include "ace/SString.h" diff --git a/TAO/tao/ObjRefTemplate/Default_ORTA.cpp b/TAO/tao/ObjRefTemplate/Default_ORTA.cpp index 00e305d93aa..76d44538b45 100644 --- a/TAO/tao/ObjRefTemplate/Default_ORTA.cpp +++ b/TAO/tao/ObjRefTemplate/Default_ORTA.cpp @@ -31,7 +31,7 @@ #include "tao/AnyTypeCode/String_TypeCode_Static.h" #include "tao/AnyTypeCode/Value_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Value_Field.h" -#include "Default_ORTC.h" +#include "tao/ObjRefTemplate/Default_ORTC.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" diff --git a/TAO/tao/ObjRefTemplate/Default_ORTC.cpp b/TAO/tao/ObjRefTemplate/Default_ORTC.cpp index 0bc55fa009a..b3a94f7c90a 100644 --- a/TAO/tao/ObjRefTemplate/Default_ORTC.cpp +++ b/TAO/tao/ObjRefTemplate/Default_ORTC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "Default_ORTC.h" +#include "tao/ObjRefTemplate/Default_ORTC.h" #include "tao/CDR.h" #include "tao/Valuetype/ValueFactory.h" @@ -38,7 +38,7 @@ #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) -#include "Default_ORTC.inl" +#include "tao/ObjRefTemplate/Default_ORTC.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from diff --git a/TAO/tao/ObjRefTemplate/Default_ORTC.h b/TAO/tao/ObjRefTemplate/Default_ORTC.h index cab7c82bdaf..bf461b7efcd 100644 --- a/TAO/tao/ObjRefTemplate/Default_ORTC.h +++ b/TAO/tao/ObjRefTemplate/Default_ORTC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ort_export.h" +#include "tao/ObjRefTemplate/ort_export.h" #include "tao/Valuetype/ValueBase.h" #include "tao/Valuetype/Valuetype_Adapter_Impl.h" #include "tao/ORB.h" @@ -243,7 +243,7 @@ TAO_ORT_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_Default_ORT::Objec TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Default_ORTC.inl" +#include "tao/ObjRefTemplate/Default_ORTC.inl" #endif /* defined INLINE */ #if defined(_MSC_VER) diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp index 38ce436f69a..d670c3ab051 100644 --- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp +++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "ORT_Adapter_Factory_Impl.h" -#include "ORT_Adapter_Impl.h" +#include "tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h" +#include "tao/ObjRefTemplate/ORT_Adapter_Impl.h" #include "tao/PortableServer/Root_POA.h" ACE_RCSID (ORT, diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h index e9cc8aaeff8..397addb069c 100644 --- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h +++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h @@ -21,7 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ort_export.h" +#include "tao/ObjRefTemplate/ort_export.h" #include "tao/PortableServer/ORT_Adapter_Factory.h" #include "tao/Versioned_Namespace.h" diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp index b365be2a2fe..1e697edc9cc 100644 --- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp +++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ORT_Adapter_Impl.h" +#include "tao/ObjRefTemplate/ORT_Adapter_Impl.h" #include "tao/PortableServer/Root_POA.h" #include "tao/CORBA_String.h" #include "tao/ORB_Constants.h" diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h index 9fee609e67e..ff30c49bbdf 100644 --- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h +++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "ort_export.h" +#include "tao/ObjRefTemplate/ort_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp index d712cc5e368..2eda0aa733e 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp @@ -32,7 +32,7 @@ #include "tao/AnyTypeCode/String_TypeCode_Static.h" #include "tao/AnyTypeCode/Value_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Value_Field.h" -#include "ObjectReferenceTemplate.h" +#include "tao/ObjRefTemplate/ObjectReferenceTemplate.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp index f14130532ee..36ed1030c9d 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "ObjectReferenceTemplate.h" +#include "tao/ObjRefTemplate/ObjectReferenceTemplate.h" #include "tao/CDR.h" #include "tao/Exception_Data.h" #include "tao/Invocation_Adapter.h" @@ -44,7 +44,7 @@ #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) -#include "ObjectReferenceTemplateC.inl" +#include "tao/ObjRefTemplate/ObjectReferenceTemplateC.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h index e9508181cb4..7c95d92555f 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h @@ -43,7 +43,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ort_export.h" +#include "tao/ObjRefTemplate/ort_export.h" #include "tao/Valuetype/ValueBase.h" #include "tao/Valuetype/Valuetype_Adapter_Impl.h" #include "tao/ORB.h" @@ -435,7 +435,7 @@ TAO_ORT_Export CORBA::Boolean operator>> ( TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "ObjectReferenceTemplateC.inl" +#include "tao/ObjRefTemplate/ObjectReferenceTemplateC.inl" #endif /* defined INLINE */ #if defined(_MSC_VER) diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp index b221c065f93..5aade26a354 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp @@ -1,4 +1,4 @@ -#include "ObjectReferenceTemplate_i.h" +#include "tao/ObjRefTemplate/ObjectReferenceTemplate_i.h" #include "tao/PortableServer/Root_POA.h" #include "tao/CORBA_String.h" diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h index 595faa5ca9f..cb19700492a 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h @@ -24,7 +24,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Default_ORTC.h" +#include "tao/ObjRefTemplate/Default_ORTC.h" #include "tao/SystemException.h" #if defined(_MSC_VER) diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h index e8fa34cf1bb..bef52c5826e 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ort_export.h" +#include "tao/ObjRefTemplate/ort_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeS.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeS.h index 0d6946f8b84..65f2ae33b8a 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeS.h +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeS.h @@ -34,7 +34,7 @@ #include /**/ "ace/pre.h" #include "tao/ObjRefTemplate/ObjectReferenceTemplateS.h" -#include "ObjectReferenceTemplate_includeC.h" +#include "tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index 6be91ecde06..3521f5cb04a 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -6,19 +6,19 @@ // // ORB: CORBA::Object operations -#include "Object.h" -#include "Stub.h" -#include "Profile.h" -#include "ORB_Core.h" -#include "Connector_Registry.h" -#include "LocateRequest_Invocation_Adapter.h" -#include "debug.h" -#include "Dynamic_Adapter.h" -#include "IFR_Client_Adapter.h" -#include "Remote_Object_Proxy_Broker.h" -#include "CDR.h" -#include "SystemException.h" -#include "PolicyC.h" +#include "tao/Object.h" +#include "tao/Stub.h" +#include "tao/Profile.h" +#include "tao/ORB_Core.h" +#include "tao/Connector_Registry.h" +#include "tao/LocateRequest_Invocation_Adapter.h" +#include "tao/debug.h" +#include "tao/Dynamic_Adapter.h" +#include "tao/IFR_Client_Adapter.h" +#include "tao/Remote_Object_Proxy_Broker.h" +#include "tao/CDR.h" +#include "tao/SystemException.h" +#include "tao/PolicyC.h" #include "ace/Dynamic_Service.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/ObjectIdListC.cpp b/TAO/tao/ObjectIdListC.cpp index 470fa8d6fc0..ea194be0136 100644 --- a/TAO/tao/ObjectIdListC.cpp +++ b/TAO/tao/ObjectIdListC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "ObjectIdListC.h" +#include "tao/ObjectIdListC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) diff --git a/TAO/tao/ObjectKey_Table.cpp b/TAO/tao/ObjectKey_Table.cpp index d5e28d94c1b..2915c3dd7ec 100644 --- a/TAO/tao/ObjectKey_Table.cpp +++ b/TAO/tao/ObjectKey_Table.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "ObjectKey_Table.h" -#include "ORB_Core.h" -#include "Refcounted_ObjectKey.h" +#include "tao/ObjectKey_Table.h" +#include "tao/ORB_Core.h" +#include "tao/Refcounted_ObjectKey.h" ACE_RCSID(tao, ObjectKey_Table, diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp index 2ceb1720ec6..7e79e07d473 100644 --- a/TAO/tao/Object_KeyC.cpp +++ b/TAO/tao/Object_KeyC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "Object_KeyC.h" +#include "tao/Object_KeyC.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" diff --git a/TAO/tao/Object_Loader.cpp b/TAO/tao/Object_Loader.cpp index 6ffb86a0d59..5379fa97148 100644 --- a/TAO/tao/Object_Loader.cpp +++ b/TAO/tao/Object_Loader.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Object_Loader.h" +#include "tao/Object_Loader.h" ACE_RCSID (tao, Object_Loader, diff --git a/TAO/tao/Object_Ref_Table.cpp b/TAO/tao/Object_Ref_Table.cpp index 7042b31054b..f5f4554f1a9 100644 --- a/TAO/tao/Object_Ref_Table.cpp +++ b/TAO/tao/Object_Ref_Table.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "Object_Ref_Table.h" -#include "ORB.h" -#include "Environment.h" -#include "debug.h" -#include "ORB_Constants.h" -#include "SystemException.h" +#include "tao/Object_Ref_Table.h" +#include "tao/ORB.h" +#include "tao/Environment.h" +#include "tao/debug.h" +#include "tao/ORB_Constants.h" +#include "tao/SystemException.h" #include "ace/OS_NS_string.h" #include "ace/Log_Msg.h" diff --git a/TAO/tao/OctetSeqC.cpp b/TAO/tao/OctetSeqC.cpp index 430e3abb68e..c788364a799 100644 --- a/TAO/tao/OctetSeqC.cpp +++ b/TAO/tao/OctetSeqC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:288 -#include "OctetSeqC.h" +#include "tao/OctetSeqC.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" diff --git a/TAO/tao/PI/ClientRequestDetails.cpp b/TAO/tao/PI/ClientRequestDetails.cpp index 6dd19106e38..eda71934918 100644 --- a/TAO/tao/PI/ClientRequestDetails.cpp +++ b/TAO/tao/PI/ClientRequestDetails.cpp @@ -1,9 +1,9 @@ -#include "ClientRequestDetails.h" +#include "tao/PI/ClientRequestDetails.h" #if TAO_HAS_INTERCEPTORS == 1 #if !defined (__ACE_INLINE__) -#include "ClientRequestDetails.inl" +#include "tao/PI/ClientRequestDetails.inl" #endif /* defined INLINE */ ACE_RCSID (PI, diff --git a/TAO/tao/PI/ClientRequestDetails.h b/TAO/tao/PI/ClientRequestDetails.h index b8623c26662..ec4666ae047 100644 --- a/TAO/tao/PI/ClientRequestDetails.h +++ b/TAO/tao/PI/ClientRequestDetails.h @@ -30,7 +30,7 @@ #if TAO_HAS_INTERCEPTORS == 1 -#include "ProcessingModePolicyC.h" +#include "tao/PI/ProcessingModePolicyC.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -74,7 +74,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "ClientRequestDetails.inl" +#include "tao/PI/ClientRequestDetails.inl" #endif /* __ACE_INLINE__ */ #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/PI/ClientRequestInfo.cpp b/TAO/tao/PI/ClientRequestInfo.cpp index 4bd5af7ebdd..9a0baa762bf 100644 --- a/TAO/tao/PI/ClientRequestInfo.cpp +++ b/TAO/tao/PI/ClientRequestInfo.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ClientRequestInfo.h" +#include "tao/PI/ClientRequestInfo.h" #if TAO_HAS_INTERCEPTORS == 1 @@ -8,8 +8,8 @@ ACE_RCSID (PI, ClientRequestInfo, "$Id$") -#include "PICurrent.h" -#include "RequestInfo_Util.h" +#include "tao/PI/PICurrent.h" +#include "tao/PI/RequestInfo_Util.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/ExceptionA.h" diff --git a/TAO/tao/PI/ClientRequestInfo.h b/TAO/tao/PI/ClientRequestInfo.h index 091d500df06..9c5f732c549 100644 --- a/TAO/tao/PI/ClientRequestInfo.h +++ b/TAO/tao/PI/ClientRequestInfo.h @@ -32,10 +32,10 @@ #endif /* _MSC_VER */ #include "tao/CORBA_methods.h" -#include "ClientRequestInfoC.h" -#include "PIForwardRequestC.h" -#include "PICurrent_Impl.h" -#include "PICurrent_Copy_Callback.h" +#include "tao/PI/ClientRequestInfoC.h" +#include "tao/PI/PIForwardRequestC.h" +#include "tao/PI/PICurrent_Impl.h" +#include "tao/PI/PICurrent_Copy_Callback.h" #include "tao/ORB_Constants.h" #include "tao/LocalObject.h" #include "tao/Invocation_Utils.h" diff --git a/TAO/tao/PI/ClientRequestInfoA.cpp b/TAO/tao/PI/ClientRequestInfoA.cpp index c550083982f..aa30e9882c7 100644 --- a/TAO/tao/PI/ClientRequestInfoA.cpp +++ b/TAO/tao/PI/ClientRequestInfoA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "ClientRequestInfoA.h" +#include "tao/PI/ClientRequestInfoA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/PI/ClientRequestInfoC.cpp b/TAO/tao/PI/ClientRequestInfoC.cpp index 668c57b6967..007536ecfe1 100644 --- a/TAO/tao/PI/ClientRequestInfoC.cpp +++ b/TAO/tao/PI/ClientRequestInfoC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "ClientRequestInfoC.h" +#include "tao/PI/ClientRequestInfoC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/PI/ClientRequestInterceptorA.cpp b/TAO/tao/PI/ClientRequestInterceptorA.cpp index 41f26d62e49..b3c99cc3579 100644 --- a/TAO/tao/PI/ClientRequestInterceptorA.cpp +++ b/TAO/tao/PI/ClientRequestInterceptorA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "ClientRequestInterceptorA.h" +#include "tao/PI/ClientRequestInterceptorA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/PI/ClientRequestInterceptorC.cpp b/TAO/tao/PI/ClientRequestInterceptorC.cpp index 199069ab999..970c1ea6d1b 100644 --- a/TAO/tao/PI/ClientRequestInterceptorC.cpp +++ b/TAO/tao/PI/ClientRequestInterceptorC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "ClientRequestInterceptorC.h" +#include "tao/PI/ClientRequestInterceptorC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp index 4c15fb3bd61..741d185e2b9 100644 --- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp +++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp @@ -1,12 +1,12 @@ -#include "ClientRequestInterceptor_Adapter_Impl.h" +#include "tao/PI/ClientRequestInterceptor_Adapter_Impl.h" #if TAO_HAS_INTERCEPTORS == 1 #if !defined (__ACE_INLINE__) -#include "ClientRequestInterceptor_Adapter_Impl.inl" +#include "tao/PI/ClientRequestInterceptor_Adapter_Impl.inl" #endif /* defined INLINE */ -#include "ClientRequestInfo.h" +#include "tao/PI/ClientRequestInfo.h" #include "tao/Invocation_Base.h" #include "tao/ORB_Core.h" diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h index a4145cfd95a..4b1a7ebc70c 100644 --- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h +++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h @@ -30,9 +30,9 @@ #if TAO_HAS_INTERCEPTORS == 1 -#include "Interceptor_List_T.h" -#include "ClientRequestInterceptorC.h" -#include "ClientRequestDetails.h" +#include "tao/PI/Interceptor_List_T.h" +#include "tao/PI/ClientRequestInterceptorC.h" +#include "tao/PI/ClientRequestDetails.h" #include "tao/ClientRequestInterceptor_Adapter.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -132,7 +132,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "ClientRequestInterceptor_Adapter_Impl.inl" +#include "tao/PI/ClientRequestInterceptor_Adapter_Impl.inl" #endif /* __ACE_INLINE__ */ #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp index 4a6aee7b43d..e4ff27b2c9b 100644 --- a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp +++ b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp @@ -11,11 +11,11 @@ */ // ================================================================= -#include "ClientRequestInterceptor_Factory_Impl.h" +#include "tao/PI/ClientRequestInterceptor_Factory_Impl.h" #if TAO_HAS_INTERCEPTORS == 1 -#include "ClientRequestInterceptor_Adapter_Impl.h" +#include "tao/PI/ClientRequestInterceptor_Adapter_Impl.h" #include "tao/ORB.h" #include "tao/debug.h" diff --git a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h index 95985693ff8..f63b6ca3407 100644 --- a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h +++ b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "pi_export.h" +#include "tao/PI/pi_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PI/InterceptorA.cpp b/TAO/tao/PI/InterceptorA.cpp index 290604176d3..20c37dc8d94 100644 --- a/TAO/tao/PI/InterceptorA.cpp +++ b/TAO/tao/PI/InterceptorA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "InterceptorA.h" +#include "tao/PI/InterceptorA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/PI/InterceptorC.cpp b/TAO/tao/PI/InterceptorC.cpp index eda67ffce4c..d7f673c3dfb 100644 --- a/TAO/tao/PI/InterceptorC.cpp +++ b/TAO/tao/PI/InterceptorC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "InterceptorC.h" +#include "tao/PI/InterceptorC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/PI/Interceptor_List_T.cpp b/TAO/tao/PI/Interceptor_List_T.cpp index a62542fc6b8..657f69213ad 100644 --- a/TAO/tao/PI/Interceptor_List_T.cpp +++ b/TAO/tao/PI/Interceptor_List_T.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "ORBInitInfoC.h" -#include "InterceptorC.h" +#include "tao/PI/ORBInitInfoC.h" +#include "tao/PI/InterceptorC.h" #include "tao/SystemException.h" #include "tao/ORB_Constants.h" #include "tao/debug.h" diff --git a/TAO/tao/PI/Interceptor_List_T.h b/TAO/tao/PI/Interceptor_List_T.h index 24f7d0c1e5d..5160ec03377 100644 --- a/TAO/tao/PI/Interceptor_List_T.h +++ b/TAO/tao/PI/Interceptor_List_T.h @@ -96,7 +96,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Interceptor_List_T.cpp" +#include "tao/PI/Interceptor_List_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/tao/PI/InvalidSlotA.cpp b/TAO/tao/PI/InvalidSlotA.cpp index fcd0d8612d4..1c099df47c0 100644 --- a/TAO/tao/PI/InvalidSlotA.cpp +++ b/TAO/tao/PI/InvalidSlotA.cpp @@ -33,7 +33,7 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -#include "InvalidSlotA.h" +#include "tao/PI/InvalidSlotA.h" #include "tao/CDR.h" diff --git a/TAO/tao/PI/InvalidSlotC.cpp b/TAO/tao/PI/InvalidSlotC.cpp index d0c59762242..e70f2b68fb2 100644 --- a/TAO/tao/PI/InvalidSlotC.cpp +++ b/TAO/tao/PI/InvalidSlotC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "InvalidSlotA.h" +#include "tao/PI/InvalidSlotA.h" #include "tao/CDR.h" #include "tao/SystemException.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/PI/ORBInitInfo.cpp b/TAO/tao/PI/ORBInitInfo.cpp index 787c3b858ee..ee0da173328 100644 --- a/TAO/tao/PI/ORBInitInfo.cpp +++ b/TAO/tao/PI/ORBInitInfo.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ORBInitInfo.h" +#include "tao/PI/ORBInitInfo.h" #include "tao/ORB_Core.h" #include "tao/ORB.h" #include "tao/SystemException.h" @@ -11,7 +11,7 @@ #include "ace/Service_Config.h" #if TAO_HAS_INTERCEPTORS == 1 -#include "PICurrent.h" +#include "tao/PI/PICurrent.h" #endif /* TAO_HAS_INTERCEPTORS == 1 */ ACE_RCSID (TAO, @@ -19,7 +19,7 @@ ACE_RCSID (TAO, "$Id$") #if !defined (__ACE_INLINE__) -#include "ORBInitInfo.inl" +#include "tao/PI/ORBInitInfo.inl" #endif /* defined INLINE */ #include "ace/OS_NS_string.h" diff --git a/TAO/tao/PI/ORBInitInfo.h b/TAO/tao/PI/ORBInitInfo.h index 729d9ecac13..63c78095104 100644 --- a/TAO/tao/PI/ORBInitInfo.h +++ b/TAO/tao/PI/ORBInitInfo.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "pi_export.h" +#include "tao/PI/pi_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ORBInitInfoC.h" +#include "tao/PI/ORBInitInfoC.h" #include "tao/LocalObject.h" // This is to remove "inherits via dominance" warnings from MSVC. @@ -328,7 +328,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "ORBInitInfo.inl" +#include "tao/PI/ORBInitInfo.inl" #endif /* __ACE_INLINE__ */ #if defined(_MSC_VER) diff --git a/TAO/tao/PI/ORBInitInfoC.cpp b/TAO/tao/PI/ORBInitInfoC.cpp index 52663736295..6fee3193261 100644 --- a/TAO/tao/PI/ORBInitInfoC.cpp +++ b/TAO/tao/PI/ORBInitInfoC.cpp @@ -29,7 +29,7 @@ // be/be_codegen.cpp:292 -#include "ORBInitInfoC.h" +#include "tao/PI/ORBInitInfoC.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/PI/ORBInitializerA.cpp b/TAO/tao/PI/ORBInitializerA.cpp index 83a81a36b55..14a39962574 100644 --- a/TAO/tao/PI/ORBInitializerA.cpp +++ b/TAO/tao/PI/ORBInitializerA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "ORBInitializerA.h" +#include "tao/PI/ORBInitializerA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/PI/ORBInitializerC.cpp b/TAO/tao/PI/ORBInitializerC.cpp index b476a04c6b2..28476830769 100644 --- a/TAO/tao/PI/ORBInitializerC.cpp +++ b/TAO/tao/PI/ORBInitializerC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "ORBInitializerC.h" +#include "tao/PI/ORBInitializerC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp index 5995fe59eac..919abb2706e 100644 --- a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp +++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp @@ -1,6 +1,6 @@ -#include "ORBInitializer_Registry_Impl.h" -#include "ORBInitInfo.h" -#include "PICurrent.h" +#include "tao/PI/ORBInitializer_Registry_Impl.h" +#include "tao/PI/ORBInitInfo.h" +#include "tao/PI/PICurrent.h" #include "tao/ORB_Core.h" #include "tao/ORB_Constants.h" diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.h b/TAO/tao/PI/ORBInitializer_Registry_Impl.h index 188408562e5..edb5a2bfc26 100644 --- a/TAO/tao/PI/ORBInitializer_Registry_Impl.h +++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "pi_export.h" +#include "tao/PI/pi_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "PI.h" +#include "tao/PI/PI.h" #include "tao/CORBA_methods.h" #include "tao/Objref_VarOut_T.h" diff --git a/TAO/tao/PI/PI.cpp b/TAO/tao/PI/PI.cpp index 5fe8f1dca9e..3e18928cf8c 100644 --- a/TAO/tao/PI/PI.cpp +++ b/TAO/tao/PI/PI.cpp @@ -1,9 +1,9 @@ -#include "PI.h" -#include "ORBInitializer_Registry_Impl.h" -#include "PolicyFactory_Loader.h" -#include "ClientRequestInterceptor_Factory_Impl.h" -#include "PICurrent_Loader.h" -#include "PI_ORBInitializer.h" +#include "tao/PI/PI.h" +#include "tao/PI/ORBInitializer_Registry_Impl.h" +#include "tao/PI/PolicyFactory_Loader.h" +#include "tao/PI/ClientRequestInterceptor_Factory_Impl.h" +#include "tao/PI/PICurrent_Loader.h" +#include "tao/PI/PI_ORBInitializer.h" #include "tao/ORBInitializer_Registry.h" #include "tao/ORB_Constants.h" diff --git a/TAO/tao/PI/PI.h b/TAO/tao/PI/PI.h index 514bde89974..da45315f182 100644 --- a/TAO/tao/PI/PI.h +++ b/TAO/tao/PI/PI.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "pi_export.h" +#include "tao/PI/pi_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -46,13 +46,13 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" #define TAO_PI_SAFE_INCLUDE -#include "ORBInitInfoC.h" -#include "PolicyFactoryC.h" -#include "ORBInitializerC.h" -#include "InterceptorC.h" -#include "ClientRequestInfoC.h" -#include "ClientRequestInterceptorC.h" -#include "PICurrentC.h" +#include "tao/PI/ORBInitInfoC.h" +#include "tao/PI/PolicyFactoryC.h" +#include "tao/PI/ORBInitializerC.h" +#include "tao/PI/InterceptorC.h" +#include "tao/PI/ClientRequestInfoC.h" +#include "tao/PI/ClientRequestInterceptorC.h" +#include "tao/PI/PICurrentC.h" #undef TAO_PI_SAFE_INCLUDE #endif /* TAO_PI_H */ diff --git a/TAO/tao/PI/PICurrent.cpp b/TAO/tao/PI/PICurrent.cpp index 4ef4820f623..1212598ae47 100644 --- a/TAO/tao/PI/PICurrent.cpp +++ b/TAO/tao/PI/PICurrent.cpp @@ -1,4 +1,4 @@ -#include "PICurrent.h" +#include "tao/PI/PICurrent.h" #if TAO_HAS_INTERCEPTORS == 1 @@ -8,10 +8,10 @@ ACE_RCSID (tao, #if !defined (__ACE_INLINE__) -# include "PICurrent.inl" +# include "tao/PI/PICurrent.inl" #endif /* __ACE_INLINE__ */ -#include "PICurrent_Impl.h" +#include "tao/PI/PICurrent_Impl.h" #include "tao/ORB_Core.h" #include "tao/ORB_Core_TSS_Resources.h" diff --git a/TAO/tao/PI/PICurrent.h b/TAO/tao/PI/PICurrent.h index c0354474538..1425f5eec74 100644 --- a/TAO/tao/PI/PICurrent.h +++ b/TAO/tao/PI/PICurrent.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "pi_export.h" +#include "tao/PI/pi_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,7 +25,7 @@ #if TAO_HAS_INTERCEPTORS == 1 -#include "PICurrentC.h" +#include "tao/PI/PICurrentC.h" #include "tao/LocalObject.h" #include "ace/Array_Base.h" @@ -139,7 +139,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "PICurrent.inl" +# include "tao/PI/PICurrent.inl" #endif /* __ACE_INLINE__ */ #if defined(_MSC_VER) diff --git a/TAO/tao/PI/PICurrentA.cpp b/TAO/tao/PI/PICurrentA.cpp index a10e9724137..bd234b398fd 100644 --- a/TAO/tao/PI/PICurrentA.cpp +++ b/TAO/tao/PI/PICurrentA.cpp @@ -32,7 +32,7 @@ #include "tao/AnyTypeCode/String_TypeCode_Static.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" -#include "PICurrentA.h" +#include "tao/PI/PICurrentA.h" #include "tao/CDR.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/PICurrentA.h b/TAO/tao/PI/PICurrentA.h index 668e6ba90cb..f9096ff2667 100644 --- a/TAO/tao/PI/PICurrentA.h +++ b/TAO/tao/PI/PICurrentA.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "pi_export.h" +#include "tao/PI/pi_export.h" #include "tao/PI/PICurrentC.h" #if defined (TAO_EXPORT_MACRO) diff --git a/TAO/tao/PI/PICurrentC.cpp b/TAO/tao/PI/PICurrentC.cpp index b99624f3c2b..79c119255e9 100644 --- a/TAO/tao/PI/PICurrentC.cpp +++ b/TAO/tao/PI/PICurrentC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "PICurrentC.h" +#include "tao/PI/PICurrentC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/PI/PICurrentC.h b/TAO/tao/PI/PICurrentC.h index ba9e11adddb..92e2360bbbb 100644 --- a/TAO/tao/PI/PICurrentC.h +++ b/TAO/tao/PI/PICurrentC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "pi_export.h" +#include "tao/PI/pi_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" diff --git a/TAO/tao/PI/PICurrent_Copy_Callback.cpp b/TAO/tao/PI/PICurrent_Copy_Callback.cpp index 58907234850..9332b9c986a 100644 --- a/TAO/tao/PI/PICurrent_Copy_Callback.cpp +++ b/TAO/tao/PI/PICurrent_Copy_Callback.cpp @@ -1,8 +1,8 @@ -#include "PICurrent_Copy_Callback.h" +#include "tao/PI/PICurrent_Copy_Callback.h" #if TAO_HAS_INTERCEPTORS == 1 -#include "PICurrent_Impl.h" +#include "tao/PI/PICurrent_Impl.h" ACE_RCSID (tao, PICurrent_Copy_Callback, diff --git a/TAO/tao/PI/PICurrent_Copy_Callback.h b/TAO/tao/PI/PICurrent_Copy_Callback.h index c4df1367f6e..76f550e652f 100644 --- a/TAO/tao/PI/PICurrent_Copy_Callback.h +++ b/TAO/tao/PI/PICurrent_Copy_Callback.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "pi_export.h" +#include "tao/PI/pi_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PI/PICurrent_Impl.cpp b/TAO/tao/PI/PICurrent_Impl.cpp index 5e158035647..4aa071e258c 100644 --- a/TAO/tao/PI/PICurrent_Impl.cpp +++ b/TAO/tao/PI/PICurrent_Impl.cpp @@ -1,4 +1,4 @@ -#include "PICurrent_Impl.h" +#include "tao/PI/PICurrent_Impl.h" #if TAO_HAS_INTERCEPTORS == 1 @@ -8,10 +8,10 @@ ACE_RCSID (tao, #if !defined (__ACE_INLINE__) -# include "PICurrent_Impl.inl" +# include "tao/PI/PICurrent_Impl.inl" #endif /* __ACE_INLINE__ */ -#include "PICurrent_Copy_Callback.h" +#include "tao/PI/PICurrent_Copy_Callback.h" #include "tao/TAO_Server_Request.h" #include "tao/SystemException.h" diff --git a/TAO/tao/PI/PICurrent_Impl.h b/TAO/tao/PI/PICurrent_Impl.h index 9c8e3f25b29..b7d624a4c9b 100644 --- a/TAO/tao/PI/PICurrent_Impl.h +++ b/TAO/tao/PI/PICurrent_Impl.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "pi_export.h" +#include "tao/PI/pi_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,7 +25,7 @@ #if TAO_HAS_INTERCEPTORS == 1 -#include "PICurrentC.h" +#include "tao/PI/PICurrentC.h" #include "tao/AnyTypeCode/Any.h" #include "ace/Array_Base.h" @@ -147,7 +147,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "PICurrent_Impl.inl" +# include "tao/PI/PICurrent_Impl.inl" #endif /* __ACE_INLINE__ */ #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/PI/PICurrent_Loader.cpp b/TAO/tao/PI/PICurrent_Loader.cpp index e0c38011bf1..639ad627d58 100644 --- a/TAO/tao/PI/PICurrent_Loader.cpp +++ b/TAO/tao/PI/PICurrent_Loader.cpp @@ -11,11 +11,11 @@ */ // ================================================================= -#include "PICurrent_Loader.h" +#include "tao/PI/PICurrent_Loader.h" #if TAO_HAS_INTERCEPTORS == 1 -#include "PICurrent.h" +#include "tao/PI/PICurrent.h" #include "tao/ORB.h" #include "tao/ORB_Core.h" diff --git a/TAO/tao/PI/PICurrent_Loader.h b/TAO/tao/PI/PICurrent_Loader.h index 3cac77a3754..a1b4e48cfa9 100644 --- a/TAO/tao/PI/PICurrent_Loader.h +++ b/TAO/tao/PI/PICurrent_Loader.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "pi_export.h" +#include "tao/PI/pi_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PI/PIForwardRequestA.cpp b/TAO/tao/PI/PIForwardRequestA.cpp index 7e068a2c524..4553d880091 100644 --- a/TAO/tao/PI/PIForwardRequestA.cpp +++ b/TAO/tao/PI/PIForwardRequestA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "PIForwardRequestA.h" +#include "tao/PI/PIForwardRequestA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/PI/PIForwardRequestC.cpp b/TAO/tao/PI/PIForwardRequestC.cpp index 9e24f47bb6f..4ed08fabe20 100644 --- a/TAO/tao/PI/PIForwardRequestC.cpp +++ b/TAO/tao/PI/PIForwardRequestC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "PIForwardRequestC.h" +#include "tao/PI/PIForwardRequestC.h" #include "tao/CDR.h" #include "tao/SystemException.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/PI/PI_ORBInitializer.cpp b/TAO/tao/PI/PI_ORBInitializer.cpp index 1eeee59a318..c138481d1ee 100644 --- a/TAO/tao/PI/PI_ORBInitializer.cpp +++ b/TAO/tao/PI/PI_ORBInitializer.cpp @@ -7,7 +7,7 @@ #include "tao/PI/PI_PolicyFactory.h" #include "tao/PI/ProcessingModePolicyC.h" #include "tao/ORB_Core.h" -#include "ORBInitInfoC.h" +#include "tao/PI/ORBInitInfoC.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/PI_ORBInitializer.h b/TAO/tao/PI/PI_ORBInitializer.h index 4b381d121ca..92d62abfef6 100644 --- a/TAO/tao/PI/PI_ORBInitializer.h +++ b/TAO/tao/PI/PI_ORBInitializer.h @@ -19,15 +19,15 @@ #if TAO_HAS_INTERCEPTORS == 1 -#include "pi_export.h" +#include "tao/PI/pi_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/LocalObject.h" -#include "ORBInitializerC.h" -#include "PolicyFactoryC.h" +#include "tao/PI/ORBInitializerC.h" +#include "tao/PI/PolicyFactoryC.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/PI_PolicyFactory.h b/TAO/tao/PI/PI_PolicyFactory.h index 72101536716..eb7e4968015 100644 --- a/TAO/tao/PI/PI_PolicyFactory.h +++ b/TAO/tao/PI/PI_PolicyFactory.h @@ -19,14 +19,14 @@ #if TAO_HAS_INTERCEPTORS == 1 -#include "pi_export.h" +#include "tao/PI/pi_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/LocalObject.h" -#include "PolicyFactoryC.h" +#include "tao/PI/PolicyFactoryC.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/PolicyFactoryA.cpp b/TAO/tao/PI/PolicyFactoryA.cpp index c6e151c09c7..ba611cec358 100644 --- a/TAO/tao/PI/PolicyFactoryA.cpp +++ b/TAO/tao/PI/PolicyFactoryA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "PolicyFactoryA.h" +#include "tao/PI/PolicyFactoryA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/PI/PolicyFactoryC.cpp b/TAO/tao/PI/PolicyFactoryC.cpp index 0d4657699c2..49c458fd6be 100644 --- a/TAO/tao/PI/PolicyFactoryC.cpp +++ b/TAO/tao/PI/PolicyFactoryC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "PolicyFactoryC.h" +#include "tao/PI/PolicyFactoryC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/PI/PolicyFactory_Loader.cpp b/TAO/tao/PI/PolicyFactory_Loader.cpp index cdf999d5dcf..3b8e49f062c 100644 --- a/TAO/tao/PI/PolicyFactory_Loader.cpp +++ b/TAO/tao/PI/PolicyFactory_Loader.cpp @@ -11,8 +11,8 @@ */ // ================================================================= -#include "PolicyFactory_Loader.h" -#include "PolicyFactory_Registry.h" +#include "tao/PI/PolicyFactory_Loader.h" +#include "tao/PI/PolicyFactory_Registry.h" #include "tao/ORB.h" #include "tao/debug.h" diff --git a/TAO/tao/PI/PolicyFactory_Loader.h b/TAO/tao/PI/PolicyFactory_Loader.h index 45b6792a09a..a25c378676e 100644 --- a/TAO/tao/PI/PolicyFactory_Loader.h +++ b/TAO/tao/PI/PolicyFactory_Loader.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "pi_export.h" +#include "tao/PI/pi_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PI/PolicyFactory_Registry.cpp b/TAO/tao/PI/PolicyFactory_Registry.cpp index bf3b3ea65ac..e97382928c8 100644 --- a/TAO/tao/PI/PolicyFactory_Registry.cpp +++ b/TAO/tao/PI/PolicyFactory_Registry.cpp @@ -1,5 +1,5 @@ -#include "PolicyFactory_Registry.h" -#include "PolicyFactoryC.h" +#include "tao/PI/PolicyFactory_Registry.h" +#include "tao/PI/PolicyFactoryC.h" #include "tao/ORB_Constants.h" #include "tao/SystemException.h" #include "tao/PolicyC.h" diff --git a/TAO/tao/PI/ProcessingModePolicy.cpp b/TAO/tao/PI/ProcessingModePolicy.cpp index b3870d43bf5..9f2feccfe82 100644 --- a/TAO/tao/PI/ProcessingModePolicy.cpp +++ b/TAO/tao/PI/ProcessingModePolicy.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ProcessingModePolicy.h" +#include "tao/PI/ProcessingModePolicy.h" #if TAO_HAS_INTERCEPTORS == 1 diff --git a/TAO/tao/PI/ProcessingModePolicy.h b/TAO/tao/PI/ProcessingModePolicy.h index 0f1737b7c32..fe2c82462bf 100644 --- a/TAO/tao/PI/ProcessingModePolicy.h +++ b/TAO/tao/PI/ProcessingModePolicy.h @@ -18,14 +18,14 @@ #if TAO_HAS_INTERCEPTORS == 1 -#include "pi_export.h" +#include "tao/PI/pi_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/LocalObject.h" -#include "ProcessingModePolicyC.h" +#include "tao/PI/ProcessingModePolicyC.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/ProcessingModePolicyC.cpp b/TAO/tao/PI/ProcessingModePolicyC.cpp index 4f3da80c092..56768cef58d 100644 --- a/TAO/tao/PI/ProcessingModePolicyC.cpp +++ b/TAO/tao/PI/ProcessingModePolicyC.cpp @@ -29,7 +29,7 @@ // be/be_codegen.cpp:292 -#include "ProcessingModePolicyC.h" +#include "tao/PI/ProcessingModePolicyC.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/PI/RequestInfoA.cpp b/TAO/tao/PI/RequestInfoA.cpp index c8ad4d80ebc..4d0a1ec8626 100644 --- a/TAO/tao/PI/RequestInfoA.cpp +++ b/TAO/tao/PI/RequestInfoA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "RequestInfoA.h" +#include "tao/PI/RequestInfoA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/PI/RequestInfoC.cpp b/TAO/tao/PI/RequestInfoC.cpp index 7e42e72ee0e..5a921808a7c 100644 --- a/TAO/tao/PI/RequestInfoC.cpp +++ b/TAO/tao/PI/RequestInfoC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "RequestInfoC.h" +#include "tao/PI/RequestInfoC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/PI/RequestInfo_Util.cpp b/TAO/tao/PI/RequestInfo_Util.cpp index fc92d156262..65d42175dd2 100644 --- a/TAO/tao/PI/RequestInfo_Util.cpp +++ b/TAO/tao/PI/RequestInfo_Util.cpp @@ -2,7 +2,7 @@ // // $Id$ -#include "RequestInfo_Util.h" +#include "tao/PI/RequestInfo_Util.h" #if TAO_HAS_INTERCEPTORS == 1 diff --git a/TAO/tao/PI/RequestInfo_Util.h b/TAO/tao/PI/RequestInfo_Util.h index 6cb834ea586..4d18f4d2309 100644 --- a/TAO/tao/PI/RequestInfo_Util.h +++ b/TAO/tao/PI/RequestInfo_Util.h @@ -26,7 +26,7 @@ #if TAO_HAS_INTERCEPTORS == 1 #include "ace/CORBA_macros.h" -#include "pi_export.h" +#include "tao/PI/pi_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI_ForwardC.cpp b/TAO/tao/PI_ForwardC.cpp index fb9f49e396c..a182b17775d 100644 --- a/TAO/tao/PI_ForwardC.cpp +++ b/TAO/tao/PI_ForwardC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "PI_ForwardC.h" +#include "tao/PI_ForwardC.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" diff --git a/TAO/tao/PI_Server/PICurrent_Guard.cpp b/TAO/tao/PI_Server/PICurrent_Guard.cpp index 0aba20316d6..23ed31147d2 100644 --- a/TAO/tao/PI_Server/PICurrent_Guard.cpp +++ b/TAO/tao/PI_Server/PICurrent_Guard.cpp @@ -1,4 +1,4 @@ -#include "PICurrent_Guard.h" +#include "tao/PI_Server/PICurrent_Guard.h" #if TAO_HAS_INTERCEPTORS == 1 diff --git a/TAO/tao/PI_Server/PICurrent_Guard.h b/TAO/tao/PI_Server/PICurrent_Guard.h index eb903fe6a1a..364ec199d29 100644 --- a/TAO/tao/PI_Server/PICurrent_Guard.h +++ b/TAO/tao/PI_Server/PICurrent_Guard.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "pi_server_export.h" +#include "tao/PI_Server/pi_server_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PI_Server/PI_Server.cpp b/TAO/tao/PI_Server/PI_Server.cpp index f6ddf992cf6..1511cfb1472 100644 --- a/TAO/tao/PI_Server/PI_Server.cpp +++ b/TAO/tao/PI_Server/PI_Server.cpp @@ -1,6 +1,6 @@ -#include "PI_Server.h" -#include "PI_Server_Loader.h" -#include "ServerRequestInterceptor_Factory_Impl.h" +#include "tao/PI_Server/PI_Server.h" +#include "tao/PI_Server/PI_Server_Loader.h" +#include "tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h" ACE_RCSID (PI_Server, PI_Server, diff --git a/TAO/tao/PI_Server/PI_Server.h b/TAO/tao/PI_Server/PI_Server.h index 97f00c064ca..eed7d6cc8eb 100644 --- a/TAO/tao/PI_Server/PI_Server.h +++ b/TAO/tao/PI_Server/PI_Server.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "pi_server_export.h" +#include "tao/PI_Server/pi_server_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -44,8 +44,8 @@ TAO_Requires_PI_Server_Initializer = TAO_END_VERSIONED_NAMESPACE_DECL #define TAO_PI_SERVER_SAFE_INCLUDE -#include "ServerRequestInterceptorC.h" -#include "ServerRequestInfoC.h" +#include "tao/PI_Server/ServerRequestInterceptorC.h" +#include "tao/PI_Server/ServerRequestInfoC.h" #undef TAO_PI_SERVER_SAFE_INCLUDE #include /**/ "ace/post.h" diff --git a/TAO/tao/PI_Server/PI_Server_Loader.cpp b/TAO/tao/PI_Server/PI_Server_Loader.cpp index 85cc532ddc9..abc2da4613c 100644 --- a/TAO/tao/PI_Server/PI_Server_Loader.cpp +++ b/TAO/tao/PI_Server/PI_Server_Loader.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "PI_Server_Loader.h" -#include "PortableServer_ORBInitializer.h" +#include "tao/PI_Server/PI_Server_Loader.h" +#include "tao/PI_Server/PortableServer_ORBInitializer.h" #include "tao/debug.h" #include "tao/ORB_Core.h" diff --git a/TAO/tao/PI_Server/PI_Server_Loader.h b/TAO/tao/PI_Server/PI_Server_Loader.h index b557672350e..b80753436b9 100644 --- a/TAO/tao/PI_Server/PI_Server_Loader.h +++ b/TAO/tao/PI_Server/PI_Server_Loader.h @@ -12,7 +12,7 @@ #define TAO_PI_SERVER_LOADER_H #include /**/ "ace/pre.h" -#include "pi_server_export.h" +#include "tao/PI_Server/pi_server_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PI_Server/PI_Server_includeC.h b/TAO/tao/PI_Server/PI_Server_includeC.h index 2f941a52b2e..cca4fe783bd 100644 --- a/TAO/tao/PI_Server/PI_Server_includeC.h +++ b/TAO/tao/PI_Server/PI_Server_includeC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "pi_server_export.h" +#include "tao/PI_Server/pi_server_export.h" #include "tao/PI_Server/ServerRequestInterceptorC.h" diff --git a/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp b/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp index fe2cab45e13..67a496a2d58 100644 --- a/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp +++ b/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp @@ -1,7 +1,7 @@ // -*- C++ -*- -#include "PortableServer_ORBInitializer.h" -#include "PortableServer_PolicyFactory.h" +#include "tao/PI_Server/PortableServer_ORBInitializer.h" +#include "tao/PI_Server/PortableServer_PolicyFactory.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" #include "tao/PortableServer/PortableServer.h" diff --git a/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp b/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp index 40a5c95dd6f..484403b2b32 100644 --- a/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp +++ b/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp @@ -1,5 +1,5 @@ -#include "PortableServer_PolicyFactory.h" +#include "tao/PI_Server/PortableServer_PolicyFactory.h" #include "tao/PortableServer/ThreadPolicy.h" #include "tao/PortableServer/LifespanPolicy.h" @@ -9,7 +9,7 @@ #include "tao/PortableServer/RequestProcessingPolicy.h" #include "tao/PortableServer/ServantRetentionPolicy.h" #include "tao/PortableServer/PortableServer.h" -#include "Policy_Creator_T.h" +#include "tao/PI_Server/Policy_Creator_T.h" ACE_RCSID (PortableServer, PortableServer_PolicyFactory, diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp index cb30a798acb..4b004d89f7b 100644 --- a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp +++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ServerInterceptorAdapter.h" +#include "tao/PI_Server/ServerInterceptorAdapter.h" #if TAO_HAS_INTERCEPTORS == 1 @@ -8,8 +8,8 @@ ACE_RCSID (PortableServer, ServerInterceptorAdapter, "$Id$") -#include "ServerRequestInfo.h" -#include "PICurrent_Guard.h" +#include "tao/PI_Server/ServerRequestInfo.h" +#include "tao/PI_Server/PICurrent_Guard.h" #include "tao/ServerRequestInterceptor_Adapter.h" #include "tao/TAO_Server_Request.h" diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.h b/TAO/tao/PI_Server/ServerInterceptorAdapter.h index 82424e9018c..b9217c4ac50 100644 --- a/TAO/tao/PI_Server/ServerInterceptorAdapter.h +++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.h @@ -29,12 +29,12 @@ #if TAO_HAS_INTERCEPTORS == 1 -#include "ServerRequestInterceptorC.h" +#include "tao/PI_Server/ServerRequestInterceptorC.h" #include "tao/PI/Interceptor_List_T.h" #include "tao/ServerRequestInterceptor_Adapter.h" #include "tao/Basic_Types.h" -#include "ServerRequestDetails.h" +#include "tao/PI_Server/ServerRequestDetails.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI_Server/ServerRequestDetails.cpp b/TAO/tao/PI_Server/ServerRequestDetails.cpp index 4479564bd1c..3bc4852ec1a 100644 --- a/TAO/tao/PI_Server/ServerRequestDetails.cpp +++ b/TAO/tao/PI_Server/ServerRequestDetails.cpp @@ -1,9 +1,9 @@ -#include "ServerRequestDetails.h" +#include "tao/PI_Server/ServerRequestDetails.h" #if TAO_HAS_INTERCEPTORS == 1 #if !defined (__ACE_INLINE__) -#include "ServerRequestDetails.inl" +#include "tao/PI_Server/ServerRequestDetails.inl" #endif /* defined INLINE */ ACE_RCSID (PI_Server, diff --git a/TAO/tao/PI_Server/ServerRequestDetails.h b/TAO/tao/PI_Server/ServerRequestDetails.h index 9839b30459a..fc34a6a66f5 100644 --- a/TAO/tao/PI_Server/ServerRequestDetails.h +++ b/TAO/tao/PI_Server/ServerRequestDetails.h @@ -73,7 +73,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "ServerRequestDetails.inl" +#include "tao/PI_Server/ServerRequestDetails.inl" #endif /* __ACE_INLINE__ */ #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/PI_Server/ServerRequestInfo.cpp b/TAO/tao/PI_Server/ServerRequestInfo.cpp index 08b9d7cf019..b0b50f027d2 100644 --- a/TAO/tao/PI_Server/ServerRequestInfo.cpp +++ b/TAO/tao/PI_Server/ServerRequestInfo.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ServerRequestInfo.h" +#include "tao/PI_Server/ServerRequestInfo.h" #if (TAO_HAS_INTERCEPTORS == 1) @@ -26,7 +26,7 @@ ACE_RCSID (PI_Server, #include "ace/OS_NS_string.h" # if !defined (__ACE_INLINE__) -# include "ServerRequestInfo.inl" +# include "tao/PI_Server/ServerRequestInfo.inl" # endif /* !__ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI_Server/ServerRequestInfo.h b/TAO/tao/PI_Server/ServerRequestInfo.h index e084e9afaad..afce3a85690 100644 --- a/TAO/tao/PI_Server/ServerRequestInfo.h +++ b/TAO/tao/PI_Server/ServerRequestInfo.h @@ -27,7 +27,7 @@ #if (TAO_HAS_INTERCEPTORS == 1) -#include "ServerRequestInfoC.h" +#include "tao/PI_Server/ServerRequestInfoC.h" #include "tao/LocalObject.h" #include "tao/OctetSeqC.h" #include "tao/TAO_Server_Request.h" @@ -302,7 +302,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL # if defined (__ACE_INLINE__) -# include "ServerRequestInfo.inl" +# include "tao/PI_Server/ServerRequestInfo.inl" # endif /* __ACE_INLINE__ */ #if defined(_MSC_VER) diff --git a/TAO/tao/PI_Server/ServerRequestInfoA.cpp b/TAO/tao/PI_Server/ServerRequestInfoA.cpp index c2de1e45236..94ad278401d 100644 --- a/TAO/tao/PI_Server/ServerRequestInfoA.cpp +++ b/TAO/tao/PI_Server/ServerRequestInfoA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "ServerRequestInfoA.h" +#include "tao/PI_Server/ServerRequestInfoA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/PI_Server/ServerRequestInfoC.cpp b/TAO/tao/PI_Server/ServerRequestInfoC.cpp index 369ef8bdde0..69fcd9ec298 100644 --- a/TAO/tao/PI_Server/ServerRequestInfoC.cpp +++ b/TAO/tao/PI_Server/ServerRequestInfoC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "ServerRequestInfoC.h" +#include "tao/PI_Server/ServerRequestInfoC.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp b/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp index 851dd83180c..8f5dfb63340 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp +++ b/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "ServerRequestInterceptorA.h" +#include "tao/PI_Server/ServerRequestInterceptorA.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp b/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp index 3a6c10cdbdb..db1e8a5d4e2 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp +++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "ServerRequestInterceptorC.h" +#include "tao/PI_Server/ServerRequestInterceptorC.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp index fb3092c69be..37b51488606 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp +++ b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp @@ -11,11 +11,11 @@ */ // ================================================================= -#include "ServerRequestInterceptor_Factory_Impl.h" +#include "tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h" #if TAO_HAS_INTERCEPTORS == 1 -#include "ServerInterceptorAdapter.h" +#include "tao/PI_Server/ServerInterceptorAdapter.h" #include "tao/ORB.h" #include "tao/debug.h" diff --git a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h index 2a0c59b8440..9cd5e06128f 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h +++ b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "pi_server_export.h" +#include "tao/PI_Server/pi_server_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/ParameterModeC.cpp b/TAO/tao/ParameterModeC.cpp index 1716c9700fd..4ded86134fd 100644 --- a/TAO/tao/ParameterModeC.cpp +++ b/TAO/tao/ParameterModeC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "ParameterModeC.h" +#include "tao/ParameterModeC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) diff --git a/TAO/tao/Pluggable_Messaging.cpp b/TAO/tao/Pluggable_Messaging.cpp index 5754449b5ad..5839334ca9f 100644 --- a/TAO/tao/Pluggable_Messaging.cpp +++ b/TAO/tao/Pluggable_Messaging.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Pluggable_Messaging.h" +#include "tao/Pluggable_Messaging.h" ACE_RCSID (tao, Pluggable_Messaging, diff --git a/TAO/tao/Pluggable_Messaging_Utils.cpp b/TAO/tao/Pluggable_Messaging_Utils.cpp index 3af1a6add70..9e7956bd5a8 100644 --- a/TAO/tao/Pluggable_Messaging_Utils.cpp +++ b/TAO/tao/Pluggable_Messaging_Utils.cpp @@ -1,7 +1,7 @@ //$Id$ -#include "Pluggable_Messaging_Utils.h" -#include "ORB_Core.h" +#include "tao/Pluggable_Messaging_Utils.h" +#include "tao/ORB_Core.h" #if !defined (__ACE_INLINE__) #include "tao/Pluggable_Messaging_Utils.i" diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp index 6b96a63bde5..0fdcb87dd8b 100644 --- a/TAO/tao/PolicyC.cpp +++ b/TAO/tao/PolicyC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "PolicyC.h" +#include "tao/PolicyC.h" #include "tao/CDR.h" #include "tao/Invocation_Adapter.h" #include "tao/Object_T.h" @@ -44,7 +44,7 @@ #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) -#include "PolicyC.inl" +#include "tao/PolicyC.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h index 8252340082d..a0cd05df25e 100644 --- a/TAO/tao/PolicyC.h +++ b/TAO/tao/PolicyC.h @@ -667,7 +667,7 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Policy_ptr &); TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "PolicyC.inl" +#include "tao/PolicyC.inl" #endif /* defined INLINE */ #if defined(_MSC_VER) diff --git a/TAO/tao/PolicyFactory_Registry_Adapter.cpp b/TAO/tao/PolicyFactory_Registry_Adapter.cpp index ad639e4bf53..c33f3a2710e 100644 --- a/TAO/tao/PolicyFactory_Registry_Adapter.cpp +++ b/TAO/tao/PolicyFactory_Registry_Adapter.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "PolicyFactory_Registry_Adapter.h" +#include "tao/PolicyFactory_Registry_Adapter.h" ACE_RCSID (tao, diff --git a/TAO/tao/PolicyFactory_Registry_Factory.cpp b/TAO/tao/PolicyFactory_Registry_Factory.cpp index 67220dd3b66..76a51641ae7 100644 --- a/TAO/tao/PolicyFactory_Registry_Factory.cpp +++ b/TAO/tao/PolicyFactory_Registry_Factory.cpp @@ -1,6 +1,6 @@ //$Id$ -#include "PolicyFactory_Registry_Factory.h" +#include "tao/PolicyFactory_Registry_Factory.h" ACE_RCSID (tao, PolicyFactory_Registry_Factory, diff --git a/TAO/tao/Policy_Current.cpp b/TAO/tao/Policy_Current.cpp index 2b3e49e8f14..14cb7c89456 100644 --- a/TAO/tao/Policy_Current.cpp +++ b/TAO/tao/Policy_Current.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Policy_Current.h" +#include "tao/Policy_Current.h" #if (TAO_HAS_CORBA_MESSAGING == 1) diff --git a/TAO/tao/Policy_Current_Impl.cpp b/TAO/tao/Policy_Current_Impl.cpp index 9ac3585bd8a..9600341a74f 100644 --- a/TAO/tao/Policy_Current_Impl.cpp +++ b/TAO/tao/Policy_Current_Impl.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Policy_Current_Impl.h" +#include "tao/Policy_Current_Impl.h" #if (TAO_HAS_CORBA_MESSAGING == 1) diff --git a/TAO/tao/Policy_Current_Impl.h b/TAO/tao/Policy_Current_Impl.h index fd95008a237..270342fe234 100644 --- a/TAO/tao/Policy_Current_Impl.h +++ b/TAO/tao/Policy_Current_Impl.h @@ -19,7 +19,7 @@ #include /**/ "ace/pre.h" -#include "TAO_Export.h" +#include "tao/TAO_Export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/Policy_ForwardC.cpp b/TAO/tao/Policy_ForwardC.cpp index 7a313012ee6..b2e78c363e3 100644 --- a/TAO/tao/Policy_ForwardC.cpp +++ b/TAO/tao/Policy_ForwardC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "Policy_ForwardC.h" +#include "tao/Policy_ForwardC.h" #include "tao/CDR.h" // TAO_IDL - Generated from diff --git a/TAO/tao/Policy_Manager.cpp b/TAO/tao/Policy_Manager.cpp index 6b1ada9329e..5e7383c4cc8 100644 --- a/TAO/tao/Policy_Manager.cpp +++ b/TAO/tao/Policy_Manager.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Policy_Manager.h" +#include "tao/Policy_Manager.h" #if (TAO_HAS_CORBA_MESSAGING == 1) diff --git a/TAO/tao/Policy_Set.cpp b/TAO/tao/Policy_Set.cpp index e7425362b9b..4dfd0946f19 100644 --- a/TAO/tao/Policy_Set.cpp +++ b/TAO/tao/Policy_Set.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "Policy_Set.h" -#include "Environment.h" -#include "SystemException.h" -#include "debug.h" +#include "tao/Policy_Set.h" +#include "tao/Environment.h" +#include "tao/SystemException.h" +#include "tao/debug.h" #if !defined (__ACE_INLINE__) -# include "Policy_Set.i" +# include "tao/Policy_Set.i" #endif /* ! __ACE_INLINE__ */ diff --git a/TAO/tao/Policy_Validator.cpp b/TAO/tao/Policy_Validator.cpp index ef3aa9f0494..b9753bd0fc2 100644 --- a/TAO/tao/Policy_Validator.cpp +++ b/TAO/tao/Policy_Validator.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "Policy_Validator.h" -#include "Environment.h" -#include "debug.h" +#include "tao/Policy_Validator.h" +#include "tao/Environment.h" +#include "tao/debug.h" #include "ace/Log_Msg.h" diff --git a/TAO/tao/PortableInterceptor.h b/TAO/tao/PortableInterceptor.h index 63623152d5f..380ae32530e 100644 --- a/TAO/tao/PortableInterceptor.h +++ b/TAO/tao/PortableInterceptor.h @@ -22,7 +22,7 @@ #include /**/ "ace/pre.h" -#include "orbconf.h" +#include "tao/orbconf.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp index 7a227917ff1..fd12ae4eb40 100644 --- a/TAO/tao/PortableInterceptorC.cpp +++ b/TAO/tao/PortableInterceptorC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "PortableInterceptorC.h" +#include "tao/PortableInterceptorC.h" #include "tao/CDR.h" // TAO_IDL - Generated from diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp index 65501458a7a..5699755a01b 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.cpp +++ b/TAO/tao/PortableServer/Active_Object_Map.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "Active_Object_Map.h" -#include "Active_Object_Map_Entry.h" +#include "tao/PortableServer/Active_Object_Map.h" +#include "tao/PortableServer/Active_Object_Map_Entry.h" #include "tao/SystemException.h" #if !defined (__ACE_INLINE__) -# include "Active_Object_Map.i" +# include "tao/PortableServer/Active_Object_Map.i" #endif /* __ACE_INLINE__ */ #include "ace/Auto_Ptr.h" diff --git a/TAO/tao/PortableServer/Active_Object_Map.h b/TAO/tao/PortableServer/Active_Object_Map.h index 2178eaa4587..65c614de389 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.h +++ b/TAO/tao/PortableServer/Active_Object_Map.h @@ -16,13 +16,13 @@ #include /**/ "ace/pre.h" -#include "Key_Adapters.h" +#include "tao/PortableServer/Key_Adapters.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Servant_Base.h" +#include "tao/PortableServer/Servant_Base.h" #include "tao/Server_Strategy_Factory.h" #include "ace/Map_T.h" @@ -618,7 +618,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "Active_Object_Map.i" +# include "tao/PortableServer/Active_Object_Map.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Active_Object_Map.i b/TAO/tao/PortableServer/Active_Object_Map.i index 5efee6747df..31b3326b811 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.i +++ b/TAO/tao/PortableServer/Active_Object_Map.i @@ -2,7 +2,7 @@ // // $Id$ -#include "Active_Object_Map_Entry.h" +#include "tao/PortableServer/Active_Object_Map_Entry.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp b/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp index 0d9826e86fd..fc29e9faec0 100644 --- a/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp +++ b/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Active_Object_Map_Entry.h" +#include "tao/PortableServer/Active_Object_Map_Entry.h" ACE_RCSID(PortableServer, Active_Object_Map_Entry, diff --git a/TAO/tao/PortableServer/Active_Object_Map_Entry.h b/TAO/tao/PortableServer/Active_Object_Map_Entry.h index f83e5fa642e..75d2a3d2c40 100644 --- a/TAO/tao/PortableServer/Active_Object_Map_Entry.h +++ b/TAO/tao/PortableServer/Active_Object_Map_Entry.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "PS_ForwardC.h" +#include "tao/PortableServer/PS_ForwardC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp index c11279d30df..33c267042ba 100644 --- a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp +++ b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp @@ -1,36 +1,36 @@ // $Id$ -#include "Active_Policy_Strategies.h" -#include "POA_Cached_Policies.h" - -#include "ThreadStrategy.h" -#include "ThreadStrategyFactory.h" -#include "RequestProcessingStrategy.h" -#include "RequestProcessingStrategyFactory.h" -#include "IdAssignmentStrategy.h" -#include "IdAssignmentStrategyFactory.h" -#include "LifespanStrategy.h" -#include "LifespanStrategyFactory.h" -#include "IdUniquenessStrategy.h" -#include "IdUniquenessStrategyFactory.h" -#include "ImplicitActivationStrategy.h" -#include "ImplicitActivationStrategyFactory.h" -#include "ServantRetentionStrategy.h" -#include "ServantRetentionStrategyFactory.h" - -#include "IdAssignmentPolicyC.h" -#include "IdUniquenessPolicyC.h" -#include "ImplicitActivationPolicyC.h" -#include "LifespanPolicyC.h" -#include "RequestProcessingPolicyC.h" -#include "ServantRetentionPolicyC.h" -#include "ThreadPolicyC.h" -#include "ServantRetentionPolicyC.h" +#include "tao/PortableServer/Active_Policy_Strategies.h" +#include "tao/PortableServer/POA_Cached_Policies.h" + +#include "tao/PortableServer/ThreadStrategy.h" +#include "tao/PortableServer/ThreadStrategyFactory.h" +#include "tao/PortableServer/RequestProcessingStrategy.h" +#include "tao/PortableServer/RequestProcessingStrategyFactory.h" +#include "tao/PortableServer/IdAssignmentStrategy.h" +#include "tao/PortableServer/IdAssignmentStrategyFactory.h" +#include "tao/PortableServer/LifespanStrategy.h" +#include "tao/PortableServer/LifespanStrategyFactory.h" +#include "tao/PortableServer/IdUniquenessStrategy.h" +#include "tao/PortableServer/IdUniquenessStrategyFactory.h" +#include "tao/PortableServer/ImplicitActivationStrategy.h" +#include "tao/PortableServer/ImplicitActivationStrategyFactory.h" +#include "tao/PortableServer/ServantRetentionStrategy.h" +#include "tao/PortableServer/ServantRetentionStrategyFactory.h" + +#include "tao/PortableServer/IdAssignmentPolicyC.h" +#include "tao/PortableServer/IdUniquenessPolicyC.h" +#include "tao/PortableServer/ImplicitActivationPolicyC.h" +#include "tao/PortableServer/LifespanPolicyC.h" +#include "tao/PortableServer/RequestProcessingPolicyC.h" +#include "tao/PortableServer/ServantRetentionPolicyC.h" +#include "tao/PortableServer/ThreadPolicyC.h" +#include "tao/PortableServer/ServantRetentionPolicyC.h" #include "ace/Dynamic_Service.h" #if !defined (__ACE_INLINE__) -# include "Active_Policy_Strategies.inl" +# include "tao/PortableServer/Active_Policy_Strategies.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(PortableServer, diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.h b/TAO/tao/PortableServer/Active_Policy_Strategies.h index 96e167692e9..685c6978c2b 100644 --- a/TAO/tao/PortableServer/Active_Policy_Strategies.h +++ b/TAO/tao/PortableServer/Active_Policy_Strategies.h @@ -99,7 +99,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "Active_Policy_Strategies.inl" +# include "tao/PortableServer/Active_Policy_Strategies.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/AdapterActivatorA.cpp b/TAO/tao/PortableServer/AdapterActivatorA.cpp index cdada812597..ebf6cd1285e 100644 --- a/TAO/tao/PortableServer/AdapterActivatorA.cpp +++ b/TAO/tao/PortableServer/AdapterActivatorA.cpp @@ -30,7 +30,7 @@ #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" #include "tao/AnyTypeCode/String_TypeCode_Static.h" -#include "AdapterActivatorA.h" +#include "tao/PortableServer/AdapterActivatorA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" diff --git a/TAO/tao/PortableServer/AdapterActivatorA.h b/TAO/tao/PortableServer/AdapterActivatorA.h index 99ac21d6918..fa84df9f34e 100644 --- a/TAO/tao/PortableServer/AdapterActivatorA.h +++ b/TAO/tao/PortableServer/AdapterActivatorA.h @@ -33,8 +33,8 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" -#include "AdapterActivatorC.h" +#include "tao/PortableServer/portableserver_export.h" +#include "tao/PortableServer/AdapterActivatorC.h" #include "tao/PortableServer/PS_ForwardA.h" diff --git a/TAO/tao/PortableServer/AdapterActivatorC.cpp b/TAO/tao/PortableServer/AdapterActivatorC.cpp index 11ddfbaeab3..7eb482f2d99 100644 --- a/TAO/tao/PortableServer/AdapterActivatorC.cpp +++ b/TAO/tao/PortableServer/AdapterActivatorC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "AdapterActivatorC.h" +#include "tao/PortableServer/AdapterActivatorC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/PortableServer/AdapterActivatorC.h b/TAO/tao/PortableServer/AdapterActivatorC.h index 7c69d6fbee6..ce0251e59d5 100644 --- a/TAO/tao/PortableServer/AdapterActivatorC.h +++ b/TAO/tao/PortableServer/AdapterActivatorC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" diff --git a/TAO/tao/PortableServer/Adapter_Activator.cpp b/TAO/tao/PortableServer/Adapter_Activator.cpp index 9bdf028c28b..a10948a20f0 100644 --- a/TAO/tao/PortableServer/Adapter_Activator.cpp +++ b/TAO/tao/PortableServer/Adapter_Activator.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Adapter_Activator.h" +#include "tao/PortableServer/Adapter_Activator.h" ACE_RCSID (PortableServer, Adapter_Activator, @@ -8,9 +8,9 @@ ACE_RCSID (PortableServer, #if (TAO_HAS_MINIMUM_POA == 0) -#include "AdapterActivatorC.h" -#include "POAManagerC.h" -#include "PortableServer.h" +#include "tao/PortableServer/AdapterActivatorC.h" +#include "tao/PortableServer/POAManagerC.h" +#include "tao/PortableServer/PortableServer.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Adapter_Activator.h b/TAO/tao/PortableServer/Adapter_Activator.h index bac4d5581ab..65ecd7d9417 100644 --- a/TAO/tao/PortableServer/Adapter_Activator.h +++ b/TAO/tao/PortableServer/Adapter_Activator.h @@ -12,13 +12,13 @@ #define TAO_ADAPTER_ACTIVATOR_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "AdapterActivatorC.h" +#include "tao/PortableServer/AdapterActivatorC.h" #if (TAO_HAS_MINIMUM_POA == 0) diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp index 0e1fdd6b85b..9ac5275b9ef 100644 --- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp +++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp @@ -1,9 +1,9 @@ //$Id$ // -- PortableServer Include -- -#include "Collocated_Object_Proxy_Broker.h" -#include "Object_Adapter.h" -#include "Servant_Upcall.h" -#include "Servant_Base.h" +#include "tao/PortableServer/Collocated_Object_Proxy_Broker.h" +#include "tao/PortableServer/Object_Adapter.h" +#include "tao/PortableServer/Servant_Upcall.h" +#include "tao/PortableServer/Servant_Base.h" // -- TAO Include -- diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h index 09258ae40d5..cd28b880933 100644 --- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h +++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h @@ -18,7 +18,7 @@ #define TAO_COLLOCATED_OBJECT_PROXY_BROKER_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PortableServer/Creation_Time.cpp b/TAO/tao/PortableServer/Creation_Time.cpp index 2b938b862ce..0156db0dec3 100644 --- a/TAO/tao/PortableServer/Creation_Time.cpp +++ b/TAO/tao/PortableServer/Creation_Time.cpp @@ -1,10 +1,10 @@ -#include "Creation_Time.h" +#include "tao/PortableServer/Creation_Time.h" ACE_RCSID (PortableServer, Creation_Time, "$Id$") #if !defined (__ACE_INLINE__) -# include "Creation_Time.inl" +# include "tao/PortableServer/Creation_Time.inl" #endif /* ! __ACE_INLINE__ */ diff --git a/TAO/tao/PortableServer/Creation_Time.h b/TAO/tao/PortableServer/Creation_Time.h index 22f3ab07172..525ce68acee 100644 --- a/TAO/tao/PortableServer/Creation_Time.h +++ b/TAO/tao/PortableServer/Creation_Time.h @@ -96,7 +96,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "Creation_Time.inl" +# include "tao/PortableServer/Creation_Time.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp index d4cd7e7d5ee..40177f90b27 100644 --- a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp +++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp @@ -1,6 +1,6 @@ // @(#) $Id$ -#include "Default_Acceptor_Filter.h" +#include "tao/PortableServer/Default_Acceptor_Filter.h" #include "tao/Transport_Acceptor.h" #include "tao/MProfile.h" #include "tao/Profile.h" diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.h b/TAO/tao/PortableServer/Default_Acceptor_Filter.h index 70bea1b23f7..b9288216837 100644 --- a/TAO/tao/PortableServer/Default_Acceptor_Filter.h +++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.h @@ -19,7 +19,7 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.cpp b/TAO/tao/PortableServer/Default_Policy_Validator.cpp index 963494e89fe..a8ad08a7394 100644 --- a/TAO/tao/PortableServer/Default_Policy_Validator.cpp +++ b/TAO/tao/PortableServer/Default_Policy_Validator.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "Default_Policy_Validator.h" +#include "tao/PortableServer/Default_Policy_Validator.h" #include "tao/ORB_Core.h" #include "tao/Policy_Set.h" #include "tao/PolicyFactory_Registry_Adapter.h" -#include "PortableServer.h" +#include "tao/PortableServer/PortableServer.h" ACE_RCSID (PortableServer, Default_Policy_Validator, diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.h b/TAO/tao/PortableServer/Default_Policy_Validator.h index e698fc939df..ce099b9d402 100644 --- a/TAO/tao/PortableServer/Default_Policy_Validator.h +++ b/TAO/tao/PortableServer/Default_Policy_Validator.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp index ebc50a296d0..ae93dee3d61 100644 --- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp +++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "Default_Servant_Dispatcher.h" -#include "Root_POA.h" +#include "tao/PortableServer/Default_Servant_Dispatcher.h" +#include "tao/PortableServer/Root_POA.h" ACE_RCSID(PortableServer, Default_Servant_Dispatcher, diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h index 092e4c498d3..412e8eea9c6 100644 --- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h +++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h @@ -14,13 +14,13 @@ #define TAO_DEFAULT_SERVANT_DISPATCHER_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Servant_Dispatcher.h" +#include "tao/PortableServer/Servant_Dispatcher.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp index ce0a4559e45..9b2d483f011 100644 --- a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp +++ b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "Direct_Collocation_Upcall_Wrapper.h" +#include "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h" #if (TAO_HAS_MINIMUM_CORBA == 0) -# include "ForwardRequestC.h" +# include "tao/PortableServer/ForwardRequestC.h" #endif /* TAO_HAS_MINIMUM_CORBA == 0 */ #include "tao/Abstract_Servant_Base.h" diff --git a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h index cb71f0f1d13..3bdf12a5022 100644 --- a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h +++ b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #ifndef ACE_LACKS_PRAGMA_ONCE # pragma once diff --git a/TAO/tao/PortableServer/ForwardRequestA.cpp b/TAO/tao/PortableServer/ForwardRequestA.cpp index f74ba34eeb1..24d7567729c 100644 --- a/TAO/tao/PortableServer/ForwardRequestA.cpp +++ b/TAO/tao/PortableServer/ForwardRequestA.cpp @@ -30,7 +30,7 @@ #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Struct_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Struct_Field.h" -#include "ForwardRequestA.h" +#include "tao/PortableServer/ForwardRequestA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" diff --git a/TAO/tao/PortableServer/ForwardRequestA.h b/TAO/tao/PortableServer/ForwardRequestA.h index 9dfac3f1406..578ec0ccb21 100644 --- a/TAO/tao/PortableServer/ForwardRequestA.h +++ b/TAO/tao/PortableServer/ForwardRequestA.h @@ -33,8 +33,8 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" -#include "ForwardRequestC.h" +#include "tao/PortableServer/portableserver_export.h" +#include "tao/PortableServer/ForwardRequestC.h" #if (TAO_HAS_MINIMUM_POA == 0) diff --git a/TAO/tao/PortableServer/ForwardRequestC.cpp b/TAO/tao/PortableServer/ForwardRequestC.cpp index 4254786753d..d82d2935b9f 100644 --- a/TAO/tao/PortableServer/ForwardRequestC.cpp +++ b/TAO/tao/PortableServer/ForwardRequestC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "ForwardRequestC.h" +#include "tao/PortableServer/ForwardRequestC.h" #include "tao/CDR.h" #include "tao/SystemException.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/PortableServer/ForwardRequestC.h b/TAO/tao/PortableServer/ForwardRequestC.h index ce718a8efcc..299323cee16 100644 --- a/TAO/tao/PortableServer/ForwardRequestC.h +++ b/TAO/tao/PortableServer/ForwardRequestC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #include "tao/ORB.h" #include "tao/Environment.h" #include "tao/Object.h" diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.cpp b/TAO/tao/PortableServer/IdAssignmentPolicy.cpp index d370bab76b6..f3744823ab9 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicy.cpp +++ b/TAO/tao/PortableServer/IdAssignmentPolicy.cpp @@ -1,5 +1,5 @@ -#include "IdAssignmentPolicy.h" -#include "PortableServer.h" +#include "tao/PortableServer/IdAssignmentPolicy.h" +#include "tao/PortableServer/PortableServer.h" ACE_RCSID (PortableServer, IdAssignmentPolicy, diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.h b/TAO/tao/PortableServer/IdAssignmentPolicy.h index 93f739b008b..c8c6d9f9cf3 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicy.h +++ b/TAO/tao/PortableServer/IdAssignmentPolicy.h @@ -14,13 +14,13 @@ #define TAO_PORTABLESERVER_IDASSIGNMENTPOLICY_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "IdAssignmentPolicyC.h" +#include "tao/PortableServer/IdAssignmentPolicyC.h" #include "tao/LocalObject.h" // This is to remove "inherits via dominance" warnings from MSVC. diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp b/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp index 67babedb32c..83970768fa3 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp +++ b/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp @@ -30,7 +30,7 @@ #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Enum_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" -#include "IdAssignmentPolicyA.h" +#include "tao/PortableServer/IdAssignmentPolicyA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyA.h b/TAO/tao/PortableServer/IdAssignmentPolicyA.h index 54a3ce33743..49df4b62e0e 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicyA.h +++ b/TAO/tao/PortableServer/IdAssignmentPolicyA.h @@ -33,8 +33,8 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" -#include "IdAssignmentPolicyC.h" +#include "tao/PortableServer/portableserver_export.h" +#include "tao/PortableServer/IdAssignmentPolicyC.h" #include "tao/AnyTypeCode/PolicyA.h" diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp b/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp index b34377d544b..7d78dc8ac31 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp +++ b/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "IdAssignmentPolicyC.h" +#include "tao/PortableServer/IdAssignmentPolicyC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyC.h b/TAO/tao/PortableServer/IdAssignmentPolicyC.h index 07e80d1c413..3a01f212361 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicyC.h +++ b/TAO/tao/PortableServer/IdAssignmentPolicyC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" diff --git a/TAO/tao/PortableServer/IdAssignmentStrategy.cpp b/TAO/tao/PortableServer/IdAssignmentStrategy.cpp index be643e68966..969a6bfa112 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategy.cpp +++ b/TAO/tao/PortableServer/IdAssignmentStrategy.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "IdAssignmentStrategy.h" +#include "tao/PortableServer/IdAssignmentStrategy.h" ACE_RCSID (PortableServer, IdAssignmentStrategy, diff --git a/TAO/tao/PortableServer/IdAssignmentStrategy.h b/TAO/tao/PortableServer/IdAssignmentStrategy.h index 7563b9ad297..d53a67c62b3 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategy.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategy.h @@ -14,7 +14,7 @@ #define TAO_ID_ASSIGNMENT_STRATEGY_H #include /**/ "ace/pre.h" -#include "Policy_Strategy.h" +#include "tao/PortableServer/Policy_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h b/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h index 5d8acd9152d..2d0dd83a80c 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h @@ -14,14 +14,14 @@ #define TAO_PORTABLESERVER_IDASSIGNMENTSTRATEGYFACTORY_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "StrategyFactory.h" -#include "IdAssignmentPolicyC.h" +#include "tao/PortableServer/StrategyFactory.h" +#include "tao/PortableServer/IdAssignmentPolicyC.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp index e388dfa129a..475632c8363 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "IdAssignmentStrategyFactoryImpl.h" -#include "IdAssignmentStrategy.h" +#include "tao/PortableServer/IdAssignmentStrategyFactoryImpl.h" +#include "tao/PortableServer/IdAssignmentStrategy.h" #include "ace/Dynamic_Service.h" ACE_RCSID (PortableServer, diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h index b3b0932290f..1e7cadb3267 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h @@ -14,13 +14,13 @@ #define TAO_PORTABLESERVER_IDASSIGNMENTSTRATEGYFACTORYIMPL_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "IdAssignmentStrategyFactory.h" +#include "tao/PortableServer/IdAssignmentStrategyFactory.h" #include "ace/Service_Config.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp b/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp index c5adacaf42f..d7775832e2c 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp +++ b/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "IdAssignmentStrategySystem.h" +#include "tao/PortableServer/IdAssignmentStrategySystem.h" ACE_RCSID (PortableServer, Id_Assignment_Strategy, diff --git a/TAO/tao/PortableServer/IdAssignmentStrategySystem.h b/TAO/tao/PortableServer/IdAssignmentStrategySystem.h index d00d60fb4c0..e77cbc95b8f 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategySystem.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategySystem.h @@ -14,13 +14,13 @@ #define TAO_IDASSIGNMENTSTRATEGYSYSTEM_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "IdAssignmentStrategy.h" +#include "tao/PortableServer/IdAssignmentStrategy.h" #include "ace/Service_Config.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp index 04728571a96..3cfa5cef85a 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp +++ b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "IdAssignmentStrategyUser.h" +#include "tao/PortableServer/IdAssignmentStrategyUser.h" ACE_RCSID (PortableServer, Id_Assignment_Strategy, diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyUser.h b/TAO/tao/PortableServer/IdAssignmentStrategyUser.h index cf3363cd9ad..f3560cef1d5 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyUser.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategyUser.h @@ -14,13 +14,13 @@ #define TAO_IDASSIGNMENTSTRATEGYUSER_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "IdAssignmentStrategy.h" +#include "tao/PortableServer/IdAssignmentStrategy.h" #include "ace/Service_Config.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp index e466546bfc7..03a206a6301 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp +++ b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp @@ -1,5 +1,5 @@ -#include "IdUniquenessPolicy.h" -#include "PortableServer.h" +#include "tao/PortableServer/IdUniquenessPolicy.h" +#include "tao/PortableServer/PortableServer.h" ACE_RCSID (PortableServer, IdUniquenessPolicy, diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.h b/TAO/tao/PortableServer/IdUniquenessPolicy.h index 46f738c75e2..20e641bc3bf 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicy.h +++ b/TAO/tao/PortableServer/IdUniquenessPolicy.h @@ -14,13 +14,13 @@ #define TAO_PORTABLESERVER_IDUNIQUENESSTPOLICY_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "IdUniquenessPolicyC.h" +#include "tao/PortableServer/IdUniquenessPolicyC.h" #include "tao/LocalObject.h" // This is to remove "inherits via dominance" warnings from MSVC. diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp b/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp index 0a9cd7862f4..a11afa6fd24 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp +++ b/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp @@ -34,7 +34,7 @@ #include "tao/AnyTypeCode/Any_Impl_T.h" #include "tao/AnyTypeCode/Any_Basic_Impl_T.h" -#include "IdUniquenessPolicyA.h" +#include "tao/PortableServer/IdUniquenessPolicyA.h" #include "tao/CDR.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyA.h b/TAO/tao/PortableServer/IdUniquenessPolicyA.h index 6b73c4023ec..547e53a5073 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicyA.h +++ b/TAO/tao/PortableServer/IdUniquenessPolicyA.h @@ -33,8 +33,8 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" -#include "IdUniquenessPolicyC.h" +#include "tao/PortableServer/portableserver_export.h" +#include "tao/PortableServer/IdUniquenessPolicyC.h" #include "tao/AnyTypeCode/PolicyA.h" diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp b/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp index 03262776418..636a02a22c3 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp +++ b/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "IdUniquenessPolicyC.h" +#include "tao/PortableServer/IdUniquenessPolicyC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyC.h b/TAO/tao/PortableServer/IdUniquenessPolicyC.h index fd9bc6d04b9..c706c285feb 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicyC.h +++ b/TAO/tao/PortableServer/IdUniquenessPolicyC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" diff --git a/TAO/tao/PortableServer/IdUniquenessStrategy.h b/TAO/tao/PortableServer/IdUniquenessStrategy.h index d58778c0644..de0fb20c737 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategy.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategy.h @@ -14,15 +14,15 @@ #define TAO_ID_UNIQUENESS_STRATEGY_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Policy_Strategy.h" -#include "IdUniquenessPolicyC.h" -#include "PS_ForwardC.h" +#include "tao/PortableServer/Policy_Strategy.h" +#include "tao/PortableServer/IdUniquenessPolicyC.h" +#include "tao/PortableServer/PS_ForwardC.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h b/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h index 574462419aa..b3f973ef19f 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h @@ -14,14 +14,14 @@ #define TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYFACTORY_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "StrategyFactory.h" -#include "IdUniquenessPolicyC.h" +#include "tao/PortableServer/StrategyFactory.h" +#include "tao/PortableServer/IdUniquenessPolicyC.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp index 1329b310f29..47530f5a9a9 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "IdUniquenessStrategyFactoryImpl.h" -#include "IdUniquenessStrategy.h" +#include "tao/PortableServer/IdUniquenessStrategyFactoryImpl.h" +#include "tao/PortableServer/IdUniquenessStrategy.h" #include "ace/Dynamic_Service.h" ACE_RCSID (PortableServer, diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h index 9b6a5c3f344..8846237437d 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h @@ -14,14 +14,14 @@ #define TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYFACTORYIMPL_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Service_Config.h" -#include "IdUniquenessStrategyFactory.h" +#include "tao/PortableServer/IdUniquenessStrategyFactory.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp index d09875ecd9f..d1071f1470c 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "IdUniquenessStrategyMultiple.h" +#include "tao/PortableServer/IdUniquenessStrategyMultiple.h" ACE_RCSID (PortableServer, Id_Uniqueness_Strategy, diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h index b7991c4a875..f3c2e405447 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h @@ -14,13 +14,13 @@ #define TAO_ID_UNIQUENESSSTRATEGY_MULITPLE_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "IdUniquenessStrategy.h" +#include "tao/PortableServer/IdUniquenessStrategy.h" #include "ace/Service_Config.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp index 0a64c9ea4d2..3c5516d4956 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "IdUniquenessStrategyUnique.h" -#include "Root_POA.h" +#include "tao/PortableServer/IdUniquenessStrategyUnique.h" +#include "tao/PortableServer/Root_POA.h" ACE_RCSID (PortableServer, Id_Uniqueness_Strategy, diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h index 6d28c176808..58bbf096de5 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h @@ -14,13 +14,13 @@ #define TAO_ID_UNIQUENESSSTRATEGYUNIQUE_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "IdUniquenessStrategy.h" +#include "tao/PortableServer/IdUniquenessStrategy.h" #include "ace/Service_Config.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp index 9a96d3263fd..b29178c143f 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "IdUniquenessStrategyUniqueFactoryImpl.h" -#include "IdUniquenessStrategyUnique.h" +#include "tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h" +#include "tao/PortableServer/IdUniquenessStrategyUnique.h" #include "ace/Dynamic_Service.h" ACE_RCSID (PortableServer, diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h index 9caa9322c9f..721ae2a6eb9 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h @@ -14,14 +14,14 @@ #define TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYUNIQUEFACTORYIMPL_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Service_Config.h" -#include "IdUniquenessStrategyFactory.h" +#include "tao/PortableServer/IdUniquenessStrategyFactory.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ImR_Client_Adapter.cpp b/TAO/tao/PortableServer/ImR_Client_Adapter.cpp index 3b3b163e18e..c5a9d148f85 100644 --- a/TAO/tao/PortableServer/ImR_Client_Adapter.cpp +++ b/TAO/tao/PortableServer/ImR_Client_Adapter.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ImR_Client_Adapter.h" +#include "tao/PortableServer/ImR_Client_Adapter.h" ACE_RCSID (tao, ImR_Client_Adapter, diff --git a/TAO/tao/PortableServer/ImR_Client_Adapter.h b/TAO/tao/PortableServer/ImR_Client_Adapter.h index ba8fd0cdff7..e5b55bd6077 100644 --- a/TAO/tao/PortableServer/ImR_Client_Adapter.h +++ b/TAO/tao/PortableServer/ImR_Client_Adapter.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp index 6605b4ba97f..3c968d993da 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp @@ -1,5 +1,5 @@ -#include "ImplicitActivationPolicy.h" -#include "PortableServer.h" +#include "tao/PortableServer/ImplicitActivationPolicy.h" +#include "tao/PortableServer/PortableServer.h" ACE_RCSID (PortableServer, ImplicitActivationPolicy, diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.h b/TAO/tao/PortableServer/ImplicitActivationPolicy.h index c2e61c7c2ea..ee7f98bbbe5 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicy.h +++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.h @@ -14,13 +14,13 @@ #define TAO_PORTABLESERVER_IMPLICITACTIVATIONPOLICY_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ImplicitActivationPolicyC.h" +#include "tao/PortableServer/ImplicitActivationPolicyC.h" #include "tao/LocalObject.h" // This is to remove "inherits via dominance" warnings from MSVC. diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp index 3532ef7e09c..e9cf1e13d1c 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp @@ -30,7 +30,7 @@ #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Enum_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" -#include "ImplicitActivationPolicyA.h" +#include "tao/PortableServer/ImplicitActivationPolicyA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyA.h b/TAO/tao/PortableServer/ImplicitActivationPolicyA.h index 0d2f117c498..1445a5a68a6 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicyA.h +++ b/TAO/tao/PortableServer/ImplicitActivationPolicyA.h @@ -33,8 +33,8 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" -#include "ImplicitActivationPolicyC.h" +#include "tao/PortableServer/portableserver_export.h" +#include "tao/PortableServer/ImplicitActivationPolicyC.h" #include "tao/AnyTypeCode/PolicyA.h" diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp index 1ec3a6abc53..3a6f411acf4 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "ImplicitActivationPolicyC.h" +#include "tao/PortableServer/ImplicitActivationPolicyC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyC.h b/TAO/tao/PortableServer/ImplicitActivationPolicyC.h index 00029e2e0e6..baad7fbbbbc 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicyC.h +++ b/TAO/tao/PortableServer/ImplicitActivationPolicyC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp index 0b9cce6163a..f2761572e36 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp @@ -1,6 +1,6 @@ // -*- C++ -*- -#include "ImplicitActivationStrategy.h" +#include "tao/PortableServer/ImplicitActivationStrategy.h" ACE_RCSID (PortableServer, ImplicitActivationStrategy, diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategy.h b/TAO/tao/PortableServer/ImplicitActivationStrategy.h index 99312a8bff7..22ca61b5cbf 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategy.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategy.h @@ -14,7 +14,7 @@ #define TAO_ACTIVATION_STRATEGY_H #include /**/ "ace/pre.h" -#include "Policy_Strategy.h" +#include "tao/PortableServer/Policy_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp index e02705848d8..09ca4fb613e 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp @@ -1,6 +1,6 @@ // -*- C++ -*- -#include "ImplicitActivationStrategyExplicit.h" +#include "tao/PortableServer/ImplicitActivationStrategyExplicit.h" ACE_RCSID (PortableServer, ImplicitActivationStrategyExplicit, diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h index a83b6f6c703..af9e70e931e 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h @@ -14,13 +14,13 @@ #define TAO_IMPLICITACTIVATIONSTRATEGYEXPLICIT_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ImplicitActivationStrategy.h" +#include "tao/PortableServer/ImplicitActivationStrategy.h" #include "ace/Service_Config.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h b/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h index 5692bd3dc99..f5d1a8aa5f4 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h @@ -14,14 +14,14 @@ #define TAO_PORTABLESERVER_IMPLICITACTIVATIONSTRATEGYFACTORY_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "StrategyFactory.h" -#include "ImplicitActivationPolicyC.h" +#include "tao/PortableServer/StrategyFactory.h" +#include "tao/PortableServer/ImplicitActivationPolicyC.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp index 993f2362d13..0fa7771687c 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "ImplicitActivationStrategyFactoryImpl.h" +#include "tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h" #include "ace/Dynamic_Service.h" -#include "ImplicitActivationStrategyImplicit.h" -#include "ImplicitActivationStrategyExplicit.h" +#include "tao/PortableServer/ImplicitActivationStrategyImplicit.h" +#include "tao/PortableServer/ImplicitActivationStrategyExplicit.h" ACE_RCSID (PortableServer, ImplicitActivationStrategyFactoryImpl, diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h index 462e9da0067..6b9e87ef7f3 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h @@ -14,14 +14,14 @@ #define TAO_PORTABLESERVER_IMPLICITACTIVATIONSTRATEGYFACTORYIMPL_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Service_Config.h" -#include "ImplicitActivationStrategyFactory.h" +#include "tao/PortableServer/ImplicitActivationStrategyFactory.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp index 084940d0f90..551d6f45bdf 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp @@ -1,6 +1,6 @@ // -*- C++ -*- -#include "ImplicitActivationStrategyImplicit.h" +#include "tao/PortableServer/ImplicitActivationStrategyImplicit.h" ACE_RCSID (PortableServer, ImplicitActivationStrategyImplicit, diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h index 754df514a5e..92f9feab992 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h @@ -14,13 +14,13 @@ #define TAO_IMPLICITACTIVATIONSTRATEGYIMPLICIT_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ImplicitActivationStrategy.h" +#include "tao/PortableServer/ImplicitActivationStrategy.h" #include "ace/Service_Config.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Key_Adapters.cpp b/TAO/tao/PortableServer/Key_Adapters.cpp index 1ffefbd49bc..9263e4470fc 100644 --- a/TAO/tao/PortableServer/Key_Adapters.cpp +++ b/TAO/tao/PortableServer/Key_Adapters.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Key_Adapters.h" +#include "tao/PortableServer/Key_Adapters.h" #include "ace/ACE.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/PortableServer/Key_Adapters.h b/TAO/tao/PortableServer/Key_Adapters.h index aa8f6bf17aa..ac5881a10fa 100644 --- a/TAO/tao/PortableServer/Key_Adapters.h +++ b/TAO/tao/PortableServer/Key_Adapters.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "PS_ForwardC.h" +#include "tao/PortableServer/PS_ForwardC.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Active_Map_Manager_Key; diff --git a/TAO/tao/PortableServer/LifespanPolicy.cpp b/TAO/tao/PortableServer/LifespanPolicy.cpp index f50265f92fa..f3eb4894a21 100644 --- a/TAO/tao/PortableServer/LifespanPolicy.cpp +++ b/TAO/tao/PortableServer/LifespanPolicy.cpp @@ -1,5 +1,5 @@ -#include "LifespanPolicy.h" -#include "PortableServer.h" +#include "tao/PortableServer/LifespanPolicy.h" +#include "tao/PortableServer/PortableServer.h" ACE_RCSID (PortableServer, LifespanPolicy, diff --git a/TAO/tao/PortableServer/LifespanPolicy.h b/TAO/tao/PortableServer/LifespanPolicy.h index da44ce9fa83..eb0de5aae3c 100644 --- a/TAO/tao/PortableServer/LifespanPolicy.h +++ b/TAO/tao/PortableServer/LifespanPolicy.h @@ -14,13 +14,13 @@ #define TAO_POA_LIFESPANPOLICY_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "LifespanPolicyC.h" +#include "tao/PortableServer/LifespanPolicyC.h" #include "tao/LocalObject.h" // This is to remove "inherits via dominance" warnings from MSVC. diff --git a/TAO/tao/PortableServer/LifespanPolicyA.cpp b/TAO/tao/PortableServer/LifespanPolicyA.cpp index 1e3eab01c54..ee1706bf526 100644 --- a/TAO/tao/PortableServer/LifespanPolicyA.cpp +++ b/TAO/tao/PortableServer/LifespanPolicyA.cpp @@ -30,7 +30,7 @@ #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Enum_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" -#include "LifespanPolicyA.h" +#include "tao/PortableServer/LifespanPolicyA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" diff --git a/TAO/tao/PortableServer/LifespanPolicyA.h b/TAO/tao/PortableServer/LifespanPolicyA.h index 1c9efe26c1a..645805dbec9 100644 --- a/TAO/tao/PortableServer/LifespanPolicyA.h +++ b/TAO/tao/PortableServer/LifespanPolicyA.h @@ -33,8 +33,8 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" -#include "LifespanPolicyC.h" +#include "tao/PortableServer/portableserver_export.h" +#include "tao/PortableServer/LifespanPolicyC.h" #include "tao/AnyTypeCode/PolicyA.h" diff --git a/TAO/tao/PortableServer/LifespanPolicyC.cpp b/TAO/tao/PortableServer/LifespanPolicyC.cpp index dd60e004e5c..6e819d2f343 100644 --- a/TAO/tao/PortableServer/LifespanPolicyC.cpp +++ b/TAO/tao/PortableServer/LifespanPolicyC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "LifespanPolicyC.h" +#include "tao/PortableServer/LifespanPolicyC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/PortableServer/LifespanPolicyC.h b/TAO/tao/PortableServer/LifespanPolicyC.h index 08f87864cc0..30753638f7f 100644 --- a/TAO/tao/PortableServer/LifespanPolicyC.h +++ b/TAO/tao/PortableServer/LifespanPolicyC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" diff --git a/TAO/tao/PortableServer/LifespanStrategy.cpp b/TAO/tao/PortableServer/LifespanStrategy.cpp index a0866da0c08..aea66e7161c 100644 --- a/TAO/tao/PortableServer/LifespanStrategy.cpp +++ b/TAO/tao/PortableServer/LifespanStrategy.cpp @@ -9,7 +9,7 @@ */ //============================================================================= -#include "LifespanStrategy.h" +#include "tao/PortableServer/LifespanStrategy.h" ACE_RCSID (PortableServer, LifespanStrategy, diff --git a/TAO/tao/PortableServer/LifespanStrategy.h b/TAO/tao/PortableServer/LifespanStrategy.h index ae84b5a7c9e..895c20335d8 100644 --- a/TAO/tao/PortableServer/LifespanStrategy.h +++ b/TAO/tao/PortableServer/LifespanStrategy.h @@ -14,13 +14,13 @@ #define TAO_PORTABLESERVER_LIFESPANPOLICY_H #include /**/ "ace/pre.h" -#include "Policy_Strategy.h" +#include "tao/PortableServer/Policy_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "LifespanPolicyC.h" +#include "tao/PortableServer/LifespanPolicyC.h" #include "tao/Object_KeyC.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/LifespanStrategyFactory.h b/TAO/tao/PortableServer/LifespanStrategyFactory.h index 5249bbf1a3d..085e2c75228 100644 --- a/TAO/tao/PortableServer/LifespanStrategyFactory.h +++ b/TAO/tao/PortableServer/LifespanStrategyFactory.h @@ -14,14 +14,14 @@ #define TAO_PORTABLESERVER_LIFEPSPANSTRATEGYFACTORY_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "StrategyFactory.h" -#include "LifespanPolicyC.h" +#include "tao/PortableServer/StrategyFactory.h" +#include "tao/PortableServer/LifespanPolicyC.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp index 660c1ef7866..07e24aebc59 100644 --- a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "LifespanStrategyFactoryImpl.h" -#include "LifespanStrategy.h" +#include "tao/PortableServer/LifespanStrategyFactoryImpl.h" +#include "tao/PortableServer/LifespanStrategy.h" #include "ace/Dynamic_Service.h" ACE_RCSID (PortableServer, diff --git a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h index 1763e15103f..e0ece8266bb 100644 --- a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h @@ -14,14 +14,14 @@ #define TAO_PORTABLESERVER_LIFEPSPANSTRATEGYFACTORYIMPL_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Service_Config.h" -#include "LifespanStrategyFactory.h" +#include "tao/PortableServer/LifespanStrategyFactory.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp index 355ede75d81..6b2e3420c14 100644 --- a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp @@ -1,14 +1,14 @@ // -*- C++ -*- -#include "LifespanStrategyPersistent.h" +#include "tao/PortableServer/LifespanStrategyPersistent.h" ACE_RCSID (PortableServer, Lifespan_Strategy, "$Id$") -#include "Root_POA.h" -#include "POAManager.h" -#include "ImR_Client_Adapter.h" +#include "tao/PortableServer/Root_POA.h" +#include "tao/PortableServer/POAManager.h" +#include "tao/PortableServer/ImR_Client_Adapter.h" #include "tao/ORB_Core.h" #include "ace/OS_NS_sys_time.h" #include "ace/Dynamic_Service.h" diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.h b/TAO/tao/PortableServer/LifespanStrategyPersistent.h index 715f0addb1a..01634563c72 100644 --- a/TAO/tao/PortableServer/LifespanStrategyPersistent.h +++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.h @@ -14,7 +14,7 @@ #define TAO_LIFESPANSTRATEGYPERSISTENT_H #include /**/ "ace/pre.h" -#include "LifespanStrategy.h" +#include "tao/PortableServer/LifespanStrategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp index 7d7daa29749..ab24406bf5f 100644 --- a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "LifespanStrategyPersistentFactoryImpl.h" +#include "tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h" #include "ace/Dynamic_Service.h" -#include "LifespanStrategyPersistent.h" +#include "tao/PortableServer/LifespanStrategyPersistent.h" ACE_RCSID (PortableServer, LifespanStrategyFactoryImpl, diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h index 9434b466b4d..b32a3c63440 100644 --- a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h +++ b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h @@ -14,14 +14,14 @@ #define TAO_PORTABLESERVER_LIFEPSPANSTRATEGYPERSISTENTFACTORYIMPL_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Service_Config.h" -#include "LifespanStrategyFactory.h" +#include "tao/PortableServer/LifespanStrategyFactory.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/LifespanStrategyTransient.cpp b/TAO/tao/PortableServer/LifespanStrategyTransient.cpp index 799e349d735..d1859883dac 100644 --- a/TAO/tao/PortableServer/LifespanStrategyTransient.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyTransient.cpp @@ -1,6 +1,6 @@ // -*- C++ -*- -#include "LifespanStrategyTransient.h" +#include "tao/PortableServer/LifespanStrategyTransient.h" ACE_RCSID (PortableServer, Lifespan_Strategy, @@ -8,10 +8,10 @@ ACE_RCSID (PortableServer, #include "ace/OS_NS_sys_time.h" #include "ace/OS_NS_string.h" -#include "POAManager.h" -#include "Root_POA.h" +#include "tao/PortableServer/POAManager.h" +#include "tao/PortableServer/Root_POA.h" #include "tao/ORB_Constants.h" -#include "Creation_Time.h" +#include "tao/PortableServer/Creation_Time.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/LifespanStrategyTransient.h b/TAO/tao/PortableServer/LifespanStrategyTransient.h index 404af6124a6..6638973712f 100644 --- a/TAO/tao/PortableServer/LifespanStrategyTransient.h +++ b/TAO/tao/PortableServer/LifespanStrategyTransient.h @@ -14,13 +14,13 @@ #define TAO_LIFESPANSTRATEGYTRANSIENT_H #include /**/ "ace/pre.h" -#include "LifespanStrategy.h" +#include "tao/PortableServer/LifespanStrategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Creation_Time.h" +#include "tao/PortableServer/Creation_Time.h" #include "tao/Object_KeyC.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp index 992f7a3d1df..896745f0846 100644 --- a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "LifespanStrategyTransientFactoryImpl.h" +#include "tao/PortableServer/LifespanStrategyTransientFactoryImpl.h" #include "ace/Dynamic_Service.h" -#include "LifespanStrategyTransient.h" +#include "tao/PortableServer/LifespanStrategyTransient.h" ACE_RCSID (PortableServer, LifespanStrategyFactoryImpl, diff --git a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h index 9769a7ecd55..e3a8c076934 100644 --- a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h +++ b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h @@ -15,14 +15,14 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Service_Config.h" -#include "LifespanStrategyFactory.h" +#include "tao/PortableServer/LifespanStrategyFactory.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Local_Servant_Base.cpp b/TAO/tao/PortableServer/Local_Servant_Base.cpp index 665e0b4fa64..007b1ca5e05 100644 --- a/TAO/tao/PortableServer/Local_Servant_Base.cpp +++ b/TAO/tao/PortableServer/Local_Servant_Base.cpp @@ -8,7 +8,7 @@ ACE_RCSID (PortableServer, "$Id$") #if !defined (__ACE_INLINE__) -# include "Local_Servant_Base.inl" +# include "tao/PortableServer/Local_Servant_Base.inl" #endif /* ! __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Local_Servant_Base.h b/TAO/tao/PortableServer/Local_Servant_Base.h index f97d9836062..dd3d9447932 100644 --- a/TAO/tao/PortableServer/Local_Servant_Base.h +++ b/TAO/tao/PortableServer/Local_Servant_Base.h @@ -54,7 +54,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "Local_Servant_Base.inl" +# include "tao/PortableServer/Local_Servant_Base.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp index cf784c40081..2660f700538 100644 --- a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp +++ b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "Non_Servant_Upcall.h" -#include "Object_Adapter.h" -#include "Root_POA.h" +#include "tao/PortableServer/Non_Servant_Upcall.h" +#include "tao/PortableServer/Object_Adapter.h" +#include "tao/PortableServer/Root_POA.h" #if !defined (__ACE_INLINE__) -# include "Non_Servant_Upcall.inl" +# include "tao/PortableServer/Non_Servant_Upcall.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (PortableServer, diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.h b/TAO/tao/PortableServer/Non_Servant_Upcall.h index 2e77c72a096..92b05194d9d 100644 --- a/TAO/tao/PortableServer/Non_Servant_Upcall.h +++ b/TAO/tao/PortableServer/Non_Servant_Upcall.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -71,7 +71,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "Non_Servant_Upcall.inl" +# include "tao/PortableServer/Non_Servant_Upcall.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/ORT_Adapter.h b/TAO/tao/PortableServer/ORT_Adapter.h index 05d3ae404e8..34d89eb42db 100644 --- a/TAO/tao/PortableServer/ORT_Adapter.h +++ b/TAO/tao/PortableServer/ORT_Adapter.h @@ -14,7 +14,7 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp b/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp index 2ada7773dc9..7d4a85297b8 100644 --- a/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp +++ b/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ORT_Adapter_Factory.h" +#include "tao/PortableServer/ORT_Adapter_Factory.h" ACE_RCSID (PortableServer, ORT_Adapter_Factory, diff --git a/TAO/tao/PortableServer/ORT_Adapter_Factory.h b/TAO/tao/PortableServer/ORT_Adapter_Factory.h index 0d48ac8f9bf..d5c7570f93f 100644 --- a/TAO/tao/PortableServer/ORT_Adapter_Factory.h +++ b/TAO/tao/PortableServer/ORT_Adapter_Factory.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp index 3a0215ed755..49c557070c8 100644 --- a/TAO/tao/PortableServer/Object_Adapter.cpp +++ b/TAO/tao/PortableServer/Object_Adapter.cpp @@ -1,17 +1,17 @@ // $Id$ // -- PortableServer Include -- -#include "Object_Adapter.h" -#include "Non_Servant_Upcall.h" -#include "Servant_Upcall.h" -#include "Root_POA.h" -#include "Regular_POA.h" -#include "Creation_Time.h" -#include "POA_Guard.h" -#include "Default_Servant_Dispatcher.h" -#include "Collocated_Object_Proxy_Broker.h" -#include "POAManager.h" -#include "Servant_Base.h" +#include "tao/PortableServer/Object_Adapter.h" +#include "tao/PortableServer/Non_Servant_Upcall.h" +#include "tao/PortableServer/Servant_Upcall.h" +#include "tao/PortableServer/Root_POA.h" +#include "tao/PortableServer/Regular_POA.h" +#include "tao/PortableServer/Creation_Time.h" +#include "tao/PortableServer/POA_Guard.h" +#include "tao/PortableServer/Default_Servant_Dispatcher.h" +#include "tao/PortableServer/Collocated_Object_Proxy_Broker.h" +#include "tao/PortableServer/POAManager.h" +#include "tao/PortableServer/Servant_Base.h" // -- ACE Include -- #include "ace/Auto_Ptr.h" @@ -36,16 +36,16 @@ #include "tao/ServerRequestInterceptor_Adapter.h" #if !defined (__ACE_INLINE__) -# include "Object_Adapter.i" +# include "tao/PortableServer/Object_Adapter.i" #endif /* __ACE_INLINE__ */ -#include "ThreadPolicy.h" -#include "LifespanPolicy.h" -#include "IdAssignmentPolicy.h" -#include "IdUniquenessPolicy.h" -#include "ImplicitActivationPolicy.h" -#include "RequestProcessingPolicy.h" -#include "ServantRetentionPolicy.h" +#include "tao/PortableServer/ThreadPolicy.h" +#include "tao/PortableServer/LifespanPolicy.h" +#include "tao/PortableServer/IdAssignmentPolicy.h" +#include "tao/PortableServer/IdUniquenessPolicy.h" +#include "tao/PortableServer/ImplicitActivationPolicy.h" +#include "tao/PortableServer/RequestProcessingPolicy.h" +#include "tao/PortableServer/ServantRetentionPolicy.h" ACE_RCSID (PortableServer, Object_Adapter, diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h index 9753c93818c..5ceb0ce6878 100644 --- a/TAO/tao/PortableServer/Object_Adapter.h +++ b/TAO/tao/PortableServer/Object_Adapter.h @@ -15,17 +15,17 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Key_Adapters.h" -#include "poa_macros.h" -#include "Servant_Location.h" -#include "Default_Policy_Validator.h" -#include "POA_Policy_Set.h" +#include "tao/PortableServer/Key_Adapters.h" +#include "tao/PortableServer/poa_macros.h" +#include "tao/PortableServer/Servant_Location.h" +#include "tao/PortableServer/Default_Policy_Validator.h" +#include "tao/PortableServer/POA_Policy_Set.h" #include "tao/Adapter.h" #include "tao/Adapter_Factory.h" @@ -36,7 +36,7 @@ #include "ace/Condition_Thread_Mutex.h" #include "ace/Map_T.h" -#include "Servant_Location.h" +#include "tao/PortableServer/Servant_Location.h" #if defined(_MSC_VER) #pragma warning(push) @@ -509,7 +509,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #endif /* _MSC_VER */ #if defined (__ACE_INLINE__) -# include "Object_Adapter.i" +# include "tao/PortableServer/Object_Adapter.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Object_Adapter_Factory.cpp b/TAO/tao/PortableServer/Object_Adapter_Factory.cpp index 6f94672dd41..0e2859d333c 100644 --- a/TAO/tao/PortableServer/Object_Adapter_Factory.cpp +++ b/TAO/tao/PortableServer/Object_Adapter_Factory.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "Object_Adapter_Factory.h" -#include "Object_Adapter.h" +#include "tao/PortableServer/Object_Adapter_Factory.h" +#include "tao/PortableServer/Object_Adapter.h" #include "tao/ORB_Core.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Object_Adapter_Factory.h b/TAO/tao/PortableServer/Object_Adapter_Factory.h index 4cca3ce8ade..77266900e27 100644 --- a/TAO/tao/PortableServer/Object_Adapter_Factory.h +++ b/TAO/tao/PortableServer/Object_Adapter_Factory.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PortableServer/Operation_Table.cpp b/TAO/tao/PortableServer/Operation_Table.cpp index e79e8a680e5..bf8be18d80d 100644 --- a/TAO/tao/PortableServer/Operation_Table.cpp +++ b/TAO/tao/PortableServer/Operation_Table.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Operation_Table.h" +#include "tao/PortableServer/Operation_Table.h" #include "tao/ORB.h" ACE_RCSID(PortableServer, diff --git a/TAO/tao/PortableServer/Operation_Table.h b/TAO/tao/PortableServer/Operation_Table.h index bd47973d891..d573d2c9f8e 100644 --- a/TAO/tao/PortableServer/Operation_Table.h +++ b/TAO/tao/PortableServer/Operation_Table.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp b/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp index b2dc94486eb..0df9e27630a 100644 --- a/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp +++ b/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Operation_Table_Binary_Search.h" +#include "tao/PortableServer/Operation_Table_Binary_Search.h" #include "tao/Timeprobe.h" #include "ace/Log_Msg.h" diff --git a/TAO/tao/PortableServer/Operation_Table_Binary_Search.h b/TAO/tao/PortableServer/Operation_Table_Binary_Search.h index ddd82ccc471..1d8d0a11c02 100644 --- a/TAO/tao/PortableServer/Operation_Table_Binary_Search.h +++ b/TAO/tao/PortableServer/Operation_Table_Binary_Search.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Operation_Table.h" +#include "tao/PortableServer/Operation_Table.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp index 1dc4352b603..21a206d9fba 100644 --- a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp +++ b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Operation_Table_Dynamic_Hash.h" +#include "tao/PortableServer/Operation_Table_Dynamic_Hash.h" #include "tao/Timeprobe.h" #include "ace/Log_Msg.h" diff --git a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h index c30000db011..40973757eba 100644 --- a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h +++ b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Operation_Table.h" +#include "tao/PortableServer/Operation_Table.h" #include "ace/Hash_Map_Manager.h" #include "ace/Synch_Traits.h" #include "ace/Null_Mutex.h" diff --git a/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp b/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp index 13b2eb43afb..0ad27a2c2c8 100644 --- a/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp +++ b/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Operation_Table_Linear_Search.h" +#include "tao/PortableServer/Operation_Table_Linear_Search.h" #include "tao/Timeprobe.h" #include "ace/Log_Msg.h" diff --git a/TAO/tao/PortableServer/Operation_Table_Linear_Search.h b/TAO/tao/PortableServer/Operation_Table_Linear_Search.h index a11add3a6c3..1f26bc71a2f 100644 --- a/TAO/tao/PortableServer/Operation_Table_Linear_Search.h +++ b/TAO/tao/PortableServer/Operation_Table_Linear_Search.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Operation_Table.h" +#include "tao/PortableServer/Operation_Table.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp index c214bd97b27..c0b75b8b6fe 100644 --- a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp +++ b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Operation_Table_Perfect_Hash.h" +#include "tao/PortableServer/Operation_Table_Perfect_Hash.h" #include "tao/Timeprobe.h" #include "ace/Log_Msg.h" diff --git a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h index 21cf3977859..00338dcc2c7 100644 --- a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h +++ b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Operation_Table.h" +#include "tao/PortableServer/Operation_Table.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/POAManager.cpp b/TAO/tao/PortableServer/POAManager.cpp index 3d6d9682827..7eba8059a4f 100644 --- a/TAO/tao/PortableServer/POAManager.cpp +++ b/TAO/tao/PortableServer/POAManager.cpp @@ -1,14 +1,14 @@ // $Id$ -#include "POAManager.h" -#include "Root_POA.h" -#include "poa_macros.h" +#include "tao/PortableServer/POAManager.h" +#include "tao/PortableServer/Root_POA.h" +#include "tao/PortableServer/poa_macros.h" #include "tao/Server_Strategy_Factory.h" #include "tao/ORB_Core.h" #include "tao/IORInterceptor_Adapter.h" #if !defined (__ACE_INLINE__) -# include "POAManager.i" +# include "tao/PortableServer/POAManager.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID (PortableServer, diff --git a/TAO/tao/PortableServer/POAManager.h b/TAO/tao/PortableServer/POAManager.h index 014c4a3c77b..056efb7578c 100644 --- a/TAO/tao/PortableServer/POAManager.h +++ b/TAO/tao/PortableServer/POAManager.h @@ -16,14 +16,14 @@ #define TAO_POAMANAGER_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "poa_macros.h" -#include "POAManagerC.h" +#include "tao/PortableServer/poa_macros.h" +#include "tao/PortableServer/POAManagerC.h" // Local Object #include "tao/LocalObject.h" @@ -164,7 +164,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #endif /* _MSC_VER */ #if defined (__ACE_INLINE__) -# include "POAManager.i" +# include "tao/PortableServer/POAManager.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/POAManagerC.cpp b/TAO/tao/PortableServer/POAManagerC.cpp index decbb1bb138..3c397bb99a2 100644 --- a/TAO/tao/PortableServer/POAManagerC.cpp +++ b/TAO/tao/PortableServer/POAManagerC.cpp @@ -40,7 +40,7 @@ #include "tao/AnyTypeCode/Any_Impl_T.h" #include "tao/AnyTypeCode/Any_Dual_Impl_T.h" #include "tao/AnyTypeCode/Any_Basic_Impl_T.h" -#include "POAManagerC.h" +#include "tao/PortableServer/POAManagerC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/PortableServer/POAManagerC.h b/TAO/tao/PortableServer/POAManagerC.h index 55274122990..9d767071182 100644 --- a/TAO/tao/PortableServer/POAManagerC.h +++ b/TAO/tao/PortableServer/POAManagerC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.cpp b/TAO/tao/PortableServer/POA_Cached_Policies.cpp index 931aa81e469..76afbefadbc 100644 --- a/TAO/tao/PortableServer/POA_Cached_Policies.cpp +++ b/TAO/tao/PortableServer/POA_Cached_Policies.cpp @@ -1,17 +1,17 @@ // $Id$ -#include "POA_Cached_Policies.h" -#include "POA_Policy_Set.h" -#include "IdAssignmentPolicyC.h" -#include "IdUniquenessPolicyC.h" -#include "ImplicitActivationPolicyC.h" -#include "LifespanPolicyC.h" -#include "RequestProcessingPolicyC.h" -#include "ServantRetentionPolicyC.h" -#include "ThreadPolicyC.h" +#include "tao/PortableServer/POA_Cached_Policies.h" +#include "tao/PortableServer/POA_Policy_Set.h" +#include "tao/PortableServer/IdAssignmentPolicyC.h" +#include "tao/PortableServer/IdUniquenessPolicyC.h" +#include "tao/PortableServer/ImplicitActivationPolicyC.h" +#include "tao/PortableServer/LifespanPolicyC.h" +#include "tao/PortableServer/RequestProcessingPolicyC.h" +#include "tao/PortableServer/ServantRetentionPolicyC.h" +#include "tao/PortableServer/ThreadPolicyC.h" #if !defined (__ACE_INLINE__) -# include "POA_Cached_Policies.i" +# include "tao/PortableServer/POA_Cached_Policies.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID(PortableServer, diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.h b/TAO/tao/PortableServer/POA_Cached_Policies.h index 73882b29cfc..a756f101782 100644 --- a/TAO/tao/PortableServer/POA_Cached_Policies.h +++ b/TAO/tao/PortableServer/POA_Cached_Policies.h @@ -16,19 +16,19 @@ #define TAO_POA_CACHED_POLICIES_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ThreadPolicyC.h" -#include "LifespanPolicyC.h" -#include "IdUniquenessPolicyC.h" -#include "IdAssignmentPolicyC.h" -#include "ImplicitActivationPolicyC.h" -#include "ServantRetentionPolicyC.h" -#include "RequestProcessingPolicyC.h" +#include "tao/PortableServer/ThreadPolicyC.h" +#include "tao/PortableServer/LifespanPolicyC.h" +#include "tao/PortableServer/IdUniquenessPolicyC.h" +#include "tao/PortableServer/IdAssignmentPolicyC.h" +#include "tao/PortableServer/ImplicitActivationPolicyC.h" +#include "tao/PortableServer/ServantRetentionPolicyC.h" +#include "tao/PortableServer/RequestProcessingPolicyC.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -107,7 +107,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "POA_Cached_Policies.i" +# include "tao/PortableServer/POA_Cached_Policies.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/POA_Current.cpp b/TAO/tao/PortableServer/POA_Current.cpp index adca77b77d3..a1e30c3faed 100644 --- a/TAO/tao/PortableServer/POA_Current.cpp +++ b/TAO/tao/PortableServer/POA_Current.cpp @@ -1,8 +1,8 @@ // $Id$ // -- PortableServer Include -- -#include "POA_Current.h" -#include "POA_Current_Impl.h" +#include "tao/PortableServer/POA_Current.h" +#include "tao/PortableServer/POA_Current_Impl.h" // -- TAO Include -- #include "tao/TSS_Resources.h" diff --git a/TAO/tao/PortableServer/POA_Current.h b/TAO/tao/PortableServer/POA_Current.h index 8f1b5c767aa..4af15a2b241 100644 --- a/TAO/tao/PortableServer/POA_Current.h +++ b/TAO/tao/PortableServer/POA_Current.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PortableServer/POA_Current_Factory.cpp b/TAO/tao/PortableServer/POA_Current_Factory.cpp index d11c66dce72..081147aad3c 100644 --- a/TAO/tao/PortableServer/POA_Current_Factory.cpp +++ b/TAO/tao/PortableServer/POA_Current_Factory.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "POA_Current_Factory.h" -#include "POA_Current.h" +#include "tao/PortableServer/POA_Current_Factory.h" +#include "tao/PortableServer/POA_Current.h" #include "tao/ORB_Core.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/POA_Current_Factory.h b/TAO/tao/PortableServer/POA_Current_Factory.h index 36261898c94..6ef224d32fd 100644 --- a/TAO/tao/PortableServer/POA_Current_Factory.h +++ b/TAO/tao/PortableServer/POA_Current_Factory.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PortableServer/POA_Current_Impl.cpp b/TAO/tao/PortableServer/POA_Current_Impl.cpp index 32ec63aa6db..1c1e81b55c2 100644 --- a/TAO/tao/PortableServer/POA_Current_Impl.cpp +++ b/TAO/tao/PortableServer/POA_Current_Impl.cpp @@ -1,14 +1,14 @@ // $Id$ // -- PortableServer Include -- -#include "Object_Adapter.h" -#include "POA_Current_Impl.h" -#include "Root_POA.h" +#include "tao/PortableServer/Object_Adapter.h" +#include "tao/PortableServer/POA_Current_Impl.h" +#include "tao/PortableServer/Root_POA.h" #include "tao/TSS_Resources.h" #if !defined (__ACE_INLINE__) -# include "POA_Current_Impl.inl" +# include "tao/PortableServer/POA_Current_Impl.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (PortableServer, diff --git a/TAO/tao/PortableServer/POA_Current_Impl.h b/TAO/tao/PortableServer/POA_Current_Impl.h index fc16eb137a1..47f2a03994c 100644 --- a/TAO/tao/PortableServer/POA_Current_Impl.h +++ b/TAO/tao/PortableServer/POA_Current_Impl.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "PS_ForwardC.h" +#include "tao/PortableServer/PS_ForwardC.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -178,7 +178,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "POA_Current_Impl.inl" +# include "tao/PortableServer/POA_Current_Impl.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/POA_Guard.cpp b/TAO/tao/PortableServer/POA_Guard.cpp index 86740ada622..a2943714015 100644 --- a/TAO/tao/PortableServer/POA_Guard.cpp +++ b/TAO/tao/PortableServer/POA_Guard.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "POA_Guard.h" -#include "Root_POA.h" +#include "tao/PortableServer/POA_Guard.h" +#include "tao/PortableServer/Root_POA.h" #include "tao/ORB_Constants.h" ACE_RCSID(PortableServer, diff --git a/TAO/tao/PortableServer/POA_Guard.h b/TAO/tao/PortableServer/POA_Guard.h index 0f07265bff2..da0f74dedae 100644 --- a/TAO/tao/PortableServer/POA_Guard.h +++ b/TAO/tao/PortableServer/POA_Guard.h @@ -13,7 +13,7 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PortableServer/POA_Policy_Set.cpp b/TAO/tao/PortableServer/POA_Policy_Set.cpp index 644c9511756..043020de869 100644 --- a/TAO/tao/PortableServer/POA_Policy_Set.cpp +++ b/TAO/tao/PortableServer/POA_Policy_Set.cpp @@ -1,14 +1,14 @@ // @(#) $Id$ -#include "POA_Policy_Set.h" -#include "POA_Cached_Policies.h" -#include "PortableServer.h" +#include "tao/PortableServer/POA_Policy_Set.h" +#include "tao/PortableServer/POA_Cached_Policies.h" +#include "tao/PortableServer/PortableServer.h" #include "tao/Policy_Validator.h" #include "tao/ORB_Core.h" #if !defined (__ACE_INLINE__) -# include "POA_Policy_Set.i" +# include "tao/PortableServer/POA_Policy_Set.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID (PortableServer, diff --git a/TAO/tao/PortableServer/POA_Policy_Set.h b/TAO/tao/PortableServer/POA_Policy_Set.h index 92c9dfc6c60..182ad836a8f 100644 --- a/TAO/tao/PortableServer/POA_Policy_Set.h +++ b/TAO/tao/PortableServer/POA_Policy_Set.h @@ -16,7 +16,7 @@ #define TAO_POA_POLICY_SET_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -76,7 +76,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "POA_Policy_Set.i" +# include "tao/PortableServer/POA_Policy_Set.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/PS_CurrentC.cpp b/TAO/tao/PortableServer/PS_CurrentC.cpp index 9c7570b1d50..1f0d5f29e69 100644 --- a/TAO/tao/PortableServer/PS_CurrentC.cpp +++ b/TAO/tao/PortableServer/PS_CurrentC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "PS_CurrentC.h" +#include "tao/PortableServer/PS_CurrentC.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/PortableServer/PS_ForwardA.cpp b/TAO/tao/PortableServer/PS_ForwardA.cpp index 38e34e157b3..efaca76332e 100644 --- a/TAO/tao/PortableServer/PS_ForwardA.cpp +++ b/TAO/tao/PortableServer/PS_ForwardA.cpp @@ -28,7 +28,7 @@ #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" -#include "PS_ForwardA.h" +#include "tao/PortableServer/PS_ForwardA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" diff --git a/TAO/tao/PortableServer/PS_ForwardA.h b/TAO/tao/PortableServer/PS_ForwardA.h index 9f37e1a25d4..047e66c649b 100644 --- a/TAO/tao/PortableServer/PS_ForwardA.h +++ b/TAO/tao/PortableServer/PS_ForwardA.h @@ -33,8 +33,8 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" -#include "PS_ForwardC.h" +#include "tao/PortableServer/portableserver_export.h" +#include "tao/PortableServer/PS_ForwardC.h" #include "tao/AnyTypeCode/OctetSeqA.h" diff --git a/TAO/tao/PortableServer/PS_ForwardC.cpp b/TAO/tao/PortableServer/PS_ForwardC.cpp index d6ccb8cbbf8..d23e1ebf431 100644 --- a/TAO/tao/PortableServer/PS_ForwardC.cpp +++ b/TAO/tao/PortableServer/PS_ForwardC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "PS_ForwardC.h" +#include "tao/PortableServer/PS_ForwardC.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" diff --git a/TAO/tao/PortableServer/PS_ForwardC.h b/TAO/tao/PortableServer/PS_ForwardC.h index 78d76a3c80d..e05abec2d4c 100644 --- a/TAO/tao/PortableServer/PS_ForwardC.h +++ b/TAO/tao/PortableServer/PS_ForwardC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #include "tao/ORB.h" #include "tao/Environment.h" #include "tao/Objref_VarOut_T.h" diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp index 57111f5cdc0..ef2bd9c048b 100644 --- a/TAO/tao/PortableServer/PolicyS.cpp +++ b/TAO/tao/PortableServer/PolicyS.cpp @@ -35,7 +35,7 @@ #include "tao/AnyTypeCode/TypeCode.h" #include "tao/AnyTypeCode/Any.h" -#include "PolicyS.h" +#include "tao/PortableServer/PolicyS.h" #include "tao/PortableServer/Operation_Table_Perfect_Hash.h" #include "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h" #include "tao/PortableServer/Upcall_Command.h" diff --git a/TAO/tao/PortableServer/PolicyS.h b/TAO/tao/PortableServer/PolicyS.h index 94b6935de27..91d1c44b232 100644 --- a/TAO/tao/PortableServer/PolicyS.h +++ b/TAO/tao/PortableServer/PolicyS.h @@ -55,7 +55,7 @@ #pragma option push -w-rvl -w-rch -w-ccc -w-inl #endif /* __BORLANDC__ */ -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO @@ -310,7 +310,7 @@ namespace POA_CORBA TAO_END_VERSIONED_NAMESPACE_DECL -#include "PolicyS_T.h" +#include "tao/PortableServer/PolicyS_T.h" #if defined(_MSC_VER) diff --git a/TAO/tao/PortableServer/PolicyS_T.cpp b/TAO/tao/PortableServer/PolicyS_T.cpp index a53bc9459b6..dfe7cbabbdd 100644 --- a/TAO/tao/PortableServer/PolicyS_T.cpp +++ b/TAO/tao/PortableServer/PolicyS_T.cpp @@ -31,10 +31,10 @@ #ifndef _TAO_IDL_ORIG_POLICYS_T_CPP_ #define _TAO_IDL_ORIG_POLICYS_T_CPP_ -#include "PolicyS_T.h" +#include "tao/PortableServer/PolicyS_T.h" #if !defined (__ACE_INLINE__) -#include "PolicyS_T.inl" +#include "tao/PortableServer/PolicyS_T.inl" #endif /* !defined INLINE */ diff --git a/TAO/tao/PortableServer/PolicyS_T.h b/TAO/tao/PortableServer/PolicyS_T.h index 1feb0eef17c..f4ef428808e 100644 --- a/TAO/tao/PortableServer/PolicyS_T.h +++ b/TAO/tao/PortableServer/PolicyS_T.h @@ -134,11 +134,11 @@ namespace POA_CORBA TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "PolicyS_T.inl" +#include "tao/PortableServer/PolicyS_T.inl" #endif /* defined INLINE */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "PolicyS_T.cpp" +#include "tao/PortableServer/PolicyS_T.cpp" #endif /* defined REQUIRED SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/tao/PortableServer/PortableServer.cpp b/TAO/tao/PortableServer/PortableServer.cpp index 3199816c87a..67d92f9fdbb 100644 --- a/TAO/tao/PortableServer/PortableServer.cpp +++ b/TAO/tao/PortableServer/PortableServer.cpp @@ -1,46 +1,46 @@ // $Id$ -#include "PortableServer.h" -#include "Object_Adapter.h" -#include "Object_Adapter_Factory.h" -#include "POA_Current_Factory.h" +#include "tao/PortableServer/PortableServer.h" +#include "tao/PortableServer/Object_Adapter.h" +#include "tao/PortableServer/Object_Adapter_Factory.h" +#include "tao/PortableServer/POA_Current_Factory.h" -#include "ThreadStrategyFactoryImpl.h" -#include "LifespanStrategyFactoryImpl.h" -#include "IdAssignmentStrategyFactoryImpl.h" -#include "IdUniquenessStrategyFactoryImpl.h" -#include "ImplicitActivationStrategyFactoryImpl.h" -#include "RequestProcessingStrategyFactoryImpl.h" -#include "ServantRetentionStrategyFactoryImpl.h" +#include "tao/PortableServer/ThreadStrategyFactoryImpl.h" +#include "tao/PortableServer/LifespanStrategyFactoryImpl.h" +#include "tao/PortableServer/IdAssignmentStrategyFactoryImpl.h" +#include "tao/PortableServer/IdUniquenessStrategyFactoryImpl.h" +#include "tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h" +#include "tao/PortableServer/RequestProcessingStrategyFactoryImpl.h" +#include "tao/PortableServer/ServantRetentionStrategyFactoryImpl.h" -#include "ThreadStrategyORBControl.h" -#include "ThreadStrategySingle.h" -#include "ThreadStrategySingleFactoryImpl.h" +#include "tao/PortableServer/ThreadStrategyORBControl.h" +#include "tao/PortableServer/ThreadStrategySingle.h" +#include "tao/PortableServer/ThreadStrategySingleFactoryImpl.h" -#include "IdAssignmentStrategySystem.h" -#include "IdAssignmentStrategyUser.h" +#include "tao/PortableServer/IdAssignmentStrategySystem.h" +#include "tao/PortableServer/IdAssignmentStrategyUser.h" -#include "IdUniquenessStrategyMultiple.h" -#include "IdUniquenessStrategyUnique.h" +#include "tao/PortableServer/IdUniquenessStrategyMultiple.h" +#include "tao/PortableServer/IdUniquenessStrategyUnique.h" -#include "ImplicitActivationStrategyExplicit.h" -#include "ImplicitActivationStrategyImplicit.h" +#include "tao/PortableServer/ImplicitActivationStrategyExplicit.h" +#include "tao/PortableServer/ImplicitActivationStrategyImplicit.h" -#include "RequestProcessingStrategyAOMOnly.h" -#include "RequestProcessingStrategyDefaultServant.h" -#include "RequestProcessingStrategyServantManager.h" +#include "tao/PortableServer/RequestProcessingStrategyAOMOnly.h" +#include "tao/PortableServer/RequestProcessingStrategyDefaultServant.h" +#include "tao/PortableServer/RequestProcessingStrategyServantManager.h" -#include "ServantRetentionStrategyNonRetainFactoryImpl.h" -#include "ServantRetentionStrategyRetainFactoryImpl.h" +#include "tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h" +#include "tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h" -#include "RequestProcessingStrategyDefaultServantFI.h" -#include "RequestProcessingStrategyAOMOnlyFactoryImpl.h" -#include "RequestProcessingStrategyServantActivatorFI.h" -#include "RequestProcessingStrategyServantLocatorFI.h" +#include "tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h" +#include "tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h" +#include "tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h" +#include "tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h" -#include "IdUniquenessStrategyUniqueFactoryImpl.h" +#include "tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h" -#include "LifespanStrategyPersistentFactoryImpl.h" -#include "LifespanStrategyTransientFactoryImpl.h" +#include "tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h" +#include "tao/PortableServer/LifespanStrategyTransientFactoryImpl.h" ACE_RCSID (PortableServer, PortableServer, diff --git a/TAO/tao/PortableServer/PortableServer.h b/TAO/tao/PortableServer/PortableServer.h index b8416d2500f..4c27f187332 100644 --- a/TAO/tao/PortableServer/PortableServer.h +++ b/TAO/tao/PortableServer/PortableServer.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -38,20 +38,20 @@ TAO_Requires_POA_Initializer = TAO_POA_Initializer::init (); TAO_END_VERSIONED_NAMESPACE_DECL #define TAO_PORTABLESERVER_SAFE_INCLUDE -#include "PortableServerC.h" +#include "tao/PortableServer/PortableServerC.h" #undef TAO_PORTABLESERVER_SAFE_INCLUDE -#include "POAManagerC.h" -#include "PS_CurrentC.h" -#include "PortableServer_Functions.h" -#include "PortableServer_WFunctions.h" -#include "PS_ForwardA.h" -#include "IdUniquenessPolicyA.h" -#include "ImplicitActivationPolicyA.h" -#include "RequestProcessingPolicyA.h" -#include "ServantRetentionPolicyA.h" -#include "ThreadPolicyA.h" -#include "IdAssignmentPolicyA.h" -#include "LifespanPolicyA.h" +#include "tao/PortableServer/POAManagerC.h" +#include "tao/PortableServer/PS_CurrentC.h" +#include "tao/PortableServer/PortableServer_Functions.h" +#include "tao/PortableServer/PortableServer_WFunctions.h" +#include "tao/PortableServer/PS_ForwardA.h" +#include "tao/PortableServer/IdUniquenessPolicyA.h" +#include "tao/PortableServer/ImplicitActivationPolicyA.h" +#include "tao/PortableServer/RequestProcessingPolicyA.h" +#include "tao/PortableServer/ServantRetentionPolicyA.h" +#include "tao/PortableServer/ThreadPolicyA.h" +#include "tao/PortableServer/IdAssignmentPolicyA.h" +#include "tao/PortableServer/LifespanPolicyA.h" #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/PortableServerA.cpp b/TAO/tao/PortableServer/PortableServerA.cpp index b147e98fa2a..548d4f7ce54 100644 --- a/TAO/tao/PortableServer/PortableServerA.cpp +++ b/TAO/tao/PortableServer/PortableServerA.cpp @@ -33,7 +33,7 @@ #include "tao/AnyTypeCode/String_TypeCode_Static.h" #include "tao/AnyTypeCode/Struct_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Struct_Field.h" -#include "PortableServer.h" +#include "tao/PortableServer/PortableServer.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp index 46f5df2e735..6b5bb141a5a 100644 --- a/TAO/tao/PortableServer/PortableServerC.cpp +++ b/TAO/tao/PortableServer/PortableServerC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "PortableServer.h" +#include "tao/PortableServer/PortableServer.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" #include "tao/Object_Argument_T.h" diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h index 14948ad62df..4609975b004 100644 --- a/TAO/tao/PortableServer/PortableServerC.h +++ b/TAO/tao/PortableServer/PortableServerC.h @@ -44,7 +44,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" diff --git a/TAO/tao/PortableServer/PortableServerS.h b/TAO/tao/PortableServer/PortableServerS.h index c963aac74a9..acf326b7e64 100644 --- a/TAO/tao/PortableServer/PortableServerS.h +++ b/TAO/tao/PortableServer/PortableServerS.h @@ -33,7 +33,7 @@ #include /**/ "ace/pre.h" -#include "PortableServerC.h" +#include "tao/PortableServer/PortableServerC.h" #include "tao/Policy_ForwardS.h" #include "tao/OctetSeqS.h" #include "tao/orb_typesS.h" diff --git a/TAO/tao/PortableServer/PortableServer_Functions.cpp b/TAO/tao/PortableServer/PortableServer_Functions.cpp index 202bc93d2fb..ac70be706c3 100644 --- a/TAO/tao/PortableServer/PortableServer_Functions.cpp +++ b/TAO/tao/PortableServer/PortableServer_Functions.cpp @@ -1,4 +1,4 @@ -#include "PortableServer_Functions.h" +#include "tao/PortableServer/PortableServer_Functions.h" ACE_RCSID (PortableServer, PortableServer_Functions, diff --git a/TAO/tao/PortableServer/PortableServer_Functions.h b/TAO/tao/PortableServer/PortableServer_Functions.h index 2ee4454a50d..e14222ac6b9 100644 --- a/TAO/tao/PortableServer/PortableServer_Functions.h +++ b/TAO/tao/PortableServer/PortableServer_Functions.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PortableServer/PortableServer_WFunctions.cpp b/TAO/tao/PortableServer/PortableServer_WFunctions.cpp index 6fa055e9ad2..d980f303b74 100644 --- a/TAO/tao/PortableServer/PortableServer_WFunctions.cpp +++ b/TAO/tao/PortableServer/PortableServer_WFunctions.cpp @@ -1,4 +1,4 @@ -#include "PortableServer_WFunctions.h" +#include "tao/PortableServer/PortableServer_WFunctions.h" ACE_RCSID (PortableServer, PortableServer_WFunctions, diff --git a/TAO/tao/PortableServer/PortableServer_WFunctions.h b/TAO/tao/PortableServer/PortableServer_WFunctions.h index 5dd938ed99b..2d6cdcbabb4 100644 --- a/TAO/tao/PortableServer/PortableServer_WFunctions.h +++ b/TAO/tao/PortableServer/PortableServer_WFunctions.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PortableServer/PortableServer_includeC.h b/TAO/tao/PortableServer/PortableServer_includeC.h index 7de2ae4f9fe..8f2a1503f6c 100644 --- a/TAO/tao/PortableServer/PortableServer_includeC.h +++ b/TAO/tao/PortableServer/PortableServer_includeC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" diff --git a/TAO/tao/PortableServer/Regular_POA.cpp b/TAO/tao/PortableServer/Regular_POA.cpp index 5d9516a1f42..7383d7bd9cf 100644 --- a/TAO/tao/PortableServer/Regular_POA.cpp +++ b/TAO/tao/PortableServer/Regular_POA.cpp @@ -1,4 +1,4 @@ -#include "Regular_POA.h" +#include "tao/PortableServer/Regular_POA.h" ACE_RCSID (PortableServer, POA, @@ -6,7 +6,7 @@ ACE_RCSID (PortableServer, // #if !defined (__ACE_INLINE__) -# include "Regular_POA.inl" +# include "tao/PortableServer/Regular_POA.inl" #endif /* ! __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Regular_POA.h b/TAO/tao/PortableServer/Regular_POA.h index c03f8d3804a..7a6d3c2289c 100644 --- a/TAO/tao/PortableServer/Regular_POA.h +++ b/TAO/tao/PortableServer/Regular_POA.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -71,7 +71,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL // **************************************************************** #if defined (__ACE_INLINE__) -# include "Regular_POA.inl" +# include "tao/PortableServer/Regular_POA.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp index 007a080e115..c3f4f480b8e 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp +++ b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp @@ -1,5 +1,5 @@ -#include "RequestProcessingPolicy.h" -#include "PortableServer.h" +#include "tao/PortableServer/RequestProcessingPolicy.h" +#include "tao/PortableServer/PortableServer.h" ACE_RCSID (PortableServer, RequestProcessingPolicy, diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.h b/TAO/tao/PortableServer/RequestProcessingPolicy.h index 63518a04663..0d8d4f7485a 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicy.h +++ b/TAO/tao/PortableServer/RequestProcessingPolicy.h @@ -14,13 +14,13 @@ #define TAO_PORTABLESERVER_REQUESTPROCESSINGPOLICY_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "RequestProcessingPolicyC.h" +#include "tao/PortableServer/RequestProcessingPolicyC.h" #include "tao/LocalObject.h" // This is to remove "inherits via dominance" warnings from MSVC. diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp b/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp index 57ce43c3f5b..5db99f4446e 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp +++ b/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp @@ -30,7 +30,7 @@ #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Enum_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" -#include "RequestProcessingPolicyA.h" +#include "tao/PortableServer/RequestProcessingPolicyA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyA.h b/TAO/tao/PortableServer/RequestProcessingPolicyA.h index 9b1693e09d5..71cd9e73205 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicyA.h +++ b/TAO/tao/PortableServer/RequestProcessingPolicyA.h @@ -33,8 +33,8 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" -#include "RequestProcessingPolicyC.h" +#include "tao/PortableServer/portableserver_export.h" +#include "tao/PortableServer/RequestProcessingPolicyC.h" #include "tao/AnyTypeCode/PolicyA.h" diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp b/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp index a9e2037a522..d980d70fd44 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp +++ b/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "RequestProcessingPolicyC.h" +#include "tao/PortableServer/RequestProcessingPolicyC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyC.h b/TAO/tao/PortableServer/RequestProcessingPolicyC.h index 58b9470e78e..cdac90a297d 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicyC.h +++ b/TAO/tao/PortableServer/RequestProcessingPolicyC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.cpp b/TAO/tao/PortableServer/RequestProcessingStrategy.cpp index 01b71f00396..535faabda48 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategy.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategy.cpp @@ -8,7 +8,7 @@ */ //============================================================================= -#include "RequestProcessingStrategy.h" +#include "tao/PortableServer/RequestProcessingStrategy.h" ACE_RCSID (PortableServer, RequestProcessingStrategy, diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.h b/TAO/tao/PortableServer/RequestProcessingStrategy.h index 0a1089daf46..8c767103d0b 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategy.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategy.h @@ -14,14 +14,14 @@ #define TAO_REQUEST_PROCESSING_STRATEGY_H #include /**/ "ace/pre.h" -#include "Policy_Strategy.h" +#include "tao/PortableServer/Policy_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "PortableServer.h" -#include "Servant_Location.h" +#include "tao/PortableServer/PortableServer.h" +#include "tao/PortableServer/Servant_Location.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp index ce65fe59834..877f8033219 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp @@ -1,11 +1,11 @@ // -*- C++ -*- #include "tao/ORB_Constants.h" -#include "RequestProcessingStrategyAOMOnly.h" -#include "ServantManagerC.h" -#include "Non_Servant_Upcall.h" -#include "Servant_Base.h" -#include "Root_POA.h" +#include "tao/PortableServer/RequestProcessingStrategyAOMOnly.h" +#include "tao/PortableServer/ServantManagerC.h" +#include "tao/PortableServer/Non_Servant_Upcall.h" +#include "tao/PortableServer/Servant_Base.h" +#include "tao/PortableServer/Root_POA.h" ACE_RCSID (PortableServer, Request_Processing, diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h index fc2a3daf6d7..b8b1b493ad4 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h @@ -14,14 +14,14 @@ #define TAO_REQUESTPROCESSINGSTRATEGYAOMONLY_H #include /**/ "ace/pre.h" -#include "RequestProcessingStrategy.h" +#include "tao/PortableServer/RequestProcessingStrategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Servant_Location.h" -#include "PortableServer.h" +#include "tao/PortableServer/Servant_Location.h" +#include "tao/PortableServer/PortableServer.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp index fe597b0882e..820605a1d42 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "RequestProcessingStrategyAOMOnlyFactoryImpl.h" -#include "RequestProcessingStrategy.h" -#include "RequestProcessingStrategyAOMOnly.h" +#include "tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h" +#include "tao/PortableServer/RequestProcessingStrategy.h" +#include "tao/PortableServer/RequestProcessingStrategyAOMOnly.h" #include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h index ae3e0e9470e..44a9df665af 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h @@ -14,7 +14,7 @@ #define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYAOMONLYFACTORYIMPL_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp index 9e2c8e25075..3b86eb66ce7 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp @@ -2,12 +2,12 @@ #include "tao/ORB_Constants.h" #include "tao/TSS_Resources.h" -#include "RequestProcessingStrategyDefaultServant.h" -#include "Non_Servant_Upcall.h" -#include "Root_POA.h" -#include "ServantManagerC.h" -#include "Servant_Base.h" -#include "POA_Current_Impl.h" +#include "tao/PortableServer/RequestProcessingStrategyDefaultServant.h" +#include "tao/PortableServer/Non_Servant_Upcall.h" +#include "tao/PortableServer/Root_POA.h" +#include "tao/PortableServer/ServantManagerC.h" +#include "tao/PortableServer/Servant_Base.h" +#include "tao/PortableServer/POA_Current_Impl.h" ACE_RCSID (PortableServer, Request_Processing, diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h index a420a29d376..26fe17df989 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h @@ -14,16 +14,16 @@ #define TAO_REQUESTPROCESSINGSTRATEGYDEFAULTSERVANT_H #include /**/ "ace/pre.h" -#include "RequestProcessingStrategy.h" +#include "tao/PortableServer/RequestProcessingStrategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Servant_Base.h" +#include "tao/PortableServer/Servant_Base.h" -#include "Servant_Location.h" -#include "PortableServer.h" +#include "tao/PortableServer/Servant_Location.h" +#include "tao/PortableServer/PortableServer.h" #if (TAO_HAS_MINIMUM_POA == 0) diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp index 3fbd8677bcf..c1f739832f5 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "RequestProcessingStrategyDefaultServantFI.h" -#include "RequestProcessingStrategy.h" -#include "RequestProcessingStrategyDefaultServant.h" +#include "tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h" +#include "tao/PortableServer/RequestProcessingStrategy.h" +#include "tao/PortableServer/RequestProcessingStrategyDefaultServant.h" #include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h index db8b253082c..7328d0bd30a 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h @@ -14,7 +14,7 @@ #define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYDEFAULTSERVANTFACTORYIMPL_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h b/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h index 2f629ba6820..9ee872f1a90 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h @@ -14,7 +14,7 @@ #define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYFACTORY_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp index 2d016cce17d..138fee4eb92 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "RequestProcessingStrategyFactoryImpl.h" -#include "RequestProcessingStrategyAOMOnly.h" -#include "RequestProcessingStrategyDefaultServant.h" -#include "RequestProcessingStrategyServantLocator.h" -#include "RequestProcessingStrategyServantActivator.h" +#include "tao/PortableServer/RequestProcessingStrategyFactoryImpl.h" +#include "tao/PortableServer/RequestProcessingStrategyAOMOnly.h" +#include "tao/PortableServer/RequestProcessingStrategyDefaultServant.h" +#include "tao/PortableServer/RequestProcessingStrategyServantLocator.h" +#include "tao/PortableServer/RequestProcessingStrategyServantActivator.h" #include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h index 7cfc2fc8b5c..fa07f1c30a3 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h @@ -14,7 +14,7 @@ #define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYFACTORYIMPL_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp index 93285339861..666eb25551b 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp @@ -1,12 +1,12 @@ // $Id$ #include "tao/ORB_Constants.h" -#include "ServantActivatorC.h" -#include "RequestProcessingStrategyServantActivator.h" -#include "Servant_Base.h" -#include "Non_Servant_Upcall.h" -#include "Root_POA.h" -#include "POA_Current_Impl.h" -#include "Servant_Upcall.h" +#include "tao/PortableServer/ServantActivatorC.h" +#include "tao/PortableServer/RequestProcessingStrategyServantActivator.h" +#include "tao/PortableServer/Servant_Base.h" +#include "tao/PortableServer/Non_Servant_Upcall.h" +#include "tao/PortableServer/Root_POA.h" +#include "tao/PortableServer/POA_Current_Impl.h" +#include "tao/PortableServer/Servant_Upcall.h" ACE_RCSID (PortableServer, Request_Processing, diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h index 8e2f590d91a..3108a053031 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h @@ -14,14 +14,14 @@ #define TAO_REQUESTPROCESSINGSTRATEGYSERVANTACTIVATOR_H #include /**/ "ace/pre.h" -#include "RequestProcessingStrategyServantManager.h" +#include "tao/PortableServer/RequestProcessingStrategyServantManager.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Servant_Location.h" -#include "PortableServer.h" +#include "tao/PortableServer/Servant_Location.h" +#include "tao/PortableServer/PortableServer.h" #if (TAO_HAS_MINIMUM_POA == 0) diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp index 34596af3652..a2b3d222282 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "RequestProcessingStrategyServantActivatorFI.h" -#include "RequestProcessingStrategy.h" -#include "RequestProcessingStrategyServantActivator.h" +#include "tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h" +#include "tao/PortableServer/RequestProcessingStrategy.h" +#include "tao/PortableServer/RequestProcessingStrategyServantActivator.h" #include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h index 4e652b80b5c..ea487fa69d3 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h @@ -14,7 +14,7 @@ #define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYSERVANTACTIVATORFACTORYIMPL_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp index bb97bac6610..e8ba2678612 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp @@ -1,11 +1,11 @@ #include "tao/ORB_Constants.h" -#include "ServantLocatorC.h" -#include "RequestProcessingStrategyServantLocator.h" -#include "Root_POA.h" -#include "POA_Current_Impl.h" -#include "Servant_Upcall.h" -#include "Non_Servant_Upcall.h" -#include "Servant_Base.h" +#include "tao/PortableServer/ServantLocatorC.h" +#include "tao/PortableServer/RequestProcessingStrategyServantLocator.h" +#include "tao/PortableServer/Root_POA.h" +#include "tao/PortableServer/POA_Current_Impl.h" +#include "tao/PortableServer/Servant_Upcall.h" +#include "tao/PortableServer/Non_Servant_Upcall.h" +#include "tao/PortableServer/Servant_Base.h" ACE_RCSID (PortableServer, Request_Processing, diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h index ff235125578..f4f8b1e0d8f 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h @@ -14,14 +14,14 @@ #define TAO_REQUESTPROCESSINGSTRATEGYSERVANTLOCATOR_H #include /**/ "ace/pre.h" -#include "RequestProcessingStrategyServantManager.h" +#include "tao/PortableServer/RequestProcessingStrategyServantManager.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Servant_Location.h" -#include "PortableServer.h" +#include "tao/PortableServer/Servant_Location.h" +#include "tao/PortableServer/PortableServer.h" #if (TAO_HAS_MINIMUM_POA == 0) diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp index ed3d062c05a..631d95d573d 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "RequestProcessingStrategyServantLocatorFI.h" -#include "RequestProcessingStrategy.h" -#include "RequestProcessingStrategyServantLocator.h" +#include "tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h" +#include "tao/PortableServer/RequestProcessingStrategy.h" +#include "tao/PortableServer/RequestProcessingStrategyServantLocator.h" #include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h index faab7a5281c..89e5d4db19b 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h @@ -14,7 +14,7 @@ #define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYSERVANTLOCATORFACTORYIMPL_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp index 414b7356150..9cfd35ba5ac 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp @@ -1,8 +1,8 @@ // -*- C++ -*- -#include "RequestProcessingStrategyServantManager.h" -#include "ServantManagerC.h" -#include "Root_POA.h" +#include "tao/PortableServer/RequestProcessingStrategyServantManager.h" +#include "tao/PortableServer/ServantManagerC.h" +#include "tao/PortableServer/Root_POA.h" #include "tao/ORB_Constants.h" ACE_RCSID (PortableServer, diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h index 2957150440b..77932c74be9 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h @@ -14,14 +14,14 @@ #define TAO_REQUESTPROCESSINGSTRATEGYSERVANTMANAGER_H #include /**/ "ace/pre.h" -#include "RequestProcessingStrategy.h" +#include "tao/PortableServer/RequestProcessingStrategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Servant_Location.h" -#include "PortableServer.h" +#include "tao/PortableServer/Servant_Location.h" +#include "tao/PortableServer/PortableServer.h" #if (TAO_HAS_MINIMUM_POA == 0) diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp index 49f7b11a55f..38bd1ffa783 100644 --- a/TAO/tao/PortableServer/Root_POA.cpp +++ b/TAO/tao/PortableServer/Root_POA.cpp @@ -1,35 +1,35 @@ // $Id$ -#include "Root_POA.h" -#include "Regular_POA.h" - -#include "ThreadPolicy.h" -#include "LifespanPolicy.h" -#include "IdAssignmentPolicy.h" -#include "IdUniquenessPolicy.h" -#include "ImplicitActivationPolicy.h" -#include "RequestProcessingPolicy.h" -#include "ServantRetentionPolicy.h" -#include "Active_Object_Map.h" -#include "Default_Acceptor_Filter.h" -#include "ORT_Adapter.h" -#include "ORT_Adapter_Factory.h" -#include "POA_Current_Impl.h" -#include "Servant_Upcall.h" -#include "AdapterActivatorC.h" -#include "Non_Servant_Upcall.h" -#include "POAManager.h" -#include "ServantManagerC.h" -#include "poa_macros.h" -#include "POA_Guard.h" -#include "Creation_Time.h" -#include "RequestProcessingStrategy.h" -#include "LifespanStrategy.h" -#include "IdUniquenessStrategy.h" -#include "IdAssignmentStrategy.h" -#include "ServantRetentionStrategy.h" -#include "ImplicitActivationStrategy.h" -#include "ThreadStrategy.h" +#include "tao/PortableServer/Root_POA.h" +#include "tao/PortableServer/Regular_POA.h" + +#include "tao/PortableServer/ThreadPolicy.h" +#include "tao/PortableServer/LifespanPolicy.h" +#include "tao/PortableServer/IdAssignmentPolicy.h" +#include "tao/PortableServer/IdUniquenessPolicy.h" +#include "tao/PortableServer/ImplicitActivationPolicy.h" +#include "tao/PortableServer/RequestProcessingPolicy.h" +#include "tao/PortableServer/ServantRetentionPolicy.h" +#include "tao/PortableServer/Active_Object_Map.h" +#include "tao/PortableServer/Default_Acceptor_Filter.h" +#include "tao/PortableServer/ORT_Adapter.h" +#include "tao/PortableServer/ORT_Adapter_Factory.h" +#include "tao/PortableServer/POA_Current_Impl.h" +#include "tao/PortableServer/Servant_Upcall.h" +#include "tao/PortableServer/AdapterActivatorC.h" +#include "tao/PortableServer/Non_Servant_Upcall.h" +#include "tao/PortableServer/POAManager.h" +#include "tao/PortableServer/ServantManagerC.h" +#include "tao/PortableServer/poa_macros.h" +#include "tao/PortableServer/POA_Guard.h" +#include "tao/PortableServer/Creation_Time.h" +#include "tao/PortableServer/RequestProcessingStrategy.h" +#include "tao/PortableServer/LifespanStrategy.h" +#include "tao/PortableServer/IdUniquenessStrategy.h" +#include "tao/PortableServer/IdAssignmentStrategy.h" +#include "tao/PortableServer/ServantRetentionStrategy.h" +#include "tao/PortableServer/ImplicitActivationStrategy.h" +#include "tao/PortableServer/ThreadStrategy.h" #include "tao/StringSeqC.h" #include "tao/PortableInterceptorC.h" @@ -56,7 +56,7 @@ #include "ace/Log_Msg.h" #if !defined (__ACE_INLINE__) -# include "Root_POA.inl" +# include "tao/PortableServer/Root_POA.inl" #endif /* ! __ACE_INLINE__ */ ACE_RCSID (PortableServer, diff --git a/TAO/tao/PortableServer/Root_POA.h b/TAO/tao/PortableServer/Root_POA.h index 7fe849bef6a..59d8e490c0c 100644 --- a/TAO/tao/PortableServer/Root_POA.h +++ b/TAO/tao/PortableServer/Root_POA.h @@ -17,25 +17,25 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ // Object Adapter -#include "Object_Adapter.h" +#include "tao/PortableServer/Object_Adapter.h" // POA Policy Set -#include "POA_Policy_Set.h" +#include "tao/PortableServer/POA_Policy_Set.h" // Cached POA Policies -#include "POA_Cached_Policies.h" -#include "Active_Policy_Strategies.h" +#include "tao/PortableServer/POA_Cached_Policies.h" +#include "tao/PortableServer/Active_Policy_Strategies.h" -#include "ORT_Adapter.h" +#include "tao/PortableServer/ORT_Adapter.h" -#include "PortableServer.h" +#include "tao/PortableServer/PortableServer.h" // Object_Key #include "tao/Object_KeyC.h" @@ -1032,7 +1032,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #endif /* _MSC_VER */ #if defined (__ACE_INLINE__) -# include "Root_POA.inl" +# include "tao/PortableServer/Root_POA.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/ServantActivatorA.cpp b/TAO/tao/PortableServer/ServantActivatorA.cpp index 1b1d0a06864..2ce0254c337 100644 --- a/TAO/tao/PortableServer/ServantActivatorA.cpp +++ b/TAO/tao/PortableServer/ServantActivatorA.cpp @@ -29,7 +29,7 @@ #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" -#include "ServantActivatorA.h" +#include "tao/PortableServer/ServantActivatorA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" diff --git a/TAO/tao/PortableServer/ServantActivatorA.h b/TAO/tao/PortableServer/ServantActivatorA.h index 36249a277e3..31a9823c2c1 100644 --- a/TAO/tao/PortableServer/ServantActivatorA.h +++ b/TAO/tao/PortableServer/ServantActivatorA.h @@ -33,8 +33,8 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" -#include "ServantActivatorC.h" +#include "tao/PortableServer/portableserver_export.h" +#include "tao/PortableServer/ServantActivatorC.h" #include "tao/PortableServer/PS_ForwardA.h" #include "tao/PortableServer/ServantManagerA.h" #include "tao/PortableServer/ForwardRequestA.h" diff --git a/TAO/tao/PortableServer/ServantActivatorC.cpp b/TAO/tao/PortableServer/ServantActivatorC.cpp index ea7903435e8..2fb05a0669e 100644 --- a/TAO/tao/PortableServer/ServantActivatorC.cpp +++ b/TAO/tao/PortableServer/ServantActivatorC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "ServantActivatorC.h" +#include "tao/PortableServer/ServantActivatorC.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/PortableServer/ServantActivatorC.h b/TAO/tao/PortableServer/ServantActivatorC.h index 39fd81603f5..f86eeef4a4b 100644 --- a/TAO/tao/PortableServer/ServantActivatorC.h +++ b/TAO/tao/PortableServer/ServantActivatorC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" diff --git a/TAO/tao/PortableServer/ServantLocatorA.cpp b/TAO/tao/PortableServer/ServantLocatorA.cpp index 94156c9aed6..f6afe468d3e 100644 --- a/TAO/tao/PortableServer/ServantLocatorA.cpp +++ b/TAO/tao/PortableServer/ServantLocatorA.cpp @@ -30,7 +30,7 @@ #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" #include "tao/AnyTypeCode/String_TypeCode_Static.h" -#include "ServantLocatorA.h" +#include "tao/PortableServer/ServantLocatorA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" diff --git a/TAO/tao/PortableServer/ServantLocatorA.h b/TAO/tao/PortableServer/ServantLocatorA.h index bbfc60753ea..4e114ea1a86 100644 --- a/TAO/tao/PortableServer/ServantLocatorA.h +++ b/TAO/tao/PortableServer/ServantLocatorA.h @@ -33,8 +33,8 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" -#include "ServantLocatorC.h" +#include "tao/PortableServer/portableserver_export.h" +#include "tao/PortableServer/ServantLocatorC.h" #include "tao/AnyTypeCode/orb_typesA.h" #include "tao/PortableServer/PS_ForwardA.h" #include "tao/PortableServer/ServantManagerA.h" diff --git a/TAO/tao/PortableServer/ServantLocatorC.cpp b/TAO/tao/PortableServer/ServantLocatorC.cpp index 1a25ffb1436..b58ab9d6972 100644 --- a/TAO/tao/PortableServer/ServantLocatorC.cpp +++ b/TAO/tao/PortableServer/ServantLocatorC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "ServantLocatorC.h" +#include "tao/PortableServer/ServantLocatorC.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/PortableServer/ServantLocatorC.h b/TAO/tao/PortableServer/ServantLocatorC.h index 19225715457..378b2df5c80 100644 --- a/TAO/tao/PortableServer/ServantLocatorC.h +++ b/TAO/tao/PortableServer/ServantLocatorC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" diff --git a/TAO/tao/PortableServer/ServantManagerA.cpp b/TAO/tao/PortableServer/ServantManagerA.cpp index f35fb1210bc..f260c424cdf 100644 --- a/TAO/tao/PortableServer/ServantManagerA.cpp +++ b/TAO/tao/PortableServer/ServantManagerA.cpp @@ -29,7 +29,7 @@ #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" -#include "ServantManagerA.h" +#include "tao/PortableServer/ServantManagerA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" diff --git a/TAO/tao/PortableServer/ServantManagerA.h b/TAO/tao/PortableServer/ServantManagerA.h index 64ab7d6e30b..25cb0d6abb9 100644 --- a/TAO/tao/PortableServer/ServantManagerA.h +++ b/TAO/tao/PortableServer/ServantManagerA.h @@ -33,8 +33,8 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" -#include "ServantManagerC.h" +#include "tao/PortableServer/portableserver_export.h" +#include "tao/PortableServer/ServantManagerC.h" // TAO_IDL - Generated from diff --git a/TAO/tao/PortableServer/ServantManagerC.cpp b/TAO/tao/PortableServer/ServantManagerC.cpp index 1baa5eb47a8..2d798612889 100644 --- a/TAO/tao/PortableServer/ServantManagerC.cpp +++ b/TAO/tao/PortableServer/ServantManagerC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "ServantManagerC.h" +#include "tao/PortableServer/ServantManagerC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/PortableServer/ServantManagerC.h b/TAO/tao/PortableServer/ServantManagerC.h index d03fde2ae0b..42b1644d5b8 100644 --- a/TAO/tao/PortableServer/ServantManagerC.h +++ b/TAO/tao/PortableServer/ServantManagerC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #include "tao/ORB.h" #include "tao/Environment.h" #include "tao/Object.h" diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp index a9c2b76c2eb..4bbcdddeb11 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp +++ b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp @@ -1,5 +1,5 @@ -#include "ServantRetentionPolicy.h" -#include "PortableServer.h" +#include "tao/PortableServer/ServantRetentionPolicy.h" +#include "tao/PortableServer/PortableServer.h" ACE_RCSID (PortableServer, ServantRetentionPolicy, diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.h b/TAO/tao/PortableServer/ServantRetentionPolicy.h index ce43683223e..067b3160089 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicy.h +++ b/TAO/tao/PortableServer/ServantRetentionPolicy.h @@ -14,13 +14,13 @@ #define TAO_PORTABLESERVER_SERVANTRETENTIONPOLICY_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ServantRetentionPolicyC.h" +#include "tao/PortableServer/ServantRetentionPolicyC.h" #include "tao/LocalObject.h" // This is to remove "inherits via dominance" warnings from MSVC. diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp b/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp index 54330776072..e2474a81437 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp +++ b/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp @@ -30,7 +30,7 @@ #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Enum_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" -#include "ServantRetentionPolicyA.h" +#include "tao/PortableServer/ServantRetentionPolicyA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyA.h b/TAO/tao/PortableServer/ServantRetentionPolicyA.h index 303a75c039d..ec53d8ff9b0 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicyA.h +++ b/TAO/tao/PortableServer/ServantRetentionPolicyA.h @@ -33,8 +33,8 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" -#include "ServantRetentionPolicyC.h" +#include "tao/PortableServer/portableserver_export.h" +#include "tao/PortableServer/ServantRetentionPolicyC.h" #include "tao/AnyTypeCode/PolicyA.h" diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp b/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp index 25fb30ef661..fd103bdc342 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp +++ b/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "ServantRetentionPolicyC.h" +#include "tao/PortableServer/ServantRetentionPolicyC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyC.h b/TAO/tao/PortableServer/ServantRetentionPolicyC.h index 5217f6e659c..eac58902cca 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicyC.h +++ b/TAO/tao/PortableServer/ServantRetentionPolicyC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" diff --git a/TAO/tao/PortableServer/ServantRetentionStrategy.h b/TAO/tao/PortableServer/ServantRetentionStrategy.h index 83268e5e00a..7dba84696c7 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategy.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategy.h @@ -14,16 +14,16 @@ #define TAO_SERVANTRETENTIONSTRATEGY_H #include /**/ "ace/pre.h" -#include "Policy_Strategy.h" +#include "tao/PortableServer/Policy_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Servant_Location.h" -#include "Servant_Upcall.h" -#include "ServantRetentionPolicyC.h" -#include "PortableServer.h" +#include "tao/PortableServer/Servant_Location.h" +#include "tao/PortableServer/Servant_Upcall.h" +#include "tao/PortableServer/ServantRetentionPolicyC.h" +#include "tao/PortableServer/PortableServer.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h b/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h index 058c2ef57ec..84d581d0c18 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h @@ -14,7 +14,7 @@ #define TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYFACTORY_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp index 7c0994d6316..c1a5c11f000 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "ServantRetentionStrategyFactoryImpl.h" -#include "ServantRetentionStrategy.h" +#include "tao/PortableServer/ServantRetentionStrategyFactoryImpl.h" +#include "tao/PortableServer/ServantRetentionStrategy.h" #include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h index ecab5ec3662..b6864c9984e 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h @@ -14,7 +14,7 @@ #define TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYFACTORYIMPL_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp index a2951bee736..2084a6bebea 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp @@ -9,12 +9,12 @@ */ //============================================================================= -#include "ServantRetentionStrategyNonRetain.h" -#include "Non_Servant_Upcall.h" -#include "Servant_Upcall.h" -#include "POA_Current_Impl.h" -#include "Root_POA.h" -#include "Servant_Base.h" +#include "tao/PortableServer/ServantRetentionStrategyNonRetain.h" +#include "tao/PortableServer/Non_Servant_Upcall.h" +#include "tao/PortableServer/Servant_Upcall.h" +#include "tao/PortableServer/POA_Current_Impl.h" +#include "tao/PortableServer/Root_POA.h" +#include "tao/PortableServer/Servant_Base.h" #include "tao/debug.h" ACE_RCSID (PortableServer, diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h index d7ff25681c4..cb5fa9a53c7 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h @@ -14,13 +14,13 @@ #define TAO_SERVANT_RETENTION_STRATEGY_NON_RETAIN_H #include /**/ "ace/pre.h" -#include "ServantRetentionStrategy.h" +#include "tao/PortableServer/ServantRetentionStrategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Servant_Location.h" +#include "tao/PortableServer/Servant_Location.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp index c14f5f348cb..bc3a3510554 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "ServantRetentionStrategyNonRetainFactoryImpl.h" -#include "ServantRetentionStrategy.h" -#include "ServantRetentionStrategyNonRetain.h" +#include "tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h" +#include "tao/PortableServer/ServantRetentionStrategy.h" +#include "tao/PortableServer/ServantRetentionStrategyNonRetain.h" #include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h index 8b9943fb574..688e49cbeec 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h @@ -14,7 +14,7 @@ #define TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYNONRETAIN_FACTORYIMPL_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp index eebff4f3c73..ecccbc7eaf5 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp @@ -11,13 +11,13 @@ #include "tao/ORB_Core.h" #include "tao/debug.h" -#include "ServantRetentionStrategyRetain.h" -#include "Non_Servant_Upcall.h" -#include "Servant_Upcall.h" -#include "POA_Current_Impl.h" -#include "Root_POA.h" -#include "Active_Object_Map.h" -#include "Active_Object_Map_Entry.h" +#include "tao/PortableServer/ServantRetentionStrategyRetain.h" +#include "tao/PortableServer/Non_Servant_Upcall.h" +#include "tao/PortableServer/Servant_Upcall.h" +#include "tao/PortableServer/POA_Current_Impl.h" +#include "tao/PortableServer/Root_POA.h" +#include "tao/PortableServer/Active_Object_Map.h" +#include "tao/PortableServer/Active_Object_Map_Entry.h" #include "ace/Auto_Ptr.h" ACE_RCSID (PortableServer, diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h index 6a9b8c86405..011d4513fa6 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h @@ -14,7 +14,7 @@ #define TAO_SERVANT_RETENTION_STRATEGY_RETAIN_H #include /**/ "ace/pre.h" -#include "ServantRetentionStrategyNonRetain.h" +#include "tao/PortableServer/ServantRetentionStrategyNonRetain.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp index 22f810a24a1..f801a3b5e25 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "ServantRetentionStrategyRetainFactoryImpl.h" -#include "ServantRetentionStrategy.h" -#include "ServantRetentionStrategyRetain.h" +#include "tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h" +#include "tao/PortableServer/ServantRetentionStrategy.h" +#include "tao/PortableServer/ServantRetentionStrategyRetain.h" #include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h index 22163587dd0..1dbddfbb378 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h @@ -14,7 +14,7 @@ #define TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYRETAIN_FACTORYIMPL_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp index af33f3010c2..a91077fe966 100644 --- a/TAO/tao/PortableServer/Servant_Base.cpp +++ b/TAO/tao/PortableServer/Servant_Base.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "Servant_Base.h" -#include "Root_POA.h" -#include "Operation_Table.h" -#include "POA_Current_Impl.h" +#include "tao/PortableServer/Servant_Base.h" +#include "tao/PortableServer/Root_POA.h" +#include "tao/PortableServer/Operation_Table.h" +#include "tao/PortableServer/POA_Current_Impl.h" #include "tao/Timeprobe.h" #include "tao/ORB_Core.h" @@ -23,7 +23,7 @@ ACE_RCSID (PortableServer, "$Id$") #if !defined (__ACE_INLINE__) -# include "Servant_Base.i" +# include "tao/PortableServer/Servant_Base.i" #endif /* ! __ACE_INLINE__ */ #if defined (ACE_ENABLE_TIMEPROBES) diff --git a/TAO/tao/PortableServer/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h index 5e1f1e4a88a..486369efbed 100644 --- a/TAO/tao/PortableServer/Servant_Base.h +++ b/TAO/tao/PortableServer/Servant_Base.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "PS_ForwardC.h" +#include "tao/PortableServer/PS_ForwardC.h" #include "tao/Abstract_Servant_Base.h" #include "ace/Atomic_Op.h" @@ -222,7 +222,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "Servant_Base.i" +# include "tao/PortableServer/Servant_Base.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Servant_Dispatcher.cpp index fc047801bed..05f34b15345 100644 --- a/TAO/tao/PortableServer/Servant_Dispatcher.cpp +++ b/TAO/tao/PortableServer/Servant_Dispatcher.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Servant_Dispatcher.h" +#include "tao/PortableServer/Servant_Dispatcher.h" ACE_RCSID(PortableServer, Servant_Dispatcher, diff --git a/TAO/tao/PortableServer/Servant_Dispatcher.h b/TAO/tao/PortableServer/Servant_Dispatcher.h index 3b415dac5f8..d2741f46546 100644 --- a/TAO/tao/PortableServer/Servant_Dispatcher.h +++ b/TAO/tao/PortableServer/Servant_Dispatcher.h @@ -14,13 +14,13 @@ #define TAO_SERVANT_DISPATCHER_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Servant_Upcall.h" +#include "tao/PortableServer/Servant_Upcall.h" #include "ace/SStringfwd.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Servant_Location.h b/TAO/tao/PortableServer/Servant_Location.h index fa60ac9cf43..7ab08442408 100644 --- a/TAO/tao/PortableServer/Servant_Location.h +++ b/TAO/tao/PortableServer/Servant_Location.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PortableServer/Servant_Upcall.cpp b/TAO/tao/PortableServer/Servant_Upcall.cpp index 71bebaa61c5..5df9cff3d57 100644 --- a/TAO/tao/PortableServer/Servant_Upcall.cpp +++ b/TAO/tao/PortableServer/Servant_Upcall.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "Object_Adapter.h" -#include "Servant_Upcall.h" -#include "Root_POA.h" -#include "Default_Servant_Dispatcher.h" -#include "Collocated_Object_Proxy_Broker.h" -#include "Active_Object_Map_Entry.h" -#include "ForwardRequestC.h" +#include "tao/PortableServer/Object_Adapter.h" +#include "tao/PortableServer/Servant_Upcall.h" +#include "tao/PortableServer/Root_POA.h" +#include "tao/PortableServer/Default_Servant_Dispatcher.h" +#include "tao/PortableServer/Collocated_Object_Proxy_Broker.h" +#include "tao/PortableServer/Active_Object_Map_Entry.h" +#include "tao/PortableServer/ForwardRequestC.h" // -- TAO Include -- #include "tao/ORB.h" @@ -14,7 +14,7 @@ #include "tao/debug.h" #if !defined (__ACE_INLINE__) -# include "Servant_Upcall.inl" +# include "tao/PortableServer/Servant_Upcall.inl" #endif /* __ACE_INLINE__ */ #include "ace/OS_NS_string.h" diff --git a/TAO/tao/PortableServer/Servant_Upcall.h b/TAO/tao/PortableServer/Servant_Upcall.h index 05cc7c34069..dff98e83559 100644 --- a/TAO/tao/PortableServer/Servant_Upcall.h +++ b/TAO/tao/PortableServer/Servant_Upcall.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -242,7 +242,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #endif /* _MSC_VER */ #if defined (__ACE_INLINE__) -# include "Servant_Upcall.inl" +# include "tao/PortableServer/Servant_Upcall.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/PortableServer/StrategyFactory.cpp b/TAO/tao/PortableServer/StrategyFactory.cpp index 84528d7cbf2..58a4bc04c11 100644 --- a/TAO/tao/PortableServer/StrategyFactory.cpp +++ b/TAO/tao/PortableServer/StrategyFactory.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "StrategyFactory.h" +#include "tao/PortableServer/StrategyFactory.h" #include "ace/Dynamic_Service.h" ACE_RCSID (PortableServer, diff --git a/TAO/tao/PortableServer/ThreadPolicy.cpp b/TAO/tao/PortableServer/ThreadPolicy.cpp index 2accc26ac96..2268a11ae61 100644 --- a/TAO/tao/PortableServer/ThreadPolicy.cpp +++ b/TAO/tao/PortableServer/ThreadPolicy.cpp @@ -1,5 +1,5 @@ -#include "ThreadPolicy.h" -#include "PortableServer.h" +#include "tao/PortableServer/ThreadPolicy.h" +#include "tao/PortableServer/PortableServer.h" ACE_RCSID (PortableServer, ThreadPolicy, diff --git a/TAO/tao/PortableServer/ThreadPolicy.h b/TAO/tao/PortableServer/ThreadPolicy.h index da85150149f..a85fc863cb1 100644 --- a/TAO/tao/PortableServer/ThreadPolicy.h +++ b/TAO/tao/PortableServer/ThreadPolicy.h @@ -14,13 +14,13 @@ #define TAO_PORTABLESERVER_THREADPOLICY_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ThreadPolicyC.h" +#include "tao/PortableServer/ThreadPolicyC.h" #include "tao/LocalObject.h" // This is to remove "inherits via dominance" warnings from MSVC. diff --git a/TAO/tao/PortableServer/ThreadPolicyA.cpp b/TAO/tao/PortableServer/ThreadPolicyA.cpp index 7799450fd5e..db3bb5be86d 100644 --- a/TAO/tao/PortableServer/ThreadPolicyA.cpp +++ b/TAO/tao/PortableServer/ThreadPolicyA.cpp @@ -35,7 +35,7 @@ #include "tao/AnyTypeCode/Enum_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" -#include "ThreadPolicyA.h" +#include "tao/PortableServer/ThreadPolicyA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" diff --git a/TAO/tao/PortableServer/ThreadPolicyA.h b/TAO/tao/PortableServer/ThreadPolicyA.h index 0f0948e7ab6..d0b05bc3667 100644 --- a/TAO/tao/PortableServer/ThreadPolicyA.h +++ b/TAO/tao/PortableServer/ThreadPolicyA.h @@ -33,8 +33,8 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" -#include "ThreadPolicyC.h" +#include "tao/PortableServer/portableserver_export.h" +#include "tao/PortableServer/ThreadPolicyC.h" #include "tao/AnyTypeCode/PolicyA.h" #if (TAO_HAS_MINIMUM_POA == 0) diff --git a/TAO/tao/PortableServer/ThreadPolicyC.cpp b/TAO/tao/PortableServer/ThreadPolicyC.cpp index 644822f747b..41e88033055 100644 --- a/TAO/tao/PortableServer/ThreadPolicyC.cpp +++ b/TAO/tao/PortableServer/ThreadPolicyC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "ThreadPolicyC.h" +#include "tao/PortableServer/ThreadPolicyC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/PortableServer/ThreadPolicyC.h b/TAO/tao/PortableServer/ThreadPolicyC.h index 398eba195a0..e0f835a33b7 100644 --- a/TAO/tao/PortableServer/ThreadPolicyC.h +++ b/TAO/tao/PortableServer/ThreadPolicyC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" diff --git a/TAO/tao/PortableServer/ThreadStrategy.cpp b/TAO/tao/PortableServer/ThreadStrategy.cpp index 58b9810f1c6..c3d6a446a4a 100644 --- a/TAO/tao/PortableServer/ThreadStrategy.cpp +++ b/TAO/tao/PortableServer/ThreadStrategy.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ThreadStrategy.h" +#include "tao/PortableServer/ThreadStrategy.h" ACE_RCSID (PortableServer, ThreadStrategy, diff --git a/TAO/tao/PortableServer/ThreadStrategy.h b/TAO/tao/PortableServer/ThreadStrategy.h index ff9ae795df4..622ad7d3748 100644 --- a/TAO/tao/PortableServer/ThreadStrategy.h +++ b/TAO/tao/PortableServer/ThreadStrategy.h @@ -14,13 +14,13 @@ #define TAO_THREAD_STRATEGY_H #include /**/ "ace/pre.h" -#include "Policy_Strategy.h" +#include "tao/PortableServer/Policy_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ThreadPolicyC.h" +#include "tao/PortableServer/ThreadPolicyC.h" #include "tao/orbconf.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ThreadStrategyFactory.h b/TAO/tao/PortableServer/ThreadStrategyFactory.h index 3f8590e1dc4..a22078ed773 100644 --- a/TAO/tao/PortableServer/ThreadStrategyFactory.h +++ b/TAO/tao/PortableServer/ThreadStrategyFactory.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "StrategyFactory.h" +#include "tao/PortableServer/StrategyFactory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ThreadPolicyC.h" +#include "tao/PortableServer/ThreadPolicyC.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp index 6d8db80f866..b21116e42b1 100644 --- a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "ThreadStrategyFactoryImpl.h" -#include "ThreadStrategy.h" +#include "tao/PortableServer/ThreadStrategyFactoryImpl.h" +#include "tao/PortableServer/ThreadStrategy.h" #include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h index ad0858eb8c4..cfe8b44147c 100644 --- a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h @@ -14,7 +14,7 @@ #define TAO_PORTABLESERVER_THREADPOLICYSTRATEGYFACTORYIMPL_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp b/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp index 35f98c7358d..44edaa4b6a9 100644 --- a/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp +++ b/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ThreadStrategyORBControl.h" +#include "tao/PortableServer/ThreadStrategyORBControl.h" #include "ace/Log_Msg.h" ACE_RCSID (PortableServer, diff --git a/TAO/tao/PortableServer/ThreadStrategyORBControl.h b/TAO/tao/PortableServer/ThreadStrategyORBControl.h index bf4c74e991d..d88997c2214 100644 --- a/TAO/tao/PortableServer/ThreadStrategyORBControl.h +++ b/TAO/tao/PortableServer/ThreadStrategyORBControl.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ThreadStrategy.h" +#include "tao/PortableServer/ThreadStrategy.h" #include "tao/orbconf.h" #include "ace/Service_Config.h" diff --git a/TAO/tao/PortableServer/ThreadStrategySingle.cpp b/TAO/tao/PortableServer/ThreadStrategySingle.cpp index 6d27355d57a..2a903d2876b 100644 --- a/TAO/tao/PortableServer/ThreadStrategySingle.cpp +++ b/TAO/tao/PortableServer/ThreadStrategySingle.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ThreadStrategySingle.h" +#include "tao/PortableServer/ThreadStrategySingle.h" #include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" diff --git a/TAO/tao/PortableServer/ThreadStrategySingle.h b/TAO/tao/PortableServer/ThreadStrategySingle.h index e1a03d69bd9..0836472a09e 100644 --- a/TAO/tao/PortableServer/ThreadStrategySingle.h +++ b/TAO/tao/PortableServer/ThreadStrategySingle.h @@ -14,13 +14,13 @@ #define TAO_THREADSTRATEGYSINGLE_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ThreadStrategy.h" +#include "tao/PortableServer/ThreadStrategy.h" #include "tao/orbconf.h" diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp index 3cc1d38be85..b718ea02ef2 100644 --- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "ThreadStrategySingleFactoryImpl.h" -#include "ThreadStrategy.h" -#include "ThreadStrategySingle.h" +#include "tao/PortableServer/ThreadStrategySingleFactoryImpl.h" +#include "tao/PortableServer/ThreadStrategy.h" +#include "tao/PortableServer/ThreadStrategySingle.h" #include "ace/Dynamic_Service.h" #include "ace/Log_Msg.h" diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h index 084fc63d7ff..e04f0995a42 100644 --- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h +++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h @@ -14,7 +14,7 @@ #define TAO_PORTABLESERVER_THREADPOLICYSINGLESTRATEGYFACTORYIMPL_H #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/PortableServer/Upcall_Command.cpp b/TAO/tao/PortableServer/Upcall_Command.cpp index 15e80841752..dd6b7d8e85f 100644 --- a/TAO/tao/PortableServer/Upcall_Command.cpp +++ b/TAO/tao/PortableServer/Upcall_Command.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Upcall_Command.h" +#include "tao/PortableServer/Upcall_Command.h" ACE_RCSID (PortableServer, diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Upcall_Wrapper.cpp index 352ff184aeb..352332e6cd0 100644 --- a/TAO/tao/PortableServer/Upcall_Wrapper.cpp +++ b/TAO/tao/PortableServer/Upcall_Wrapper.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "Upcall_Wrapper.h" -#include "Upcall_Command.h" +#include "tao/PortableServer/Upcall_Wrapper.h" +#include "tao/PortableServer/Upcall_Command.h" #if TAO_HAS_INTERCEPTORS == 1 # include "tao/ServerRequestInterceptor_Adapter.h" diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.h b/TAO/tao/PortableServer/Upcall_Wrapper.h index 3d3b02f2a0d..f0ba3f1c7e0 100644 --- a/TAO/tao/PortableServer/Upcall_Wrapper.h +++ b/TAO/tao/PortableServer/Upcall_Wrapper.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "portableserver_export.h" +#include "tao/PortableServer/portableserver_export.h" #ifndef ACE_LACKS_PRAGMA_ONCE # pragma once diff --git a/TAO/tao/Principal.cpp b/TAO/tao/Principal.cpp index 31fde2cb144..f7fed0a138c 100644 --- a/TAO/tao/Principal.cpp +++ b/TAO/tao/Principal.cpp @@ -4,8 +4,8 @@ // All Rights Reserved // ORB: Principal identifier pseudo-objref -#include "Principal.h" -#include "CDR.h" +#include "tao/Principal.h" +#include "tao/CDR.h" #if !defined (__ACE_INLINE__) #include "tao/Principal.i" diff --git a/TAO/tao/Principal.h b/TAO/tao/Principal.h index e216328dcc2..d080b3f1bb7 100644 --- a/TAO/tao/Principal.h +++ b/TAO/tao/Principal.h @@ -19,14 +19,14 @@ #include /**/ "ace/pre.h" -#include "CORBA_methods.h" +#include "tao/CORBA_methods.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "OctetSeqC.h" -#include "Pseudo_VarOut_T.h" +#include "tao/OctetSeqC.h" +#include "tao/Pseudo_VarOut_T.h" #include "ace/Thread_Mutex.h" #include "ace/Atomic_Op.h" diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp index f22f0176bb7..9879ff26ef4 100644 --- a/TAO/tao/Profile.cpp +++ b/TAO/tao/Profile.cpp @@ -16,7 +16,7 @@ #include "ace/os_include/os_ctype.h" #if !defined (__ACE_INLINE__) -#include "Profile.i" +#include "tao/Profile.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h index 573c77e418d..64425287013 100644 --- a/TAO/tao/Profile.h +++ b/TAO/tao/Profile.h @@ -423,7 +423,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "Profile.i" +# include "tao/Profile.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Profile_Transport_Resolver.cpp b/TAO/tao/Profile_Transport_Resolver.cpp index 4c95c83d980..2fafd42c511 100644 --- a/TAO/tao/Profile_Transport_Resolver.cpp +++ b/TAO/tao/Profile_Transport_Resolver.cpp @@ -1,24 +1,24 @@ // $Id$ -#include "Profile_Transport_Resolver.h" -#include "Profile.h" -#include "Stub.h" -#include "Transport.h" -#include "Invocation_Endpoint_Selectors.h" -#include "ORB_Core.h" -#include "Thread_Lane_Resources.h" -#include "Transport_Cache_Manager.h" -#include "Endpoint_Selector_Factory.h" -#include "Codeset_Manager.h" -#include "Connector_Registry.h" -#include "Transport_Connector.h" -#include "Endpoint.h" -#include "SystemException.h" +#include "tao/Profile_Transport_Resolver.h" +#include "tao/Profile.h" +#include "tao/Stub.h" +#include "tao/Transport.h" +#include "tao/Invocation_Endpoint_Selectors.h" +#include "tao/ORB_Core.h" +#include "tao/Thread_Lane_Resources.h" +#include "tao/Transport_Cache_Manager.h" +#include "tao/Endpoint_Selector_Factory.h" +#include "tao/Codeset_Manager.h" +#include "tao/Connector_Registry.h" +#include "tao/Transport_Connector.h" +#include "tao/Endpoint.h" +#include "tao/SystemException.h" #include "ace/Countdown_Time.h" #if !defined (__ACE_INLINE__) -# include "Profile_Transport_Resolver.inl" +# include "tao/Profile_Transport_Resolver.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (tao, diff --git a/TAO/tao/Profile_Transport_Resolver.h b/TAO/tao/Profile_Transport_Resolver.h index 771f50af586..5ec4889a76b 100644 --- a/TAO/tao/Profile_Transport_Resolver.h +++ b/TAO/tao/Profile_Transport_Resolver.h @@ -196,7 +196,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "Profile_Transport_Resolver.inl" +# include "tao/Profile_Transport_Resolver.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Protocol_Factory.cpp b/TAO/tao/Protocol_Factory.cpp index 1d6d96930ab..7d67c460789 100644 --- a/TAO/tao/Protocol_Factory.cpp +++ b/TAO/tao/Protocol_Factory.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Protocol_Factory.h" +#include "tao/Protocol_Factory.h" ACE_RCSID (tao, Protocol_Factory, diff --git a/TAO/tao/Protocols_Hooks.cpp b/TAO/tao/Protocols_Hooks.cpp index 4b02516a37c..444d92846a6 100644 --- a/TAO/tao/Protocols_Hooks.cpp +++ b/TAO/tao/Protocols_Hooks.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Protocols_Hooks.h" +#include "tao/Protocols_Hooks.h" #include "ace/Dynamic_Service.h" ACE_RCSID (tao, diff --git a/TAO/tao/Protocols_Hooks.h b/TAO/tao/Protocols_Hooks.h index dc1a30c0ae8..ddec97f4919 100644 --- a/TAO/tao/Protocols_Hooks.h +++ b/TAO/tao/Protocols_Hooks.h @@ -22,9 +22,9 @@ #include "ace/Service_Object.h" -#include "TAO_Export.h" -#include "Basic_Types.h" -#include "IOP_IORC.h" +#include "tao/TAO_Export.h" +#include "tao/Basic_Types.h" +#include "tao/IOP_IORC.h" #include "ace/SString.h" diff --git a/TAO/tao/QtResource_Factory.cpp b/TAO/tao/QtResource_Factory.cpp index 0b890eadcb5..ec50933e935 100644 --- a/TAO/tao/QtResource_Factory.cpp +++ b/TAO/tao/QtResource_Factory.cpp @@ -1,7 +1,7 @@ //$Id$ -#include "QtResource_Factory.h" -#include "debug.h" +#include "tao/QtResource_Factory.h" +#include "tao/debug.h" #include "ace/QtReactor.h" ACE_RCSID (TAO_QtResource, diff --git a/TAO/tao/QtResource_Loader.cpp b/TAO/tao/QtResource_Loader.cpp index b526f248e33..a735eaa6d87 100644 --- a/TAO/tao/QtResource_Loader.cpp +++ b/TAO/tao/QtResource_Loader.cpp @@ -1,7 +1,7 @@ //$Id$ -#include "QtResource_Loader.h" -#include "ORB_Core.h" -#include "QtResource_Factory.h" +#include "tao/QtResource_Loader.h" +#include "tao/ORB_Core.h" +#include "tao/QtResource_Factory.h" ACE_RCSID( TAO_QtResource, QtResource_Loader, diff --git a/TAO/tao/Queued_Message.cpp b/TAO/tao/Queued_Message.cpp index 93eb53bda9e..c7caef37cc0 100644 --- a/TAO/tao/Queued_Message.cpp +++ b/TAO/tao/Queued_Message.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Queued_Message.h" +#include "tao/Queued_Message.h" ACE_RCSID (tao, Queued_Message, diff --git a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp index 5d9c2809d47..b965edd8d07 100644 --- a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp +++ b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Continuous_Priority_Mapping.h" +#include "tao/RTCORBA/Continuous_Priority_Mapping.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 diff --git a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h index 9000ab6f672..a2a4b976e7a 100644 --- a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h +++ b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h @@ -23,8 +23,8 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "rtcorba_export.h" -#include "Priority_Mapping.h" +#include "tao/RTCORBA/rtcorba_export.h" +#include "tao/RTCORBA/Priority_Mapping.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp index cc48b3db39c..124b0bfefa9 100644 --- a/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp +++ b/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp @@ -4,7 +4,7 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "Direct_Priority_Mapping.h" +#include "tao/RTCORBA/Direct_Priority_Mapping.h" #include "ace/Sched_Params.h" ACE_RCSID(RTCORBA, diff --git a/TAO/tao/RTCORBA/Direct_Priority_Mapping.h b/TAO/tao/RTCORBA/Direct_Priority_Mapping.h index f4fbcac44e3..ceee55ac971 100644 --- a/TAO/tao/RTCORBA/Direct_Priority_Mapping.h +++ b/TAO/tao/RTCORBA/Direct_Priority_Mapping.h @@ -19,7 +19,7 @@ #include "tao/orbconf.h" -#include "Priority_Mapping.h" +#include "tao/RTCORBA/Priority_Mapping.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp index 4d3c4724595..68d4353dbd8 100644 --- a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp +++ b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp @@ -5,7 +5,7 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "Linear_Network_Priority_Mapping.h" +#include "tao/RTCORBA/Linear_Network_Priority_Mapping.h" #include "tao/debug.h" #include "ace/Sched_Params.h" diff --git a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h index 7953d46cac4..5c8410bf943 100644 --- a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h +++ b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h @@ -24,8 +24,8 @@ #include "tao/orbconf.h" -#include "rtcorba_export.h" -#include "Network_Priority_Mapping.h" +#include "tao/RTCORBA/rtcorba_export.h" +#include "tao/RTCORBA/Network_Priority_Mapping.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp index 5963a6c9a02..cfc239023b6 100644 --- a/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp +++ b/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp @@ -4,7 +4,7 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "Linear_Priority_Mapping.h" +#include "tao/RTCORBA/Linear_Priority_Mapping.h" #include "tao/debug.h" #include "ace/Sched_Params.h" #include "ace/Log_Msg.h" diff --git a/TAO/tao/RTCORBA/Linear_Priority_Mapping.h b/TAO/tao/RTCORBA/Linear_Priority_Mapping.h index 835e4642a6b..164e7f024b7 100644 --- a/TAO/tao/RTCORBA/Linear_Priority_Mapping.h +++ b/TAO/tao/RTCORBA/Linear_Priority_Mapping.h @@ -25,8 +25,8 @@ #include "tao/orbconf.h" -#include "rtcorba_export.h" -#include "Priority_Mapping.h" +#include "tao/RTCORBA/rtcorba_export.h" +#include "tao/RTCORBA/Priority_Mapping.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp index 29829066d61..b896b6c61d2 100644 --- a/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp +++ b/TAO/tao/RTCORBA/Network_Priority_Mapping.cpp @@ -2,7 +2,7 @@ #include "tao/orbconf.h" -#include "Network_Priority_Mapping.h" +#include "tao/RTCORBA/Network_Priority_Mapping.h" ACE_RCSID(RTCORBA, Network_Priority_Mapping, diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping.h b/TAO/tao/RTCORBA/Network_Priority_Mapping.h index 8080d9f7e9f..4fa09f454f4 100644 --- a/TAO/tao/RTCORBA/Network_Priority_Mapping.h +++ b/TAO/tao/RTCORBA/Network_Priority_Mapping.h @@ -26,7 +26,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #define TAO_RTCORBA_SAFE_INCLUDE -#include "RTCORBAC.h" +#include "tao/RTCORBA/RTCORBAC.h" #undef TAO_RTCORBA_SAFE_INCLUDE #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp index 7b712efaf0e..387adcf5677 100644 --- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp +++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "Network_Priority_Mapping_Manager.h" +#include "tao/RTCORBA/Network_Priority_Mapping_Manager.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 #if ! defined (__ACE_INLINE__) -#include "Network_Priority_Mapping_Manager.i" +#include "tao/RTCORBA/Network_Priority_Mapping_Manager.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (RTCORBA, diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h index 458b16439f0..7237c16ad55 100644 --- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h +++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" #include "tao/orbconf.h" -#include "rtcorba_export.h" +#include "tao/RTCORBA/rtcorba_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -24,7 +24,7 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "Network_Priority_Mapping.h" +#include "tao/RTCORBA/Network_Priority_Mapping.h" #include "tao/LocalObject.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -150,7 +150,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Network_Priority_Mapping_Manager.i" +#include "tao/RTCORBA/Network_Priority_Mapping_Manager.i" #endif /* __ACE_INLINE__ */ #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/Priority_Mapping.cpp b/TAO/tao/RTCORBA/Priority_Mapping.cpp index 6b8aac5b956..ae4f6ebcf3f 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping.cpp +++ b/TAO/tao/RTCORBA/Priority_Mapping.cpp @@ -4,7 +4,7 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "Priority_Mapping.h" +#include "tao/RTCORBA/Priority_Mapping.h" ACE_RCSID(RTCORBA, Priority_Mapping, diff --git a/TAO/tao/RTCORBA/Priority_Mapping.h b/TAO/tao/RTCORBA/Priority_Mapping.h index 76b099b0d6d..10425814b01 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping.h +++ b/TAO/tao/RTCORBA/Priority_Mapping.h @@ -27,7 +27,7 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 #define TAO_RTCORBA_SAFE_INCLUDE -#include "RTCORBAC.h" +#include "tao/RTCORBA/RTCORBAC.h" #undef TAO_RTCORBA_SAFE_INCLUDE TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp index 7dd3fd104d1..47f3804489a 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp +++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "Priority_Mapping_Manager.h" +#include "tao/RTCORBA/Priority_Mapping_Manager.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 #if ! defined (__ACE_INLINE__) -#include "Priority_Mapping_Manager.i" +#include "tao/RTCORBA/Priority_Mapping_Manager.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (RTCORBA, diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h index 1507518ec4f..e5b63369e51 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h +++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" #include "tao/orbconf.h" -#include "rtcorba_export.h" +#include "tao/RTCORBA/rtcorba_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -24,7 +24,7 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "Priority_Mapping.h" +#include "tao/RTCORBA/Priority_Mapping.h" #include "tao/LocalObject.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -145,7 +145,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Priority_Mapping_Manager.i" +#include "tao/RTCORBA/Priority_Mapping_Manager.i" #endif /* __ACE_INLINE__ */ #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/RTCORBA.cpp b/TAO/tao/RTCORBA/RTCORBA.cpp index 79ee6e4a6a6..3f29493da22 100644 --- a/TAO/tao/RTCORBA/RTCORBA.cpp +++ b/TAO/tao/RTCORBA/RTCORBA.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "RTCORBA.h" +#include "tao/RTCORBA/RTCORBA.h" #if TAO_HAS_CORBA_MESSAGING == 1 -#include "RT_ORB_Loader.h" +#include "tao/RTCORBA/RT_ORB_Loader.h" ACE_RCSID (RTCORBA, RTCORBA, "$Id$") diff --git a/TAO/tao/RTCORBA/RTCORBA.h b/TAO/tao/RTCORBA/RTCORBA.h index 0f4e1617d4e..ead9d8ce329 100644 --- a/TAO/tao/RTCORBA/RTCORBA.h +++ b/TAO/tao/RTCORBA/RTCORBA.h @@ -21,7 +21,7 @@ #include /**/ "ace/pre.h" -#include "rtcorba_export.h" +#include "tao/RTCORBA/rtcorba_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -45,7 +45,7 @@ static TAO_RTCORBA_Initializer TAO_RTCORBA_initializer; TAO_END_VERSIONED_NAMESPACE_DECL #define TAO_RTCORBA_SAFE_INCLUDE -#include "RTCORBAC.h" +#include "tao/RTCORBA/RTCORBAC.h" #undef TAO_RTCORBA_SAFE_INCLUDE #endif /* TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/RTCORBAA.cpp b/TAO/tao/RTCORBA/RTCORBAA.cpp index 7f736c2356c..5f9260f6d8e 100644 --- a/TAO/tao/RTCORBA/RTCORBAA.cpp +++ b/TAO/tao/RTCORBA/RTCORBAA.cpp @@ -35,7 +35,7 @@ #include "tao/AnyTypeCode/Struct_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Struct_Field.h" #include "tao/AnyTypeCode/Recursive_Type_TypeCode.h" -#include "RTCORBA.h" +#include "tao/RTCORBA/RTCORBA.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" diff --git a/TAO/tao/RTCORBA/RTCORBAC.cpp b/TAO/tao/RTCORBA/RTCORBAC.cpp index 26a6667a23c..59f945ff53b 100644 --- a/TAO/tao/RTCORBA/RTCORBAC.cpp +++ b/TAO/tao/RTCORBA/RTCORBAC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "RTCORBA.h" +#include "tao/RTCORBA/RTCORBA.h" #include "tao/CDR.h" #include "tao/Basic_Arguments.h" #include "tao/Special_Basic_Arguments.h" diff --git a/TAO/tao/RTCORBA/RTCORBAC.h b/TAO/tao/RTCORBA/RTCORBAC.h index 294b58b8746..036bf70b06a 100644 --- a/TAO/tao/RTCORBA/RTCORBAC.h +++ b/TAO/tao/RTCORBA/RTCORBAC.h @@ -44,8 +44,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "rtcorba_export.h" -#include "rtcorba_typedefs.h" +#include "tao/RTCORBA/rtcorba_export.h" +#include "tao/RTCORBA/rtcorba_typedefs.h" #include "tao/ORB.h" #include "tao/TimeBaseC.h" #include "tao/SystemException.h" diff --git a/TAO/tao/RTCORBA/RTCORBA_includeC.h b/TAO/tao/RTCORBA/RTCORBA_includeC.h index 0744f8c6611..1b7cc8c0f9a 100644 --- a/TAO/tao/RTCORBA/RTCORBA_includeC.h +++ b/TAO/tao/RTCORBA/RTCORBA_includeC.h @@ -40,7 +40,7 @@ #include "tao/CDR.h" #include "tao/Environment.h" -#include "RTCORBA.h" +#include "tao/RTCORBA/RTCORBA.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO diff --git a/TAO/tao/RTCORBA/RT_Current.cpp b/TAO/tao/RTCORBA/RT_Current.cpp index ef85c2e198f..5c9170dd78e 100644 --- a/TAO/tao/RTCORBA/RT_Current.cpp +++ b/TAO/tao/RTCORBA/RT_Current.cpp @@ -2,11 +2,11 @@ // $Id$ // -#include "RT_Current.h" +#include "tao/RTCORBA/RT_Current.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "Priority_Mapping.h" +#include "tao/RTCORBA/Priority_Mapping.h" #include "tao/Stub.h" #include "tao/ORB_Core.h" diff --git a/TAO/tao/RTCORBA/RT_Current.h b/TAO/tao/RTCORBA/RT_Current.h index 61080877d2a..58b994d0bee 100644 --- a/TAO/tao/RTCORBA/RT_Current.h +++ b/TAO/tao/RTCORBA/RT_Current.h @@ -20,7 +20,7 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 #define TAO_RTCORBA_SAFE_INCLUDE -#include "RTCORBAC.h" +#include "tao/RTCORBA/RTCORBAC.h" #undef TAO_RTCORBA_SAFE_INCLUDE #include "tao/LocalObject.h" diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp index 1bc5d632299..a74d7ea7277 100644 --- a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp +++ b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp @@ -1,10 +1,10 @@ -#include "RT_Endpoint_Selector_Factory.h" +#include "tao/RTCORBA/RT_Endpoint_Selector_Factory.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "RT_Invocation_Endpoint_Selectors.h" -#include "RT_Endpoint_Utils.h" -#include "RT_Stub.h" +#include "tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h" +#include "tao/RTCORBA/RT_Endpoint_Utils.h" +#include "tao/RTCORBA/RT_Stub.h" #include "tao/Protocols_Hooks.h" diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h index cbb9903e36c..f361563ad22 100644 --- a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h +++ b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h @@ -18,7 +18,7 @@ #define RT_ENDPOINT_SELECTOR_FACTORY_H #include /**/ "ace/pre.h" -#include "rtcorba_export.h" +#include "tao/RTCORBA/rtcorba_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp index e8fb65afe61..841c73bc6dc 100644 --- a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp +++ b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp @@ -1,12 +1,12 @@ -#include "RT_Endpoint_Utils.h" +#include "tao/RTCORBA/RT_Endpoint_Utils.h" #include "tao/Profile_Transport_Resolver.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "RT_Endpoint_Selector_Factory.h" -#include "RT_Invocation_Endpoint_Selectors.h" +#include "tao/RTCORBA/RT_Endpoint_Selector_Factory.h" +#include "tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h" -#include "RT_Stub.h" +#include "tao/RTCORBA/RT_Stub.h" ACE_RCSID (RTCORBA, RT_Endpoint_Utils, diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Utils.h b/TAO/tao/RTCORBA/RT_Endpoint_Utils.h index e39da435abf..649c3ca2896 100644 --- a/TAO/tao/RTCORBA/RT_Endpoint_Utils.h +++ b/TAO/tao/RTCORBA/RT_Endpoint_Utils.h @@ -19,7 +19,7 @@ #include /**/ "ace/pre.h" -#include "rtcorba_export.h" +#include "tao/RTCORBA/rtcorba_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp index 2ffca97ffa8..6e712fe4fc9 100644 --- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp +++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp @@ -1,13 +1,13 @@ -#include "RT_Invocation_Endpoint_Selectors.h" +#include "tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "RT_Policy_i.h" -#include "RT_Stub.h" -#include "RT_Transport_Descriptor.h" -#include "RT_Transport_Descriptor_Property.h" -#include "RT_Endpoint_Utils.h" -#include "RT_Protocols_Hooks.h" +#include "tao/RTCORBA/RT_Policy_i.h" +#include "tao/RTCORBA/RT_Stub.h" +#include "tao/RTCORBA/RT_Transport_Descriptor.h" +#include "tao/RTCORBA/RT_Transport_Descriptor_Property.h" +#include "tao/RTCORBA/RT_Endpoint_Utils.h" +#include "tao/RTCORBA/RT_Protocols_Hooks.h" #include "tao/Stub.h" #include "tao/ORB_Core.h" #include "tao/Profile.h" diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h index dac3caff71e..4c6d75e022e 100644 --- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h +++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h @@ -20,7 +20,7 @@ #include /**/ "ace/pre.h" -#include "rtcorba_export.h" +#include "tao/RTCORBA/rtcorba_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -30,7 +30,7 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "RTCORBA.h" +#include "tao/RTCORBA/RTCORBA.h" #include "tao/Invocation_Endpoint_Selectors.h" diff --git a/TAO/tao/RTCORBA/RT_Mutex.cpp b/TAO/tao/RTCORBA/RT_Mutex.cpp index 05708d1e326..701505481ee 100644 --- a/TAO/tao/RTCORBA/RT_Mutex.cpp +++ b/TAO/tao/RTCORBA/RT_Mutex.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "RT_Mutex.h" +#include "tao/RTCORBA/RT_Mutex.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "RT_ORB.h" +#include "tao/RTCORBA/RT_ORB.h" #include "ace/OS_NS_sys_time.h" ACE_RCSID(RTCORBA, diff --git a/TAO/tao/RTCORBA/RT_Mutex.h b/TAO/tao/RTCORBA/RT_Mutex.h index 187e7aebc09..2381712964f 100644 --- a/TAO/tao/RTCORBA/RT_Mutex.h +++ b/TAO/tao/RTCORBA/RT_Mutex.h @@ -24,7 +24,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #define TAO_RTCORBA_SAFE_INCLUDE -#include "RTCORBAC.h" +#include "tao/RTCORBA/RTCORBAC.h" #undef TAO_RTCORBA_SAFE_INCLUDE #include "tao/LocalObject.h" diff --git a/TAO/tao/RTCORBA/RT_ORB.cpp b/TAO/tao/RTCORBA/RT_ORB.cpp index 3e3ef0e6080..7f6e2cc028b 100644 --- a/TAO/tao/RTCORBA/RT_ORB.cpp +++ b/TAO/tao/RTCORBA/RT_ORB.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "RT_ORB.h" +#include "tao/RTCORBA/RT_ORB.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "RT_Policy_i.h" -#include "RT_Mutex.h" -#include "Priority_Mapping_Manager.h" +#include "tao/RTCORBA/RT_Policy_i.h" +#include "tao/RTCORBA/RT_Mutex.h" +#include "tao/RTCORBA/Priority_Mapping_Manager.h" #include "tao/ORB_Core.h" #include "tao/ORB.h" #include "tao/RTCORBA/Thread_Pool.h" diff --git a/TAO/tao/RTCORBA/RT_ORB.h b/TAO/tao/RTCORBA/RT_ORB.h index 4fe45bdd19a..612108d048d 100644 --- a/TAO/tao/RTCORBA/RT_ORB.h +++ b/TAO/tao/RTCORBA/RT_ORB.h @@ -22,7 +22,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #define TAO_RTCORBA_SAFE_INCLUDE -#include "RTCORBAC.h" +#include "tao/RTCORBA/RTCORBAC.h" #undef TAO_RTCORBA_SAFE_INCLUDE #include "tao/LocalObject.h" diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp index 1a4804a5633..464c35660aa 100644 --- a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp +++ b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp @@ -1,4 +1,4 @@ -#include "RT_ORBInitializer.h" +#include "tao/RTCORBA/RT_ORBInitializer.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 @@ -11,21 +11,21 @@ ACE_RCSID (RTCORBA, #include "tao/RTCORBA/RTCORBAC.h" #undef TAO_RTCORBA_SAFE_INCLUDE -#include "RT_Policy_i.h" -#include "RT_PolicyFactory.h" -#include "RT_Protocols_Hooks.h" -#include "Priority_Mapping_Manager.h" -#include "Network_Priority_Mapping_Manager.h" -#include "RT_ORB_Loader.h" -#include "RT_Stub_Factory.h" -#include "RT_Endpoint_Selector_Factory.h" -#include "Continuous_Priority_Mapping.h" -#include "Linear_Priority_Mapping.h" -#include "Direct_Priority_Mapping.h" -#include "Linear_Network_Priority_Mapping.h" -#include "RT_ORB.h" -#include "RT_Current.h" -#include "RT_Thread_Lane_Resources_Manager.h" +#include "tao/RTCORBA/RT_Policy_i.h" +#include "tao/RTCORBA/RT_PolicyFactory.h" +#include "tao/RTCORBA/RT_Protocols_Hooks.h" +#include "tao/RTCORBA/Priority_Mapping_Manager.h" +#include "tao/RTCORBA/Network_Priority_Mapping_Manager.h" +#include "tao/RTCORBA/RT_ORB_Loader.h" +#include "tao/RTCORBA/RT_Stub_Factory.h" +#include "tao/RTCORBA/RT_Endpoint_Selector_Factory.h" +#include "tao/RTCORBA/Continuous_Priority_Mapping.h" +#include "tao/RTCORBA/Linear_Priority_Mapping.h" +#include "tao/RTCORBA/Direct_Priority_Mapping.h" +#include "tao/RTCORBA/Linear_Network_Priority_Mapping.h" +#include "tao/RTCORBA/RT_ORB.h" +#include "tao/RTCORBA/RT_Current.h" +#include "tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h" #include "tao/Exception.h" #include "tao/ORB_Core.h" diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.h b/TAO/tao/RTCORBA/RT_ORBInitializer.h index 3a0d02a4a01..c2f04c46c04 100644 --- a/TAO/tao/RTCORBA/RT_ORBInitializer.h +++ b/TAO/tao/RTCORBA/RT_ORBInitializer.h @@ -20,7 +20,7 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "rtcorba_export.h" +#include "tao/RTCORBA/rtcorba_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp index 029fb093346..00f21ce77e0 100644 --- a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp +++ b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp @@ -1,8 +1,8 @@ -#include "RT_ORB_Loader.h" +#include "tao/RTCORBA/RT_ORB_Loader.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "RT_ORBInitializer.h" +#include "tao/RTCORBA/RT_ORBInitializer.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.h b/TAO/tao/RTCORBA/RT_ORB_Loader.h index 49cf2cfd579..a3e2d4cd375 100644 --- a/TAO/tao/RTCORBA/RT_ORB_Loader.h +++ b/TAO/tao/RTCORBA/RT_ORB_Loader.h @@ -17,7 +17,7 @@ #define TAO_RT_ORB_LOADER_H #include /**/ "ace/pre.h" -#include "rtcorba_export.h" +#include "tao/RTCORBA/rtcorba_export.h" #include "tao/orbconf.h" diff --git a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp b/TAO/tao/RTCORBA/RT_PolicyFactory.cpp index e1dd1ca7578..cd80662c192 100644 --- a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp +++ b/TAO/tao/RTCORBA/RT_PolicyFactory.cpp @@ -1,4 +1,4 @@ -#include "RT_PolicyFactory.h" +#include "tao/RTCORBA/RT_PolicyFactory.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 @@ -6,7 +6,7 @@ ACE_RCSID (RTCORBA, RT_PolicyFactory, "$Id$") -#include "RT_Policy_i.h" +#include "tao/RTCORBA/RT_Policy_i.h" #include "tao/PolicyC.h" #include "tao/ORB_Constants.h" diff --git a/TAO/tao/RTCORBA/RT_PolicyFactory.h b/TAO/tao/RTCORBA/RT_PolicyFactory.h index 88ffb9f91d3..6229e74af12 100644 --- a/TAO/tao/RTCORBA/RT_PolicyFactory.h +++ b/TAO/tao/RTCORBA/RT_PolicyFactory.h @@ -21,7 +21,7 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "rtcorba_export.h" +#include "tao/RTCORBA/rtcorba_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/RTCORBA/RT_Policy_i.cpp b/TAO/tao/RTCORBA/RT_Policy_i.cpp index ac8f47445cd..a9f893c31e3 100644 --- a/TAO/tao/RTCORBA/RT_Policy_i.cpp +++ b/TAO/tao/RTCORBA/RT_Policy_i.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "RT_Policy_i.h" +#include "tao/RTCORBA/RT_Policy_i.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 diff --git a/TAO/tao/RTCORBA/RT_Policy_i.h b/TAO/tao/RTCORBA/RT_Policy_i.h index 77949403a6d..ed8e1cfe6a4 100644 --- a/TAO/tao/RTCORBA/RT_Policy_i.h +++ b/TAO/tao/RTCORBA/RT_Policy_i.h @@ -24,7 +24,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #define TAO_RTCORBA_SAFE_INCLUDE -#include "RTCORBAC.h" +#include "tao/RTCORBA/RTCORBAC.h" #undef TAO_RTCORBA_SAFE_INCLUDE #include "tao/LocalObject.h" diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp index f98c570213d..9dba0b882b0 100644 --- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp +++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp @@ -1,10 +1,10 @@ -#include "RT_Protocols_Hooks.h" +#include "tao/RTCORBA/RT_Protocols_Hooks.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "RT_Policy_i.h" -#include "Priority_Mapping_Manager.h" -#include "RT_Stub.h" +#include "tao/RTCORBA/RT_Policy_i.h" +#include "tao/RTCORBA/Priority_Mapping_Manager.h" +#include "tao/RTCORBA/RT_Stub.h" #include "tao/Stub.h" #include "tao/ORB_Core.h" diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h index e0f6539b3da..a1542f2e2a8 100644 --- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h +++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h @@ -19,8 +19,8 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "Priority_Mapping_Manager.h" -#include "Network_Priority_Mapping_Manager.h" +#include "tao/RTCORBA/Priority_Mapping_Manager.h" +#include "tao/RTCORBA/Network_Priority_Mapping_Manager.h" #include "tao/Protocols_Hooks.h" diff --git a/TAO/tao/RTCORBA/RT_Stub.cpp b/TAO/tao/RTCORBA/RT_Stub.cpp index 10743cbba09..fe828a2bb5f 100644 --- a/TAO/tao/RTCORBA/RT_Stub.cpp +++ b/TAO/tao/RTCORBA/RT_Stub.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "RT_Stub.h" +#include "tao/RTCORBA/RT_Stub.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "RT_Policy_i.h" +#include "tao/RTCORBA/RT_Policy_i.h" #include "tao/ORB_Core.h" #include "tao/Policy_Set.h" #include "tao/Policy_Manager.h" diff --git a/TAO/tao/RTCORBA/RT_Stub.h b/TAO/tao/RTCORBA/RT_Stub.h index 11a59ee51fe..fcaf8a32562 100644 --- a/TAO/tao/RTCORBA/RT_Stub.h +++ b/TAO/tao/RTCORBA/RT_Stub.h @@ -23,7 +23,7 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "rtcorba_export.h" +#include "tao/RTCORBA/rtcorba_export.h" #include "tao/Stub.h" diff --git a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp index eb402f62b9d..84f376955cd 100644 --- a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp +++ b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "RT_Stub_Factory.h" +#include "tao/RTCORBA/RT_Stub_Factory.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "RT_Stub.h" +#include "tao/RTCORBA/RT_Stub.h" #include "tao/ORB_Constants.h" #include "tao/SystemException.h" diff --git a/TAO/tao/RTCORBA/RT_Stub_Factory.h b/TAO/tao/RTCORBA/RT_Stub_Factory.h index 8dfe39dd4ea..27a8f8cf712 100644 --- a/TAO/tao/RTCORBA/RT_Stub_Factory.h +++ b/TAO/tao/RTCORBA/RT_Stub_Factory.h @@ -24,7 +24,7 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "rtcorba_export.h" +#include "tao/RTCORBA/rtcorba_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp b/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp index 4eefe566719..0058ea2023c 100644 --- a/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp +++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp @@ -1,15 +1,15 @@ // $Id$ -#include "RT_Transport_Descriptor.h" +#include "tao/RTCORBA/RT_Transport_Descriptor.h" #include "ace/OS_Memory.h" #if ! defined (__ACE_INLINE__) -#include "RT_Transport_Descriptor.inl" +#include "tao/RTCORBA/RT_Transport_Descriptor.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(RTCORBA, TAO_RT_Transport_Descriptor, "$Id$") -#include "RT_Transport_Descriptor_Property.h" +#include "tao/RTCORBA/RT_Transport_Descriptor_Property.h" #include "tao/Endpoint.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor.h b/TAO/tao/RTCORBA/RT_Transport_Descriptor.h index d783d6c80e9..bbf8f97ee28 100644 --- a/TAO/tao/RTCORBA/RT_Transport_Descriptor.h +++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor.h @@ -13,13 +13,13 @@ #include /**/ "ace/pre.h" -#include "rtcorba_export.h" +#include "tao/RTCORBA/rtcorba_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "RT_Transport_Descriptor_Property.h" +#include "tao/RTCORBA/RT_Transport_Descriptor_Property.h" #include "tao/Transport_Descriptor_Interface.h" @@ -72,7 +72,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "RT_Transport_Descriptor.inl" +#include "tao/RTCORBA/RT_Transport_Descriptor.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp index 73cd7fd9469..020fe70267a 100644 --- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp +++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "RT_Transport_Descriptor_Property.h" +#include "tao/RTCORBA/RT_Transport_Descriptor_Property.h" #include "ace/OS_Memory.h" #if ! defined (__ACE_INLINE__) -#include "RT_Transport_Descriptor_Property.inl" +#include "tao/RTCORBA/RT_Transport_Descriptor_Property.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (RTCORBA, diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h index 99673b20d3f..cf38816b4d6 100644 --- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h +++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h @@ -13,7 +13,7 @@ #include /**/ "ace/pre.h" -#include "rtcorba_export.h" +#include "tao/RTCORBA/rtcorba_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -136,7 +136,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL /*****************************************************************************/ #if defined (__ACE_INLINE__) -#include "RT_Transport_Descriptor_Property.inl" +#include "tao/RTCORBA/RT_Transport_Descriptor_Property.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp index 4e04ba5dc7d..f63d8809bb5 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.cpp +++ b/TAO/tao/RTCORBA/Thread_Pool.cpp @@ -1,4 +1,4 @@ -#include "Thread_Pool.h" +#include "tao/RTCORBA/Thread_Pool.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 @@ -7,7 +7,7 @@ ACE_RCSID (RTCORBA, "$Id$") #if ! defined (__ACE_INLINE__) -#include "Thread_Pool.inl" +#include "tao/RTCORBA/Thread_Pool.inl" #endif /* __ACE_INLINE__ */ #include "tao/Exception.h" diff --git a/TAO/tao/RTCORBA/Thread_Pool.h b/TAO/tao/RTCORBA/Thread_Pool.h index 59592bb239e..cd0047741e9 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.h +++ b/TAO/tao/RTCORBA/Thread_Pool.h @@ -24,7 +24,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #define TAO_RTCORBA_SAFE_INCLUDE -#include "RTCORBAC.h" +#include "tao/RTCORBA/RTCORBAC.h" #undef TAO_RTCORBA_SAFE_INCLUDE #include "ace/Hash_Map_Manager.h" @@ -467,7 +467,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Thread_Pool.inl" +#include "tao/RTCORBA/Thread_Pool.inl" #endif /* __ACE_INLINE__ */ #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTPortableServer/RTPortableServer.cpp b/TAO/tao/RTPortableServer/RTPortableServer.cpp index bd538798210..bb1ea26cbdb 100644 --- a/TAO/tao/RTPortableServer/RTPortableServer.cpp +++ b/TAO/tao/RTPortableServer/RTPortableServer.cpp @@ -12,8 +12,8 @@ // // ================================================================= -#include "RTPortableServer.h" -#include "RT_Object_Adapter_Factory.h" +#include "tao/RTPortableServer/RTPortableServer.h" +#include "tao/RTPortableServer/RT_Object_Adapter_Factory.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 diff --git a/TAO/tao/RTPortableServer/RTPortableServer.h b/TAO/tao/RTPortableServer/RTPortableServer.h index 8bdb8e554c8..82e605cccba 100644 --- a/TAO/tao/RTPortableServer/RTPortableServer.h +++ b/TAO/tao/RTPortableServer/RTPortableServer.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "rtportableserver_export.h" +#include "tao/RTPortableServer/rtportableserver_export.h" #include "tao/orbconf.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 @@ -40,7 +40,7 @@ static TAO_RTPortableServer_Initializer TAO_RTPortableServer_initializer; TAO_END_VERSIONED_NAMESPACE_DECL #define TAO_RT_PORTABLESERVER_SAFE_INCLUDE -#include "RTPortableServerC.h" +#include "tao/RTPortableServer/RTPortableServerC.h" #undef TAO_RT_PORTABLESERVER_SAFE_INCLUDE #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTPortableServer/RTPortableServerA.cpp b/TAO/tao/RTPortableServer/RTPortableServerA.cpp index d2fa6a0482f..e0e8678f7be 100644 --- a/TAO/tao/RTPortableServer/RTPortableServerA.cpp +++ b/TAO/tao/RTPortableServer/RTPortableServerA.cpp @@ -30,7 +30,7 @@ #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" #include "tao/AnyTypeCode/String_TypeCode_Static.h" -#include "RTPortableServer.h" +#include "tao/RTPortableServer/RTPortableServer.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.cpp b/TAO/tao/RTPortableServer/RTPortableServerC.cpp index 2735dd9db24..85e9834111f 100644 --- a/TAO/tao/RTPortableServer/RTPortableServerC.cpp +++ b/TAO/tao/RTPortableServer/RTPortableServerC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "RTPortableServer.h" +#include "tao/RTPortableServer/RTPortableServer.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.h b/TAO/tao/RTPortableServer/RTPortableServerC.h index 78bc7eff130..cb6e8d013f8 100644 --- a/TAO/tao/RTPortableServer/RTPortableServerC.h +++ b/TAO/tao/RTPortableServer/RTPortableServerC.h @@ -44,7 +44,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "rtportableserver_export.h" +#include "tao/RTPortableServer/rtportableserver_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" diff --git a/TAO/tao/RTPortableServer/RTPortableServerS.h b/TAO/tao/RTPortableServer/RTPortableServerS.h index a85828bca7d..6b5943d104f 100644 --- a/TAO/tao/RTPortableServer/RTPortableServerS.h +++ b/TAO/tao/RTPortableServer/RTPortableServerS.h @@ -33,7 +33,7 @@ #include /**/ "ace/pre.h" -#include "RTPortableServerC.h" +#include "tao/RTPortableServer/RTPortableServerC.h" #include "tao/PortableServer/PortableServer_includeS.h" #include "tao/RTCORBA/RTCORBA_includeS.h" diff --git a/TAO/tao/RTPortableServer/RTPortableServer_includeC.h b/TAO/tao/RTPortableServer/RTPortableServer_includeC.h index d8cf0b2f527..2b42eb48285 100644 --- a/TAO/tao/RTPortableServer/RTPortableServer_includeC.h +++ b/TAO/tao/RTPortableServer/RTPortableServer_includeC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "rtportableserver_export.h" +#include "tao/RTPortableServer/rtportableserver_export.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Environment.h" diff --git a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp index b409456b4bd..53444f8e1b4 100644 --- a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp +++ b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "RT_Acceptor_Filters.h" +#include "tao/RTPortableServer/RT_Acceptor_Filters.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 diff --git a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h index a4f5810a1da..6eb39e04677 100644 --- a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h +++ b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h @@ -25,7 +25,7 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "rtportableserver_export.h" +#include "tao/RTPortableServer/rtportableserver_export.h" #include "tao/Acceptor_Filter.h" #define TAO_RTCORBA_SAFE_INCLUDE diff --git a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp index 627742817c4..4dc295d06aa 100644 --- a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp +++ b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp @@ -1,14 +1,14 @@ // $Id$ -#include "RT_Object_Adapter_Factory.h" +#include "tao/RTPortableServer/RT_Object_Adapter_Factory.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 #include "tao/PortableServer/Object_Adapter.h" #include "tao/ORB_Core.h" -#include "RT_Servant_Dispatcher.h" -#include "RT_Policy_Validator.h" -#include "RT_Collocation_Resolver.h" +#include "tao/RTPortableServer/RT_Servant_Dispatcher.h" +#include "tao/RTPortableServer/RT_Policy_Validator.h" +#include "tao/RTPortableServer/RT_Collocation_Resolver.h" ACE_RCSID (RTPortableServer, RT_Object_Adapter_Factory, diff --git a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h index db886adceb3..5749011b0e6 100644 --- a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h +++ b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h @@ -14,7 +14,7 @@ #define TAO_RT_OBJECT_ADAPTER_FACTORY_H #include /**/ "ace/pre.h" -#include "rtportableserver_export.h" +#include "tao/RTPortableServer/rtportableserver_export.h" #include "tao/Adapter_Factory.h" #include "tao/orbconf.h" diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp index c16221515cc..6d4baacc932 100644 --- a/TAO/tao/RTPortableServer/RT_POA.cpp +++ b/TAO/tao/RTPortableServer/RT_POA.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "RT_POA.h" +#include "tao/RTPortableServer/RT_POA.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "RT_Acceptor_Filters.h" +#include "tao/RTPortableServer/RT_Acceptor_Filters.h" #include "tao/ORB_Core.h" #include "tao/ORB.h" @@ -28,7 +28,7 @@ #include "ace/Auto_Ptr.h" #if !defined (__ACE_INLINE__) -# include "RT_POA.i" +# include "tao/RTPortableServer/RT_POA.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID (RTPortableServer, diff --git a/TAO/tao/RTPortableServer/RT_POA.h b/TAO/tao/RTPortableServer/RT_POA.h index f877f7acfc0..5ae1c845166 100644 --- a/TAO/tao/RTPortableServer/RT_POA.h +++ b/TAO/tao/RTPortableServer/RT_POA.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "rtportableserver_export.h" +#include "tao/RTPortableServer/rtportableserver_export.h" #include "tao/PortableServer/Regular_POA.h" #include "tao/orbconf.h" @@ -25,7 +25,7 @@ #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 #define TAO_RT_PORTABLESERVER_SAFE_INCLUDE -#include "RTPortableServerC.h" +#include "tao/RTPortableServer/RTPortableServerC.h" #undef TAO_RT_PORTABLESERVER_SAFE_INCLUDE #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -320,7 +320,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #endif /* _MSC_VER */ #if defined (__ACE_INLINE__) -# include "RT_POA.i" +# include "tao/RTPortableServer/RT_POA.i" #endif /* __ACE_INLINE__ */ #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp index 846452db602..4e11afb2d2e 100644 --- a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp +++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp @@ -1,4 +1,4 @@ -#include "RT_Policy_Validator.h" +#include "tao/RTPortableServer/RT_Policy_Validator.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.h b/TAO/tao/RTPortableServer/RT_Policy_Validator.h index 6fb9f3b570b..2f96666c544 100644 --- a/TAO/tao/RTPortableServer/RT_Policy_Validator.h +++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.h @@ -26,7 +26,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "rtportableserver_export.h" +#include "tao/RTPortableServer/rtportableserver_export.h" #include "tao/Policy_Validator.h" #include "tao/RTCORBA/RTCORBA.h" diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp index 21711bf9157..45eebeee97f 100644 --- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp +++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp @@ -1,9 +1,9 @@ -#include "RT_Servant_Dispatcher.h" +#include "tao/RTPortableServer/RT_Servant_Dispatcher.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 -#include "RT_POA.h" +#include "tao/RTPortableServer/RT_POA.h" #include "tao/ORB_Core.h" #include "tao/ORB_Core_TSS_Resources.h" diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h index a278765c310..138523ff62a 100644 --- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h +++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h @@ -15,7 +15,7 @@ #define TAO_RT_SERVANT_DISPATCHER_H #include /**/ "ace/pre.h" -#include "rtportableserver_export.h" +#include "tao/RTPortableServer/rtportableserver_export.h" #include "tao/orbconf.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp index 914b4a18ff5..3ac075d66e0 100644 --- a/TAO/tao/RTScheduling/Current.cpp +++ b/TAO/tao/RTScheduling/Current.cpp @@ -1,5 +1,5 @@ -#include "Current.h" -#include "Distributable_Thread.h" +#include "tao/RTScheduling/Current.h" +#include "tao/RTScheduling/Distributable_Thread.h" #include "tao/RTCORBA/Priority_Mapping_Manager.h" #include "tao/RTCORBA/RT_Current.h" #include "tao/ORB_Core.h" diff --git a/TAO/tao/RTScheduling/Current.h b/TAO/tao/RTScheduling/Current.h index 67a4bc08095..bae9d0e22c7 100644 --- a/TAO/tao/RTScheduling/Current.h +++ b/TAO/tao/RTScheduling/Current.h @@ -16,13 +16,13 @@ #include /**/ "ace/pre.h" -#include "rtscheduler_export.h" +#include "tao/RTScheduling/rtscheduler_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "RTScheduler.h" +#include "tao/RTScheduling/RTScheduler.h" #include "tao/LocalObject.h" #include "ace/Hash_Map_Manager_T.h" #include "ace/Task.h" diff --git a/TAO/tao/RTScheduling/Distributable_Thread.cpp b/TAO/tao/RTScheduling/Distributable_Thread.cpp index 7b9e18d91c7..87c9e02a245 100644 --- a/TAO/tao/RTScheduling/Distributable_Thread.cpp +++ b/TAO/tao/RTScheduling/Distributable_Thread.cpp @@ -1,6 +1,6 @@ //$Id$ -#include "Distributable_Thread.h" +#include "tao/RTScheduling/Distributable_Thread.h" #include "tao/ORB_Constants.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTScheduling/RTScheduler.cpp b/TAO/tao/RTScheduling/RTScheduler.cpp index 3dfe606a49c..15eebbb61fe 100644 --- a/TAO/tao/RTScheduling/RTScheduler.cpp +++ b/TAO/tao/RTScheduling/RTScheduler.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "RTScheduler.h" -#include "RTScheduler_Loader.h" +#include "tao/RTScheduling/RTScheduler.h" +#include "tao/RTScheduling/RTScheduler_Loader.h" ACE_RCSID (RTScheduler, RTScheduler, "$Id$") diff --git a/TAO/tao/RTScheduling/RTScheduler.h b/TAO/tao/RTScheduling/RTScheduler.h index b96c286b74a..3dbcb0553b9 100644 --- a/TAO/tao/RTScheduling/RTScheduler.h +++ b/TAO/tao/RTScheduling/RTScheduler.h @@ -19,7 +19,7 @@ #define TAO_RTSCHEDULER_H_ #include /**/ "ace/pre.h" -#include "rtscheduler_export.h" +#include "tao/RTScheduling/rtscheduler_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -41,7 +41,7 @@ static TAO_RTScheduler_Initializer TAO_RTScheduler_initializer; TAO_END_VERSIONED_NAMESPACE_DECL #define TAO_RTSCHEDULER_SAFE_INCLUDE -#include "RTSchedulerC.h" +#include "tao/RTScheduling/RTSchedulerC.h" #undef TAO_RTSCHEDULER_SAFE_INCLUDE #include /**/ "ace/post.h" diff --git a/TAO/tao/RTScheduling/RTSchedulerA.cpp b/TAO/tao/RTScheduling/RTSchedulerA.cpp index b6df10aa907..38df96e2be8 100644 --- a/TAO/tao/RTScheduling/RTSchedulerA.cpp +++ b/TAO/tao/RTScheduling/RTSchedulerA.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "RTScheduler.h" +#include "tao/RTScheduling/RTScheduler.h" #include "tao/AnyTypeCode/Null_RefCount_Policy.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" diff --git a/TAO/tao/RTScheduling/RTSchedulerC.cpp b/TAO/tao/RTScheduling/RTSchedulerC.cpp index 93ec0c40352..4c493789da4 100644 --- a/TAO/tao/RTScheduling/RTSchedulerC.cpp +++ b/TAO/tao/RTScheduling/RTSchedulerC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "RTScheduler.h" +#include "tao/RTScheduling/RTScheduler.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" #include "tao/Var_Size_Argument_T.h" diff --git a/TAO/tao/RTScheduling/RTSchedulerC.h b/TAO/tao/RTScheduling/RTSchedulerC.h index 6d10850d4b9..5d9d5944fc7 100644 --- a/TAO/tao/RTScheduling/RTSchedulerC.h +++ b/TAO/tao/RTScheduling/RTSchedulerC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "rtscheduler_export.h" +#include "tao/RTScheduling/rtscheduler_export.h" #include "tao/PI_Server/ServerRequestInfoC.h" #include "tao/PI/ClientRequestInfoC.h" diff --git a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp index d512afbcf16..574b964f843 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp +++ b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp @@ -2,8 +2,8 @@ // // $Id$ -#include "RTScheduler_Initializer.h" -#include "Request_Interceptor.h" +#include "tao/RTScheduling/RTScheduler_Initializer.h" +#include "tao/RTScheduling/Request_Interceptor.h" ACE_RCSID (TAO, RTScheduler_Initializer, "$Id$") diff --git a/TAO/tao/RTScheduling/RTScheduler_Initializer.h b/TAO/tao/RTScheduling/RTScheduler_Initializer.h index 3f39a4d5985..8b242f9af9e 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Initializer.h +++ b/TAO/tao/RTScheduling/RTScheduler_Initializer.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" #include "tao/Basic_Types.h" -#include "rtscheduler_export.h" +#include "tao/RTScheduling/rtscheduler_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp index 2e8928f52ff..bc4f99432bb 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp +++ b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "RTScheduler_Loader.h" -#include "RTScheduler_Initializer.h" +#include "tao/RTScheduling/RTScheduler_Loader.h" +#include "tao/RTScheduling/RTScheduler_Initializer.h" #include "tao/debug.h" #include "tao/ORB_Core.h" diff --git a/TAO/tao/RTScheduling/RTScheduler_Loader.h b/TAO/tao/RTScheduling/RTScheduler_Loader.h index 29f6c082ed1..92715d11279 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Loader.h +++ b/TAO/tao/RTScheduling/RTScheduler_Loader.h @@ -17,7 +17,7 @@ #define TAO_RTSCHEDULER_LOADER_H #include /**/ "ace/pre.h" -#include "rtscheduler_export.h" +#include "tao/RTScheduling/rtscheduler_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.cpp b/TAO/tao/RTScheduling/RTScheduler_Manager.cpp index cc66f73bf14..14c269cab6c 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Manager.cpp +++ b/TAO/tao/RTScheduling/RTScheduler_Manager.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "RTScheduler_Manager.h" +#include "tao/RTScheduling/RTScheduler_Manager.h" #if ! defined (__ACE_INLINE__) -#include "RTScheduler_Manager.i" +#include "tao/RTScheduling/RTScheduler_Manager.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(TAO, RT_ORB, "$Id$") diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.h b/TAO/tao/RTScheduling/RTScheduler_Manager.h index 8abd8a587f3..908922f6bda 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Manager.h +++ b/TAO/tao/RTScheduling/RTScheduler_Manager.h @@ -14,7 +14,7 @@ #ifndef TAO_PRIORITY_MAPPING_MANAGER_H #define TAO_PRIORITY_MAPPING_MANAGER_H -#include "RTScheduler.h" +#include "tao/RTScheduling/RTScheduler.h" #include "tao/LocalObject.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -137,7 +137,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "RTScheduler_Manager.i" +#include "tao/RTScheduling/RTScheduler_Manager.i" #endif /* __ACE_INLINE__ */ #endif /* TAO_PRIORITY_MAPPING_MANAGER_H */ diff --git a/TAO/tao/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp index fc049b4c626..d9cba461f36 100644 --- a/TAO/tao/RTScheduling/Request_Interceptor.cpp +++ b/TAO/tao/RTScheduling/Request_Interceptor.cpp @@ -3,9 +3,9 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/TypeCode.h" -#include "Request_Interceptor.h" -#include "Current.h" -#include "Distributable_Thread.h" +#include "tao/RTScheduling/Request_Interceptor.h" +#include "tao/RTScheduling/Current.h" +#include "tao/RTScheduling/Distributable_Thread.h" #include "tao/TSS_Resources.h" #include "tao/debug.h" diff --git a/TAO/tao/RTScheduling/Request_Interceptor.h b/TAO/tao/RTScheduling/Request_Interceptor.h index 1d49a794312..1a8c74a389a 100644 --- a/TAO/tao/RTScheduling/Request_Interceptor.h +++ b/TAO/tao/RTScheduling/Request_Interceptor.h @@ -5,10 +5,10 @@ #ifndef TAO_RTSCHEDULING_REQUEST_INTERCEPTOR_H #define TAO_RTSCHEDULING_REQUEST_INTERCEPTOR_H -#include "rtscheduler_export.h" -#include "RTScheduler.h" +#include "tao/RTScheduling/rtscheduler_export.h" +#include "tao/RTScheduling/RTScheduler.h" #include "ace/Atomic_Op.h" -#include "Current.h" +#include "tao/RTScheduling/Current.h" #include "tao/LocalObject.h" #include "tao/PI/PI.h" diff --git a/TAO/tao/RTScheduling/ThreadAction.h b/TAO/tao/RTScheduling/ThreadAction.h index 3152a30434a..e7b7fc530cd 100644 --- a/TAO/tao/RTScheduling/ThreadAction.h +++ b/TAO/tao/RTScheduling/ThreadAction.h @@ -8,7 +8,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "RTSchedulerC.h" +#include "tao/RTScheduling/RTSchedulerC.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Reactive_Connect_Strategy.cpp b/TAO/tao/Reactive_Connect_Strategy.cpp index 5d8bf92dd1d..0883b3ee91c 100644 --- a/TAO/tao/Reactive_Connect_Strategy.cpp +++ b/TAO/tao/Reactive_Connect_Strategy.cpp @@ -1,8 +1,8 @@ -#include "Reactive_Connect_Strategy.h" -#include "Connection_Handler.h" -#include "ORB_Core.h" -#include "debug.h" -#include "Transport.h" +#include "tao/Reactive_Connect_Strategy.h" +#include "tao/Connection_Handler.h" +#include "tao/ORB_Core.h" +#include "tao/debug.h" +#include "tao/Transport.h" #include "ace/Synch_Options.h" diff --git a/TAO/tao/Reactive_Flushing_Strategy.cpp b/TAO/tao/Reactive_Flushing_Strategy.cpp index 00ed6f9d756..ab76a31f168 100644 --- a/TAO/tao/Reactive_Flushing_Strategy.cpp +++ b/TAO/tao/Reactive_Flushing_Strategy.cpp @@ -1,10 +1,10 @@ // -*- C++ -*- // $Id$ -#include "Reactive_Flushing_Strategy.h" -#include "Transport.h" -#include "ORB_Core.h" -#include "Queued_Message.h" +#include "tao/Reactive_Flushing_Strategy.h" +#include "tao/Transport.h" +#include "tao/ORB_Core.h" +#include "tao/Queued_Message.h" ACE_RCSID (tao, Reactive_Flushing_Strategy, diff --git a/TAO/tao/Reactive_Flushing_Strategy.h b/TAO/tao/Reactive_Flushing_Strategy.h index 302f7bf7140..56896b01f95 100644 --- a/TAO/tao/Reactive_Flushing_Strategy.h +++ b/TAO/tao/Reactive_Flushing_Strategy.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "Flushing_Strategy.h" +#include "tao/Flushing_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/Refcounted_ObjectKey.cpp b/TAO/tao/Refcounted_ObjectKey.cpp index eb6ae666920..9e8a02109bb 100644 --- a/TAO/tao/Refcounted_ObjectKey.cpp +++ b/TAO/tao/Refcounted_ObjectKey.cpp @@ -1,9 +1,9 @@ //$Id$ -#include "Refcounted_ObjectKey.h" +#include "tao/Refcounted_ObjectKey.h" #include "ace/Log_Msg.h" #if !defined (__ACE_INLINE__) -#include "Refcounted_ObjectKey.inl" +#include "tao/Refcounted_ObjectKey.inl" #endif /* defined INLINE */ ACE_RCSID(tao, diff --git a/TAO/tao/Refcounted_ObjectKey.h b/TAO/tao/Refcounted_ObjectKey.h index aac418c4b6f..4143f1e8af7 100644 --- a/TAO/tao/Refcounted_ObjectKey.h +++ b/TAO/tao/Refcounted_ObjectKey.h @@ -68,7 +68,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Refcounted_ObjectKey.inl" +#include "tao/Refcounted_ObjectKey.inl" #endif /* defined INLINE */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Remote_Invocation.cpp b/TAO/tao/Remote_Invocation.cpp index 01a39121e30..1e6ea8b5426 100644 --- a/TAO/tao/Remote_Invocation.cpp +++ b/TAO/tao/Remote_Invocation.cpp @@ -1,14 +1,14 @@ //$Id$ -#include "Remote_Invocation.h" -#include "Profile.h" -#include "Profile_Transport_Resolver.h" -#include "Stub.h" -#include "Transport.h" -#include "Connection_Handler.h" -#include "operation_details.h" -#include "ORB_Core.h" -#include "Protocols_Hooks.h" -#include "debug.h" +#include "tao/Remote_Invocation.h" +#include "tao/Profile.h" +#include "tao/Profile_Transport_Resolver.h" +#include "tao/Stub.h" +#include "tao/Transport.h" +#include "tao/Connection_Handler.h" +#include "tao/operation_details.h" +#include "tao/ORB_Core.h" +#include "tao/Protocols_Hooks.h" +#include "tao/debug.h" ACE_RCSID (tao, Remote_Invocation, diff --git a/TAO/tao/Remote_Object_Proxy_Broker.cpp b/TAO/tao/Remote_Object_Proxy_Broker.cpp index eb4d06eabde..fd4bc75cde0 100644 --- a/TAO/tao/Remote_Object_Proxy_Broker.cpp +++ b/TAO/tao/Remote_Object_Proxy_Broker.cpp @@ -1,11 +1,11 @@ -#include "Remote_Object_Proxy_Broker.h" -#include "CORBA_String.h" -#include "UB_String_Arguments.h" -#include "Special_Basic_Arguments.h" -#include "Invocation_Adapter.h" -#include "IFR_Client_Adapter.h" -#include "ORB_Core.h" -#include "SystemException.h" +#include "tao/Remote_Object_Proxy_Broker.h" +#include "tao/CORBA_String.h" +#include "tao/UB_String_Arguments.h" +#include "tao/Special_Basic_Arguments.h" +#include "tao/Invocation_Adapter.h" +#include "tao/IFR_Client_Adapter.h" +#include "tao/ORB_Core.h" +#include "tao/SystemException.h" #include "ace/Dynamic_Service.h" diff --git a/TAO/tao/Reply_Dispatcher.cpp b/TAO/tao/Reply_Dispatcher.cpp index eeec0b8072b..278f4463203 100644 --- a/TAO/tao/Reply_Dispatcher.cpp +++ b/TAO/tao/Reply_Dispatcher.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Reply_Dispatcher.h" +#include "tao/Reply_Dispatcher.h" ACE_RCSID (tao, Reply_Dispatcher, diff --git a/TAO/tao/Request_Dispatcher.cpp b/TAO/tao/Request_Dispatcher.cpp index 2f4abca0ceb..3663d1ee49e 100644 --- a/TAO/tao/Request_Dispatcher.cpp +++ b/TAO/tao/Request_Dispatcher.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "Request_Dispatcher.h" -#include "TAO_Server_Request.h" -#include "ORB_Core.h" +#include "tao/Request_Dispatcher.h" +#include "tao/TAO_Server_Request.h" +#include "tao/ORB_Core.h" ACE_RCSID (tao, Request_Dispatcher, diff --git a/TAO/tao/Resource_Factory.cpp b/TAO/tao/Resource_Factory.cpp index 7ef72c7a73a..2f629c3331b 100644 --- a/TAO/tao/Resource_Factory.cpp +++ b/TAO/tao/Resource_Factory.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "Resource_Factory.h" -#include "Protocol_Factory.h" -#include "orbconf.h" +#include "tao/Resource_Factory.h" +#include "tao/Protocol_Factory.h" +#include "tao/orbconf.h" #include "ace/ACE.h" diff --git a/TAO/tao/Resume_Handle.cpp b/TAO/tao/Resume_Handle.cpp index 0f220dbdb06..3cb6d7199ec 100644 --- a/TAO/tao/Resume_Handle.cpp +++ b/TAO/tao/Resume_Handle.cpp @@ -1,10 +1,10 @@ -#include "Resume_Handle.h" -#include "ORB_Core.h" +#include "tao/Resume_Handle.h" +#include "tao/ORB_Core.h" #include "ace/Reactor.h" #if !defined (__ACE_INLINE__) -# include "Resume_Handle.inl" +# include "tao/Resume_Handle.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (tao, diff --git a/TAO/tao/Resume_Handle.h b/TAO/tao/Resume_Handle.h index c7eed3e401a..3c8a8039560 100644 --- a/TAO/tao/Resume_Handle.h +++ b/TAO/tao/Resume_Handle.h @@ -89,7 +89,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "Resume_Handle.inl" +# include "tao/Resume_Handle.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Seq_Out_T.cpp b/TAO/tao/Seq_Out_T.cpp index bb832224a9e..02bc2c7f89f 100644 --- a/TAO/tao/Seq_Out_T.cpp +++ b/TAO/tao/Seq_Out_T.cpp @@ -3,10 +3,10 @@ #ifndef TAO_SEQ_OUT_T_CPP #define TAO_SEQ_OUT_T_CPP -#include "Seq_Out_T.h" +#include "tao/Seq_Out_T.h" #if !defined (__ACE_INLINE__) -#include "Seq_Out_T.inl" +#include "tao/Seq_Out_T.inl" #endif /* __ACE_INLINE__ */ #endif /* TAO_SEQUENCE_OUT_T_CPP */ diff --git a/TAO/tao/Seq_Out_T.h b/TAO/tao/Seq_Out_T.h index 1bc9d4ef17e..1544f24c9ee 100644 --- a/TAO/tao/Seq_Out_T.h +++ b/TAO/tao/Seq_Out_T.h @@ -87,7 +87,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Seq_Out_T.inl" +#include "tao/Seq_Out_T.inl" #endif /* defined INLINE */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/tao/Seq_Var_T.h b/TAO/tao/Seq_Var_T.h index d53d4b8d807..9b3e4f38193 100644 --- a/TAO/tao/Seq_Var_T.h +++ b/TAO/tao/Seq_Var_T.h @@ -146,7 +146,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Seq_Var_T.inl" +#include "tao/Seq_Var_T.inl" #endif /* defined INLINE */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/tao/Sequence.cpp b/TAO/tao/Sequence.cpp index 138c46ab1c8..20c274d8a98 100644 --- a/TAO/tao/Sequence.cpp +++ b/TAO/tao/Sequence.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "Sequence.h" +#include "tao/Sequence.h" #if !defined (__ACE_INLINE__) #include "tao/Sequence.i" #endif /* __ACE_INLINE__ */ -#include "SystemException.h" +#include "tao/SystemException.h" #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) # include "ace/Message_Block.h" diff --git a/TAO/tao/ServerRequestInterceptor_Adapter.cpp b/TAO/tao/ServerRequestInterceptor_Adapter.cpp index c26fc486d27..7afe711cb85 100644 --- a/TAO/tao/ServerRequestInterceptor_Adapter.cpp +++ b/TAO/tao/ServerRequestInterceptor_Adapter.cpp @@ -1,4 +1,4 @@ -#include "ServerRequestInterceptor_Adapter.h" +#include "tao/ServerRequestInterceptor_Adapter.h" ACE_RCSID (tao, ServerRequestInterceptorAdapter, diff --git a/TAO/tao/ServerRequestInterceptor_Adapter_Factory.cpp b/TAO/tao/ServerRequestInterceptor_Adapter_Factory.cpp index 20f957007c8..3408f8b97aa 100644 --- a/TAO/tao/ServerRequestInterceptor_Adapter_Factory.cpp +++ b/TAO/tao/ServerRequestInterceptor_Adapter_Factory.cpp @@ -1,4 +1,4 @@ -#include "ServerRequestInterceptor_Adapter_Factory.h" +#include "tao/ServerRequestInterceptor_Adapter_Factory.h" ACE_RCSID (tao, ServerRequestInterceptorAdapterFactory, diff --git a/TAO/tao/Server_Strategy_Factory.h b/TAO/tao/Server_Strategy_Factory.h index 7d36997b180..2e5fdc2800a 100644 --- a/TAO/tao/Server_Strategy_Factory.h +++ b/TAO/tao/Server_Strategy_Factory.h @@ -21,8 +21,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "TAO_Export.h" -#include "Basic_Types.h" +#include "tao/TAO_Export.h" +#include "tao/Basic_Types.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Service_Callbacks.cpp b/TAO/tao/Service_Callbacks.cpp index 82311c96db7..465867c0d3c 100644 --- a/TAO/tao/Service_Callbacks.cpp +++ b/TAO/tao/Service_Callbacks.cpp @@ -1,8 +1,8 @@ -#include "Service_Callbacks.h" -#include "ORB_Constants.h" -#include "SystemException.h" -#include "Environment.h" -#include "Invocation_Utils.h" +#include "tao/Service_Callbacks.h" +#include "tao/ORB_Constants.h" +#include "tao/SystemException.h" +#include "tao/Environment.h" +#include "tao/Invocation_Utils.h" ACE_RCSID (tao, Service_Callbacks, diff --git a/TAO/tao/ServicesC.cpp b/TAO/tao/ServicesC.cpp index c9139e959b9..853fbfd293f 100644 --- a/TAO/tao/ServicesC.cpp +++ b/TAO/tao/ServicesC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:288 -#include "ServicesC.h" +#include "tao/ServicesC.h" #include "tao/CDR.h" #include "tao/ORB_Core.h" diff --git a/TAO/tao/ShortSeqC.cpp b/TAO/tao/ShortSeqC.cpp index 5f215c64eff..4ebe8407bcb 100644 --- a/TAO/tao/ShortSeqC.cpp +++ b/TAO/tao/ShortSeqC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "ShortSeqC.h" +#include "tao/ShortSeqC.h" #include "tao/CDR.h" // TAO_IDL - Generated from diff --git a/TAO/tao/SmartProxies/Smart_Proxies.cpp b/TAO/tao/SmartProxies/Smart_Proxies.cpp index 91e62e5cafc..10707265d59 100644 --- a/TAO/tao/SmartProxies/Smart_Proxies.cpp +++ b/TAO/tao/SmartProxies/Smart_Proxies.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "Smart_Proxies.h" +#include "tao/SmartProxies/Smart_Proxies.h" ACE_RCSID(SmartProxies, Smart_Proxies, "$Id$") #if !defined (__ACE_INLINE__) -#include "Smart_Proxies.inl" +#include "tao/SmartProxies/Smart_Proxies.inl" #endif /* defined INLINE */ // Add this line to please the AIX linker, otherwise it complains diff --git a/TAO/tao/SmartProxies/Smart_Proxies.h b/TAO/tao/SmartProxies/Smart_Proxies.h index 467c1ed4267..204702f7ec9 100644 --- a/TAO/tao/SmartProxies/Smart_Proxies.h +++ b/TAO/tao/SmartProxies/Smart_Proxies.h @@ -17,7 +17,7 @@ #define TAO_SMARTPROXIES_H #include /**/ "ace/pre.h" -#include "smartproxies_export.h" +#include "tao/SmartProxies/smartproxies_export.h" #include "tao/Object.h" #include "tao/TAO_Singleton.h" #include "tao/LocalObject.h" @@ -56,7 +56,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Smart_Proxies.inl" +#include "tao/SmartProxies/Smart_Proxies.inl" #endif /* defined INLINE */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp index 2932bfea349..e217355811a 100644 --- a/TAO/tao/Strategies/DIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp @@ -1,11 +1,11 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ -#include "DIOP_Acceptor.h" +#include "tao/Strategies/DIOP_Acceptor.h" #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) -#include "DIOP_Profile.h" +#include "tao/Strategies/DIOP_Profile.h" #include "tao/MProfile.h" #include "tao/ORB_Core.h" #include "tao/debug.h" @@ -17,7 +17,7 @@ #include "ace/OS_NS_string.h" #if !defined(__ACE_INLINE__) -#include "DIOP_Acceptor.i" +#include "tao/Strategies/DIOP_Acceptor.i" #endif /* __ACE_INLINE__ */ #include "ace/os_include/os_netdb.h" diff --git a/TAO/tao/Strategies/DIOP_Acceptor.h b/TAO/tao/Strategies/DIOP_Acceptor.h index 9460c2e281c..0de8b911e3d 100644 --- a/TAO/tao/Strategies/DIOP_Acceptor.h +++ b/TAO/tao/Strategies/DIOP_Acceptor.h @@ -27,7 +27,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/Transport_Acceptor.h" -#include "DIOP_Connection_Handler.h" +#include "tao/Strategies/DIOP_Connection_Handler.h" #include "tao/Acceptor_Impl.h" #include "tao/GIOP_Message_Version.h" @@ -181,7 +181,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined(__ACE_INLINE__) -#include "DIOP_Acceptor.i" +#include "tao/Strategies/DIOP_Acceptor.i" #endif /* __ACE_INLINE__ */ #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */ diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp index 1eb7e2ea49e..335567bc4e1 100644 --- a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "DIOP_Connection_Handler.h" +#include "tao/Strategies/DIOP_Connection_Handler.h" #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) @@ -16,8 +16,8 @@ #include "tao/Protocols_Hooks.h" #include "tao/Resume_Handle.h" -#include "DIOP_Transport.h" -#include "DIOP_Endpoint.h" +#include "tao/Strategies/DIOP_Transport.h" +#include "tao/Strategies/DIOP_Endpoint.h" #include "ace/os_include/netinet/os_tcp.h" #include "ace/os_include/os_netdb.h" diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.h b/TAO/tao/Strategies/DIOP_Connection_Handler.h index 6761f89b4a3..74c8702113a 100644 --- a/TAO/tao/Strategies/DIOP_Connection_Handler.h +++ b/TAO/tao/Strategies/DIOP_Connection_Handler.h @@ -29,9 +29,9 @@ #include "tao/Wait_Strategy.h" #include "tao/Connection_Handler.h" -#include "DIOP_Transport.h" +#include "tao/Strategies/DIOP_Transport.h" #include "ace/SOCK_Dgram.h" -#include "strategies_export.h" +#include "tao/Strategies/strategies_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp index cf64af9e709..a2aecebc2b4 100644 --- a/TAO/tao/Strategies/DIOP_Connector.cpp +++ b/TAO/tao/Strategies/DIOP_Connector.cpp @@ -1,7 +1,7 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ -#include "DIOP_Connector.h" +#include "tao/Strategies/DIOP_Connector.h" #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) @@ -15,7 +15,7 @@ #include "ace/OS_NS_strings.h" #include "ace/OS_NS_string.h" -#include "DIOP_Profile.h" +#include "tao/Strategies/DIOP_Profile.h" ACE_RCSID (Strategies, diff --git a/TAO/tao/Strategies/DIOP_Connector.h b/TAO/tao/Strategies/DIOP_Connector.h index ee457059ce5..d1f8e139fbe 100644 --- a/TAO/tao/Strategies/DIOP_Connector.h +++ b/TAO/tao/Strategies/DIOP_Connector.h @@ -22,7 +22,7 @@ #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) #include "tao/Transport_Connector.h" -#include "DIOP_Connection_Handler.h" +#include "tao/Strategies/DIOP_Connection_Handler.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/Strategies/DIOP_Endpoint.cpp b/TAO/tao/Strategies/DIOP_Endpoint.cpp index 7bc957855df..43657b6d783 100644 --- a/TAO/tao/Strategies/DIOP_Endpoint.cpp +++ b/TAO/tao/Strategies/DIOP_Endpoint.cpp @@ -2,11 +2,11 @@ // $Id$ -#include "DIOP_Endpoint.h" +#include "tao/Strategies/DIOP_Endpoint.h" #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) -#include "DIOP_Connection_Handler.h" +#include "tao/Strategies/DIOP_Connection_Handler.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" @@ -20,7 +20,7 @@ ACE_RCSID (Strategies, #if !defined (__ACE_INLINE__) -# include "DIOP_Endpoint.i" +# include "tao/Strategies/DIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ #include "ace/os_include/os_netdb.h" diff --git a/TAO/tao/Strategies/DIOP_Endpoint.h b/TAO/tao/Strategies/DIOP_Endpoint.h index b5b92fafa55..a654c95e94a 100644 --- a/TAO/tao/Strategies/DIOP_Endpoint.h +++ b/TAO/tao/Strategies/DIOP_Endpoint.h @@ -27,7 +27,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/CORBA_String.h" #include "ace/INET_Addr.h" -#include "strategies_export.h" +#include "tao/Strategies/strategies_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -140,7 +140,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "DIOP_Endpoint.i" +# include "tao/Strategies/DIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ #endif /* TAO_HAS_DIOP && TAO_HAS_DIOP != 0 */ diff --git a/TAO/tao/Strategies/DIOP_Factory.cpp b/TAO/tao/Strategies/DIOP_Factory.cpp index 0197fe4ddaa..8c23791d31f 100644 --- a/TAO/tao/Strategies/DIOP_Factory.cpp +++ b/TAO/tao/Strategies/DIOP_Factory.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "DIOP_Factory.h" +#include "tao/Strategies/DIOP_Factory.h" #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) -#include "DIOP_Acceptor.h" -#include "DIOP_Connector.h" +#include "tao/Strategies/DIOP_Acceptor.h" +#include "tao/Strategies/DIOP_Connector.h" #include "tao/ORB_Constants.h" diff --git a/TAO/tao/Strategies/DIOP_Factory.h b/TAO/tao/Strategies/DIOP_Factory.h index f488a81c305..6add2587345 100644 --- a/TAO/tao/Strategies/DIOP_Factory.h +++ b/TAO/tao/Strategies/DIOP_Factory.h @@ -27,7 +27,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Service_Config.h" -#include "strategies_export.h" +#include "tao/Strategies/strategies_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp index 31c6afc3e0c..19c9432b3a0 100644 --- a/TAO/tao/Strategies/DIOP_Profile.cpp +++ b/TAO/tao/Strategies/DIOP_Profile.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "DIOP_Profile.h" +#include "tao/Strategies/DIOP_Profile.h" #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) diff --git a/TAO/tao/Strategies/DIOP_Profile.h b/TAO/tao/Strategies/DIOP_Profile.h index ab19f9e1e82..0458ebef6dc 100644 --- a/TAO/tao/Strategies/DIOP_Profile.h +++ b/TAO/tao/Strategies/DIOP_Profile.h @@ -27,7 +27,7 @@ #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "DIOP_Endpoint.h" +#include "tao/Strategies/DIOP_Endpoint.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/DIOP_Transport.cpp b/TAO/tao/Strategies/DIOP_Transport.cpp index 064c70e7071..876fd01d111 100644 --- a/TAO/tao/Strategies/DIOP_Transport.cpp +++ b/TAO/tao/Strategies/DIOP_Transport.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "DIOP_Transport.h" +#include "tao/Strategies/DIOP_Transport.h" #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) -#include "DIOP_Connection_Handler.h" -#include "DIOP_Acceptor.h" -#include "DIOP_Profile.h" +#include "tao/Strategies/DIOP_Connection_Handler.h" +#include "tao/Strategies/DIOP_Acceptor.h" +#include "tao/Strategies/DIOP_Profile.h" #include "tao/Acceptor_Registry.h" #include "tao/operation_details.h" #include "tao/Timeprobe.h" diff --git a/TAO/tao/Strategies/DIOP_Transport.h b/TAO/tao/Strategies/DIOP_Transport.h index 0e1c23e1e6d..7313639fc96 100644 --- a/TAO/tao/Strategies/DIOP_Transport.h +++ b/TAO/tao/Strategies/DIOP_Transport.h @@ -27,7 +27,7 @@ #include "ace/SOCK_Stream.h" #include "ace/Svc_Handler.h" -#include "strategies_export.h" +#include "tao/Strategies/strategies_export.h" #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT template class TAO_Strategies_Export ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>; diff --git a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp index fcd76415924..4a9822dc7b5 100644 --- a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp +++ b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "FIFO_Connection_Purging_Strategy.h" +#include "tao/Strategies/FIFO_Connection_Purging_Strategy.h" #include "tao/Transport.h" ACE_RCSID(tao, FIFO_Connection_Purging_Strategy, "$Id$") diff --git a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h index 266eac1e0e7..30ef3794a5c 100644 --- a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h +++ b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h @@ -14,7 +14,7 @@ #define TAO_FIFO_PURGING_STRATEGY_H #include /**/ "ace/pre.h" -#include "strategies_export.h" +#include "tao/Strategies/strategies_export.h" #include "tao/Connection_Purging_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp index ae34579daaf..eab9bc1f9e0 100644 --- a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp +++ b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "LFU_Connection_Purging_Strategy.h" +#include "tao/Strategies/LFU_Connection_Purging_Strategy.h" #include "tao/Transport.h" ACE_RCSID(tao, LFU_Connection_Purging_Strategy, "$Id$") diff --git a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h index c1df04e655b..98ea59231f9 100644 --- a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h +++ b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h @@ -14,7 +14,7 @@ #define TAO_LFU_PURGING_STRATEGY_H #include /**/ "ace/pre.h" -#include "strategies_export.h" +#include "tao/Strategies/strategies_export.h" #include "tao/Connection_Purging_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/tao/Strategies/LF_Strategy_Null.cpp b/TAO/tao/Strategies/LF_Strategy_Null.cpp index 5fbe04c1572..67c5f5e0871 100644 --- a/TAO/tao/Strategies/LF_Strategy_Null.cpp +++ b/TAO/tao/Strategies/LF_Strategy_Null.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "LF_Strategy_Null.h" +#include "tao/Strategies/LF_Strategy_Null.h" #if !defined (__ACE_INLINE__) -# include "LF_Strategy_Null.inl" +# include "tao/Strategies/LF_Strategy_Null.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(tao, LF_Strategy_Null, "$Id$") diff --git a/TAO/tao/Strategies/LF_Strategy_Null.h b/TAO/tao/Strategies/LF_Strategy_Null.h index 6dff8211e9c..18ba5632ad0 100644 --- a/TAO/tao/Strategies/LF_Strategy_Null.h +++ b/TAO/tao/Strategies/LF_Strategy_Null.h @@ -14,7 +14,7 @@ #define TAO_LF_STRATEGY_NULL_H #include /**/ "ace/pre.h" -#include "strategies_export.h" +#include "tao/Strategies/strategies_export.h" #include "tao/LF_Strategy.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -53,7 +53,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "LF_Strategy_Null.inl" +# include "tao/Strategies/LF_Strategy_Null.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp index 1e982f5c11e..181be613d77 100644 --- a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp +++ b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "NULL_Connection_Purging_Strategy.h" +#include "tao/Strategies/NULL_Connection_Purging_Strategy.h" #include "tao/Transport.h" ACE_RCSID(tao, NULL_Connection_Purging_Strategy, "$Id$") diff --git a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h index e0d79b76ce7..37b5c15d268 100644 --- a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h +++ b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h @@ -14,7 +14,7 @@ #define TAO_NULL_PURGING_STRATEGY_H #include /**/ "ace/pre.h" -#include "strategies_export.h" +#include "tao/Strategies/strategies_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp index cbaf238d70c..96c1cf8c8b2 100644 --- a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp +++ b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "OC_Endpoint_Selector_Factory.h" -#include "Optimized_Connection_Endpoint_Selector.h" +#include "tao/Strategies/OC_Endpoint_Selector_Factory.h" +#include "tao/Strategies/Optimized_Connection_Endpoint_Selector.h" #include "ace/Log_Msg.h" #include "tao/ORB_Core.h" #include "ace/OS.h" diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h index aa45b6bd3ff..c1cae879efb 100644 --- a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h +++ b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h @@ -19,7 +19,7 @@ #include /**/ "ace/pre.h" -#include "strategies_export.h" +#include "tao/Strategies/strategies_export.h" #include "tao/Endpoint_Selector_Factory.h" #include "ace/Service_Config.h" diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.cpp b/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.cpp index f7f12cced30..c250cd76240 100644 --- a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.cpp +++ b/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "OC_Endpoint_Selector_Loader.h" -#include "OC_Endpoint_Selector_Factory.h" +#include "tao/Strategies/OC_Endpoint_Selector_Loader.h" +#include "tao/Strategies/OC_Endpoint_Selector_Factory.h" ACE_RCSID (tao, OC_Endpoint_Selector_Loader, diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.h b/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.h index e16accfd75e..5edc517027d 100644 --- a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.h +++ b/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.h @@ -18,7 +18,7 @@ #define TAO_OC_ENDPOINT_LOADER_H #include /**/ "ace/pre.h" -#include "strategies_export.h" +#include "tao/Strategies/strategies_export.h" #include "tao/Strategies/OC_Endpoint_Selector_Factory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp index 86e78ded029..dae584e8152 100644 --- a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp +++ b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp @@ -1,6 +1,6 @@ // -*- C++ -*- -#include "Optimized_Connection_Endpoint_Selector.h" +#include "tao/Strategies/Optimized_Connection_Endpoint_Selector.h" #include "tao/debug.h" #include "tao/Stub.h" diff --git a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h index 3f6ef363aa0..818541916c6 100644 --- a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h +++ b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h @@ -25,7 +25,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "strategies_export.h" +#include "tao/Strategies/strategies_export.h" #include "tao/Invocation_Endpoint_Selectors.h" #include "ace/Time_Value.h" diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.cpp b/TAO/tao/Strategies/SCIOP_Acceptor.cpp index dd4e5a32a26..03574aa5b2b 100644 --- a/TAO/tao/Strategies/SCIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/SCIOP_Acceptor.cpp @@ -1,5 +1,5 @@ -#include "SCIOP_Acceptor.h" -#include "SCIOP_Profile.h" +#include "tao/Strategies/SCIOP_Acceptor.h" +#include "tao/Strategies/SCIOP_Profile.h" #if TAO_HAS_SCIOP == 1 @@ -11,7 +11,7 @@ #include "tao/CDR.h" #if !defined(__ACE_INLINE__) -#include "SCIOP_Acceptor.i" +#include "tao/Strategies/SCIOP_Acceptor.i" #endif /* __ACE_INLINE__ */ ACE_RCSID(tao, diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.h b/TAO/tao/Strategies/SCIOP_Acceptor.h index 0d200b6dc80..f81492115c2 100644 --- a/TAO/tao/Strategies/SCIOP_Acceptor.h +++ b/TAO/tao/Strategies/SCIOP_Acceptor.h @@ -32,7 +32,7 @@ #include "ace/SOCK_SEQPACK_Acceptor.h" #include "tao/Transport_Acceptor.h" -#include "SCIOP_Connection_Handler.h" +#include "tao/Strategies/SCIOP_Connection_Handler.h" #include "tao/Acceptor_Impl.h" #include "tao/GIOP_Message_Version.h" @@ -225,7 +225,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined(__ACE_INLINE__) -#include "SCIOP_Acceptor.i" +#include "tao/Strategies/SCIOP_Acceptor.i" #endif /* __ACE_INLINE__ */ #endif /* TAO_HAS_SCIOP == 1 */ diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp index 9cc02861eb0..932a4e6b575 100644 --- a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp @@ -1,4 +1,4 @@ -#include "SCIOP_Connection_Handler.h" +#include "tao/Strategies/SCIOP_Connection_Handler.h" #if TAO_HAS_SCIOP == 1 @@ -19,8 +19,8 @@ #include "tao/ORB.h" #include "tao/CDR.h" #include "tao/Server_Strategy_Factory.h" -#include "SCIOP_Transport.h" -#include "SCIOP_Endpoint.h" +#include "tao/Strategies/SCIOP_Transport.h" +#include "tao/Strategies/SCIOP_Endpoint.h" #include "tao/Transport_Cache_Manager.h" #include "tao/Thread_Lane_Resources.h" #include "tao/Base_Transport_Property.h" diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.h b/TAO/tao/Strategies/SCIOP_Connection_Handler.h index 06480e03af1..9cfe605b80f 100644 --- a/TAO/tao/Strategies/SCIOP_Connection_Handler.h +++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.h @@ -29,7 +29,7 @@ #if TAO_HAS_SCIOP == 1 -#include "strategies_export.h" +#include "tao/Strategies/strategies_export.h" #include "tao/Connection_Handler.h" #include "tao/IIOPC.h" diff --git a/TAO/tao/Strategies/SCIOP_Connector.cpp b/TAO/tao/Strategies/SCIOP_Connector.cpp index a0bf8b5cdf0..663bccdb60a 100644 --- a/TAO/tao/Strategies/SCIOP_Connector.cpp +++ b/TAO/tao/Strategies/SCIOP_Connector.cpp @@ -1,5 +1,5 @@ -#include "SCIOP_Connector.h" -#include "SCIOP_Profile.h" +#include "tao/Strategies/SCIOP_Connector.h" +#include "tao/Strategies/SCIOP_Profile.h" #if TAO_HAS_SCIOP == 1 diff --git a/TAO/tao/Strategies/SCIOP_Connector.h b/TAO/tao/Strategies/SCIOP_Connector.h index 817fe65c0a8..8431309099a 100644 --- a/TAO/tao/Strategies/SCIOP_Connector.h +++ b/TAO/tao/Strategies/SCIOP_Connector.h @@ -33,7 +33,7 @@ #include "ace/Connector.h" #include "tao/Transport_Connector.h" #include "tao/Connector_Impl.h" -#include "SCIOP_Connection_Handler.h" +#include "tao/Strategies/SCIOP_Connection_Handler.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.cpp b/TAO/tao/Strategies/SCIOP_Endpoint.cpp index d36c0703657..136d8927ff2 100644 --- a/TAO/tao/Strategies/SCIOP_Endpoint.cpp +++ b/TAO/tao/Strategies/SCIOP_Endpoint.cpp @@ -1,4 +1,4 @@ -#include "SCIOP_Endpoint.h" +#include "tao/Strategies/SCIOP_Endpoint.h" #if TAO_HAS_SCIOP == 1 @@ -19,7 +19,7 @@ ACE_RCSID (Strategies, #if !defined (__ACE_INLINE__) -# include "SCIOP_Endpoint.i" +# include "tao/Strategies/SCIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.h b/TAO/tao/Strategies/SCIOP_Endpoint.h index d4f3e69acda..483d0206c36 100644 --- a/TAO/tao/Strategies/SCIOP_Endpoint.h +++ b/TAO/tao/Strategies/SCIOP_Endpoint.h @@ -29,7 +29,7 @@ #if TAO_HAS_SCIOP == 1 #include "tao/Endpoint.h" -#include "strategies_export.h" +#include "tao/Strategies/strategies_export.h" #include "tao/CORBA_String.h" #include "ace/INET_Addr.h" #include "tao/IIOP_EndpointsC.h" @@ -165,7 +165,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "SCIOP_Endpoint.i" +# include "tao/Strategies/SCIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ #endif /* TAO_HAS_SCIOP == 1 */ diff --git a/TAO/tao/Strategies/SCIOP_Factory.cpp b/TAO/tao/Strategies/SCIOP_Factory.cpp index 9f0ee8ef552..c6c0d3a271d 100644 --- a/TAO/tao/Strategies/SCIOP_Factory.cpp +++ b/TAO/tao/Strategies/SCIOP_Factory.cpp @@ -1,6 +1,6 @@ -#include "SCIOP_Factory.h" -#include "SCIOP_Acceptor.h" -#include "SCIOP_Connector.h" +#include "tao/Strategies/SCIOP_Factory.h" +#include "tao/Strategies/SCIOP_Acceptor.h" +#include "tao/Strategies/SCIOP_Connector.h" #include "ace/OS_NS_strings.h" #if TAO_HAS_SCIOP == 1 diff --git a/TAO/tao/Strategies/SCIOP_Factory.h b/TAO/tao/Strategies/SCIOP_Factory.h index 9e82e1282dc..a81198ab706 100644 --- a/TAO/tao/Strategies/SCIOP_Factory.h +++ b/TAO/tao/Strategies/SCIOP_Factory.h @@ -25,7 +25,7 @@ #if TAO_HAS_SCIOP == 1 -#include "strategies_export.h" +#include "tao/Strategies/strategies_export.h" #include "ace/Service_Config.h" #include "tao/Protocol_Factory.h" diff --git a/TAO/tao/Strategies/SCIOP_Lite_Factory.cpp b/TAO/tao/Strategies/SCIOP_Lite_Factory.cpp index 5219dc36246..e71cb4dd6ce 100644 --- a/TAO/tao/Strategies/SCIOP_Lite_Factory.cpp +++ b/TAO/tao/Strategies/SCIOP_Lite_Factory.cpp @@ -1,6 +1,6 @@ -#include "SCIOP_Lite_Factory.h" -#include "SCIOP_Acceptor.h" -#include "SCIOP_Connector.h" +#include "tao/Strategies/SCIOP_Lite_Factory.h" +#include "tao/Strategies/SCIOP_Acceptor.h" +#include "tao/Strategies/SCIOP_Connector.h" #include "ace/Dynamic_Service.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_strings.h" diff --git a/TAO/tao/Strategies/SCIOP_Lite_Factory.h b/TAO/tao/Strategies/SCIOP_Lite_Factory.h index bfb45d950cb..c4e05a13bb9 100644 --- a/TAO/tao/Strategies/SCIOP_Lite_Factory.h +++ b/TAO/tao/Strategies/SCIOP_Lite_Factory.h @@ -25,7 +25,7 @@ #if TAO_HAS_SCIOP == 1 -#include "strategies_export.h" +#include "tao/Strategies/strategies_export.h" #include "ace/Service_Config.h" #include "tao/Protocol_Factory.h" diff --git a/TAO/tao/Strategies/SCIOP_Profile.cpp b/TAO/tao/Strategies/SCIOP_Profile.cpp index 7b12fe57871..0a9b1da7693 100644 --- a/TAO/tao/Strategies/SCIOP_Profile.cpp +++ b/TAO/tao/Strategies/SCIOP_Profile.cpp @@ -1,7 +1,7 @@ // This may look like C, but it's really -*- C++ -*- // SCIOP_Profile.cpp -#include "SCIOP_Profile.h" +#include "tao/Strategies/SCIOP_Profile.h" #if TAO_HAS_SCIOP == 1 @@ -11,7 +11,7 @@ #include "tao/ORB_Core.h" #include "tao/debug.h" #include "tao/StringSeqC.h" -#include "sciop_endpointsC.h" +#include "tao/Strategies/sciop_endpointsC.h" ACE_RCSID(Strategies, SCIOP_Profile, diff --git a/TAO/tao/Strategies/SCIOP_Profile.h b/TAO/tao/Strategies/SCIOP_Profile.h index 688b3efb1ed..c2abcf93a1b 100644 --- a/TAO/tao/Strategies/SCIOP_Profile.h +++ b/TAO/tao/Strategies/SCIOP_Profile.h @@ -26,7 +26,7 @@ #if TAO_HAS_SCIOP == 1 -#include "SCIOP_Endpoint.h" +#include "tao/Strategies/SCIOP_Endpoint.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/SCIOP_Transport.cpp b/TAO/tao/Strategies/SCIOP_Transport.cpp index ae22a9f796c..72da213aa93 100644 --- a/TAO/tao/Strategies/SCIOP_Transport.cpp +++ b/TAO/tao/Strategies/SCIOP_Transport.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "SCIOP_Transport.h" +#include "tao/Strategies/SCIOP_Transport.h" #if TAO_HAS_SCIOP == 1 -#include "SCIOP_Connection_Handler.h" -#include "SCIOP_Acceptor.h" -#include "SCIOP_Profile.h" +#include "tao/Strategies/SCIOP_Connection_Handler.h" +#include "tao/Strategies/SCIOP_Acceptor.h" +#include "tao/Strategies/SCIOP_Profile.h" #include "tao/Acceptor_Registry.h" #include "tao/Thread_Lane_Resources.h" #include "tao/operation_details.h" diff --git a/TAO/tao/Strategies/SCIOP_Transport.h b/TAO/tao/Strategies/SCIOP_Transport.h index a794cccc5be..ad07a706b64 100644 --- a/TAO/tao/Strategies/SCIOP_Transport.h +++ b/TAO/tao/Strategies/SCIOP_Transport.h @@ -25,7 +25,7 @@ #if TAO_HAS_SCIOP == 1 -#include "strategies_export.h" +#include "tao/Strategies/strategies_export.h" #include "tao/IIOPC.h" #include "ace/SOCK_SEQPACK_Association.h" diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp index 78557535a7d..5de6670b1a1 100644 --- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "SHMIOP_Acceptor.h" +#include "tao/Strategies/SHMIOP_Acceptor.h" #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) -#include "SHMIOP_Profile.h" +#include "tao/Strategies/SHMIOP_Profile.h" #include "tao/MProfile.h" #include "tao/ORB_Core.h" #include "tao/Server_Strategy_Factory.h" diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.h b/TAO/tao/Strategies/SHMIOP_Acceptor.h index 8fc08931336..b1db53fd947 100644 --- a/TAO/tao/Strategies/SHMIOP_Acceptor.h +++ b/TAO/tao/Strategies/SHMIOP_Acceptor.h @@ -31,7 +31,7 @@ #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) #include "tao/Transport_Acceptor.h" -#include "SHMIOP_Connection_Handler.h" +#include "tao/Strategies/SHMIOP_Connection_Handler.h" #include "tao/Acceptor_Impl.h" #include "ace/Acceptor.h" #include "ace/MEM_Acceptor.h" diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp index 77fb0542194..788407dfd7d 100644 --- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "SHMIOP_Connection_Handler.h" +#include "tao/Strategies/SHMIOP_Connection_Handler.h" #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) @@ -13,7 +13,7 @@ #include "tao/Base_Transport_Property.h" #include "tao/Transport_Cache_Manager.h" #include "tao/Thread_Lane_Resources.h" -#include "SHMIOP_Endpoint.h" +#include "tao/Strategies/SHMIOP_Endpoint.h" #include "tao/Resume_Handle.h" #include "tao/Protocols_Hooks.h" diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h index 6f4001159b9..626c424920b 100644 --- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h +++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h @@ -28,7 +28,7 @@ #include "ace/Acceptor.h" #include "tao/Wait_Strategy.h" #include "tao/Connection_Handler.h" -#include "SHMIOP_Transport.h" +#include "tao/Strategies/SHMIOP_Transport.h" // **************************************************************** diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp index f9e1faef722..adba9338dc1 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "SHMIOP_Connector.h" +#include "tao/Strategies/SHMIOP_Connector.h" #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) -#include "SHMIOP_Profile.h" -#include "SHMIOP_Endpoint.h" +#include "tao/Strategies/SHMIOP_Profile.h" +#include "tao/Strategies/SHMIOP_Endpoint.h" #include "tao/debug.h" #include "tao/Base_Transport_Property.h" #include "tao/ORB_Core.h" diff --git a/TAO/tao/Strategies/SHMIOP_Connector.h b/TAO/tao/Strategies/SHMIOP_Connector.h index 0d958d83ea9..95c1ef4a2f7 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.h +++ b/TAO/tao/Strategies/SHMIOP_Connector.h @@ -30,7 +30,7 @@ #include "ace/MEM_Connector.h" #include "ace/Connector.h" #include "tao/Transport_Connector.h" -#include "SHMIOP_Connection_Handler.h" +#include "tao/Strategies/SHMIOP_Connection_Handler.h" #include "tao/Resource_Factory.h" #include "tao/Connector_Impl.h" diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.cpp b/TAO/tao/Strategies/SHMIOP_Endpoint.cpp index bea6b1bb00f..cf24fcd5fba 100644 --- a/TAO/tao/Strategies/SHMIOP_Endpoint.cpp +++ b/TAO/tao/Strategies/SHMIOP_Endpoint.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "SHMIOP_Endpoint.h" +#include "tao/Strategies/SHMIOP_Endpoint.h" #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) -#include "SHMIOP_Connection_Handler.h" +#include "tao/Strategies/SHMIOP_Connection_Handler.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" @@ -17,7 +17,7 @@ ACE_RCSID (Strategies, #if !defined (__ACE_INLINE__) -# include "SHMIOP_Endpoint.i" +# include "tao/Strategies/SHMIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ #include "ace/os_include/os_netdb.h" diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.h b/TAO/tao/Strategies/SHMIOP_Endpoint.h index a35aaf81e04..bd5b24ffb14 100644 --- a/TAO/tao/Strategies/SHMIOP_Endpoint.h +++ b/TAO/tao/Strategies/SHMIOP_Endpoint.h @@ -25,7 +25,7 @@ #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) #include "tao/CORBA_String.h" -#include "strategies_export.h" +#include "tao/Strategies/strategies_export.h" #include "ace/INET_Addr.h" #include "ace/MEM_Addr.h" @@ -139,7 +139,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "SHMIOP_Endpoint.i" +# include "tao/Strategies/SHMIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */ diff --git a/TAO/tao/Strategies/SHMIOP_Factory.cpp b/TAO/tao/Strategies/SHMIOP_Factory.cpp index 9237f0ef236..0b75ccda628 100644 --- a/TAO/tao/Strategies/SHMIOP_Factory.cpp +++ b/TAO/tao/Strategies/SHMIOP_Factory.cpp @@ -1,9 +1,9 @@ -#include "SHMIOP_Factory.h" +#include "tao/Strategies/SHMIOP_Factory.h" #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) -#include "SHMIOP_Acceptor.h" -#include "SHMIOP_Connector.h" +#include "tao/Strategies/SHMIOP_Acceptor.h" +#include "tao/Strategies/SHMIOP_Connector.h" #include "tao/ORB_Constants.h" diff --git a/TAO/tao/Strategies/SHMIOP_Factory.h b/TAO/tao/Strategies/SHMIOP_Factory.h index 4c577d34a0c..fff404e0d98 100644 --- a/TAO/tao/Strategies/SHMIOP_Factory.h +++ b/TAO/tao/Strategies/SHMIOP_Factory.h @@ -28,7 +28,7 @@ #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) #include "tao/Protocol_Factory.h" -#include "strategies_export.h" +#include "tao/Strategies/strategies_export.h" #include "ace/Service_Config.h" diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp index 32e4e4ea534..71a73c4dc7c 100644 --- a/TAO/tao/Strategies/SHMIOP_Profile.cpp +++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp @@ -1,4 +1,4 @@ -#include "SHMIOP_Profile.h" +#include "tao/Strategies/SHMIOP_Profile.h" #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) diff --git a/TAO/tao/Strategies/SHMIOP_Profile.h b/TAO/tao/Strategies/SHMIOP_Profile.h index bb3fed66847..f71d1546cb1 100644 --- a/TAO/tao/Strategies/SHMIOP_Profile.h +++ b/TAO/tao/Strategies/SHMIOP_Profile.h @@ -27,9 +27,9 @@ #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) -#include "strategies_export.h" +#include "tao/Strategies/strategies_export.h" #include "tao/Profile.h" -#include "SHMIOP_Endpoint.h" +#include "tao/Strategies/SHMIOP_Endpoint.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/SHMIOP_Transport.cpp b/TAO/tao/Strategies/SHMIOP_Transport.cpp index 8b714c06dc6..23e03b8e94b 100644 --- a/TAO/tao/Strategies/SHMIOP_Transport.cpp +++ b/TAO/tao/Strategies/SHMIOP_Transport.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "SHMIOP_Transport.h" +#include "tao/Strategies/SHMIOP_Transport.h" #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) -#include "SHMIOP_Connection_Handler.h" -#include "SHMIOP_Profile.h" +#include "tao/Strategies/SHMIOP_Connection_Handler.h" +#include "tao/Strategies/SHMIOP_Profile.h" #include "tao/Timeprobe.h" #include "tao/CDR.h" #include "tao/Transport_Mux_Strategy.h" diff --git a/TAO/tao/Strategies/SHMIOP_Transport.h b/TAO/tao/Strategies/SHMIOP_Transport.h index 3ee952b329e..6c90b821c4e 100644 --- a/TAO/tao/Strategies/SHMIOP_Transport.h +++ b/TAO/tao/Strategies/SHMIOP_Transport.h @@ -24,7 +24,7 @@ #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0) -#include "strategies_export.h" +#include "tao/Strategies/strategies_export.h" #include "ace/Svc_Handler.h" #include "ace/MEM_Stream.h" #include "tao/Transport.h" diff --git a/TAO/tao/Strategies/UIOP_Acceptor.cpp b/TAO/tao/Strategies/UIOP_Acceptor.cpp index 81304e7301a..87917221593 100644 --- a/TAO/tao/Strategies/UIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/UIOP_Acceptor.cpp @@ -1,8 +1,8 @@ -#include "UIOP_Acceptor.h" +#include "tao/Strategies/UIOP_Acceptor.h" #if TAO_HAS_UIOP == 1 -#include "UIOP_Profile.h" +#include "tao/Strategies/UIOP_Profile.h" #include "tao/MProfile.h" #include "tao/ORB_Core.h" #include "tao/Server_Strategy_Factory.h" diff --git a/TAO/tao/Strategies/UIOP_Acceptor.h b/TAO/tao/Strategies/UIOP_Acceptor.h index 7ce65dbf5b4..20de4591230 100644 --- a/TAO/tao/Strategies/UIOP_Acceptor.h +++ b/TAO/tao/Strategies/UIOP_Acceptor.h @@ -25,7 +25,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ # if TAO_HAS_UIOP == 1 -#include "UIOP_Connection_Handler.h" +#include "tao/Strategies/UIOP_Connection_Handler.h" #include "tao/Transport_Acceptor.h" #include "tao/Acceptor_Impl.h" diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp index f6997db70cf..ada81ab9075 100644 --- a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "UIOP_Connection_Handler.h" +#include "tao/Strategies/UIOP_Connection_Handler.h" #if TAO_HAS_UIOP == 1 -#include "UIOP_Transport.h" -#include "UIOP_Endpoint.h" +#include "tao/Strategies/UIOP_Transport.h" +#include "tao/Strategies/UIOP_Endpoint.h" #include "tao/debug.h" #include "tao/ORB_Core.h" #include "tao/ORB.h" diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.h b/TAO/tao/Strategies/UIOP_Connection_Handler.h index 881612ef782..c2e0078cd00 100644 --- a/TAO/tao/Strategies/UIOP_Connection_Handler.h +++ b/TAO/tao/Strategies/UIOP_Connection_Handler.h @@ -32,7 +32,7 @@ #include "ace/Reactor.h" #include "tao/Connection_Handler.h" #include "tao/Wait_Strategy.h" -#include "UIOP_Transport.h" +#include "tao/Strategies/UIOP_Transport.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp index ca01621b774..efce00f17d2 100644 --- a/TAO/tao/Strategies/UIOP_Connector.cpp +++ b/TAO/tao/Strategies/UIOP_Connector.cpp @@ -1,8 +1,8 @@ -#include "UIOP_Connector.h" +#include "tao/Strategies/UIOP_Connector.h" #if TAO_HAS_UIOP == 1 -#include "UIOP_Profile.h" +#include "tao/Strategies/UIOP_Profile.h" #include "tao/debug.h" #include "tao/ORB_Core.h" #include "tao/Environment.h" diff --git a/TAO/tao/Strategies/UIOP_Connector.h b/TAO/tao/Strategies/UIOP_Connector.h index 327537ec5d2..1898316e91a 100644 --- a/TAO/tao/Strategies/UIOP_Connector.h +++ b/TAO/tao/Strategies/UIOP_Connector.h @@ -31,7 +31,7 @@ #include "ace/LSOCK_Connector.h" #include "ace/Connector.h" #include "tao/Transport_Connector.h" -#include "UIOP_Connection_Handler.h" +#include "tao/Strategies/UIOP_Connection_Handler.h" #include "tao/Resource_Factory.h" #include "tao/Connector_Impl.h" diff --git a/TAO/tao/Strategies/UIOP_Endpoint.cpp b/TAO/tao/Strategies/UIOP_Endpoint.cpp index 5eca79cdf3c..f0ff4199582 100644 --- a/TAO/tao/Strategies/UIOP_Endpoint.cpp +++ b/TAO/tao/Strategies/UIOP_Endpoint.cpp @@ -1,5 +1,5 @@ -#include "UIOP_Endpoint.h" -#include "UIOP_Connection_Handler.h" +#include "tao/Strategies/UIOP_Endpoint.h" +#include "tao/Strategies/UIOP_Connection_Handler.h" #include "tao/ORB_Constants.h" @@ -15,7 +15,7 @@ ACE_RCSID (Strategies, #if !defined (__ACE_INLINE__) -# include "UIOP_Endpoint.i" +# include "tao/Strategies/UIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/UIOP_Endpoint.h b/TAO/tao/Strategies/UIOP_Endpoint.h index c515f11885a..dfff6c2a1f2 100644 --- a/TAO/tao/Strategies/UIOP_Endpoint.h +++ b/TAO/tao/Strategies/UIOP_Endpoint.h @@ -24,7 +24,7 @@ # if TAO_HAS_UIOP == 1 -#include "strategies_export.h" +#include "tao/Strategies/strategies_export.h" #include "ace/UNIX_Addr.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -95,7 +95,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "UIOP_Endpoint.i" +# include "tao/Strategies/UIOP_Endpoint.i" #endif /* __ACE_INLINE__ */ # endif /* TAO_HAS_UIOP == 1 */ diff --git a/TAO/tao/Strategies/UIOP_Factory.cpp b/TAO/tao/Strategies/UIOP_Factory.cpp index f96cbbc97df..b74a464f82c 100644 --- a/TAO/tao/Strategies/UIOP_Factory.cpp +++ b/TAO/tao/Strategies/UIOP_Factory.cpp @@ -1,12 +1,12 @@ // -*- C++ -*- // $Id$ -#include "UIOP_Factory.h" +#include "tao/Strategies/UIOP_Factory.h" #if TAO_HAS_UIOP == 1 -#include "UIOP_Acceptor.h" -#include "UIOP_Connector.h" +#include "tao/Strategies/UIOP_Acceptor.h" +#include "tao/Strategies/UIOP_Connector.h" #include "tao/ORB_Constants.h" diff --git a/TAO/tao/Strategies/UIOP_Factory.h b/TAO/tao/Strategies/UIOP_Factory.h index 17dbb32fe44..d3ec7616987 100644 --- a/TAO/tao/Strategies/UIOP_Factory.h +++ b/TAO/tao/Strategies/UIOP_Factory.h @@ -29,7 +29,7 @@ # if TAO_HAS_UIOP == 1 #include "tao/Protocol_Factory.h" -#include "strategies_export.h" +#include "tao/Strategies/strategies_export.h" #include "ace/Service_Config.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/UIOP_Lite_Factory.cpp b/TAO/tao/Strategies/UIOP_Lite_Factory.cpp index 4fd189274cf..8aa707a3472 100644 --- a/TAO/tao/Strategies/UIOP_Lite_Factory.cpp +++ b/TAO/tao/Strategies/UIOP_Lite_Factory.cpp @@ -1,9 +1,9 @@ -#include "UIOP_Lite_Factory.h" +#include "tao/Strategies/UIOP_Lite_Factory.h" #if TAO_HAS_UIOP == 1 -#include "UIOP_Acceptor.h" -#include "UIOP_Connector.h" +#include "tao/Strategies/UIOP_Acceptor.h" +#include "tao/Strategies/UIOP_Connector.h" #include "tao/ORB_Constants.h" diff --git a/TAO/tao/Strategies/UIOP_Lite_Factory.h b/TAO/tao/Strategies/UIOP_Lite_Factory.h index 72de6079253..9199095b1cc 100644 --- a/TAO/tao/Strategies/UIOP_Lite_Factory.h +++ b/TAO/tao/Strategies/UIOP_Lite_Factory.h @@ -29,7 +29,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Service_Config.h" -#include "strategies_export.h" +#include "tao/Strategies/strategies_export.h" #include "tao/Protocol_Factory.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/UIOP_Profile.cpp b/TAO/tao/Strategies/UIOP_Profile.cpp index 15b4219ac17..853bfc83d9e 100644 --- a/TAO/tao/Strategies/UIOP_Profile.cpp +++ b/TAO/tao/Strategies/UIOP_Profile.cpp @@ -1,8 +1,8 @@ -#include "UIOP_Profile.h" +#include "tao/Strategies/UIOP_Profile.h" #if TAO_HAS_UIOP == 1 -#include "uiop_endpointsC.h" +#include "tao/Strategies/uiop_endpointsC.h" #include "tao/CDR.h" #include "tao/Environment.h" diff --git a/TAO/tao/Strategies/UIOP_Profile.h b/TAO/tao/Strategies/UIOP_Profile.h index dd01aff2397..fe515c4d388 100644 --- a/TAO/tao/Strategies/UIOP_Profile.h +++ b/TAO/tao/Strategies/UIOP_Profile.h @@ -27,10 +27,10 @@ # if TAO_HAS_UIOP == 1 -#include "strategies_export.h" +#include "tao/Strategies/strategies_export.h" #include "tao/Profile.h" -#include "UIOP_Connection_Handler.h" -#include "UIOP_Endpoint.h" +#include "tao/Strategies/UIOP_Connection_Handler.h" +#include "tao/Strategies/UIOP_Endpoint.h" #include "ace/UNIX_Addr.h" diff --git a/TAO/tao/Strategies/UIOP_Transport.cpp b/TAO/tao/Strategies/UIOP_Transport.cpp index f8e80a52a24..4adc371f55a 100644 --- a/TAO/tao/Strategies/UIOP_Transport.cpp +++ b/TAO/tao/Strategies/UIOP_Transport.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "UIOP_Transport.h" +#include "tao/Strategies/UIOP_Transport.h" #if TAO_HAS_UIOP == 1 -#include "UIOP_Connection_Handler.h" -#include "UIOP_Profile.h" +#include "tao/Strategies/UIOP_Connection_Handler.h" +#include "tao/Strategies/UIOP_Profile.h" #include "tao/Timeprobe.h" #include "tao/CDR.h" #include "tao/Transport_Mux_Strategy.h" diff --git a/TAO/tao/Strategies/UIOP_Transport.h b/TAO/tao/Strategies/UIOP_Transport.h index 8e81650ece2..1a7599f45fb 100644 --- a/TAO/tao/Strategies/UIOP_Transport.h +++ b/TAO/tao/Strategies/UIOP_Transport.h @@ -25,7 +25,7 @@ # if TAO_HAS_UIOP == 1 -#include "strategies_export.h" +#include "tao/Strategies/strategies_export.h" #include "ace/LSOCK_Acceptor.h" #include "ace/Svc_Handler.h" #include "tao/Transport.h" diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp index f1341d56135..fb44555a925 100644 --- a/TAO/tao/Strategies/advanced_resource.cpp +++ b/TAO/tao/Strategies/advanced_resource.cpp @@ -1,17 +1,17 @@ // $Id$ #include "ace/Service_Config.h" -#include "advanced_resource.h" +#include "tao/Strategies/advanced_resource.h" -#include "UIOP_Factory.h" -#include "SHMIOP_Factory.h" -#include "DIOP_Factory.h" -#include "SCIOP_Factory.h" +#include "tao/Strategies/UIOP_Factory.h" +#include "tao/Strategies/SHMIOP_Factory.h" +#include "tao/Strategies/DIOP_Factory.h" +#include "tao/Strategies/SCIOP_Factory.h" -#include "LFU_Connection_Purging_Strategy.h" -#include "FIFO_Connection_Purging_Strategy.h" -#include "NULL_Connection_Purging_Strategy.h" +#include "tao/Strategies/LFU_Connection_Purging_Strategy.h" +#include "tao/Strategies/FIFO_Connection_Purging_Strategy.h" +#include "tao/Strategies/NULL_Connection_Purging_Strategy.h" -#include "LF_Strategy_Null.h" +#include "tao/Strategies/LF_Strategy_Null.h" #include "tao/debug.h" #include "tao/LRU_Connection_Purging_Strategy.h" diff --git a/TAO/tao/Strategies/advanced_resource.h b/TAO/tao/Strategies/advanced_resource.h index 12b1ce6a5e4..98dde1143d3 100644 --- a/TAO/tao/Strategies/advanced_resource.h +++ b/TAO/tao/Strategies/advanced_resource.h @@ -4,7 +4,7 @@ #define TAO_ADVANCED_RESOURCE_H #include /**/ "ace/pre.h" -#include "strategies_export.h" +#include "tao/Strategies/strategies_export.h" #include "tao/default_resource.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/tao/Strategies/sciop_endpointsC.cpp b/TAO/tao/Strategies/sciop_endpointsC.cpp index 052868ee02b..7b5dbd4fd68 100644 --- a/TAO/tao/Strategies/sciop_endpointsC.cpp +++ b/TAO/tao/Strategies/sciop_endpointsC.cpp @@ -36,7 +36,7 @@ #include "tao/AnyTypeCode/String_TypeCode_Static.h" #include "tao/AnyTypeCode/Struct_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Struct_Field.h" -#include "sciop_endpointsC.h" +#include "tao/Strategies/sciop_endpointsC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) diff --git a/TAO/tao/Strategies/sciop_endpointsC.h b/TAO/tao/Strategies/sciop_endpointsC.h index fa4fd4c9cc2..4944c7276c0 100644 --- a/TAO/tao/Strategies/sciop_endpointsC.h +++ b/TAO/tao/Strategies/sciop_endpointsC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "strategies_export.h" +#include "tao/Strategies/strategies_export.h" #include "tao/ORB.h" #include "tao/Environment.h" #include "tao/Sequence_T.h" diff --git a/TAO/tao/Strategies/uiop_endpointsC.cpp b/TAO/tao/Strategies/uiop_endpointsC.cpp index 8995489bae7..a9b2ed7f462 100644 --- a/TAO/tao/Strategies/uiop_endpointsC.cpp +++ b/TAO/tao/Strategies/uiop_endpointsC.cpp @@ -36,7 +36,7 @@ #include "tao/AnyTypeCode/String_TypeCode_Static.h" #include "tao/AnyTypeCode/Struct_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Struct_Field.h" -#include "uiop_endpointsC.h" +#include "tao/Strategies/uiop_endpointsC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) diff --git a/TAO/tao/Strategies/uiop_endpointsC.h b/TAO/tao/Strategies/uiop_endpointsC.h index 95307d2dd32..1907a64939b 100644 --- a/TAO/tao/Strategies/uiop_endpointsC.h +++ b/TAO/tao/Strategies/uiop_endpointsC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "strategies_export.h" +#include "tao/Strategies/strategies_export.h" #include "tao/ORB.h" #include "tao/Environment.h" #include "tao/Sequence_T.h" diff --git a/TAO/tao/StringSeqC.cpp b/TAO/tao/StringSeqC.cpp index 4bbe9b5461d..426787893e4 100644 --- a/TAO/tao/StringSeqC.cpp +++ b/TAO/tao/StringSeqC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "StringSeqC.h" +#include "tao/StringSeqC.h" #include "tao/CDR.h" // TAO_IDL - Generated from diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp index 0f5d4bbbcd5..3543c63c4bb 100644 --- a/TAO/tao/Stub.cpp +++ b/TAO/tao/Stub.cpp @@ -8,18 +8,18 @@ // based implementation, and can neither be used by other kinds of // objref nor have a default implementation. -#include "Stub.h" -#include "Profile.h" -#include "ORB_Core.h" -#include "Client_Strategy_Factory.h" -#include "Remote_Object_Proxy_Broker.h" -#include "Transport_Queueing_Strategies.h" -#include "debug.h" -#include "Policy_Manager.h" -#include "SystemException.h" +#include "tao/Stub.h" +#include "tao/Profile.h" +#include "tao/ORB_Core.h" +#include "tao/Client_Strategy_Factory.h" +#include "tao/Remote_Object_Proxy_Broker.h" +#include "tao/Transport_Queueing_Strategies.h" +#include "tao/debug.h" +#include "tao/Policy_Manager.h" +#include "tao/SystemException.h" #if !defined (__ACE_INLINE__) -# include "Stub.i" +# include "tao/Stub.i" #endif /* ! __ACE_INLINE__ */ #include "ace/Auto_Ptr.h" diff --git a/TAO/tao/Stub_Factory.cpp b/TAO/tao/Stub_Factory.cpp index b49d7ccdbd2..4c76edc15c9 100644 --- a/TAO/tao/Stub_Factory.cpp +++ b/TAO/tao/Stub_Factory.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Stub_Factory.h" +#include "tao/Stub_Factory.h" ACE_RCSID (tao, TAO_Stub_Factory, diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp index 32a0a3f11a2..aa895fb16f6 100644 --- a/TAO/tao/Synch_Invocation.cpp +++ b/TAO/tao/Synch_Invocation.cpp @@ -1,22 +1,22 @@ // $Id$ -#include "Synch_Invocation.h" -#include "Profile_Transport_Resolver.h" -#include "Profile.h" -#include "Synch_Reply_Dispatcher.h" -#include "Transport.h" -#include "Stub.h" -#include "Bind_Dispatcher_Guard.h" -#include "operation_details.h" -#include "Wait_Strategy.h" -#include "debug.h" -#include "ORB_Constants.h" -#include "Messaging_SyncScopeC.h" -#include "ORB_Core.h" -#include "Service_Context.h" +#include "tao/Synch_Invocation.h" +#include "tao/Profile_Transport_Resolver.h" +#include "tao/Profile.h" +#include "tao/Synch_Reply_Dispatcher.h" +#include "tao/Transport.h" +#include "tao/Stub.h" +#include "tao/Bind_Dispatcher_Guard.h" +#include "tao/operation_details.h" +#include "tao/Wait_Strategy.h" +#include "tao/debug.h" +#include "tao/ORB_Constants.h" +#include "tao/Messaging_SyncScopeC.h" +#include "tao/ORB_Core.h" +#include "tao/Service_Context.h" #if TAO_HAS_INTERCEPTORS == 1 -# include "PortableInterceptorC.h" +# include "tao/PortableInterceptorC.h" #endif /*TAO_HAS_INTERCEPTORS */ #include "ace/Auto_Ptr.h" @@ -24,7 +24,7 @@ #include "ace/Countdown_Time.h" #if !defined (__ACE_INLINE__) -# include "Synch_Invocation.inl" +# include "tao/Synch_Invocation.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Synch_Queued_Message.cpp b/TAO/tao/Synch_Queued_Message.cpp index cce9c918c70..bcafd9afefc 100644 --- a/TAO/tao/Synch_Queued_Message.cpp +++ b/TAO/tao/Synch_Queued_Message.cpp @@ -1,8 +1,8 @@ // "$Id$" -#include "Synch_Queued_Message.h" -#include "debug.h" -#include "ORB_Core.h" +#include "tao/Synch_Queued_Message.h" +#include "tao/debug.h" +#include "tao/ORB_Core.h" #include "ace/Malloc_T.h" #include "ace/Message_Block.h" diff --git a/TAO/tao/Synch_Queued_Message.h b/TAO/tao/Synch_Queued_Message.h index c04e0a8832d..09b96f3b6ba 100644 --- a/TAO/tao/Synch_Queued_Message.h +++ b/TAO/tao/Synch_Queued_Message.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "Queued_Message.h" +#include "tao/Queued_Message.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/Synch_Reply_Dispatcher.cpp b/TAO/tao/Synch_Reply_Dispatcher.cpp index c9b5e9d93e3..d8f7fd8df1e 100644 --- a/TAO/tao/Synch_Reply_Dispatcher.cpp +++ b/TAO/tao/Synch_Reply_Dispatcher.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "Synch_Reply_Dispatcher.h" -#include "ORB_Core.h" -#include "Pluggable_Messaging_Utils.h" -#include "debug.h" +#include "tao/Synch_Reply_Dispatcher.h" +#include "tao/ORB_Core.h" +#include "tao/Pluggable_Messaging_Utils.h" +#include "tao/debug.h" ACE_RCSID (tao, diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp index a7c00f6afe9..35a47758128 100644 --- a/TAO/tao/SystemException.cpp +++ b/TAO/tao/SystemException.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "SystemException.h" -#include "Environment.h" -#include "ORB_Constants.h" -#include "CORBA_String.h" -#include "CDR.h" -#include "debug.h" -#include "AnyTypeCode_Adapter.h" +#include "tao/SystemException.h" +#include "tao/Environment.h" +#include "tao/ORB_Constants.h" +#include "tao/CORBA_String.h" +#include "tao/CDR.h" +#include "tao/debug.h" +#include "tao/AnyTypeCode_Adapter.h" #include "ace/Malloc.h" #include "ace/SString.h" diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp index 8016d25b4fd..11c30f3c6be 100644 --- a/TAO/tao/TAOC.cpp +++ b/TAO/tao/TAOC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "TAOC.h" +#include "tao/TAOC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp index f7be84ace4a..bef50c3cf33 100644 --- a/TAO/tao/TAO_Internal.cpp +++ b/TAO/tao/TAO_Internal.cpp @@ -1,24 +1,24 @@ // $Id$ -#include "TAO_Internal.h" -#include "default_server.h" -#include "default_client.h" -#include "default_resource.h" -#include "IIOP_Factory.h" -#include "MCAST_Parser.h" -#include "CORBANAME_Parser.h" -#include "CORBALOC_Parser.h" -#include "FILE_Parser.h" -#include "DLL_Parser.h" -#include "ORB_Core.h" -#include "Adapter_Factory.h" -#include "Default_Stub_Factory.h" -#include "Default_Endpoint_Selector_Factory.h" -#include "Default_Protocols_Hooks.h" -#include "Default_Thread_Lane_Resources_Manager.h" -#include "Default_Collocation_Resolver.h" -#include "debug.h" -#include "StringSeqC.h" +#include "tao/TAO_Internal.h" +#include "tao/default_server.h" +#include "tao/default_client.h" +#include "tao/default_resource.h" +#include "tao/IIOP_Factory.h" +#include "tao/MCAST_Parser.h" +#include "tao/CORBANAME_Parser.h" +#include "tao/CORBALOC_Parser.h" +#include "tao/FILE_Parser.h" +#include "tao/DLL_Parser.h" +#include "tao/ORB_Core.h" +#include "tao/Adapter_Factory.h" +#include "tao/Default_Stub_Factory.h" +#include "tao/Default_Endpoint_Selector_Factory.h" +#include "tao/Default_Protocols_Hooks.h" +#include "tao/Default_Thread_Lane_Resources_Manager.h" +#include "tao/Default_Collocation_Resolver.h" +#include "tao/debug.h" +#include "tao/StringSeqC.h" #include "ace/Dynamic_Service.h" #include "ace/Arg_Shifter.h" diff --git a/TAO/tao/TAO_Server_Request.cpp b/TAO/tao/TAO_Server_Request.cpp index 920f554db57..528c402b311 100644 --- a/TAO/tao/TAO_Server_Request.cpp +++ b/TAO/tao/TAO_Server_Request.cpp @@ -1,24 +1,24 @@ // $Id$ -#include "TAO_Server_Request.h" -#include "ORB_Core.h" -#include "Timeprobe.h" -#include "debug.h" -#include "Pluggable_Messaging.h" -#include "GIOP_Utils.h" -#include "Stub.h" -#include "operation_details.h" -#include "Transport.h" -#include "CDR.h" -#include "SystemException.h" +#include "tao/TAO_Server_Request.h" +#include "tao/ORB_Core.h" +#include "tao/Timeprobe.h" +#include "tao/debug.h" +#include "tao/Pluggable_Messaging.h" +#include "tao/GIOP_Utils.h" +#include "tao/Stub.h" +#include "tao/operation_details.h" +#include "tao/Transport.h" +#include "tao/CDR.h" +#include "tao/SystemException.h" #if TAO_HAS_INTERCEPTORS == 1 -#include "PortableInterceptorC.h" -#include "ServerRequestInterceptor_Adapter.h" +#include "tao/PortableInterceptorC.h" +#include "tao/ServerRequestInterceptor_Adapter.h" #endif #if !defined (__ACE_INLINE__) -# include "TAO_Server_Request.i" +# include "tao/TAO_Server_Request.i" #endif /* ! __ACE_INLINE__ */ ACE_RCSID (tao, diff --git a/TAO/tao/TAO_Server_Request.h b/TAO/tao/TAO_Server_Request.h index 7c410acc66e..c6724852e1b 100644 --- a/TAO/tao/TAO_Server_Request.h +++ b/TAO/tao/TAO_Server_Request.h @@ -42,7 +42,7 @@ namespace TAO } TAO_END_VERSIONED_NAMESPACE_DECL -#include "PortableInterceptorC.h" +#include "tao/PortableInterceptorC.h" #endif /* TAO_HAS_INTERCEPTORS == 1 */ @@ -378,7 +378,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "TAO_Server_Request.i" +# include "tao/TAO_Server_Request.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/TSS_Resources.cpp b/TAO/tao/TSS_Resources.cpp index 8b243ca7878..73ec7175070 100644 --- a/TAO/tao/TSS_Resources.cpp +++ b/TAO/tao/TSS_Resources.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "TSS_Resources.h" -#include "GUIResource_Factory.h" -#include "TAO_Singleton.h" +#include "tao/TSS_Resources.h" +#include "tao/GUIResource_Factory.h" +#include "tao/TAO_Singleton.h" ACE_RCSID (tao, TSS_Resources, diff --git a/TAO/tao/Thread_Lane_Resources.h b/TAO/tao/Thread_Lane_Resources.h index 5d337b1f67e..07ec9a50edc 100644 --- a/TAO/tao/Thread_Lane_Resources.h +++ b/TAO/tao/Thread_Lane_Resources.h @@ -24,7 +24,7 @@ #include "tao/TAO_Export.h" #include "tao/orbconf.h" -#include "params.h" +#include "tao/params.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Allocator; diff --git a/TAO/tao/Thread_Per_Connection_Handler.cpp b/TAO/tao/Thread_Per_Connection_Handler.cpp index 8ec54b4d5ef..9cf61f3bfc2 100644 --- a/TAO/tao/Thread_Per_Connection_Handler.cpp +++ b/TAO/tao/Thread_Per_Connection_Handler.cpp @@ -1,9 +1,9 @@ //$Id$ -#include "Thread_Per_Connection_Handler.h" -#include "Connection_Handler.h" -#include "debug.h" -#include "Transport.h" -#include "ORB_Core.h" +#include "tao/Thread_Per_Connection_Handler.h" +#include "tao/Connection_Handler.h" +#include "tao/debug.h" +#include "tao/Transport.h" +#include "tao/ORB_Core.h" #include "ace/Flag_Manip.h" ACE_RCSID (tao, diff --git a/TAO/tao/TimeBaseC.cpp b/TAO/tao/TimeBaseC.cpp index b7597eecac3..650026e6abb 100644 --- a/TAO/tao/TimeBaseC.cpp +++ b/TAO/tao/TimeBaseC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "TimeBaseC.h" +#include "tao/TimeBaseC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) diff --git a/TAO/tao/TkResource_Loader.cpp b/TAO/tao/TkResource_Loader.cpp index 9aec129aad4..e8885850e0d 100644 --- a/TAO/tao/TkResource_Loader.cpp +++ b/TAO/tao/TkResource_Loader.cpp @@ -1,7 +1,7 @@ //$Id$ -#include "TkResource_Loader.h" -#include "ORB_Core.h" -#include "TkResource_Factory.h" +#include "tao/TkResource_Loader.h" +#include "tao/ORB_Core.h" +#include "tao/TkResource_Factory.h" ACE_RCSID( TAO_TkResource, TkResource_Loader, diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp index b25305068a4..594e6120e9e 100644 --- a/TAO/tao/Transport.cpp +++ b/TAO/tao/Transport.cpp @@ -1,26 +1,26 @@ // $Id$ -#include "Transport.h" - -#include "LF_Follower.h" -#include "Leader_Follower.h" -#include "Client_Strategy_Factory.h" -#include "Wait_Strategy.h" -#include "Transport_Mux_Strategy.h" -#include "Stub.h" -#include "Transport_Queueing_Strategies.h" -#include "Connection_Handler.h" -#include "Pluggable_Messaging.h" -#include "Synch_Queued_Message.h" -#include "Asynch_Queued_Message.h" -#include "Flushing_Strategy.h" -#include "Thread_Lane_Resources.h" -#include "Resume_Handle.h" -#include "Codeset_Manager.h" -#include "Codeset_Translator_Base.h" -#include "debug.h" -#include "CDR.h" -#include "ORB_Core.h" +#include "tao/Transport.h" + +#include "tao/LF_Follower.h" +#include "tao/Leader_Follower.h" +#include "tao/Client_Strategy_Factory.h" +#include "tao/Wait_Strategy.h" +#include "tao/Transport_Mux_Strategy.h" +#include "tao/Stub.h" +#include "tao/Transport_Queueing_Strategies.h" +#include "tao/Connection_Handler.h" +#include "tao/Pluggable_Messaging.h" +#include "tao/Synch_Queued_Message.h" +#include "tao/Asynch_Queued_Message.h" +#include "tao/Flushing_Strategy.h" +#include "tao/Thread_Lane_Resources.h" +#include "tao/Resume_Handle.h" +#include "tao/Codeset_Manager.h" +#include "tao/Codeset_Translator_Base.h" +#include "tao/debug.h" +#include "tao/CDR.h" +#include "tao/ORB_Core.h" #include "ace/OS_NS_sys_time.h" #include "ace/OS_NS_stdio.h" @@ -34,7 +34,7 @@ //@@ TAO_TRANSPORT_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK #if !defined (__ACE_INLINE__) -# include "Transport.inl" +# include "tao/Transport.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h index 90fc862dc7b..b37fd063b36 100644 --- a/TAO/tao/Transport.h +++ b/TAO/tao/Transport.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "Transport_Cache_Manager.h" +#include "tao/Transport_Cache_Manager.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -1044,7 +1044,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "Transport.inl" +# include "tao/Transport.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Transport_Acceptor.cpp b/TAO/tao/Transport_Acceptor.cpp index 3671852f8b4..5fd09d0c402 100644 --- a/TAO/tao/Transport_Acceptor.cpp +++ b/TAO/tao/Transport_Acceptor.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "Transport_Acceptor.h" +#include "tao/Transport_Acceptor.h" #if !defined (__ACE_INLINE__) -# include "Transport_Acceptor.inl" +# include "tao/Transport_Acceptor.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (tao, diff --git a/TAO/tao/Transport_Acceptor.h b/TAO/tao/Transport_Acceptor.h index 53900953f54..f49ac1b4190 100644 --- a/TAO/tao/Transport_Acceptor.h +++ b/TAO/tao/Transport_Acceptor.h @@ -158,7 +158,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "Transport_Acceptor.inl" +# include "tao/Transport_Acceptor.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Transport_Cache_Manager.cpp b/TAO/tao/Transport_Cache_Manager.cpp index cb8d3b02434..67f196cbc05 100644 --- a/TAO/tao/Transport_Cache_Manager.cpp +++ b/TAO/tao/Transport_Cache_Manager.cpp @@ -1,12 +1,12 @@ //$Id$ -#include "Transport_Cache_Manager.h" -#include "Transport.h" -#include "debug.h" -#include "ORB_Core.h" -#include "Connection_Purging_Strategy.h" -#include "Client_Strategy_Factory.h" -#include "Condition.h" -#include "Wait_Strategy.h" +#include "tao/Transport_Cache_Manager.h" +#include "tao/Transport.h" +#include "tao/debug.h" +#include "tao/ORB_Core.h" +#include "tao/Connection_Purging_Strategy.h" +#include "tao/Client_Strategy_Factory.h" +#include "tao/Condition.h" +#include "tao/Wait_Strategy.h" #include "ace/ACE.h" #include "ace/Reactor.h" diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp index 48d68507549..844e29defa6 100644 --- a/TAO/tao/Transport_Connector.cpp +++ b/TAO/tao/Transport_Connector.cpp @@ -1,24 +1,24 @@ -#include "Transport_Connector.h" -#include "Transport.h" -#include "ORB_Core.h" -#include "MProfile.h" -#include "Profile.h" -#include "Environment.h" -#include "Thread_Lane_Resources.h" -#include "debug.h" -#include "Connect_Strategy.h" -#include "Client_Strategy_Factory.h" -#include "Connection_Handler.h" -#include "Profile_Transport_Resolver.h" -#include "Wait_Strategy.h" -#include "SystemException.h" +#include "tao/Transport_Connector.h" +#include "tao/Transport.h" +#include "tao/ORB_Core.h" +#include "tao/MProfile.h" +#include "tao/Profile.h" +#include "tao/Environment.h" +#include "tao/Thread_Lane_Resources.h" +#include "tao/debug.h" +#include "tao/Connect_Strategy.h" +#include "tao/Client_Strategy_Factory.h" +#include "tao/Connection_Handler.h" +#include "tao/Profile_Transport_Resolver.h" +#include "tao/Wait_Strategy.h" +#include "tao/SystemException.h" #include "ace/OS_NS_string.h" //@@ TAO_CONNECTOR_SPL_INCLUDE_ADD_HOOK #if !defined (__ACE_INLINE__) -# include "Transport_Connector.inl" +# include "tao/Transport_Connector.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (tao, diff --git a/TAO/tao/Transport_Connector.h b/TAO/tao/Transport_Connector.h index cddffaa5a49..e29d0b251b3 100644 --- a/TAO/tao/Transport_Connector.h +++ b/TAO/tao/Transport_Connector.h @@ -23,8 +23,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "TAO_Export.h" -#include "Basic_Types.h" +#include "tao/TAO_Export.h" +#include "tao/Basic_Types.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Time_Value; @@ -205,7 +205,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "Transport_Connector.inl" +# include "tao/Transport_Connector.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Transport_Queueing_Strategies.cpp b/TAO/tao/Transport_Queueing_Strategies.cpp index 36405c87aef..4de33f760dd 100644 --- a/TAO/tao/Transport_Queueing_Strategies.cpp +++ b/TAO/tao/Transport_Queueing_Strategies.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "Transport_Queueing_Strategies.h" -#include "Buffering_Constraint_Policy.h" -#include "Stub.h" -#include "debug.h" +#include "tao/Transport_Queueing_Strategies.h" +#include "tao/Buffering_Constraint_Policy.h" +#include "tao/Stub.h" +#include "tao/debug.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_sys_time.h" diff --git a/TAO/tao/Transport_Timer.cpp b/TAO/tao/Transport_Timer.cpp index 210417b250f..6a704fbd72f 100644 --- a/TAO/tao/Transport_Timer.cpp +++ b/TAO/tao/Transport_Timer.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "Transport_Timer.h" -#include "Transport.h" +#include "tao/Transport_Timer.h" +#include "tao/Transport.h" ACE_RCSID (tao, Transport_Timer, diff --git a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp index 3cdb3a9d07c..3a8f77cdb6d 100644 --- a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp +++ b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "Recursive_TypeCode.h" +#include "tao/TypeCodeFactory/Recursive_TypeCode.h" #ifndef __ACE_INLINE__ -# include "Recursive_TypeCode.inl" +# include "tao/TypeCodeFactory/Recursive_TypeCode.inl" #endif /* __ACE_INLINE__ */ #include "tao/SystemException.h" diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp index 9a0d44efc85..5bcf47ab3d8 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp @@ -30,7 +30,7 @@ #include "tao/AnyTypeCode/Alias_TypeCode_Static.h" #include "tao/AnyTypeCode/Objref_TypeCode_Static.h" #include "tao/AnyTypeCode/String_TypeCode_Static.h" -#include "TypeCodeFactoryC.h" +#include "tao/TypeCodeFactory/TypeCodeFactoryC.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp index ede894d7dea..aa97c491b4c 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "TypeCodeFactoryC.h" +#include "tao/TypeCodeFactory/TypeCodeFactoryC.h" #include "tao/CDR.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h index 758be0ed147..8548e8e4cee 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "typecodefactory_export.h" +#include "tao/TypeCodeFactory/typecodefactory_export.h" #include "tao/AnyTypeCode/TypeCode.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" #include "tao/ORB.h" diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp index d8d6a7e9672..29fb9ac421f 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp @@ -1,8 +1,8 @@ // $Id$ #include "tao/AnyTypeCode/AnyTypeCode_methods.h" -#include "TypeCodeFactory_Adapter_Impl.h" -#include "TypeCodeFactory_i.h" +#include "tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h" +#include "tao/TypeCodeFactory/TypeCodeFactory_i.h" #include "tao/ORB_Core.h" diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h index 2dae9e9a027..5f20f2af5b8 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h @@ -15,7 +15,7 @@ #define TAO_TYPECODEFACTORY_ADAPTER_IMPL_H #include /**/ "ace/pre.h" -#include "typecodefactory_export.h" +#include "tao/TypeCodeFactory/typecodefactory_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp index 77632341cb7..36d20aeda87 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp @@ -15,8 +15,8 @@ // // ================================================================= -#include "TypeCodeFactory_Loader.h" -#include "TypeCodeFactory_i.h" +#include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h" +#include "tao/TypeCodeFactory/TypeCodeFactory_i.h" #include "ace/Log_Msg.h" ACE_RCSID(TypeCodeFactory, diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h index 9a6faf3909f..55a524c32b8 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h @@ -14,7 +14,7 @@ #define TAO_TYPECODEFACTORY_LOADER_H #include /**/ "ace/pre.h" -#include "typecodefactory_export.h" +#include "tao/TypeCodeFactory/typecodefactory_export.h" #include "tao/Object_Loader.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -58,7 +58,7 @@ ACE_STATIC_SVC_DECLARE (TAO_TypeCodeFactory_Loader) ACE_FACTORY_DECLARE (TAO_TypeCodeFactory, TAO_TypeCodeFactory_Loader) #define TAO_TYPECODEFACTORY_SAFE_INCLUDE -#include "TypeCodeFactoryC.h" +#include "tao/TypeCodeFactory/TypeCodeFactoryC.h" #undef TAO_TYPECODEFACTORY_SAFE_INCLUDE #include /**/ "ace/post.h" diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp index 2232a94fc50..5fb6c575d65 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "Recursive_TypeCode.h" -#include "TypeCodeFactory_i.h" +#include "tao/TypeCodeFactory/Recursive_TypeCode.h" +#include "tao/TypeCodeFactory/TypeCodeFactory_i.h" #include "tao/AnyTypeCode/Marshal.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h index 81913877a86..e463d0a4169 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h @@ -14,7 +14,7 @@ #define TAO_TYPECODEFACTORY_I_H #include /**/ "ace/pre.h" -#include "TypeCodeFactory_Loader.h" +#include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/Typecode_typesC.cpp b/TAO/tao/Typecode_typesC.cpp index d33a07dcac5..bf8cc72d22a 100644 --- a/TAO/tao/Typecode_typesC.cpp +++ b/TAO/tao/Typecode_typesC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "Typecode_typesC.h" +#include "tao/Typecode_typesC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) diff --git a/TAO/tao/ULongLongSeqC.cpp b/TAO/tao/ULongLongSeqC.cpp index e5e5d7e195e..08f97a96aed 100644 --- a/TAO/tao/ULongLongSeqC.cpp +++ b/TAO/tao/ULongLongSeqC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "ULongLongSeqC.h" +#include "tao/ULongLongSeqC.h" #include "tao/CDR.h" // TAO_IDL - Generated from diff --git a/TAO/tao/ULongSeqC.cpp b/TAO/tao/ULongSeqC.cpp index 265c5cd30d6..a474b95567f 100644 --- a/TAO/tao/ULongSeqC.cpp +++ b/TAO/tao/ULongSeqC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:288 -#include "ULongSeqC.h" +#include "tao/ULongSeqC.h" #include "tao/CDR.h" // TAO_IDL - Generated from diff --git a/TAO/tao/UShortSeqC.cpp b/TAO/tao/UShortSeqC.cpp index 22cd79be478..aecdf19d4a5 100644 --- a/TAO/tao/UShortSeqC.cpp +++ b/TAO/tao/UShortSeqC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "UShortSeqC.h" +#include "tao/UShortSeqC.h" #include "tao/CDR.h" #if defined (__BORLANDC__) diff --git a/TAO/tao/UserException.cpp b/TAO/tao/UserException.cpp index 361898528c0..638f895b362 100644 --- a/TAO/tao/UserException.cpp +++ b/TAO/tao/UserException.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "UserException.h" +#include "tao/UserException.h" #include "ace/SString.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/Utils/Encodable.cpp b/TAO/tao/Utils/Encodable.cpp index 1f377302158..c9c484f549c 100644 --- a/TAO/tao/Utils/Encodable.cpp +++ b/TAO/tao/Utils/Encodable.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Encodable.h" +#include "tao/Utils/Encodable.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Utils/Encodable.h b/TAO/tao/Utils/Encodable.h index ace15cb7089..15afe05370f 100644 --- a/TAO/tao/Utils/Encodable.h +++ b/TAO/tao/Utils/Encodable.h @@ -24,7 +24,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "utils_export.h" +#include "tao/Utils/utils_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Utils/Implicit_Deactivator.cpp b/TAO/tao/Utils/Implicit_Deactivator.cpp index a050334804c..9e0fb6444f9 100644 --- a/TAO/tao/Utils/Implicit_Deactivator.cpp +++ b/TAO/tao/Utils/Implicit_Deactivator.cpp @@ -1,4 +1,4 @@ -#include "Implicit_Deactivator.h" +#include "tao/Utils/Implicit_Deactivator.h" #include "tao/PortableServer/Servant_Base.h" ACE_RCSID (Utils, diff --git a/TAO/tao/Utils/Implicit_Deactivator.h b/TAO/tao/Utils/Implicit_Deactivator.h index c21e75bfd85..68077296726 100644 --- a/TAO/tao/Utils/Implicit_Deactivator.h +++ b/TAO/tao/Utils/Implicit_Deactivator.h @@ -12,7 +12,7 @@ #ifndef TAO_UTILS_IMPLICIT_DEACTIVATOR_H #define TAO_UTILS_IMPLICIT_DEACTIVATOR_H #include /**/ "ace/pre.h" -#include "utils_export.h" +#include "tao/Utils/utils_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/tao/Utils/ORB_Destroyer.cpp b/TAO/tao/Utils/ORB_Destroyer.cpp index e81a0bde780..8b8a74220ff 100644 --- a/TAO/tao/Utils/ORB_Destroyer.cpp +++ b/TAO/tao/Utils/ORB_Destroyer.cpp @@ -1,4 +1,4 @@ -#include "ORB_Destroyer.h" +#include "tao/Utils/ORB_Destroyer.h" ACE_RCSID (Utils, diff --git a/TAO/tao/Utils/ORB_Destroyer.h b/TAO/tao/Utils/ORB_Destroyer.h index 5f7906017fd..920ba64d3e5 100644 --- a/TAO/tao/Utils/ORB_Destroyer.h +++ b/TAO/tao/Utils/ORB_Destroyer.h @@ -12,7 +12,7 @@ #ifndef TAO_UTILS_ORB_DESTROYER_H #define TAO_UTILS_ORB_DESTROYER_H #include /**/ "ace/pre.h" -#include "utils_export.h" +#include "tao/Utils/utils_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/Utils/ORB_Manager.cpp b/TAO/tao/Utils/ORB_Manager.cpp index 1202e6f33c7..7485985f09b 100644 --- a/TAO/tao/Utils/ORB_Manager.cpp +++ b/TAO/tao/Utils/ORB_Manager.cpp @@ -10,7 +10,7 @@ // // ============================================================================ -#include "ORB_Manager.h" +#include "tao/Utils/ORB_Manager.h" #include "tao/PortableServer/POAManagerC.h" #include "tao/PortableServer/IdAssignmentPolicyC.h" diff --git a/TAO/tao/Utils/ORB_Manager.h b/TAO/tao/Utils/ORB_Manager.h index 9aab1c8ee11..520ca1af26e 100644 --- a/TAO/tao/Utils/ORB_Manager.h +++ b/TAO/tao/Utils/ORB_Manager.h @@ -14,7 +14,7 @@ #define TAO_ORB_MANAGER_H #include /**/ "ace/pre.h" -#include "utils_export.h" +#include "tao/Utils/utils_export.h" #include "tao/PortableServer/PortableServer.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/tao/Utils/PolicyList_Destroyer.cpp b/TAO/tao/Utils/PolicyList_Destroyer.cpp index c6490f4027c..426d841991c 100644 --- a/TAO/tao/Utils/PolicyList_Destroyer.cpp +++ b/TAO/tao/Utils/PolicyList_Destroyer.cpp @@ -1,8 +1,8 @@ -#include "PolicyList_Destroyer.h" +#include "tao/Utils/PolicyList_Destroyer.h" #include "tao/Environment.h" #if !defined (__ACE_INLINE__) -# include "PolicyList_Destroyer.inl" +# include "tao/Utils/PolicyList_Destroyer.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (Utils, diff --git a/TAO/tao/Utils/PolicyList_Destroyer.h b/TAO/tao/Utils/PolicyList_Destroyer.h index 0d83414322d..ef2ef408805 100644 --- a/TAO/tao/Utils/PolicyList_Destroyer.h +++ b/TAO/tao/Utils/PolicyList_Destroyer.h @@ -11,7 +11,7 @@ #ifndef TAO_UTILS_POLICYLIST_DESTROYER_H #define TAO_UTILS_POLICYLIST_DESTROYER_H #include /**/ "ace/pre.h" -#include "utils_export.h" +#include "tao/Utils/utils_export.h" #include "tao/PolicyC.h" @@ -47,7 +47,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "PolicyList_Destroyer.inl" +# include "tao/Utils/PolicyList_Destroyer.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Utils/RIR_Narrow.cpp b/TAO/tao/Utils/RIR_Narrow.cpp index e4d909533d6..fad7ef86477 100644 --- a/TAO/tao/Utils/RIR_Narrow.cpp +++ b/TAO/tao/Utils/RIR_Narrow.cpp @@ -3,7 +3,7 @@ #ifndef TAO_UTILS_RIR_NARROW_CPP #define TAO_UTILS_RIR_NARROW_CPP -#include "RIR_Narrow.h" +#include "tao/Utils/RIR_Narrow.h" #include "tao/SystemException.h" #if defined (ACE_HAS_EXCEPTIONS) #include <stdexcept> diff --git a/TAO/tao/Utils/RIR_Narrow.h b/TAO/tao/Utils/RIR_Narrow.h index afe67295638..fdeba60f91e 100644 --- a/TAO/tao/Utils/RIR_Narrow.h +++ b/TAO/tao/Utils/RIR_Narrow.h @@ -67,7 +67,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -# include "RIR_Narrow.cpp" +# include "tao/Utils/RIR_Narrow.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Utils/Servant_Var.cpp b/TAO/tao/Utils/Servant_Var.cpp index a6f63b15d51..1506ae356bc 100644 --- a/TAO/tao/Utils/Servant_Var.cpp +++ b/TAO/tao/Utils/Servant_Var.cpp @@ -1,10 +1,10 @@ #ifndef TAO_UTILS_SERVANT_VAR_CPP #define TAO_UTILS_SERVANT_VAR_CPP -#include "Servant_Var.h" +#include "tao/Utils/Servant_Var.h" #if !defined (__ACE_INLINE__) -# include "Servant_Var.inl" +# include "tao/Utils/Servant_Var.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (Utils, diff --git a/TAO/tao/Utils/Servant_Var.h b/TAO/tao/Utils/Servant_Var.h index 70d874f6735..626b5e285b7 100644 --- a/TAO/tao/Utils/Servant_Var.h +++ b/TAO/tao/Utils/Servant_Var.h @@ -156,11 +156,11 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "Servant_Var.inl" +# include "tao/Utils/Servant_Var.inl" #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Servant_Var.cpp" +#include "tao/Utils/Servant_Var.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/tao/Utils/Server_Main.cpp b/TAO/tao/Utils/Server_Main.cpp index adb0786b28b..da47ec1e8df 100644 --- a/TAO/tao/Utils/Server_Main.cpp +++ b/TAO/tao/Utils/Server_Main.cpp @@ -15,7 +15,7 @@ #ifndef TAO_UTILS_SERVER_MAIN_T_CPP #define TAO_UTILS_SERVER_MAIN_T_CPP -#include "Server_Main.h" +#include "tao/Utils/Server_Main.h" #include "tao/ORB.h" diff --git a/TAO/tao/Utils/Server_Main.h b/TAO/tao/Utils/Server_Main.h index df06deb4d0f..c5d3ea2d825 100644 --- a/TAO/tao/Utils/Server_Main.h +++ b/TAO/tao/Utils/Server_Main.h @@ -88,7 +88,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -# include "Server_Main.cpp" +# include "tao/Utils/Server_Main.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/tao/Utils/Synch_Refcountable.cpp b/TAO/tao/Utils/Synch_Refcountable.cpp index ff4f6b582d8..4b132799b70 100644 --- a/TAO/tao/Utils/Synch_Refcountable.cpp +++ b/TAO/tao/Utils/Synch_Refcountable.cpp @@ -1,7 +1,7 @@ -#include "Synch_Refcountable.h" +#include "tao/Utils/Synch_Refcountable.h" #if !defined (__ACE_INLINE__) -# include "Synch_Refcountable.inl" +# include "tao/Utils/Synch_Refcountable.inl" #endif /* __ACE_INLINE__ */ #include "ace/Log_Msg.h" diff --git a/TAO/tao/Utils/Synch_Refcountable.h b/TAO/tao/Utils/Synch_Refcountable.h index 44a7bfdb516..3e77a70c4c3 100644 --- a/TAO/tao/Utils/Synch_Refcountable.h +++ b/TAO/tao/Utils/Synch_Refcountable.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "utils_export.h" +#include "tao/Utils/utils_export.h" #include "tao/Versioned_Namespace.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -55,7 +55,7 @@ protected: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "Synch_Refcountable.inl" +# include "tao/Utils/Synch_Refcountable.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Valuetype/AbstractBase.cpp b/TAO/tao/Valuetype/AbstractBase.cpp index 2888267e788..2af762b5c00 100644 --- a/TAO/tao/Valuetype/AbstractBase.cpp +++ b/TAO/tao/Valuetype/AbstractBase.cpp @@ -1,8 +1,8 @@ // "$Id$" -#include "AbstractBase.h" -#include "ValueBase.h" -#include "ValueFactory.h" +#include "tao/Valuetype/AbstractBase.h" +#include "tao/Valuetype/ValueBase.h" +#include "tao/Valuetype/ValueFactory.h" #include "tao/Stub.h" #include "tao/ORB_Core.h" #include "tao/Profile.h" @@ -10,7 +10,7 @@ #include "tao/CDR.h" #if !defined (__ACE_INLINE__) -# include "AbstractBase.inl" +# include "tao/Valuetype/AbstractBase.inl" #endif /* ! __ACE_INLINE__ */ ACE_RCSID (Valuetype, diff --git a/TAO/tao/Valuetype/AbstractBase.h b/TAO/tao/Valuetype/AbstractBase.h index dc8d4657150..cc00f37a969 100644 --- a/TAO/tao/Valuetype/AbstractBase.h +++ b/TAO/tao/Valuetype/AbstractBase.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "valuetype_export.h" +#include "tao/Valuetype/valuetype_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -170,7 +170,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "AbstractBase.inl" +# include "tao/Valuetype/AbstractBase.inl" #endif /* __ACE_INLINE__) */ #include /**/ "ace/post.h" diff --git a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp index c2a9ad11b5d..a0212ddde94 100644 --- a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp +++ b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp @@ -1,6 +1,6 @@ //$Id$ -#include "AbstractBase_Invocation_Adapter.h" -#include "AbstractBase.h" +#include "tao/Valuetype/AbstractBase_Invocation_Adapter.h" +#include "tao/Valuetype/AbstractBase.h" ACE_RCSID (Valuetype, AbstractBase_Invocation_Adapter, diff --git a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h index a65447d502a..afac495a54f 100644 --- a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h +++ b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h @@ -13,7 +13,7 @@ #define TAO_ABSTRACTBASE_INVOCATION_ADAPTER_H #include /**/ "ace/pre.h" -#include "valuetype_export.h" +#include "tao/Valuetype/valuetype_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/Valuetype/AbstractBase_T.cpp b/TAO/tao/Valuetype/AbstractBase_T.cpp index ca45e9b4782..6b80c96b8b3 100644 --- a/TAO/tao/Valuetype/AbstractBase_T.cpp +++ b/TAO/tao/Valuetype/AbstractBase_T.cpp @@ -3,8 +3,8 @@ #ifndef TAO_ABSTRACT_BASE_T_CPP #define TAO_ABSTRACT_BASE_T_CPP -#include "AbstractBase_T.h" -#include "AbstractBase.h" +#include "tao/Valuetype/AbstractBase_T.h" +#include "tao/Valuetype/AbstractBase.h" #include "tao/Stub.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Valuetype/AbstractBase_T.h b/TAO/tao/Valuetype/AbstractBase_T.h index d2533d87f88..dced03cf334 100644 --- a/TAO/tao/Valuetype/AbstractBase_T.h +++ b/TAO/tao/Valuetype/AbstractBase_T.h @@ -54,7 +54,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "AbstractBase_T.cpp" +#include "tao/Valuetype/AbstractBase_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/tao/Valuetype/Sequence_T.cpp b/TAO/tao/Valuetype/Sequence_T.cpp index 3568ff0ecb5..d69116d7704 100644 --- a/TAO/tao/Valuetype/Sequence_T.cpp +++ b/TAO/tao/Valuetype/Sequence_T.cpp @@ -3,10 +3,10 @@ #ifndef TAO_VALUETYPE_SEQUENCE_T_CPP #define TAO_VALUETYPE_SEQUENCE_T_CPP -#include "Sequence_T.h" +#include "tao/Valuetype/Sequence_T.h" #if !defined (__ACE_INLINE__) -#include "Sequence_T.inl" +#include "tao/Valuetype/Sequence_T.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID (Valuetype, diff --git a/TAO/tao/Valuetype/Sequence_T.h b/TAO/tao/Valuetype/Sequence_T.h index b01b9d80673..6a5e323b713 100644 --- a/TAO/tao/Valuetype/Sequence_T.h +++ b/TAO/tao/Valuetype/Sequence_T.h @@ -238,7 +238,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "Sequence_T.inl" +#include "tao/Valuetype/Sequence_T.inl" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -247,7 +247,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Sequence_T.cpp" +#include "tao/Valuetype/Sequence_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/tao/Valuetype/StringValueC.cpp b/TAO/tao/Valuetype/StringValueC.cpp index f5b0bf02e71..836192bc71a 100644 --- a/TAO/tao/Valuetype/StringValueC.cpp +++ b/TAO/tao/Valuetype/StringValueC.cpp @@ -39,7 +39,7 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Impl_T.h" -#include "StringValueC.h" +#include "tao/Valuetype/StringValueC.h" #include "tao/Valuetype/ValueFactory.h" #include "tao/CDR.h" @@ -48,7 +48,7 @@ #endif /* __BORLANDC__ */ #if !defined (__ACE_INLINE__) -#include "StringValueC.inl" +#include "tao/Valuetype/StringValueC.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from diff --git a/TAO/tao/Valuetype/StringValueC.h b/TAO/tao/Valuetype/StringValueC.h index 144505c85fa..a0b9b69b3a8 100644 --- a/TAO/tao/Valuetype/StringValueC.h +++ b/TAO/tao/Valuetype/StringValueC.h @@ -40,7 +40,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "valuetype_export.h" +#include "tao/Valuetype/valuetype_export.h" #include "tao/Valuetype/ValueBase.h" #include "tao/CDR.h" #include "tao/Valuetype/Valuetype_Adapter_Impl.h" @@ -310,7 +310,7 @@ TAO_Valuetype_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::WStringVa TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "StringValueC.inl" +#include "tao/Valuetype/StringValueC.inl" #endif /* defined INLINE */ #if defined(_MSC_VER) diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp index a217a75cec5..d7c325203d8 100644 --- a/TAO/tao/Valuetype/ValueBase.cpp +++ b/TAO/tao/Valuetype/ValueBase.cpp @@ -5,8 +5,8 @@ #include "tao/AnyTypeCode/Value_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" -#include "ValueBase.h" -#include "ValueFactory.h" +#include "tao/Valuetype/ValueBase.h" +#include "tao/Valuetype/ValueFactory.h" #include "tao/CDR.h" #include "tao/ORB.h" @@ -15,7 +15,7 @@ #include "ace/OS_NS_string.h" #if !defined (__ACE_INLINE__) -# include "ValueBase.inl" +# include "tao/Valuetype/ValueBase.inl" #endif /* ! __ACE_INLINE__ */ diff --git a/TAO/tao/Valuetype/ValueBase.h b/TAO/tao/Valuetype/ValueBase.h index d9d97efcd2b..55360627f05 100644 --- a/TAO/tao/Valuetype/ValueBase.h +++ b/TAO/tao/Valuetype/ValueBase.h @@ -248,7 +248,7 @@ namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "ValueBase.inl" +# include "tao/Valuetype/ValueBase.inl" #endif /* __ACE_INLINE__*/ #include /**/ "ace/post.h" diff --git a/TAO/tao/Valuetype/ValueFactory.cpp b/TAO/tao/Valuetype/ValueFactory.cpp index 9348eca9fa9..473780b8790 100644 --- a/TAO/tao/Valuetype/ValueFactory.cpp +++ b/TAO/tao/Valuetype/ValueFactory.cpp @@ -1,4 +1,4 @@ -#include "ValueFactory.h" +#include "tao/Valuetype/ValueFactory.h" #include "ace/Guard_T.h" ACE_RCSID (Valuetype, diff --git a/TAO/tao/Valuetype/ValueFactory.h b/TAO/tao/Valuetype/ValueFactory.h index 2880b8db23d..0935bba77a4 100644 --- a/TAO/tao/Valuetype/ValueFactory.h +++ b/TAO/tao/Valuetype/ValueFactory.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "valuetype_export.h" +#include "tao/Valuetype/valuetype_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Value_VarOut_T.h" +#include "tao/Valuetype/Value_VarOut_T.h" #include "tao/Environment.h" #include "tao/Basic_Types.h" diff --git a/TAO/tao/Valuetype/ValueFactory_Map.cpp b/TAO/tao/Valuetype/ValueFactory_Map.cpp index 40643500065..674c1764bab 100644 --- a/TAO/tao/Valuetype/ValueFactory_Map.cpp +++ b/TAO/tao/Valuetype/ValueFactory_Map.cpp @@ -1,5 +1,5 @@ -#include "ValueFactory_Map.h" -#include "ValueFactory.h" +#include "tao/Valuetype/ValueFactory_Map.h" +#include "tao/Valuetype/ValueFactory.h" #include "tao/CORBA_String.h" #include "tao/TAO_Singleton.h" diff --git a/TAO/tao/Valuetype/Value_CORBA_methods.h b/TAO/tao/Valuetype/Value_CORBA_methods.h index 45cc2e6cf51..352c981ac76 100644 --- a/TAO/tao/Valuetype/Value_CORBA_methods.h +++ b/TAO/tao/Valuetype/Value_CORBA_methods.h @@ -17,7 +17,7 @@ #include /**/ "ace/pre.h" -#include "valuetype_export.h" +#include "tao/Valuetype/valuetype_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/Valuetype/Value_VarOut_T.h b/TAO/tao/Valuetype/Value_VarOut_T.h index ec1e15ae879..fcc36464fdf 100644 --- a/TAO/tao/Valuetype/Value_VarOut_T.h +++ b/TAO/tao/Valuetype/Value_VarOut_T.h @@ -124,7 +124,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Value_VarOut_T.cpp" +#include "tao/Valuetype/Value_VarOut_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp index 31586e27853..19a2ec7f52f 100644 --- a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp +++ b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "Valuetype_Adapter_Impl.h" -#include "AbstractBase.h" -#include "ValueBase.h" -#include "ValueFactory_Map.h" +#include "tao/Valuetype/Valuetype_Adapter_Impl.h" +#include "tao/Valuetype/AbstractBase.h" +#include "tao/Valuetype/ValueBase.h" +#include "tao/Valuetype/ValueFactory_Map.h" #include "tao/ORB_Core.h" diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h index 353ea51e4d0..e868321588c 100644 --- a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h +++ b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "valuetype_export.h" +#include "tao/Valuetype/valuetype_export.h" #include "tao/Valuetype_Adapter.h" diff --git a/TAO/tao/WCharSeqC.cpp b/TAO/tao/WCharSeqC.cpp index b4b2ae47b29..6de54e5b49f 100644 --- a/TAO/tao/WCharSeqC.cpp +++ b/TAO/tao/WCharSeqC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "WCharSeqC.h" +#include "tao/WCharSeqC.h" #include "tao/CDR.h" // TAO_IDL - Generated from diff --git a/TAO/tao/WStringSeqC.cpp b/TAO/tao/WStringSeqC.cpp index 068399c3217..12ab5b23d1b 100644 --- a/TAO/tao/WStringSeqC.cpp +++ b/TAO/tao/WStringSeqC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:277 -#include "WStringSeqC.h" +#include "tao/WStringSeqC.h" #include "tao/CDR.h" // TAO_IDL - Generated from diff --git a/TAO/tao/Wait_On_LF_No_Upcall.cpp b/TAO/tao/Wait_On_LF_No_Upcall.cpp index d9aebd16279..1a039a0b089 100644 --- a/TAO/tao/Wait_On_LF_No_Upcall.cpp +++ b/TAO/tao/Wait_On_LF_No_Upcall.cpp @@ -5,7 +5,7 @@ #include "tao/Transport.h" #include "tao/ORB_Core.h" #include "tao/ORB_Core_TSS_Resources.h" -#include "debug.h" +#include "tao/debug.h" ACE_RCSID(tao, Wait_On_LF_No_Upcall, diff --git a/TAO/tao/Wait_On_Read.cpp b/TAO/tao/Wait_On_Read.cpp index fb0f2fa2395..ba4af971c66 100644 --- a/TAO/tao/Wait_On_Read.cpp +++ b/TAO/tao/Wait_On_Read.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "Wait_On_Read.h" -#include "Transport.h" -#include "Resume_Handle.h" -#include "Synch_Reply_Dispatcher.h" -#include "Client_Strategy_Factory.h" -#include "ORB_Core.h" +#include "tao/Wait_On_Read.h" +#include "tao/Transport.h" +#include "tao/Resume_Handle.h" +#include "tao/Synch_Reply_Dispatcher.h" +#include "tao/Client_Strategy_Factory.h" +#include "tao/ORB_Core.h" #include "ace/Reactor.h" #include "ace/Countdown_Time.h" diff --git a/TAO/tao/Wait_Strategy.cpp b/TAO/tao/Wait_Strategy.cpp index d7ad89b5bbe..efbcc303399 100644 --- a/TAO/tao/Wait_Strategy.cpp +++ b/TAO/tao/Wait_Strategy.cpp @@ -7,7 +7,7 @@ ACE_RCSID (tao, "$Id$") #if !defined (__ACE_INLINE__) -# include "Wait_Strategy.inl" +# include "tao/Wait_Strategy.inl" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/Wait_Strategy.h b/TAO/tao/Wait_Strategy.h index b7305766407..d2818275714 100644 --- a/TAO/tao/Wait_Strategy.h +++ b/TAO/tao/Wait_Strategy.h @@ -100,7 +100,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "Wait_Strategy.inl" +# include "tao/Wait_Strategy.inl" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp index ce670c4f08f..c051cb19370 100644 --- a/TAO/tao/WrongTransactionC.cpp +++ b/TAO/tao/WrongTransactionC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:291 -#include "WrongTransactionC.h" +#include "tao/WrongTransactionC.h" #include "tao/CDR.h" #include "tao/SystemException.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/XtResource_Factory.cpp b/TAO/tao/XtResource_Factory.cpp index 5ca19fba0f0..c6afc35a325 100644 --- a/TAO/tao/XtResource_Factory.cpp +++ b/TAO/tao/XtResource_Factory.cpp @@ -1,7 +1,7 @@ //$Id$ -#include "XtResource_Factory.h" -#include "debug.h" +#include "tao/XtResource_Factory.h" +#include "tao/debug.h" #include "ace/XtReactor.h" ACE_RCSID( TAO_XtResource, diff --git a/TAO/tao/XtResource_Loader.cpp b/TAO/tao/XtResource_Loader.cpp index d2350ddcc00..5fdc64af074 100644 --- a/TAO/tao/XtResource_Loader.cpp +++ b/TAO/tao/XtResource_Loader.cpp @@ -1,7 +1,7 @@ //$Id$ -#include "XtResource_Loader.h" -#include "ORB_Core.h" -#include "XtResource_Factory.h" +#include "tao/XtResource_Loader.h" +#include "tao/ORB_Core.h" +#include "tao/XtResource_Factory.h" ACE_RCSID( TAO_XtResource, XtResource_Loader, diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp index c841a44d409..bc6d38cf6ab 100644 --- a/TAO/tao/default_client.cpp +++ b/TAO/tao/default_client.cpp @@ -1,16 +1,16 @@ // $Id$ -#include "default_client.h" -#include "Wait_On_Read.h" -#include "Wait_On_Reactor.h" -#include "Wait_On_Leader_Follower.h" -#include "Wait_On_LF_No_Upcall.h" -#include "Exclusive_TMS.h" -#include "Muxed_TMS.h" -#include "Blocked_Connect_Strategy.h" -#include "Reactive_Connect_Strategy.h" -#include "LF_Connect_Strategy.h" -#include "orbconf.h" +#include "tao/default_client.h" +#include "tao/Wait_On_Read.h" +#include "tao/Wait_On_Reactor.h" +#include "tao/Wait_On_Leader_Follower.h" +#include "tao/Wait_On_LF_No_Upcall.h" +#include "tao/Exclusive_TMS.h" +#include "tao/Muxed_TMS.h" +#include "tao/Blocked_Connect_Strategy.h" +#include "tao/Reactive_Connect_Strategy.h" +#include "tao/LF_Connect_Strategy.h" +#include "tao/orbconf.h" #include "ace/Lock_Adapter_T.h" #include "ace/Recursive_Thread_Mutex.h" diff --git a/TAO/tao/operation_details.cpp b/TAO/tao/operation_details.cpp index 2aa3cd2b972..faccd9fe89c 100644 --- a/TAO/tao/operation_details.cpp +++ b/TAO/tao/operation_details.cpp @@ -1,11 +1,11 @@ //$Id$ -#include "operation_details.h" -#include "Stub.h" -#include "ORB_Constants.h" -#include "Exception_Data.h" -#include "SystemException.h" -#include "Argument.h" +#include "tao/operation_details.h" +#include "tao/Stub.h" +#include "tao/ORB_Constants.h" +#include "tao/Exception_Data.h" +#include "tao/SystemException.h" +#include "tao/Argument.h" #include "ace/OS_NS_string.h" diff --git a/TAO/tao/operation_details.h b/TAO/tao/operation_details.h index d10dc54ed11..bc44c92e5f9 100644 --- a/TAO/tao/operation_details.h +++ b/TAO/tao/operation_details.h @@ -14,15 +14,15 @@ #include /**/ "ace/pre.h" -#include "SystemException.h" +#include "tao/SystemException.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "Service_Context.h" -#include "TimeBaseC.h" -#include "target_specification.h" +#include "tao/Service_Context.h" +#include "tao/TimeBaseC.h" +#include "tao/target_specification.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -215,7 +215,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "operation_details.i" +# include "tao/operation_details.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" diff --git a/TAO/tao/orb_typesC.cpp b/TAO/tao/orb_typesC.cpp index 43f0899df80..b4bd2cb6e1c 100644 --- a/TAO/tao/orb_typesC.cpp +++ b/TAO/tao/orb_typesC.cpp @@ -29,7 +29,7 @@ // be\be_codegen.cpp:288 -#include "orb_typesC.h" +#include "tao/orb_typesC.h" #include "tao/CDR.h" // TAO_IDL - Generated from diff --git a/TAO/tao/target_specification.cpp b/TAO/tao/target_specification.cpp index d72faa3c200..ca77495c883 100644 --- a/TAO/tao/target_specification.cpp +++ b/TAO/tao/target_specification.cpp @@ -4,7 +4,7 @@ #include "tao/target_specification.h" #if !defined (__ACE_INLINE__) -#include "target_specification.i" +#include "tao/target_specification.i" #endif /* !defined INLINE */ ACE_RCSID (tao, diff --git a/TAO/tao/target_specification.h b/TAO/tao/target_specification.h index 53b911a2281..60c997f0e3c 100644 --- a/TAO/tao/target_specification.h +++ b/TAO/tao/target_specification.h @@ -131,7 +131,7 @@ private: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "target_specification.i" +#include "tao/target_specification.i" #endif /* defined INLINE */ #include /**/ "ace/post.h" |