diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-03-14 06:14:35 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-03-14 06:14:35 +0000 |
| commit | 360eb9cc38ab03b6b4a24136243be44e90212f7e (patch) | |
| tree | 8cf2448690ccc7640fcee867fa59ed06ae1f52a8 /TAO/orbsvcs/orbsvcs/IFRService | |
| parent | 4098205ba0310d7d2f7ae1e1cd108eceafae34d1 (diff) | |
| download | ATCD-360eb9cc38ab03b6b4a24136243be44e90212f7e.tar.gz | |
ChangeLogTag: Tue Mar 14 06:02:15 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/IFRService')
123 files changed, 375 insertions, 375 deletions
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp index 791e3b79954..9c7831e7387 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "AbstractInterfaceDef_i.h" -#include "Repository_i.h" +#include "orbsvcs/IFRService/AbstractInterfaceDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" ACE_RCSID (IFRService, AbstractInterfaceDef_i, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h index ce2ab4dcbdb..b753a1afa16 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_ABSTRACTINTERFACEDEF_I_H #define TAO_ABSTRACTINTERFACEDEF_I_H -#include "InterfaceDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/InterfaceDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp index 1c4e8b5d987..308a637d9ac 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "AliasDef_i.h" -#include "Repository_i.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/AliasDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/Auto_Ptr.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h index c8e0f2fffb4..7cc9c8826ca 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_ALIASDEF_I_H #define TAO_ALIASDEF_I_H -#include "TypedefDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/TypedefDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp index 1c0a53c240d..70022598977 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "ArrayDef_i.h" -#include "Repository_i.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/ArrayDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/Auto_Ptr.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h index ee024d06a9f..ec0d6966f8d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_ARRAYDEF_I_H #define TAO_ARRAYDEF_I_H -#include "IDLType_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/IDLType_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp index 1027d8f5928..0d9ce3b6a42 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "AttributeDef_i.h" -#include "Repository_i.h" -#include "IDLType_i.h" -#include "ExceptionDef_i.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/AttributeDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/IDLType_i.h" +#include "orbsvcs/IFRService/ExceptionDef_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/Auto_Ptr.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h index 2c3883e7906..d08b3dfa119 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_ATTRIBUTEDEF_I_H #define TAO_ATTRIBUTEDEF_I_H -#include "Contained_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/Contained_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp index 918723c6417..b61cc8542a9 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "ComponentContainer_i.h" -#include "Repository_i.h" -#include "InterfaceDef_i.h" -#include "ComponentDef_i.h" -#include "ValueDef_i.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/ComponentContainer_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/InterfaceDef_i.h" +#include "orbsvcs/IFRService/ComponentDef_i.h" +#include "orbsvcs/IFRService/ValueDef_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/SString.h" ACE_RCSID (IFRService, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h index f656d9ea391..bc1c9e9fec6 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h @@ -21,14 +21,14 @@ #ifndef TAO_COMPONENTCONTAINER_I_H #define TAO_COMPONENTCONTAINER_I_H -#include "Container_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/Container_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "IFR_ComponentsS.h" +#include "orbsvcs/IFRService/IFR_ComponentsS.h" #if defined(_MSC_VER) #pragma warning(push) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp index 2ba6e45a7fa..52d3fcd60fd 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp @@ -1,14 +1,14 @@ // $Id$ -#include "Repository_i.h" -#include "ComponentDef_i.h" -#include "ProvidesDef_i.h" -#include "UsesDef_i.h" -#include "EmitsDef_i.h" -#include "PublishesDef_i.h" -#include "ConsumesDef_i.h" -#include "ExtAttributeDef_i.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/ComponentDef_i.h" +#include "orbsvcs/IFRService/ProvidesDef_i.h" +#include "orbsvcs/IFRService/UsesDef_i.h" +#include "orbsvcs/IFRService/EmitsDef_i.h" +#include "orbsvcs/IFRService/PublishesDef_i.h" +#include "orbsvcs/IFRService/ConsumesDef_i.h" +#include "orbsvcs/IFRService/ExtAttributeDef_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h index 4db2f4b69dc..0c05918d563 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h @@ -21,15 +21,15 @@ #ifndef TAO_COMPONENTDEF_I_H #define TAO_COMPONENTDEF_I_H -#include "ExtInterfaceDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/ExtInterfaceDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "IFR_ComponentsS.h" -#include "IFR_Service_Utils_T.h" +#include "orbsvcs/IFRService/IFR_ComponentsS.h" +#include "orbsvcs/IFRService/IFR_Service_Utils_T.h" #if defined(_MSC_VER) #pragma warning(push) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp index 6a0a56173b4..474f85baf57 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "ComponentModuleDef_i.h" +#include "orbsvcs/IFRService/ComponentModuleDef_i.h" ACE_RCSID (IFRService, ComponentModuleDef_i, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h index ba0d9850e22..6556910861c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_COMPONENTMODULEDEF_I_H #define TAO_COMPONENTMODULEDEF_I_H -#include "ComponentContainer_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/ComponentContainer_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp index 8fafb46de7e..f0efb71adb1 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp @@ -1,18 +1,18 @@ /* -*- C++ -*- */ // $Id$ -#include "ComponentRepository_i.h" -#include "ModuleDef_i.h" -#include "ComponentDef_i.h" -#include "HomeDef_i.h" -#include "EventDef_i.h" -#include "FinderDef_i.h" -#include "FactoryDef_i.h" -#include "EmitsDef_i.h" -#include "PublishesDef_i.h" -#include "ConsumesDef_i.h" -#include "ProvidesDef_i.h" -#include "UsesDef_i.h" +#include "orbsvcs/IFRService/ComponentRepository_i.h" +#include "orbsvcs/IFRService/ModuleDef_i.h" +#include "orbsvcs/IFRService/ComponentDef_i.h" +#include "orbsvcs/IFRService/HomeDef_i.h" +#include "orbsvcs/IFRService/EventDef_i.h" +#include "orbsvcs/IFRService/FinderDef_i.h" +#include "orbsvcs/IFRService/FactoryDef_i.h" +#include "orbsvcs/IFRService/EmitsDef_i.h" +#include "orbsvcs/IFRService/PublishesDef_i.h" +#include "orbsvcs/IFRService/ConsumesDef_i.h" +#include "orbsvcs/IFRService/ProvidesDef_i.h" +#include "orbsvcs/IFRService/UsesDef_i.h" ACE_RCSID (IFRService, ComponentRepository_i, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h index d6c2a404395..7690ee20edc 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h @@ -21,14 +21,14 @@ #ifndef TAO_COMPONENTREPOSITORY_I_H #define TAO_COMPONENTREPOSITORY_I_H -#include "Repository_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ComponentContainer_i.h" +#include "orbsvcs/IFRService/ComponentContainer_i.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp index 3e5a832a1f4..3ca04650d04 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "ConstantDef_i.h" -#include "Repository_i.h" -#include "IFR_Service_Utils.h" -#include "IDLType_i.h" +#include "orbsvcs/IFRService/ConstantDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "orbsvcs/IFRService/IDLType_i.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h index a3b0b2b29fa..f9243f6d58c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_CONSTANTDEF_I_H #define TAO_CONSTANTDEF_I_H -#include "Contained_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/Contained_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp index e7a77458e5a..0b6b8311b7e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp @@ -2,8 +2,8 @@ // $Id$ -#include "Repository_i.h" -#include "ConsumesDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/ConsumesDef_i.h" ACE_RCSID (IFRService, ConsumesDef_i, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h index 231ed6f2f84..2bbbef43916 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_CONSUMESDEF_I_H #define TAO_CONSUMESDEF_I_H -#include "EventPortDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/EventPortDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp index 4ca4a05623a..b61b34ea4a1 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "concrete_classes.h" -#include "Repository_i.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/concrete_classes.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/Auto_Ptr.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h index ddc84da8c21..5729837ce3b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h @@ -21,8 +21,8 @@ #ifndef TAO_CONTAINED_I_H #define TAO_CONTAINED_I_H -#include "IRObject_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/IRObject_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp index e4a1a265e26..a4c5a74089d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "Repository_i.h" -#include "InterfaceDef_i.h" -#include "ValueDef_i.h" -#include "ExtValueDef_i.h" -#include "IFR_Service_Utils.h" -#include "IFR_Service_Utils_T.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/InterfaceDef_i.h" +#include "orbsvcs/IFRService/ValueDef_i.h" +#include "orbsvcs/IFRService/ExtValueDef_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "orbsvcs/IFRService/IFR_Service_Utils_T.h" #include "tao/IFR_Client/IFR_ComponentsC.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h index 54fffd17de3..ab8e833579b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h @@ -21,8 +21,8 @@ #ifndef TAO_CONTAINER_I_H #define TAO_CONTAINER_I_H -#include "IRObject_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/IRObject_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp index 2232fcd228d..0cbe4a4093d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "EmitsDef_i.h" -#include "Repository_i.h" +#include "orbsvcs/IFRService/EmitsDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" ACE_RCSID (IFRService, EmitsDef_i, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h index 1537eb6b433..5d8e93fdeba 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_EMITSDEF_I_H #define TAO_EMITSDEF_I_H -#include "EventPortDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/EventPortDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp index e3ff2992e2c..4ab27a971b8 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "EnumDef_i.h" -#include "Repository_i.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/EnumDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h index ce90039c409..0bd5b265451 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_ENUMDEF_I_H #define TAO_ENUMDEF_I_H -#include "TypedefDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/TypedefDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp index c0311732717..cd62666f25d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "Repository_i.h" -#include "EventDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/EventDef_i.h" ACE_RCSID (IFRService, EventDef_i, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h index 95210c872d9..a1e280a2882 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_EVENTDEF_I_H #define TAO_EVENTDEF_I_H -#include "ExtValueDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/ExtValueDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp index ce3be7d690c..f3d1a44a8f4 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "Repository_i.h" -#include "EventPortDef_i.h" -#include "EventDef_i.h" -#include "IFR_Service_Utils_T.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/EventPortDef_i.h" +#include "orbsvcs/IFRService/EventDef_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils_T.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h index 93e7ff394c3..dc84527d41f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h @@ -21,14 +21,14 @@ #ifndef TAO_EVENTPORTDEF_I_H #define TAO_EVENTPORTDEF_I_H -#include "Contained_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/Contained_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "IFR_ComponentsS.h" +#include "orbsvcs/IFRService/IFR_ComponentsS.h" #if defined(_MSC_VER) #pragma warning(push) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp index 53e2849200a..33b7c9eee99 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "ExceptionDef_i.h" -#include "Repository_i.h" -#include "IDLType_i.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/ExceptionDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/IDLType_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/Auto_Ptr.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h index ca6864b1612..88dd3e8bbd5 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h @@ -21,9 +21,9 @@ #ifndef TAO_EXCEPTIONDEF_I_H #define TAO_EXCEPTIONDEF_I_H -#include "Contained_i.h" -#include "Container_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/Contained_i.h" +#include "orbsvcs/IFRService/Container_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp index 18e2d85ca02..82ffce83d05 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "ExtAbstractInterfaceDef_i.h" -#include "Repository_i.h" +#include "orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" ACE_RCSID (IFRService, ExtAbstractInterfaceDef_i, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h index 467a1509877..e79471d8e11 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h @@ -21,14 +21,14 @@ #ifndef TAO_EXTABSTRACTINTERFACEDEF_I_H #define TAO_EXTABSTRACTINTERFACEDEF_I_H -#include "AbstractInterfaceDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/AbstractInterfaceDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "InterfaceAttrExtension_i.h" +#include "orbsvcs/IFRService/InterfaceAttrExtension_i.h" #if defined(_MSC_VER) #pragma warning(push) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp index a3de999bf4f..62405fe8393 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "ExtAttributeDef_i.h" -#include "Repository_i.h" -#include "ExceptionDef_i.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/ExtAttributeDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/ExceptionDef_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h index 83f1f6e3b98..f4d9e54b665 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_EXTATTRIBUTEDEF_I_H #define TAO_EXTATTRIBUTEDEF_I_H -#include "AttributeDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/AttributeDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp index f104cf7ff60..30f003136b2 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "ExtInterfaceDef_i.h" -#include "Repository_i.h" +#include "orbsvcs/IFRService/ExtInterfaceDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" ACE_RCSID (IFRService, ExtInterfaceDef_i, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h index 43d33ffc3a3..11fecc1e6a5 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h @@ -21,14 +21,14 @@ #ifndef TAO_EXTINTERFACEDEF_I_H #define TAO_EXTINTERFACEDEF_I_H -#include "InterfaceDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/InterfaceDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "InterfaceAttrExtension_i.h" +#include "orbsvcs/IFRService/InterfaceAttrExtension_i.h" #if defined(_MSC_VER) #pragma warning(push) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp index d542a8d858f..3b802bcb762 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "ExtLocalInterfaceDef_i.h" -#include "Repository_i.h" +#include "orbsvcs/IFRService/ExtLocalInterfaceDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" ACE_RCSID (IFRService, ExtLocalInterfaceDef_i, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h index d1c0c19e632..1e5eec3bcf2 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h @@ -21,14 +21,14 @@ #ifndef TAO_EXTLOCALINTERFACEDEF_I_H #define TAO_EXTLOCALINTERFACEDEF_I_H -#include "LocalInterfaceDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/LocalInterfaceDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "InterfaceAttrExtension_i.h" +#include "orbsvcs/IFRService/InterfaceAttrExtension_i.h" #if defined(_MSC_VER) #pragma warning(push) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp index e108597159d..c70696ecf52 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "Repository_i.h" -#include "ExtValueDef_i.h" -#include "ExceptionDef_i.h" -#include "IFR_Service_Utils.h" -#include "IFR_Service_Utils_T.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/ExtValueDef_i.h" +#include "orbsvcs/IFRService/ExceptionDef_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "orbsvcs/IFRService/IFR_Service_Utils_T.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h index 802212bf0ab..d2390a47c4a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_EXTVALUEDEF_I_H #define TAO_EXTVALUEDEF_I_H -#include "ValueDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/ValueDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp index 0664f117126..f1fd5ae8157 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "Repository_i.h" -#include "FactoryDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/FactoryDef_i.h" ACE_RCSID (IFRService, FactoryDef_i, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h index 2e788c6a4f2..38a366914ec 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_FACTORYDEF_I_H #define TAO_FACTORYDEF_I_H -#include "OperationDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/OperationDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp index 0d7e9b5983b..6fffd784ad3 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "Repository_i.h" -#include "FinderDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/FinderDef_i.h" ACE_RCSID (IFRService, FinderDef_i, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h index aec902a1516..e8ad0a283d7 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_FINDERDEF_I_H #define TAO_FINDERDEF_I_H -#include "OperationDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/OperationDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp index 56befc089a9..f8fdc472f04 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "Repository_i.h" -#include "FixedDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/FixedDef_i.h" ACE_RCSID (IFRService, FixedDef_i, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h index 6141f1262b3..326bc90185b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_FIXEDDEF_I_H #define TAO_FIXEDDEF_I_H -#include "IDLType_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/IDLType_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp index 5caa2ee6f75..f70745a001e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp @@ -1,14 +1,14 @@ // $Id$ -#include "Repository_i.h" -#include "HomeDef_i.h" -#include "FactoryDef_i.h" -#include "FinderDef_i.h" -#include "ValueDef_i.h" -#include "ExceptionDef_i.h" -#include "AttributeDef_i.h" -#include "IFR_Service_Utils_T.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/HomeDef_i.h" +#include "orbsvcs/IFRService/FactoryDef_i.h" +#include "orbsvcs/IFRService/FinderDef_i.h" +#include "orbsvcs/IFRService/ValueDef_i.h" +#include "orbsvcs/IFRService/ExceptionDef_i.h" +#include "orbsvcs/IFRService/AttributeDef_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils_T.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h index e18572359da..7436829cb68 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h @@ -21,14 +21,14 @@ #ifndef TAO_HOMEDEF_I_H #define TAO_HOMEDEF_I_H -#include "ExtInterfaceDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/ExtInterfaceDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "IFR_ComponentsS.h" +#include "orbsvcs/IFRService/IFR_ComponentsS.h" #if defined(_MSC_VER) #pragma warning(push) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp index 46f57289ab4..83c64aff90e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "IDLType_i.h" +#include "orbsvcs/IFRService/IDLType_i.h" ACE_RCSID (IFRService, IDLType_i, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h index 810d87dc757..8935d63aae6 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.h @@ -20,8 +20,8 @@ #ifndef TAO_IDLTYPE_I_H #define TAO_IDLTYPE_I_H -#include "IRObject_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/IRObject_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp index 15ebfddd229..1da0c338611 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp @@ -33,7 +33,7 @@ #define _TAO_IDL_ORIG_IFR_BASES_CPP_ -#include "IFR_BaseS.h" +#include "orbsvcs/IFRService/IFR_BaseS.h" #include "tao/PortableServer/Operation_Table_Perfect_Hash.h" #include "tao/PortableServer/Upcall_Command.h" #include "tao/PortableServer/Upcall_Wrapper.h" @@ -69,7 +69,7 @@ #include "ace/Malloc_Allocator.h" #if !defined (__ACE_INLINE__) -#include "IFR_BaseS.inl" +#include "orbsvcs/IFRService/IFR_BaseS.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h index bd0d14d45f5..02963091e2a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h @@ -1246,10 +1246,10 @@ namespace POA_CORBA TAO_END_VERSIONED_NAMESPACE_DECL -#include "IFR_BaseS_T.h" +#include "orbsvcs/IFRService/IFR_BaseS_T.h" #if defined (__ACE_INLINE__) -#include "IFR_BaseS.inl" +#include "orbsvcs/IFRService/IFR_BaseS.inl" #endif /* defined INLINE */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp index c2d66dc74a8..4dff6ffb090 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp @@ -31,10 +31,10 @@ #ifndef _TAO_IDL_ORIG_IFR_BASES_T_CPP_ #define _TAO_IDL_ORIG_IFR_BASES_T_CPP_ -#include "IFR_BaseS_T.h" +#include "orbsvcs/IFRService/IFR_BaseS_T.h" #if !defined (__ACE_INLINE__) -#include "IFR_BaseS_T.inl" +#include "orbsvcs/IFRService/IFR_BaseS_T.inl" #endif /* !defined INLINE */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h index 396586e5433..1313c456c1d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h @@ -908,11 +908,11 @@ namespace POA_CORBA TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "IFR_BaseS_T.inl" +#include "orbsvcs/IFRService/IFR_BaseS_T.inl" #endif /* defined INLINE */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "IFR_BaseS_T.cpp" +#include "orbsvcs/IFRService/IFR_BaseS_T.cpp" #endif /* defined REQUIRED SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp index 1fe85a7d2a5..62e82e0ad6e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp @@ -33,7 +33,7 @@ #define _TAO_IDL_ORIG_IFR_BASICS_CPP_ -#include "IFR_BasicS.h" +#include "orbsvcs/IFRService/IFR_BasicS.h" #include "tao/PortableServer/Operation_Table_Perfect_Hash.h" #include "tao/PortableServer/Upcall_Command.h" #include "tao/PortableServer/Upcall_Wrapper.h" @@ -69,7 +69,7 @@ #include "ace/Malloc_Allocator.h" #if !defined (__ACE_INLINE__) -#include "IFR_BasicS.inl" +#include "orbsvcs/IFRService/IFR_BasicS.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h index 6ea55966148..f1a3050b67c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h @@ -34,7 +34,7 @@ #include /**/ "ace/pre.h" #include "tao/IFR_Client/IFR_BasicC.h" -#include "IFR_BaseS.h" +#include "orbsvcs/IFRService/IFR_BaseS.h" #include "tao/ParameterModeS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -7883,10 +7883,10 @@ namespace POA_CORBA TAO_END_VERSIONED_NAMESPACE_DECL -#include "IFR_BasicS_T.h" +#include "orbsvcs/IFRService/IFR_BasicS_T.h" #if defined (__ACE_INLINE__) -#include "IFR_BasicS.inl" +#include "orbsvcs/IFRService/IFR_BasicS.inl" #endif /* defined INLINE */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp index 1b3eeebb76a..03d51e6bba8 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp @@ -31,10 +31,10 @@ #ifndef _TAO_IDL_ORIG_IFR_BASICS_T_CPP_ #define _TAO_IDL_ORIG_IFR_BASICS_T_CPP_ -#include "IFR_BasicS_T.h" +#include "orbsvcs/IFRService/IFR_BasicS_T.h" #if !defined (__ACE_INLINE__) -#include "IFR_BasicS_T.inl" +#include "orbsvcs/IFRService/IFR_BasicS_T.inl" #endif /* !defined INLINE */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h index f06759d4b3c..ebca0c6b9fe 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h @@ -7952,11 +7952,11 @@ namespace POA_CORBA TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "IFR_BasicS_T.inl" +#include "orbsvcs/IFRService/IFR_BasicS_T.inl" #endif /* defined INLINE */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "IFR_BasicS_T.cpp" +#include "orbsvcs/IFRService/IFR_BasicS_T.cpp" #endif /* defined REQUIRED SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp index a9e2b380b37..ff99bba5658 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp @@ -33,7 +33,7 @@ #define _TAO_IDL_ORIG_IFR_COMPONENTSS_CPP_ -#include "IFR_ComponentsS.h" +#include "orbsvcs/IFRService/IFR_ComponentsS.h" #include "tao/PortableServer/Operation_Table_Perfect_Hash.h" #include "tao/PortableServer/Upcall_Command.h" #include "tao/PortableServer/Upcall_Wrapper.h" @@ -67,7 +67,7 @@ #include "ace/Malloc_Allocator.h" #if !defined (__ACE_INLINE__) -#include "IFR_ComponentsS.inl" +#include "orbsvcs/IFRService/IFR_ComponentsS.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h index 13f64641067..91a17a070cc 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h @@ -34,7 +34,7 @@ #include /**/ "ace/pre.h" #include "tao/IFR_Client/IFR_ComponentsC.h" -#include "IFR_ExtendedS.h" +#include "orbsvcs/IFRService/IFR_ExtendedS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -5104,10 +5104,10 @@ namespace POA_CORBA TAO_END_VERSIONED_NAMESPACE_DECL -#include "IFR_ComponentsS_T.h" +#include "orbsvcs/IFRService/IFR_ComponentsS_T.h" #if defined (__ACE_INLINE__) -#include "IFR_ComponentsS.inl" +#include "orbsvcs/IFRService/IFR_ComponentsS.inl" #endif /* defined INLINE */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp index b2d75f94608..9ea48d226df 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp @@ -31,10 +31,10 @@ #ifndef _TAO_IDL_ORIG_IFR_COMPONENTSS_T_CPP_ #define _TAO_IDL_ORIG_IFR_COMPONENTSS_T_CPP_ -#include "IFR_ComponentsS_T.h" +#include "orbsvcs/IFRService/IFR_ComponentsS_T.h" #if !defined (__ACE_INLINE__) -#include "IFR_ComponentsS_T.inl" +#include "orbsvcs/IFRService/IFR_ComponentsS_T.inl" #endif /* !defined INLINE */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h index f5868a35eb2..cad66ac774e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h @@ -5368,11 +5368,11 @@ namespace POA_CORBA TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "IFR_ComponentsS_T.inl" +#include "orbsvcs/IFRService/IFR_ComponentsS_T.inl" #endif /* defined INLINE */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "IFR_ComponentsS_T.cpp" +#include "orbsvcs/IFRService/IFR_ComponentsS_T.cpp" #endif /* defined REQUIRED SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp index 57a991f3f8c..cfd97366bc6 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp @@ -33,7 +33,7 @@ #define _TAO_IDL_ORIG_IFR_EXTENDEDS_CPP_ -#include "IFR_ExtendedS.h" +#include "orbsvcs/IFRService/IFR_ExtendedS.h" #include "tao/PortableServer/Operation_Table_Perfect_Hash.h" #include "tao/PortableServer/Upcall_Command.h" #include "tao/PortableServer/Upcall_Wrapper.h" @@ -67,7 +67,7 @@ #include "ace/Malloc_Allocator.h" #if !defined (__ACE_INLINE__) -#include "IFR_ExtendedS.inl" +#include "orbsvcs/IFRService/IFR_ExtendedS.inl" #endif /* !defined INLINE */ // TAO_IDL - Generated from diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h index 87f87bdbf01..a1385081787 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h @@ -34,7 +34,7 @@ #include /**/ "ace/pre.h" #include "tao/IFR_Client/IFR_ExtendedC.h" -#include "IFR_BasicS.h" +#include "orbsvcs/IFRService/IFR_BasicS.h" #include "tao/AnyTypeCode/VisibilityS.h" #include "tao/AnyTypeCode/ValueModifierS.h" @@ -2125,10 +2125,10 @@ namespace POA_CORBA TAO_END_VERSIONED_NAMESPACE_DECL -#include "IFR_ExtendedS_T.h" +#include "orbsvcs/IFRService/IFR_ExtendedS_T.h" #if defined (__ACE_INLINE__) -#include "IFR_ExtendedS.inl" +#include "orbsvcs/IFRService/IFR_ExtendedS.inl" #endif /* defined INLINE */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp index 7821ed96169..0c4b6e67e52 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp @@ -31,10 +31,10 @@ #ifndef _TAO_IDL_ORIG_IFR_EXTENDEDS_T_CPP_ #define _TAO_IDL_ORIG_IFR_EXTENDEDS_T_CPP_ -#include "IFR_ExtendedS_T.h" +#include "orbsvcs/IFRService/IFR_ExtendedS_T.h" #if !defined (__ACE_INLINE__) -#include "IFR_ExtendedS_T.inl" +#include "orbsvcs/IFRService/IFR_ExtendedS_T.inl" #endif /* !defined INLINE */ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h index 936317c7330..9f6d959523c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h @@ -2013,11 +2013,11 @@ namespace POA_CORBA TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -#include "IFR_ExtendedS_T.inl" +#include "orbsvcs/IFRService/IFR_ExtendedS_T.inl" #endif /* defined INLINE */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "IFR_ExtendedS_T.cpp" +#include "orbsvcs/IFRService/IFR_ExtendedS_T.cpp" #endif /* defined REQUIRED SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp index 40d09f52ae5..a5e914dcf87 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp @@ -10,7 +10,7 @@ // Priyanka Gontla <pgontla@ece.uci.edu> // ================================================================ -#include "IFR_Service_Loader.h" +#include "orbsvcs/IFRService/IFR_Service_Loader.h" #include "ace/Dynamic_Service.h" #include "ace/Argv_Type_Converter.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h index 751ba68c8ed..4ed289fb58b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h @@ -25,7 +25,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp index 821224e8885..6d98478e2e2 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "IFR_Service_Utils.h" -#include "IDLType_i.h" -#include "Container_i.h" -#include "Contained_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "orbsvcs/IFRService/IDLType_i.h" +#include "orbsvcs/IFRService/Container_i.h" +#include "orbsvcs/IFRService/Contained_i.h" #include "orbsvcs/IFRService/ComponentRepository_i.h" #include "orbsvcs/IFRService/Options.h" #include "orbsvcs/IFRService/IFR_ComponentsS.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h index c23f75b1661..2b91098a1ee 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h @@ -25,7 +25,7 @@ #include /**/ "ace/pre.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #include "tao/IFR_Client/IFR_BasicC.h" #include "tao/PortableServer/PortableServer.h" #include "tao/ORB.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp index deabd6d0ff5..848677edd13 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp @@ -3,9 +3,9 @@ #ifndef TAO_IFR_SERVICE_UTILS_T_CPP #define TAO_IFR_SERVICE_UTILS_T_CPP -#include "IFR_Service_Utils_T.h" -#include "IFR_Service_Utils.h" -#include "Repository_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils_T.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "orbsvcs/IFRService/Repository_i.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h index 2f0df4be017..056582e494a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h @@ -113,7 +113,7 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "IFR_Service_Utils_T.cpp" +#include "orbsvcs/IFRService/IFR_Service_Utils_T.cpp" #endif /* defined REQUIRED SOURCE */ #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp index 57c6d85cfd3..9846d186808 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "IRObject_i.h" -#include "Repository_i.h" -#include "IDLType_i.h" -#include "Contained_i.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/IRObject_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/IDLType_i.h" +#include "orbsvcs/IFRService/Contained_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "tao/PortableServer/Root_POA.h" #include "tao/PortableServer/POA_Current_Impl.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h index 30733d02dfb..a6bbdc4adfa 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h @@ -22,13 +22,13 @@ #define TAO_IROBJECT_I_H #include "ace/Configuration.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "IFR_ExtendedS.h" +#include "orbsvcs/IFRService/IFR_ExtendedS.h" #if defined(_MSC_VER) #pragma warning(push) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp index 0403aca795f..943a6082e1f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp @@ -1,12 +1,12 @@ // $Id$ -#include "InterfaceAttrExtension_i.h" -#include "Repository_i.h" -#include "InterfaceDef_i.h" -#include "OperationDef_i.h" -#include "AttributeDef_i.h" -#include "ExtAttributeDef_i.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/InterfaceAttrExtension_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/InterfaceDef_i.h" +#include "orbsvcs/IFRService/OperationDef_i.h" +#include "orbsvcs/IFRService/AttributeDef_i.h" +#include "orbsvcs/IFRService/ExtAttributeDef_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h index e2f231af0e7..f330fe3dec6 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h @@ -20,8 +20,8 @@ #ifndef TAO_INTERFACEATTREXTENSION_I_H #define TAO_INTERFACEATTREXTENSION_I_H -#include "IRObject_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/IRObject_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp index 64a61678227..6360f9c745f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "InterfaceDef_i.h" -#include "Repository_i.h" -#include "AttributeDef_i.h" -#include "OperationDef_i.h" -#include "IFR_Service_Utils.h" -#include "IFR_Service_Utils_T.h" +#include "orbsvcs/IFRService/InterfaceDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/AttributeDef_i.h" +#include "orbsvcs/IFRService/OperationDef_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "orbsvcs/IFRService/IFR_Service_Utils_T.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h index 1b32b2d23db..4d010fa0d48 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h @@ -21,10 +21,10 @@ #ifndef TAO_INTERFACEDEF_I_H #define TAO_INTERFACEDEF_I_H -#include "Container_i.h" -#include "Contained_i.h" -#include "IDLType_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/Container_i.h" +#include "orbsvcs/IFRService/Contained_i.h" +#include "orbsvcs/IFRService/IDLType_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp index 03c7bd1e6a3..dab11360086 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "LocalInterfaceDef_i.h" -#include "Repository_i.h" +#include "orbsvcs/IFRService/LocalInterfaceDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" ACE_RCSID (IFRService, LocalInterfaceDef_i, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h index aeb91cf0483..92bfd1be945 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_LOCALINTERFACEDEF_I_H #define TAO_LOCALINTERFACEDEF_I_H -#include "InterfaceDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/InterfaceDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp index affebfc885b..731d9aaf511 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "ModuleDef_i.h" -#include "Repository_i.h" +#include "orbsvcs/IFRService/ModuleDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h index df8d915f4c0..8c178c7cf50 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h @@ -22,9 +22,9 @@ #define TAO_MODULEDEF_I_H //#include "Container_i.h" -#include "Contained_i.h" -#include "ComponentModuleDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/Contained_i.h" +#include "orbsvcs/IFRService/ComponentModuleDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp index b5d73bba38e..e207ffe8823 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "NativeDef_i.h" -#include "Repository_i.h" +#include "orbsvcs/IFRService/NativeDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h index 91425e09ad5..d6960a185e9 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_NATIVEDEF_I_H #define TAO_NATIVEDEF_I_H -#include "TypedefDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/TypedefDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp index 6b78e7c25e6..cf8d8a91ba9 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "OperationDef_i.h" -#include "Repository_i.h" -#include "IDLType_i.h" -#include "ExceptionDef_i.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/OperationDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/IDLType_i.h" +#include "orbsvcs/IFRService/ExceptionDef_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/Auto_Ptr.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h index d309e1fd06c..f11a2850319 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_OPERATIONDEF_I_H #define TAO_OPERATIONDEF_I_H -#include "Contained_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/Contained_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp index 13533f28a58..26f71866bfd 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "Options.h" +#include "orbsvcs/IFRService/Options.h" #include "ace/Get_Opt.h" #include "ace/Log_Msg.h" #include "ace/Null_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Options.h b/TAO/orbsvcs/orbsvcs/IFRService/Options.h index 79554df38f9..f1453559b03 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Options.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/Options.h @@ -24,7 +24,7 @@ #include "ace/Singleton.h" #include "ace/Null_Mutex.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #include "tao/Versioned_Namespace.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp index 5fd58f1639f..f9789c4282b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "Repository_i.h" -#include "PrimitiveDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/PrimitiveDef_i.h" ACE_RCSID (IFRService, PrimitiveDef_i, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h index fef725da150..05103c5c7ed 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_PRIMITIVEDEF_I_H #define TAO_PRIMITIVEDEF_I_H -#include "IDLType_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/IDLType_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp index 9d859d45567..f9bf6490763 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "Repository_i.h" -#include "ProvidesDef_i.h" -#include "IFR_ComponentsS.h" -#include "IFR_Service_Utils_T.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/ProvidesDef_i.h" +#include "orbsvcs/IFRService/IFR_ComponentsS.h" +#include "orbsvcs/IFRService/IFR_Service_Utils_T.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h index 30c04de398f..e07923a3fee 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h @@ -20,8 +20,8 @@ #ifndef TAO_PROVIDESDEF_I_H #define TAO_PROVIDESDEF_I_H -#include "Contained_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/Contained_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp index 8b6df87e6b6..1a06feb5687 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp @@ -1,8 +1,8 @@ /* -*- C++ -*- */ // $Id$ -#include "PublishesDef_i.h" -#include "Repository_i.h" +#include "orbsvcs/IFRService/PublishesDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" ACE_RCSID (IFRService, PublishesDef_i, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h index fbfeb8adbdd..613bc9010e1 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.h @@ -20,8 +20,8 @@ #ifndef TAO_PUBLISHESDEF_I_H #define TAO_PUBLISHESDEF_I_H -#include "EventPortDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/EventPortDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp index 94404797eb9..a6e4c6a6051 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "RecursDef_i.h" +#include "orbsvcs/IFRService/RecursDef_i.h" ACE_RCSID (IFRService, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.h index 203c78c3236..5fdf5b7e7a0 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.h @@ -21,7 +21,7 @@ #ifndef TAO_RECURSDEF_I_H #define TAO_RECURSDEF_I_H -#include "TypedefDef_i.h" +#include "orbsvcs/IFRService/TypedefDef_i.h" #include "ace/SString.h" #include "ace/OS_NS_stdlib.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp index 484e829b333..028f07f18cc 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "concrete_classes.h" -#include "Repository_i.h" -#include "IDLType_i.h" -#include "Options.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/concrete_classes.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/IDLType_i.h" +#include "orbsvcs/IFRService/Options.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "tao/ORB.h" #include "tao/Object_KeyC.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h index e5adc59accc..06cbfdc2360 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h @@ -21,8 +21,8 @@ #ifndef REPOSITORY_I_H #define REPOSITORY_I_H -#include "Container_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/Container_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -33,7 +33,7 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -#include "IFR_macro.h" +#include "orbsvcs/IFRService/IFR_macro.h" #include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h" #include "tao/CORBA_String.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp index 1d14b090c1e..5f7465b47fe 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "SequenceDef_i.h" -#include "Repository_i.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/SequenceDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/Auto_Ptr.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h index 85fad8e044f..cbed0039d88 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h @@ -21,8 +21,8 @@ #ifndef SEQUENCEDEF_I_H #define SEQUENCEDEF_I_H -#include "IDLType_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/IDLType_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp index 51b6729ed30..b8068cdb642 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "Repository_i.h" -#include "StringDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/StringDef_i.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h index 99b8ee22326..5f1e402b8ce 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_STRINGDEF_I_H #define TAO_STRINGDEF_I_H -#include "IDLType_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/IDLType_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp index eaa20ccdcf7..e4cef6229e6 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "StructDef_i.h" -#include "RecursDef_i.h" -#include "Repository_i.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/StructDef_i.h" +#include "orbsvcs/IFRService/RecursDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/Auto_Ptr.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h index 1eff26460cc..a679e5ff3dd 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h @@ -21,9 +21,9 @@ #ifndef TAO_STRUCTDEF_I_H #define TAO_STRUCTDEF_I_H -#include "TypedefDef_i.h" -#include "Container_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/TypedefDef_i.h" +#include "orbsvcs/IFRService/Container_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp index 43e4bb44ed0..3261a380750 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "Repository_i.h" -#include "TypedefDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/TypedefDef_i.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h index b6037230db7..1d836a105d2 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h @@ -21,9 +21,9 @@ #ifndef TAO_TYPEDEFDEF_I_H #define TAO_TYPEDEFDEF_I_H -#include "Contained_i.h" -#include "IDLType_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/Contained_i.h" +#include "orbsvcs/IFRService/IDLType_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp index c21eb8b8e4c..efc0446c718 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "UnionDef_i.h" -#include "RecursDef_i.h" -#include "Repository_i.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/UnionDef_i.h" +#include "orbsvcs/IFRService/RecursDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" #include "tao/CDR.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h index ea26a0a3de5..feace1c2ec5 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h @@ -21,9 +21,9 @@ #ifndef TAO_UNIONDEF_I_H #define TAO_UNIONDEF_I_H -#include "TypedefDef_i.h" -#include "Container_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/TypedefDef_i.h" +#include "orbsvcs/IFRService/Container_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp index 4f8ac2424a9..833a7fd0c6a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "Repository_i.h" -#include "UsesDef_i.h" -#include "IFR_Service_Utils_T.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/UsesDef_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils_T.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h index 9ba4e6800dc..c0daa00be10 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_USESDEF_I_H #define TAO_USESDEF_I_H -#include "Contained_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/Contained_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp index 7c1fdcbc193..c8a710dcc23 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "ValueBoxDef_i.h" -#include "Repository_i.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/ValueBoxDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/Auto_Ptr.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h index 287aef87fa5..9fd68ca1cc8 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_VALUEBOXDEF_I_H #define TAO_VALUEBOXDEF_I_H -#include "TypedefDef_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/TypedefDef_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp index 2447364b7ee..9968cf84a82 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "Repository_i.h" -#include "ValueDef_i.h" -#include "AttributeDef_i.h" -#include "OperationDef_i.h" -#include "IFR_Service_Utils.h" -#include "IFR_Service_Utils_T.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/ValueDef_i.h" +#include "orbsvcs/IFRService/AttributeDef_i.h" +#include "orbsvcs/IFRService/OperationDef_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" +#include "orbsvcs/IFRService/IFR_Service_Utils_T.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h index 53c6b530e41..0d5dd9d7f9f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h @@ -21,9 +21,9 @@ #ifndef TAO_VALUEDEF_I_H #define TAO_VALUEDEF_I_H -#include "Contained_i.h" -#include "IDLType_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/Contained_i.h" +#include "orbsvcs/IFRService/IDLType_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp index a503b34cb32..bb6b101ddd0 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp @@ -1,10 +1,10 @@ // $Id$ -#include "Repository_i.h" -#include "ValueMemberDef_i.h" -#include "IDLType_i.h" -#include "IFR_Service_Utils_T.h" -#include "IFR_Service_Utils.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/ValueMemberDef_i.h" +#include "orbsvcs/IFRService/IDLType_i.h" +#include "orbsvcs/IFRService/IFR_Service_Utils_T.h" +#include "orbsvcs/IFRService/IFR_Service_Utils.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h index aa0c859207b..1da19410d15 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_VALUEMEMBERDEF_I_H #define TAO_VALUEMEMBERDEF_I_H -#include "Contained_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/Contained_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp index 69efbfd6554..252050a2855 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp @@ -1,7 +1,7 @@ // $Id$ -#include "Repository_i.h" -#include "WstringDef_i.h" +#include "orbsvcs/IFRService/Repository_i.h" +#include "orbsvcs/IFRService/WstringDef_i.h" #include "ace/SString.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h index 4e9d8faa2d5..c1317c0a888 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h @@ -21,8 +21,8 @@ #ifndef TAO_WSTRINGDEF_I_H #define TAO_WSTRINGDEF_I_H -#include "IDLType_i.h" -#include "ifr_service_export.h" +#include "orbsvcs/IFRService/IDLType_i.h" +#include "orbsvcs/IFRService/ifr_service_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/IFRService/concrete_classes.h b/TAO/orbsvcs/orbsvcs/IFRService/concrete_classes.h index 917db83e7a4..27407fa581c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/concrete_classes.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/concrete_classes.h @@ -19,36 +19,36 @@ #ifndef CONCRETE_CLASSES_H #define CONCRETE_CLASSES_H -#include "PrimitiveDef_i.h" -#include "StringDef_i.h" -#include "WstringDef_i.h" -#include "SequenceDef_i.h" -#include "ArrayDef_i.h" -#include "FixedDef_i.h" -#include "EnumDef_i.h" -#include "AliasDef_i.h" -#include "NativeDef_i.h" -#include "ValueBoxDef_i.h" -#include "UnionDef_i.h" -#include "StructDef_i.h" -#include "ValueMemberDef_i.h" -#include "FactoryDef_i.h" -#include "AttributeDef_i.h" -#include "ConstantDef_i.h" -#include "ValueDef_i.h" -#include "ExceptionDef_i.h" -#include "ModuleDef_i.h" -#include "ExtAbstractInterfaceDef_i.h" -#include "ExtLocalInterfaceDef_i.h" +#include "orbsvcs/IFRService/PrimitiveDef_i.h" +#include "orbsvcs/IFRService/StringDef_i.h" +#include "orbsvcs/IFRService/WstringDef_i.h" +#include "orbsvcs/IFRService/SequenceDef_i.h" +#include "orbsvcs/IFRService/ArrayDef_i.h" +#include "orbsvcs/IFRService/FixedDef_i.h" +#include "orbsvcs/IFRService/EnumDef_i.h" +#include "orbsvcs/IFRService/AliasDef_i.h" +#include "orbsvcs/IFRService/NativeDef_i.h" +#include "orbsvcs/IFRService/ValueBoxDef_i.h" +#include "orbsvcs/IFRService/UnionDef_i.h" +#include "orbsvcs/IFRService/StructDef_i.h" +#include "orbsvcs/IFRService/ValueMemberDef_i.h" +#include "orbsvcs/IFRService/FactoryDef_i.h" +#include "orbsvcs/IFRService/AttributeDef_i.h" +#include "orbsvcs/IFRService/ConstantDef_i.h" +#include "orbsvcs/IFRService/ValueDef_i.h" +#include "orbsvcs/IFRService/ExceptionDef_i.h" +#include "orbsvcs/IFRService/ModuleDef_i.h" +#include "orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h" +#include "orbsvcs/IFRService/ExtLocalInterfaceDef_i.h" -#include "ComponentDef_i.h" -#include "HomeDef_i.h" -#include "FinderDef_i.h" -#include "ConsumesDef_i.h" -#include "PublishesDef_i.h" -#include "EmitsDef_i.h" -#include "EventDef_i.h" -#include "ProvidesDef_i.h" -#include "UsesDef_i.h" +#include "orbsvcs/IFRService/ComponentDef_i.h" +#include "orbsvcs/IFRService/HomeDef_i.h" +#include "orbsvcs/IFRService/FinderDef_i.h" +#include "orbsvcs/IFRService/ConsumesDef_i.h" +#include "orbsvcs/IFRService/PublishesDef_i.h" +#include "orbsvcs/IFRService/EmitsDef_i.h" +#include "orbsvcs/IFRService/EventDef_i.h" +#include "orbsvcs/IFRService/ProvidesDef_i.h" +#include "orbsvcs/IFRService/UsesDef_i.h" #endif /* CONCRETE_CLASSES_H */ |