diff options
| author | Martin Corino <mcorino@remedy.nl> | 2015-06-01 11:17:42 +0200 |
|---|---|---|
| committer | Martin Corino <mcorino@remedy.nl> | 2015-06-01 11:17:42 +0200 |
| commit | d6b3c39af65a94712d7860c5301ccd49f540b814 (patch) | |
| tree | ef3efef35d4d008c2f8df4d4006da86609b6dfd4 | |
| parent | 66bc5ea15a06468eced9efc553ae570b584c1a9f (diff) | |
| download | ATCD-d6b3c39af65a94712d7860c5301ccd49f540b814.tar.gz | |
Fix MSVC integer conversion warnings.
* TAO/tao/PortableServer/POAManager.inl:
* TAO/tao/PortableServer/Servant_Base.cpp:
| -rw-r--r-- | TAO/tao/PortableServer/POAManager.inl | 4 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Servant_Base.cpp | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/TAO/tao/PortableServer/POAManager.inl b/TAO/tao/PortableServer/POAManager.inl index 3dd8e658506..efb11b50208 100644 --- a/TAO/tao/PortableServer/POAManager.inl +++ b/TAO/tao/PortableServer/POAManager.inl @@ -91,10 +91,10 @@ TAO_POA_Manager::generate_manager_id (void) const // 64-bit platforms. if (sizeof (this) == 4) // 32 bit address - id = reinterpret_cast <ptrdiff_t> (this); + id = static_cast<CORBA::Long> (reinterpret_cast <ptrdiff_t> (this)); else if (sizeof (this) == 8) // 64 bit address -- use lower 32 bits - id = reinterpret_cast <ptrdiff_t> (this) & 0xFFFFFFFFu; + id = static_cast<CORBA::Long> (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! diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp index 9abb539aab1..887154ad4bf 100644 --- a/TAO/tao/PortableServer/Servant_Base.cpp +++ b/TAO/tao/PortableServer/Servant_Base.cpp @@ -476,7 +476,8 @@ TAO_ServantBase::_find (const char *opname, const size_t length) { ACE_FUNCTION_TIMEPROBE (TAO_SERVANT_BASE_FIND_START); - return this->optable_->find (opname, skelfunc, length); + return this->optable_->find (opname, skelfunc, + static_cast<unsigned int> (length)); } int @@ -486,7 +487,8 @@ TAO_ServantBase::_find (const char *opname, const size_t length) { ACE_FUNCTION_TIMEPROBE (TAO_SERVANT_BASE_FIND_START); - return this->optable_->find (opname, skelfunc, st, length); + return this->optable_->find (opname, skelfunc, st, + static_cast<unsigned int> (length)); } TAO_Stub * |