summaryrefslogtreecommitdiff
path: root/ACE/ace/CDR_Stream.cpp
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2007-06-29 11:16:37 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2007-06-29 11:16:37 +0000
commit92b0cbad75f88ce3e8436969be8994c620d4c7f3 (patch)
tree5513a74e544945817e995c9e873851af82256fef /ACE/ace/CDR_Stream.cpp
parentd951868a94e2823f344baa40b41044886d8f7d0a (diff)
downloadATCD-92b0cbad75f88ce3e8436969be8994c620d4c7f3.tar.gz
ChangeLogTag: Fri Jun 29 11:12:17 UTC 2007 Jeff Parsons <j.parsons@vanderbilt.edu>
Diffstat (limited to 'ACE/ace/CDR_Stream.cpp')
-rw-r--r--ACE/ace/CDR_Stream.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/ACE/ace/CDR_Stream.cpp b/ACE/ace/CDR_Stream.cpp
index 542337856d3..7d11b8a3be2 100644
--- a/ACE/ace/CDR_Stream.cpp
+++ b/ACE/ace/CDR_Stream.cpp
@@ -1822,15 +1822,6 @@ operator<< (std::ostream &os, ACE_OutputCDR::from_char x)
}
std::ostream&
-operator<< (std::ostream &os, ACE_OutputCDR::from_octet x)
-{
- // Same format (hex) and no risk of overflow.
- ACE_CDR::WChar w = static_cast<ACE_CDR::WChar> (x.val_);
- ACE_OutputCDR::from_wchar tmp (w);
- return os << tmp;
-}
-
-std::ostream&
operator<< (std::ostream &os, ACE_OutputCDR::from_wchar x)
{
os.setf (ios_base::showbase);
@@ -1841,4 +1832,13 @@ operator<< (std::ostream &os, ACE_OutputCDR::from_wchar x)
return os;
}
+std::ostream&
+operator<< (std::ostream &os, ACE_OutputCDR::from_octet x)
+{
+ // Same format (hex) and no risk of overflow.
+ ACE_CDR::WChar w = static_cast<ACE_CDR::WChar> (x.val_);
+ ACE_OutputCDR::from_wchar tmp (w);
+ return os << tmp;
+}
+
ACE_END_VERSIONED_NAMESPACE_DECL