aboutsummaryrefslogtreecommitdiff
path: root/src/google
Commit message (Expand)AuthorAgeFilesLines
...
* | | 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
| * | | io_win32_unittest: fix condition in GetCwdAsUtf8Laszlo Csomor2017-12-071-1/+1
| * | | io_win32_unittest: use CWD as last tempdirLaszlo Csomor2017-12-071-3/+26
| * | | io_win32: add more encoding-related testsLaszlo Csomor2017-12-073-31/+89
| * | | io_win32: support non-ASCII pathsLaszlo Csomor2017-12-073-89/+176
| * | | io_win32_unittest: make //:win32_test run againLaszlo Csomor2017-12-071-49/+29
| |/ /
* | | Merge pull request #4077 from mkamilov/masterJisi Liu2017-12-201-0/+3
|\ \ \
| * | | Add support for Windows ARM64 buildMiradham Kamilov2017-12-191-0/+3
* | | | line breaks adjstedUbuntu2017-12-201-5/+12
* | | | formatting issuesUbuntu2017-12-202-8/+11
* | | | resolve issue 4032 and added a unit testUbuntu2017-12-192-1/+17
|/ / /
* | | Merge pull request #4046 from acozzette/deprecated-valueof-issue-2054Adam Cozzette2017-12-141-1/+9
|\ \ \
| * | | Generate an annotation to suppress deprecation warningsAdam Cozzette2017-12-131-1/+9
* | | | Merge pull request #4045 from pherl/deprecateJisi Liu2017-12-142-5/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Add deprecation annotation for oneof case.Jisi Liu2017-12-132-5/+7
* | | | Add auto-generated header to C# generated files (#4038)Jan Tattermusch2017-12-131-2/+4
* | | | Merge pull request #4044 from xfxyjwf/issue3268Feng Xiao2017-12-1313-39/+39
|\ \ \ \
| * | | | Update generated code.Feng Xiao2017-12-1312-36/+36
| * | | | Avoid two consecutive underscores in macro name.Feng Xiao2017-12-131-3/+3
* | | | | Merge pull request #4041 from acozzette/fix-license-issue-1775Adam Cozzette2017-12-132-1/+60
|\ \ \ \ \