ChangeLogTag:Tue Aug 23 15:54:52 2005 Ossama Othman <ossama@dre.vanderbilt.edu>

5 files changed, 46 insertions, 21 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index df264c9dc66..e65c9f940a0 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,23 @@
+Tue Aug 23 15:54:52 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+	* TAO_IDL/be/be_codegen.cpp (gen_stub_hdr_includes):
+
+	  Another round of generated include directive reording to address
+	  template related order of parsing issues in g++ 3.4.x or better.
+
+	* tao/Any_Insert_Policy_T.h (any_insert):
+
+	  Made these methods non-virtual.  All binding is done at
+	  compile-time so there is no need make them virtual.  Also
+	  addresses "class with virtual funtions but no virtual
+	  destructor" g++ 4.0 warnings.
+
+	* tao/IFR_Client/IFR_ComponentsC.h:
+	* orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h:
+
+	  More g++ 3.4.x or better order of parsing related template
+	  error fixes.
+
 Tue Aug 23 10:43:07 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
 	* tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp:
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index 6ba28e1129c..076109701f7 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -1412,6 +1412,12 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
   // that require all necessary non-dependent names be parsed prior to
   // parsing templates that may use them (e.g. GNU g++ 3.4.x).
 
+  this->gen_cond_file_include ((be_global->tc_support ()
+                                || idl_global->exception_seen_)
+                               && !be_global->gen_anyop_files (),
+                               "tao/AnyTypeCode/AnyTypeCode_methods.h",
+                               this->client_header_);
+
   if (idl_global->abstract_iface_seen_)
     {
       // Include the AbstractBase file from the Valuetype library.
@@ -1454,12 +1460,6 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
         );
     }
 
-  this->gen_cond_file_include ((be_global->tc_support ()
-                                || idl_global->exception_seen_)
-                               && !be_global->gen_anyop_files (),
-                               "tao/AnyTypeCode/AnyTypeCode_methods.h",
-                               this->client_header_);
-
   // @note This header should not go first.  See the discussion above
   //       regarding non-dependent template names.
   this->gen_standard_include (this->client_header_,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
index b59da5db26e..8978bc212bf 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
@@ -24,10 +24,10 @@
 
 #include /**/ "ace/pre.h"
 
+#include "ifr_service_export.h"
+#include "tao/IFR_Client/IFR_BasicC.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/ORB.h"
-#include "tao/IFR_Client/IFR_BasicC.h"
-#include "ifr_service_export.h"
 
 #include "ace/Configuration.h"
 
diff --git a/TAO/tao/Any_Insert_Policy_T.h b/TAO/tao/Any_Insert_Policy_T.h
index e9e645f9b92..2f35d558898 100644
--- a/TAO/tao/Any_Insert_Policy_T.h
+++ b/TAO/tao/Any_Insert_Policy_T.h
@@ -34,8 +34,9 @@ namespace TAO
   template <typename S>
   class Any_Insert_Policy_Stream
   {
-    public:
-      virtual void any_insert (CORBA::Any* p, S const & x) const
+  public:
+
+    void any_insert (CORBA::Any* p, S const & x) const
       {
         (*p) <<= x;
       }
@@ -44,8 +45,9 @@ namespace TAO
   template <typename S>
   class Any_Insert_Policy_AnyTypeCode_Adapter
   {
-    public:
-      virtual void any_insert (CORBA::Any* p, S const & x) const
+  public:
+  
+    void any_insert (CORBA::Any* p, S const & x) const
       {
         TAO_AnyTypeCode_Adapter *adapter =
           ACE_Dynamic_Service<TAO_AnyTypeCode_Adapter>::instance (
@@ -68,8 +70,9 @@ namespace TAO
   template <typename S>
   class Any_Insert_Policy_IFR_Client_Adapter
   {
-    public:
-      virtual void any_insert (CORBA::Any* p, S const & x) const
+  public:
+
+    void any_insert (CORBA::Any* p, S const & x) const
       {
         TAO_IFR_Client_Adapter *adapter =
           ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
@@ -83,8 +86,9 @@ namespace TAO
   template <typename S>
   class Any_Insert_Policy_Noop
   {
-    public:
-      virtual void any_insert (CORBA::Any* , S const &) const
+  public:
+
+    void any_insert (CORBA::Any* , S const &) const
       {
       }
   };
@@ -92,14 +96,15 @@ namespace TAO
   template <typename S>
   class Any_Insert_Policy_CORBA_Object
   {
-    public:
-      virtual void any_insert (CORBA::Any* , S const &) const
+  public:
+  
+    void any_insert (CORBA::Any* , S const &) const
       {
         if (TAO_debug_level > 2)
           {
             ACE_DEBUG ((LM_DEBUG,
                         "TAO (%P|%t) - Cannot insert a vanilla CORBA Object"
-                        " into an Any for returning the return argument \n"));
+                        " into an Any for returning the return value.\n"));
           }
       }
   };
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.h b/TAO/tao/IFR_Client/IFR_ComponentsC.h
index ad47576bc3f..f2efcd1c0c8 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.h
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.h
@@ -41,12 +41,12 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ifr_client_export.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
-#include "tao/AnyTypeCode/TypeCode.h"
-#include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/Sequence_T.h"
 #include "tao/Objref_VarOut_T.h"
 #include "tao/Seq_Var_T.h"