summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-10-17 05:04:06 +0000
committernanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-10-17 05:04:06 +0000
commitdabe4f96d7ff71199f068d1aad5f83c3223ee290 (patch)
tree89ee1427f88d86753505dc33ac058c9a467c5fdb
parent9ea6a51bde7cac5e0237c7ae874e5e30901c834f (diff)
downloadATCD-dabe4f96d7ff71199f068d1aad5f83c3223ee290.tar.gz
*** empty log message ***
-rw-r--r--ChangeLog7
-rw-r--r--ChangeLogs/ChangeLog-02a7
-rw-r--r--ChangeLogs/ChangeLog-03a7
-rw-r--r--ace/SString.cpp7
4 files changed, 28 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 265f844a8af..e013705202d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Oct 16 01:55:44 2001 Nanbor Wang <nanbor@cs.wustl.edu>
+
+ * ace/SString.cpp (operator<<): Avoided the problem of printing
+ wchar strings temporarily. Using ACE_Wide_To_Ascii didn't work
+ on platforms that don't support wchar. Thanks to Keith Hamburg
+ for pointing this out.
+
Wed Oct 10 21:17:40 2001 Nanbor Wang <nanbor@cs.wustl.edu>
* ace/String_Base.cpp: Fixed incorrect RCSID name. Thanks to
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 265f844a8af..e013705202d 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,10 @@
+Tue Oct 16 01:55:44 2001 Nanbor Wang <nanbor@cs.wustl.edu>
+
+ * ace/SString.cpp (operator<<): Avoided the problem of printing
+ wchar strings temporarily. Using ACE_Wide_To_Ascii didn't work
+ on platforms that don't support wchar. Thanks to Keith Hamburg
+ for pointing this out.
+
Wed Oct 10 21:17:40 2001 Nanbor Wang <nanbor@cs.wustl.edu>
* ace/String_Base.cpp: Fixed incorrect RCSID name. Thanks to
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 265f844a8af..e013705202d 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,10 @@
+Tue Oct 16 01:55:44 2001 Nanbor Wang <nanbor@cs.wustl.edu>
+
+ * ace/SString.cpp (operator<<): Avoided the problem of printing
+ wchar strings temporarily. Using ACE_Wide_To_Ascii didn't work
+ on platforms that don't support wchar. Thanks to Keith Hamburg
+ for pointing this out.
+
Wed Oct 10 21:17:40 2001 Nanbor Wang <nanbor@cs.wustl.edu>
* ace/String_Base.cpp: Fixed incorrect RCSID name. Thanks to
diff --git a/ace/SString.cpp b/ace/SString.cpp
index 16bb39ccdec..edf959fe538 100644
--- a/ace/SString.cpp
+++ b/ace/SString.cpp
@@ -235,7 +235,14 @@ operator<< (ostream &os, const ACE_CString &cs)
ostream &
operator<< (ostream &os, const ACE_WString &ws)
{
+ // @@ Need to figure out how to print the "wide" string
+ // on platforms that don't support "wide" strings.
+#if defined (ACE_HAS_WCHAR)
os << ACE_Wide_To_Ascii (ws.fast_rep ()).char_rep ();
+#else
+ ACE_UNUSED_ARG (ws);
+ os << "(*non-printable string*)";
+#endif
return os;
}