aboutsummaryrefslogtreecommitdiff
path: root/src/google
Commit message (Collapse)AuthorAgeFilesLines
* Fix map_field_inl.h for gcc 4.1Matt Hauck2017-07-111-2/+2
|
* 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-2433-671/+846
|\ | | | | 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-2320-228/+246
| |
* | 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>
* Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-masterAdam Cozzette2017-04-27174-4857/+11152
|\
| * Add prefix to enum value with reserved name. (#3020)v3.3.0Paul Yang2017-04-261-4/+4
| |
| * Allow proto files to import descriptor.proto (#2995)Paul Yang2017-04-201-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 Yang2017-04-201-8/+27
| |
| * Enum defined without package have incorrect class name. (#2988)Paul Yang2017-04-191-47/+35
| | | | | | | | Fix the bug by sharing the code for generating class name for both message and enum.
| * Cherry-pick cl/152450543Feng Xiao2017-04-118-2/+472
| |
| * Cherry-pick cl/151775298Feng Xiao2017-04-112-2/+56
| |
| * Merge pull request #2955 from xfxyjwf/3.3.xFeng Xiao2017-04-111-0/+1
| |\ | | | | | | Add include for INT_MAX
| | * Add include for INT_MAXFeng Xiao2017-04-081-0/+1
| | |
| * | cherrypick descriptor_pool.FindFileContainingSymbol by extensions (#2962)Jie Luo2017-04-101-2/+4
| |/ | | | | | | | | | | * Use PyUnicode_AsEncodedString() instead of PyUnicode_AsEncodedObject() * Cherrypick the fix descriptor_pool.FindFileContainingSymbol by extensions.
| * Cleanup reflection objects for map entry.Feng Xiao2017-04-062-0/+10
| |
| * Update generated code.Feng Xiao2017-04-0513-26/+26
| |
| * Update version number and changelog for 3.3.0Feng Xiao2017-04-051-5/+5
| |
| * Fix MSVC DLL build.Feng Xiao2017-03-306-8/+10
| |
| * Down-integrate from google3.Feng Xiao2017-03-29168-4780/+10501
| |
* | Fully qualify min as std::min in wire_format_lite.ccAdam Cozzette2017-04-271-1/+1
| |
* | Merge pull request #3018 from acozzette/using-namespace-stdAdam Cozzette2017-04-2615-98/+108
|\ \ | | | | | | Remove "using namespace std" from stubs/common.h
| * | Remove "using namespace std" from stubs/common.hAdam Cozzette2017-04-2615-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 Buchgraber2017-04-251-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 inMichael Allen2017-04-171-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 Agrawal2017-04-072-6/+0
|/ | | | mutation method.
* Removes ignored const from return type (#2915)Juan David Dominguez2017-03-291-1/+1
| | | See https://github.com/google/protobuf/issues/2425
* Fix gcc warning when using map (#2213)drivehappy2017-03-281-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 NaClAdam Cozzette2017-03-281-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/gopackageJoshua Haberman2017-03-272-4/+5
|\ | | | | Changed go_package for plugin.proto.
| * Properly regenerated descriptor.proto.Josh Haberman2017-03-161-3/+4
| |
| * Changed go_package for plugin.proto.Josh Haberman2017-03-151-1/+1
| | | | | | | | For more info see: https://github.com/google/protobuf/issues/1289
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-17 03:37:35 +0000