diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-10-07 20:15:18 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-10-07 20:15:18 +0000 |
| commit | 3d7a18a70adad596e99138cfdc98d4dcb483a4ea (patch) | |
| tree | 11fabe3aec6a812c74d72610183bc054a85b0445 | |
| parent | 0d96cb0dbac6a8414b4d6def3b66f4b19f2b6ece (diff) | |
| download | ATCD-3d7a18a70adad596e99138cfdc98d4dcb483a4ea.tar.gz | |
ChangeLogTag:Sat Oct 07 15:05:31 2000 Nanbor Wang <nanbor@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 6 | ||||
| -rw-r--r-- | TAO/tao/Object.cpp | 13 | ||||
| -rw-r--r-- | TAO/tao/Object.i | 13 |
3 files changed, 19 insertions, 13 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index d097a21fa94..30b60346709 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Sat Oct 07 15:05:31 2000 Nanbor Wang <nanbor@cs.wustl.edu> + + * tao/Object.i: + * tao/Object.cpp: Moved CORBA::Object::is_nil to Object.i. This + function should be inlined when appropriate. + Sat Oct 07 14:00:27 2000 Balachandran Natarajan <bala@cs.wustl.edu> * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h: diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index 54693e5090a..1cedd0e8634 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -232,19 +232,6 @@ CORBA::Object::_use_locate_requests (CORBA::Boolean use_it) return; } -CORBA::Boolean -CORBA::is_nil (CORBA::Object_ptr obj) -{ - if (obj == 0) - return 1; - - // To accomodate new definitions - if (obj->_stubobj ()) - return obj->_stubobj ()->orb_core ()->object_is_nil (obj); - - return 0; -} - #if (TAO_HAS_MINIMUM_CORBA == 0) diff --git a/TAO/tao/Object.i b/TAO/tao/Object.i index 1e20ff5cf37..dbb01b355f5 100644 --- a/TAO/tao/Object.i +++ b/TAO/tao/Object.i @@ -43,6 +43,19 @@ CORBA_Object::_duplicate (CORBA_Object_ptr obj) return obj; } +ACE_INLINE CORBA::Boolean +CORBA::is_nil (CORBA::Object_ptr obj) +{ + if (obj == 0) + return 1; + + // To accomodate new definitions + if (obj->_stubobj ()) + return obj->_stubobj ()->orb_core ()->object_is_nil (obj); + + return 0; +} + // Null pointers represent nil objects. |