From dae124560d8782f621389e55b53a61f1caf947e9 Mon Sep 17 00:00:00 2001
From: coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>
Date: Mon, 12 Apr 1999 19:42:46 +0000
Subject: ChangeLogTag:Mon Apr 12 14:24:12 1999  Carlos O'Ryan 
 <coryan@cs.wustl.edu>

---
 TAO/ChangeLog-99c    |  4 ++++
 TAO/tao/ORB_Core.cpp |  6 ++++--
 TAO/tao/Stub.cpp     | 12 ++++++------
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index ffe0dccdd2c..9f939350f54 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -4,6 +4,10 @@ Mon Apr 12 14:24:12 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
           The resolve_policy_manager() and resolve_policy_current() only
           worked if TAO_HAS_CORBA_MESSAGING was defined.
 
+	* tao/ORB_Core.cpp:
+	* tao/Stub.cpp:
+	  More problems if TAO_HAS_CORBA_MESSAGING is not defined.
+
 Mon Apr 12 14:19:45 1999  David L. Levine  <levine@cs.wustl.edu>
 
         * LifeCycle_Service/Makefile,tests/Property/Makefile,
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index fafa7de8abd..02a18847b51 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -59,8 +59,10 @@ TAO_ORB_Core::TAO_ORB_Core (void)
 #endif /* TAO_ARL_USES_SAME_CONNECTOR_PORT */
     preconnections_ (0),
     default_environment_ (0),
-    tss_environment_ (this),
-    policy_current_ (&this->initial_policy_current_)
+    tss_environment_ (this)
+#if defined (TAO_HAS_CORBA_MESSAGING)
+    , policy_current_ (&this->initial_policy_current_)
+#endif /* TAO_HAS_CORBA_MESSAGING */
 {
 }
 
diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp
index 51be1a02a82..ea2bb133aa2 100644
--- a/TAO/tao/Stub.cpp
+++ b/TAO/tao/Stub.cpp
@@ -73,8 +73,10 @@ TAO_Stub::TAO_Stub (char *repository_id,
     refcount_ (1),
     use_locate_request_ (0),
     first_locate_request_ (0),
-    orb_core_ (orb_core),
-    policies_ (0)
+    orb_core_ (orb_core)
+#if defined (TAO_HAS_CORBA_MESSAGING)
+    , policies_ (0)
+#endif /* TAO_HAS_CORBA_MESSAGING */
 {
   if (this->orb_core_ == 0)
     {
@@ -845,7 +847,7 @@ TAO_Stub::get_policy (
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard,
                     this->refcount_lock_,
                     CORBA::Policy::_nil ());
-  
+
   if (this->policies_ == 0)
     return CORBA::Policy::_nil ();
 
@@ -860,7 +862,7 @@ TAO_Stub::get_client_policy (
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard,
                     this->refcount_lock_,
                     CORBA::Policy::_nil ());
-  
+
   CORBA::Policy_var result;
   if (this->policies_ != 0)
     {
@@ -975,5 +977,3 @@ template class ACE_Auto_Basic_Ptr<TAO_Policy_Manager_Impl>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 #endif /* TAO_HAS_CORBA_MESSAGING */
-
-
-- 
cgit v1.2.1