diff options
author | john_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-04-28 03:50:28 +0000 |
---|---|---|
committer | john_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-04-28 03:50:28 +0000 |
commit | 88556d568eb0a06bf8af2ddefacbc1ad5f00401e (patch) | |
tree | 72f4a0e33b9dd26d1783ff005d67494bfb79a9de /TAO/tao/PortableServer/POAManager.i | |
parent | 317d8c1ce78436f0107f056418c0c5f5b4231069 (diff) | |
download | ATCD-oci_dave_wchar_refactor_branch.tar.gz |
4_27_06 branch merge in and compile error fixedoci_dave_wchar_refactor_branch
Diffstat (limited to 'TAO/tao/PortableServer/POAManager.i')
-rw-r--r-- | TAO/tao/PortableServer/POAManager.i | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/TAO/tao/PortableServer/POAManager.i b/TAO/tao/PortableServer/POAManager.i index 19adb23dd8f..5dad4c14de5 100644 --- a/TAO/tao/PortableServer/POAManager.i +++ b/TAO/tao/PortableServer/POAManager.i @@ -84,7 +84,7 @@ TAO_POA_Manager::get_state (ACE_ENV_SINGLE_ARG_DECL) return this->get_state_i (); } -ACE_INLINE PortableInterceptor::AdapterManagerId +ACE_INLINE char* TAO_POA_Manager::generate_manager_id (void) const { // The AdapterManagerId must be unique across all Adapter Managers @@ -101,7 +101,7 @@ TAO_POA_Manager::generate_manager_id (void) const // shifting of 64 bit addresses is performed since the // TAO_POA_Manager object is not large enough to allow that trick. - PortableInterceptor::AdapterManagerId id = 0; + CORBA::Long id = 0; // Note that we reinterpret_cast to an "unsigned long" instead of // CORBA::ULong since we need to first cast to an integer large @@ -109,14 +109,10 @@ TAO_POA_Manager::generate_manager_id (void) const // 64-bit platforms. if (sizeof (this) == 4) // 32 bit address - id = - static_cast <PortableInterceptor::AdapterManagerId> - (reinterpret_cast <ptrdiff_t> (this)); + id = reinterpret_cast <ptrdiff_t> (this); else if (sizeof (this) == 8) // 64 bit address -- use lower 32 bits - id = - static_cast <PortableInterceptor::AdapterManagerId> - (reinterpret_cast <ptrdiff_t> (this) & 0xFFFFFFFFu); + id = reinterpret_cast <ptrdiff_t> (this) & 0xFFFFFFFFu; // @@ If we ever hit a platform where neither of the above cases are // satisfied, we're up the creek! @@ -126,7 +122,16 @@ TAO_POA_Manager::generate_manager_id (void) const // // ORB, or perhaps specific to the process. // id = ...GENERATE_ID_ATOMICALLY...; // Fallback - return id; + char* buf = new char [25]; + ACE_OS::sprintf (buf, "POAManager%d", id); + return buf; } +ACE_INLINE +CORBA::PolicyList& TAO_POA_Manager::get_policies () +{ + return this->policies_; +} + + TAO_END_VERSIONED_NAMESPACE_DECL |