AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
3,196 Commits 35 Branches 138 Tags 124 MiB
29d58d3392
Commit Graph

3196 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jisi Liu
878b603d32 Merge pull request #849 from pherl/master 
Integrate google internal changes.
 2015-10-06 14:13:01 -07:00
Jisi Liu
5f6a1d3dbb Remove duplicated header file 2015-10-06 13:58:41 -07:00
Jisi Liu
479a90b4dd Revert unwanted changes. 2015-10-06 13:54:35 -07:00
Jisi Liu
78d040a18b remove extra collection import 2015-10-06 11:02:24 -07:00
Jisi Liu
72bd9c959a disable tests for python-cpp under py26 as well. 2015-10-06 10:48:57 -07:00
Jisi Liu
f509c7b2f5 disable py2.6 tests for json_format_test 2015-10-05 16:14:50 -07:00
Jisi Liu
dbea00ae88 Revert back changes to import unittest2 for py26 2015-10-05 16:08:22 -07:00
Jisi Liu
a783eaf37f make the python json test less strict on expected errors. 2015-10-05 15:06:06 -07:00
Jisi Liu
61871a02d4 fix stringpiece test to use portable hash set. 2015-10-05 15:05:50 -07:00
Jisi Liu
e8c3c54b3f Adding back three missing export macros. 2015-10-05 14:39:10 -07:00
Jisi Liu
9cafa20122 Merge pull request #837 from mzhaom/bazel-java 
Add "java_proto" target in bazel BUILD file to provide Java runtime library.
 2015-10-05 13:55:25 -07:00
Jisi Liu
8d8177c757 Merge remote-tracking branch 'origin/master' into fix-author 2015-10-05 13:54:05 -07:00
Jisi Liu
46e8ff63cb Down-integrate from google internal. 2015-10-05 11:59:43 -07:00
Jan Tattermusch
cccf6fed7e Merge pull request #845 from jskeet/xmldocs 
Extract XML documentation in a primitive but reasonably-effective way
 2015-10-05 07:49:17 -07:00
Bo Yang
7c14dc837b Down-integrate internal bug fixing changes. 2015-10-04 13:22:54 -07:00
Paul Yang
24fe6ba750 Merge pull request #843 from thomasvl/objcpp_enum_fwd_decl 
Support enum forward decls in Objective C++
 2015-10-01 11:00:50 -07:00
Thomas Van Lenten
ad2d5c926b Support enum forward decls in Objective C++ 
NS_ENUM changes defintion in Objective C++ based on the C++ spec being
compiled with, special case the one situation where it wouldn't support doing a
forward decl for the enum.
 2015-10-01 09:03:30 -04:00
Jon Skeet
9ed6d4da37 Support ToString in RepeatedField and MapField. 
This changes how we approach JSON formatting in general - instead of looking  at the field a value came from, we just look at the type of the value. It's possible this *could* be slightly inefficient, but if we start caring about JSON performance deeply, we'll probably want to rewrite all of this anyway. It's definitely simpler this way.

When we support dynamic messages, we'll need to modify JsonFormatter to handle enum values, as they won't come be "real" .NET enums at that point. It shouldn't be hard to do though.
 2015-10-01 13:07:47 +01:00
Jon Skeet
18e0a2e5ec Generated code from previous commit. 2015-10-01 10:38:01 +01:00
Jon Skeet
67dd42c50d First pass at generating XML documentation from .proto comments. 
This could be tidied up significantly, and at some point we will want to parse the markdown and generate more appropriate XML - but this is definitely better than nothing.

Generated code changes coming in next commit.
 2015-10-01 10:36:58 +01:00
Paul Yang
ebf3eb630d Merge pull request #841 from thomasvl/newer_xcodes 
Cleanups for newer Xcodes
 2015-09-30 11:01:45 -07:00
Jon Skeet
aa7ea3b698 Merge pull request #834 from jskeet/docfixes 
Add (some) XML documentation to generated code
 2015-09-30 09:58:07 +01:00
Jon Skeet
6bbbdfa24c Fix typo in oneof case enum comment 2015-09-30 06:59:38 +01:00
Paul Yang
5ebac49f1e Merge pull request #836 from jcanizales/fix-version-number 
Fix Podspec version number
 2015-09-29 15:07:03 -07:00
Thomas Van Lenten
1383d53e67 Cleanups for newer Xcodes 
- Move up to 8.4 as the high simulator (assuming Xcode 6.4).
- Add cast to NSMutableDictionary so clang and resolve the selector.
- Add case for the newer static analyzer so it won't trigger a false warning.
- Update the "dictionary" interface to use "object" naming. Xcode 7+ has gotten
  more strict on the use of nonnull/nullable; combining that with the generic
  collection support; and the "dictionary" classes we created now collide with
  what the generic KeyValueCoding in the system headers triggering
  warnings/errors. Fix this and hopefully all future issue by renaming the
  methods to use "object" for the classes that have data types as objects
  instead of PODs. Taking this renaming hit now while ObjC is still in beta
  because it is a breaking change for any existing code.
 2015-09-29 17:18:09 -04:00
