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/Ice/ArgVector.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/Ice/ArgVector.cpp')
| -rw-r--r-- | cpp/src/Ice/ArgVector.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/ArgVector.cpp b/cpp/src/Ice/ArgVector.cpp index ee1d60af61b..48ce959524f 100644 --- a/cpp/src/Ice/ArgVector.cpp +++ b/cpp/src/Ice/ArgVector.cpp @@ -8,8 +8,8 @@ IceInternal::ArgVector::ArgVector(int argcP, const char* const argvP[]) { assert(argcP >= 0); - _args.resize(argcP); - for(int i = 0; i < argcP; ++i) + _args.resize(static_cast<size_t>(argcP)); + for(size_t i = 0; i < static_cast<size_t>(argcP); ++i) { _args[i] = argvP[i]; } @@ -51,7 +51,7 @@ IceInternal::ArgVector::setupArgcArgv() { throw ::std::bad_alloc(); } - for(int i = 0; i < argc; i++) + for(size_t i = 0; i < static_cast<size_t>(argc); i++) { argv[i] = const_cast<char*>(_args[i].c_str()); } |