Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add new file option php_namespace. (#3162) | Paul Yang | 2017-06-05 | 4 | -177/+410 |
| | | | | | | | | | | | | | | | | * Add new file option php_namespace. Use this option to change the namespace of php generated classes. Default is empty. When this option is empty, the package name will be used for determining the namespace. * Uncomment commented tests * Revert gdb test change * Update csharp descriptor. * Add test for empty php_namespace. | ||||
* | not to use std::random_device for map.Seed(). (#3133) | Wayne Zhang | 2017-05-30 | 1 | -13/+0 |
| | | | | | | * not to use std::random_device for map.Seed(). * remove include random | ||||
* | Add ARRAY for reserved name (#3150) | Paul Yang | 2017-05-29 | 1 | -2/+2 |
| | |||||
* | Adds fluent setters for PHP (#3130) | Brent Shaffer | 2017-05-29 | 1 | -0/+2 |
| | |||||
* | Removing undefined behavior and compiler warnings (#1315) | brian-peloton | 2017-05-23 | 7 | -32/+38 |
| | | | | | | | | | | | | | | | | | | | * Comment out unused arguments. These last few are all that's needed to compile with -Wunused-arguments. * Fix missing struct field initializer. With this fix, everything compiles with -Wmissing-field-initializers. * Add support for disabling unaligned memory accesses on x86 too. ubsan doesn't like these because they are technically undefined behavior, so -DGOOGLE_PROTOBUF_DONT_USE_UNALIGNED will disable them easily. * Avoid undefined integer overflow. ubsan catches all of these. | ||||
* | show help if protoc is called without any arguments, pre-empts -h and --help ↵ | Dennis Cappendijk | 2017-05-22 | 1 | -0/+6 |
| | | | | to show a useful message instead of just 'Missing input file.' | ||||
* | Workaround gcc < 4.5.0 bug | Mario J. Rugiero | 2017-05-05 | 1 | -1/+2 |
| | | | | | | 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-master | Adam Cozzette | 2017-04-27 | 175 | -4873/+11187 |
|\ | |||||
| * | Add prefix to enum value with reserved name. (#3020)v3.3.0 | Paul Yang | 2017-04-26 | 1 | -4/+4 |
| | | |||||
| * | Allow proto files to import descriptor.proto (#2995) | Paul Yang | 2017-04-20 | 1 | -0/+26 |
| | | | | | | | | | | | | | | | | | | 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) | Paul Yang | 2017-04-20 | 1 | -8/+27 |
| | | |||||
| * | Enum defined without package have incorrect class name. (#2988) | Paul Yang | 2017-04-19 | 1 | -47/+35 |
| | | | | | | | | Fix the bug by sharing the code for generating class name for both message and enum. | ||||
| * | Cherry-pick cl/152450543 | Feng Xiao | 2017-04-11 | 8 | -2/+472 |
| | | |||||
| * | Cherry-pick cl/151775298 | Feng Xiao | 2017-04-11 | 2 | -2/+56 |
| | | |||||
| * | Merge pull request #2955 from xfxyjwf/3.3.x | Feng Xiao | 2017-04-11 | 1 | -0/+1 |
| |\ | | | | | | | Add include for INT_MAX | ||||
| | * | Add include for INT_MAX | Feng Xiao | 2017-04-08 | 1 | -0/+1 |
| | | | |||||
| * | | cherrypick descriptor_pool.FindFileContainingSymbol by extensions (#2962) | Jie Luo | 2017-04-10 | 1 | -2/+4 |
| |/ | | | | | | | | | | | * Use PyUnicode_AsEncodedString() instead of PyUnicode_AsEncodedObject() * Cherrypick the fix descriptor_pool.FindFileContainingSymbol by extensions. | ||||
| * | Cleanup reflection objects for map entry. | Feng Xiao | 2017-04-06 | 2 | -0/+10 |
| | | |||||
| * | Update generated code. | Feng Xiao | 2017-04-05 | 13 | -26/+26 |
| | | |||||
| * | Update version number and changelog for 3.3.0 | Feng Xiao | 2017-04-05 | 2 | -8/+8 |
| | | |||||
| * | Fix C++ distcheck. | Feng Xiao | 2017-03-30 | 1 | -0/+2 |
| | | |||||
| * | Fix MSVC DLL build. | Feng Xiao | 2017-03-30 | 6 | -8/+10 |
| | | |||||
| * | Down-integrate from google3. | Feng Xiao | 2017-03-29 | 169 | -4793/+10531 |
| | | |||||
* | | Fully qualify min as std::min in wire_format_lite.cc | Adam Cozzette | 2017-04-27 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #3018 from acozzette/using-namespace-std | Adam Cozzette | 2017-04-26 | 15 | -98/+108 |
|\ \ | | | | | | | Remove "using namespace std" from stubs/common.h | ||||
| * | | Remove "using namespace std" from stubs/common.h | Adam Cozzette | 2017-04-26 | 15 | -98/+108 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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. | Jakob Buchgraber | 2017-04-25 | 1 | -2/+0 |
|/ / | | | | | | | | | When compiling with -Werror, -Wunused-const-variable the build fails due to those two constants not being used. | ||||
* | | Simplify the Element dtor invocation when freeing elements in | Michael Allen | 2017-04-17 | 1 | -1/+1 |
| | | | | | | | | | | InternalDeallocate to avoid confusing the compiler when there's a class named Element already defined in the global namespace. | ||||
* | | Allow unknown values for Map put*Value methods just like every other enum ↵ | Anuraag Agrawal | 2017-04-07 | 2 | -6/+0 |
|/ | | | | mutation method. | ||||
* | Removes ignored const from return type (#2915) | Juan David Dominguez | 2017-03-29 | 1 | -1/+1 |
| | | | See https://github.com/google/protobuf/issues/2425 | ||||
* | Fix gcc warning when using map (#2213) | drivehappy | 2017-03-28 | 1 | -1/+3 |
| | | | | | | * Issue #2211: Addressing GCC warning on enumeral/non-enumeral in conditional expression. * Updated per 80 character wrap. | ||||
* | Added a workaround to allow building for NaCl | Adam Cozzette | 2017-03-28 | 1 | -1/+8 |
| | | | | | | | 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/gopackage | Joshua Haberman | 2017-03-27 | 2 | -4/+5 |
|\ | | | | | Changed go_package for plugin.proto. | ||||
| * | Properly regenerated descriptor.proto. | Josh Haberman | 2017-03-16 | 1 | -3/+4 |
| | | |||||
| * | Changed go_package for plugin.proto. | Josh Haberman | 2017-03-15 | 1 | -1/+1 |
| | | | | | | | | For more info see: https://github.com/google/protobuf/issues/1289 | ||||
* | | Merge pull request #2861 from byronyi/#710 | Adam Cozzette | 2017-03-20 | 4 | -0/+205 |
|\ \ | | | | | | | migrate delimited messages functions to util package | ||||
| * | | Update delimited_message_util_test.cc | Bairen Yi | 2017-03-18 | 1 | -1/+1 |
| | | | |||||
| * | | fix several issues | Byron Yi | 2017-03-17 | 3 | -15/+15 |
| | | | |||||
| * | | add LIBPROTOBUF_EXPORT to make msvc happy | Byron Yi | 2017-03-16 | 1 | -6/+6 |
| | | | |||||
| * | | migrate delimited messages functions to util package | Byron Yi | 2017-03-16 | 4 | -0/+205 |
| |/ | |||||
* | | Merge pull request #2860 from prehistoric-penguin/master | Feng Xiao | 2017-03-20 | 2 | -60/+0 |
|\ \ | | | | | | | Remove duplicated copyright statement | ||||
| * | | Remove duplicated copyright statement | prehistoric-penguin | 2017-03-16 | 2 | -60/+0 |
| |/ | |||||
* | | Merge pull request #2854 from hesmar/attributesFix | Adam Cozzette | 2017-03-20 | 3 | -31/+31 |
|\ \ | | | | | | | fix attributes warning | ||||
| * | | fix attributes warning | Markus Heß | 2017-03-15 | 3 | -31/+31 |
| | | | |||||
* | | | Merge pull request #2867 from mojoBrendan/master | Feng Xiao | 2017-03-17 | 7 | -9/+86 |
|\ \ \ | | | | | | | | | Add preserve_proto_field_names option to JsonPrintOptions | ||||
| * | | | Add option to preserve original proto field names | Brendan McCarthy | 2017-03-17 | 9 | -28/+87 |
| | | | | |||||
| * | | | Add use_snake_case_for_field_names option to JsonPrintOptions | Brendan McCarthy | 2017-03-17 | 4 | -3/+21 |
| | |/ | |/| | |||||
* | | | Merge pull request #2837 from anandolee/master | Jie Luo | 2017-03-17 | 2 | -2/+19 |
|\ \ \ | | | | | | | | | DefaultValueObjectWriter should populate oneof message field | ||||
| * | | | DefaultValueObjectWriter should populate oneof message field | Jie Luo | 2017-03-10 | 2 | -2/+19 |
| | | | | |||||
* | | | | Add file option php_class_prefix (#2849) | Paul Yang | 2017-03-17 | 4 | -148/+358 |
| | | | | | | | | | | | | | | | | This option will be prepended to generated classes of all messages in the containing file. |