ChangeLogTag:Tue Aug 23 20:09:59 2005 Ossama Othman <ossama@dre.vanderbilt.edu>

6 files changed, 36 insertions, 14 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 5b6c40375b3..7c372b3de98 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,15 @@
+Tue Aug 23 20:09:59 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+	* DAnCE/Old_Config_Handlers/DT_Handler.h:
+	* DAnCE/RTNodeApplication/RTServer_Impl.h:
+	* DAnCE/ciao/Container_Base.h:
+	* DAnCE/ciao/Context_Impl_Base.h:
+	* DAnCE/ciao/NodeApplication_Impl.h:
+
+	  Reordered include directives to make sure all necessary
+	  non-dependent names are parsed before the templates that use
+	  them.  Addresses g++ 3.4.x or better compile-time errors.
+
 Tue Aug 23 19:29:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * DAnCE/DeploymentManager/DeploymentManager.mpc:
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/DT_Handler.h b/TAO/CIAO/DAnCE/Old_Config_Handlers/DT_Handler.h
index 8cd04c66650..54ab924355a 100644
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/DT_Handler.h
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/DT_Handler.h
@@ -13,7 +13,7 @@
 #include /**/ "ace/pre.h"
 
 #include "Config_Handler_export.h"
-#include "tao/ORB.h"
+#include "tao/Basic_Types.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -30,6 +30,12 @@ using xercesc::DOMText;
 using xercesc::DOMNodeIterator;
 using xercesc::DOMNode;
 
+namespace CORBA
+{
+  class ORB;
+  typedef ORB* ORB_ptr;
+}
+
 namespace CIAO
 {
   namespace Config_Handler
diff --git a/TAO/CIAO/DAnCE/RTNodeApplication/RTServer_Impl.h b/TAO/CIAO/DAnCE/RTNodeApplication/RTServer_Impl.h
index 75758c0dc36..fdcca084ed5 100644
--- a/TAO/CIAO/DAnCE/RTNodeApplication/RTServer_Impl.h
+++ b/TAO/CIAO/DAnCE/RTNodeApplication/RTServer_Impl.h
@@ -31,10 +31,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/RTCORBA/RTCORBA.h"
 #include "ciao/NodeApplication_Impl.h"
-//#include "ciao/Container_Impl.h"
 #include "ciao/Container_Base.h"
+#include "tao/RTCORBA/RTCORBA.h"
 
 namespace CIAO
 {
diff --git a/TAO/CIAO/DAnCE/ciao/Container_Base.h b/TAO/CIAO/DAnCE/ciao/Container_Base.h
index 4b2fe6b4fc7..f6ae970238a 100644
--- a/TAO/CIAO/DAnCE/ciao/Container_Base.h
+++ b/TAO/CIAO/DAnCE/ciao/Container_Base.h
@@ -15,16 +15,21 @@
 
 #ifndef CIAO_CONTAINER_BASE_H
 #define CIAO_CONTAINER_BASE_H
+
 #include /**/ "ace/pre.h"
 
-#include "ace/Hash_Map_Manager_T.h"
-#include "tao/ORB.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Base.h"
 #include "ciao/CCM_ContainerC.h"
 #include "ciao/Deployment_CoreC.h"
 #include "ciao/CIAO_Server_Export.h"
 
+#include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/Servant_Base.h"
+
+#include "tao/ORB.h"
+
+#include "ace/Hash_Map_Manager_T.h"
+
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
diff --git a/TAO/CIAO/DAnCE/ciao/Context_Impl_Base.h b/TAO/CIAO/DAnCE/ciao/Context_Impl_Base.h
index 29238c58141..737956742a6 100644
--- a/TAO/CIAO/DAnCE/ciao/Context_Impl_Base.h
+++ b/TAO/CIAO/DAnCE/ciao/Context_Impl_Base.h
@@ -19,14 +19,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Objref_VarOut_T.h"
+#include "CIAO_Server_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "CIAO_Server_Export.h"
 #include "ciao/CCM_ContainerC.h"
+#include "tao/Objref_VarOut_T.h"
 
 namespace Components
 {
diff --git a/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.h b/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.h
index b2dccf413d6..133ac3a697e 100644
--- a/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.h
+++ b/TAO/CIAO/DAnCE/ciao/NodeApplication_Impl.h
@@ -20,16 +20,16 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/ORB.h"
-#include "ace/Synch.h"
-#include "ace/Synch_Traits.h"
-#include "ace/SString.h"
-#include "ace/Hash_Map_Manager_T.h"
 #include "Container_Base.h"
 #include "Deployment_CoreS.h"
 #include "Server_init.h"
 #include "CIAO_common.h"
 #include "Object_Set_T.h"
+#include "tao/ORB.h"
+#include "ace/Synch.h"
+#include "ace/Synch_Traits.h"
+#include "ace/SString.h"
+#include "ace/Hash_Map_Manager_T.h"
 
 using CIAO::Utility::write_IOR;