Fri Sep 7 18:15:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

13 files changed, 38 insertions, 23 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 63f795a9c9b..6576d108cfc 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,22 @@
+Fri Sep  7 18:15:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO-INSTALL.html:
+          Updated supported platform list
+
+        * tao/Abstract_Servant_Base.h:
+        * tao/Object.cpp:
+        * tao/Object.h:
+        * tao/Object_Proxy_Broker.h:
+        * tao/PortableServer/Collocated_Object_Proxy_Broker.cpp:
+        * tao/PortableServer/Collocated_Object_Proxy_Broker.h:
+        * tao/be/be_interface.cpp:
+        * tao/be/be_visitor_component/component_sh.cpp:
+        * tao/be/be_visitor_interface/amh_sh.cpp:
+        * tao/be/be_visitor_interface/interface_sh.cpp:
+        * tao/be/be_visitor_interface/interface_ss.cpp:
+          Disable get_interface when CORBA/e is enabled. This fixes bugzilla bug
+          3066
+
 Thu Sep  6 22:57:44 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
 
         * utils/NamingViewer/AddNameServerDlg.h:
@@ -53,9 +72,6 @@ Thu Sep  6 12:37:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Thu Sep  6 10:32:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * TAO-INSTALL.html:
-          Updated supported platform list
-
         * orbsvcs/orbsvcs/AV/AV_Core.h:
         * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h:
         * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h:
diff --git a/TAO/TAO-INSTALL.html b/TAO/TAO-INSTALL.html
index 929e5235d91..c5ec08562d7 100644
--- a/TAO/TAO-INSTALL.html
+++ b/TAO/TAO-INSTALL.html
@@ -31,9 +31,10 @@ to run TAO on:<P>
 <table width="100%" border=1>
   <tr valign=top>
     <td><b>Fully supported, i.e., continually tested and used daily</b></td>
-    <td>Solaris 7, 8 and 9, Windows 2000/XP (7.1, and 8.0 and
-        Borland C++ Builder 6/2006), Linux/Intel (Redhat,
-        Debian and SuSe), Linux/Alpha (SuSe), VxWorks 5.5.1/6.2/6.3, OpenVMS 8.2
+    <td>Solaris 7, 8, 9, 10 & 11, Windows 2000/XP/2003/Vista (7.1, and 8.0 and
+        Borland C++ Builder 6/2006/2007), Linux/Intel (Redhat,
+        Debian and SuSe), VxWorks 5.5.1/6.2/6.3/6.4/6,5, OpenVMS 8.2 & 8.3
+        Alpha & IA64
     </td>
   </tr>
   <tr valign=top bgcolor="#AFAFAF">
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index a584d72bb47..3669fcf9ea4 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -848,7 +848,7 @@ be_interface::gen_operation_table (const char *flat_name,
             ++this->skel_count_;
           }
 
-        if (!be_global->gen_minimum_corba ())
+        if (!be_global->gen_corba_e () && !be_global->gen_minimum_corba ())
           {
             *os << "{\"_interface\", &" << skeleton_class_name
                 << "::_interface_skel, 0}," << be_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_sh.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_sh.cpp
index 7e0bb0afb0b..3f802c93d92 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_sh.cpp
@@ -179,7 +179,7 @@ be_visitor_component_sh::visit_component (be_component *node)
         << ");" << be_uidt_nl << be_nl;
     }
 
-  if (!be_global->gen_minimum_corba ())
+  if (!be_global->gen_corba_e () && !be_global->gen_minimum_corba ())
     {
     // Add a skeleton for our _interface method.
     *os << "static void _interface_skel (" << be_idt << be_idt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp
index bb96fba6371..002cad64667 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp
@@ -139,7 +139,7 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node)
           << ");" << be_uidt_nl << be_nl;
     }
 
-  if (!be_global->gen_minimum_corba ())
+  if (!be_global->gen_corba_e () && !be_global->gen_minimum_corba ())
     {
       // Add a skeleton for our _interface method.
       *os << "static void _interface_skel (" << be_idt << be_idt_nl
@@ -149,7 +149,7 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node)
           << ");" << be_uidt_nl << be_nl;
     }
 
-  if (!be_global->gen_corba_e ())
+  if (!be_global->gen_corba_e () && !be_global->gen_minimum_corba ())
     {
       // Add a skeleton for our _component method.
       *os << "static void _component_skel (" << be_idt << be_idt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
index d0e48eb2f05..64786df07eb 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
@@ -187,7 +187,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
           << ");" << be_uidt_nl << be_nl;
     }
 
-  if (!be_global->gen_minimum_corba ())
+  if (!be_global->gen_corba_e () && !be_global->gen_minimum_corba ())
     {
       // Add a skeleton for our _interface method.
       *os << "static void _interface_skel (" << be_idt << be_idt_nl
@@ -197,7 +197,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
           << ");" << be_uidt_nl << be_nl;
     }
 
