aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'origin/master' into mergeGravatar Jisi Liu2017-07-25
|\
* | Merge from masterGravatar Jisi Liu2017-07-25
| |
| * Merge pull request #3407 from bklarson/masterGravatar Adam Cozzette2017-07-25
| |\ | | | | | | Add declaration for AddDescriptorsImpl()
* | \ Merge remote-tracking branch 'origin/3.4.x' into vbGravatar Jisi Liu2017-07-24
|\ \ \
| * | | Omit the zip test if tools are not availableGravatar Jisi Liu2017-07-24
| | | |
* | | | Update required version on pre-generated filesGravatar Jisi Liu2017-07-24
| | | |
* | | | Update pre generated filesGravatar Jisi Liu2017-07-24
| | | |
* | | | Update version number for 3.4.0Gravatar Jisi Liu2017-07-24
|/ / /
| | * Put AddDescriptorsImpl() in anonymous namespaceGravatar Brad Larson2017-07-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | AddDescriptorsImpl() is a private static implementation detail, and needs to be declared but won't be used from outside the source file. Place it inside an anonymous namespace to fix a previous build error that would result in more restrictive build enviornments that use -Werror=missing-declarations or similar compiler flags.
| * | Merge pull request #3281 from BSBandme/ConformanceTestYilunChongGravatar Yilun Chong2017-07-24
| |\ \ | | | | | | | | Proto2 test message support to conformance test
| * \ \ Merge pull request #2969 from laszlocsomor/masterGravatar Feng Xiao2017-07-24
| |\ \ \ | | |_|/ | |/| | Windows: support long paths in open/mkdir/access
| * | | Fixed dynamic initialization for C++ liteGravatar Adam Cozzette2017-07-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An ifdef condition seems to have been inverted by mistake, causing the dynamic initialization to occur for lite if and only if the _NO_STATIC_INITIALIZER macro is set. This problem manifested itself as segfaults due to uninitialized empty strings: https://github.com/google/protobuf/issues/2839 Since no one complained about initialization not happening, it would appear that we can just disable this initialization for lite unconditionally, so that is what this change does. Instead of the default instance initialization happening pre-main, it now always happens lazily when needed.
* | | | remove profileGravatar Jisi Liu2017-07-19
| | | |
| * | | Merge pull request #3375 from TeBoring/3.3.xGravatar Paul Yang2017-07-19
| |\ \ \ | | | | | | | | | | Merge 3.3.x into master
* | | | | Merge master into 3.4.xGravatar Jisi Liu2017-07-18
|\| | | |
* | | | | Merge from Google internal for 3.4 releaseGravatar Jisi Liu2017-07-18
| | | | |
| | * | | Merge 3.3.x into masterGravatar Bo Yang2017-07-18
| | |\ \ \
| * | | | | Support PHP generic services (#3269)Gravatar Matt A2017-07-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-againGravatar Adam Cozzette2017-07-17
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix map_field_inl.h for gcc 4.1
| * \ \ \ \ \ Merge pull request #3357 from bklarson/masterGravatar Adam Cozzette2017-07-17
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix build when using -Werror=undef
| * \ \ \ \ \ \ Merge pull request #3134 from lundefugl/javabug1Gravatar Feng Xiao2017-07-17
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | Issue 3112: Object class with fully qualified name
| * | | | | | | remove pass by reference for php setters (#3344)Gravatar Brent Shaffer2017-07-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove pass by reference for php setters * comments out memory leak test
| * | | | | | | removes an accidental newline in printing for the php generator (#3333)Gravatar Brent Shaffer2017-07-13
| | | | | | | |
| * | | | | | | Add space between arrow and casted type (#3353)Gravatar Paul Yang2017-07-13
| | | | | | | |
| * | | | | | | Merge pull request #3327 from htuch/fix-3322Gravatar Feng Xiao2017-07-13
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Use consistent hash across NDEBUG/!NDEBUG builds.
| | | | * | | | | Fix build when using -Werror=undefGravatar Brad Larson2017-07-12
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct a couple places where macros were being checked when they might not exist in some cases. Fixes #3356.
| | | | * | | | Fix map_field_inl.h for gcc 4.1Gravatar Matt Hauck2017-07-11
| | |_|/ / / / | |/| | | | |
| | | | | * | Windows: support long pathsGravatar Laszlo Csomor2017-07-11
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add implementations of open(2), mkdir(2), stat(2), etc. that support long paths under Windows (paths longer than MAX_PATH in <windows.h>, which is 260 characters). The implementations are in a separate namespace (google::protobuf::internal::win32), so they won't collide with the standard implementations in <io.h>, but after importing them with `using` they can be drop-in replacements. Fixes https://github.com/bazelbuild/bazel/issues/2634 Fixes https://github.com/google/protobuf/issues/2891
| * | | | | Fix missing std::tr1::hash on GCC 4.1 (#2907)Gravatar Matt Hauck2017-07-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)Gravatar tanderson-google2017-07-09
| | | | | | | | | | | | | | | | | | * Remove using std::{set,map}
| | * | | | Use consistent hash across NDEBUG/!NDEBUG builds.Gravatar Harvey Tuch2017-07-07
| |/ / / / | | | | | | | | | | | | | | | Fixes #3322.
| | | | * Merge branch 'master' into ConformanceTestYilunChongGravatar Yilun Chong2017-06-30
| | | | |\ | | |_|_|/ | |/| | |
| | | | * add some test proto2 supported, add js proto2 supported, fixed some errorGravatar Yilun Chong2017-06-30
| | | | |
| | | | * change php objc nodejs csharp rubyGravatar Yilun Chong2017-06-29
| | | | |
| * | | | Add initialized as a reserved keyword as that's the actual property nameGravatar Sergio Campama2017-06-29
| | | | |
| | | | * add message set test caseGravatar Yilun Chong2017-06-28
| | | | |
| * | | | adds PHPDoc @return and @param for getters and setters respectively (#3131)Gravatar Brent Shaffer2017-06-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | | | * add support for proto2Gravatar Yilun Chong2017-06-26
| | | | |
| * | | | Merge pull request #3264 from TeBoring/php-bugGravatar Paul Yang2017-06-24
| |\ \ \ \ | | | | | | | | | | | | Enusre public header and generated code have no implicit converion.
| | * | | | Fix more implicit type conversions in public headers and generated code.Gravatar Bo Yang2017-06-24
| | | | | |
| * | | | | Merge pull request #2968 from ngg/cpp-proper-fwdGravatar Feng Xiao2017-06-23
| |\ \ \ \ \ | | | | | | | | | | | | | | C++: Do not forward-declare dependencies in generated .h files
| | | * | | | Enusre public header and generated code have no implicit converion.Gravatar Bo Yang2017-06-23
| | |/ / / / | |/| | | |
| | | | | * add test_proto2_message.proto and change conformnace/makefile.amGravatar Yilun Chong2017-06-23
| | |_|_|/ | |/| | |
| | | | * Update C++ generated code.Gravatar Bo Yang2017-06-21
| | | | |
| | | | * Update version number to 3.3.2Gravatar Bo Yang2017-06-21
| | | | |
| | | | * Add ARRAY for reserved name (#3150)Gravatar Paul Yang2017-06-20
| | | | |
| * | | | Merge pull request #3240 from thomasvl/float_funGravatar Thomas Van Lenten2017-06-19
| |\ \ \ \ | | | | | | | | | | | | Raise the number of digits used for floats.
| | * | | | Raise the number of digits used for floats.Gravatar Thomas Van Lenten2017-06-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | About 1.5% of all IEEE754 single-precision numbers require nine decimal digits to represent accurately.
| * | | | | Qualify string in java_options.hGravatar Calder Coalson2017-06-16
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 functionsGravatar Silvio Traversaro2017-06-12
| | | | | | | | | | | | | | | | | | | | fixed_address_empty_string symbol is used in an inline function. We have to export it to avoid undefined reference link errors.