summaryrefslogtreecommitdiff
path: root/tao/Object.inl
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2011-06-21 14:39:35 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2011-06-21 14:39:35 +0000
commitd0301acb799b1d5696713ab42034305f45c4e93e (patch)
tree0b8f08656d6028906c0e09a18adefbaf4165625e /tao/Object.inl
parent69f9bf8d9b860780108161e5209a5d9b1ad3d321 (diff)
downloadATCD-d0301acb799b1d5696713ab42034305f45c4e93e.tar.gz
ChangeLogTag: Mon Jun 13 18:00:05 UTC 2011 Jeff Parsons <j.parsons@vanderbilt.edu>
Diffstat (limited to 'tao/Object.inl')
-rw-r--r--tao/Object.inl8
1 files changed, 4 insertions, 4 deletions
diff --git a/tao/Object.inl b/tao/Object.inl
index 729c0fd0a8d..57b3c128916 100644
--- a/tao/Object.inl
+++ b/tao/Object.inl
@@ -15,7 +15,7 @@ CORBA::is_nil (CORBA::Object_ptr obj)
{
return true;
}
-
+
return CORBA::Object::is_nil_i (obj);
}
@@ -23,12 +23,12 @@ CORBA::is_nil (CORBA::Object_ptr obj)
ACE_INLINE
CORBA::Object::Object (int)
- : is_local_ (true),
+ : refcount_ (1),
+ is_local_ (true),
is_evaluated_ (true),
ior_ (),
orb_core_ (0),
- protocol_proxy_ (0),
- object_init_lock_ (0)
+ protocol_proxy_ (0)
{
}