Merge pull request #1155 from jcburke14/jb-intcast

Fix compiler warning from repeated_field.h
pull/780/merge
Feng Xiao 9 years ago
commit 6794d17c94
  1. 2
      src/google/protobuf/repeated_field.h

@ -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);
}
};

Loading…
Cancel
Save