Commit Graph

4763 Commits

Author SHA1 Message Date
Paul Yang
50aa4febaf Merge pull request #3375 from TeBoring/3.3.x
Merge 3.3.x into master
2017-07-19 06:58:05 -07:00
Feng Xiao
942a29cecd Merge pull request #3390 from danielgtaylor-isp/patch-1
Add note about includes to README
2017-07-18 12:29:44 -07:00
Bo Yang
6ec0b7e4d1 Merge 3.3.x into master 2017-07-18 11:06:16 -07:00
Jie Luo
337029983c Merge pull request #3385 from anandolee/master
Set PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION for pure python comformance
2017-07-18 10:20:12 -07:00
Daniel Taylor
4b5b1e6e3e Add note about includes to README
Ran into an issue today where a machine had the `protoc` compiler but not the include files. Took a while to sort out, and this added note to the README included in every zip should help.
2017-07-18 12:05:00 -04:00
Matt A
9e745f771b Support PHP generic services (#3269)
* 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
2017-07-18 07:45:18 -07:00
Jie Luo
b764e67812 Set PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION for pure python comformance test 2017-07-17 14:34:54 -07:00
Adam Cozzette
3354558328 Merge pull request #3348 from matthauck/fix-gcc41-again
Fix map_field_inl.h for gcc 4.1
2017-07-17 13:38:31 -07:00
Adam Cozzette
dd6e420dc4 Merge pull request #3357 from bklarson/master
Fix build when using -Werror=undef
2017-07-17 10:52:34 -07:00
Feng Xiao
eb8e3d3220 Merge pull request #3134 from lundefugl/javabug1
Issue 3112: Object class with fully qualified name
2017-07-17 10:30:31 -07:00
Adam Cozzette
aaa2550f7b Merge pull request #3372 from dylanetaft/master
Expand documentation in Readme.md
2017-07-17 10:11:59 -07:00
Brent Shaffer
324b20a491 remove pass by reference for php setters (#3344)
* remove pass by reference for php setters

* comments out memory leak test
2017-07-17 09:14:46 -07:00
Richard Fussenegger
29ff49f534 Fix Implicit Return Types (#3363)
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.
2017-07-17 09:13:12 -07:00
dylanetaft
36fcc2a5d8 Expand documentation in Readme.md
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.
2017-07-15 01:52:07 -04:00
Paul Yang
c78dbd7c89 Initial value in generated code cannot be used by c extension. (#3367)
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.
2017-07-14 15:48:48 -06:00
Brent Shaffer
ec3f5dcc72 removes an accidental newline in printing for the php generator (#3333) 2017-07-13 11:29:28 -07:00
Paul Yang
3a0382e907 Add map iterator for c extension (#3350) 2017-07-13 11:21:03 -07:00
Paul Yang
d3bbf1c8a9 Add space between arrow and casted type (#3353) 2017-07-13 11:20:11 -07:00
Feng Xiao
6aa4b20fc7 Merge pull request #3327 from htuch/fix-3322
Use consistent hash across NDEBUG/!NDEBUG builds.
2017-07-13 10:14:49 -07:00
Jon Skeet
71f2f0d76c Fix repository URL in C# project file 2017-07-13 14:03:56 +01:00
Brad Larson
81142e162b Fix build when using -Werror=undef
Correct a couple places where macros were being checked when they
might not exist in some cases.

Fixes #3356.
2017-07-12 14:45:19 -05:00
Jean-Rémy Bancel
727c0dc1fa C#: Implement IReadOnlyDictionary<K,V> in MapField<K,V> 2017-07-12 09:28:43 +01:00
Matt Hauck
2130feadcf
Fix map_field_inl.h for gcc 4.1 2017-07-11 11:02:24 -07:00
Matt Hauck
9ab7c73f7c Fix missing std::tr1::hash on GCC 4.1 (#2907)
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
2017-07-10 16:43:18 -07:00
tanderson-google
126082c371 Add std:: namespace prefix to set and map (#3332)
* Remove using std::{set,map}
2017-07-09 20:31:50 -07:00
Paul Yang
b9c4daadf7 Uncomment php tests (#3301) 2017-07-09 07:49:25 -07:00
Harvey Tuch
f6ff32cd79 Use consistent hash across NDEBUG/!NDEBUG builds.
Fixes #3322.
2017-07-07 09:56:32 -04:00
Adam Cozzette
bd5ab154da Merge pull request #2482 from andreaseger/fix_ruby_timestamp_accuracy
[Ruby] fix floating point accuracy problem in Timestamp#to_f
2017-07-06 08:11:50 -07:00
MaDuo
6bd51a59df add Grpc Protobuf validation (#3311)
* add Grpc Protobuf validation
2017-07-05 11:31:32 -07:00
Thomas Van Lenten
e264b20e69 Merge pull request #3315 from thomasvl/mutate_unknowns
Expose the initializer for unknown fields.
2017-07-05 11:25:38 -04:00
Thomas Van Lenten
b30dee3ea6 Expose the initializer for unknown fields. 2017-07-05 11:16:34 -04:00
Jon Skeet
cdd524a0bd Ensure leaveOpen is true when writing to a buffer
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.
2017-07-04 06:42:45 +01:00
Jon Skeet
62d7fe5697 Make Any easier to work with in C#
- 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.
2017-07-03 12:16:40 +01:00
Paul Yang
ecca6ea95d Add json encode/decode for php. (#3226)
* Add json encode/decode for php.

* Fix php conformance test on 32-bit machines.

* Fix conformance test for c extension.

* Fix comments
2017-06-30 12:14:09 -07:00
Thomas Van Lenten
5a52b3588d Merge pull request #3287 from sergiocampama/initialized
Add initialized as a reserved keyword as that's the actual property name
2017-06-29 11:52:37 -04:00
Sergio Campama
e55782fa95 Add initialized as a reserved keyword as that's the actual property name 2017-06-29 11:49:36 -04:00
Paul Yang
176bac6dac Add scripts to build python wheel for linux. (#2693)
* Add scripts to build python wheel for linux.
Followed PEP513.

* Fix dist check for new added files.

* Update README for usage example.
2017-06-28 15:22:19 -07:00
Brent Shaffer
12acbc2678 adds PHPDoc @return and @param for getters and setters respectively (#3131)
* 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
2017-06-27 16:28:28 -07:00
Feng Xiao
097bfb53d1 Merge pull request #3084 from lukaszx0/patch-1
Workaround the docker bug when compiling artifacts
2017-06-26 10:48:22 -07:00
Paul Yang
dd7265e1a2 Merge pull request #3264 from TeBoring/php-bug
Enusre public header and generated code have no implicit converion.
2017-06-24 12:20:57 -07:00
Bo Yang
e3c807d4e7 Fix more implicit type conversions in public headers and generated code. 2017-06-24 11:28:13 -07:00
Feng Xiao
1a7e49d462 Merge pull request #2968 from ngg/cpp-proper-fwd
C++: Do not forward-declare dependencies in generated .h files
2017-06-23 15:08:04 -07:00
Bo Yang
9c0b35cf62 Enusre public header and generated code have no implicit converion. 2017-06-23 11:58:05 -07:00
Feng Xiao
f752d816b7 Merge pull request #3266 from mbrickn/patch-1
Updated links to use https
2017-06-23 10:39:42 -07:00
Maxwell Paul Brickner
d07efbad91 Updated links to use https
Howdy!

I just updated some links to use https instead of http.

Thanks! ^ _ ^
2017-06-23 09:25:03 -04:00
Thomas Van Lenten
eca0f4ee91 Merge pull request #3261 from thomasvl/super_oddcase
If we fail to get a descriptor just super the method resolving.
2017-06-22 10:34:10 -04:00
Thomas Van Lenten
db45687a38 If we fail to get a descriptor just super the method resolving.
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.
2017-06-22 10:18:00 -04:00
Paul Yang
5532abc15b Merge pull request #3258 from TeBoring/3.3.x
Update version number to 3.3.2
2017-06-21 15:29:32 -07:00
Bo Yang
5520b4384a Update C++ generated code. 2017-06-21 11:17:30 -07:00
Bo Yang
e7bcfc4241 Update version number to 3.3.2 2017-06-21 10:20:34 -07:00