aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge remote-tracking branch 'origin/master' into fix-authorJisi Liu2015-10-0525-35/+282
|\ \ \
| * | | First pass at generating XML documentation from .proto comments.Jon Skeet2015-10-0112-1/+177
| * | | Fix typo in oneof case enum commentJon Skeet2015-09-301-1/+1
| * | | Move the summary comments above the attributes.Jon Skeet2015-09-292-9/+9
| * | | Added documentation to generated code.Jon Skeet2015-09-292-1/+9
| * | | Merge pull request #727 from AustinSchuh/arena_bounds_fixFeng Xiao2015-09-241-0/+3
| |\ \ \ | | |_|/ | |/| |
| | * | Handled blocks being too small in arena.ccAustin Schuh2015-08-281-0/+3
| * | | Merge pull request #785 from jskeet/csharp-directoriesJan Tattermusch2015-09-236-13/+52
| |\ \ \
| | * | | Stop adding a space to the end of lines for descriptor binary data.Jon Skeet2015-09-011-1/+1
| | * | | Specify csharp_namespace in descriptor.protoJon Skeet2015-09-012-4/+3
| | * | | Generate a directory hierarchy based on namespace (C#)Jon Skeet2015-09-012-6/+48
| | * | | Remove vestigial reference to MakeFixedTagJon Skeet2015-09-011-2/+0
| * | | | Add GOOGLE_ATTRIBUTE_NOINLINE to GetArena() and GetMaybeArenaPointer() method...0xAAE2015-09-151-0/+8
| | |_|/ | |/| |
| * | | Merge pull request #769 from pkasting/metadataFeng Xiao2015-09-101-1/+1
| |\ \ \
| | * | | Change to just not marking the class for exportPeter Kasting2015-08-273-45/+3
| | * | | Fix compile failures building protobuf DLLs on MSVC in Chromium's codebase.Peter Kasting2015-08-273-2/+44
| * | | | Merge pull request #766 from pkasting/hashFeng Xiao2015-09-101-4/+4
| |\ \ \ \
| | * | | | It helps if you write macros correctlyPeter Kasting2015-08-271-2/+2
| | * | | | Try modifying check in hopes of passing upstream buildPeter Kasting2015-08-271-2/+3
| | * | | | Review commentsPeter Kasting2015-08-271-2/+1
| | * | | | Refine check for unordered_{map|set} availability.Peter Kasting2015-08-271-4/+4
| * | | | | Don't assume char is signed.Brian Silverman2015-09-081-1/+6
| * | | | | Use TEST_TMPDIR for writing temporary files if it's set.Brian Silverman2015-09-081-0/+7
| * | | | | Rename 'BYTE_SIZE' macro to 'GOOGLE_PROTOBUF_BYTE_SIZE'kbinani2015-09-041-12/+12
| | |_|/ / | |/| | |
* / | | | Down-integrate from google internal.Jisi Liu2015-10-0562-359/+1325
|/ / / /
* | | | Merge remote-tracking branch 'origin/master' into beta-1Feng Xiao2015-08-299-96/+109
|\ \ \ \
| * \ \ \ Merge pull request #770 from pkasting/string_spaceFeng Xiao2015-08-284-19/+14
| |\ \ \ \
| | * | | | Move StringSpaceUsedIncludingSelf to lite library.Peter Kasting2015-08-274-19/+14
| | | |/ / | | |/| |
| * | | | Merge pull request #771 from pkasting/static_init_1Feng Xiao2015-08-282-63/+78
| |\ \ \ \
| | * | | | Remove a static initializer by removing a global of non-POD type.Peter Kasting2015-08-272-63/+78
| | | |/ / | | |/| |
| * | | | Merge pull request #569 from redivo/masterFeng Xiao2015-08-281-5/+5
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fix GOOGLE_PROTOBUF_ATOMICOPS_ERROR syntax errorGeorge Redivo2015-07-061-5/+5
| * | | | Merge pull request #768 from pkasting/timeFeng Xiao2015-08-281-1/+0
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Delete kNanosPerSecond from time.cc.Peter Kasting2015-08-271-1/+0
| | | |/ | | |/|
| * | | Merge pull request #746 from zmodem/fix_predict_macros2Feng Xiao2015-08-271-2/+2
| |\ \ \
| | * | | Fix the no-op definitions of GOOGLE_PREDICT_{TRUE,FALSE}Hans Wennborg2015-08-261-2/+2
| * | | | Avoid #including system headers from inside a namespace.Peter Kasting2015-08-271-6/+10
| | |/ / | |/| |
* | | | Update generated file.Feng Xiao2015-08-261-1/+0