aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* Stop removing all blank lines in doc comments.Jon Skeet2015-11-061-2/+18
* Add support for POWER LinuxDoug Kwan2015-11-034-3/+5
* Fix compilation errors when built internally.Feng Xiao2015-11-023-3/+4
* Correct spellingBenjamin Barenblat2015-10-307-7/+7
* Get VS 2015 to use const int definitionsBruce Dawson2015-10-297-70/+72
* Merge pull request #908 from jskeet/oneof-equalityJan Tattermusch2015-10-241-0/+8
|\
| * Include the oneof-case in equality and hash code generated code.Jon Skeet2015-10-241-0/+8
* | Change the #include for any.h to use angle brackets instead of quotes, to be ...Matthew Wu2015-10-221-1/+1
|/
* Merge pull request #783 from podsvirov/topic-cmake-projectFeng Xiao2015-10-161-3/+5
|\
| * Simplify testing from CMake project to "check" targetKonstantin Podsvirov2015-09-171-6/+4
| * Improved testing from CMake projectKonstantin Podsvirov2015-09-151-0/+4
* | Merge pull request #824 from jtattermusch/expose_get_output_fileJan Tattermusch2015-10-144-39/+58
|\ \
| * | expose GetOutputFile in csharp_names.hJan Tattermusch2015-09-234-39/+58
* | | Merge pull request #875 from tkarls/return_correct_bool_type_from_mapFeng Xiao2015-10-131-1/+1
|\ \ \
| * | | Changed return type from int32 to bool in function returning a boolThomas Karlsson2015-10-131-1/+1
* | | | Changed argument typ to uint32 in set function that sets an uint32 valueThomas Karlsson2015-10-131-1/+1
|/ / /
* | | Merge pull request #815 from TeBoring/third-partyPaul Yang2015-10-0915-348/+37
|\ \ \
| * | | Down-integrate internal bug fixing changes.Bo Yang2015-10-0415-348/+37
* | | | Use static castHamdi Sahloul2015-10-091-1/+1
* | | | VS2010 compatibility of address initalizationHamdi Sahloul2015-10-091-1/+1
* | | | Remove duplicated header fileJisi Liu2015-10-061-218/+0
* | | | fix stringpiece test to use portable hash set.Jisi Liu2015-10-051-1/+1
* | | | Adding back three missing export macros.Jisi Liu2015-10-051-3/+3