summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/Parser.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2015-08-04 15:53:50 +0200
committerJose <jose@zeroc.com>2015-08-04 15:53:50 +0200
commit3d54a70c0dabf9e4d9d998705899e211702ae00d (patch)
tree5853d9b27d36b791ed5f5815ee0f6dddf6ae0fba /cpp/src/IceGrid/Parser.cpp
parentICE-5731 - Convert icegridadmin output on Windows (diff)
downloadice-3d54a70c0dabf9e4d9d998705899e211702ae00d.tar.bz2
ice-3d54a70c0dabf9e4d9d998705899e211702ae00d.tar.xz
ice-3d54a70c0dabf9e4d9d998705899e211702ae00d.zip
non Windows build fix
Diffstat (limited to 'cpp/src/IceGrid/Parser.cpp')
-rw-r--r--cpp/src/IceGrid/Parser.cpp16
1 files changed, 14 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/Parser.cpp b/cpp/src/IceGrid/Parser.cpp
index 3a0dc32674b..b1792e8ffe8 100644
--- a/cpp/src/IceGrid/Parser.cpp
+++ b/cpp/src/IceGrid/Parser.cpp
@@ -2810,7 +2810,13 @@ void
Parser::error(const char* s)
{
- cerr << "error: " << toConsoleEncoding(s) << endl;
+ cerr << "error: "
+#ifdef _WIN32
+ << toConsoleEncoding(s)
+#else
+ << s
+#endif
+ << endl;
_errors++;
}
@@ -2823,7 +2829,13 @@ Parser::error(const string& s)
void
Parser::warning(const char* s)
{
- cerr << "warning: " << toConsoleEncoding(s) << endl;
+ cerr << "warning: "
+#ifdef _WIN32
+ << toConsoleEncoding(s)
+#else
+ << s
+#endif
+ << endl;
}
void