aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google
Commit message (Collapse)AuthorAge
* show help if protoc is called without any arguments, pre-empts -h and --help ↵Gravatar Dennis Cappendijk2017-05-22
| | | | to show a useful message instead of just 'Missing input file.'
* Workaround gcc < 4.5.0 bugGravatar Mario J. Rugiero2017-05-05
| | | | | | See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=189 Signed-off-by: Mario J. Rugiero <mrugiero@gmail.com>
* Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-masterGravatar Adam Cozzette2017-04-27
|\
* | Fully qualify min as std::min in wire_format_lite.ccGravatar Adam Cozzette2017-04-27
| |
| * Add prefix to enum value with reserved name. (#3020)Gravatar Paul Yang2017-04-26
| |
* | Merge pull request #3018 from acozzette/using-namespace-stdGravatar Adam Cozzette2017-04-26
|\ \ | | | | | | Remove "using namespace std" from stubs/common.h
| * | Remove "using namespace std" from stubs/common.hGravatar Adam Cozzette2017-04-26
| | | | | | | | | | | | | | | | | | | | | | | | This prevents the contents of the std namespace from being effectively pulled into the top-level namespace in all translation units that include common.h. I left in individual using statements for a few common things like std::set and std::map, because it did not seem worth going through the churn of updating the whole codebase to fix those right now.
* | | Remove unused constants.Gravatar Jakob Buchgraber2017-04-25
|/ / | | | | | | | | When compiling with -Werror, -Wunused-const-variable the build fails due to those two constants not being used.
| * Allow proto files to import descriptor.proto (#2995)Gravatar Paul Yang2017-04-20
| | | | | | | | | | | | | | | | | | descriptor.proto uses proto2 syntax, which is not ready for external usage. However, some proto3 files import descriptor.proto and cannot be used. In this PR, all references (We cheated by only removing extensions, which is enough for now. User should avoid using messages defined in descriptor.proto as field type.) to content in descriptor.proto are removed from generated files. Those that import descriptor.proto can be used like other proto files.
| * Prepend "PB" to generated classes whose name are reserved words. (#2990)Gravatar Paul Yang2017-04-20
| |
| * Enum defined without package have incorrect class name. (#2988)Gravatar Paul Yang2017-04-19
| | | | | | | | Fix the bug by sharing the code for generating class name for both message and enum.
* | Simplify the Element dtor invocation when freeing elements inGravatar Michael Allen2017-04-17
| | | | | | | | | | InternalDeallocate to avoid confusing the compiler when there's a class named Element already defined in the global namespace.
| * Cherry-pick cl/152450543Gravatar Feng Xiao2017-04-11
| |
| * Cherry-pick cl/151775298Gravatar Feng Xiao2017-04-11
| |
| * Merge pull request #2955 from xfxyjwf/3.3.xGravatar Feng Xiao2017-04-11
| |\ | | | | | | Add include for INT_MAX
| * | cherrypick descriptor_pool.FindFileContainingSymbol by extensions (#2962)Gravatar Jie Luo2017-04-10
| | | | | | | | | | | | | | | | | | * Use PyUnicode_AsEncodedString() instead of PyUnicode_AsEncodedObject() * Cherrypick the fix descriptor_pool.FindFileContainingSymbol by extensions.
| | * Add include for INT_MAXGravatar Feng Xiao2017-04-08
| |/
* | Allow unknown values for Map put*Value methods just like every other enum ↵Gravatar Anuraag Agrawal2017-04-07
| | | | | | | | mutation method.
| * Cleanup reflection objects for map entry.Gravatar Feng Xiao2017-04-06
| |
| * Update generated code.Gravatar Feng Xiao2017-04-05
| |
| * Update version number and changelog for 3.3.0Gravatar Feng Xiao2017-04-05
| |
| * Fix MSVC DLL build.Gravatar Feng Xiao2017-03-30
| |
| * Down-integrate from google3.Gravatar Feng Xiao2017-03-29
|/
* Removes ignored const from return type (#2915)Gravatar Juan David Dominguez2017-03-29
| | | See https://github.com/google/protobuf/issues/2425
* Fix gcc warning when using map (#2213)Gravatar drivehappy2017-03-28
| | | | | | * Issue #2211: Addressing GCC warning on enumeral/non-enumeral in conditional expression. * Updated per 80 character wrap.
* Added a workaround to allow building for NaClGravatar Adam Cozzette2017-03-28
| | | | | | | arm-nacl-clang seems to produce a mysterious compiler error when it encounters __builtin_clzll, so when we are building for NaCl, let's avoid that in favor of the portable implementation of Log2FloorNonZero64.
* Merge pull request #2858 from haberman/gopackageGravatar Joshua Haberman2017-03-27
|\ | | | | Changed go_package for plugin.proto.
* \ Merge pull request #2861 from byronyi/#710Gravatar Adam Cozzette2017-03-20
|\ \ | | | | | | migrate delimited messages functions to util package
* \ \ Merge pull request #2860 from prehistoric-penguin/masterGravatar Feng Xiao2017-03-20
|\ \ \ | | | | | | | | Remove duplicated copyright statement
* \ \ \ Merge pull request #2854 from hesmar/attributesFixGravatar Adam Cozzette2017-03-20
|\ \ \ \ | | | | | | | | | | fix attributes warning
* \ \ \ \ Merge pull request #2867 from mojoBrendan/masterGravatar Feng Xiao2017-03-17
|\ \ \ \ \ | | | | | | | | | | | | Add preserve_proto_field_names option to JsonPrintOptions
* \ \ \ \ \ Merge pull request #2837 from anandolee/masterGravatar Jie Luo2017-03-17
|\ \ \ \ \ \ | | | | | | | | | | | | | | DefaultValueObjectWriter should populate oneof message field
* | | | | | | Add file option php_class_prefix (#2849)Gravatar Paul Yang2017-03-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This option will be prepended to generated classes of all messages in the containing file.
* | | | | | | Merge pull request #2848 from xfxyjwf/freebsdGravatar Feng Xiao2017-03-17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix freebsd build.
| | | | | | * | Update delimited_message_util_test.ccGravatar Bairen Yi2017-03-18
| | | | | | | |
| | | * | | | | Add option to preserve original proto field namesGravatar Brendan McCarthy2017-03-17
| | | | | | | |
| | | * | | | | Add use_snake_case_for_field_names option to JsonPrintOptionsGravatar Brendan McCarthy2017-03-17
| |_|/ / / / / |/| | | | | |
| | | | | * | fix several issuesGravatar Byron Yi2017-03-17
| | | | | | |
| | | | | | * Properly regenerated descriptor.proto.Gravatar Josh Haberman2017-03-16
| | | | | | |
| | | | | * | add LIBPROTOBUF_EXPORT to make msvc happyGravatar Byron Yi2017-03-16
| | | | | | |
| | | | | * | migrate delimited messages functions to util packageGravatar Byron Yi2017-03-16
| |_|_|_|/ / |/| | | | |
| | | | * | Remove duplicated copyright statementGravatar prehistoric-penguin2017-03-16
| |_|_|/ / |/| | | |
| | | | * Changed go_package for plugin.proto.Gravatar Josh Haberman2017-03-15
| |_|_|/ |/| | | | | | | | | | | For more info see: https://github.com/google/protobuf/issues/1289
* | | | Merge pull request #2023 from odeke-em/fix-print-help-to-stdoutGravatar Joshua Haberman2017-03-15
|\ \ \ \ | | | | | | | | | | compiler/cli: PrintHelpText prints to stdout instead of stderr
* \ \ \ \ Merge pull request #2846 from acozzette/bytestream-commentGravatar Adam Cozzette2017-03-15
|\ \ \ \ \ | | | | | | | | | | | | Updated an outdated comment in bytestream.h
| | | | | * fix attributes warningGravatar Markus Heß2017-03-15
| |_|_|_|/ |/| | | |
| | | * | Fix freebsd build.Gravatar Feng Xiao2017-03-14
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out system headers included by generated plugin.pb.h file already contains major/minor macro definitions when built on FreeBSD and we need to add #undefs to the generated header file. This change also fixes another compile error regarding EXPECT_DEATH on FreeBSD.
| * | | Updated an outdated comment in bytestream.hGravatar Adam Cozzette2017-03-14
| | | |
* | | | Replace CHECK() with GOOGLE_CHECK().Gravatar Josh Haberman2017-03-13
|/ / / | | | | | | | | | Fixes: https://github.com/google/protobuf/issues/1175
| | * DefaultValueObjectWriter should populate oneof message fieldGravatar Jie Luo2017-03-10
| | |