aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/extension_set.h
Commit message (Collapse)AuthorAge
* Merge pull request #4882 from google/3.6.xGravatar Adam Cozzette2018-07-09
|\ | | | | Merge 3.6.x into master
| * Fix initialization with Visual StudioGravatar Adam Cozzette2018-07-06
| | | | | | | | | | | | | | | | | | | | | | | | It appears that Visual Studio does not work well with std::once_flag because it has a bug causing it to initialize that during dynamic initialization instead of constant initialization. This change works around the problem by using function static initializers instead. @gerben-s originally wrote this change for the Google-internal codebase but I am just cherry-picking it here. This fixes #4773.
* | Add "override" for overridden virtual functionsGravatar Khuzema Pithewan2018-06-19
|/ | | | | | 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 GoogleGravatar Adam Cozzette2018-03-13
|
* Integrated internal changes from GoogleGravatar Adam Cozzette2017-12-01
|
* Integrated internal changes from GoogleGravatar Adam Cozzette2017-09-14
|
* Merge from Google internal for 3.4 releaseGravatar Jisi Liu2017-07-18
|
* Fix MSVC DLL build.Gravatar Feng Xiao2017-03-30
|
* Down-integrate from google3.Gravatar Feng Xiao2017-03-29
|
* Integrate internal changesGravatar Bo Yang2016-10-10
|
* Fix windows build.Gravatar Feng Xiao2016-06-30
| | | | Change-Id: Ibf7d1df850f4b497303f9f617751be98327898ef
* Integrated internal changes from GoogleGravatar Adam Cozzette2016-06-29
| | | | This includes all internal changes from around May 20 to now.
* Adding back three missing export macros.Gravatar Jisi Liu2015-10-05
|
* Down-integrate from google internal.Gravatar Jisi Liu2015-10-05
|
* Merge remote-tracking branch 'origin/master' into beta-1Gravatar Feng Xiao2015-08-29
|\ | | | | | | | | Conflicts: src/google/protobuf/extension_set.h
| * Remove a static initializer by removing a global of non-POD type.Gravatar Peter Kasting2015-08-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are banned by the Google style guide, and Chromium has a hard no-new-static-initializers policy preventing updating to a new version of libprotobuf unless this is resolved. This is the first such change, I'll need to make at least one more in the future. Luckily, the protobuf source tree already has an alternative to static initializers in once.h; use that machinery instead. I defined everything in the .cc file in a blob to replace the old implementation rather than matching the .h layout precisely; let me know if a different ordering is preferred. I also eliminated the macro that used to be used here as spelling everything out only takes one additional line, and the macro didn't actually handle all details of using a particular member variable, just the declaration, so it felt a bit error-prone.
* | Down-integrate from google3.Gravatar Feng Xiao2015-08-22
|/
* down-integrate internal changesGravatar Bo Yang2015-05-21
|
* Down-integrate from internal code base.Gravatar Feng Xiao2014-11-10
|
* Change references to `vector` to use `std::vector`Gravatar Fabrice de Gans-Riberi2014-11-03
| | | | | Upstreaming patch used by Chromium in https://codereview.chromium.org/693773003/
* InitializeDefaultRepeatedFields() allocates memory but does not release it.Gravatar Antoni Buszta2014-10-08
|
* Replace links to code.google.com/protobuf with ↵Gravatar Feng Xiao2014-10-01
| | | | developers.google.com/protocol-buffers
* down integrate to svnGravatar jieluo@google.com2014-07-18
|
* Down-integrate pending changes from internal repository after previous release.Gravatar liujisi@google.com2014-05-28
|
* Fix issue 445, issue 449Gravatar xiaofeng@google.com2013-02-07
|
* Down-integrate from internal branchGravatar xiaofeng@google.com2012-09-22
|
* Submit recent changes from internal branch. See CHANGES.txt for more details.Gravatar liujisi@google.com2010-11-02
|
* Monty Taylor claims this helps the drizzle compile for some reason.Gravatar kenton@google.com2010-01-05
|
* Fixed DLL compile under MSVC.Gravatar kenton@google.com2010-01-04
|
* Hopefully fix build on Sun Studio.Gravatar kenton@google.com2009-12-22
|
* Massive roll-up of changes. See CHANGES.txt.Gravatar kenton@google.com2009-12-18
|
* Silence pedantic warning about unused parameter.Gravatar kenton@google.com2009-08-07
|
* Fix compile for GCC 3.4.4.Gravatar kenton@google.com2009-08-01
|
* Submit recent changes from internal branch, including "lite mode" forGravatar kenton@google.com2009-07-29
| | | | | C++ and Java. See CHANGES.txt for more details.
* Add Swap(), SwapElements(), and RemoveLast() to Reflection. Patch by Scott ↵Gravatar kenton@google.com2009-06-25
| | | | Stafford.
* Make building libprotobuf as a DLL work again.Gravatar kenton@google.com2009-04-28
|
* Update MSVC project files for rev 120, and add instructions for compiling ↵Gravatar kenton@google.com2009-04-27
| | | | with zlib.
* Integrate recent changes from Google-internal code tree. See CHANGES.txtGravatar kenton@google.com2009-04-25
| | | | | for details.
* Integrate changes from internal code.Gravatar kenton@google.com2008-11-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | protoc * Enum values may now have custom options, using syntax similar to field options. * Fixed bug where .proto files which use custom options but don't actually define them (i.e. they import another .proto file defining the options) had to explicitly import descriptor.proto. * Adjacent string literals in .proto files will now be concatenated, like in C. C++ * Generated message classes now have a Swap() method which efficiently swaps the contents of two objects. * All message classes now have a SpaceUsed() method which returns an estimate of the number of bytes of allocated memory currently owned by the object. This is particularly useful when you are reusing a single message object to improve performance but want to make sure it doesn't bloat up too large. * New method Message::SerializeAsString() returns a string containing the serialized data. May be more convenient than calling SerializeToString(string*). * In debug mode, log error messages when string-type fields are found to contain bytes that are not valid UTF-8. * Fixed bug where a message with multiple extension ranges couldn't parse extensions. * Fixed bug where MergeFrom(const Message&) didn't do anything if invoked on a message that contained no fields (but possibly contained extensions). * Fixed ShortDebugString() to not be O(n^2). Durr. * Fixed crash in TextFormat parsing if the first token in the input caused a tokenization error. Java * New overload of mergeFrom() which parses a slice of a byte array instead of the whole thing. * New method ByteString.asReadOnlyByteBuffer() does what it sounds like. * Improved performance of isInitialized() when optimizing for code size. Python * Corrected ListFields() signature in Message base class to match what subclasses actually implement. * Some minor refactoring.
* Integrate changes from internal Google-internal branch.Gravatar kenton@google.com2008-09-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
* Integrate recent changes from google3.Gravatar temporal2008-08-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | protoc - New flags --encode and --decode can be used to convert between protobuf text format and binary format from the command-line. - New flag --descriptor_set_out can be used to write FileDescriptorProtos for all parsed files directly into a single output file. This is particularly useful if you wish to parse .proto files from programs written in languages other than C++: just run protoc as a background process and have it output a FileDescriptorList, then parse that natively. C++ - Reflection objects are now per-class rather than per-instance. To make this possible, the Reflection interface had to be changed such that all methods take the Message instance as a parameter. This change improves performance significantly in memory-bandwidth-limited use cases, since it makes the message objects smaller. Note that source-incompatible interface changes like this will not be made again after the library leaves beta. Python - MergeFrom(message) and CopyFrom(message) are now implemented. - SerializeToString() raises an exception if the message is missing required fields. - Code organization improvements. - Fixed doc comments for RpcController and RpcChannel, which had somehow been swapped.
* Initial checkin.Gravatar temporal2008-07-10