Skip to content

Instantly share code, notes, and snippets.

@sarum9in

sarum9in/gcc-1.patch

Created May 22, 2016 01:28
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save sarum9in/ccc7326d94770417275513eadddcae27 to your computer and use it in GitHub Desktop.
Save sarum9in/ccc7326d94770417275513eadddcae27 to your computer and use it in GitHub Desktop.
Download ZIP
protobuf3 gcc patches
Raw
gcc-1.patch
--- a/src/google/protobuf/util/internal/protostream_objectsource_test.cc 2016-05-16 22:34:04.000000000 +0400
+++ b/src/google/protobuf/util/internal/protostream_objectsource_test.cc 2016-05-22 05:16:56.210068181 +0400
@@ -132,6 +132,7 @@
->RenderUint32("", bit_cast<uint32>(0))
->RenderUint32("", bit_cast<uint32>(3202))
->EndList()
+ ;(&ow_)
->StartList("repU32")
->RenderUint32("", bit_cast<uint32>(3203))
->RenderUint32("", bit_cast<uint32>(0))
@@ -141,6 +142,7 @@
->RenderInt32("", 3204)
->RenderInt32("", 3205)
->EndList()
+ ;(&ow_)
->StartList("repSf32")
->RenderInt32("", 3206)
->RenderInt32("", 0)
@@ -150,6 +152,7 @@
->RenderInt32("", 3207)
->RenderInt32("", 3208)
->EndList()
+ ;(&ow_)
->StartList("repFix64")
->RenderUint64("", bit_cast<uint64>(6401LL))
->RenderUint64("", bit_cast<uint64>(0LL))
@@ -159,11 +162,13 @@
->RenderUint64("", bit_cast<uint64>(6402LL))
->RenderUint64("", bit_cast<uint64>(6403LL))
->EndList()
+ ;(&ow_)
->StartList("repI64")
->RenderInt64("", 6404L)
->RenderInt64("", 0L)
->EndList()
->StartList("repSf64")
+ ;(&ow_)
->RenderInt64("", 0L)
->RenderInt64("", 6405L)
->RenderInt64("", 6406L)
@@ -172,15 +177,18 @@
->RenderInt64("", 6407L)
->RenderInt64("", 0L)
->EndList()
+ ;(&ow_)
->StartList("repFloat")
->RenderFloat("", 0.0f)
->RenderFloat("", 32.1f)
->RenderFloat("", 32.2f)
->EndList()
+ ;(&ow_)
->StartList("repDouble")
->RenderDouble("", 64.1L)
->RenderDouble("", 0.0L)
->EndList()
+ ;(&ow_)
->StartList("repBool")
->RenderBool("", true)
->RenderBool("", false)
@@ -577,15 +585,18 @@
->StartObject("key1")
->RenderString("foo", "foovalue")
->EndObject()
+ ;(&ow_)
->StartObject("key2")
->RenderString("foo", "barvalue")
->EndObject()
+ ;(&ow_)
->StartObject("map2")
->StartObject("nestedself")
->StartObject("map1")
->StartObject("nested_key1")
->RenderString("foo", "nested_foo")
->EndObject()
+ ;(&ow_)
->EndObject()
->RenderString("bar", "nested_bar_string")
->EndObject()
@@ -594,6 +605,7 @@
->RenderString("111", "one one one")
->EndObject()
->EndObject()
+ ;(&ow_)
->RenderString("bar", "top bar")
->EndObject();
@@ -640,6 +652,7 @@
->StartObject("")
->RenderString("foo", "foovalue")
->EndObject()
+ ;(&ow_)
->EndObject()
->StartObject("map2")
->StartObject("")
@@ -647,12 +660,14 @@
->StartObject("nested_key1")
->RenderString("foo", "nested_foo")
->EndObject()
+ ;(&ow_)
->EndObject()
->EndObject()
->EndObject()
->StartObject("map3")
->RenderString("0", "one one one")
->EndObject()
+ ;(&ow_)
->StartObject("map4")
->RenderString("false", "bool")
->EndObject()
@@ -922,16 +937,20 @@
->RenderString("id", "1")
->RenderString("singleMask", "path1,snakeCasePath2")
->StartList("repeatedMask")
+ ;(&ow_)
->RenderString("", "path3")
->RenderString("", "snakeCasePath4,path5")
->EndList()
+ ;(&ow_)
->StartList("nestedMask")
->StartObject("")
->RenderString("data", "data")
->RenderString("singleMask", "nested.path1,nestedField.snakeCasePath2")
+ ;(&ow_)
->StartList("repeatedMask")
->RenderString("", "nestedField.path3,nested.snakeCasePath4")
->RenderString("", "nested.path5")
+ ;(&ow_)
->RenderString("",
"snakeCase.mapField[\"map_key_should_be_ignored\"]."
"nestedSnakeCase.mapField[\"map_key_sho\\\"uld_be_"
Raw
gcc-2.patch
--- a/src/google/protobuf/util/internal/protostream_objectwriter_test.cc 2016-05-16 22:34:04.000000000 +0400
+++ b/src/google/protobuf/util/internal/protostream_objectwriter_test.cc 2016-05-22 05:16:56.210068181 +0400
@@ -232,16 +232,19 @@
->StartObject("publisher")
->RenderString("name", "My Publisher")
->EndObject()
+ ;ow_
->StartObject("author")
->RenderBool("alive", true)
->RenderString("name", "robert")
->StartList("pseudonym")
->RenderString("", "bob")
+ ;ow_
->RenderString("", "bobby")
->EndList()
->StartList("friend")
->StartObject("")
->RenderString("name", "john")
+ ;ow_
->EndObject()
->EndList()
->EndObject()
@@ -303,61 +306,74 @@
->RenderString("fix32", "101")
->RenderString("u32", "102")
->RenderString("i32", "-103")
+ ;ow_
->RenderString("sf32", "-104")
->RenderString("s32", "-105")
->RenderString("fix64", "40000000001")
->RenderString("u64", "40000000002")
+ ;ow_
->RenderString("i64", "-40000000003")
->RenderString("sf64", "-40000000004")
->RenderString("s64", "-40000000005")
->RenderString("str", "string1")
+ ;ow_
->RenderString("bytes", "U29tZSBCeXRlcw==") // "Some Bytes"
->RenderString("float", "3.14")
->RenderString("double", "-4.05")
->RenderString("bool", "true")
+ ;ow_
->StartList("rep_fix32")
->RenderString("", "201")
->EndList()
->StartList("rep_u32")
->RenderString("", "202")
+ ;ow_
->EndList()
->StartList("rep_i32")
->RenderString("", "-203")
->EndList()
->StartList("rep_sf32")
+ ;ow_
->RenderString("", "-204")
->EndList()
->StartList("rep_s32")
->RenderString("", "-205")
+ ;ow_
->EndList()
->StartList("rep_fix64")
->RenderString("", "80000000001")
->EndList()
->StartList("rep_u64")
+ ;ow_
->RenderString("", "80000000002")
->EndList()
->StartList("rep_i64")
->RenderString("", "-80000000003")
->EndList()
+ ;ow_
->StartList("rep_sf64")
->RenderString("", "-80000000004")
->EndList()
->StartList("rep_s64")
->RenderString("", "-80000000005")
+ ;ow_
->EndList()
->StartList("rep_str")
->RenderString("", "string2")
->EndList()
->StartList("rep_bytes")
+ ;ow_
->RenderString("", "TW9yZSBCeXRlcw==") // "More Bytes"
->EndList()
->StartList("rep_float")
->RenderString("", "6.14")
->EndList()
+ ;ow_
->StartList("rep_double")
->RenderString("", "-8.05")
->EndList()
->StartList("rep_bool")
+ ;ow_
->RenderString("", "false")
->EndList()
->EndObject();
@@ -390,6 +406,7 @@
->RenderString("float", "Infinity")
->RenderString("i32", "Infinity")
->RenderString("u32", "Infinity")
+ ;ow_
->RenderString("sf64", "-Infinity")
->RenderString("str", "-Infinity")
->RenderString("bool", "Infinity")
@@ -423,6 +440,7 @@
->RenderString("float", "NaN")
->RenderString("i32", "NaN")
->RenderString("u32", "NaN")
+ ;ow_
->RenderString("sf64", "NaN")
->RenderString("str", "NaN")
->RenderString("bool", "NaN")
@@ -475,6 +493,7 @@
->RenderString("name", "The Author")
->StartList("pseudonym")
->RenderString("", "first")
+ ;ow_
->RenderString("", "second")
->EndList()
->EndObject()
@@ -496,6 +515,7 @@
->StartObject("author")
->StartList("name")
->RenderString("", "first")
+ ;ow_
->RenderString("", "second")
->EndList()
->EndObject()
@@ -520,6 +540,7 @@
->StartObject("friend")
->RenderString("name", "first")
->EndObject()
+ ;ow_
->StartObject("friend")
->RenderString("name", "second")
->EndObject()
@@ -542,6 +563,7 @@
->EndObject()
->StartObject("publisher")
->RenderString("name", "first")
+ ;ow_
->EndObject()
->StartObject("publisher")
->RenderString("name", "second")
@@ -566,10 +588,12 @@
->RenderBool("alive", true)
->StartList("friend")
->StartObject("")
+ ;ow_
->RenderString("name", "first")
->EndObject()
->StartObject("")
->RenderString("name", "second")
+ ;ow_
->EndObject()
->EndList()
->EndObject()
@@ -595,6 +619,7 @@
->StartList("publisher")
->StartObject("")
->RenderString("name", "first")
+ ;ow_
->EndObject()
->StartObject("")
->RenderString("name", "second")
@@ -634,12 +659,14 @@
->StartList("friend")
->StartObject("")
->RenderString("name", "Mark")
+ ;ow_
->EndObject()
->StartObject("")
->RenderString("name", "John")
->RenderString("address", "Patmos")
->EndObject()
->StartObject("")
+ ;ow_
->RenderString("name", "Luke")
->EndObject()
->EndList()
@@ -671,6 +698,7 @@
->StartObject("author")
->RenderString("name", "William")
->StartObject("wife")
+ ;ow_
->RenderString("name", "Hilary")
->EndObject()
->RenderString("pseudonym", "Bill")
@@ -702,6 +730,7 @@
->StartObject("publisher")
->RenderString("name", "propaganda")
->StartList("alliance")
+ ;ow_
->EndList()
->EndObject()
->RenderString("title", "Brainwashing")
@@ -1320,6 +1349,7 @@
->StartObject("object")
->RenderString("k1", "v1")
->StartList("k1")
+ ;ow_
->RenderString("", "v2")
->EndList()
->EndObject()
@@ -1336,6 +1366,7 @@
->StartObject("k1")
->RenderString("sub_k1", "v1")
->EndObject()
+ ;ow_
->StartObject("k1")
->RenderString("sub_k2", "v2")
->EndObject()
@@ -1460,6 +1491,7 @@
->StartObject("any")
->RenderString("@type", "type.googleapis.com/google.protobuf.Any")
->StartObject("value")
+ ;ow_
->RenderString("@type",
"type.googleapis.com/google.protobuf.testing.anys.AnyM")
->RenderString("foo", "foovalue")
@@ -1493,6 +1525,7 @@
->StartObject("value")
->RenderString("@type", "type.googleapis.com/google.protobuf.Any")
->StartObject("value")
+ ;ow_
->RenderString("@type",
"type.googleapis.com/google.protobuf.testing.anys.AnyM")
->RenderString("foo", "foovalue")
@@ -1671,6 +1704,7 @@
->StartObject("any")
->RenderString("@type", "type.googleapis.com/google.protobuf.Value")
->StartObject("value")
+ ;ow_
->RenderString("foo", "abc")
->EndObject()
->EndObject()
@@ -1699,6 +1733,7 @@
->RenderString("@type", "type.googleapis.com/google.protobuf.Value")
->StartList("value")
->RenderString("", "hello")
+ ;ow_
->EndList()
->EndObject()
->EndObject()
@@ -1784,6 +1819,7 @@
->StartObject("any")
->RenderString("@type", "type.googleapis.com/google.protobuf.Value")
->StartList("not_value")
+ ;ow_
->EndList()
->EndObject()
->EndObject()
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment