Merge remote-tracking branch 'origin/3.7' into swift

6 files changed, 15 insertions, 15 deletions

diff --git a/cpp/src/slice2cs/CsUtil.cpp b/cpp/src/slice2cs/CsUtil.cpp
index 3c748ef88e9..de027895412 100644
--- a/cpp/src/slice2cs/CsUtil.cpp
+++ b/cpp/src/slice2cs/CsUtil.cpp
@@ -27,7 +27,7 @@ namespace
 {
 
 string
-lookupKwd(const string& name, int baseTypes, bool mangleCasts = false)
+lookupKwd(const string& name, unsigned int baseTypes, bool mangleCasts = false)
 {
     //
     // Keyword list. *Must* be kept in alphabetical order.
@@ -210,7 +210,7 @@ Slice::CsGenerator::getUnqualified(const ContainedPtr& p, const string& package,
 // if so, prefix it with ice_; otherwise, return the name unchanged.
 //
 string
-Slice::CsGenerator::fixId(const string& name, int baseTypes, bool mangleCasts)
+Slice::CsGenerator::fixId(const string& name, unsigned int baseTypes, bool mangleCasts)
 {
     if(name.empty())
     {
@@ -239,7 +239,7 @@ Slice::CsGenerator::fixId(const string& name, int baseTypes, bool mangleCasts)
 }
 
 string
-Slice::CsGenerator::fixId(const ContainedPtr& cont, int baseTypes, bool mangleCasts)
+Slice::CsGenerator::fixId(const ContainedPtr& cont, unsigned int baseTypes, bool mangleCasts)
 {
     ContainerPtr container = cont->container();
     ContainedPtr contained = ContainedPtr::dynamicCast(container);
diff --git a/cpp/src/slice2cs/CsUtil.h b/cpp/src/slice2cs/CsUtil.h
index 0cfc81fe6ae..fd438fafaf4 100644
--- a/cpp/src/slice2cs/CsUtil.h
+++ b/cpp/src/slice2cs/CsUtil.h
@@ -49,8 +49,8 @@ protected:
     static std::string resultStructName(const std::string&, const std::string&, bool = false);
     static std::string resultType(const OperationPtr&, const std::string&, bool = false);
     static std::string taskResultType(const OperationPtr&, const std::string&, bool = false);
-    static std::string fixId(const std::string&, int = 0, bool = false);
-    static std::string fixId(const ContainedPtr&, int = 0, bool = false);
+    static std::string fixId(const std::string&, unsigned int = 0, bool = false);
+    static std::string fixId(const ContainedPtr&, unsigned int = 0, bool = false);
     static std::string getOptionalFormat(const TypePtr&, const std::string&);
     static std::string getStaticId(const TypePtr&);
     static std::string typeToString(const TypePtr&, const std::string&, bool = false, bool = false,
diff --git a/cpp/src/slice2cs/DotNetNames.cpp b/cpp/src/slice2cs/DotNetNames.cpp
index 38649df2fa0..fc5a6e651c3 100644
--- a/cpp/src/slice2cs/DotNetNames.cpp
+++ b/cpp/src/slice2cs/DotNetNames.cpp
@@ -120,14 +120,14 @@ mangle(const string& s, const Node* np, string& newName)
 }
 
 string
-Slice::DotNet::mangleName(const string& s, int baseTypes)
+Slice::DotNet::mangleName(const string& s, unsigned int baseTypes)
 {
     if(baseTypes == 0)
     {
         return s;
     }
     string newName;
-    for(unsigned int mask = 1, i=0; mask < END; mask <<= 1, ++i)
+    for(unsigned int mask = 1, i = 0; mask < END; mask <<= 1, ++i)
     {
         if(baseTypes & mask)
         {
diff --git a/cpp/src/slice2cs/DotNetNames.h b/cpp/src/slice2cs/DotNetNames.h
index 9839c4f3e49..3379309ad58 100644
--- a/cpp/src/slice2cs/DotNetNames.h
+++ b/cpp/src/slice2cs/DotNetNames.h
@@ -20,7 +20,7 @@ enum BaseType
 
 extern const char * manglePrefix;
 
-std::string mangleName(const std::string&, int baseTypes = 0);
+std::string mangleName(const std::string&, unsigned int baseTypes = 0);
 
 }
 
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
index 5b748b41a0a..221b3121fc7 100644
--- a/cpp/src/slice2cs/Gen.cpp
+++ b/cpp/src/slice2cs/Gen.cpp
@@ -1204,7 +1204,7 @@ Slice::CsVisitor::requiresDataMemberInitializers(const DataMemberList& members)
 }
 
 void
-Slice::CsVisitor::writeDataMemberInitializers(const DataMemberList& members, const string& ns, int baseTypes,
+Slice::CsVisitor::writeDataMemberInitializers(const DataMemberList& members, const string& ns, unsigned int baseTypes,
                                               bool propertyMapping)
 {
     for(DataMemberList::const_iterator p = members.begin(); p != members.end(); ++p)
@@ -3381,7 +3381,7 @@ Slice::Gen::TypesVisitor::visitConst(const ConstPtr& p)
 void
 Slice::Gen::TypesVisitor::visitDataMember(const DataMemberPtr& p)
 {
-    int baseTypes = 0;
+    unsigned int baseTypes = 0;
     bool isClass = false;
     bool isProperty = false;
     bool isValue = false;
@@ -3492,7 +3492,7 @@ Slice::Gen::TypesVisitor::visitDataMember(const DataMemberPtr& p)
 }
 
 void
-Slice::Gen::TypesVisitor::writeMemberHashCode(const DataMemberList& dataMembers, int baseTypes)
+Slice::Gen::TypesVisitor::writeMemberHashCode(const DataMemberList& dataMembers, unsigned int baseTypes)
 {
     for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
     {
@@ -3506,7 +3506,7 @@ Slice::Gen::TypesVisitor::writeMemberHashCode(const DataMemberList& dataMembers,
 }
 
 void
-Slice::Gen::TypesVisitor::writeMemberEquals(const DataMemberList& dataMembers, int baseTypes)
+Slice::Gen::TypesVisitor::writeMemberEquals(const DataMemberList& dataMembers, unsigned int baseTypes)
 {
     for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
     {
diff --git a/cpp/src/slice2cs/Gen.h b/cpp/src/slice2cs/Gen.h
index b20c824e337..202998ea4ae 100644
--- a/cpp/src/slice2cs/Gen.h
+++ b/cpp/src/slice2cs/Gen.h
@@ -51,7 +51,7 @@ protected:
     // Generate assignment statements for those data members that have default values.
     //
     bool requiresDataMemberInitializers(const DataMemberList&);
-    void writeDataMemberInitializers(const DataMemberList&, const std::string&, int = 0, bool = false);
+    void writeDataMemberInitializers(const DataMemberList&, const std::string&, unsigned int = 0, bool = false);
 
     std::string toCsIdent(const std::string&);
     std::string editMarkup(const std::string&);
@@ -158,8 +158,8 @@ private:
 
     private:
 
-        void writeMemberHashCode(const DataMemberList&, int);
-        void writeMemberEquals(const DataMemberList&, int);
+        void writeMemberHashCode(const DataMemberList&, unsigned int);
+        void writeMemberEquals(const DataMemberList&, unsigned int);
     };
 
     class AsyncDelegateVisitor : public CsVisitor