Merge pull request #305 from ezegomez/master

Fix unittest in i386

Merge pull request #305 from ezegomez/master
Fix unittest in i386
69433f38 · Feng Xiao · d1281cdb · fb28d732 · 69433f38
Commit 69433f38 authored Jun 02, 2015 by Feng Xiao
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

wire_format_unittest.cc src/google/protobuf/wire_format_unittest.cc +1 -1

No files found.
--- 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;