aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Regenerate all C# code and make it compileGravatar Jon Skeet2016-04-20
| | | | JSON tests fail, as we're not using OriginalNameAttribute yet.
* Add C# codegen changes to enum value names (mostly C++)Gravatar Jon Skeet2016-04-20
| | | | | | | | | | Overview of changes: - A new C#-specific command-line option, legacy_enum_values to revert to the old behavior - When legacy_enum_values isn't specified, we strip the enum name as a prefix, and PascalCase the value name - A new attribute within the C# code so that we can always tell the original in-proto name Regenerating the C# code with legacy_enum_values leads to code which still compiles and works - but there's more still to do.
* Use 0 as the default value for all enums, rather than finding the actual ↵Gravatar Jon Skeet2016-04-11
| | | | | | enum value name This will make it easier to change the enum value names, as it reduces the number of places they're used.
* Merge pull request #1400 from jskeet/fix-internalGravatar Jan Tattermusch2016-04-10
|\ | | | | Fix to csharp_options - initialize internal_access to false.
| * Fix to csharp_options - initialize internal_access to false.Gravatar Jon Skeet2016-04-08
|/
* Merge pull request #1393 from gvaish/masterGravatar Jon Skeet2016-04-07
|\ | | | | Added support for internal_access for C#
* \ Merge pull request #1392 from anandolee/masterGravatar Jie Luo2016-04-07
|\ \ | | | | | | Sync the manually integrate changes in google3/third_party
| | * Added support for internal_access for C#Gravatar Gaurav Vaish2016-04-07
| |/ |/|
* | Merge pull request #1390 from jskeet/tidy-upGravatar Jon Skeet2016-04-07
|\ \ | | | | | | Tidy up for C# codegen
| | * sync the Manually integrate changes in google3/third_partyGravatar Jie Luo2016-04-06
| | |
* | | Merge pull request #1391 from thomasvl/string_tweaksGravatar Thomas Van Lenten2016-04-06
|\ \ \ | | | | | | | | ObjC String followups: one test case only addition, behavior change for invalid UTF-8
* | | | Updating Xcode Settings to use iOS 9.3Gravatar Geoffrey Wiseman2016-04-06
| | | | | | | | | | | | | | | | Update the simulators used for some tests under Xcode 7.3 to be iOS 9.3.
| | * | Add more documentation for csharp_options.hGravatar Jon Skeet2016-04-06
| | | | | | | | | | | | | | | | | | | | | | | | This also renames generate_directories to base_namespace_specified; generating directories is the immediate *effect* of specifying a base namespace, but with this change the options reflect what has been specified rather than the effect. (There may be other effects in the future, of course.)
| | * | Line-wrapping changes only for C# generator codeGravatar Jon Skeet2016-04-06
| |/ / |/| | | | | | | | | | | | | | | | | | | | This should have no behavioral changes at all. This doesn't strictly enforce an 80-column limit, but removes the most egregious violations. The indentation in the C# generator code is inconsistent in general, unfortunately - if we have any good tools that can be trusted to reformat, I'd be happy to apply them.
| * | Error during parsing for invalid UTF-8 instead of dropping dropping data.Gravatar Thomas Van Lenten2016-04-05
| | | | | | | | | | | | | | | | | | | | | This seems to be some code evolution side effects. Back when there was a custom string class, we couldn't really error when we finally saw the string was bad so we had to return the empty string, but now that full validation is done up front, it can error out.
| * | Add tests to ensure we read strings with BOMs so we don't forget about ↵Gravatar Thomas Van Lenten2016-04-05
|/ / | | | | | | lessons of the past.
* | Merge pull request #1349 from gvaish/masterGravatar Jon Skeet2016-04-05
|\ \ | | | | | | Added CLI option internal_access for types (C#)
* \ \ Merge pull request #1386 from andrewharp/patch-2Gravatar Feng Xiao2016-04-05
|\ \ \ | | | | | | | | Do not link in pthread library for Android builds.
| | * | Added access_level for typesGravatar Gaurav Vaish2016-04-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * `csharp_options`: Added `Options` to encapsulate generator options. Supported options for now - file_extension, base_namespace * `{Blah}Generator`: Now accept `Options*` as parameter to constructor * `csharp_generator.cc`: Parse and populate options * `Makefile.am`: Added `csharp_options.h` * `extract_includes.bat.in`: Added `csharp_options.h` Refactoring code to two commits. This is the first commit
| * | | Update BUILDGravatar Andrew Harp2016-04-04
| | | |
| * | | Do not link in pthread library for Android builds.Gravatar Andrew Harp2016-04-04
|/ / / | | | | | | This is required to allow Tensorflow to build on Android without hacks. Currently we create a dummy pthread library just to satisfy this dependency for a library that does not exist on Android. See https://github.com/google/protobuf/issues/1373 for more context.
* | | Merge pull request #852 from qzix/masterGravatar Thomas Van Lenten2016-04-04
|\ \ \ | |/ / |/| | Added deprecated option handling to objective-c
| * | Added deprecated option handling for objective-c generatorGravatar Oleg Vereshko2016-04-04
| | |
* | | Merge pull request #1353 from keveman/masterGravatar Joshua Haberman2016-04-01
|\ \ \ | | | | | | | | Linking the cpp implementation extension statically with libprotobuf
| * | | Linking the cpp implementation extension statically with libprotobufGravatar Manjunath Kudlur2016-04-01
| | | |
* | | | Merge pull request #1377 from jskeet/remove-duplicate-testsGravatar Jon Skeet2016-04-01
|\ \ \ \ | | | | | | | | | | Remove duplicate test cases.
* \ \ \ \ Merge pull request #1378 from thomasvl/manual_stream_parsing_helpersGravatar Thomas Van Lenten2016-04-01
|\ \ \ \ \ | |_|_|/ / |/| | | | Add -position and -isAtEnd for use when manually parsing input streams.
| * | | | Add -position and -isAtEnd for use when manually parsing input streams.Gravatar Thomas Van Lenten2016-04-01
|/ / / /
| * / / Remove duplicate test cases.Gravatar Jon Skeet2016-04-01
|/ / / | | | | | | | | | (NCrunch noticed these.)
* | | Merge pull request #1369 from jskeet/tools-nuspecGravatar Jan Tattermusch2016-03-31
|\ \ \ | |/ / |/| | Introduce a new nuget package, Google.Protobuf.Tools, basically to contain protoc on multiple platforms.
* | | Merge pull request #1371 from keveman/oversize_protosGravatar Joshua Haberman2016-03-31
|\ \ \ | | | | | | | | Added an API to allow oversize protos when using C++ extension in Python
| * | | Added an API to allow oversize protos when using C++ extension in PythonGravatar Manjunath Kudlur2016-03-31
| | | |
* | | | Merge pull request #1366 from xyzzyz/int128_ostreamGravatar Feng Xiao2016-03-31
|\ \ \ \ | |/ / / |/| | | Replace #include <iostream> with #include <ostream> in int128.cc
| | * | Remove duplicate lineGravatar Jon Skeet2016-03-31
| | | |
| | * | Introduce a new nuget package, Google.Protobuf.Tools, basically to contain ↵Gravatar Jon Skeet2016-03-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | protoc on multiple platforms. I've moved both protoc.exe and the proto files out of Google.Protobuf. The .proto files aren't a slam-dunk, but it feels like they belong with protoc as you'd *use* them with protoc. It's not clear to me whether we really need both an x86 and x64 version of protoc.exe, as x86 would work on 64-bit Windows anyway. Discuss :)
* | | | Merge pull request #1362 from jskeet/tweak_json_nameGravatar Jan Tattermusch2016-03-30
|\ \ \ \ | | | | | | | | | | Refactoring of FieldDescriptor
| | * | | Replace #include <iostream> with #include <ostream>Gravatar Adam Michalik2016-03-30
| |/ / / |/| | | | | | | | | | | | | | | iostream is not actually necessary here, and it introduces unnecessary static initializers.
* | | | Merge pull request #1360 from pherl/masterGravatar Jisi Liu2016-03-30
|\ \ \ \ | | | | | | | | | | Use the T() instead of NULL for the default value.
* \ \ \ \ Merge pull request #1295 from haberman/dockerGravatar Joshua Haberman2016-03-30
|\ \ \ \ \ | |_|_|/ / |/| | | | Add support for running on Jenkins
| | | * | Refactoring of FieldDescriptorGravatar Jon Skeet2016-03-30
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | This makes no externally visible behavioral changes. Internally and non-behaviorally: - We use a field (compiler-generated) to store the JsonName to avoid recomputing it repeatedly - The documentation for JsonName is updated to reflect the meaning better - Readonly autoprops and expression-bodied properties used where possible
* | | | Merge pull request #1326 from the-alien/csharp_json_nameGravatar Jon Skeet2016-03-30
|\ \ \ \ | | | | | | | | | | csharp: add support for the json_name option
| | * \ \ Merge branch 'master' into dockerGravatar Josh Haberman2016-03-29
| | |\ \ \ | |_|/ / / |/| | | |
| | | * | Use the T() instead of NULL for the default value.Gravatar Jisi Liu2016-03-29
| |_|/ / |/| | | | | | | | | | | | | | | The template can be specialized on primitives, e.g. double, where converting NULL will trigger a warning.
| * | | Merge branch 'master' of https://github.com/google/protobuf into ↵Gravatar alien2016-03-29
| |\ \ \ | |/ / / |/| | | | | | | csharp_json_name
| * | | Code review fixesGravatar alien2016-03-29
| | | |
* | | | Merge pull request #1358 from thomasvl/travis_tweaksGravatar Thomas Van Lenten2016-03-29
|\ \ \ \ | | | | | | | | | | Mark iOS tests as able to fail.
| * | | | Mark iOS tests as able to fail.Gravatar Thomas Van Lenten2016-03-29
|/ / / / | | | | | | | | | | | | | | | | Travis updated their images to include an xctool that can randomly kill tests, so mark them as flaky to avoid turning things red.
* | | | Merge pull request #1350 from thomasvl/over_releaseGravatar Thomas Van Lenten2016-03-24
|\ \ \ \ | | | | | | | | | | The message was autoreleased, the -releases are an over release.
| * | | | The message was autoreleased, the -releases are an over release.Gravatar Thomas Van Lenten2016-03-24
|/ / / /
* | | | Merge pull request #1345 from smparkes/smparkes/well-known-protosGravatar Feng Xiao2016-03-23
|\ \ \ \ | | | | | | | | | | export well known protos