aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/descriptor.cc
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.
* | Merge pull request #4827 from acozzette/merge-3-6-xGravatar Adam Cozzette2018-06-25
|\ \ | | | | | | Merge 3.6.x branch into master
* \ \ Merge pull request #4608 from khuzemap/masterGravatar Feng Xiao2018-06-25
|\ \ \ | | | | | | | | Add "override" keyword for overridden virtual functions
| | * | Merge branch '3.6.x' into merge-3-6-xGravatar Adam Cozzette2018-06-25
| |/| | |/| |/
| * | 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
| | * Make sure to delete temporary maps used by FileDescriptorTablesGravatar Adam Cozzette2018-05-24
| |/ | | | | | | | | | | | | I ran the tcmalloc heap checker in draconian mode, and it reported some heap allocations that were still reachable when protobuf-test exited. To fix that, I updated FileDescriptorTables to make sure its temporary heap-allocated maps are deleted when it is destroyed.
* / Remove undefined behavior from the hash function.Gravatar Eugene Hermann2018-05-14
|/ | | | | | Signed integer overflow creates undefined behavior that may lead to unpredictable fails on different platforms. One known example of the hardware where this code did fail is Apple A6 (32-bit Apple Swift CPU) 16777619, 16777499 - two prime numbers that typically used to get better dispersion.
* source code info for interpreted options; fix source code info for extension ↵Gravatar Joshua Humphries2018-03-26
| | | | | | | | | range options (#4342) * when interpreting options, rewrite file descriptor's source code info - so that interpreted option paths have correct location information - so that corresponding uninterpreted option paths are removed also includes a fix to source code locations for extension range options
* Integrated internal changes from GoogleGravatar Adam Cozzette2018-03-13
|
* Integrated internal changes from GoogleGravatar Adam Cozzette2017-12-01
|
* Fix undefined memory management found by Clang's sanitizers.Gravatar John Millikin2017-10-16
| | | | See https://github.com/google/protobuf/issues/3752 for context.
* Integrated internal changes from GoogleGravatar Adam Cozzette2017-09-14
|
* Merge from Google internal for 3.4 releaseGravatar Jisi Liu2017-07-18
|
* Down-integrate from google3.Gravatar Feng Xiao2017-03-29
|
* 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)
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-10 02:09:10 +0000