Ming Zhao
60880a7e46 Add "java_proto" target in bazel BUILD file to provide Java runtime 
library.
 2015-09-29 13:21:44 -07:00
Joshua Haberman
61874bc6ea Merge pull request #831 from haberman/ruby-tinyfix 
A very small fix to silence some warnings.
 2015-09-29 13:17:55 -07:00
Jorge Canizales
c1e3f540af Fix Podspec version number 
This was released as `3.0.0-alpha-4.1`
 2015-09-29 09:46:39 -07:00
Jon Skeet
e2c823027e Generated code changes for previous commit. 2015-09-29 14:34:31 +01:00
Jon Skeet
1351d20c31 Move the summary comments above the attributes. 
(Generated code changes coming next...)
 2015-09-29 14:34:05 +01:00
Jon Skeet
b0888a42ad Generated code for previous commit 2015-09-29 13:37:30 +01:00
Jon Skeet
2212f56bcd Added documentation to generated code. 
There are now summaries for:
- The Types nested class (which holds nested types)
- The file descriptor class for each proto
- The enum generated for each oneof

(Also fixed two typos.)

Generated code in next commit.
 2015-09-29 13:37:15 +01:00
Josh Haberman
14e2b4fa51 A very small fix to silence some warnings. 
Also updated the Gemfile.lock since alpha-4 has been
pushed to RubyGems.

Change-Id: I8ddc5f125f28aa9a33c88dfe48251a75a877e1d3
 2015-09-28 08:56:14 -07:00
Feng Xiao
0e5686a707 Merge pull request #727 from AustinSchuh/arena_bounds_fix 
Handled blocks being too small in arena.cc
 2015-09-24 17:41:45 -07:00
Jan Tattermusch
c31f11deb4 expose GetOutputFile in csharp_names.h 2015-09-23 15:12:17 -07:00
Jan Tattermusch
97a1c1e08d Merge pull request #785 from jskeet/csharp-directories 
Generate C# directory hierarchy with new option
 2015-09-23 14:31:31 -07:00
Konstantin Podsvirov
f397ede7c6 Add CMake option protobuf_DEBUG_POSTFIX 2015-09-17 13:00:12 +03:00
Konstantin Podsvirov
e301946ca4 Simplify testing from CMake project to "check" target 2015-09-17 12:08:47 +03:00
Feng Xiao
c9418912cb Merge pull request #813 from 0xAAE/master 
Add GOOGLE_ATTRIBUTE_NOINLINE to GetArena() and GetMaybeArenaPointer(…
 2015-09-16 14:44:48 -07:00
Konstantin Podsvirov
d41601c249 Improved testing from CMake project 
Build tests optimization
Now lite-test added to CTest collection
 2015-09-16 12:55:35 +03:00
Konstantin Podsvirov
0a22fe59b7 Rename CMake option BUILD_SHARED_LIBS to protobuf_BUILD_SHARED_LIBS 2015-09-15 15:36:20 +03:00
Konstantin Podsvirov
620bd7418d Rename CMake option ZLIB to protobuf_WITH_ZLIB 2015-09-15 15:31:25 +03:00
Konstantin Podsvirov
673d32e093 Rename CMake option BUILD_TESTING to protobuf_BUILD_TESTS 2015-09-15 15:30:02 +03:00
Konstantin Podsvirov
2fa0439b00 Improved testing from CMake project 2015-09-15 15:01:05 +03:00
0xAAE
d41a3d630c Add GOOGLE_ATTRIBUTE_NOINLINE to GetArena() and GetMaybeArenaPointer() methods. This is to avoid "unresolved link" errors in MSVC 2015 during Release build 2015-09-15 01:46:28 +03:00
Feng Xiao
fbabf987e6 Merge pull request #769 from pkasting/metadata 
Fix compile failures building protobuf DLLs on MSVC in Chromium's cod…
 2015-09-10 12:46:21 -07:00
Feng Xiao
c8c5fed544 Merge pull request #766 from pkasting/hash 
Refine check for unordered_{map|set} availability.
 2015-09-10 12:45:22 -07:00
Feng Xiao
e61ff47ac3 Merge pull request #802 from bsilver8192/master 
Small fixes
 2015-09-08 22:23:03 -07:00
Brian Silverman
21f3d3777a Don't assume char is signed. 
It isn't always, which causes problems when trying to put negative
values into the array with C++11.
 2015-09-08 20:25:48 -04:00
Brian Silverman
133be3dc1f Use TEST_TMPDIR for writing temporary files if it's set. 
Bazel expects all tests to do this.
 2015-09-08 20:25:48 -04:00