Adam Cozzette
9053033a50
Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-master
8 years ago
Adam Cozzette
067b1eec3b
Merge pull request #3023 from acozzette/min
...
Fully qualify min as std::min in wire_format_lite.cc
8 years ago
Adam Cozzette
07c284f86c
Fully qualify min as std::min in wire_format_lite.cc
8 years ago
Paul Yang
a6189acd18
Add prefix to enum value with reserved name. ( #3020 )
8 years ago
Adam Cozzette
cbd08cb7d1
Merge pull request #3018 from acozzette/using-namespace-std
...
Remove "using namespace std" from stubs/common.h
8 years ago
Feng Xiao
54d1701f6c
Merge pull request #3015 from buchgr/unused-consts
...
Remove unused constants.
8 years ago
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.
8 years ago
Paul Yang
3c0855e94a
Add a test case for nested enum, which was missed previously. ( #3010 )
8 years ago
Jakob Buchgraber
b1c75bc742
Remove unused constants.
...
When compiling with -Werror, -Wunused-const-variable the build fails due
to those two constants not being used.
8 years ago
Feng Xiao
4920e27a48
Merge pull request #3008 from postmasters/patch-1
...
Add a link to dart-lang/protobuf
8 years ago
Paul Yang
fba2acd72e
Add nested enum descriptor in php rumtime. ( #3009 )
8 years ago
Paul Yang
e64b618b21
Update php version number to 3.3.0 ( #3001 )
8 years ago
postmasters
4777574a6c
Add a link to dart-lang/protobuf
8 years ago
Paul Yang
6fff091c49
Throw exception when parsing invalid data. ( #3000 )
8 years ago
Feng Xiao
f418b9e3eb
Merge pull request #2996 from xfxyjwf/3.3.x
...
Fix python3 issue.
8 years ago
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.
8 years ago
Feng Xiao
478119fe77
Fix python3 issue.
8 years ago
Feng Xiao
14afc3fd41
Merge pull request #2992 from xiaogaozi/patch-1
...
Add gogoprotobuf to third-party add-ons list
8 years ago
Changjian Gao
f85eecb585
Add gogoprotobuf to third-party add-ons list
8 years ago
Paul Yang
4c57e8475f
Prepend "PB" to generated classes whose name are reserved words. ( #2990 )
8 years ago
Paul Yang
b97cd573e4
Add test for nested enum for php ( #2989 )
8 years ago
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.
8 years ago
Paul Yang
190b5270c8
Make PHP c extension work with PHP7 ( #2951 )
8 years ago
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
8 years ago
Feng Xiao
0a93f67055
Merge pull request #2987 from konsumer/patch-1
...
Add node-protoc-plugin to "Other Utilities"
8 years ago
Adam Cozzette
594f810081
Merge pull request #2982 from mda000/issue2972
...
Simplify the Element dtor invocation when freeing elements in InternalDeallocate
8 years ago
David Konsumer
3055a02125
Add node-protoc-plugin to "Other Utilities"
8 years ago
Thomas Van Lenten
a3873cafae
Merge pull request #2985 from thomasvl/class_check_tweaks
...
Tighten up class usage/checks.
8 years ago
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.
8 years ago
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.
8 years ago
Feng Xiao
8aa927f08f
Merge pull request #2950 from anuraaga/dev_rag
...
Allow unknown values for Map put*Value methods just like every other …
8 years ago
Feng Xiao
43234828da
Merge pull request #2967 from xfxyjwf/3.3.x
...
Fix map serialization
8 years ago
Feng Xiao
5777259273
Cherry-pick cl/152450543
8 years ago
Feng Xiao
cad0258d17
Cherry-pick cl/151775298
8 years ago
Feng Xiao
fc3ea97870
Merge pull request #2955 from xfxyjwf/3.3.x
...
Add include for INT_MAX
8 years ago
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.
8 years ago
Feng Xiao
bfeeb98517
Add include for INT_MAX
8 years ago
Feng Xiao
e91caa1f19
Merge pull request #2949 from xfxyjwf/3.3.x
...
Cleanup reflection objects for map entry.
8 years ago
Anuraag Agrawal
bf483dfb99
Allow unknown values for Map put*Value methods just like every other enum mutation method.
8 years ago
Feng Xiao
ee9c7f17e9
Cleanup reflection objects for map entry.
8 years ago
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…
8 years ago
Feng Xiao
18c13c93de
Merge pull request #2942 from xfxyjwf/3.3.x
...
Update version number and changelog for 3.3.0
8 years ago
Feng Xiao
21b0b3ca36
Update generated code.
8 years ago
Feng Xiao
80f0c0ac40
Update version number and changelog for 3.3.0
8 years ago
Jie Luo
69bfde22b6
Merge pull request #2922 from anandolee/master
...
Use PyUnicode_AsEncodedString() instead of PyUnicode_AsEncodedObject()
8 years ago
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.
8 years ago
Adam Cozzette
139fd0a1c5
Merge pull request #2933 from mharrend/patch-1
...
Adding default shell env to allow non-default compilers
8 years ago
Adam Cozzette
37c7b766b3
Merge pull request #2930 from anuraaga/dev_rag
...
Fix error message for int64 parse failure.
8 years ago
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.
8 years ago
Adam Cozzette
cc3fa2ec80
Merge pull request #2676 from acozzette/js-compatibility-tests
...
JS compatibility tests
8 years ago