aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix typo in oneof case enum commentJon Skeet2015-09-306-10/+10
* Generated code changes for previous commit.Jon Skeet2015-09-2919-34/+34
* Move the summary comments above the attributes.Jon Skeet2015-09-292-9/+9
* Generated code for previous commitJon Skeet2015-09-2919-0/+62
* Added documentation to generated code.Jon Skeet2015-09-294-3/+11
* 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-2326-762/+1095
|\ \
| * | Regenerated code. Most changes are whitespace, removing trailing spaces.Jon Skeet2015-09-0119-741/+1033
| * | 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-013-14/+58
| * | Remove vestigial reference to MakeFixedTagJon Skeet2015-09-011-2/+0
* | | Merge pull request #813 from 0xAAE/masterFeng Xiao2015-09-161-0/+8
|\ \ \
| * | | 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-275-47/+3
| * | | Fix compile failures building protobuf DLLs on MSVC in Chromium's codebase.Peter Kasting2015-08-275-2/+46
* | | | 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
* | | | | Merge pull request #802 from bsilver8192/masterFeng Xiao2015-09-082-1/+13
|\ \ \ \ \
| * | | | | 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
|/ / / / /
* | | | | Merge pull request #786 from pherl/masterJisi Liu2015-09-081-0/+5
|\ \ \ \ \
| * | | | | Update objc script in generate_descriptor_proto.shJisi Liu2015-09-081-0/+5
| | |_|/ / | |/| | |
* | | | | Merge pull request #796 from jcanizales/add-missing-commaPaul Yang2015-09-041-1/+1
|\ \ \ \ \
| * | | | | Fix podspec by adding missing commaJorge Canizales2015-09-041-1/+1
|/ / / / /
* | | | | Merge pull request #794 from jskeet/anyJan Tattermusch2015-09-046-0/+151
|\ \ \ \ \
| * | | | | Pack/Unpack implementation for Any.Jon Skeet2015-09-046-0/+151
|/ / / / /
* | | | | Merge pull request #772 from dano/fix_scalar_mapJoshua Haberman2015-09-047-85/+167
|\ \ \ \ \
| * | | | | Fix Python 3.4 cpp implementationDan O'Reilly2015-08-317-85/+167
| |/ / / /
* | | | | Merge pull request #793 from kbinani/fix_redefinition_BYTE_SIZE_macroFeng Xiao2015-09-031-12/+12
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Rename 'BYTE_SIZE' macro to 'GOOGLE_PROTOBUF_BYTE_SIZE'kbinani2015-09-041-12/+12
|/ / / /
* | | | 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
| * | | | Merge pull request #767 from pkasting/portFeng Xiao2015-08-271-6/+10
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Avoid #including system headers from inside a namespace.Peter Kasting2015-08-271-6/+10
| |/ / /
* | | | Merge pull request #776 from haberman/pyfixJoshua Haberman2015-08-291-15/+18
|\ \ \ \