diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2015-06-02 10:53:03 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2015-06-02 10:53:03 -0700 |
| commit | 69433f3810a2bc1b7446f819b82591037cc2f6af (patch) | |
| tree | be3f24042b0a01474e92080915da38ad439af004 | |
| parent | d1281cdb6951cc77daa2b576234d16028e8a57df (diff) | |
| parent | fb28d73204819b2c1083416e405f68816b5a1306 (diff) | |
Merge pull request #305 from ezegomez/master
Fix unittest in i386
| -rw-r--r-- | src/google/protobuf/wire_format_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/wire_format_unittest.cc b/src/google/protobuf/wire_format_unittest.cc index e80c5a71..4b151f97 100644 --- a/src/google/protobuf/wire_format_unittest.cc +++ b/src/google/protobuf/wire_format_unittest.cc @@ -768,7 +768,7 @@ TEST(WireFormatTest, RepeatedScalarsDifferentTagSizes) { } TEST(WireFormatTest, CompatibleTypes) { - const int64 data = 0x100000000; + const int64 data = 0x100000000LL; unittest::Int64Message msg1; msg1.set_data(data); string serialized; |