diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/include/IceUtil/FileUtil.h | 5 | ||||
| -rw-r--r-- | cpp/src/slice2cs/Gen.cpp | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/cpp/include/IceUtil/FileUtil.h b/cpp/include/IceUtil/FileUtil.h index 617a88d8466..7f523585b03 100644 --- a/cpp/include/IceUtil/FileUtil.h +++ b/cpp/include/IceUtil/FileUtil.h @@ -35,7 +35,12 @@ ICE_UTIL_API bool directoryExists(const std::string&); #ifdef _WIN32 +#if defined(_MSC_VER) && (_MSC_VER < 1300) +typedef struct _stat structstat; +#else typedef struct _stat64i32 structstat; +#endif + #ifdef _MSC_VER # define O_RDONLY _O_RDONLY # define O_BINARY _O_BINARY diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp index 894cd2eac47..fe5813810e4 100644 --- a/cpp/src/slice2cs/Gen.cpp +++ b/cpp/src/slice2cs/Gen.cpp @@ -1391,13 +1391,14 @@ Slice::CsVisitor::writeDocCommentOp(const OperationPtr& p) // // Output the leading comment block up until the first <param>, <returns>, or <exception> tag. // - for(StringList::const_iterator i = summaryLines.begin(); i != summaryLines.end(); ++i) + StringList::const_iterator i; + for(i = summaryLines.begin(); i != summaryLines.end(); ++i) { _out << nl << "/// " << *i; } bool done = false; - for(StringList::const_iterator i = remarksLines.begin(); i != remarksLines.end() && !done; ++i) + for(i = remarksLines.begin(); i != remarksLines.end() && !done; ++i) { if(i->find("<param") != string::npos || i->find("<returns") != string::npos || @@ -1494,13 +1495,14 @@ Slice::CsVisitor::writeDocCommentAsync(const OperationPtr& p, ParamDir paramType // Output the leading comment block up until the first tag. // _out << nl << "/// <summary>"; - for(StringList::const_iterator i = summaryLines.begin(); i != summaryLines.end(); ++i) + StringList::const_iterator i; + for(i = summaryLines.begin(); i != summaryLines.end(); ++i) { _out << nl << "/// " << *i; } bool done = false; - for(StringList::const_iterator i = remarksLines.begin(); i != remarksLines.end() && !done; ++i) + for(i = remarksLines.begin(); i != remarksLines.end() && !done; ++i) { string::size_type pos = i->find('<'); done = true; |