AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
5,033 Commits 35 Branches 138 Tags 124 MiB
9477123538
Commit Graph

5033 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jie Luo
9150cd8603 Skip setUpClass which is newly added in python2.7 for python2.6 2017-08-04 10:50:24 -07:00
Jie Luo
d58df3b902 Add python 2.6 test back for cpp implementation. Json format issue was fixed in #869 2017-08-03 16:04:10 -07:00
Jisi Liu
c2f69d6fa2 Merge pull request #3450 from pherl/invalidoffset 
Fix invalid offsetof warning.
 2017-08-03 13:49:25 -07:00
Jisi Liu
e243fd8ab7 Merge pull request #3451 from pherl/fixtypo 
Fix typo.
 2017-08-03 11:20:45 -07:00
Jisi Liu
39a91d376a Fix typo. 2017-08-03 11:15:47 -07:00
Jisi Liu
4cbbf33b77 Fix invalid offsetof warning. 
Use composition instead of inheritance for oneof default.
 2017-08-03 11:13:25 -07:00
Paul Yang
25672c1757 Add getClass for php Descriptor in c extension (#3443) 2017-08-02 18:33:25 -07:00
Gerben Stavenga
7781784796 Add destructors for default instances to the shutdown code. 
Verified test succeed under draconian heap checker
 2017-08-02 18:25:28 -07:00
Jisi Liu
53ae6de18b Merge pull request #3442 from pherl/csharpversion 
Bump csharp version
 2017-08-02 13:28:15 -07:00
Jisi Liu
6c64f11778 Bump csharp version 2017-08-02 13:20:13 -07:00
Jisi Liu
e0288e7ec0 Merge pull request #3438 from pherl/changelog 
Update change log
 2017-08-02 11:48:40 -07:00
Ryan Gordon
9df89ccabc Fixing HHVM Compatibility (#3437) 2017-08-02 07:43:27 -07:00
Paul Yang
c15a3269f9 Expose descriptor API in php c extension (#3422) 2017-08-02 07:42:27 -07:00
Jisi Liu
8a5208fd37 Update change log 2017-08-01 15:47:26 -07:00
Jisi Liu
502624ff8b Merge pull request #3419 from pherl/3.4.x 
Merge master into 3.4.x
 2017-08-01 14:47:09 -07:00
Jisi Liu
d77c8c5e44 remove the duplication 2017-08-01 14:01:55 -07:00
Jisi Liu
bcf17332bd Adding the missing header 2017-08-01 13:51:26 -07:00
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.
 2017-08-01 13:23:34 -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
Feng Xiao
d6bd959761 Merge pull request #3406 from ax3l/bg-3.4-cmake-pkgconfig 
CMake: Install .pc Files (Backport: 3.4)
 2017-07-31 10:45:36 -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
Jisi Liu
19b8c8bfd3 Update conformance tests again. 2017-07-25 16:08:17 -07: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
Jisi Liu
12c186f7c6 Fix makefile.am 2017-07-25 14:38:00 -07:00
Jisi Liu
de6debcf2b Fix conformance tests 2017-07-25 14:37:37 -07:00
Jisi Liu
e177739fa2 Fix build files 2017-07-25 14:37:19 -07:00
Jisi Liu
9b8f6589f2 Remove dependency on guava 20 2017-07-25 13:46:17 -07:00
Jisi Liu
d974cc2e9a Update conformance tests 2017-07-25 12:22:32 -07:00
Jisi Liu
f39d4de94f Merge remote-tracking branch 'origin/master' into merge 2017-07-25 12:00:29 -07:00
Jisi Liu
759245a49a Merge from master 2017-07-25 11:52:33 -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
Jisi Liu
4bff88e0fb Merge pull request #3413 from pherl/3.4.x 
Update version number for 3.4.0
 2017-07-25 00:16:35 -07:00
Jisi Liu
ce4416705b Merge remote-tracking branch 'origin/3.4.x' into vb 2017-07-24 20:44:59 -07:00
Jisi Liu
4ae94d69ff Merge pull request #3414 from pherl/fixzip 
Omit the zip test if tools are not available
 2017-07-24 20:38:29 -07:00
Jisi Liu
eb6b3320a5 Merge pull request #3412 from anandolee/3.4.x 
Use keys() instead of iterkeys() to be python3 compatbile.
 2017-07-24 20:37:35 -07:00
Jisi Liu
02250a7ff4 Omit the zip test if tools are not available 2017-07-24 17:17:57 -07:00
Jie Luo
9c012ed07d Add __bool__ as well as __nonzero__ for python3 2017-07-24 16:42:23 -07:00
Jisi Liu
11b4d5ec73 Update required version on pre-generated files 2017-07-24 16:23:43 -07:00
Jisi Liu
8b24feb6ad Update pre generated files 2017-07-24 16:20:17 -07:00