organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #1412 from google/internal

Browse source 
Integrate interanl changes
This commit is contained in:
Paul Yang 2016-05-18 20:36:35 +08:00
commit 32e3d7a109
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/google/protobuf/compiler/js/js_generator.cc
View file

@ -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

2
src/google/protobuf/text_format_unittest.cc
View file

@ -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 {