aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Merge 3.3.x into masterBo Yang2017-07-1834-23/+98
| |\ \ \ \ \
| | * | | | | Update C++ generated code.Bo Yang2017-06-2113-13/+13
| | | | | | |
| | * | | | | Update version number to 3.3.2Bo Yang2017-06-212-4/+4
| | | | | | |
| | * | | | | Add ARRAY for reserved name (#3150)Paul Yang2017-06-201-2/+2
| | | | | | |
| | * | | | | regenerate plugin and profile message codeSteven Peters2017-05-112-0/+4
| | | | | | |
| | * | | | | Use bool deterministic to suppress warningSteven Peters2017-05-1113-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3059 by re-applying 08b1c718 from #3087.
| | * | | | | Update C++ generated code.Feng Xiao2017-05-0813-13/+13
| | | | | | |
| | * | | | | Update version number to 3.3.1Feng Xiao2017-05-082-4/+4
| | | | | | |
| | * | | | | Merge pull request #3073 from xfxyjwf/3.3.xFeng Xiao2017-05-081-1/+2
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Cherry-pick a bug fix: workaround gcc < 4.5.0 bug
| | | * | | | | Workaround gcc < 4.5.0 bugMario J. Rugiero2017-05-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=189 Signed-off-by: Mario J. Rugiero <mrugiero@gmail.com>
| | * | | | | | Fix compilationrandomguy32017-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | <: is a digraph, so a space is necessary for compilation on certain compilers.
| | * | | | | | Fix offset type to match the tables it is used inAlex Merry2017-05-051-1/+1
| | |/ / / / /
| | * | | | | Add missing LIBRPOTOC_EXPORT.Feng Xiao2017-05-041-2/+2
| | | | | | |
| | * | | | | Skip C# test in C++ only distribution.Feng Xiao2017-05-041-0/+8
| | | | | | |
| | * | | | | Add missing files to build files.Feng Xiao2017-05-042-3/+4
| | | | | | |
| | * | | | | Fix issue 3046: compilation on alpine 3.5Chris Nix2017-05-041-0/+7
| | | | | | |
* | | | | | | Support PHP generic services (#3269)Matt A2017-07-184-129/+353
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add php_generic_services option * Generate PHP generic services * Respect namespaces for generated PHP services * Test PHP generated services * Rename PHP generator service method doc comment function * Correct phpdoc service method case * Test namespaced PHP generic services * Always use the FQCN for PHP generic service input/output * Add generated_service_test to php test.sh * Add php service test protos to CI * Add php service files to php_EXTRA_DIST * Use Interface suffix for php generic services
* | | | | | | Merge pull request #3348 from matthauck/fix-gcc41-againAdam Cozzette2017-07-171-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix map_field_inl.h for gcc 4.1
| * | | | | | | Fix map_field_inl.h for gcc 4.1Matt Hauck2017-07-111-2/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #3357 from bklarson/masterAdam Cozzette2017-07-172-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix build when using -Werror=undef
| * | | | | | | Fix build when using -Werror=undefBrad Larson2017-07-122-2/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct a couple places where macros were being checked when they might not exist in some cases. Fixes #3356.
* | | | | | | Merge pull request #3134 from lundefugl/javabug1Feng Xiao2017-07-172-5/+5
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Issue 3112: Object class with fully qualified name
| * | | | | | Issue 3112: Object class with fully qualified namelundefugl2017-05-242-5/+5
| | | | | | |
* | | | | | | remove pass by reference for php setters (#3344)Brent Shaffer2017-07-171-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove pass by reference for php setters * comments out memory leak test
* | | | | | | removes an accidental newline in printing for the php generator (#3333)Brent Shaffer2017-07-131-1/+1
| | | | | | |
* | | | | | | Add space between arrow and casted type (#3353)Paul Yang2017-07-133-27/+27
| | | | | | |
* | | | | | | Merge pull request #3327 from htuch/fix-3322Feng Xiao2017-07-131-7/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Use consistent hash across NDEBUG/!NDEBUG builds.
| * | | | | | Use consistent hash across NDEBUG/!NDEBUG builds.Harvey Tuch2017-07-071-7/+0
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Fixes #3322.
* | | | | | Fix missing std::tr1::hash on GCC 4.1 (#2907)Matt Hauck2017-07-101-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than crashing on use (doh!) better to just declare this platform is missing a proper hash_map/hash_set implementation and use the std::map/std::set emulation. Fixes regression introduced by #1913
* | | | | | Add std:: namespace prefix to set and map (#3332)tanderson-google2017-07-0937-80/+78
|/ / / / / | | | | | | | | | | * Remove using std::{set,map}
* | | | | Add initialized as a reserved keyword as that's the actual property nameSergio Campama2017-06-291-1/+1
| | | | |
* | | | | adds PHPDoc @return and @param for getters and setters respectively (#3131)Brent Shaffer2017-06-271-39/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * adds PHPDoc @return and @param for getters and setters respectively * addresses changes in PR review * adds documentation tests * Update php_generator: - Prepend \ to names where required - Remove <pre> tags - Update protobuf field comments * Updates class files with the protobuf changes * Addresses review comments * removes Protobuf Type line from PHP generated classes * fixes phpdoc test * adds array types to phpdoc
* | | | | Merge pull request #3264 from TeBoring/php-bugPaul Yang2017-06-2434-672/+847
|\ \ \ \ \ | | | | | | | | | | | | Enusre public header and generated code have no implicit converion.
| * | | | | Fix more implicit type conversions in public headers and generated code.Bo Yang2017-06-2426-449/+606
| | | | | |
| * | | | | Enusre public header and generated code have no implicit converion.Bo Yang2017-06-2321-229/+247
| | |_|/ / | |/| | |
* | | | | Merge pull request #2968 from ngg/cpp-proper-fwdFeng Xiao2017-06-234-107/+0
|\ \ \ \ \ | |/ / / / |/| | | | C++: Do not forward-declare dependencies in generated .h files
| * | | | C++: Do not forward-declare dependencies in generated .h filesGergely Nagy2017-06-124-107/+0
| | | | |
* | | | | Merge pull request #3240 from thomasvl/float_funThomas Van Lenten2017-06-191-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Raise the number of digits used for floats.
| * | | | | Raise the number of digits used for floats.Thomas Van Lenten2017-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | About 1.5% of all IEEE754 single-precision numbers require nine decimal digits to represent accurately.
* | | | | | Qualify string in java_options.hCalder Coalson2017-06-161-2/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Building the protobuf compiler with Bazel fails to resolve the unqualifed "string"s in java_options.h: ``` ERROR: .../external/com_google_protobuf/BUILD:248:1: C++ compilation of rule '@com_google_protobuf//:protoc_lib' failed: Process exited with status 1 [sandboxed]. In file included from external/com_google_protobuf/src/google/protobuf/compiler/java/java_context.h:41:0, from external/com_google_protobuf/src/google/protobuf/compiler/java/java_enum_field_lite.cc:38: external/com_google_protobuf/src/google/protobuf/compiler/java/java_options.h:59:3: error: 'string' does not name a type string annotation_list_file; ^ external/com_google_protobuf/src/google/protobuf/compiler/java/java_options.h:62:3: error: 'string' does not name a type string output_list_file; ^ Use --strategy=CppCompile=standalone to disable sandboxing for the failing actions. INFO: Elapsed time: 41.487s, Critical Path: 6.20s //interpreter:eval_test NO STATUS Executed 0 out of 1 test: 1 was skipped. ```
* / / / / Export symbols used in inline functionsSilvio Traversaro2017-06-121-1/+1
|/ / / / | | | | | | | | | | | | fixed_address_empty_string symbol is used in an inline function. We have to export it to avoid undefined reference link errors.
* | | | Merge pull request #3176 from acozzette/fix-3114Adam Cozzette2017-06-071-4/+10
|\ \ \ \ | | | | | | | | | | Ensure that for Java, imports of .proto files with empty packages works
| * | | | Ensure that for Java, imports of .proto files with empty packages worksAdam Cozzette2017-06-021-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a compiler bug that caused a Java syntax error when one .proto file would import another one with an empty package and java_package. This fixes issue #3114.
* | | | | Add new file option php_namespace. (#3162)Paul Yang2017-06-054-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 Zhang2017-05-301-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | * not to use std::random_device for map.Seed(). * remove include random
* | | | Add ARRAY for reserved name (#3150)Paul Yang2017-05-291-2/+2
| | | |
* | | | Adds fluent setters for PHP (#3130)Brent Shaffer2017-05-291-0/+2
|/ / /
* | | Removing undefined behavior and compiler warnings (#1315)brian-peloton2017-05-237-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 Cappendijk2017-05-221-0/+6
| | | | | | | | | | | | to show a useful message instead of just 'Missing input file.'
* | | Workaround gcc < 4.5.0 bugMario J. Rugiero2017-05-051-1/+2
| |/ |/| | | | | | | | | See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=189 Signed-off-by: Mario J. Rugiero <mrugiero@gmail.com>