Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #653 from airtimemedia/master | Feng Xiao | 2015-08-03 | 8 | -13/+9 |
|\ | | | | | Various compilation fixes | ||||
| * | Move pthread include. | Tom Hughes | 2015-07-30 | 2 | -2/+4 |
| | | | | | | | | | | Based on pull request feedback. See commit 60c5222 for why the pthread header is necessary. | ||||
| * | Remove unused private fields. | Tom Hughes | 2015-07-29 | 4 | -12/+2 |
| | | | | | | | | | | Fixes compilation when -Wunused-private-field is enabled (e.g., when using -Wall). | ||||
| * | Fix compilation error when using C++11. | Tom Hughes | 2015-07-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issue occurs when the template type deduction results in NodeType being const. Shortened version of compile error: no matching function for call to 'operator new' new (p) NodeType(std::forward<Args>(args)...); candidate function not viable: no known conversion from 'const std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > *' to 'void *' for 2nd argument; take the address of the argument with & inline __attribute__ ((__visibility__("hidden"), __always_inline__)) void* operator new (std::size_t, void* __p) noexcept {return __p;} | ||||
| * | Set cmake include directories on library targets. | Tom Hughes | 2015-07-28 | 2 | -0/+2 |
| | | | | | | | | | | cmake targets that depend on these libraries will automatically have these include directories. | ||||
| * | Include pthread.h when using GOOGLE_PROTOBUF_NO_THREADLOCAL. | Tom Hughes | 2015-07-28 | 1 | -0/+2 |
| | | | | | | | | | | When GOOGLE_PROTOBUF_NO_THREADLOCAL is defined, classes that depend on pthread functions are included (such as ThreadLocalStorage). | ||||
* | | Merge pull request #681 from jskeet/json-fieldmask | Jon Skeet | 2015-08-03 | 2 | -1/+39 |
|\ \ | | | | | | | JSON formatting for FieldMask | ||||
| * | | JSON formatting for FieldMask | Jon Skeet | 2015-08-03 | 2 | -1/+39 |
| | | | |||||
* | | | Merge pull request #677 from jskeet/move-protos | Jon Skeet | 2015-08-03 | 3 | -121/+121 |
|\ \ \ | | | | | | | | | Remove a redundant layer of directory hierarchy. | ||||
| * | | | Remove a redundant layer of directory hierarchy. | Jon Skeet | 2015-08-03 | 3 | -121/+121 |
| | | | | |||||
* | | | | Merge pull request #680 from jskeet/aptca | Jon Skeet | 2015-08-03 | 1 | -0/+2 |
|\ \ \ \ | |_|/ / |/| | | | Allow partially-trusted callers again. | ||||
| * | | | Allow partially-trusted callers again. | Jon Skeet | 2015-08-03 | 1 | -0/+2 |
| |/ / | | | | | | | | | | Fixes issue #552. (And yay, it looks like our build profile supports this...) | ||||
* | | | Merge pull request #678 from jskeet/stream-ctor | Jon Skeet | 2015-08-03 | 11 | -127/+100 |
|\ \ \ | |/ / |/| | | Expose Coded*Stream constructors directly. | ||||
| * | | Expose Coded*Stream constructors directly. | Jon Skeet | 2015-08-03 | 11 | -127/+100 |
|/ / | |||||
* | | Merge pull request #675 from jtattermusch/signing | Jon Skeet | 2015-08-03 | 14 | -92/+87 |
|\ \ | | | | | | | Add ReleaseSigned configuration for C# | ||||
| * | | Update Makefile.am | Jan Tattermusch | 2015-08-02 | 1 | -2/+2 |
| | | | |||||
| * | | make changes and fixes in signing | Jan Tattermusch | 2015-08-02 | 10 | -96/+16 |
| | | | |||||
| * | | added protoc.exe and well known protobuf files to the nuspec file | Jan Tattermusch | 2015-08-02 | 1 | -1/+15 |
| | | | |||||
| * | | build signed assemblies | Jan Tattermusch | 2015-08-02 | 15 | -36/+97 |
| | | | |||||
* | | | Merge pull request #672 from jskeet/json-struct | Jon Skeet | 2015-08-03 | 2 | -3/+98 |
|\ \ \ | | | | | | | | | Formatting of Struct as JSON | ||||
| * | | | Initial pass at formatting Struct as JSON. | Jon Skeet | 2015-08-03 | 2 | -3/+98 |
|/ / / | | | | | | | | | | This seems remarkably little code, but it appears to work. I can add tests for invalid structs at some point, once the general approach is approved. | ||||
* | | | Merge pull request #671 from jskeet/json-time | Jon Skeet | 2015-08-03 | 4 | -11/+174 |
|\ \ \ | |/ / |/| | | JSON formatting for Timestamp and Duration | ||||
| * | | Addressed issues raised in code review. Will merge when green. | Jon Skeet | 2015-08-03 | 2 | -26/+18 |
| | | | |||||
| * | | Format JSON for Duration and Timestamp. | Jon Skeet | 2015-08-03 | 3 | -11/+182 |
|/ / | | | | | | | This is taking an approach of putting all the logic in JsonFormatter. That's helpful in terms of concealing the details of whether or not to wrap the value in quotes, but it does lack flexibility. I don't *think* we want to allow user-defined formatting of messages, so that much shouldn't be a problem. | ||||
* | | Merge pull request #669 from jskeet/simpify-json-tests | Jan Tattermusch | 2015-08-01 | 1 | -60/+71 |
|\ \ | | | | | | | Simpify json tests | ||||
| * | | Simplify the JSON tests for readability | Jon Skeet | 2015-07-31 | 1 | -60/+71 |
| | | | | | | | | | | | | Use ' instead of " in the expected JSON, then replace it before asserting. | ||||
* | | | Merge pull request #668 from jskeet/json_ordering | Jan Tattermusch | 2015-08-01 | 4 | -36/+353 |
|\| | | | | | | | | Fix C# JSON field ordering | ||||
| * | | Fix JSON formatting to always emit fields in field order, including oneofs | Jon Skeet | 2015-07-31 | 4 | -36/+353 |
| | | | |||||
* | | | Merge pull request #643 from yukawa/fix_win_unicode_build | Paul Yang | 2015-07-31 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix build failure on Windows when Unicode build is enabled. | ||||
| * | | | Fix build failure on Windows when Unicode build is enabled. | Yohei Yukawa | 2015-07-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow up CL for e9abc404df99ef85d3e25aaaccd4aa83e381, which breaks build when UNICODE macro is defined. protoc has explicitly called MBCS version of APIs / funcsions rather than UTF-16 (wchar_t) version of them regardless of UNICODE macro definition (and it indeed works as expected). Hence it makes sense to call GetModuleFileNameA explicitly. | ||||
* | | | | Merge pull request #667 from jskeet/fix-field-orderings | Jan Tattermusch | 2015-07-31 | 2 | -1/+14 |
|\ \ \ \ | | |/ / | |/| | | Fix trivial bug in field orderings. | ||||
| * | | | Fix trivial bug in field orderings. | Jon Skeet | 2015-07-31 | 2 | -1/+14 |
|/ / / | | | | | | | | | | (Shows the benefit of unit testing even code "too simple to fail"...) | ||||
* | | | Merge pull request #666 from jskeet/wkt-times | Jon Skeet | 2015-07-31 | 7 | -0/+563 |
|\ \ \ | | | | | | | | | Well-known type operations for Timestamp and Duration | ||||
| * | | | Well-known type operations for Timestamp and Duration (but not JSON formatting). | Jon Skeet | 2015-07-31 | 7 | -0/+563 |
|/ / / | | | | | | | | | | | | | While I've provided operators, I haven't yet provided the method equivalents. It's not clear to me that they're actually a good idea, while we're really targeting C# developers who definitely *can* use the user-defined operators. | ||||
* | | | Merge pull request #665 from jskeet/types_field | Jon Skeet | 2015-07-31 | 4 | -7/+251 |
|\ \ \ | | | | | | | | | Handle field names of "descriptor" and "types". | ||||
| * | | | Handle field names of "descriptor" and "types". | Jon Skeet | 2015-07-31 | 4 | -7/+251 |
|/ / / | |||||
* | | | Merge pull request #664 from jtattermusch/expose_umbrella_class_name2 | Jan Tattermusch | 2015-07-30 | 6 | -34/+28 |
|\ \ \ | | | | | | | | | Expose GetUmbrellaClassName in csharp_names.h | ||||
| * | | | refactor umbrella class helpers | Jan Tattermusch | 2015-07-30 | 6 | -34/+28 |
|/ / / | |||||
* | | | Merge pull request #632 from google/csharp-experimental | Jan Tattermusch | 2015-07-30 | 385 | -255618/+32710 |
|\ \ \ | | | | | | | | | Merge C# proto3 from csharp-experimental to master | ||||
| * \ \ | Merge pull request #660 from jskeet/throw-on-null | Jan Tattermusch | 2015-07-30 | 19 | -149/+169 |
| |\ \ \ | | | | | | | | | | | Throw on null for string/bytes single fields | ||||
| | * | | | Generated code for previous commit. | Jon Skeet | 2015-07-30 | 9 | -57/+57 |
| | | | | | |||||
| | * | | | Prohibit null values for string/bytes fields in generated code. | Jon Skeet | 2015-07-30 | 3 | -13/+12 |
| | | | | | |||||
| | * | | | Rename ThrowHelper to Preconditions and make it public - we'll want to use ↵ | Jon Skeet | 2015-07-30 | 7 | -79/+100 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | it from the generated code soon. Additionally, change it to return the value passed, and make it generic with a class constraint. A separate method doesn't have the class constraint, for more unusual scenarios. | ||||
| * | | | Merge pull request #659 from jskeet/fix-frozen | Jon Skeet | 2015-07-30 | 21 | -327/+3 |
| |\ \ \ | | | | | | | | | | | Remove a few hangers-on from frozenness. | ||||
| | * | | | Generated code from previous commit. | Jon Skeet | 2015-07-30 | 18 | -315/+0 |
| | | | | | |||||
| | * | | | More freezing tidy-up; generated code in next commit. | Jon Skeet | 2015-07-30 | 2 | -5/+2 |
| | | | | | |||||
| | * | | | Minor bits of left-over frozenness. | Jon Skeet | 2015-07-30 | 2 | -7/+1 |
| |/ / / | |||||
| * | | | Merge pull request #654 from jtattermusch/csharp_hide_freeze | Jon Skeet | 2015-07-30 | 35 | -1498/+8 |
| |\ \ \ | | | | | | | | | | | Remove the C# Freeze API | ||||
| | * | | | regenerate code | Jan Tattermusch | 2015-07-29 | 18 | -1192/+0 |
| | | | | | |||||
| | * | | | remove the freeze API | Jan Tattermusch | 2015-07-29 | 17 | -306/+8 |
| | | | | |