aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google
Commit message (Collapse)AuthorAge
* Merge pull request #700 from jskeet/remove-packed-hackGravatar Jan Tattermusch2015-08-08
|\ | | | | Remove our own version of MakeTag now that the main one is fixed.
* \ Merge pull request #694 from jskeet/groupsGravatar Jon Skeet2015-08-08
|\ \ | | | | | | Fix groups handling in C#
| | * Remove our own version of MakeTag now that the main one is fixed.Gravatar Jon Skeet2015-08-07
| |/ |/| | | | | "Tested" by regenerating code and observing that there are no changes.
* | Merge pull request #645 from zsurocking/masterGravatar Paul Yang2015-08-06
|\ \ | | | | | | Down integrate. Generate a package name suffix ".nano" for nano messages
* | | Remove unused .pb.h #includes.Gravatar Bo Yang2015-08-06
| | |
| | * Skip groups properly.Gravatar Jon Skeet2015-08-06
| |/ |/| | | | | | | | | | | | | | | | | | | Now the generated code doesn't need to check for end group tags, as it will skip whole groups at a time. Currently it will ignore extraneous end group tags, which may or may not be a good thing. Renamed ConsumeLastField to SkipLastField as it felt more natural. Removed WireFormat.IsEndGroupTag as it's no longer useful. This mostly fixes issue 688. (Generated code changes coming in next commit.)
* | Change ReadTag and PeekTag to just use 0 as a return value for "end of ↵Gravatar Jon Skeet2015-08-05
| | | | | | | | | | | | | | | | stream", rather than using an awkward out parameter. This simplifies quite a lot of code. Generated code in next commit.
* | Consume unknown fields when parsing.Gravatar Jon Skeet2015-08-05
| | | | | | | | | | This is expected to be the cause of the conformance test failures. Generated code in next commit.
| * Merge remote-tracking branch 'upstream/master'Gravatar Xiao Hang2015-08-04
| |\ | |/ |/|
* | Merge pull request #653 from airtimemedia/masterGravatar Feng Xiao2015-08-03
|\ \ | | | | | | Various compilation fixes
* \ \ Merge pull request #643 from yukawa/fix_win_unicode_buildGravatar Paul Yang2015-07-31
|\ \ \ | | | | | | | | Fix build failure on Windows when Unicode build is enabled.
* | | | Handle field names of "descriptor" and "types".Gravatar Jon Skeet2015-07-31
| | | |
| * | | Fix build failure on Windows when Unicode build is enabled.Gravatar Yohei Yukawa2015-07-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | refactor umbrella class helpersGravatar Jan Tattermusch2015-07-30
| | | |
* | | | Merge pull request #632 from google/csharp-experimentalGravatar Jan Tattermusch2015-07-30
|\ \ \ \ | | | | | | | | | | Merge C# proto3 from csharp-experimental to master
| | | * | Move pthread include.Gravatar Tom Hughes2015-07-30
| | | | | | | | | | | | | | | | | | | | | | | | | Based on pull request feedback. See commit 60c5222 for why the pthread header is necessary.
| * | | | Prohibit null values for string/bytes fields in generated code.Gravatar Jon Skeet2015-07-30
| | | | |
| * | | | More freezing tidy-up; generated code in next commit.Gravatar Jon Skeet2015-07-30
| | | | |
| * | | | remove the freeze APIGravatar Jan Tattermusch2015-07-29
| | | | |
* | | | | Merge pull request #652 from TeBoring/objectivecGravatar Paul Yang2015-07-29
|\ \ \ \ \ | | | | | | | | | | | | Move the definition of GOOGLE_FALLTHROUGH_INTENDED to port.h
| | | | | * Generate a package name suffix ".nano" for nano messagesGravatar Xiao Hang2015-07-29
| | | | | | | | | | | | | | | | | | | | | | | | Also introducing an option javanano_use_deprecated_package to allow users to disable the suffix
| * | | | | Move the definition of GOOGLE_FALLTHROUGH_INTENDED to port.hGravatar teboring2015-07-29
| | |_|_|/ | |/| | |
| | | | * Remove unused private fields.Gravatar Tom Hughes2015-07-29
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes compilation when -Wunused-private-field is enabled (e.g., when using -Wall).
| | | | * Fix compilation error when using C++11.Gravatar Tom Hughes2015-07-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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;}
* | | | | Windows is always little-endian.Gravatar LitingLin2015-07-30
| | | | |
* | | | | A bug about PROTOBUF_LITTLE_ENDIAN remain undefined on MSVC x64Gravatar LitingLin2015-07-30
|/ / / /
| | | * Include pthread.h when using GOOGLE_PROTOBUF_NO_THREADLOCAL.Gravatar Tom Hughes2015-07-28
| |_|/ |/| | | | | | | | | | | When GOOGLE_PROTOBUF_NO_THREADLOCAL is defined, classes that depend on pthread functions are included (such as ThreadLocalStorage).
* | | Remove two unused functions.Gravatar Nico Weber2015-07-25
| |/ |/|
| * Fix attribute mistake and regenerate code.Gravatar Jon Skeet2015-07-22
| |
| * Remove the usage of attributes for field/method discovery.Gravatar Jon Skeet2015-07-22
| | | | | | | | Instead, introduce GeneratedCodeInfo which passes in what we need, and adjust the codegen to take account of this.
| * Revamp to reflection.Gravatar Jon Skeet2015-07-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in brief: 1. Descriptor is now the entry point for all reflection. 2. IReflectedMessage has gone; there's now a Descriptor property in IMessage, which is explicitly implemented (due to the static property). 3. FieldAccessorTable has gone away 4. IFieldAccessor and OneofFieldAccessor still exist; we *could* put the functionality straight into FieldDescriptor and OneofDescriptor... I'm unsure about that. 5. There's a temporary property MessageDescriptor.FieldAccessorsByFieldNumber to make the test changes small - we probably want this to go away 6. Discovery for delegates is now via attributes applied to properties and the Clear method of a oneof I'm happy with 1-3. 4 I'm unsure about - feedback welcome. 5 will go away 6 I'm unsure about, both in design and implementation. Should we have a ProtobufMessageAttribute too? Should we find all the relevant attributes in MessageDescriptor and pass them down, to avoid an O(N^2) scenario? Generated code changes coming in the next commit.
| * Merge pull request #629 from google/masterGravatar Jon Skeet2015-07-21
| |\ | |/ |/| Integrate changes from upstream/master into csharp-experimental
* | Merge pull request #621 from nico/staticassGravatar Jisi Liu2015-07-20
|\ \ | | | | | | Let GOOGLE_COMPILE_ASSERT use static_assert if available.
* \ \ Merge pull request #604 from haberman/ruby-conformanceGravatar Joshua Haberman2015-07-20
|\ \ \ | | | | | | | | Added Ruby to conformance tests.
* \ \ \ Merge pull request #622 from pherl/splitheadersGravatar Jisi Liu2015-07-17
|\ \ \ \ | | | | | | | | | | Addming missing includes in stubs headers.
| * | | | Addming missing includes in stubs headers.Gravatar Jisi Liu2015-07-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to prepare removing those additional headers in common.h Change-Id: I707d6d8eaf193eb28195a827c7fec738b968ab3e
| | | * | Let GOOGLE_COMPILE_ASSERT use static_assert if available.Gravatar Nico Weber2015-07-17
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The motivation is that gcc 4.8+ and clang trunk warn on unused local typedefs, which COMPILE_ASSERT adds. After this change, the warning will be happy at least in C++11 builds. static_assert also produces a slighly nicer diagnostic than the typedef method. https://github.com/google/re2/commit/eb93e8bc43ac8d05322fb3e9fc885898ad924f8a did the same change in re2.
* | | | Merge pull request #613 from pherl/splitheadersGravatar Jisi Liu2015-07-17
|\| | | | | | | | | | | Split up common.h headers
| | | * Merge pull request #611 from jskeet/csharp-wrappersGravatar Jon Skeet2015-07-17
| | | |\ | | | | | | | | | | C# wrapper types
| | | | * Fixes from PR review.Gravatar Jon Skeet2015-07-17
| | | | |
| | | * | Merge pull request #586 from jtattermusch/csharp_names_exportGravatar Jan Tattermusch2015-07-16
| | | |\ \ | | | | | | | | | | | | Export c# naming routines publicly
| * | | | | Split up common.h headersGravatar Jisi Liu2015-07-16
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I223783111d743aa5193bf70fa1b9b54c7b4389c3
| | * | | | Added Ruby to conformance tests.Gravatar Josh Haberman2015-07-16
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This involved fixing a few important bugs in the Ruby implementation -- mostly cases of mixing upb field types and descriptor types (upb field types do not distinguish between int/sint/fixed/sfixed like descriptor types do). Also added protobuf-specific exceptions so parse errors can be caught specifically. Change-Id: Ib49d3db976900b2c6f3455c8b88af52cfb86e036
* / / / / ignore UTF-8 BOM if it is in the begining of a proto fileGravatar Jie Luo2015-07-16
|/ / / /
| | | * First pass at wrapper types.Gravatar Jon Skeet2015-07-16
| | | | | | | | | | | | | | | | | | | | - We do still generate the message types, as otherwise reflection breaks, even though it doesn't actually use those types. - JSON handling hasn't been implemented yet
| | | * First part of implementing wrapper types. Not ready yet!Gravatar Jon Skeet2015-07-16
| | |/ | |/|
| * | Merge remote-tracking branch 'upstream/master' into csharp-experimentalGravatar Jan Tattermusch2015-07-15
| |\ \ | |/ / |/| |
| * | Address requested change from code review.Gravatar Jon Skeet2015-07-15
| | |
| * | Don't create nested types (or field accessors) for map types.Gravatar Jon Skeet2015-07-15
| | | | | | | | | | | | I'm sure I've implemented this before, but somehow it's been lost in a maze of twisty little branches, all alike.
| * | Generate the well-known types in C#Gravatar Jon Skeet2015-07-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This involves: - Specifying a namespace in each proto (including ones we'd previously missed) - Updating the generation script - Changing codegen to implement IReflectedMessage.Fields explicitly (a good thing anyway) - Changing reflection tests to take account of the explicit interface implementation Non-generated code in this commit; generated code to follow