Jisi Liu
39a91d376a
Fix typo.
7 years ago
Jisi Liu
4cbbf33b77
Fix invalid offsetof warning.
...
Use composition instead of inheritance for oneof default.
7 years ago
Paul Yang
25672c1757
Add getClass for php Descriptor in c extension ( #3443 )
7 years ago
Gerben Stavenga
7781784796
Add destructors for default instances to the shutdown code.
...
Verified test succeed under draconian heap checker
7 years ago
Jisi Liu
53ae6de18b
Merge pull request #3442 from pherl/csharpversion
...
Bump csharp version
7 years ago
Jisi Liu
6c64f11778
Bump csharp version
7 years ago
Jisi Liu
e0288e7ec0
Merge pull request #3438 from pherl/changelog
...
Update change log
7 years ago
Ryan Gordon
9df89ccabc
Fixing HHVM Compatibility ( #3437 )
7 years ago
Paul Yang
c15a3269f9
Expose descriptor API in php c extension ( #3422 )
7 years ago
Jisi Liu
8a5208fd37
Update change log
7 years ago
Jisi Liu
502624ff8b
Merge pull request #3419 from pherl/3.4.x
...
Merge master into 3.4.x
7 years ago
Jisi Liu
d77c8c5e44
remove the duplication
7 years ago
Jisi Liu
bcf17332bd
Adding the missing header
7 years ago
Jisi Liu
ebeb472c1e
Export functions in io_win32.h in win DLL build
...
Previous code duplicates io_win32.cc in sources of all the libraries
that include io_win32.h header.
7 years ago
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)
7 years ago
Brent Shaffer
d32f5b4de3
Removes unnecessary pass-by-references in PHP internal classes ( #3433 )
7 years ago
Feng Xiao
072431452a
Merge pull request #3429 from king6cong/master
...
Add classpath for java example Makefile
7 years ago
Feng Xiao
d6bd959761
Merge pull request #3406 from ax3l/bg-3.4-cmake-pkgconfig
...
CMake: Install .pc Files (Backport: 3.4)
7 years ago
king6cong
547d76ed8e
Add classpath for java example Makefile
7 years ago
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.
7 years ago
Thomas Van Lenten
9a4692d8af
Update the comment on the message_type to cover what it should be.
7 years ago
Thomas Van Lenten
5eb95efa81
Merge pull request #3420 from thomasvl/objc_proto2_conformance
...
Objc proto2 conformance test support
7 years ago
Thomas Van Lenten
3caf9fd00a
Review feedback.
...
- Better error message for unknown messageType.
- Remove unneeded if.
7 years ago
Thomas Van Lenten
c2831a346c
Add the proto2 message conformance support for ObjC.
7 years ago
Thomas Van Lenten
9fd5e59c97
Generate the proto2 test file and link it in for ObjC.
7 years ago
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.
7 years ago
Jisi Liu
19b8c8bfd3
Update conformance tests again.
7 years ago
Adam Cozzette
8d5f2c57e8
Merge pull request #3410 from adam-26/1745
...
Fix issue #1745 - javascript allow dot in filename
7 years ago
Jisi Liu
12c186f7c6
Fix makefile.am
7 years ago
Jisi Liu
de6debcf2b
Fix conformance tests
7 years ago
Jisi Liu
e177739fa2
Fix build files
7 years ago
Jisi Liu
9b8f6589f2
Remove dependency on guava 20
7 years ago
Jisi Liu
d974cc2e9a
Update conformance tests
7 years ago
Jisi Liu
f39d4de94f
Merge remote-tracking branch 'origin/master' into merge
7 years ago
Jisi Liu
759245a49a
Merge from master
7 years ago
Sergey
bb8664419b
need for php math functions. used in mergeFromJsonString ( #3409 )
7 years ago
Adam Cozzette
e9f4e8e4f5
Merge pull request #3407 from bklarson/master
...
Add declaration for AddDescriptorsImpl()
7 years ago
Paul Yang
451d061141
Fix cycle dependency for repeated field not collected by gc ( #3399 )
7 years ago
Jisi Liu
4bff88e0fb
Merge pull request #3413 from pherl/3.4.x
...
Update version number for 3.4.0
7 years ago
Jisi Liu
ce4416705b
Merge remote-tracking branch 'origin/3.4.x' into vb
7 years ago
Jisi Liu
4ae94d69ff
Merge pull request #3414 from pherl/fixzip
...
Omit the zip test if tools are not available
7 years ago
Jisi Liu
eb6b3320a5
Merge pull request #3412 from anandolee/3.4.x
...
Use keys() instead of iterkeys() to be python3 compatbile.
7 years ago
Jisi Liu
02250a7ff4
Omit the zip test if tools are not available
7 years ago
Jie Luo
9c012ed07d
Add __bool__ as well as __nonzero__ for python3
7 years ago
Jisi Liu
11b4d5ec73
Update required version on pre-generated files
7 years ago
Jisi Liu
8b24feb6ad
Update pre generated files
7 years ago
Jisi Liu
7bb39bef1a
Update version number for 3.4.0
7 years ago
Jie Luo
a484794820
Use keys() instead of iterkeys() to be python3 compatbile.
7 years ago
Jisi Liu
72cc5a6eb3
Merge pull request #3393 from pherl/3.4.x
...
Create 3.4.x branch
7 years ago
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.
7 years ago