ChangeLogTag: Fri Mar 10 07:09:22 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>

18 files changed, 24 insertions, 24 deletions

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"