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

4377 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Cozzette
cdc2766a5d Merge pull request #2506 from ckennelly/rvalue-setters 
Add rvalue setters for non-arena strings on C++11.
 2016-12-19 16:51:43 -08:00
Adam Cozzette
bb2c6b21a0 Merge pull request #2505 from ckennelly/master 
Remove spurious NULL checks in ArenaStringPtr::CreateInstance.
 2016-12-19 16:18:45 -08:00
Adam Cozzette
fb15862bac Merge pull request #2517 from acozzette/js-embed 
Auto-generate well_known_types_embed.cc
 2016-12-19 14:49:11 -08:00
Adam Cozzette
98d89d4277 Fixed "make check" for cmake build 
The check target did not depend on the test_plugin binary, so this would
cause "make check" to fail at times because of the absence of
test_plugin. This change adds a dependency on test_plugin so that it
will always get built before the tests are executed.
 2016-12-19 14:38:21 -08:00
Adam Cozzette
1b3a0c16e6 Auto-generate well_known_types_embed.cc 
Until now this file was just checked into the repo, but actually it
should be generated from any.js, struct.js, and timestamp.js. This
change updates the build system to make this happen. To make it work I
also had to remove some C++11 features from embed.cc.
 2016-12-19 14:38:21 -08:00
Chris Kennelly
183d31cbdb Add rvalue setters for non-arena strings on C++11. 2016-12-16 13:50:14 -08:00
Feng Xiao
f39cf88a34 Merge pull request #2227 from KindDragon/3.1.x 
Missed LIBPROTOC_EXPORT for GRPC added
 2016-12-16 10:56:36 -08:00
Jon Skeet
b18bc9b944 Give C# ByteString a sensible GetHashCode implementation. 
Fixes #2511.
 2016-12-16 12:04:40 +00:00
Chris Kennelly
ba63fa731e Remove spurious NULL checks in ArenaStringPtr::CreateInstance. 2016-12-15 14:43:33 -08:00
Adam Cozzette
a95e38ce8d Merge pull request #2499 from ckennelly/master 
Define LANG_CXX11 for port.h and use this to guard C++11 features.
 2016-12-15 13:15:22 -08:00
Chris Kennelly
a902e2588d Define LANG_CXX11 for port.h and use this to guard C++11 features. 2016-12-14 14:03:55 -08:00
Adam Cozzette
83d681ee2c Merge pull request #2495 from acozzette/android-hash 
Removed Android-specific code from stubs/hash.h
 2016-12-14 13:39:31 -08:00
Thomas Van Lenten
d1c1dad047 Merge pull request #2498 from sergiocampama/enum 
Fixes and expands comments on how to use GPB_ENUM_FWD_DECLARE
 2016-12-14 11:49:21 -05:00
