Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Cleanups for newer Xcodes | Thomas Van Lenten | 2015-09-29 | 15 | -1208/+1216 |
* | Merge pull request #727 from AustinSchuh/arena_bounds_fix | Feng Xiao | 2015-09-24 | 1 | -0/+3 |
|\ | |||||
| * | Handled blocks being too small in arena.cc | Austin Schuh | 2015-08-28 | 1 | -0/+3 |
* | | Merge pull request #785 from jskeet/csharp-directories | Jan Tattermusch | 2015-09-23 | 26 | -762/+1095 |
|\ \ | |||||
| * | | Regenerated code. Most changes are whitespace, removing trailing spaces. | Jon Skeet | 2015-09-01 | 19 | -741/+1033 |
| * | | Stop adding a space to the end of lines for descriptor binary data. | Jon Skeet | 2015-09-01 | 1 | -1/+1 |
| * | | Specify csharp_namespace in descriptor.proto | Jon Skeet | 2015-09-01 | 2 | -4/+3 |
| * | | Generate a directory hierarchy based on namespace (C#) | Jon Skeet | 2015-09-01 | 3 | -14/+58 |
| * | | Remove vestigial reference to MakeFixedTag | Jon Skeet | 2015-09-01 | 1 | -2/+0 |
* | | | Merge pull request #813 from 0xAAE/master | Feng Xiao | 2015-09-16 | 1 | -0/+8 |
|\ \ \ | |||||
| * | | | Add GOOGLE_ATTRIBUTE_NOINLINE to GetArena() and GetMaybeArenaPointer() method... | 0xAAE | 2015-09-15 | 1 | -0/+8 |
|/ / / | |||||
* | | | Merge pull request #769 from pkasting/metadata | Feng Xiao | 2015-09-10 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Change to just not marking the class for export | Peter Kasting | 2015-08-27 | 5 | -47/+3 |
| * | | | Fix compile failures building protobuf DLLs on MSVC in Chromium's codebase. | Peter Kasting | 2015-08-27 | 5 | -2/+46 |
* | | | | Merge pull request #766 from pkasting/hash | Feng Xiao | 2015-09-10 | 1 | -4/+4 |
|\ \ \ \ | |||||
| * | | | | It helps if you write macros correctly | Peter Kasting | 2015-08-27 | 1 | -2/+2 |
| * | | | | Try modifying check in hopes of passing upstream build | Peter Kasting | 2015-08-27 | 1 | -2/+3 |
| * | | | | Review comments | Peter Kasting | 2015-08-27 | 1 | -2/+1 |
| * | | | | Refine check for unordered_{map|set} availability. | Peter Kasting | 2015-08-27 | 1 | -4/+4 |
* | | | | | Merge pull request #802 from bsilver8192/master | Feng Xiao | 2015-09-08 | 2 | -1/+13 |
|\ \ \ \ \ | |||||
| * | | | | | Don't assume char is signed. | Brian Silverman | 2015-09-08 | 1 | -1/+6 |
| * | | | | | Use TEST_TMPDIR for writing temporary files if it's set. | Brian Silverman | 2015-09-08 | 1 | -0/+7 |
|/ / / / / | |||||
* | | | | | Merge pull request #786 from pherl/master | Jisi Liu | 2015-09-08 | 1 | -0/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Update objc script in generate_descriptor_proto.sh | Jisi Liu | 2015-09-08 | 1 | -0/+5 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #796 from jcanizales/add-missing-comma | Paul Yang | 2015-09-04 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fix podspec by adding missing comma | Jorge Canizales | 2015-09-04 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #794 from jskeet/any | Jan Tattermusch | 2015-09-04 | 6 | -0/+151 |
|\ \ \ \ \ | |||||
| * | | | | | Pack/Unpack implementation for Any. | Jon Skeet | 2015-09-04 | 6 | -0/+151 |
|/ / / / / | |||||
* | | | | | Merge pull request #772 from dano/fix_scalar_map | Joshua Haberman | 2015-09-04 | 7 | -85/+167 |
|\ \ \ \ \ | |||||
| * | | | | | Fix Python 3.4 cpp implementation | Dan O'Reilly | 2015-08-31 | 7 | -85/+167 |
| |/ / / / | |||||
* | | | | | Merge pull request #793 from kbinani/fix_redefinition_BYTE_SIZE_macro | Feng Xiao | 2015-09-03 | 1 | -12/+12 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Rename 'BYTE_SIZE' macro to 'GOOGLE_PROTOBUF_BYTE_SIZE' | kbinani | 2015-09-04 | 1 | -12/+12 |
|/ / / / | |||||
* | | | | Merge remote-tracking branch 'origin/master' into beta-1 | Feng Xiao | 2015-08-29 | 9 | -96/+109 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #770 from pkasting/string_space | Feng Xiao | 2015-08-28 | 4 | -19/+14 |
| |\ \ \ \ | |||||
| | * | | | | Move StringSpaceUsedIncludingSelf to lite library. | Peter Kasting | 2015-08-27 | 4 | -19/+14 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge pull request #771 from pkasting/static_init_1 | Feng Xiao | 2015-08-28 | 2 | -63/+78 |
| |\ \ \ \ | |||||
| | * | | | | Remove a static initializer by removing a global of non-POD type. | Peter Kasting | 2015-08-27 | 2 | -63/+78 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge pull request #569 from redivo/master | Feng Xiao | 2015-08-28 | 1 | -5/+5 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | Fix GOOGLE_PROTOBUF_ATOMICOPS_ERROR syntax error | George Redivo | 2015-07-06 | 1 | -5/+5 |
| * | | | | Merge pull request #768 from pkasting/time | Feng Xiao | 2015-08-28 | 1 | -1/+0 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Delete kNanosPerSecond from time.cc. | Peter Kasting | 2015-08-27 | 1 | -1/+0 |
| | | |/ | | |/| | |||||
| * | | | Merge pull request #746 from zmodem/fix_predict_macros2 | Feng Xiao | 2015-08-27 | 1 | -2/+2 |
| |\ \ \ | |||||
| | * | | | Fix the no-op definitions of GOOGLE_PREDICT_{TRUE,FALSE} | Hans Wennborg | 2015-08-26 | 1 | -2/+2 |
| * | | | | Merge pull request #767 from pkasting/port | Feng Xiao | 2015-08-27 | 1 | -6/+10 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Avoid #including system headers from inside a namespace. | Peter Kasting | 2015-08-27 | 1 | -6/+10 |
| |/ / / | |||||
* | | | | Merge pull request #776 from haberman/pyfix | Joshua Haberman | 2015-08-29 | 1 | -15/+18 |
|\ \ \ \ | |||||
| * | | | | Fixed assignment syntax error. | Josh Haberman | 2015-08-28 | 1 | -1/+1 |
| * | | | | Fix for https://github.com/google/protobuf/issues/758 | Josh Haberman | 2015-08-28 | 1 | -14/+17 |
|/ / / / | |||||
* | | | | Merge pull request #765 from xfxyjwf/javadoc | Feng Xiao | 2015-08-27 | 4 | -24/+25 |
|\ \ \ \ | |||||
| * | | | | Fix javadoc errors. | Feng Xiao | 2015-08-27 | 4 | -24/+25 |
|/ / / / |