AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
2,595 Commits 35 Branches 138 Tags 124 MiB
0977815af2
Commit Graph

2595 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jisi Liu
0977815af2 fix "memory leaks" in protostream-object files. 
Change-Id: I0aca56802d974cb03cb89c1a294f37068b5b9758
 2015-08-25 22:01:12 -07:00
Jisi Liu
01e060f20e Fix commandline interface file under heapcheck. 
The internal down-integrate script probably does not handle the
top level macros well. Moved the macro inside of the namespace
declrations to avoid down-integrate errors in the future.

Change-Id: I3790357f36b0204a2a26577805192a3a1e989df8
 2015-08-25 20:53:19 -07:00
Feng Xiao
5da0b46811 Merge pull request #734 from TeBoring/beta-1 
Fix bugs on windows
 2015-08-25 18:00:26 -07:00
Bo Yang
ff7bdad231 Fix bugs on windows 2015-08-25 17:58:48 -07:00
Jisi Liu
ed91f89f73 Merge pull request #735 from pherl/beta-1 
Update cmake and BUILD files.
 2015-08-25 17:12:14 -07:00
Jisi Liu
b90f9f8073 Update cmake and BUILD files. 
Change-Id: I17e16fdae6e4d2fb74d178fa5564a609ed58af1d
 2015-08-25 17:06:33 -07:00
Jisi Liu
144ea00659 Merge branch 'beta-1' of github.com:google/protobuf into manual-merge 2015-08-25 17:03:49 -07:00
Jisi Liu
4c663d810e Update descriptor protos. 
Change-Id: I74a73d3135ec1e0e4d52d741a77456b8e55f038f
 2015-08-25 17:03:05 -07:00
Jisi Liu
db45aa117a Merge branch 'beta-1' of github.com:google/protobuf into manual-merge 
Change-Id: I83a93fdb119a643fbc884e6ec3624493f6270370
 2015-08-25 16:51:22 -07:00
Feng Xiao
cc5a1bfede Make the PARSER @Deprecated public. 
(cherry-picking an intenral change).
 2015-08-25 16:50:53 -07:00
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.
 2015-08-25 16:32:01 -07:00
Feng Xiao
f4ef8fe3b8 Delete incorrectly placed test file. 2015-08-25 14:49:09 -07:00
Feng Xiao
fbb3ef28c9 Merge Java util package to github. 2015-08-25 14:32:09 -07:00
Feng Xiao
839b180dba Cherry-pick Java utf8 change. 2015-08-24 11:25:15 -07:00
Feng Xiao
b17ec3ca11 Down-integrate from internal code base. 2015-08-23 17:50:38 -07:00
Feng Xiao
eee38b0c01 Down-integrate from google3. 2015-08-22 18:25:48 -07:00
Jisi Liu
c3bc155ace Merge branch 'master' of github.com:google/protobuf 
Change-Id: If3fb07754a734bae610d95124528e073515ac525
 2015-08-21 11:44:49 -07:00
Jisi Liu
b0f661181d Down-integrate from internal branch. 
Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4
 2015-08-21 11:18:45 -07:00
Joshua Haberman
eb65c69e14 Merge pull request #584 from haberman/cwarnings 
Ruby: Conform to C89/C90 variable declaration rules.
 2015-08-21 09:00:40 -07:00
Josh Haberman
d61e6adfcc Return TypedData_Wrap_Struct directly. 
Change-Id: I6cf77f01370204ad4bc7b345a040a9a3de1706a0
 2015-08-20 16:41:32 -07:00
Jon Skeet
0cb84ee31f Merge pull request #720 from jtattermusch/csharp_fixes 
C# fix for TypeInitializer exception.
 2015-08-14 22:12:02 +01:00
