aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge pull request #3385 from anandolee/masterJie Luo2017-07-181-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Set PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION for pure python comformance
| * | | | | Set PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION for pure python comformance testJie Luo2017-07-171-0/+1
| | | | | |
* | | | | | Support PHP generic services (#3269)Matt A2017-07-1814-191/+623
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | | | | | |
* | | | | | | Merge pull request #3372 from dylanetaft/masterAdam Cozzette2017-07-171-1/+9
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Expand documentation in Readme.md
| * | | | | | Expand documentation in Readme.mddylanetaft2017-07-151-1/+9
| | | | | | | | | | | | | | | | | | | | | Add some supporting documentation regarding Closure for those unfamiliar., Also substantiate details for "files in this directory" - including them all will result in a project that does not compile as some are used for test cases and aren't part of the core library.
* | | | | | | remove pass by reference for php setters (#3344)Brent Shaffer2017-07-1724-64/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove pass by reference for php setters * comments out memory leak test
* | | | | | | Fix Implicit Return Types (#3363)Richard Fussenegger2017-07-171-2/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Both native_slot_merge and native_slot_merge_by_array have no return type declared. GCC implicitly uses int as return type in such cases, however, these functions are actually void.
* | | | | | Initial value in generated code cannot be used by c extension. (#3367)Paul Yang2017-07-145-2/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the generated code of previous versions, each php field is given an initial value. In c extension, it was assumed that the field order in the generated code is consistent with upb fields order, so that the correct initial value can be bound to the correct upb field. However, this may not be true. The order of fields in generated code is decided by proto compiler, while the order of upb fields is decided by the hash function used in c extension. This PR fixes the issue by reset the initial value at runtime.
* | | | | | removes an accidental newline in printing for the php generator (#3333)Brent Shaffer2017-07-131-1/+1
| | | | | |
* | | | | | Add map iterator for c extension (#3350)Paul Yang2017-07-136-5/+157
| | | | | |
* | | | | | 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 repository URL in C# project fileJon Skeet2017-07-131-1/+1
| |_|/ / / / |/| | | | |
* | | | | | C#: Implement IReadOnlyDictionary<K,V> in MapField<K,V>Jean-Rémy Bancel2017-07-122-0/+27
| |_|/ / / |/| | | |
* | | | | 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-0939-84/+82
| | | | | | | | | | | | | | | * Remove using std::{set,map}
* | | | | Uncomment php tests (#3301)Paul Yang2017-07-092-416/+416
|/ / / /
* | | | Merge pull request #2482 from andreaseger/fix_ruby_timestamp_accuracyAdam Cozzette2017-07-062-3/+11
|\ \ \ \ | | | | | | | | | | [Ruby] fix floating point accuracy problem in Timestamp#to_f
| * | | | change test for nanosecond accurate timestampsAndreas Eger2017-05-131-2/+5
| | | | |
| * | | | fix floating point accuracy problem in Timestamp#to_fAndreas Eger2017-05-132-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | `.quo` return the most exact devision which fixes accuracy problems for the timestamp coercion
* | | | | add Grpc Protobuf validation (#3311)MaDuo2017-07-051-0/+1
| | | | | | | | | | | | | | | * add Grpc Protobuf validation
* | | | | Merge pull request #3315 from thomasvl/mutate_unknownsThomas Van Lenten2017-07-052-2/+3
|\ \ \ \ \ | | | | | | | | | | | | Expose the initializer for unknown fields.
| * | | | | Expose the initializer for unknown fields.Thomas Van Lenten2017-07-052-2/+3
|/ / / / /
* | | | | Ensure leaveOpen is true when writing to a bufferJon Skeet2017-07-045-12/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that the compatibility tests have had to cahnge as well, to cope with internal changes. (The test project has access to internals in the main project.) Fixes #3209.
* | | | | Make Any easier to work with in C#Jon Skeet2017-07-032-7/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add a TryUnpack method which doesn't throw if the type is wrong - Make GetTypeName public for easier determination of the message type Fixes #3294.
* | | | | Add json encode/decode for php. (#3226)Paul Yang2017-06-3036-2274/+3118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add json encode/decode for php. * Fix php conformance test on 32-bit machines. * Fix conformance test for c extension. * Fix comments
* | | | | Merge pull request #3287 from sergiocampama/initializedThomas Van Lenten2017-06-291-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Add initialized as a reserved keyword as that's the actual property name
| * | | | | Add initialized as a reserved keyword as that's the actual property nameSergio Campama2017-06-291-1/+1
|/ / / / /
* | | | | Add scripts to build python wheel for linux. (#2693)Paul Yang2017-06-285-0/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add scripts to build python wheel for linux. Followed PEP513. * Fix dist check for new added files. * Update README for usage example.
* | | | | adds PHPDoc @return and @param for getters and setters respectively (#3131)Brent Shaffer2017-06-2736-925/+1220
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 #3084 from lukaszx0/patch-1Feng Xiao2017-06-261-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Workaround the docker bug when compiling artifacts
| * | | | | Workaround the docker bug when compiling artifactsŁukasz Strzałkowski2017-05-111-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a workaround (https://github.com/moby/moby/issues/10180#issuecomment-190429512) the docker issue (https://github.com/moby/moby/issues/10180) which breaks protoc-artifacts build process with following error ```Rpmdb checksum is invalid: dCDPT(pkg checksums): devtoolset-1.1-elfutils.x86_64 0:0.154-6.el6 - u The command '/bin/sh -c yum clean all && yum install -y devtoolset-1.1 devtoolset-1.1-libstdc++-devel devtoolset-1.1-libstdc++-devel.i686' returned a non-zero code: 1``` https://github.com/moby/moby/issues/10180#issuecomment-190429512
* | | | | 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 #3266 from mbrickn/patch-1Feng Xiao2017-06-231-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Updated links to use https
| * | | | | | Updated links to use httpsMaxwell Paul Brickner2017-06-231-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Howdy! I just updated some links to use https instead of http. Thanks! ^ _ ^
* | | | | | Merge pull request #3261 from thomasvl/super_oddcaseThomas Van Lenten2017-06-221-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | If we fail to get a descriptor just super the method resolving.
| * | | | | If we fail to get a descriptor just super the method resolving.Thomas Van Lenten2017-06-221-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | This should never happen, but if someone is swizzling or do other hooking of methods, anything is possible, so this seems slighty safer than they returning NO.
* | | | | Switch to addEnumType to fix fatal error (#3225)Ryan Gordon2017-06-194-160/+235
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Switch to addEnumType to fix fatal error * Fixing more cases of HHVM incompatibility * Updating tests to be hhvm compatible * Fixing tests * Fixing merge * Don't use call_user_func, should hopefully fix tests * Fixing spelling * Fixing another misspelling in a test * Fixing placement of append and kvUpdate functions * Actually fix function helpers * Remove double addEnumType. How did this ever work? * Fixing a couple more tests * Only use the setter if the return value isn't an object
* | | | | Updated upb to fix JSON conformance issues. (#3206)Joshua Haberman2017-06-195-580/+493
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed a bunch of Ruby conformance errors. * Fixed some more Ruby conformance errors in JSON.