aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1144 from dongjoon-hyun/remove_redundant_theJoshua Haberman2016-02-114-5/+5
|\
| * Remove redundant `the` in comments.Dongjoon Hyun2016-02-034-5/+5
* | Merge pull request #1194 from Photonios/masterJoshua Haberman2016-02-116-37/+37
|\ \
| * | Fixed unused parameters and extra ';'Swen Kooij2016-01-286-37/+37
* | | Merge pull request #1217 from jhump/jh/make-warning-usefulJoshua Haberman2016-02-111-3/+3
|\ \ \
| * | | make 'no syntax' warning useful by showing which fileJoshua Humphries2016-02-061-3/+3
* | | | Merge pull request #1185 from kkm000/icl-fixJoshua Haberman2016-02-102-4/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Fix Intel compiler warnings in include files on Windowskkm2016-01-272-4/+4
| |/ /
* | | Rename Preconditions to ProtoPreconditionsJon Skeet2016-02-041-2/+2
* | | Rename GeneratedCodeInfo to GeneratedClrTypeInfoJon Skeet2016-02-041-4/+4
| |/ |/|
* | Integrate from google internal.Jisi Liu2016-01-298-61/+1435
|/
* Refactor README.md.Feng Xiao2016-01-211-0/+209
* Avoid upcasting uninitialized pointersBrian Silverman2016-01-201-2/+2
* Merge pull request #789 from motahan/solaris64_fixFeng Xiao2016-01-203-2/+7
|\
| * Fixing compile errors on Solaris in 64-bit modeMohamed El-Tahan2015-09-023-2/+7
* | Fix compiler warning from repeated_field.hJohn Burke2016-01-191-1/+1
* | Merge pull request #896 from jhump/jh/fix-ioexception-vs-invalidprotobuf-exce...Feng Xiao2016-01-162-10/+9
|\ \
| * | fully qualify invocations of static methods on GeneratedMessageJoshua Humphries2016-01-151-6/+6
| * | throw IOException instead of InvalidProtocolBufferException when appropriateJoshua Humphries2016-01-152-10/+9
* | | Make sure thatJon Skeet2016-01-151-0/+2
|/ /
* | Prohibit null values in map fieldsJon Skeet2016-01-111-2/+1
* | Fix appveyor build.Feng Xiao2016-01-091-1/+1
* | Patch internal change 111557819.Feng Xiao2016-01-066-4/+179
* | Fix for Visual Studio 2008.Feng Xiao2015-12-304-35/+27
* | Fix a misplaced macro.Feng Xiao2015-12-281-5/+5
* | Fix a compiler warning.Feng Xiao2015-12-281-0/+2
* | Add missing files to EXTRA_DIST.Feng Xiao2015-12-285-273/+11
* | Merge branch master into v3.0.0-beta-2Feng Xiao2015-12-212-4/+29
|\ \
| * \ Merge pull request #1062 from rinatz/masterFeng Xiao2015-12-181-3/+28
| |\ \
| | * | Initialize singleton instance by GoogleOnceInit()Kenichiro IDA2015-12-191-2/+24
| | * | Alter FileDescriptorTables::kEmpty to GetEmptyInstance()Kenichiro IDA2015-12-171-3/+6
| * | | Make ToString() valid without a type registryJon Skeet2015-12-151-1/+1
| |/ /
* | | Make conformance tests build for C++ and Java.Feng Xiao2015-12-161-2/+2
* | | Remove the usage of C++11 override.Feng Xiao2015-12-141-2/+2
* | | Down-integrate from internal code base.Feng Xiao2015-12-11102-2211/+6762
|/ /
* | Merge pull request #1025 from Yangqing/masterFeng Xiao2015-12-091-47/+38
|\ \
| * | Minor changes to match the internal versionYangqing Jia2015-12-091-6/+7
| * | Arena type traits standardization.Yangqing Jia2015-12-051-47/+37
* | | Merge pull request #1033 from c0nk/wip-implicit-cast-fixFeng Xiao2015-12-091-1/+1
|\ \ \
| * | | Fix narrowing implicit cast in generated message [NFC]Kal Conley2015-12-081-1/+1
| |/ /
* / / Use angle bracket for well known type proto header.Bo Yang2015-12-0819-79/+91
|/ /
* | Tweak the error message as the generate is in the core binary these days.Thomas Van Lenten2015-12-021-1/+1
* | Fix some narrowing implicit casts [NFC]Kal Conley2015-11-282-6/+8
* | Adds support for buliding protobuf with emscripten; we just needed the proper...Craig Donner2015-11-242-1/+5
* | Tidy up reflection in advance of attempting to implement DynamicMessage.Jon Skeet2015-11-221-1/+1
* | Rename "umbrella" to "reflection" consistently.Jon Skeet2015-11-198-40/+35
* | Introduce a Parser property into MessageDescriptor, and populate it from gene...Jon Skeet2015-11-191-1/+1
* | Merge pull request #944 from jskeet/umbrella-classnameJon Skeet2015-11-193-56/+12
|\ \
| * | Change how the reflection descriptor class is generated.Jon Skeet2015-11-093-56/+12
* | | Reorder the checks so anything in the expected file is an implicit whitelisting.Thomas Van Lenten2015-11-171-50/+51
|/ /