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 /ruby/src/IceRuby/Properties.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 'ruby/src/IceRuby/Properties.cpp')
| -rw-r--r-- | ruby/src/IceRuby/Properties.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ruby/src/IceRuby/Properties.cpp b/ruby/src/IceRuby/Properties.cpp index 567c315b405..edd5f7fe059 100644 --- a/ruby/src/IceRuby/Properties.cpp +++ b/ruby/src/IceRuby/Properties.cpp @@ -136,7 +136,7 @@ IceRuby_Properties_getPropertyAsIntWithDefault(VALUE self, VALUE key, VALUE def) { Ice::PropertiesPtr p = getProperties(self); string k = getString(key); - Ice::Int d = getInteger(def); + Ice::Int d = static_cast<Ice::Int>(getInteger(def)); Ice::Int v = p->getPropertyAsIntWithDefault(k, d); return INT2FIX(v); } |