diff options
| author | Brad King <brad.king@kitware.com> | 2017-05-09 15:37:33 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-05-09 15:37:35 (GMT) |
| commit | b69e061b8073efbd2c356f4508ea401c85e8dae3 (patch) | |
| tree | bafe49c2a963cec546634a6c7872a925736cb8b2 /Source | |
| parent | fcf60ec1bcb0fa3224bfe80f8279c29670cefd19 (diff) | |
| parent | 2731a91c98ad8b48aaecc2fa3039cc9601d48fbc (diff) | |
| download | CMake-b69e061b8073efbd2c356f4508ea401c85e8dae3.zip CMake-b69e061b8073efbd2c356f4508ea401c85e8dae3.tar.gz CMake-b69e061b8073efbd2c356f4508ea401c85e8dae3.tar.bz2 | |
Merge topic 'suncc-cxx11'
2731a91c Update SunPro flags used for CMake itself to support C++11
86edc5b6 Choose compiler-specific flags earlier in CMake's own build
7b2d529b cmBase32: Cast pointer subtraction result to size explicitly
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !813
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmBase32.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmBase32.cxx b/Source/cmBase32.cxx index 091d619..1dac212 100644 --- a/Source/cmBase32.cxx +++ b/Source/cmBase32.cxx @@ -58,7 +58,7 @@ std::string cmBase32Encoder::encodeString(const unsigned char* input, input += blockSize; } - size_t remain(end - input); + size_t remain = static_cast<size_t>(end - input); if (remain != 0) { // Temporary source buffer filled up with 0s unsigned char extended[blockSize]; |