aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* First pass at wrapper types.Jon Skeet2015-07-1615-475/+927
| | | | | - 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
* Fixes to ByteString's equality handling.Jon Skeet2015-07-162-20/+41
|
* First part of implementing wrapper types. Not ready yet!Jon Skeet2015-07-1613-20/+2853
|
* Merge pull request #610 from jskeet/fix-enumeratorJon Skeet2015-07-162-63/+6
|\ | | | | Remove the struct-based iterator for RepeatedField.
| * Remove the struct-based iterator for RepeatedField.Jon Skeet2015-07-162-63/+6
|/ | | | | | We don't use it in the runtime or generated code anywhere now, so the extra small performance boost isn't as critical, and it has some undesirable consequences. The tests have needed to change as iterator block enumerators don't throw when we might expect them to.
* Merge pull request #605 from jtattermusch/csharp_cleanupJon Skeet2015-07-166-10/+5
|\ | | | | Assorted nits from C# code.
| * added comment for ByteString.CopyFromJan Tattermusch2015-07-151-0/+2
| |
| * C# cleanup - assorted nitsJan Tattermusch2015-07-155-10/+3
|/
* Merge pull request #606 from jtattermusch/csharp-experimental-mergedJon Skeet2015-07-1639-430/+761
|\ | | | | Update csharp-experimental with changes from upstream/master
| * Merge remote-tracking branch 'upstream/master' into csharp-experimentalJan Tattermusch2015-07-1539-430/+761
|/|
| * Merge pull request #591 from pherl/fixbuildJisi Liu2015-07-131-1/+0
| |\ | | | | | | remove pbconfig from extract script
| | * remove pbconfig from extract scriptJisi Liu2015-07-131-1/+0
| |/ | | | | | | Change-Id: I5049da7449cbada781aa1e23485a336b584802cb
| * Merge pull request #588 from haberman/conformance-jsonJoshua Haberman2015-07-136-52/+263
| |\ | | | | | | Added support for JSON and valid input to conformance tests.
| | * Added support for Json and valid input to conformance tests.Josh Haberman2015-07-106-52/+263
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-partyPaul Yang2015-07-0911-158/+167
| |\ | | | | | | Internal local modifications.
| | * Internal local modifications.Bo Yang2015-07-0911-158/+167
| |/
| * Merge pull request #575 from haberman/rbleakJoshua Haberman2015-07-081-1/+13
| |\ | | | | | | Worked around memory leak bug in Ruby interpreter.
| | * Worked around memory leak bug in Ruby interpreter.Josh Haberman2015-07-081-1/+13
| |/ | | | | | | | | Change-Id: I8e2b425f9008e6b82d41d59783bb8b04af1f886f Fixes: https://github.com/google/protobuf/issues/474.
| * Merge pull request #554 from jcanizales/proto-objc-bazelPaul Yang2015-07-063-35/+50
| |\ | | | | | | Add Bazel target for the Objective-C protobuf runtime
| | * Add Bazel target for protobuf ObjC runtimeJorge Canizales2015-07-063-35/+50
| | | | | | | | | | | | | | | 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/tempPaul Yang2015-07-013-62/+94
| |\ \ | | | | | | | | Implement parsing for proto3 primitive repeated fields.
| | * | Implement parsing for proto3 primitive repeated fields. Previously, forBo Yang2015-06-153-62/+94
| | | | | | | | | | | | | | | | | | | | proto3 primitive repeated fields, packed data cannot be parsed if definition is unpacked. Neither is the other way.
| * | | Merge pull request #551 from ostrovsky/masterFeng Xiao2015-07-016-31/+21
| |\ \ \ | | | | | | | | | | MinGW64+MSYS2 compilation issues
| | * | | MinGW64+MSYS2 compilation issues and portable isnan using MathLimitsKarol Ostrovsky2015-07-016-31/+21
| | | |/ | | |/|
| * | | Merge pull request #458 from xfxyjwf/memory_leakPaul Yang2015-06-301-0/+5
| |\ \ \ | | | | | | | | | | Delete default UnknownFieldSet when shuting down.
| | * | | Delete default UnknownFieldSet when shuting down.Feng Xiao2015-06-021-0/+5
| | | | |
| * | | | Merge pull request #556 from mgiuca/fix-clang-warningFeng Xiao2015-06-301-1/+1
| |\ \ \ \ | | |_|/ / | |/| | | Fix "sometimes-uninitialized" warning on Windows Clang.
| | * | | Fix "sometimes-uninitialized" warning on Windows Clang.Matt Giuca2015-06-301-1/+1
| |/ / /
| * | | Merge pull request #540 from pherl/clean-warningsJisi Liu2015-06-253-11/+6
| |\ \ \ | | | | | | | | | | fix compiler warnings.
| | * | | fix compiler warnings.Jisi Liu2015-06-243-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - control reaches end of non-void function. - remove a deprecated IsMatch. Change-Id: Ifdeb15879bbcf591c48dc7fda1cd8994bdf87bb3
| * | | | Merge pull request #512 from pherl/bazelPaul Yang2015-06-244-77/+140
| |\ \ \ \ | | | | | | | | | | | | Enable tests for bazel build.
| | * | | | Enable tests for bazel build.Jisi Liu2015-06-184-77/+140
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I63ed5fb58a45e098f2fd1fa457a219148de030bd
| * | | | | Merge pull request #538 from google/jtattermusch-patch-1Jisi Liu2015-06-241-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | | fix typo in cmake/README.md
| | * | | | fix typo in cmake/README.mdJan Tattermusch2015-06-241-1/+1
| |/ / / /
* | | | | Merge pull request #599 from jskeet/no-map-entriesJon Skeet2015-07-155-5779/+39
|\ \ \ \ \ | | | | | | | | | | | | Don't generate types for map entry messages
| * | | | | Address requested change from code review.Jon Skeet2015-07-151-12/+12
| | | | | |
| * | | | | Don't create nested types (or field accessors) for map types.Jon Skeet2015-07-155-5773/+33
|/ / / / / | | | | | | | | | | | | | | | I'm sure I've implemented this before, but somehow it's been lost in a maze of twisty little branches, all alike.
* | | | | Merge pull request #594 from jskeet/csharp-wellknowntypesJan Tattermusch2015-07-1531-130/+4808
|\ \ \ \ \ | | | | | | | | | | | | Introduce C# well-known types
| * | | | | Generated code for well-known typesJon Skeet2015-07-1417-113/+4763
| | | | | |
| * | | | | Generate the well-known types in C#Jon Skeet2015-07-1414-17/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge pull request #593 from jskeet/reflection-namespaceJon Skeet2015-07-1449-3355/+3331
|\| | | | | | | | | | | | | | | | | Change the reflection namespace in C#
| * | | | | Changing reflection namespace (part 4)Jon Skeet2015-07-148-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | Update code already within Google.Protobuf.Reflection which was importing Google.Protobuf.DescriptorProtos
| * | | | | Changing reflection namespace (part 3)Jon Skeet2015-07-1412-252/+251
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the C# namespace in descriptor.proto to Google.Protobuf.Reflection. This then means changing where the generated code lives, which means updating the project file... It also involves regenerating the C++ - which has updated the well-known types as well, for no terribly obvious reason...
| * | | | | Changing reflection namespace (part 2)Jon Skeet2015-07-147-487/+487
| | | | | | | | | | | | | | | | | | | | | | | | Generated code changes from previous commit
| * | | | | Changing reflection namespace (part 1)Jon Skeet2015-07-1432-2638/+2626
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move types into Google.Protobuf.Reflection - Change codegen to reflect that in generated types Generated code changes coming in part 2
* | | | | Merge pull request #583 from jskeet/issue312Jon Skeet2015-07-142-3/+11
|\ \ \ \ \ | | | | | | | | | | | | Pascal-case namespace automatically in C# codegen
| * | | | | Convert package name to PascalCase for C# namespaceJon Skeet2015-07-142-3/+11
|/ / / / / | | | | | | | | | | | | | | | Fixes issue 312.
* | | | | Merge pull request #582 from jskeet/csharp-jsonJon Skeet2015-07-1421-168/+1494
|\ \ \ \ \ | | | | | | | | | | | | JSON formatting in C#
| * | | | | Changes suggested during review.Jon Skeet2015-07-142-27/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove the indexers in FieldAccessorTable - Add a TODO for field ordering in oneof
| * | | | | Fixes to JsonFormatterJon Skeet2015-07-102-11/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Handle oneof properly - Omit unknown enum values