diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-05-06 19:18:09 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-05-06 19:18:09 +0300 |
commit | f3d00667c5a1bffa5a04d5e86676caca6979b58d (patch) | |
tree | 8c326bea9dfeee35670ad201f39818fc1a7765bc /src/resources/map/tileset.h | |
parent | bbfe142ec3b7879bbd618f36367f95c030d65968 (diff) | |
download | ManaVerse-f3d00667c5a1bffa5a04d5e86676caca6979b58d.tar.gz ManaVerse-f3d00667c5a1bffa5a04d5e86676caca6979b58d.tar.bz2 ManaVerse-f3d00667c5a1bffa5a04d5e86676caca6979b58d.tar.xz ManaVerse-f3d00667c5a1bffa5a04d5e86676caca6979b58d.zip |
Fix code style.
Diffstat (limited to 'src/resources/map/tileset.h')
-rw-r--r-- | src/resources/map/tileset.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/resources/map/tileset.h b/src/resources/map/tileset.h index c2f4a297c..93ff16c2d 100644 --- a/src/resources/map/tileset.h +++ b/src/resources/map/tileset.h @@ -77,15 +77,15 @@ class Tileset final : public ImageSet int calcMemoryLocal() const override final { int sz = ImageSet::calcMemoryLocal() + - sizeof(Tileset); + static_cast<int>(sizeof(Tileset)); const std::map<std::string, std::string>::const_iterator it_end = mProperties.end(); std::map<std::string, std::string>::const_iterator it = mProperties.begin(); while (it != it_end) { - sz += (*it).first.capacity() + - (*it).second.capacity(); + sz += static_cast<int>((*it).first.capacity() + + (*it).second.capacity()); ++ it; } return sz; |