diff options
| author | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-11-19 10:59:13 +0000 |
|---|---|---|
| committer | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-11-19 10:59:13 +0000 |
| commit | 6243788efd2da9f6afb7a142d4ad7e793b4850f7 (patch) | |
| tree | 821bf35b0796894747454414371b8d59f5492131 | |
| parent | 0b18e5790dd49c2751d6f8bc1143bf1444b64b2c (diff) | |
| download | ATCD-6243788efd2da9f6afb7a142d4ad7e793b4850f7.tar.gz | |
ChangeLogTag: Wed Nov 19 10:59:00 UTC 2008 Simon Massey <sma at prismtech dot com>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_helper.cpp | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 6e7b247a2a8..0effc3e92fc 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Wed Nov 19 10:59:00 UTC 2008 Simon Massey <sma at prismtech dot com> + + * TAO_IDL/be/be_helper.cpp: + Reverted Reversion of Nov 18 for change of Oct 13 to convert + format specifiers to plain ascii. This change was not the + introducer of the 64bit compile warnings problem. + Wed Nov 19 09:53:00 UTC 2008 Simon Massey <sma at prismtech dot com> * tao/orbsvcs/orbsvcs/av/SCTP_SEQ.cpp: diff --git a/TAO/TAO_IDL/be/be_helper.cpp b/TAO/TAO_IDL/be/be_helper.cpp index a764bb8b2e7..2fd7dd18aab 100644 --- a/TAO/TAO_IDL/be/be_helper.cpp +++ b/TAO/TAO_IDL/be/be_helper.cpp @@ -365,7 +365,7 @@ TAO_OutStream & TAO_OutStream::operator<< (const ACE_CDR::ULongLong num) { ACE_OS::fprintf (this->fp_, - ACE_UINT64_FORMAT_SPECIFIER, + ACE_TEXT_ALWAYS_CHAR (ACE_UINT64_FORMAT_SPECIFIER), num); return *this; @@ -375,7 +375,7 @@ TAO_OutStream & TAO_OutStream::operator<< (const ACE_CDR::LongLong num) { ACE_OS::fprintf (this->fp_, - ACE_INT64_FORMAT_SPECIFIER, + ACE_TEXT_ALWAYS_CHAR (ACE_INT64_FORMAT_SPECIFIER), num); return *this; |