Commit Graph

4827 Commits

Author SHA1 Message Date
Paul Yang
c15a3269f9 Expose descriptor API in php c extension (#3422) 2017-08-02 07:42:27 -07:00
Tony Wong
be73938d72 Change divideInt64ToInt32 to static (#3436)
divideInt64ToInt32 is called statically from protobuf/php/src/Google/Protobuf/Internal/CodedOutputStream.php
(the only reference)
This causes fatal error in PHP 7.1 (32-bit only because 64-bit doesn't use this function)
2017-08-01 13:22:47 -07:00
Brent Shaffer
d32f5b4de3 Removes unnecessary pass-by-references in PHP internal classes (#3433) 2017-08-01 09:42:46 -07:00
Feng Xiao
072431452a Merge pull request #3429 from king6cong/master
Add classpath for java example Makefile
2017-07-31 10:59:56 -07:00
king6cong
547d76ed8e Add classpath for java example Makefile 2017-07-31 14:53:05 +08:00
Thomas Van Lenten
9b505a92bf Merge pull request #3421 from thomasvl/update_comment
Update the comment on the message_type to cover what it should be.
2017-07-26 18:48:19 -04:00
Thomas Van Lenten
9a4692d8af Update the comment on the message_type to cover what it should be. 2017-07-26 17:07:01 -04:00
Thomas Van Lenten
5eb95efa81 Merge pull request #3420 from thomasvl/objc_proto2_conformance
Objc proto2 conformance test support
2017-07-26 16:28:14 -04:00
Thomas Van Lenten
3caf9fd00a Review feedback.
- Better error message for unknown messageType.
- Remove unneeded if.
2017-07-26 16:24:05 -04:00
Thomas Van Lenten
c2831a346c Add the proto2 message conformance support for ObjC. 2017-07-26 15:58:07 -04:00
Thomas Van Lenten
9fd5e59c97 Generate the proto2 test file and link it in for ObjC. 2017-07-26 15:45:23 -04:00
Thomas Van Lenten
21800ff84f Add a objc_class_prefix to test_messages_proto3.proto.
Both test_messages_proto3.proto & test_messages_proto2.proto define
message ForeignMessage {...} and enum ForeignEnum {...} but since
objc doesn't use the proto package in the naming, these end up
conflicting.

Adding the objc_class_prefix option to the proto3 file ensure the generated
objc types are all unique.
2017-07-26 15:44:02 -04:00
Adam Cozzette
8d5f2c57e8 Merge pull request #3410 from adam-26/1745
Fix issue #1745 - javascript allow dot in filename
2017-07-25 15:52:25 -07:00
Sergey
bb8664419b need for php math functions. used in mergeFromJsonString (#3409) 2017-07-25 10:40:10 -07:00
Adam Cozzette
e9f4e8e4f5 Merge pull request #3407 from bklarson/master
Add declaration for AddDescriptorsImpl()
2017-07-25 06:44:14 -07:00
Paul Yang
451d061141 Fix cycle dependency for repeated field not collected by gc (#3399) 2017-07-25 00:49:16 -07:00
Brad Larson
b6da2262e8 Put AddDescriptorsImpl() in anonymous namespace
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.
2017-07-24 16:52:04 -05:00
Yilun Chong
a713b73076 Merge pull request #3281 from BSBandme/ConformanceTestYilunChong
Proto2 test message support to conformance test
2017-07-24 14:50:52 -07:00
Adam
2b6db00de1 Fix quotation marks 2017-07-24 23:00:49 +02:00
Adam
a3a65b320d Fix issue #1745 - javascript allow dot in filename 2017-07-24 22:41:09 +02:00
Feng Xiao
f15185d370 Merge pull request #2969 from laszlocsomor/master
Windows: support long paths in open/mkdir/access
2017-07-24 10:26:55 -07:00
Brad Larson
0d9a34c7b2 Add -Werror=missing-declarations to test builds
Treat missing declarations as an error for test builds, to prevent
future updates which add functions without properly declaring them.
This will prevent broken builds in more restrictive build environments.
2017-07-24 11:51:47 -05:00
Adam Cozzette
eef2edcb84 Merge pull request #3403 from ax3l/topic-cmake-pkgconfig
CMake: Install .pc Files
2017-07-24 08:11:38 -07:00
Axel Huebl
74dcf447af
Travis: Exclude CMake .pc files
Exclude the unconfigured .pc input files of the CMake
based install: they shall not be packed/distributed,
only their outputs are
2017-07-23 20:48:02 +02:00
Axel Huebl
668712c58f
CMake: Install .pc Files
Adds pkg-config (`.pc`) files for CMake based installs.
2017-07-23 18:28:04 +02:00
Adam Cozzette
e8a32d07ff Merge pull request #3401 from aschrijver/patch-2
Updated outdated hyperlink
2017-07-21 07:55:07 -07:00
Arnold Schrijver
d640cddf19 Updated outdated hyperlink
Github repo had moved, pointing to correct location.
2017-07-21 13:06:04 +02:00
Feng Xiao
062df3d072 Merge pull request #3179 from bjwatson/fix-duration-typo
Fix typos in comment
2017-07-20 13:01:04 -07:00
Adam Cozzette
040f56e61b Merge pull request #3397 from acozzette/initialization
Fixed default instance initialization for C++ lite
2017-07-20 08:31:48 -07:00
Jie Luo
bba4c4ae51 Merge pull request #3262 from snnn/master
Make it compatible with python 3.6.1
2017-07-19 16:25:05 -07:00
Adam Cozzette
417aae6154 Fixed dynamic initialization for C++ lite
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.
2017-07-19 15:29:28 -07:00
Brent Shaffer
aa61bb0d3c compiles removal of newline (#3333) (#3370) 2017-07-19 14:57:34 -07:00
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