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/IceGrid/LocatorI.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/IceGrid/LocatorI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/LocatorI.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/LocatorI.cpp b/cpp/src/IceGrid/LocatorI.cpp index a66a5e037c3..ae21fa49175 100644 --- a/cpp/src/IceGrid/LocatorI.cpp +++ b/cpp/src/IceGrid/LocatorI.cpp @@ -233,7 +233,7 @@ public: _encoding(encoding), _adapters(adapters), _traceLevels(locator->getTraceLevels()), - _count(count), + _count(static_cast<unsigned int>(count)), _lastAdapter(_adapters.begin()) { assert(_adapters.empty() || _count > 0); |