aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch master into v3.0.0-beta-2Feng Xiao2015-12-212-4/+29
|\
| * Merge pull request #1062 from rinatz/masterFeng Xiao2015-12-181-3/+28
| |\ | | | | | | Fix static non-pod type problem with dlopen
| | * Initialize singleton instance by GoogleOnceInit()Kenichiro IDA2015-12-191-2/+24
| | |
| | * Alter FileDescriptorTables::kEmpty to GetEmptyInstance()Kenichiro IDA2015-12-171-3/+6
| | |
| * | Make ToString() valid without a type registryJon Skeet2015-12-151-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | This addresses issue #1008, by creating a JsonFormatter which is private and only different to JsonFormatter.Default in terms of reference equality. Other plausible designs: - The same, but expose the diagnostic-only formatter - Add something to settings to say "I don't have a type registry at all" - Change the behaviour of JsonFormatter.Default (bad idea IMO, as we really *don't* want the result of this used as regular JSON to be parsed) Note that just trying to find a separate fix to issue #933 and using that to override Any.ToString() differently wouldn't work for messages that *contain* an Any. Generated code changes follow in the next commit.
* | Make conformance tests build for C++ and Java.Feng Xiao2015-12-161-2/+2
| | | | | | | | Change-Id: Ibb3fe6f919cc7ca0df91da5e1697ba33d259e433
* | Remove the usage of C++11 override.Feng Xiao2015-12-141-2/+2
| | | | | | | | | | | | [skip appveyor] Change-Id: I700f70e734abb6264db29369ecf227a9e1f783e7
* | Down-integrate from internal code base.Feng Xiao2015-12-11102-2211/+6762
|/
* Merge pull request #1025 from Yangqing/masterFeng Xiao2015-12-091-47/+38
|\ | | | | Arena type traits standardization.
| * Minor changes to match the internal versionYangqing Jia2015-12-091-6/+7
| |
| * Arena type traits standardization.Yangqing Jia2015-12-051-47/+37
| | | | | | | | | | | | | | | | | | | | This is adapted from the branch of @xfxyjwf at: https://github.com/xfxyjwf/protobuf/commit/494716a682ef854168e92231a3cdcc89d587d9b9 and should solve the protobuf compilation problem against nvcc. Tested against nvcc 6.5 and 7.0.
* | Merge pull request #1033 from c0nk/wip-implicit-cast-fixFeng Xiao2015-12-091-1/+1
|\ \ | | | | | | Fix narrowing implicit cast in generated message [NFC]
| * | Fix narrowing implicit cast in generated message [NFC]Kal Conley2015-12-081-1/+1
| |/
* / Use angle bracket for well known type proto header.Bo Yang2015-12-0819-79/+91
|/
* Tweak the error message as the generate is in the core binary these days.Thomas Van Lenten2015-12-021-1/+1
|
* Fix some narrowing implicit casts [NFC]Kal Conley2015-11-282-6/+8
|
* Adds support for buliding protobuf with emscripten; we just needed the ↵Craig Donner2015-11-242-1/+5
| | | | proper platform define used in the right place.
* Tidy up reflection in advance of attempting to implement DynamicMessage.Jon Skeet2015-11-221-1/+1
| | | | | | | | | There are corner cases where MessageDescriptor.{ClrType,Parser} will return null, and these are now documented. However, normally they *should* be implemented, even for descriptors of for dynamic messages. Ditto FieldDescriptor.Accessor. We'll still need a fair amount of work to implement dynamic messages, but this change means that the public API will be remain intact. Additionally, this change starts making use of C# 6 features in the files that it touches. This is far from exhaustive, and later PRs will have more. Generated code changes coming in the next commit.
* Rename "umbrella" to "reflection" consistently.Jon Skeet2015-11-198-40/+35
| | | | This changes csharp_names.h, which will require a corresponding change in GRPC.
* Introduce a Parser property into MessageDescriptor, and populate it from ↵Jon Skeet2015-11-191-1/+1
| | | | | | generated types. Generated code coming in next commit - in a subsequent PR I want to do a bit of renaming and redocumenting around this, in anticipation of DynamicMessage.
* Merge pull request #944 from jskeet/umbrella-classnameJon Skeet2015-11-193-56/+12
|\ | | | | Change the way the "umbrella class" (descriptors) is named/namespaced
| * Change how the reflection descriptor class is generated.Jon Skeet2015-11-093-56/+12
| | | | | | | | | | Instead of having a Proto nested namespace to avoid conflicts between the descriptor-holding static class and message classes, just append "Reflection" to the name. Generated code changes (and corresponding manual changes) in following commit.
* | Reorder the checks so anything in the expected file is an implicit whitelisting.Thomas Van Lenten2015-11-171-50/+51
|/ | | | | | In the old flow, any 2 char prefix in the expected file was still generating a warning about being a poor prefix. Now we check the expected file first, so anything expected is let through.
* Stop removing all blank lines in doc comments.Jon Skeet2015-11-061-2/+18
| | | | | | This fixes issue #832. Generated code changes in next commit.
* Add support for POWER LinuxDoug Kwan2015-11-034-3/+5
|
* Fix compilation errors when built internally.Feng Xiao2015-11-023-3/+4
| | | | | | | | 1. mathlimits.h must be included before the inclusion of cmath (which gtest/gtest.h seems to include). 2. hash function for StringPiece doesn't work. Change-Id: I358a25d941a25b10b39fe76780eda41557699811
* Correct spellingBenjamin Barenblat2015-10-307-7/+7
|
* Get VS 2015 to use const int definitionsBruce Dawson2015-10-297-70/+72
| | | | | | | | | | | | | | | | | | VC++ up to VS 2015 RTM does not require explicit storage allocation for static const integers declared in classes. VS 2015 Update 1 requires these storage definitions in some cases. It's unclear exactly what cases - simple tests work with and without the explicit storage allocation. Many previous versions of VC++ have theoretically *allowed* a definition to supply storage, but tests on VC++ 2013 show that this doesn't actually work correctly - it leads to duplicate definition errors in Chromium. So, the change is scoped to VS 2015 only. This change also updates the generated files to match the new generator. TL;DR - this change is necessary in order for Chromium to build with VS 2015 Update 1.
* Merge pull request #908 from jskeet/oneof-equalityJan Tattermusch2015-10-241-0/+8
|\ | | | | Use oneof case in equality tests
| * Include the oneof-case in equality and hash code generated code.Jon Skeet2015-10-241-0/+8
| | | | | | | | The included C# test will fail until the regenerated code is used, which is in the next commit.
* | Change the #include for any.h to use angle brackets instead of quotes, to be ↵Matthew Wu2015-10-221-1/+1
|/ | | | consistent with other protobuf library includes.
* Merge pull request #783 from podsvirov/topic-cmake-projectFeng Xiao2015-10-161-3/+5
|\ | | | | Improved CMake project
| * Simplify testing from CMake project to "check" targetKonstantin Podsvirov2015-09-171-6/+4
| |
| * Improved testing from CMake projectKonstantin Podsvirov2015-09-151-0/+4
| |
* | Merge pull request #824 from jtattermusch/expose_get_output_fileJan Tattermusch2015-10-144-39/+58
|\ \ | | | | | | Expose GetOutputFile in csharp_names.h
| * | expose GetOutputFile in csharp_names.hJan Tattermusch2015-09-234-39/+58
| | |
* | | Merge pull request #875 from tkarls/return_correct_bool_type_from_mapFeng Xiao2015-10-131-1/+1
|\ \ \ | | | | | | | | Changed return type from int32 to bool in function returning a bool
| * | | Changed return type from int32 to bool in function returning a boolThomas Karlsson2015-10-131-1/+1
| | | |
* | | | Changed argument typ to uint32 in set function that sets an uint32 valueThomas Karlsson2015-10-131-1/+1
|/ / /
* | | 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
| | | |
* | | | 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*
* | | | Remove duplicated header fileJisi Liu2015-10-061-218/+0
| | | |
* | | | 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-0525-35/+282
|\ \ \ \
| * | | | First pass at generating XML documentation from .proto comments.Jon Skeet2015-10-0112-1/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Fix typo in oneof case enum commentJon Skeet2015-09-301-1/+1
| | | | |
| * | | | Move the summary comments above the attributes.Jon Skeet2015-09-292-9/+9
| | | | | | | | | | | | | | | | | | | | (Generated code changes coming next...)
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-26 05:07:48 +0000