Tue Jul 31 12:39:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

10 files changed, 32 insertions, 16 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index a7107f39104..81da25941b3 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,28 @@
+Tue Jul 31 12:39:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Abstract_Servant_Base.h:
+          Fixed typo in comment
+
+        * tao/PortableServer/Adapter_Activator.h:
+          Layout change
+
+        * tao/PortableServer/POA.pidl:
+        * tao/PortableServer/POAManagerFactory.pidl:
+          Fixed a few ifdef checks so that also minimum corba with BCB
+          can be used
+
+        * tao/PortableServer/Servant_Base.{h,cpp}:
+          Don't make methods dependent on CORBA/e or Minimum Corba. This
+          makes it possible to use the -Gce and -Gmc options on the IDL
+          files. When all generated files are removed from the repo the
+          checks can be added again, created bugzilla 3019 as reminder for
+          this.
+
+        * MPC/config/corba_e_compact.mpb:
+        * MPC/config/corba_e_micro.mpb:
+        * MPC/config/core_minimum_corba.mpb:
+          Added -Gce and -Gmc again
+
 Tue Jul 31 12:22:20 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
 
         * orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/run_test.pl:
diff --git a/TAO/MPC/config/corba_e_compact.mpb b/TAO/MPC/config/corba_e_compact.mpb
index 7e7627a4878..60e92d3bdab 100644
--- a/TAO/MPC/config/corba_e_compact.mpb
+++ b/TAO/MPC/config/corba_e_compact.mpb
@@ -3,5 +3,5 @@
 
 feature (corba_e_compact) : taoidldefaults {
   macros += CORBA_E_COMPACT
-  idlflags += -DCORBA_E_COMPACT
+  idlflags += -DCORBA_E_COMPACT -Gce
 }
diff --git a/TAO/MPC/config/corba_e_micro.mpb b/TAO/MPC/config/corba_e_micro.mpb
index 5f14ae228b9..c4b502141e1 100644
--- a/TAO/MPC/config/corba_e_micro.mpb
+++ b/TAO/MPC/config/corba_e_micro.mpb
@@ -3,5 +3,5 @@
 
 feature (corba_e_micro) : taoidldefaults {
   macros += CORBA_E_MICRO
-  idlflags += -DCORBA_E_MICRO
+  idlflags += -DCORBA_E_MICRO -Gce
 }
diff --git a/TAO/MPC/config/core_minimum_corba.mpb b/TAO/MPC/config/core_minimum_corba.mpb
index dd8dc2f75a4..8428a96cfc5 100644
--- a/TAO/MPC/config/core_minimum_corba.mpb
+++ b/TAO/MPC/config/core_minimum_corba.mpb
@@ -2,6 +2,6 @@
 // $Id$
 
 feature(minimum_corba) : taoidldefaults {
-  idlflags += -DTAO_HAS_MINIMUM_POA
+  idlflags += -DTAO_HAS_MINIMUM_POA -Gmc
   macros += TAO_HAS_MINIMUM_CORBA=1
 }
diff --git a/TAO/tao/Abstract_Servant_Base.h b/TAO/tao/Abstract_Servant_Base.h
index b5c8509d58e..ab36bd0fa84 100644
--- a/TAO/tao/Abstract_Servant_Base.h
+++ b/TAO/tao/Abstract_Servant_Base.h
@@ -7,7 +7,7 @@
  *  $Id$
  *
  *  This files contains the TAO_Abstract_ServantBase, which is used
- *  as a way to decuple the PortableServer from the TAO Core,
+ *  as a way to decouple the PortableServer from the TAO Core,
  *  and make it possible to keep the reference to the servant in
  *  the CORBA::Object class.
  *
