aboutsummaryrefslogtreecommitdiff
path: root/src/google
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into fixbug_enum2json2stone47742018-03-22235-12876/+13225
|\
| * 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
| | |/
* | | 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
|/ /
* | 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
* | | Fix ValidateDateTime: check day instead monthAnton Fedorov2018-01-051-2/+2
|/ /
* | Merge remote-tracking branch 'origin/3.5.x' into masterJisi Liu2018-01-031-1/+1
|\ \
| * | remove nullptrJisi Liu2018-01-021-1/+1
* | | Merge remote-tracking branch 'origin/3.5.x' into masterJisi Liu2018-01-0320-153/+301
|\| |
| * | Merge pull request #4080 from pherl/arm64Jisi Liu2017-12-201-0/+3
| |\ \
| | * | Add support for Windows ARM64 buildMiradham Kamilov2017-12-201-0/+3
| * | | Merge pull request #4072 from google/jieluoJisi Liu2017-12-194-51/+99
| |\ \ \
| | * | | Cherrypick for csharp, including:Jie Luo2017-12-194-51/+99
| * | | | Fix string::back() usage in googletest.ccJisi Liu2017-12-191-1/+1
| | |/ / | |/| |
| * | | Merge pull request #4074 from pherl/mapatJisi Liu2017-12-191-1/+1
| |\ \ \
| | * | | Replace C++11 only method std::map::atJisi Liu2017-12-191-1/+1
| | |/ /
| * / / Update version number to 3.5.1Jisi Liu2017-12-1913-13/+13
| |/ /
| * | Merge pull request #4042 from pherl/cpp_enumJisi Liu2017-12-131-9/+9
| |\ \
| | * | Use matching enum type for IsPOD.Jisi Liu2017-12-131-9/+9
| * | | Explicitly propagate the status of Flush().Jisi Liu2017-12-131-2/+2
| * | | io_win32_unittest: remove incorrect error checkLaszlo Csomor2017-12-071-3/+3
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-26 02:41:12 +0000