summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2019-09-02 17:11:10 +0200
committerJose <jose@zeroc.com>2019-09-02 17:11:10 +0200
commit409693faf4d82f3f25bcd0950b2b148b73f3f229 (patch)
treee0baa0b72c6232fdb5fd81b58eef10fef9ca43bb /cpp/src
parentAdd slice2swift to NuGet packages - Close #505 (diff)
downloadice-409693faf4d82f3f25bcd0950b2b148b73f3f229.tar.bz2
ice-409693faf4d82f3f25bcd0950b2b148b73f3f229.tar.xz
ice-409693faf4d82f3f25bcd0950b2b148b73f3f229.zip
Fix slice2swift Windows build failure
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/slice2swift/Gen.cpp2
-rw-r--r--cpp/src/slice2swift/SwiftUtil.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/cpp/src/slice2swift/Gen.cpp b/cpp/src/slice2swift/Gen.cpp
index 1d8ff20d595..8a57e737181 100644
--- a/cpp/src/slice2swift/Gen.cpp
+++ b/cpp/src/slice2swift/Gen.cpp
@@ -10,6 +10,8 @@
#include <Slice/FileTracker.h>
#include <Slice/Util.h>
+#include <iterator>
+
#include "Gen.h"
using namespace std;
diff --git a/cpp/src/slice2swift/SwiftUtil.cpp b/cpp/src/slice2swift/SwiftUtil.cpp
index 0163f56cc0e..b3bc165a40d 100644
--- a/cpp/src/slice2swift/SwiftUtil.cpp
+++ b/cpp/src/slice2swift/SwiftUtil.cpp
@@ -1575,7 +1575,7 @@ SwiftGenerator::writeMembers(IceUtilInternal::Output& out,
int typeCtx)
{
string swiftModule = getSwiftModule(getTopLevelModule(p));
- bool protocol = (typeCtx & TypeContextProtocol);
+ bool protocol = (typeCtx & TypeContextProtocol) != 0;
string access = protocol ? "" : "public ";
for(DataMemberList::const_iterator q = members.begin(); q != members.end(); ++q)
{