Merge pull request #1155 from jcburke14/jb-intcast

Fix compiler warning from repeated_field.h
This commit is contained in:
Feng Xiao 2016-01-19 16:57:10 -08:00
commit 6794d17c94

View file

@ -692,7 +692,7 @@ class LIBPROTOBUF_EXPORT StringTypeHandlerBase {
class StringTypeHandler : public StringTypeHandlerBase {
public:
static int SpaceUsed(const string& value) {
return sizeof(value) + StringSpaceUsedExcludingSelf(value);
return static_cast<int>(sizeof(value)) + StringSpaceUsedExcludingSelf(value);
}
};