diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-10-02 14:05:45 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-10-02 14:05:45 +0000 |
| commit | 028e6354140364184e68cb9d5f3950fd3afb64d9 (patch) | |
| tree | 15be19a0f2c4a2b894c7e5d9779240573fb999b3 /TAO/TAO_IDL/be/be_helper.cpp | |
| parent | ae24b2171c09b930f9f1b953075d67dbce8c89a0 (diff) | |
| download | ATCD-028e6354140364184e68cb9d5f3950fd3afb64d9.tar.gz | |
ChangeLogTag: Thu Oct 2 14:01:39 UTC 2008 Jeff Parsons <j.parsons@vanderbilt.edu>
Diffstat (limited to 'TAO/TAO_IDL/be/be_helper.cpp')
| -rw-r--r-- | TAO/TAO_IDL/be/be_helper.cpp | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/TAO/TAO_IDL/be/be_helper.cpp b/TAO/TAO_IDL/be/be_helper.cpp index a701721f3dd..3468d2d18e3 100644 --- a/TAO/TAO_IDL/be/be_helper.cpp +++ b/TAO/TAO_IDL/be/be_helper.cpp @@ -360,7 +360,10 @@ TAO_OutStream::operator<< (const ACE_CDR::Long num) return *this; } -#if defined (ACE_WIN64) || ! (! defined (ACE_HAS_UINT64_T) && ACE_SIZEOF_LONG == 8) +// (JP) 2008-10-02 - let's try depending on the ACE_CDR basic +// types to make the two operators below unambiguous and portable. +//#if defined (ACE_WIN64) || ! (! defined (ACE_HAS_UINT64_T) && ACE_SIZEOF_LONG == 8) + TAO_OutStream & TAO_OutStream::operator<< (const ACE_CDR::ULongLong num) { @@ -380,28 +383,9 @@ TAO_OutStream::operator<< (const ACE_CDR::LongLong num) return *this; } -#endif -/* -TAO_OutStream & -TAO_OutStream::operator<< (const unsigned long num) -{ - ACE_OS::fprintf (this->fp_, - "%lu", - num); - - return *this; -} -TAO_OutStream & -TAO_OutStream::operator<< (const long num) -{ - ACE_OS::fprintf (this->fp_, - "%ld", - num); +//#endif - return *this; -} -*/ TAO_OutStream & TAO_OutStream::operator<< (const TAO_NL&) { |