summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordoccvs <doccvs@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-12-22 23:04:23 +0000
committerdoccvs <doccvs@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-12-22 23:04:23 +0000
commitc624a872c99ecd273051270c25f7598bd8e50b8d (patch)
tree8422b2c504fc1615fcb0092194aecd93865774d2
parent41ed55a0dba402684cbab2258442c24148fe75ce (diff)
downloadATCD-c624a872c99ecd273051270c25f7598bd8e50b8d.tar.gz
ChangeLogTag: Fri Dec 22 15:02:00 2000 Priyanka Gontla <pgontla@ece.uci.edu>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a7
-rw-r--r--TAO/tao/ORB_Core.h4
-rw-r--r--TAO/tao/ORB_Core.i4
3 files changed, 15 insertions, 0 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index fd4aa4f42e5..0bdebb03f41 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,10 @@
+Fri Dec 22 15:02:00 2000 Priyanka Gontla <pgontla@ece.uci.edu>
+
+ * tao/ORB_Core.h :
+ * tao/ORB_Core.i:
+ Added TAO_HAS_CORBA_MESSAGING guards around get_default_policies
+ which returns TAO_Policy_Manager_Impl *.
+
Fri Dec 22 14:24:17 2000 Priyanka Gontla <pgontla@ece.uci.edu>
* tao/TAO.dsp
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 868f3fbefea..7e212485b46 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -427,9 +427,13 @@ public:
/// locking strategies.
ACE_Data_Block *create_input_cdr_data_block (size_t size);
+#if (TAO_HAS_CORBA_MESSAGING == 1)
+
/// Accessor method for the default_policies_
TAO_Policy_Manager_Impl *get_default_policies (void);
+#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
+
/**
* The thread has a default environment to simplify porting between
* platforms that support native C++ exceptions and those that
diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i
index 1180c14074c..e65471d8c8b 100644
--- a/TAO/tao/ORB_Core.i
+++ b/TAO/tao/ORB_Core.i
@@ -589,12 +589,16 @@ TAO_ORB_Core::poa_current (CORBA::Object_ptr current)
CORBA::Object::_duplicate (current);
}
+#if (TAO_HAS_CORBA_MESSAGING == 1)
+
ACE_INLINE TAO_Policy_Manager_Impl *
TAO_ORB_Core::get_default_policies (void)
{
return this->default_policies_;
}
+#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
+
ACE_INLINE CORBA_Environment *
TAO_ORB_Core::default_environment (void) const
{