diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/Cond.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/slice2confluence/Gen.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/cpp/src/Ice/Cond.cpp b/cpp/src/Ice/Cond.cpp index 1ec40216661..756ef6db691 100644 --- a/cpp/src/Ice/Cond.cpp +++ b/cpp/src/Ice/Cond.cpp @@ -332,7 +332,7 @@ IceUtil::Cond::Cond() throw ThreadSyscallException(__FILE__, __LINE__, rc); } -#if !defined(__hppa) && !defined(__APPLE__) && !defined(__FreeBSD__) +#if !defined(__hppa) && !defined(__APPLE__) rc = pthread_condattr_setclock(&attr, CLOCK_MONOTONIC); if(rc != 0) { 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; |