aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Merge pull request #652 from TeBoring/objectivecGravatar Paul Yang2015-07-29
|\ | | | | Move the definition of GOOGLE_FALLTHROUGH_INTENDED to port.h
| * Move the definition of GOOGLE_FALLTHROUGH_INTENDED to port.hGravatar teboring2015-07-29
| |
* | Merge pull request #651 from litinglin/masterGravatar Feng Xiao2015-07-29
|\ \ | |/ |/| On x64 MSVC platform, macro PROTOBUF_LITTLE_ENDIAN won't be set
| * Windows is always little-endian.Gravatar LitingLin2015-07-30
| |
| * A bug about PROTOBUF_LITTLE_ENDIAN remain undefined on MSVC x64Gravatar LitingLin2015-07-30
|/
* Merge pull request #635 from TeBoring/objectivecGravatar Paul Yang2015-07-27
|\ | | | | Update minimal ios and osx version for deployment.
* \ Merge pull request #642 from nico/unusedGravatar Feng Xiao2015-07-27
|\ \ | | | | | | Remove two unused functions.
| | * Update minimal ios and osx version for deployment.Gravatar Bo Yang2015-07-27
| |/ |/|
| * Remove two unused functions.Gravatar Nico Weber2015-07-25
|/
* Merge pull request #602 from TeBoring/objectivecGravatar Paul Yang2015-07-21
|\ | | | | Add packTo and unpackFrom in google.protobuf.Any.
| * Add packFrom, unpackTo and is in google.protobuf.Any.Gravatar TeBoring2015-07-21
| | | | | | | | | | | | The previous two methods make it easy to transform between any and normal message. unPackeTo will throw error if the type url in any doesn't match the type of the message to be transformed to. is checks any's type url matches the give GPBMessage type.
* | Merge pull request #627 from jtattermusch/addressbook_proto3Gravatar Jan Tattermusch2015-07-20
|\ \ | | | | | | Update addressbook.proto and examples code to proto3
* \ \ Merge pull request #621 from nico/staticassGravatar Jisi Liu2015-07-20
|\ \ \ | | | | | | | | Let GOOGLE_COMPILE_ASSERT use static_assert if available.
| | * | rename persons to peopleGravatar Jan Tattermusch2015-07-20
| | | |
| | * | use Google.Protobuf namespace for C#Gravatar Jan Tattermusch2015-07-20
| | | |
| | * | fixed java exampleGravatar Jan Tattermusch2015-07-20
| | | |
| | * | fix python exampleGravatar Jan Tattermusch2015-07-20
| | | |
| | * | fix C++ exampleGravatar Jan Tattermusch2015-07-20
| | | |
| | * | update addressbook.proto to proto3Gravatar Jan Tattermusch2015-07-20
| |/ / |/| |
* | | Merge pull request #604 from haberman/ruby-conformanceGravatar Joshua Haberman2015-07-20
|\ \ \ | | | | | | | | Added Ruby to conformance tests.
| * | | Fixed lint errors and responded to CR comments.Gravatar Josh Haberman2015-07-17
| | | | | | | | | | | | | | | | Change-Id: If7b1cc0f03f609a7f43ddafc8509b44207c60910
| * | | Exclude JRuby from conformance tests for now.Gravatar Josh Haberman2015-07-17
| | | | | | | | | | | | | | | | Change-Id: Id008ebac5159f773e1bde8b85acb2626cbd16de8
* | | | 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 #601 from anandolee/masterGravatar Jie Luo2015-07-17
|\ \ \ \ | | | | | | | | | | ignore UTF-8 BOM
| | * | | update header list.Gravatar Jisi Liu2015-07-17
| | | | | | | | | | | | | | | | | | | | Change-Id: I75459b8b6562c3ac58fa4b1e4513accdda43ad64
| | * | | Merge branch 'master' of github.com:google/protobuf into splitheaderGravatar Jisi Liu2015-07-17
| | |\ \ \ | |_|/ / / |/| | | | | | | | | Change-Id: I5f6cbc2430200e3751ad754cc7ae604338db6f91
| | * | | Update make file for extra headers.Gravatar Jisi Liu2015-07-17
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifbc415755266ba3d0ffa5661fcd7c7d2e3b32a22
| | * | | 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
| |/
* / Install missing headersGravatar Rob Earhart2015-07-14
|/ | | | | | Install google/protobuf/stubs/status.h, and google/protobuf/stubs/stringpiece.h -- these are required in order to include google/protobuf/util/type_resolver.h. Install google/protobuf/stubs/bytestream.h -- this is required in order to include google/protobuf/util/json_util.h.
* Merge pull request #591 from pherl/fixbuildGravatar Jisi Liu2015-07-13
|\ | | | | remove pbconfig from extract script
| * remove pbconfig from extract scriptGravatar Jisi Liu2015-07-13
|/ | | | Change-Id: I5049da7449cbada781aa1e23485a336b584802cb
* Merge pull request #588 from haberman/conformance-jsonGravatar Joshua Haberman2015-07-13
|\ | | | | Added support for JSON and valid input to conformance tests.
| * Added support for Json and valid input to conformance tests.Gravatar Josh Haberman2015-07-10
|/ | | | | | | | | | | | | | | | | | | | | | | | | This was enabled by the recent open-sourcing of JSON support and MessageDifferencer. MessageDifferencer allows the conformance suite to expand because it allows us to write tests for payloads that parse successfully. To verify the testee's output payload, we need to parse it back into a message and compare the message instances. Comparing output bytes vs. a golden message is *not* valid, because protobufs do not have a canonical encoding (especially in the presence of maps, which have no prescribed serialization order). We only add one small JSON test for now, but with the framework in place we now have the foundation to dramatically expand the coverage of the conformance test suite. Also added the ability for the testee to skip tests that exercise features that are unimplemented. This allows Java (which currently has no JSON support) to skip tests involving JSON. Change-Id: I697b4363da432b61ae3b638b4287c4cda1af4deb
* Merge pull request #570 from google/internal-third-partyGravatar Paul Yang2015-07-09
|\ | | | | Internal local modifications.
| * Internal local modifications.Gravatar Bo Yang2015-07-09
|/
* Merge pull request #575 from haberman/rbleakGravatar Joshua Haberman2015-07-08
|\ | | | | Worked around memory leak bug in Ruby interpreter.
| * Worked around memory leak bug in Ruby interpreter.Gravatar Josh Haberman2015-07-08
|/ | | | | Change-Id: I8e2b425f9008e6b82d41d59783bb8b04af1f886f Fixes: https://github.com/google/protobuf/issues/474.
* Merge pull request #554 from jcanizales/proto-objc-bazelGravatar Paul Yang2015-07-06
|\ | | | | Add Bazel target for the Objective-C protobuf runtime
| * Add Bazel target for protobuf ObjC runtimeGravatar Jorge Canizales2015-07-06
| | | | | | | | | | Also add WKT headers to the umbrella file, and simplify Podspec with it. Plus some layout improvements to the BUILD file.
* | Merge pull request #500 from TeBoring/tempGravatar Paul Yang2015-07-01
|\ \ | | | | | | Implement parsing for proto3 primitive repeated fields.
* \ \ Merge pull request #551 from ostrovsky/masterGravatar Feng Xiao2015-07-01
|\ \ \ | | | | | | | | MinGW64+MSYS2 compilation issues
| * | | MinGW64+MSYS2 compilation issues and portable isnan using MathLimitsGravatar Karol Ostrovsky2015-07-01
| | |/ | |/|
* | | Merge pull request #458 from xfxyjwf/memory_leakGravatar Paul Yang2015-06-30
|\ \ \ | | | | | | | | Delete default UnknownFieldSet when shuting down.
* \ \ \ Merge pull request #556 from mgiuca/fix-clang-warningGravatar Feng Xiao2015-06-30
|\ \ \ \ | |_|/ / |/| | | Fix "sometimes-uninitialized" warning on Windows Clang.
| * | | Fix "sometimes-uninitialized" warning on Windows Clang.Gravatar Matt Giuca2015-06-30
|/ / /