summaryrefslogtreecommitdiff
path: root/cpp/src/IceXML/Parser.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2009-11-10 05:30:26 +0100
committerJose <jose@zeroc.com>2009-11-10 05:30:26 +0100
commit4247c9e2c2612394a5f4d63a65ba538f975906d4 (patch)
tree96d3308681d9b0684ce5dd763f5a5d415eaf09d7 /cpp/src/IceXML/Parser.cpp
parentWin32 64 bits compilation error (diff)
downloadice-4247c9e2c2612394a5f4d63a65ba538f975906d4.tar.bz2
ice-4247c9e2c2612394a5f4d63a65ba538f975906d4.tar.xz
ice-4247c9e2c2612394a5f4d63a65ba538f975906d4.zip
Fixed 3962 - Berkeley DB, problems with unicode paths.
Diffstat (limited to 'cpp/src/IceXML/Parser.cpp')
-rw-r--r--cpp/src/IceXML/Parser.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/cpp/src/IceXML/Parser.cpp b/cpp/src/IceXML/Parser.cpp
index 5538074bd78..fd8338f5a8c 100644
--- a/cpp/src/IceXML/Parser.cpp
+++ b/cpp/src/IceXML/Parser.cpp
@@ -8,9 +8,10 @@
// **********************************************************************
#include <IceXML/Parser.h>
+#include <IceUtil/Unicode.h>
+#include <IceUtil/FileUtil.h>
#include <expat.h>
#include <list>
-#include <fstream>
using namespace std;
using namespace IceXML;
@@ -373,9 +374,9 @@ IceXML::Parser::parse(istream& in)
}
void
-IceXML::Parser::parse(const string& file, Handler& handler)
+IceXML::Parser::parse(const string& file, Handler& handler) // The given filename must be UTF-8 encoded
{
- ifstream in(file.c_str());
+ IceUtilInternal::ifstream in(file);
if(!in.good())
{
ostringstream out;