Sergio Campama
c68fc589a9 Fixes and expands comments on how to use GPB_ENUM_FWD_DECLARE 2016-12-14 11:35:44 -05:00
Joshua Haberman
2ff42dcf2c Added conformance testing for binary primitive types. (#2491) 
This is basic and more tests will be added over time.
 2016-12-13 16:31:02 -08:00
Feng Xiao
f983302ca7 Merge pull request #2496 from xyzzyz/fix-overflow 
Fix integer overflow in FastUInt32ToBufferLeft
 2016-12-13 15:19:34 -08:00
Feng Xiao
837fd6b6a0 Merge pull request #2493 from jbrianceau/add-missing-climits-include 
Add missing includes
 2016-12-13 15:11:09 -08:00
Feng Xiao
f77b7d9ee3 Merge pull request #2484 from ngg/uwp_build 
Add support for Windows ARM builds
 2016-12-13 11:11:18 -08:00
Adam Michalik
4c5d3eddf9 Fix integer overflow in FastUInt32ToBufferLeft 
If digits > 2, and int is 32 bit, line 999 overflows. It has been fixed
internally in CL 41203823.
 2016-12-13 11:02:58 -08:00
Adam Cozzette
5587562a70 Removed Android-specific code from stubs/hash.h 
This #ifdef in hash.h causes us to give up on finding a hash function on
Android, when there do seem to be hash functions available in practice.
I also had to tweak a macro in map.h that was disabling on Android an
allocator construct() method that we need.
 2016-12-13 11:00:12 -08:00
Julien Brianceau
7b220f3db5 Add missing include in embed.cc 
This changes fixes "error C2039: 'getline': is not a member of 'std'"
compilation error.
 2016-12-13 14:57:11 +01:00
Jan Tattermusch
9d709f446f Merge pull request #2487 from jtattermusch/csharp_leading_whitespace 
remove leading whitespace in C# xml comments
 2016-12-13 13:42:23 +01:00
Julien Brianceau
83c728a940 Add missing includes 
This changes fixes "use of undeclared identifier 'INT_MAX'"
compilation error.
 2016-12-13 10:09:11 +01:00
Feng Xiao
eb455ce1c9 Merge pull request #2471 from jbrianceau/fix-include-style 
Fix #include in cc files
 2016-12-12 16:27:16 -08:00
Jisi Liu
6b86a8922b Merge pull request #2490 from xfxyjwf/icon2 
Add a badge for bazel build status.
 2016-12-12 15:04:18 -08:00
Feng Xiao
4c252dd80b Add a badge for bazel build status. 2016-12-12 14:58:13 -08:00
Gergely Nagy
ec021f5429 Add support for Windows ARM builds 2016-12-12 23:04:09 +01:00
Feng Xiao
29fb87e1d5 Merge pull request #2454 from pongad/go_package 
update descriptor.proto's go_package
 2016-12-12 12:26:58 -08:00
Jan Tattermusch
fda9049ead remove leading whitespace in C# xml comments 2016-12-12 12:41:26 +01:00
Josh Haberman
277a8b6580 generate_changelog.py: flush output so piping works correctly. 2016-12-09 16:13:18 -08:00
Adam Cozzette
84948462a4 Merge pull request #2476 from acozzette/generated-message-reflection-fix 
Use uint32 in GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET macro
 2016-12-09 13:45:18 -08:00
Thomas Van Lenten
dc11940568 Merge pull request #2475 from sergiocampama/rvm2 
Reenable cocoapods objc test and remove unnecessary workaround for rvm
 2016-12-09 14:38:20 -05:00
Adam Cozzette
e19f3b5e3a Use uint32 in GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET macro 
There have been some reports that this necessary to prevent build
failures in some environments. It makes sense to do this anyway since
the result of this macro is ultimately assigned to uint32 in the
generated code.
 2016-12-09 11:20:51 -08:00
Sergio Campama
1ac8944294 Reenable cocoapods objc test and remove unnecessary workaround for rvm 2016-12-09 11:26:11 -05:00
Thomas Van Lenten
e43f73e099 Merge pull request #2473 from thomasvl/update_xcodes 
Update xcode version support and travis usage
 2016-12-09 11:15:06 -05:00
Thomas Van Lenten
70e21d7cf9 Mark objectivec_cocoapods_integration as failing 2016-12-09 10:24:33 -05:00
Thomas Van Lenten
bc9d0774f3 Skip benchmark test if cmake isn't installed. 2016-12-09 10:16:21 -05:00
Thomas Van Lenten
2754586fa4 Xcode 8.1 support 
- Add entries to objectivec/DevTools/full_mac_build.sh
- Support `-quiet` via an option on full_mac_build.sh. NOTE: we don't use
  this on travis because the lack of output for a long time could cause travis
  to kill the build (when we get a slow VM).
- Update travis config to use newer images.
 2016-12-09 10:15:40 -05:00
Julien Brianceau
e3da722b66 Fix #include in cc files 2016-12-09 09:34:07 +01:00
Feng Xiao
243ebec887 Merge pull request #2468 from sergei-ivanov/patch-1 
Update third_party.md
 2016-12-08 18:54:14 -08:00
Paul Yang
d8f54c4206 Disable jruby test. (#2469) 
Missed in #2467.
 2016-12-08 16:27:56 -08:00
Sergei Ivanov
09dc933932 Update third_party.md 
Updated the location for `protobuf-maven-plugin`
 2016-12-09 00:01:11 +00:00
Paul Yang
e3e38b81cc Update commit id in Dockerfile to trigger update. (#2467) 2016-12-08 14:39:20 -08:00
Feng Xiao
4474c042c0 Merge pull request #2462 from jbrianceau/fix-comp-builds-part2 
C++: export _xxx_default_instance_ symbols
 2016-12-08 11:23:36 -08:00
Feng Xiao
6b4eee408b Merge pull request #2461 from jbrianceau/add-missing-include-in-embed-cc 
Add missing include in embed.cc
 2016-12-08 11:22:39 -08:00
Feng Xiao
34a1b6e6b8 Merge pull request #2394 from cwelton/formatting 
oneOf fix for JsonFormat includingDefaultValueFields
 2016-12-08 11:17:10 -08:00
Paul Yang
46ae90dc5e Make php generated code conform to PSR-4. (#2435) 
1. Generate single file for each message.
2. Lazily initiate metadata.
 2016-12-08 11:16:49 -08:00
Thomas Van Lenten
631f4618a7 Merge pull request #2466 from thomasvl/deprecation_followup 
Improve ObjC deprecated annotation support.
 2016-12-08 14:02:32 -05:00
Feng Xiao
4c84b474d1 Merge pull request #2460 from sergiocampama/c11 
Include -std=c++11 when compiling protobuf if available.
 2016-12-08 10:49:13 -08:00
Thomas Van Lenten
dad775b798 Improve ObjC deprecated annotation support. 
- Check the parent file options for deprecation when deciding to tag Messages
  and Enums as deprecated.
- Within the generated source push/pop the warning for implementing deprecated
  things around a deprecated class implementation.
- Annotate the methods generated for extension fields as deprecated.
- Add a testing .proto file that covers deprecated fields, messages, enums,
  enum values and compile it into the unittests to confirm things compile
  cleanly.
- Add a testing .proto file that uses the file level option to make everything
  deprecated and compile it into the unittests to confirm things compile
  cleanly.
 2016-12-08 12:12:50 -05:00