diff --git a/TAO/tao/PortableServer/Adapter_Activator.h b/TAO/tao/PortableServer/Adapter_Activator.h
index d5d648b8a3b..199896689d4 100644
--- a/TAO/tao/PortableServer/Adapter_Activator.h
+++ b/TAO/tao/PortableServer/Adapter_Activator.h
@@ -41,7 +41,6 @@ namespace TAO
       : public PortableServer::AdapterActivator
     {
     public:
-
       Adapter_Activator (PortableServer::POAManager_ptr poa_manager);
 
       CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent,
diff --git a/TAO/tao/PortableServer/POA.pidl b/TAO/tao/PortableServer/POA.pidl
index be91adb3935..aed75dfd6d3 100644
--- a/TAO/tao/PortableServer/POA.pidl
+++ b/TAO/tao/PortableServer/POA.pidl
@@ -173,9 +173,9 @@ module PortableServer
     readonly attribute POAList      the_children;
 #       endif
     readonly attribute POAManager   the_POAManager;
-#   if (TAO_HAS_MINIMUM_POA == 0) && ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO)
+#       if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO) && !defined (TAO_HAS_MINIMUM_POA)
     readonly attribute POAManagerFactory   the_POAManagerFactory;
-#endif
+#   endif
 #       if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO) && !defined (TAO_HAS_MINIMUM_POA)
     attribute AdapterActivator      the_activator;
 #       endif
diff --git a/TAO/tao/PortableServer/POAManagerFactory.pidl b/TAO/tao/PortableServer/POAManagerFactory.pidl
index 1a47c584714..7266f29e05b 100644
--- a/TAO/tao/PortableServer/POAManagerFactory.pidl
+++ b/TAO/tao/PortableServer/POAManagerFactory.pidl
@@ -21,7 +21,7 @@
 
 #pragma prefix "omg.org"
 
-#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+#if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO) && !defined (TAO_HAS_MINIMUM_POA)
 
 module PortableServer
 {
diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp
index e77ebc3ab53..ff4e9bdde6e 100644
--- a/TAO/tao/PortableServer/Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Servant_Base.cpp
@@ -87,7 +87,6 @@ TAO_ServantBase::_is_a (const char *logical_type_id)
   return ACE_OS::strcmp (logical_type_id, id) == 0;
 }
 
-#if (TAO_HAS_MINIMUM_CORBA == 0)
 CORBA::Boolean
 TAO_ServantBase::_non_existent (void)
 {
@@ -112,20 +111,17 @@ TAO_ServantBase::_get_interface (void)
                                  this->_interface_repository_id ());
 }
 
-#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 CORBA::Object_ptr
 TAO_ServantBase::_get_component (void)
 {
   return CORBA::Object::_nil ();
 }
-#endif
 
 char *
 TAO_ServantBase::_repository_id (void)
 {
   return CORBA::string_dup (this->_interface_repository_id ());
 }
-#endif /* TAO_HAS_MINIMUM_CORBA */
 
 int
 TAO_ServantBase::_find (const char *opname,
diff --git a/TAO/tao/PortableServer/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h
index 27e4ed3993b..b8923c91fdc 100644
--- a/TAO/tao/PortableServer/Servant_Base.h
+++ b/TAO/tao/PortableServer/Servant_Base.h
@@ -72,21 +72,17 @@ public:
   /// Local implementation of the CORBA::Object::_is_a method.
   virtual CORBA::Boolean _is_a (const char *logical_type_id);
 
-#if (TAO_HAS_MINIMUM_CORBA == 0)
   /// Default _non_existent: always returns false.
   virtual CORBA::Boolean _non_existent (void);
 
   /// Query the Interface Repository for the interface definition.
   virtual CORBA::InterfaceDef_ptr _get_interface (void);
 
-#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   /// Default _get_component: always returns CORBA::Object::_nil().
   virtual CORBA::Object_ptr _get_component (void);
-#endif
 
   /// Get the repository id.
   virtual char * _repository_id (void);
-#endif /* TAO_HAS_MINIMUM_CORBA */
 
   /// This is an auxiliary method for _this() and _narrow().
   virtual TAO_Stub *_create_stub (void);