diff options
| author | Jose <jose@zeroc.com> | 2016-10-13 14:46:59 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-10-13 14:46:59 +0200 |
| commit | a9940e76262e0301c0291367960d553764698665 (patch) | |
| tree | b15342eeba62cef0ef8866ba8cd49f595d83c8c6 /cpp/src/slice2confluence | |
| parent | Changed parsing of hex escape sequences in Slice string literals (diff) | |
| parent | Merge pull request #12 from grembo/patch-2 (diff) | |
| download | ice-a9940e76262e0301c0291367960d553764698665.tar.bz2 ice-a9940e76262e0301c0291367960d553764698665.tar.xz ice-a9940e76262e0301c0291367960d553764698665.zip | |
Merge remote-tracking branch 'origin/3.6'
Conflicts:
cpp/src/slice2confluence/Makefile
cpp/src/slice2confluence/Makefile.mak
Diffstat (limited to 'cpp/src/slice2confluence')
| -rw-r--r-- | cpp/src/slice2confluence/Gen.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/slice2confluence/Gen.cpp b/cpp/src/slice2confluence/Gen.cpp index dd7175133f1..b97445781f1 100644 --- a/cpp/src/slice2confluence/Gen.cpp +++ b/cpp/src/slice2confluence/Gen.cpp @@ -7,6 +7,7 @@ // // ********************************************************************** +#include <IceUtil/FileUtil.h> #include <IceUtil/Functional.h> #include <IceUtil/StringUtil.h> #include <IceUtil/FileUtil.h> @@ -1804,7 +1805,7 @@ Slice::GeneratorBase::makeDir(const string& dir) string Slice::GeneratorBase::readFile(const string& file) { - ifstream in(file.c_str()); + std::ifstream in(file.c_str()); if(!in) { ostringstream os; @@ -1840,7 +1841,7 @@ Slice::GeneratorBase::getFooter(const string& footer) void Slice::GeneratorBase::readFile(const string& file, string& part1, string& part2) { - ifstream in(file.c_str()); + std::ifstream in(file.c_str()); if(!in) { ostringstream os; |