aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Rename Preconditions to ProtoPreconditionsJon Skeet2016-02-041-2/+2
| | | | (Generated code changes in next commit.)
* Rename GeneratedCodeInfo to GeneratedClrTypeInfoJon Skeet2016-02-041-4/+4
| | | | | | | Recently, descriptor.proto gained a GeneratedCodeInfo message, which means the generated code conflicts with our type. Unfortunately this affects codegen as well, although this is a part of the public API which is very unlikely to affect hand-written code. Generated code changes in next commit.
* Integrate from google internal.Jisi Liu2016-01-298-61/+1435
| | | | | Java files are moved to un-do the hack in the prevous commit, which moved the java files to the original position for integration.
* Refactor README.md.Feng Xiao2016-01-211-0/+209
| | | | | | Move the original README.md to src since it's talking about C++ exclusively and add a more general README.md to document how to install protoc for all languages.
* Avoid upcasting uninitialized pointersBrian Silverman2016-01-201-2/+2
| | | | | | | | | | Fixes google/protobuf#693 msan flags this as being undefined behavior. I think it's triggering because the compiler has to insert a branch to avoid changing the pointer's value if it starts out NULL. I can't figure out if this is actually undefined behavior or not, but it definitely seems to be a gray area of the standard which is best avoided.
* Merge pull request #789 from motahan/solaris64_fixFeng Xiao2016-01-203-2/+7
|\ | | | | Fixing compile errors on Solaris in 64-bit mode
| * Fixing compile errors on Solaris in 64-bit modeMohamed El-Tahan2015-09-023-2/+7
| |
* | Fix compiler warning from repeated_field.hJohn Burke2016-01-191-1/+1
| |
* | Merge pull request #896 from ↵Feng Xiao2016-01-162-10/+9
|\ \ | | | | | | | | | | | | jhump/jh/fix-ioexception-vs-invalidprotobuf-exception throw IOException instead of InvalidProtocolBufferException when appropriate
| * | fully qualify invocations of static methods on GeneratedMessageJoshua Humphries2016-01-151-6/+6
| | |
| * | throw IOException instead of InvalidProtocolBufferException when appropriateJoshua Humphries2016-01-152-10/+9
| | |
* | | Make sure thatJon Skeet2016-01-151-0/+2
|/ / | | | | | | | | | | "valueField": null is parsed appropriately, i.e. that it remembers that the field is set.
* | Prohibit null values in map fieldsJon Skeet2016-01-111-2/+1
| | | | | | | | | | On deserialization, missing values for message types are replaced with a "default" message.
* | Fix appveyor build.Feng Xiao2016-01-091-1/+1
| |
* | Patch internal change 111557819.Feng Xiao2016-01-066-4/+179
| | | | | | | | | | | | | | Defer calls to mutable_unknown_fields() until it is actually required to save memory for C++ lite runtime. Change-Id: Ica9c1fd276cdb164942d1e7b6e098c83ee3ffdc5
* | Fix for Visual Studio 2008.Feng Xiao2015-12-304-35/+27
| |
* | Fix a misplaced macro.Feng Xiao2015-12-281-5/+5
| | | | | | | | Change-Id: Ife609e073bd142d328b680c753f543bb18f4f66d
* | Fix a compiler warning.Feng Xiao2015-12-281-0/+2
| | | | | | | | Change-Id: I4c4e2a4a248e4336fef735f75ff5648d8d33627e
* | Add missing files to EXTRA_DIST.Feng Xiao2015-12-285-273/+11
| | | | | | | | Also delete some unused files.
* | 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.