Moved CORBA_ORB::perform_work() and CORBA_ORB::work_pending()

outside of the !TAO_HAS_MINIMUM_CORBA code block.  This change
is similar to the change we made for shutdown because we (Irfan)
feel these methods are too important.

2 files changed, 32 insertions, 32 deletions

diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 71e96db7fab..7b91b6e366b 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -231,6 +231,28 @@ CORBA_ORB::shutdown (CORBA::Boolean wait_for_completion,
                                ACE_TRY_ENV);
 }
 
+int
+CORBA_ORB::perform_work (const ACE_Time_Value &tv)
+{
+  ACE_Reactor *r = this->orb_core_->reactor ();
+
+  // Set the owning thread of the Reactor to the one which we're
+  // currently in.  This is necessary b/c it's possible that the
+  // application is calling us from a thread other than that in which
+  // the Reactor's CTOR (which sets the owner) was called.
+  r->owner (ACE_Thread::self ());
+
+  ACE_Time_Value tmp_tv (tv);
+
+  return r->handle_events (tmp_tv);
+}
+
+CORBA::Boolean
+CORBA_ORB::work_pending (void)
+{
+  return this->orb_core_->reactor ()->work_pending ();
+}
+
 #if !defined (TAO_HAS_MINIMUM_CORBA)
 
 void
@@ -256,28 +278,6 @@ CORBA_ORB::create_list (CORBA::Long count,
     }
 }
 
-int
-CORBA_ORB::perform_work (const ACE_Time_Value &tv)
-{
-  ACE_Reactor *r = this->orb_core_->reactor ();
-
-  // Set the owning thread of the Reactor to the one which we're
-  // currently in.  This is necessary b/c it's possible that the
-  // application is calling us from a thread other than that in which
-  // the Reactor's CTOR (which sets the owner) was called.
-  r->owner (ACE_Thread::self ());
-
-  ACE_Time_Value tmp_tv (tv);
-
-  return r->handle_events (tmp_tv);
-}
-
-CORBA::Boolean
-CORBA_ORB::work_pending (void)
-{
-  return this->orb_core_->reactor ()->work_pending ();
-}
-
 // The following functions are not implemented - they just throw
 // CORBA::NO_IMPLEMENT.
 
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index e237f19de8e..a9f10bb66a5 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -434,16 +434,6 @@ public:
   CORBA::Boolean poll_next_response (CORBA_Environment &ACE_TRY_ENV =
                                      TAO_default_environment ());
 
-  CORBA::Boolean work_pending (void);
-  // Returns an indication of whether the ORB needs to perform some
-  // work.
-
-  int perform_work (const ACE_Time_Value & = ACE_Time_Value::zero);
-  // This operation performs an implementation-defined unit of
-  // work. Note that the default behavior is not to block; this
-  // behavior can be modified by passing an appropriate
-  // <ACE_Time_Value>.
-
   // Typecode for the above exception.
   static CORBA::TypeCode_ptr _tc_InconsistentTypeCode;
 
@@ -493,6 +483,16 @@ public:
   // deactivation or other operations associated with object adapters)
   // has completed.
 
+  CORBA::Boolean work_pending (void);
+  // Returns an indication of whether the ORB needs to perform some
+  // work.
+
+  int perform_work (const ACE_Time_Value & = ACE_Time_Value::zero);
+  // This operation performs an implementation-defined unit of
+  // work. Note that the default behavior is not to block; this
+  // behavior can be modified by passing an appropriate
+  // <ACE_Time_Value>.
+
   // @@EXC@@ Add the ACE_THROW_SPEC for these two functions
 
   CORBA_Object_ptr resolve_initial_references (const char *name,