diff options
| author | Jose <jose@zeroc.com> | 2019-06-22 00:29:53 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-06-22 00:29:53 +0200 |
| commit | c5959fd09de61604bedd75354401df6a57395d65 (patch) | |
| tree | 3b0227f631c8b20fb1a1a274b92f63f52f34af2c /cpp/src/slice2cs/CsUtil.cpp | |
| parent | Small fix (diff) | |
| parent | Enable -Wconversion with clang - Close #363 (diff) | |
| download | ice-c5959fd09de61604bedd75354401df6a57395d65.tar.bz2 ice-c5959fd09de61604bedd75354401df6a57395d65.tar.xz ice-c5959fd09de61604bedd75354401df6a57395d65.zip | |
Merge remote-tracking branch 'origin/3.7' into swift
Diffstat (limited to 'cpp/src/slice2cs/CsUtil.cpp')
| -rw-r--r-- | cpp/src/slice2cs/CsUtil.cpp | 6 |
1 files changed, 3 insertions, 3 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); |