aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add support for arguments.Matthew Valimaki2015-10-131-1/+13
| | | | | | Support curl -s argument. Signed-off-by: Matthew Valimaki <matthew.valimaki@gmail.com>
* Merge pull request #815 from TeBoring/third-partyPaul Yang2015-10-0915-348/+37
|\ | | | | Use std::get where it's available
| * Down-integrate internal bug fixing changes.Bo Yang2015-10-0415-348/+37
| |
* | Merge pull request #822 from podsvirov/topic-cmake-readmeFeng Xiao2015-10-091-76/+272
|\ \ | | | | | | Update cmake/README.md for #783 PR
| * | Update cmake/README.md for #783 PRKonstantin Podsvirov2015-10-091-76/+272
|/ /
* | Merge pull request #866 from Sahloul/patch-1Feng Xiao2015-10-081-1/+1
|\ \ | | | | | | VS2010 compatibility of address initalization
| * | Use static castHamdi Sahloul2015-10-091-1/+1
| | | | | | | | | Used static cast to improve initalization compatibility with MSVC2010
| * | VS2010 compatibility of address initalizationHamdi Sahloul2015-10-091-1/+1
| | | | | | | | | VS2010 cannot compile json_util_test.cc since it assumes NULL as a zero (int), and therefore cannot convert into to char*
* | | Merge pull request #856 from mzhaom/bazel-buildJisi Liu2015-10-081-0/+1
|\ \ \ | |/ / |/| | Add missing csharp_doc_comment.cc to protoc_lib.
| * | Add missing csharp_doc_comment.cc to protoc_lib.Ming Zhao2015-10-071-0/+1
|/ /
* | Merge pull request #846 from jskeet/tostringJon Skeet2015-10-075-115/+203
|\ \ | | | | | | Support ToString in RepeatedField and MapField.
| * | Support ToString in RepeatedField and MapField.Jon Skeet2015-10-015-115/+203
| | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #860 from pherl/masterJisi Liu2015-10-071-8/+10
|\ \ \ | | | | | | | | Generate well known types for python.
| * | | add complete WKT for python.Jisi Liu2015-10-061-4/+8
| | | |
| * | | Generate well known types for python.Jisi Liu2015-10-061-8/+6
|/ / /
* | | Merge pull request #849 from pherl/masterJisi Liu2015-10-06107-878/+3322
|\ \ \ | | | | | | | | Integrate google internal changes.
| * | | Remove duplicated header fileJisi Liu2015-10-061-218/+0
| | | |
| * | | Revert unwanted changes.Jisi Liu2015-10-062-35/+35
| | | |
| * | | remove extra collection importJisi Liu2015-10-061-1/+0
| | | |
| * | | disable tests for python-cpp under py26 as well.Jisi Liu2015-10-062-3/+4
| | | |
| * | | disable py2.6 tests for json_format_testJisi Liu2015-10-052-2/+4
| | | |
| * | | Revert back changes to import unittest2 for py26Jisi Liu2015-10-0516-26/+64
| | | |
| * | | make the python json test less strict on expected errors.Jisi Liu2015-10-051-5/+5
| | | |
| * | | fix stringpiece test to use portable hash set.Jisi Liu2015-10-051-1/+1
| | | |
| * | | Adding back three missing export macros.Jisi Liu2015-10-051-3/+3
| | | |
| * | | Merge remote-tracking branch 'origin/master' into fix-authorJisi Liu2015-10-0586-2090/+4997
| |\ \ \
| * | | | Down-integrate from google internal.Jisi Liu2015-10-05112-962/+3562
| | | | |
* | | | | Merge pull request #837 from mzhaom/bazel-javaJisi Liu2015-10-051-1/+22
|\ \ \ \ \ | |_|/ / / |/| | | | Add "java_proto" target in bazel BUILD file to provide Java runtime library.
| * | | | Add "java_proto" target in bazel BUILD file to provide Java runtimeMing Zhao2015-09-291-1/+22
| | | | | | | | | | | | | | | | | | | | library.
* | | | | Merge pull request #845 from jskeet/xmldocsJan Tattermusch2015-10-0532-1/+2123
|\ \ \ \ \ | | | | | | | | | | | | Extract XML documentation in a primitive but reasonably-effective way
| * | | | | Generated code from previous commit.Jon Skeet2015-10-0119-0/+1945
| | | | | |
| * | | | | First pass at generating XML documentation from .proto comments.Jon Skeet2015-10-0113-1/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge pull request #843 from thomasvl/objcpp_enum_fwd_declPaul Yang2015-10-015-6/+92
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Support enum forward decls in Objective C++
| * | | | | Support enum forward decls in Objective C++Thomas Van Lenten2015-10-015-6/+92
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge pull request #841 from thomasvl/newer_xcodesPaul Yang2015-09-3015-1208/+1216
|\ \ \ \ \ | |/ / / / |/| | | | Cleanups for newer Xcodes
| * | | | Cleanups for newer XcodesThomas Van Lenten2015-09-2915-1208/+1216
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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.
* | | | Merge pull request #834 from jskeet/docfixesJon Skeet2015-09-3023-5/+75
|\ \ \ \ | | | | | | | | | | Add (some) XML documentation to generated code
| * | | | Fix typo in oneof case enum commentJon Skeet2015-09-306-10/+10
| | | | |
| * | | | Generated code changes for previous commit.Jon Skeet2015-09-2919-34/+34
| | | | |
| * | | | Move the summary comments above the attributes.Jon Skeet2015-09-292-9/+9
| | | | | | | | | | | | | | | | | | | | (Generated code changes coming next...)
| * | | | Generated code for previous commitJon Skeet2015-09-2919-0/+62
| | | | |
| * | | | Added documentation to generated code.Jon Skeet2015-09-294-3/+11
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge pull request #836 from jcanizales/fix-version-numberPaul Yang2015-09-291-1/+1
|\ \ \ \ | | | | | | | | | | Fix Podspec version number
| * | | | Fix Podspec version numberJorge Canizales2015-09-291-1/+1
| |/ / / | | | | | | | | This was released as `3.0.0-alpha-4.1`
* | | | Merge pull request #831 from haberman/ruby-tinyfixJoshua Haberman2015-09-292-2/+7
|\ \ \ \ | |/ / / |/| | | A very small fix to silence some warnings.
| * | | A very small fix to silence some warnings.Josh Haberman2015-09-282-2/+7
|/ / / | | | | | | | | | | | | | | | | | | Also updated the Gemfile.lock since alpha-4 has been pushed to RubyGems. Change-Id: I8ddc5f125f28aa9a33c88dfe48251a75a877e1d3
* | | Merge pull request #727 from AustinSchuh/arena_bounds_fixFeng Xiao2015-09-241-0/+3
|\ \ \ | | | | | | | | Handled blocks being too small in arena.cc
| * | | Handled blocks being too small in arena.ccAustin Schuh2015-08-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | When the user passed in a block which was smaller than the Block structure, this code would blow past the end of the memory and crash. Check for that condition.
* | | | Merge pull request #785 from jskeet/csharp-directoriesJan Tattermusch2015-09-2326-762/+1095
|\ \ \ \ | | | | | | | | | | Generate C# directory hierarchy with new option
| * | | | Regenerated code. Most changes are whitespace, removing trailing spaces.Jon Skeet2015-09-0119-741/+1033
| | | | | | | | | | | | | | | | | | | | Other changes are due to the well-known types changing without us regenerating.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-04 23:14:15 +0000