-  if (!be_global->gen_corba_e ())
+  if (!be_global->gen_corba_e () && !be_global->gen_minimum_corba ())
     {
       // Add a skeleton for our _component method.
       *os << "static void _component_skel (" << be_idt << be_idt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
index 41a517fc3e9..328c13dcf58 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
@@ -502,7 +502,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
     s.get ()->destroy ();
   }
 
-  if (!be_global->gen_minimum_corba ())
+  if (!be_global->gen_corba_e () && !be_global->gen_minimum_corba ())
   {
     *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
         << "// " << __FILE__ << ":" << __LINE__;
diff --git a/TAO/tao/Abstract_Servant_Base.h b/TAO/tao/Abstract_Servant_Base.h
index ab36bd0fa84..a41fe1bec54 100644
--- a/TAO/tao/Abstract_Servant_Base.h
+++ b/TAO/tao/Abstract_Servant_Base.h
@@ -78,10 +78,10 @@ public:
   /// Default @c _non_existent: always returns false.
   virtual CORBA::Boolean _non_existent (void) = 0;
 
+#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   /// Query the Interface Repository.
   virtual CORBA::InterfaceDef_ptr _get_interface (void) = 0;
 
-#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   /// Default @c _get_component: always returns nil.
   virtual CORBA::Object_ptr _get_component (void) = 0;
 #endif
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index 90def769086..4a9f50341d7 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -490,6 +490,7 @@ CORBA::Object::_non_existent (void)
 }
 
 
+#if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO)
 CORBA::InterfaceDef_ptr
 CORBA::Object::_get_interface (void)
 {
@@ -503,7 +504,6 @@ CORBA::Object::_get_implementation (void)
   return 0;
 }
 
-#if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO)
 CORBA::Object_ptr
 CORBA::Object::_get_component (void)
 {
@@ -530,8 +530,7 @@ CORBA::Object::_repository_id (void)
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
 CORBA::Policy_ptr
-CORBA::Object::_get_policy (
-  CORBA::PolicyType type)
+CORBA::Object::_get_policy (CORBA::PolicyType type)
 {
   TAO_OBJECT_IOR_EVALUATE_RETURN;
 
@@ -542,8 +541,7 @@ CORBA::Object::_get_policy (
 }
 
 CORBA::Policy_ptr
-CORBA::Object::_get_cached_policy (
-  TAO_Cached_Policy_Type type)
+CORBA::Object::_get_cached_policy (TAO_Cached_Policy_Type type)
 {
   TAO_OBJECT_IOR_EVALUATE_RETURN;
 
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index 9cd6bd9b6eb..1976c89d79c 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -155,6 +155,7 @@ namespace CORBA
 
     virtual CORBA::Boolean _non_existent (void);
 
+#if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO)
     /// This method is deprecated in the CORBA 2.2 spec, we just return 0
     /// every time.
     virtual CORBA::ImplementationDef_ptr _get_implementation (void);
@@ -162,7 +163,6 @@ namespace CORBA
     /// Get info about the object from the Interface Repository.
     virtual InterfaceDef_ptr _get_interface (void);
 
-#if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO)
     /// Get info about the object from the Interface Repository.
     virtual CORBA::Object_ptr _get_component (void);
 #endif
diff --git a/TAO/tao/Object_Proxy_Broker.h b/TAO/tao/Object_Proxy_Broker.h
index ff7d58ac6f9..14a0c3ea224 100644
--- a/TAO/tao/Object_Proxy_Broker.h
+++ b/TAO/tao/Object_Proxy_Broker.h
@@ -62,9 +62,9 @@ namespace TAO
 
   virtual CORBA::Boolean _non_existent (CORBA::Object_ptr target) = 0;
 
+#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   virtual CORBA::InterfaceDef *_get_interface (CORBA::Object_ptr target) = 0;
 
-#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   virtual CORBA::Object_ptr _get_component (CORBA::Object_ptr target) = 0;
 #endif
 
diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp
index 55e31f41113..bc946d33eb9 100644
--- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp
+++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp
@@ -168,7 +168,6 @@ namespace TAO
 
     return _tao_retval._retn ();
   }
-#endif
 
   CORBA::InterfaceDef_ptr
   Collocated_Object_Proxy_Broker::_get_interface (CORBA::Object_ptr target)
@@ -212,6 +211,7 @@ namespace TAO
 
     return _tao_retval;
   }
+#endif
 
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h
index 2b74af5a912..56f4000a383 100644
--- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h
+++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h
@@ -51,9 +51,9 @@ namespace TAO
 
   virtual CORBA::Boolean _non_existent (CORBA::Object_ptr target);
 
+#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   virtual CORBA::InterfaceDef * _get_interface (CORBA::Object_ptr target);
 
-#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   virtual CORBA::Object_ptr _get_component (CORBA::Object_ptr target);
 #endif