Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Down-integrate from google3. | Josh Haberman | 2018-09-04 | 1 | -48/+25 |
| | |||||
* | Down-integrate from google3. | Feng Xiao | 2018-08-08 | 1 | -43/+38 |
| | |||||
* | Merge pull request #4882 from google/3.6.x | Adam Cozzette | 2018-07-09 | 1 | -2/+18 |
|\ | | | | | Merge 3.6.x into master | ||||
| * | Fix initialization with Visual Studio | Adam Cozzette | 2018-07-06 | 1 | -2/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 branch '3.6.x' into merge-3-6-x | Adam Cozzette | 2018-06-25 | 1 | -0/+9 |
|\| | |||||
| * | Work around MSVC issue with std::atomic initialization (#4777) | Adam Cozzette | 2018-06-18 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | | | * Work around MSVC issue with std::atomic initialization MSVC seems to have a bug where it does not use constant initialization for std::atomic, which ends up causing crashes during initialization. This change introduces a workaround by putting the std::atomic inside a union, which causes the compiler to use constant initialization for it. * Added an AppVeyor test for static linking with MSVC | ||||
* | | Fix parameters declaration | vervaekejonathan | 2018-06-22 | 1 | -2/+2 |
|/ | |||||
* | Fixes MSVC compiler warning C4800 "Forcing value to bool 'true' or 'false'" ↵ | Alexey Malov | 2018-03-26 | 1 | -1/+1 |
| | | | | (#4350) | ||||
* | Integrated internal changes from Google | Adam Cozzette | 2018-03-13 | 1 | -21/+51 |
| | |||||
* | Integrated internal changes from Google | Adam Cozzette | 2017-12-01 | 1 | -0/+16 |
| | |||||
* | Merge from google internal | Jisi Liu | 2017-10-18 | 1 | -0/+39 |
| | |||||
* | Merge from master | Jisi Liu | 2017-07-25 | 1 | -1/+1 |
| | |||||
* | Merge from Google internal for 3.4 release | Jisi Liu | 2017-07-18 | 1 | -100/+151 |
| | |||||
* | Add include for INT_MAX | Feng Xiao | 2017-04-08 | 1 | -0/+1 |
| | |||||
* | Fix MSVC DLL build. | Feng Xiao | 2017-03-30 | 1 | -1/+1 |
| | |||||
* | Down-integrate from google3. | Feng Xiao | 2017-03-29 | 1 | -4/+52 |
| | |||||
* | Define LANG_CXX11 for port.h and use this to guard C++11 features. | Chris Kennelly | 2016-12-14 | 1 | -2/+2 |
| | |||||
* | Export symbols used in inline functions | Julien Brianceau | 2016-12-07 | 1 | -1/+1 |
| | | | | | fixed_address_empty_string symbol is used in an inline function. We have to export it to avoid undefined reference link errors. | ||||
* | Integrated internal changes from Google | Adam Cozzette | 2016-11-17 | 1 | -4/+16 |
| | |||||
* | Fix default instance destructor | Jisi Liu | 2016-10-10 | 1 | -0/+6 |
| | |||||
* | Integrate internal changes | Bo Yang | 2016-10-10 | 1 | -14/+50 |
| | |||||
* | Add missing LIBPROTOBUF_EXPORT. | Feng Xiao | 2016-07-13 | 1 | -3/+4 |
| | |||||
* | Integrate from internal code base. | Feng Xiao | 2016-07-13 | 1 | -1/+5 |
| | |||||
* | Add GOOGLE_ prefix before PROTOBUF_DEPRECATED_ATTR | Bo Yang | 2016-06-07 | 1 | -1/+1 |
| | |||||
* | Down integrate from Google internal. | Jisi Liu | 2016-04-28 | 1 | -1/+3 |
| | |||||
* | Move StringSpaceUsedIncludingSelf to lite library. | Peter Kasting | 2015-08-27 | 1 | -6/+0 |
| | | | | | | | | | This came up because Chromium downstream modifies the lite library in a way that requires this function, but I'm upstreaming it because based on the comments in repeated_field.h, this ought to allow resolution of an existing hack. I don't know enough about the protobuf code to feel confident trying to resolve this hack myself, so I've merely updated the TODO comments. | ||||
* | down-integrate internal changes | Bo Yang | 2015-05-21 | 1 | -0/+13 |
| | |||||
* | Replace links to code.google.com/protobuf with ↵ | Feng Xiao | 2014-10-01 | 1 | -1/+1 |
| | | | | developers.google.com/protocol-buffers | ||||
* | down integrate to svn | jieluo@google.com | 2014-07-18 | 1 | -4/+30 |
| | |||||
* | Replace kEmptyString wth OnceInit initialized string* | xiaofeng@google.com | 2014-02-13 | 1 | -2/+12 |
| | |||||
* | Down-integrate from internal branch | xiaofeng@google.com | 2012-09-22 | 1 | -13/+8 |
| | |||||
* | Add missing dll export macros. | liujisi@google.com | 2011-07-05 | 1 | -3/+3 |
| | |||||
* | Submit recent changes from internal branch. See CHANGES.txt for more details. | liujisi@google.com | 2010-11-02 | 1 | -2/+7 |
| | |||||
* | Fixed DLL compile under MSVC. | kenton@google.com | 2010-01-04 | 1 | -2/+2 |
| | |||||
* | Massive roll-up of changes. See CHANGES.txt. | kenton@google.com | 2009-12-18 | 1 | -3/+15 |
| | |||||
* | Submit recent changes from internal branch, including "lite mode" for | kenton@google.com | 2009-07-29 | 1 | -0/+65 |
C++ and Java. See CHANGES.txt for more details. |