Jisi Liu
ed91f89f73
Merge pull request #735 from pherl/beta-1
...
Update cmake and BUILD files.
10 years ago
Jisi Liu
b90f9f8073
Update cmake and BUILD files.
...
Change-Id: I17e16fdae6e4d2fb74d178fa5564a609ed58af1d
10 years ago
Jisi Liu
144ea00659
Merge branch 'beta-1' of github.com:google/protobuf into manual-merge
10 years ago
Jisi Liu
4c663d810e
Update descriptor protos.
...
Change-Id: I74a73d3135ec1e0e4d52d741a77456b8e55f038f
10 years ago
Jisi Liu
db45aa117a
Merge branch 'beta-1' of github.com:google/protobuf into manual-merge
...
Change-Id: I83a93fdb119a643fbc884e6ec3624493f6270370
10 years ago
Feng Xiao
cc5a1bfede
Make the PARSER @Deprecated public.
...
(cherry-picking an intenral change).
10 years ago
Jisi Liu
56c4f57bb0
Merge branch 'gcc-c++11-fix' of https://github.com/nsuke/protobuf into beta-1
...
Manually merge pull request: https://github.com/google/protobuf/pull/674
that fixes the gcc C++11 build.
10 years ago
Feng Xiao
f4ef8fe3b8
Delete incorrectly placed test file.
10 years ago
Feng Xiao
fbb3ef28c9
Merge Java util package to github.
10 years ago
Feng Xiao
839b180dba
Cherry-pick Java utf8 change.
10 years ago
Feng Xiao
b17ec3ca11
Down-integrate from internal code base.
10 years ago
Feng Xiao
eee38b0c01
Down-integrate from google3.
10 years ago
Jisi Liu
c3bc155ace
Merge branch 'master' of github.com:google/protobuf
...
Change-Id: If3fb07754a734bae610d95124528e073515ac525
10 years ago
Jisi Liu
b0f661181d
Down-integrate from internal branch.
...
Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4
10 years ago
Joshua Haberman
eb65c69e14
Merge pull request #584 from haberman/cwarnings
...
Ruby: Conform to C89/C90 variable declaration rules.
10 years ago
Josh Haberman
d61e6adfcc
Return TypedData_Wrap_Struct directly.
...
Change-Id: I6cf77f01370204ad4bc7b345a040a9a3de1706a0
10 years ago
Jon Skeet
0cb84ee31f
Merge pull request #720 from jtattermusch/csharp_fixes
...
C# fix for TypeInitializer exception.
10 years ago
Jan Tattermusch
fa2fe35dec
fix type initialization problem with FileDescriptor
10 years ago
Jan Tattermusch
143688f68b
add a failing descriptor test
10 years ago
Jan Tattermusch
a55a4449ef
remove duplicate test case
10 years ago
Paul Yang
5c370cc55f
Merge pull request #571 from thomasvl/validation_support
...
Add support for a file listing expected package to objc prefixes for validation.
10 years ago
Thomas Van Lenten
4e43931eaf
Add support for a file listing expected package to objc prefixes for validation.
...
- Add a env var to pass a set of expected prefixes for validation.
- Report warnings/errors based on the expected prefixes vs. the data in the files compiled.
- Use some helpers from common directory.
10 years ago
Joshua Haberman
53435df594
Merge pull request #716 from haberman/fixruby
...
Fixed several Ruby conformance test cases through upb update.
10 years ago
Jan Tattermusch
2093749caf
Merge pull request #718 from jskeet/descriptor-descriptor
...
Allow public access to descriptor.proto as a dependency.
10 years ago
Jon Skeet
a39ababb7c
Allow public access to descriptor.proto as a dependency.
...
With this in place, generating APIs on github.com/google/googleapis works - previously annotations.proto failed.
Currently there's no access to the annotations (stored as extensions) but we could potentially expose those at a later date.
10 years ago
Feng Xiao
f818183f9b
Merge pull request #673 from podsvirov/topic-cmake-install
...
Install protobuf from cmake project
10 years ago
Josh Haberman
5bdf4a4271
Fixed several Ruby conformance test cases through upb update.
...
Change-Id: Ief77de7134e05e07b1a7e3970d49880c2d5e6fe9
10 years ago
Feng Xiao
38a56ee4b1
Merge pull request #702 from jtattermusch/visual_studio_build_static_runtime
...
Link runtime statically for VS build
10 years ago
Jan Tattermusch
9bdeba479b
only link runtime libraries statically for a static build
10 years ago
Paul Yang
edaefac5d2
Merge pull request #706 from thomasvl/revert_any_change_2
...
Revert "Add packFrom, unpackTo and is in google.protobuf.Any."
10 years ago
Thomas Van Lenten
1c33d34e34
Revert "Add packFrom, unpackTo and is in google.protobuf.Any."
...
This reverts commit 7366efd81e
.
Still some discussion about the api to expose the helpers with.
10 years ago
Paul Yang
63778e537a
Merge pull request #649 from cijianzy/master
...
Update GPBWellKnownTypes.m
10 years ago
Jan Tattermusch
6994b07f14
Merge pull request #703 from jskeet/more-todos
...
More TODOs done.
10 years ago
Jon Skeet
f2732c7af1
More TODOs done.
...
- Removed a TODO without change in DescriptorPool.LookupSymbol - the TODOs were around performance, and this is only used during descriptor initialization
- Make the CodedInputStream limits read-only, adding a static factory method for the rare cases when this is useful
- Extracted IDeepCloneable into its own file.
10 years ago
Jon Skeet
29fe8d223e
Merge pull request #701 from jskeet/map-views
...
Implement Keys and Values as views in MapField
10 years ago
Jon Skeet
4deea8c231
Fix parameter name in exception.
10 years ago
Jon Skeet
c2c42053bc
Merge pull request #699 from jskeet/validate_packed
...
Make FieldDescriptor.IsPacked work appropriately.
10 years ago
Jon Skeet
5be01ee65b
Implement ICollection.CopyTo (using Array) for MapField views.
10 years ago
Jan Tattermusch
1858ac9b42
make VS build link runtime statically
10 years ago
Jan Tattermusch
5980629933
Merge pull request #700 from jskeet/remove-packed-hack
...
Remove our own version of MakeTag now that the main one is fixed.
10 years ago
Jon Skeet
3f45d7c11e
Implement Keys and Values as views
10 years ago
Jon Skeet
547d8e8221
Make FieldDescriptor.IsPacked work appropriately.
...
This is a bit of a grotty hack, as we need to sort of fake proto2 field presence, but with only a proto3 version of the descriptor messages (a bit like oneof detection).
Should be okay, but will need to be careful of this if we ever implement proto2.
10 years ago
Jon Skeet
e58cdbd214
Merge pull request #695 from jskeet/remove-todos
...
Tidying up
10 years ago
Jon Skeet
c671095e91
Address review comments.
10 years ago
Jon Skeet
889b88a29f
Remove reference to generic types within XML comment.
...
Visual Studio is happy with it, but Mono isn't :(
10 years ago
Jon Skeet
6f300442bc
Tidying up - fix a bunch of TODOs and remove outdated ones.
10 years ago
Jon Skeet
cac4531323
Merge pull request #694 from jskeet/groups
...
Fix groups handling in C#
10 years ago
Jon Skeet
6e16037c99
Address review comments.
10 years ago
Jon Skeet
93bdf36f8b
Remove our own version of MakeTag now that the main one is fixed.
...
"Tested" by regenerating code and observing that there are no changes.
10 years ago
Paul Yang
b76b76ba4f
Merge pull request #645 from zsurocking/master
...
Down integrate. Generate a package name suffix ".nano" for nano messages
10 years ago