aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Follows proper autoloading standards (#3123)Brent Shaffer2017-06-1416-841/+1048
| | | | | | | | | | | | | | * Follows proper autoloading standards - Splits PHP classes in descriptor.php into separate files - Splits MapFieldIter and RepeatedFieldIter into separate files - Moves descriptor.php to Internal/functions.php - Moves all namespaced functions into Iternal/functions.php * fixes Makefile.am for added php files * [PHP] moves all functions to GPBUtil * removes description.php from the makefile
* Merge pull request #3228 from thomasvl/add_tvos_to_podspecThomas Van Lenten2017-06-141-0/+1
|\ | | | | Add tvOS to the podspec.
| * Add tvOS to the podspec.Thomas Van Lenten2017-06-141-0/+1
|/ | | | Fixes https://github.com/google/protobuf/issues/3217
* Merge pull request #3216 from traversaro/patch-1Feng Xiao2017-06-121-1/+1
|\ | | | | Export symbols used in inline functions
| * Export symbols used in inline functionsSilvio Traversaro2017-06-121-1/+1
|/ | | | fixed_address_empty_string symbol is used in an inline function. We have to export it to avoid undefined reference link errors.
* Merge pull request #3176 from acozzette/fix-3114Adam Cozzette2017-06-071-4/+10
|\ | | | | Ensure that for Java, imports of .proto files with empty packages works
| * Ensure that for Java, imports of .proto files with empty packages worksAdam Cozzette2017-06-021-4/+10
| | | | | | | | | | | | This fixes a compiler bug that caused a Java syntax error when one .proto file would import another one with an empty package and java_package. This fixes issue #3114.
* | Merge pull request #3196 from matt-kwong/kokoroFeng Xiao2017-06-0718-0/+90
|\ \ | | | | | | Add continuous testing config files for Kokoro
| * | Add continuous testing config files for KokoroMatt Kwong2017-06-0718-0/+90
| | |
* | | Merge pull request #3191 from matt-kwong/kokoroFeng Xiao2017-06-0639-0/+337
|\| | | | | | | | Add MacOS and Linux tests to Kokoro
| * | Add MacOS and Linux tests to KokoroMatt Kwong2017-06-0639-0/+337
| | |
* | | Merge pull request #3189 from thomasvl/objc_proto3_unknown_fieldsThomas Van Lenten2017-06-063-44/+5
|\ \ \ | | | | | | | | ObjC: Preserve unknown fields in proto3 syntax files.
| * | | ObjC: Preserve unknown fields in proto3 syntax files.Thomas Van Lenten2017-06-063-44/+5
| | | | | | | | | | | | | | | | | | | | | | | | As announced: https://groups.google.com/forum/#!topic/protobuf/VX5qEmTW3y0 The ObjC side of https://github.com/google/protobuf/issues/272
* | | | Merge pull request #3160 from meteorcloudy/winbuildFeng Xiao2017-06-061-12/+32
|\ \ \ \ | | | | | | | | | | Refactor cc options in BUILD file for Windows
| * | | | Refactor cc options in BUILD file for WindowsYun Peng2017-05-311-12/+32
| | |_|/ | |/| | | | | | | | | | | | | | Don't put gcc warnings options in copts, so that protobuf is able to build by MSVC toolchain without python wrappers.
* | | | Merge pull request #3159 from yeswalrus/new-generateAdam Cozzette2017-06-063-84/+117
|\ \ \ \ | |_|/ / |/| | | CMake: Add modern protobuf_generate
| * | | add protobuf_generate function, allows use of target_sources where availableWalter Gray2017-06-023-84/+117
| | | |
| * | | fix check_and_save_build_option not correctly exporting build optionsWalter Gray2017-05-301-1/+1
| | | |
* | | | Merge pull request #3190 from thomasvl/objc_IllegalZeroFieldNumThomas Van Lenten2017-06-063-10/+41
|\ \ \ \ | | | | | | | | | | Properly error on a tag with field number zero.
| * | | | Properly error on a tag with field number zero.Thomas Van Lenten2017-06-063-10/+41
|/ / / /
* | | | Merge pull request #3157 from yeswalrus/fix-version-checkAdam Cozzette2017-06-051-14/+16
|\ \ \ \ | | | | | | | | | | Fix CMake version check
| * | | | fix check_and_save_build_option not correctly exporting build optionsWalter Gray2017-06-021-1/+1
| |/ / /
| * | | Fix the check_and_save_build_option macro never evaluating to trueWalter Gray2017-05-301-1/+1
| | | |
| * | | Fix find module not working when no version number was givenWalter Gray2017-05-301-12/+14
| |/ /
* | | Add new file option php_namespace. (#3162)Paul Yang2017-06-0542-442/+1070
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add new file option php_namespace. Use this option to change the namespace of php generated classes. Default is empty. When this option is empty, the package name will be used for determining the namespace. * Uncomment commented tests * Revert gdb test change * Update csharp descriptor. * Add test for empty php_namespace.
* | | Merge pull request #3169 from dmaclach/masterThomas Van Lenten2017-06-011-1058/+1504
|\ \ \ | |_|/ |/| | Optimize GPBDictionary.m codegen to reduce size of library
| * | Optimize GPBDictionary.m codegen to reduce size of overall library by 46K ↵Dave MacLachlan2017-06-011-1058/+1504
| |/ | | | | | | per architecture.
* | Merge pull request #3170 from thomasvl/int64_map_issueThomas Van Lenten2017-06-012-1/+6
|\ \ | |/ |/| Fix some cases of reading of 64bit map values.
| * Fix some cases of reading of 64bit map values.Thomas Van Lenten2017-06-012-1/+6
|/ | | | Fixes https://github.com/google/protobuf/issues/3164.
* not to use std::random_device for map.Seed(). (#3133)Wayne Zhang2017-05-301-13/+0
| | | | | | * not to use std::random_device for map.Seed(). * remove include random
* Merge pull request #3149 from KarrokDC/masterAdam Cozzette2017-05-303-3/+192
|\ | | | | Add headers as part of cmake project generation
| * Add headers as part of cmake projectDennis Cappendijk2017-05-293-3/+192
| | | | | | | | tested only on windows with visual studio 2015 as generator
* | Oneof field should be serialized even it's equal to default. (#3153)Paul Yang2017-05-293-1/+17
| |
* | Add ARRAY for reserved name (#3150)Paul Yang2017-05-296-7/+13
| |
* | Adds fluent setters for PHP (#3130)Brent Shaffer2017-05-292-0/+15
|/
* Merge pull request #3113 from phst/masterAdam Cozzette2017-05-261-1/+3
|\ | | | | Improve fix for https://github.com/google/protobuf/issues/295
| * Improve fix for https://github.com/google/protobuf/issues/295Philipp Stephani2017-05-231-1/+3
| | | | | | | | | | | | | | | | Requiring the legacy ‘cl’ library unconditionally pollutes the namespace. Instead, require it only when compiling and in known-broken versions. This is almost the same patch that opoplawski suggested, except that I removed the test for ‘emacs-repository-version’, which isn’t defined in Emacs 24.3.
* | update csharp README and fix .NET 3.5 build errorJohn Brock2017-05-252-44/+23
| |
* | Add IncludeSource in csproj as per review commentsJon Skeet2017-05-241-0/+1
| |
* | Convert C# projects to MSBuild (csproj) formatJon Skeet2017-05-2433-388/+269
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has one important packaging change: the netstandard version now depends (implicitly) on netstandard1.6.1 rather than on individual packages. This is the preferred style of dependency, and shouldn't affect any users - see http://stackoverflow.com/questions/42946951 for details. The tests are still NUnit, but NUnit doesn't support "dotnet test" yet; the test project is now an executable using NUnitLite. (When NUnit supports dotnet test, we can adapt to it.) Note that the project will now only work in Visual Studio 2017 (and Visual Studio Code, and from the command line with the .NET Core 1.0.0 SDK); Visual Studio 2015 does *not* support this project file format.
* | Removing undefined behavior and compiler warnings (#1315)brian-peloton2017-05-237-32/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Comment out unused arguments. These last few are all that's needed to compile with -Wunused-arguments. * Fix missing struct field initializer. With this fix, everything compiles with -Wmissing-field-initializers. * Add support for disabling unaligned memory accesses on x86 too. ubsan doesn't like these because they are technically undefined behavior, so -DGOOGLE_PROTOBUF_DONT_USE_UNALIGNED will disable them easily. * Avoid undefined integer overflow. ubsan catches all of these.
* | Merge pull request #3126 from mbrukman/fix-readme-formattingFeng Xiao2017-05-231-38/+45
|\ \ | | | | | | Fix Markdown formatting in README.
| * | Fix Markdown formatting in README.Misha Brukman2017-05-231-38/+45
| |/ | | | | | | | | | | | | | | | | | | Fix indentation to enable code formatting for sample command lines to set them visually apart from the surrounding text, and make it easy to copy-paste. Add code formatting for env vars, paths, binary and library names for readability. Hide URLs behind text for readability and conciseness.
* | Merge pull request #3117 from KarrokDC/masterFeng Xiao2017-05-231-0/+6
|\ \ | | | | | | Show help if protoc is called without any arguments
| * | show help if protoc is called without any arguments, pre-empts -h and --help ↵Dennis Cappendijk2017-05-221-0/+6
| |/ | | | | | | to show a useful message instead of just 'Missing input file.'
* | Merge pull request #3103 from sergiocampama/perfThomas Van Lenten2017-05-231-0/+106
|\ \ | |/ |/| Adds serial and parallel parsing tests.
| * Adds serial and parallel parsing tests to check if parallel parsing is ↵Sergio Campama2017-05-231-0/+106
|/ | | | faster than serial parsing, which it should
* Merge pull request #3104 from thomasvl/ext_registry_copyThomas Van Lenten2017-05-177-23/+187
|\ | | | | Fix ExtensionRegistry copying and add tests.
| * Fix ExtensionRegistry copying and add tests.Thomas Van Lenten2017-05-177-23/+187
|/ | | | | | | | | - Fix up -copyWithZone: to not leave the two registries sharing some of the storage by using -addExtensions:. - Improve -addExtensions: to clone the sub dict when there is nothing to merge into. - A ExtensionRegistry unittests. - Update project schemes to not have extra things in perf scheme.
* Merge pull request #2815 from devwout/ruby_json_emit_defaultsJoshua Haberman2017-05-152-33/+149
|\ | | | | Ruby version optionally emits default values in JSON encoding.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-01 19:55:44 +0000