Jan Tattermusch
fa2fe35dec fix type initialization problem with FileDescriptor 2015-08-14 13:38:34 -07:00
Jan Tattermusch
143688f68b add a failing descriptor test 2015-08-14 13:23:44 -07:00
Jan Tattermusch
a55a4449ef remove duplicate test case 2015-08-14 13:16:04 -07:00
Paul Yang
5c370cc55f Merge pull request #571 from thomasvl/validation_support 
Add support for a file listing expected package to objc prefixes for validation.
 2015-08-14 13:06:43 -07:00
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.
 2015-08-14 13:34:51 -04:00
Joshua Haberman
53435df594 Merge pull request #716 from haberman/fixruby 
Fixed several Ruby conformance test cases through upb update.
 2015-08-13 13:40:09 -07:00
Jan Tattermusch
2093749caf Merge pull request #718 from jskeet/descriptor-descriptor 
Allow public access to descriptor.proto as a dependency.
 2015-08-13 09:23:29 -07:00
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.
 2015-08-13 12:01:41 +01:00
Feng Xiao
f818183f9b Merge pull request #673 from podsvirov/topic-cmake-install 
Install protobuf from cmake project
 2015-08-12 23:07:54 -07:00
Josh Haberman
5bdf4a4271 Fixed several Ruby conformance test cases through upb update. 
Change-Id: Ief77de7134e05e07b1a7e3970d49880c2d5e6fe9
 2015-08-12 18:50:15 -07:00
Feng Xiao
38a56ee4b1 Merge pull request #702 from jtattermusch/visual_studio_build_static_runtime 
Link runtime statically for VS build
 2015-08-12 14:11:12 -07:00
Jan Tattermusch
9bdeba479b only link runtime libraries statically for a static build 2015-08-12 12:47:02 -07:00
Paul Yang
edaefac5d2 Merge pull request #706 from thomasvl/revert_any_change_2 
Revert "Add packFrom, unpackTo and is in google.protobuf.Any."
 2015-08-11 13:43:45 -07:00
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.
 2015-08-11 16:22:47 -04:00
Paul Yang
63778e537a Merge pull request #649 from cijianzy/master 
Update GPBWellKnownTypes.m
 2015-08-11 13:02:50 -07:00
Jan Tattermusch
6994b07f14 Merge pull request #703 from jskeet/more-todos 
More TODOs done.
 2015-08-10 14:39:40 -07:00
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.
 2015-08-10 19:18:18 +01:00
Jon Skeet
29fe8d223e Merge pull request #701 from jskeet/map-views 
Implement Keys and Values as views in MapField
 2015-08-10 12:44:49 +01:00
Jon Skeet
4deea8c231 Fix parameter name in exception. 2015-08-10 09:03:43 +01:00
Jon Skeet
c2c42053bc Merge pull request #699 from jskeet/validate_packed 
Make FieldDescriptor.IsPacked work appropriately.
 2015-08-10 08:47:57 +01:00
Jon Skeet
5be01ee65b Implement ICollection.CopyTo (using Array) for MapField views. 2015-08-10 08:47:07 +01:00
Jan Tattermusch
1858ac9b42 make VS build link runtime statically 2015-08-08 19:56:52 -07:00
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.
 2015-08-08 11:51:40 -07:00
Jon Skeet
3f45d7c11e Implement Keys and Values as views 2015-08-08 08:59:53 +01:00
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.
 2015-08-08 07:27:58 +01:00
Jon Skeet
e58cdbd214 Merge pull request #695 from jskeet/remove-todos 
Tidying up
 2015-08-08 07:26:51 +01:00
Jon Skeet
c671095e91 Address review comments. 2015-08-08 07:26:26 +01:00
Jon Skeet
889b88a29f Remove reference to generic types within XML comment. 
Visual Studio is happy with it, but Mono isn't :(
 2015-08-08 07:25:29 +01:00
Jon Skeet
6f300442bc Tidying up - fix a bunch of TODOs and remove outdated ones. 2015-08-08 07:25:28 +01:00