AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
4,602 Commits 35 Branches 138 Tags 124 MiB
9053033a50
Commit Graph

4602 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Cozzette
9053033a50 Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-master 2017-04-27 14:55:53 -07:00
Adam Cozzette
067b1eec3b Merge pull request #3023 from acozzette/min 
Fully qualify min as std::min in wire_format_lite.cc
 2017-04-27 13:56:27 -07:00
Adam Cozzette
07c284f86c Fully qualify min as std::min in wire_format_lite.cc 2017-04-27 11:35:59 -07:00
Paul Yang
a6189acd18 Add prefix to enum value with reserved name. (#3020) 2017-04-26 16:32:21 -07:00
Adam Cozzette
cbd08cb7d1 Merge pull request #3018 from acozzette/using-namespace-std 
Remove "using namespace std" from stubs/common.h
 2017-04-26 13:56:24 -07:00
Feng Xiao
54d1701f6c Merge pull request #3015 from buchgr/unused-consts 
Remove unused constants.
 2017-04-26 11:09:42 -07:00
Adam Cozzette
7c76ac1735 Remove "using namespace std" from stubs/common.h 
This prevents the contents of the std namespace from being effectively
pulled into the top-level namespace in all translation units that
include common.h. I left in individual using statements for a few common
things like std::set and std::map, because it did not seem worth going
through the churn of updating the whole codebase to fix those right now.
 2017-04-26 08:25:01 -07:00
Paul Yang
3c0855e94a Add a test case for nested enum, which was missed previously. (#3010) 2017-04-25 10:47:09 -07:00
Jakob Buchgraber
b1c75bc742 Remove unused constants. 
When compiling with -Werror, -Wunused-const-variable the build fails due
to those two constants not being used.
 2017-04-25 12:49:00 +02:00
Feng Xiao
4920e27a48 Merge pull request #3008 from postmasters/patch-1 
Add a link to dart-lang/protobuf
 2017-04-24 13:09:48 -07:00
Paul Yang
fba2acd72e Add nested enum descriptor in php rumtime. (#3009) 2017-04-24 12:40:37 -07:00
Paul Yang
e64b618b21 Update php version number to 3.3.0 (#3001) 2017-04-24 09:24:43 -07:00
postmasters
4777574a6c Add a link to dart-lang/protobuf 2017-04-24 08:46:56 -07:00
Paul Yang
6fff091c49 Throw exception when parsing invalid data. (#3000) 2017-04-21 15:00:00 -07:00
Feng Xiao
f418b9e3eb Merge pull request #2996 from xfxyjwf/3.3.x 
Fix python3 issue.
 2017-04-20 17:32:48 -07:00
Paul Yang
4523c9c233 Allow proto files to import descriptor.proto (#2995) 
descriptor.proto uses proto2 syntax, which is not ready for external
usage. However, some proto3 files import descriptor.proto and cannot be
used. In this PR, all references (We cheated by only removing
extensions, which is enough for now. User should avoid using messages
defined in descriptor.proto as field type.) to content in
descriptor.proto are removed from generated files. Those that import
descriptor.proto can be used like other proto files.
 2017-04-20 16:55:56 -07:00
Feng Xiao
478119fe77 Fix python3 issue. 2017-04-20 16:30:26 -07:00
Feng Xiao
14afc3fd41 Merge pull request #2992 from xiaogaozi/patch-1 
Add gogoprotobuf to third-party add-ons list
 2017-04-20 11:12:02 -07:00
Changjian Gao
f85eecb585 Add gogoprotobuf to third-party add-ons list 2017-04-20 19:53:11 +08:00
Paul Yang
4c57e8475f Prepend "PB" to generated classes whose name are reserved words. (#2990) 2017-04-20 01:19:03 -07:00
Paul Yang
b97cd573e4 Add test for nested enum for php (#2989) 2017-04-19 21:20:55 -07:00
Paul Yang
7be088202b Enum defined without package have incorrect class name. (#2988) 
Fix the bug by sharing the code for generating class name for both
message and enum.
 2017-04-19 20:03:34 -07:00
Paul Yang
190b5270c8 Make PHP c extension work with PHP7 (#2951) 2017-04-19 16:23:51 -07:00
Feng Xiao
357afc39de Merge pull request #2508 from yliu120/pass_default_env_to_protoc 
add a key to ctx.action dict to prevent protoc losing the default env
 2017-04-19 11:28:54 -07:00
Feng Xiao
0a93f67055 Merge pull request #2987 from konsumer/patch-1 
Add node-protoc-plugin to "Other Utilities"
 2017-04-19 10:30:42 -07:00
Adam Cozzette
594f810081 Merge pull request #2982 from mda000/issue2972 
Simplify the Element dtor invocation when freeing elements in InternalDeallocate
 2017-04-19 08:34:54 -07:00
David Konsumer
3055a02125 Add node-protoc-plugin to "Other Utilities" 2017-04-18 18:58:21 -07:00
Thomas Van Lenten
a3873cafae Merge pull request #2985 from thomasvl/class_check_tweaks 
Tighten up class usage/checks.
 2017-04-18 13:28:41 -04:00
Thomas Van Lenten
f5a01d1bbd Tighten up class usage/checks. 
- Ensure extensions resolution/wiring is happening directly on the
  messageClass (incase someone is doing odd things our out classes).
- Make the extension message check match the other class checks in
  for mergeFrom/isEqual/etc.
 2017-04-18 13:10:52 -04:00
Michael Allen
2240a785f9 Simplify the Element dtor invocation when freeing elements in 
InternalDeallocate to avoid confusing the compiler when there's
a class named Element already defined in the global namespace.
 2017-04-17 10:59:31 -07:00
Feng Xiao
8aa927f08f Merge pull request #2950 from anuraaga/dev_rag 
Allow unknown values for Map put*Value methods just like every other …
 2017-04-12 10:42:18 -07:00
Feng Xiao
43234828da Merge pull request #2967 from xfxyjwf/3.3.x 
Fix map serialization
 2017-04-11 16:52:06 -07:00
Feng Xiao
5777259273 Cherry-pick cl/152450543 2017-04-11 16:15:46 -07:00
Feng Xiao
cad0258d17 Cherry-pick cl/151775298 2017-04-11 16:14:00 -07:00
Feng Xiao
fc3ea97870 Merge pull request #2955 from xfxyjwf/3.3.x 
Add include for INT_MAX
 2017-04-11 16:13:32 -07:00
Jie Luo
899460c9cb cherrypick descriptor_pool.FindFileContainingSymbol by extensions (#2962) 
* Use PyUnicode_AsEncodedString() instead of PyUnicode_AsEncodedObject()

* Cherrypick the fix descriptor_pool.FindFileContainingSymbol by extensions.
 2017-04-10 16:37:57 -07:00
Feng Xiao
bfeeb98517 Add include for INT_MAX 2017-04-08 00:39:03 +00:00
Feng Xiao
e91caa1f19 Merge pull request #2949 from xfxyjwf/3.3.x 
Cleanup reflection objects for map entry.
 2017-04-07 11:30:40 -07:00
Anuraag Agrawal
bf483dfb99 Allow unknown values for Map put*Value methods just like every other enum mutation method. 2017-04-07 14:50:52 +09:00
Feng Xiao
ee9c7f17e9 Cleanup reflection objects for map entry. 2017-04-06 16:47:18 -07:00
Adam Cozzette
efec757104 Merge pull request #2937 from anuraaga/dev_rag2 
Fix duplicate fields test and Any test. The repeated version is passing because nu…
 2017-04-06 16:27:54 -07:00
Feng Xiao
18c13c93de Merge pull request #2942 from xfxyjwf/3.3.x 
Update version number and changelog for 3.3.0
 2017-04-06 11:46:51 -07:00
Feng Xiao
21b0b3ca36 Update generated code. 2017-04-05 17:45:21 -07:00
Feng Xiao
80f0c0ac40 Update version number and changelog for 3.3.0 2017-04-05 17:32:17 -07:00
Jie Luo
69bfde22b6 Merge pull request #2922 from anandolee/master 
Use PyUnicode_AsEncodedString() instead of PyUnicode_AsEncodedObject()
 2017-04-05 16:34:54 -07:00
Anuraag Agrawal
09328db1ff Fix test for unexpected type url when parsing Any. Currently, the test fails since TestAllTypes doesn't have field '@type', which is the same test as testUnknownFields. 2017-04-05 17:44:26 +09:00
Adam Cozzette
139fd0a1c5 Merge pull request #2933 from mharrend/patch-1 
Adding default shell env to allow non-default compilers
 2017-04-04 09:34:06 -07:00
Adam Cozzette
37c7b766b3 Merge pull request #2930 from anuraaga/dev_rag 
Fix error message for int64 parse failure.
 2017-04-04 09:31:14 -07:00
Anuraag Agrawal
662f97841e Fix duplicate fields test. The repeated version is passing because null values in a repeated field are rejected and not testing what it wanted to. Also adds a oneof version that verifies the case of oneof fields of different names (currently only same name check seems to be tested). 
Also fix spelling of a test.
 2017-04-04 17:27:53 +09:00
Adam Cozzette
cc3fa2ec80 Merge pull request #2676 from acozzette/js-compatibility-tests 
JS compatibility tests
 2017-04-03 14:39:26 -07:00