aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/descriptor_database.h
Commit message (Collapse)AuthorAgeFilesLines
* Down-integrate from google3.Josh Haberman2018-09-041-42/+50
|
* Fix failing tests.Feng Xiao2018-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Fix C++ tests. * Add missing files to Makefile.am and fix distcheck in tests.sh * Remove BUILT_SOURCES from conformance/Makefile.am. * Add some missing override keyword. * Add a type cast to int64 because our StrCat() in stubs can't handle size_t. 2. Fix Java tests. * Add missing test dependency on guava in pom.xml. * Include newly referenced test data in test resources. * Manually fix map_lite_test.proto which is overwritten because it's mapped from map_test.proto in google3. * Add back "optimize_for = LITE_RUNTIME" which is still needed to keep the opensource test passing as it's still running lite tests. * Add a type cast in newBuilder() because without it the code doesn't compile with openjdk javac 1.8 (the compiler can't figure if it's the right type due to complex generic typing). 3. Fix Python tests. * Remove/replace references to <hash_map>. * Suppress more warnings in setup.py. * Replace incorrect header inclusion for google/protobuf/proto_api.h. * Add strings::EndsWith to google/protobuf/stubs/strutil.h because it's referenced in the updated python C extension code. * Replace proto2 with google::protobuf. The proto2 name is leaked to opensource because we removed the subsitition rule for proto2 namespace but only fixed C++ source code and forgot to update python C extension code.
* Down-integrate from google3.Feng Xiao2018-08-081-1/+4
|
* Add "override" for overridden virtual functionsKhuzema Pithewan2018-06-191-20/+20
| | | | | | Add "override" for overridden virtual functions. Please refer following issue for discussion on this. https://github.com/google/protobuf/issues/67
* Integrated internal changes from GoogleAdam Cozzette2018-03-131-1/+1
|
* Down-integrate from google3.Feng Xiao2017-03-291-0/+12
|
* Integrated internal changes from GoogleAdam Cozzette2016-11-171-16/+18
|
* down-integrate internal changesBo Yang2015-05-211-2/+2
|
* Replace links to code.google.com/protobuf with ↵Feng Xiao2014-10-011-1/+1
| | | | developers.google.com/protocol-buffers
* down integrate to svnjieluo@google.com2014-07-181-0/+2
|
* Down-integrate pending changes from internal repository after previous release.liujisi@google.com2014-05-281-2/+2
|
* Down-integrate from internal branchxiaofeng@google.com2012-09-221-0/+1
|
* Massive roll-up of changes. See CHANGES.txt.kenton@google.com2009-12-181-0/+4
|
* Integrate recent changes from Google-internal code tree. See CHANGES.txtkenton@google.com2009-04-251-21/+186
| | | | | for details.
* Integrate changes from internal Google-internal branch.kenton@google.com2008-09-241-10/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | General * License changed from Apache 2.0 to New BSD. * It is now possible to define custom "options", which are basically annotations which may be placed on definitions in a .proto file. For example, you might define a field option called "foo" like so: import "google/protobuf/descriptor.proto" extend google.protobuf.FieldOptions { optional string foo = 12345; } Then you annotate a field using the "foo" option: message MyMessage { optional int32 some_field = 1 [(foo) = "bar"] } The value of this option is then visible via the message's Descriptor: const FieldDescriptor* field = MyMessage::descriptor()->FindFieldByName("some_field"); assert(field->options().GetExtension(foo) == "bar"); This feature has been implemented and tested in C++ and Java. Other languages may or may not need to do extra work to support custom options, depending on how they construct descriptors. C++ * Fixed some GCC warnings that only occur when using -pedantic. * Improved static initialization code, making ordering more predictable among other things. * TextFormat will no longer accept messages which contain multiple instances of a singular field. Previously, the latter instance would overwrite the former. * Now works on systems that don't have hash_map. Python * Strings now use the "unicode" type rather than the "str" type. String fields may still be assigned ASCII "str" values; they will automatically be converted. * Adding a property to an object representing a repeated field now raises an exception. For example: # No longer works (and never should have). message.some_repeated_field.foo = 1
* Initial checkin.temporal2008-07-101-0/+183