| diff -aur protobuf-2.6.1x/src/google/protobuf/compiler/command_line_interface_unittest.cc protobuf-2.6.1/src/google/protobuf/compiler/command_line_interface_unittest.cc |
| --- protobuf-2.6.1x/src/google/protobuf/compiler/command_line_interface_unittest.cc 2014-10-20 17:06:06.000000000 -0700 |
| +++ protobuf-2.6.1/src/google/protobuf/compiler/command_line_interface_unittest.cc 2016-02-04 07:47:59.893962900 -0800 |
| @@ -714,7 +714,7 @@ |
| #endif |
| |
| Run("protocol_compiler --test_out=$tmpdir " |
| - "--proto_path=$tmpdir/a"PATH_SEPARATOR"$tmpdir/b foo.proto"); |
| + "--proto_path=$tmpdir/a" PATH_SEPARATOR "$tmpdir/b foo.proto"); |
| |
| #undef PATH_SEPARATOR |
| |
| diff -aur protobuf-2.6.1x/src/google/protobuf/compiler/parser_unittest.cc protobuf-2.6.1/src/google/protobuf/compiler/parser_unittest.cc |
| --- protobuf-2.6.1x/src/google/protobuf/compiler/parser_unittest.cc 2014-10-20 17:06:06.000000000 -0700 |
| +++ protobuf-2.6.1/src/google/protobuf/compiler/parser_unittest.cc 2016-02-04 07:47:54.215562900 -0800 |
| @@ -365,35 +365,35 @@ |
| #define ETC "name:\"foo\" label:LABEL_REQUIRED number:1" |
| "message_type {" |
| " name: \"TestMessage\"" |
| - " field { type:TYPE_INT32 default_value:\"1\" "ETC" }" |
| - " field { type:TYPE_INT32 default_value:\"-2\" "ETC" }" |
| - " field { type:TYPE_INT64 default_value:\"3\" "ETC" }" |
| - " field { type:TYPE_INT64 default_value:\"-4\" "ETC" }" |
| - " field { type:TYPE_UINT32 default_value:\"5\" "ETC" }" |
| - " field { type:TYPE_UINT64 default_value:\"6\" "ETC" }" |
| - " field { type:TYPE_FLOAT default_value:\"7.5\" "ETC" }" |
| - " field { type:TYPE_FLOAT default_value:\"-8.5\" "ETC" }" |
| - " field { type:TYPE_FLOAT default_value:\"9\" "ETC" }" |
| - " field { type:TYPE_DOUBLE default_value:\"10.5\" "ETC" }" |
| - " field { type:TYPE_DOUBLE default_value:\"-11.5\" "ETC" }" |
| - " field { type:TYPE_DOUBLE default_value:\"12\" "ETC" }" |
| - " field { type:TYPE_DOUBLE default_value:\"inf\" "ETC" }" |
| - " field { type:TYPE_DOUBLE default_value:\"-inf\" "ETC" }" |
| - " field { type:TYPE_DOUBLE default_value:\"nan\" "ETC" }" |
| - " field { type:TYPE_STRING default_value:\"13\\001\" "ETC" }" |
| - " field { type:TYPE_STRING default_value:\"abc\" "ETC" }" |
| - " field { type:TYPE_BYTES default_value:\"14\\\\002\" "ETC" }" |
| - " field { type:TYPE_BYTES default_value:\"abc\" "ETC" }" |
| - " field { type:TYPE_BOOL default_value:\"true\" "ETC" }" |
| - " field { type_name:\"Foo\" default_value:\"FOO\" "ETC" }" |
| + " field { type:TYPE_INT32 default_value:\"1\" " ETC " }" |
| + " field { type:TYPE_INT32 default_value:\"-2\" " ETC " }" |
| + " field { type:TYPE_INT64 default_value:\"3\" " ETC " }" |
| + " field { type:TYPE_INT64 default_value:\"-4\" " ETC " }" |
| + " field { type:TYPE_UINT32 default_value:\"5\" " ETC " }" |
| + " field { type:TYPE_UINT64 default_value:\"6\" " ETC " }" |
| + " field { type:TYPE_FLOAT default_value:\"7.5\" " ETC " }" |
| + " field { type:TYPE_FLOAT default_value:\"-8.5\" " ETC " }" |
| + " field { type:TYPE_FLOAT default_value:\"9\" " ETC " }" |
| + " field { type:TYPE_DOUBLE default_value:\"10.5\" " ETC " }" |
| + " field { type:TYPE_DOUBLE default_value:\"-11.5\" " ETC " }" |
| + " field { type:TYPE_DOUBLE default_value:\"12\" " ETC " }" |
| + " field { type:TYPE_DOUBLE default_value:\"inf\" " ETC " }" |
| + " field { type:TYPE_DOUBLE default_value:\"-inf\" " ETC " }" |
| + " field { type:TYPE_DOUBLE default_value:\"nan\" " ETC " }" |
| + " field { type:TYPE_STRING default_value:\"13\\001\" " ETC " }" |
| + " field { type:TYPE_STRING default_value:\"abc\" " ETC " }" |
| + " field { type:TYPE_BYTES default_value:\"14\\\\002\" " ETC " }" |
| + " field { type:TYPE_BYTES default_value:\"abc\" " ETC " }" |
| + " field { type:TYPE_BOOL default_value:\"true\" " ETC " }" |
| + " field { type_name:\"Foo\" default_value:\"FOO\" " ETC " }" |
| |
| - " field { type:TYPE_INT32 default_value:\"2147483647\" "ETC" }" |
| - " field { type:TYPE_INT32 default_value:\"-2147483648\" "ETC" }" |
| - " field { type:TYPE_UINT32 default_value:\"4294967295\" "ETC" }" |
| - " field { type:TYPE_INT64 default_value:\"9223372036854775807\" "ETC" }" |
| - " field { type:TYPE_INT64 default_value:\"-9223372036854775808\" "ETC" }" |
| - " field { type:TYPE_UINT64 default_value:\"18446744073709551615\" "ETC" }" |
| - " field { type:TYPE_DOUBLE default_value:\"43981\" "ETC" }" |
| + " field { type:TYPE_INT32 default_value:\"2147483647\" " ETC " }" |
| + " field { type:TYPE_INT32 default_value:\"-2147483648\" " ETC " }" |
| + " field { type:TYPE_UINT32 default_value:\"4294967295\" " ETC " }" |
| + " field { type:TYPE_INT64 default_value:\"9223372036854775807\" " ETC " }" |
| + " field { type:TYPE_INT64 default_value:\"-9223372036854775808\" " ETC " }" |
| + " field { type:TYPE_UINT64 default_value:\"18446744073709551615\" " ETC " }" |
| + " field { type:TYPE_DOUBLE default_value:\"43981\" " ETC " }" |
| "}"); |
| #undef ETC |
| } |
| |
