diff options
author | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-02-11 11:33:12 +0000 |
---|---|---|
committer | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-02-11 11:33:12 +0000 |
commit | 4df04cc27ef1e77bcc941afaba7d4c943b98a936 (patch) | |
tree | 5054c2bde24d048d4790ff659b61be0838cd0d69 /TAO/tao/PortableServer/Object_Adapter.inl | |
parent | b723802f85ac66026a503827677a2fb1e9a77933 (diff) | |
download | ATCD-4df04cc27ef1e77bcc941afaba7d4c943b98a936.tar.gz |
Fri Feb 11 11:16:00 UTC 2011 Martin Corino <mcorino@remedy.nl>
Merged changes from Remedy work branch.
Diffstat (limited to 'TAO/tao/PortableServer/Object_Adapter.inl')
-rw-r--r-- | TAO/tao/PortableServer/Object_Adapter.inl | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/TAO/tao/PortableServer/Object_Adapter.inl b/TAO/tao/PortableServer/Object_Adapter.inl index 2d4414b1b93..ed4707efc3c 100644 --- a/TAO/tao/PortableServer/Object_Adapter.inl +++ b/TAO/tao/PortableServer/Object_Adapter.inl @@ -13,12 +13,6 @@ TAO_Object_Adapter::validator (void) return this->default_validator_; } -ACE_INLINE int -TAO_Object_Adapter::enable_locking (void) const -{ - return this->enable_locking_; -} - ACE_INLINE TAO_POA_Policy_Set & TAO_Object_Adapter::default_poa_policies (void) { |