aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/descriptor.cc
Commit message (Collapse)AuthorAge
* Merge 3.2.x branch into master (#2648)Gravatar Paul Yang2017-01-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Down-integrate internal changes to github. * Update conformance test failure list. * Explicitly import used class in nano test to avoid random test fail. * Update _GNUC_VER to use the correct implementation of atomic operation on Mac. * maps_test.js: check whether Symbol is defined before using it (#2524) Symbol is not yet available on older versions of Node.js and so this test fails with them. This change just directly checks whether Symbol is available before we try to use it. * Added well_known_types_embed.cc to CLEANFILES so that it gets cleaned up * Updated Makefile.am to fix out-of-tree builds * Added Bazel genrule for generating well_known_types_embed.cc In pull request #2517 I made this change for the CMake and autotools builds but forgot to do it for the Bazel build. * Update _GNUC_VER to use the correct implementation of atomic operation on Mac. * Add new js file in extra dist. * Bump version number to 3.2.0 * Fixed issue with autoloading - Invalid paths (#2538) * PHP fix int64 decoding (#2516) * fix int64 decoding * fix int64 decoding + tests * Fix int64 decoding on 32-bit machines. * Fix warning in compiler/js/embed.cc embed.cc: In function ‘std::string CEscape(const string&)’: embed.cc:51:32: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] for (int i = 0; i < str.size(); ++i) { ^ * Fix include in auto-generated well_known_types_embed.cc Restore include style fix (e3da722) that has been trampled by auto-generation of well_known_types_embed.cc * Fixed cross compilations with the Autotools build Pull request #2517 caused cross compilations to start failing, because the js_embed binary was being built to run on the target platform instead of on the build machine. This change updates the Autotools build to use the AX_PROG_CXX_FOR_BUILD macro to find a suitable compiler for the build machine and always use that when building js_embed. * Minor fix for autocreated object repeated fields and maps. - If setting/clearing a repeated field/map that was objects, check the class before checking the autocreator. - Just to be paranoid, don’t mutate within copy/mutableCopy for the autocreated classes to ensure there is less chance of issues if someone does something really crazy threading wise. - Some more tests for the internal AutocreatedArray/AutocreatedDictionary classes to ensure things are working as expected. - Add Xcode 8.2 to the full_mac_build.sh supported list. * Fix generation of extending nested messages in JavaScript (#2439) * Fix generation of extending nested messages in JavaScript * Added missing test8.proto to build * Fix generated code when there is no namespace but there is enum definition. * Decoding unknown field should succeed. * Add embed.cc in src/Makefile.am to fix dist check. * Fixed "make distcheck" for the Autotools build To make the test pass I needed to fix out-of-tree builds and update EXTRA_DIST and CLEANFILES. * Remove redundent embed.cc from src/Makefile.am * Update version number to 3.2.0-rc.1 (#2578) * Change protoc-artifacts version to 3.2.0-rc.1 * Update version number to 3.2.0rc2 * Update change logs for 3.2.0 release. * Update php README * Update upb, fixes some bugs (including a hash table problem). (#2611) * Update upb, fixes some bugs (including a hash table problem). * Ruby: added a test for the previous hash table corruption. Verified that this triggers the bug in the currently released version. * Ruby: bugfix for SEGV. * Ruby: removed old code for dup'ing defs. * Reverting deployment target to 7.0 (#2618) The Protobuf library doesn’t require the 7.1 deployment target so reverting it back to 7.0 * Fix typo that breaks builds on big-endian (#2632) * Bump version number to 3.2.0
* Allow OneofOptions to be extended in proto3.Gravatar Jie Luo2017-01-25
|
* Integrated internal changes from GoogleGravatar Adam Cozzette2016-11-17
|
* Do strict enum name checking only for proto3Gravatar Adam Cozzette2016-10-10
| | | | | | | | There seem to already be .proto files out there that have conflicting enum names, which will not be able to build successfully for some languages (like C#). To prevent this problem from spreading, let's make it an error for proto3 but just issue a warning for proto2. This fixes issue #2179.
* Integrate internal changesGravatar Bo Yang2016-10-10
|
* Integrated internal changes from GoogleGravatar Adam Cozzette2016-06-29
| | | | This includes all internal changes from around May 20 to now.
* Down integrate from Google internal.Gravatar Jisi Liu2016-04-28
|
* Merge branch master into v3.0.0-beta-2Gravatar Feng Xiao2015-12-21
|\
| * Initialize singleton instance by GoogleOnceInit()Gravatar Kenichiro IDA2015-12-19
| |
| * Alter FileDescriptorTables::kEmpty to GetEmptyInstance()Gravatar Kenichiro IDA2015-12-17
| |
* | Down-integrate from internal code base.Gravatar Feng Xiao2015-12-11
|/
* Get VS 2015 to use const int definitionsGravatar Bruce Dawson2015-10-29
| | | | | | | | | | | | | | | | | | 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.
* Down-integrate from google internal.Gravatar Jisi Liu2015-10-05
|
* Down-integrate from google3.Gravatar Feng Xiao2015-08-22
|
* down-integrate internal changesGravatar Bo Yang2015-05-21
|
* Down integrate from Google internal branch for C++ and Java.Gravatar Jisi Liu2015-02-28
| | | | | | | | - Maps for C++ lite - C++ Arena optimizations. - Java Lite runtime code size optimization. Change-Id: I7537a4357c1cb385d23f9e8aa7ffdfeefe079f13
* Delete some globals in ShutdownProtobufLibrary().Gravatar Feng Xiao2014-12-03
|
* Get rid of some build warnings.Gravatar Feng Xiao2014-12-02
|
* Down-integrate from internal code base.Gravatar Feng Xiao2014-11-20
|
* Down-integrate from internal code base (C++ maps support).Gravatar Feng Xiao2014-11-14
|
* Merge branch 'typofixes-vlajos-20141108' of ↵Gravatar Feng Xiao2014-11-11
|\ | | | | | | | | | | | | https://github.com/vlajos/protobuf into typo Conflicts: src/google/protobuf/compiler/java/java_file.cc
* | Down-integrate from internal code base.Gravatar Feng Xiao2014-11-10
| |
| * typo fixes - https://github.com/vlajos/misspell_fixerGravatar Veres Lajos2014-11-08
|/
* Replace links to code.google.com/protobuf with ↵Gravatar Feng Xiao2014-10-01
| | | | developers.google.com/protocol-buffers
* add #ifdef _MSC_VERGravatar jieluo@google.com2014-08-01
|
* change some files to pass MSVC 2013Gravatar jieluo@google.com2014-07-31
|
* delete unused variableGravatar jieluo@google.com2014-07-18
|
* 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
|
* Replace kEmptyString wth OnceInit initialized string*Gravatar xiaofeng@google.com2014-02-13
|
* Generate a warning for duplicated enum values, when allow_alias option isn'tGravatar liujisi@google.com2012-12-28
| | | | set.
* Make custom option able to work for -f-no-rtti; Fix remaining death tests ↵Gravatar liujisi@google.com2012-12-05
| | | | for gtest 1.6
* Use string::size_type instead of int for results of string.find() etc. -- ↵Gravatar xiaofeng@google.com2012-09-27
| | | | patch from hans
* Down-integrate from internal branchGravatar xiaofeng@google.com2012-09-22
|
* Add an intermediate method to propagate the friendship access to nested ↵Gravatar liujisi@google.com2011-02-07
| | | | classes as a workaround for old compilers (e.g. gcc 3.4)
* Submit recent changes from internal branch. See CHANGES.txt for more details.Gravatar liujisi@google.com2010-11-02
|
* Allow services with lite runtime when using rpc generator plugin.Gravatar kenton@google.com2010-04-19
|
* Fix build on MinGW/Win32 (including implementing Subprocess using ↵Gravatar kenton@google.com2009-12-19
| | | | CreateProcess()).
* Ensure that 'once' objects are declared using the macro. This is either the ↵Gravatar temporal2009-12-18
| | | | third or fourth time I've screwed this up when down-integrating, because our internal code does not require the macro (it's not portable) and on Linux a pthread_once_t that is zero-initialized just happens to work. So, I only discover the problem when I test on Mac, then kick myself for making the same mistake yet again. No more! This time, I have renamed GoogleOnceType to ProtobufOnceType, thus making the type name differ from our internal code. As a result, if you don't update the decls to use the macros, they won't compile. Hah! Take that, future self!
* Massive roll-up of changes. See CHANGES.txt.Gravatar kenton@google.com2009-12-18
|
* Use the nice macro to declare once-init control objects, like good little ↵Gravatar temporal2009-08-01
| | | | coders should. Otherwise the initialization routines never run on Mac. TODO: Investigate how this was broken.
* Submit recent changes from internal branch, including "lite mode" forGravatar kenton@google.com2009-07-29
| | | | | C++ and Java. See CHANGES.txt for more details.
* Provide ShutdownProtobufLibrary() which frees all startup-allocated objects.Gravatar kenton@google.com2009-05-06
|
* Integrate recent changes from Google-internal code tree. See CHANGES.txtGravatar kenton@google.com2009-04-25
| | | | | for details.
* Push out changes from internal codebase.Gravatar kenton@google.com2009-01-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All Languages * Repeated fields of primitive types (types other that string, group, and nested messages) may now use the option [packed = true] to get a more efficient encoding. In the new encoding, the entire list is written as a single byte blob using the "length-delimited" wire type. Within this blob, the individual values are encoded the same way they would be normally except without a tag before each value (thus, they are tightly "packed"). C++ * UnknownFieldSet now supports STL-like iteration. * Message interface has method ParseFromBoundedZeroCopyStream() which parses a limited number of bytes from an input stream rather than parsing until EOF. Java * Fixed bug where Message.mergeFrom(Message) failed to merge extensions. * Message interface has new method toBuilder() which is equivalent to newBuilderForType().mergeFrom(this). * All enums now implement the ProtocolMessageEnum interface. * Setting a field to null now throws NullPointerException. * Fixed tendency for TextFormat's parsing to overflow the stack when parsing large string values. The underlying problem is with Java's regex implementation (which unfortunately uses recursive backtracking rather than building an NFA). Worked around by making use of possesive quantifiers. Python * Updated RPC interfaces to allow for blocking operation. A client may now pass None for a callback when making an RPC, in which case the call will block until the response is received, and the response object will be returned directly to the caller. This interface change cannot be used in practice until RPC implementations are updated to implement it.
* 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.
* Support HP C++ on Tru64.Gravatar kenton@google.com2008-11-14
| | | | | Patch (mostly) by Vincent Choinière <Choiniere.Vincent@hydro.qc.ca>.
* Simplify some template usage so that older compilers can handle it. (UsersGravatar kenton@google.com2008-11-06
| | | | | report that MSVC 2003 in particular needs this change.)
* * Fixed template specialization syntax that MSVC 2005 didn't like. Not sure ifGravatar kenton@google.com2008-10-03
| | | | | | it was valid or not. * Moved UTF-8 coding directive to the right place in reflection_test.py.
* 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