aboutsummaryrefslogtreecommitdiff
path: root/src/google
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | MinGW build failedIvan Shynkarenka2018-05-021-1/+1
* | | | | typoBrady Killeen2018-04-261-1/+1
* | | | | Write messages to backing field in generated C# cloning code (#4440)Sydney Acksman2018-04-191-1/+1
* | | | | Merge pull request #4504 from xfxyjwf/liteFeng Xiao2018-04-181-0/+10
|\ \ \ \ \
| * | | | | Cleanup + documentation for Java Lite runtime.Feng Xiao2018-04-121-0/+10
* | | | | | Fixed a Visual Studio 2017 build error. (#4488)Ronny Krüger2018-04-168-20/+13
|/ / / / /
* | | | | Don't generate imports for the WKTs unless generating the WKTs.Thomas Van Lenten2018-04-024-8/+21
* | | | | Trim imports for bundled generated protos.Thomas Van Lenten2018-04-022-12/+41
* | | | | Removed atomicops.h since it is no longer usedAdam Cozzette2018-03-271-237/+0
* | | | | source code info for interpreted options; fix source code info for extension ...Joshua Humphries2018-03-264-68/+748
* | | | | Merge pull request #4431 from xfxyjwf/rmnanoFeng Xiao2018-03-2624-5807/+0
|\ \ \ \ \
| * | | | | Remove javanano.Feng Xiao2018-03-2624-5807/+0
* | | | | | Fixes MSVC compiler warning C4800 "Forcing value to bool 'true' or 'false'" (...Alexey Malov2018-03-262-2/+2
* | | | | | Merge pull request #4395 from stone4774/fixbug_enum2json2Feng Xiao2018-03-265-17/+66
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into fixbug_enum2json2stone47742018-03-22235-12876/+13225
| |\ \ \ \ \ \
| * | | | | | | Use the first enum value instead of 0 in DefaultValueObjectWriter::FindEnumDe...stone47742018-03-211-1/+1
| * | | | | | | Fix bug: whether always_print_enums_as_ints is true or false, it always print...stone47742018-03-195-17/+66
* | | | | | | | Fix missing LIBPROTOC_EXPORT.Egor Pugin2018-03-251-3/+6
| |_|/ / / / / |/| | | | | |
* | | | | | | Removed some unused C++ source filesAdam Cozzette2018-03-2220-4897/+0
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #4387 from acozzette/down-integrateAdam Cozzette2018-03-20234-12869/+13215
|\ \ \ \ \ \
| * | | | | | Removed use of some type traitsAdam Cozzette2018-03-203-5/+5
| * | | | | | Deleted scoped_ptr.hAdam Cozzette2018-03-1424-306/+47
| * | | | | | Fixed up proto3_lite_unittest.ccAdam Cozzette2018-03-141-11/+11
| * | | | | | Merge branch 'master' into down-integrateAdam Cozzette2018-03-139-12/+77
| |\| | | | |
| * | | | | | Integrated internal changes from GoogleAdam Cozzette2018-03-13212-12586/+13191
* | | | | | | Merge pull request #4371 from Rasrack/gnuc_minorAdam Cozzette2018-03-151-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix spelling error of __GNUC_MINOR__Adam Aili2018-03-101-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #4310 from KindDragon/patch-1Feng Xiao2018-03-141-6/+9
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Support using MSVC intrinsics in Log2FloorNonZeroArkady Shapkin2018-02-151-6/+9
| |/ / / / /
* | | | | | Merge pull request #4183 from pcc/win-libcxxFeng Xiao2018-02-262-2/+3
|\ \ \ \ \ \
| * | | | | | Add support for libc++ on Windows.Peter Collingbourne2018-01-172-2/+3
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #4195 from alexey-malov/IgnoreUnknownEnumsInJsonFeng Xiao2018-02-265-6/+72
|\ \ \ \ \ \
| * | | | | | The JsonParseOptions::ignore_unknown_fields option behavior treatsAlexey Malov2018-02-125-6/+72
| |/ / / / /
* | | | | | Merge pull request #4323 from dtapuska/masterFeng Xiao2018-02-201-2/+2
|\ \ \ \ \ \
| * | | | | | Rename a shadowed variable.Dave Tapuska2018-02-201-2/+2
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #3186 from gkelly/remove-unused-variableFeng Xiao2018-02-201-2/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Remove unused output_file variable from js_embedGarret Kelly2017-06-051-2/+0
* | | | | | Remove stray indent on normal imports.Thomas Van Lenten2018-02-081-2/+2
* | | | | | Remove use of GOOGLE_FALLTHROUGH_INTENDED from protobuf.Nico Weber2018-02-072-16/+1
* | | | | | Merge pull request #4239 from mrpi/masterAdam Cozzette2018-01-311-4/+2
|\ \ \ \ \ \
| * | | | | | Fix -fpermissive: '<::' cannot begin a template-argument listLudger Sprenker2018-01-301-1/+1
| * | | | | | Create std::string in Arena memoryLudger Sprenker2018-01-241-4/+2
* | | | | | | Fix to use "nil" instead of "NULL" for objc objects.Thomas Van Lenten2018-01-311-1/+1
* | | | | | | Merge pull request #4240 from davido/generate_warning_free_java_codeFeng Xiao2018-01-292-0/+30
|\ \ \ \ \ \ \
| * | | | | | | Java: Generate warning free codeDavid Ostrovsky2018-01-272-0/+30
* | | | | | | | Removed using statements from common.hAdam Cozzette2018-01-2636-148/+143
|/ / / / / / /
* / / / / / / Add an explicit import of stdatomic.h.Thomas Van Lenten2018-01-251-0/+35
|/ / / / / /
* | / / / / Migrate away from deprecated OSAtomic APIs. (#4184)Jonathan Dierksen2018-01-221-2/+3
| |/ / / / |/| | | |
* | | | | Merge pull request #4148 from datacompboy/patch-2Adam Cozzette2018-01-081-0/+53
|\ \ \ \ \
| * | | | | Update time_test.ccAnton Fedorov2018-01-051-0/+53