diff options
| author | Martin Corino <mcorino@remedy.nl> | 2015-06-01 10:08:52 +0200 |
|---|---|---|
| committer | Martin Corino <mcorino@remedy.nl> | 2015-06-01 10:08:52 +0200 |
| commit | 66bc5ea15a06468eced9efc553ae570b584c1a9f (patch) | |
| tree | 7d3ecb09391958b00a365431b3e79dfdd88faf27 | |
| parent | ba64a124f699c1e6d2125c619480c8a40c4683aa (diff) | |
| download | ATCD-66bc5ea15a06468eced9efc553ae570b584c1a9f.tar.gz | |
Fix compile problems with integer conversions.
* TAO/tao/CORBA_String.cpp:
| -rw-r--r-- | TAO/tao/CORBA_String.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/TAO/tao/CORBA_String.cpp b/TAO/tao/CORBA_String.cpp index 0490672fb40..aaa20da44ec 100644 --- a/TAO/tao/CORBA_String.cpp +++ b/TAO/tao/CORBA_String.cpp @@ -4,7 +4,6 @@ #include "ace/OS_NS_string.h" #include "ace/OS_NS_wchar.h" #include "ace/OS_Memory.h" -#include "ace/Truncate.h" // FUZZ: disable check_for_streams_include #include "ace/streams.h" @@ -32,7 +31,7 @@ istream & operator>> (istream &is, CORBA::String_var &sv) { is.seekg (0, ios::end); - sv = CORBA::string_alloc (ACE_Utils::truncate_cast<CORBA::ULong> (is.tellg ())); + sv = CORBA::string_alloc (static_cast<CORBA::ULong> (is.tellg ())); is.seekg (0, ios::beg); is >> sv.inout (); return is; @@ -49,7 +48,7 @@ istream & operator>> (istream &is, CORBA::String_out &so) { is.seekg (0, ios::end); - so = CORBA::string_alloc (ACE_Utils::truncate_cast<CORBA::ULong> (is.tellg ())); + so = CORBA::string_alloc (static_cast<CORBA::ULong> (is.tellg ())); is.seekg (0, ios::beg); is >> so.ptr (); return is; @@ -78,7 +77,7 @@ operator>> (istream &is, CORBA::WString_var &wsv) { is.seekg (0, ios::end); // @@ is.tellg()/sizeof(CORBA::WChar) instead? - CORBA::ULong const len = ACE_Utils::truncate_cast<CORBA::ULong> (is.tellg ()); + CORBA::ULong const len = static_cast<CORBA::ULong> (is.tellg ()); wsv = CORBA::wstring_alloc (len); is.seekg (0, ios::beg); @@ -117,7 +116,7 @@ operator>> (istream &is, CORBA::WString_out &wso) { is.seekg (0, ios::end); // @@ is.tellg()/sizeof(CORBA::WChar) instead? - const CORBA::ULong len = ACE_Utils::truncate_cast<CORBA::ULong> (is.tellg ()); + const CORBA::ULong len = static_cast<CORBA::ULong> (is.tellg ()); wso = CORBA::wstring_alloc (len); is.seekg (0, ios::beg); |