summaryrefslogtreecommitdiff
path: root/cpp/src/slice2confluence/ConfluenceOutput.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2017-01-09 17:01:31 +0100
committerJose <jose@zeroc.com>2017-01-09 17:01:31 +0100
commitd4ed7973f1824478477be29989fc125b04207494 (patch)
treeec488f46a0ee15f987a0a24c87d1fe0a999cc168 /cpp/src/slice2confluence/ConfluenceOutput.cpp
parentIceSSL C#/Java test fixes to sync with C++ changes (diff)
downloadice-d4ed7973f1824478477be29989fc125b04207494.tar.bz2
ice-d4ed7973f1824478477be29989fc125b04207494.tar.xz
ice-d4ed7973f1824478477be29989fc125b04207494.zip
Fixed (ICE-6694) - Unicode output in command line tools
Diffstat (limited to 'cpp/src/slice2confluence/ConfluenceOutput.cpp')
-rw-r--r--cpp/src/slice2confluence/ConfluenceOutput.cpp14
1 files changed, 12 insertions, 2 deletions
diff --git a/cpp/src/slice2confluence/ConfluenceOutput.cpp b/cpp/src/slice2confluence/ConfluenceOutput.cpp
index a1176f7cc37..cac2dc645e4 100644
--- a/cpp/src/slice2confluence/ConfluenceOutput.cpp
+++ b/cpp/src/slice2confluence/ConfluenceOutput.cpp
@@ -1,3 +1,13 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <IceUtil/ConsoleUtil.h>
#include <ConfluenceOutput.h>
#include <iostream>
#include <sstream>
@@ -795,8 +805,8 @@ Confluence::ConfluenceOutput::getMarkerLimits(const string& str)
}
else
{
- cerr << "getEscaperLimits FOUND START OF ESCAPE MARKER WITH NO MATCHING END IN STRING:" << endl
- << str.substr(start) << endl;
+ consoleErr << "getEscaperLimits FOUND START OF ESCAPE MARKER WITH NO MATCHING END IN STRING:"
+ << endl << str.substr(start) << endl;
break;
}
}