summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Mesnier <mesnier_p@ociweb.com>2009-06-12 02:22:21 +0000
committerPhil Mesnier <mesnier_p@ociweb.com>2009-06-12 02:22:21 +0000
commit0d6139094498d9ac4f7c402b58d6f3939d7cfafe (patch)
tree8b81d1c274cf0809bff0e44595190237c0791bfb
parent3929fea6883975787555e2e01f67de0f3d199cbe (diff)
downloadATCD-0d6139094498d9ac4f7c402b58d6f3939d7cfafe.tar.gz
Fri Jun 12 02:05:32 UTC 2009 Phil Mesnier <mesnier_p@ociweb.com>
* utils/logWalker/logWalker.cpp: Clean up WChar errors.
-rw-r--r--TAO/ChangeLog8
-rw-r--r--TAO/utils/logWalker/logWalker.cpp4
2 files changed, 9 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index b294c7a3d39..1e7d807a405 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,9 +1,15 @@
+Fri Jun 12 02:05:32 UTC 2009 Phil Mesnier <mesnier_p@ociweb.com>
+
+ * utils/logWalker/logWalker.cpp:
+
+ Clean up WChar errors.
+
Thu Jun 11 23:16:41 UTC 2009 Yan Dai <dai_y@ociweb.com>
* NEWS:
Added entry for bug #3688 fix.
-
+
Thu Jun 11 19:29:51 UTC 2009 Steven Stallion <stallions@ociweb.com>
* PROBLEM-REPORT-FORM:
diff --git a/TAO/utils/logWalker/logWalker.cpp b/TAO/utils/logWalker/logWalker.cpp
index c3bf7477548..e5ca05a10e6 100644
--- a/TAO/utils/logWalker/logWalker.cpp
+++ b/TAO/utils/logWalker/logWalker.cpp
@@ -28,7 +28,7 @@ void
parse_manifest (Session &session, ACE_TCHAR *filename)
{
// get list of logs, aliases, and other config from file
- ifstream strm (filename);
+ ifstream strm (ACE_TEXT_ALWAYS_CHAR (filename));
if (!strm.is_open())
{
ACE_DEBUG ((LM_DEBUG,"cannot open manifest file %C\n", filename));
@@ -135,7 +135,7 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv)
if (outfile == 0)
strm = &cout;
else
- strm = new ofstream(outfile);
+ strm = new ofstream(ACE_TEXT_ALWAYS_CHAR (outfile));
session.dump(*strm);