summaryrefslogtreecommitdiff
path: root/src/FileEntry.h
diff options
context:
space:
mode:
authorTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2011-08-09 23:33:55 +0900
committerTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2011-08-09 23:33:55 +0900
commita10cda2f17916895d8c6bc3cd69a360947017771 (patch)
tree0740833f77a3e239ea58e870a9dcb9086d43e516 /src/FileEntry.h
parent02307cee0a395d8405d0e160664d4a37c79fe16c (diff)
Use global::cout to output string to stdout.
In MinGW32 build, global::cout is WinConsoleFile. When outputing to console, it uses WriteConsoleW, so Unicode characters are written. Fixed memory leak in WChar<->MultiByte conversion functions. The portion of code which uses std::cout is rewritten to use global::cout.
Diffstat (limited to 'src/FileEntry.h')
-rw-r--r--src/FileEntry.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/FileEntry.h b/src/FileEntry.h
index ce202d57..f7d23f38 100644
--- a/src/FileEntry.h
+++ b/src/FileEntry.h
@@ -317,9 +317,9 @@ void writeFilePath
}
} else {
if(memory) {
- o << "[MEMORY]" << utf8ToNative(File(e->getPath()).getBasename());
+ o << "[MEMORY]" << File(e->getPath()).getBasename();
} else {
- o << utf8ToNative(e->getPath());
+ o << e->getPath();
}
size_t count = countRequestedFileEntry(first, last);
if(count > 1) {