aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Integrate google internal changes.Jisi Liu2016-03-30145-1440/+5155
|
* Merge pull request #1260 from legrosbuffle/masterPaul Yang2016-03-021-2/+4
|\ | | | | Make cpp generated enum constants constexpr when Options::proto_h is specified
| * Make cpp generated enum constants constexpr when Options::proto_h isClement Courbet2016-02-191-2/+4
| | | | | | | | specified.
* | Fix CommonJS relative require generation, and test itmurgatroid992016-02-241-1/+15
| |
* | Merge pull request #804 from bsilver8192/masterFeng Xiao2016-02-223-0/+160
|\ \ | | | | | | Add atomics support for 32-bit PPC.
| * | Add atomics support for 32-bit PPC.Brian Silverman2015-09-093-0/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was originally submitted as a patch on the Google Code issue tracker, but the original author didn't submit a pull request. They did, however, give permission for somebody else to do so. I cleaned up a few things myself and am now submitting it. I can't find any record of what the original patch was, but there is a copy of the discussion at <https://groups.google.com/forum/#!topic/protobuf/SMwF5fYHIi0>. Fixes google/protobuf#581
* | | Merge pull request #1215 from haberman/commonjsJoshua Haberman2016-02-192-57/+236
|\ \ \ | | | | | | | | Added support for CommonJS require()
| * | | Fixed definition of extensions, and added CommonJS tests to Travis.Josh Haberman2016-02-181-1/+8
| | | |
| * | | Fixed nested message scopes for CommonJS.Josh Haberman2016-02-181-7/+5
| | | |
| * | | CommonJS tests are now passing.Josh Haberman2016-02-181-1/+5
| | | |
| * | | WIP.Josh Haberman2016-02-182-57/+227
| | |/ | |/|
* / | Support ObjC Generic CollectionsThomas Van Lenten2016-02-1818-132/+237
|/ / | | | | | | | | | | | | - Extend GPB*ObjectDictionary to support generic syntax. - Update the generator to output generics so the enclosed type is exposed for compiler checks. - Use generics in a the public interfaces. - Update the generated sources that are checked in.
* | Merge pull request #260 from ejsd1989/issue-#242Joshua Haberman2016-02-162-4/+2
|\ \ | | | | | | Removes redundant null pointer checks checks
| * | Removal of null checkeissajamil@gmail.com2015-03-291-3/+1
| | | | | | | | | | | | | | | Removed the redundant check for NULL which is already handled by using delete
| * | Removal of null checkeissajamil@gmail.com2015-03-291-1/+1
| | | | | | | | | | | | | | | Removed the redundant check for NULL which is already correctly handled by used the delete
* | | Merge pull request #1144 from dongjoon-hyun/remove_redundant_theJoshua Haberman2016-02-114-5/+5
|\ \ \ | | | | | | | | Remove redundant `the`.
| * | | Remove redundant `the` in comments.Dongjoon Hyun2016-02-034-5/+5
| | | |
* | | | Merge pull request #1194 from Photonios/masterJoshua Haberman2016-02-116-37/+37
|\ \ \ \ | | | | | | | | | | Fixed unused parameters and extra ';'
| * | | | Fixed unused parameters and extra ';'Swen Kooij2016-01-286-37/+37
| | | | |
* | | | | Merge pull request #1217 from jhump/jh/make-warning-usefulJoshua Haberman2016-02-111-3/+3
|\ \ \ \ \ | | | | | | | | | | | | make 'no syntax' warning useful by showing which file
| * | | | | make 'no syntax' warning useful by showing which fileJoshua Humphries2016-02-061-3/+3
| | | | | |
* | | | | | Merge pull request #1185 from kkm000/icl-fixJoshua Haberman2016-02-102-4/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix Intel compiler warnings in include files on Windows
| * | | | | Fix Intel compiler warnings in include files on Windowskkm2016-01-272-4/+4
| |/ / / /
* | | | | 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
|/ / / /