From 0400cca3236de1ca303af38bf81eab332d042b7c Mon Sep 17 00:00:00 2001 From: Adam Cozzette Date: Tue, 13 Mar 2018 16:37:29 -0700 Subject: Integrated internal changes from Google --- .../java/src/main/java/com/google/protobuf/ProtoCaliperBenchmark.java | 1 + benchmarks/py_benchmark.py | 1 + 2 files changed, 2 insertions(+) (limited to 'benchmarks') diff --git a/benchmarks/java/src/main/java/com/google/protobuf/ProtoCaliperBenchmark.java b/benchmarks/java/src/main/java/com/google/protobuf/ProtoCaliperBenchmark.java index 7dff16dc..b50c6585 100755 --- a/benchmarks/java/src/main/java/com/google/protobuf/ProtoCaliperBenchmark.java +++ b/benchmarks/java/src/main/java/com/google/protobuf/ProtoCaliperBenchmark.java @@ -243,3 +243,4 @@ public class ProtoCaliperBenchmark { } } + diff --git a/benchmarks/py_benchmark.py b/benchmarks/py_benchmark.py index 48234f03..c3d80492 100755 --- a/benchmarks/py_benchmark.py +++ b/benchmarks/py_benchmark.py @@ -115,3 +115,4 @@ class Benchmark: if __name__ == "__main__": for i in range(2, len(sys.argv)): run_one_test(sys.argv[i]) + -- cgit v1.2.3