diff options
| author |  Bo Yang <teboring@google.com> | 2016-04-14 10:47:36 -0700 |
|---|---|---|
| committer | Bo Yang <teboring@google.com> | 2016-05-18 17:11:22 +0800 |
| commit | 6673283a56782e9c38205d1d851f80f1099f0b9c (patch) | |
| tree | a795a8891481aa42367a5ebd05e9de10444a0ef1 /src/google/protobuf | |
| parent | 718eb75b51025a3236bc4b4af90aae1b0023620f (diff) | |
Integrate interanl changes
Diffstat (limited to 'src/google/protobuf')
| -rwxr-xr-x | src/google/protobuf/compiler/js/js_generator.cc | 1 | ||||
| -rw-r--r-- | src/google/protobuf/text_format_unittest.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/js/js_generator.cc b/src/google/protobuf/compiler/js/js_generator.cc index 3de61e80..ac917c2d 100755 --- a/src/google/protobuf/compiler/js/js_generator.cc +++ b/src/google/protobuf/compiler/js/js_generator.cc @@ -489,6 +489,7 @@ string JSByteGetterSuffix(BytesMode bytes_mode) { default: assert(false); } + return ""; } // Returns the field name as a capitalized portion of a getter/setter method diff --git a/src/google/protobuf/text_format_unittest.cc b/src/google/protobuf/text_format_unittest.cc index 58aa3f8d..410e5480 100644 --- a/src/google/protobuf/text_format_unittest.cc +++ b/src/google/protobuf/text_format_unittest.cc @@ -53,11 +53,11 @@ #include <google/protobuf/unittest_mset_wire_format.pb.h> #include <google/protobuf/io/tokenizer.h> #include <google/protobuf/io/zero_copy_stream_impl.h> +#include <google/protobuf/stubs/mathlimits.h> #include <google/protobuf/stubs/strutil.h> #include <google/protobuf/stubs/substitute.h> #include <google/protobuf/testing/googletest.h> #include <gtest/gtest.h> -#include <google/protobuf/stubs/mathlimits.h> namespace google { |