aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* add support for proto2Yilun Chong2017-06-265-87/+142
|
* fix readme.mdYilun Chong2017-06-231-1/+1
|
* add test_proto2_message.proto and change conformnace/makefile.amYilun Chong2017-06-233-7/+213
|
* Merge pull request #3266 from mbrickn/patch-1Feng Xiao2017-06-231-1/+1
|\ | | | | Updated links to use https
| * Updated links to use httpsMaxwell Paul Brickner2017-06-231-1/+1
|/ | | | | | | Howdy! I just updated some links to use https instead of http. Thanks! ^ _ ^
* Merge pull request #3261 from thomasvl/super_oddcaseThomas Van Lenten2017-06-221-1/+1
|\ | | | | If we fail to get a descriptor just super the method resolving.
| * If we fail to get a descriptor just super the method resolving.Thomas Van Lenten2017-06-221-1/+1
|/ | | | | | This should never happen, but if someone is swizzling or do other hooking of methods, anything is possible, so this seems slighty safer than they returning NO.
* Switch to addEnumType to fix fatal error (#3225)Ryan Gordon2017-06-194-160/+235
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Switch to addEnumType to fix fatal error * Fixing more cases of HHVM incompatibility * Updating tests to be hhvm compatible * Fixing tests * Fixing merge * Don't use call_user_func, should hopefully fix tests * Fixing spelling * Fixing another misspelling in a test * Fixing placement of append and kvUpdate functions * Actually fix function helpers * Remove double addEnumType. How did this ever work? * Fixing a couple more tests * Only use the setter if the return value isn't an object
* Updated upb to fix JSON conformance issues. (#3206)Joshua Haberman2017-06-195-580/+493
| | | | | | * Fixed a bunch of Ruby conformance errors. * Fixed some more Ruby conformance errors in JSON.
* Merge pull request #3243 from yjjnls/masterFeng Xiao2017-06-191-0/+2
|\ | | | | replenish missed header files in install step
| * replenish missed header files in install stepyjjnls2017-06-191-0/+2
| | | | | | | | install 'generated_message_table_driven.h' and 'metadata_lite.h', they are included when compiling the files generated using protoc.exe 3.3.0
* | Merge pull request #3244 from thomasvl/complete_docsThomas Van Lenten2017-06-193-2/+25
|\ \ | | | | | | ObjC: Document the exceptions on some of the writing apis.
| * | ObjC: Document the exceptions on some of the writing apis.Thomas Van Lenten2017-06-193-2/+25
|/ /
* | Merge pull request #3240 from thomasvl/float_funThomas Van Lenten2017-06-193-1/+3
|\ \ | |/ |/| Raise the number of digits used for floats.
| * Raise the number of digits used for floats.Thomas Van Lenten2017-06-163-1/+3
| | | | | | | | | | About 1.5% of all IEEE754 single-precision numbers require nine decimal digits to represent accurately.
* | Remove inclusion of ext/json/php_json.h. (#3241)Jeff Ching2017-06-171-1/+0
| | | | | | | | That implementation of json is not being used - this extension is using a json encoder/decoder provided by 'upb'.
* | Merge pull request #3237 from calder/patch-1Feng Xiao2017-06-161-2/+2
|\ \ | | | | | | Qualify string in java_options.h
| * | Qualify string in java_options.hCalder Coalson2017-06-161-2/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Building the protobuf compiler with Bazel fails to resolve the unqualifed "string"s in java_options.h: ``` ERROR: .../external/com_google_protobuf/BUILD:248:1: C++ compilation of rule '@com_google_protobuf//:protoc_lib' failed: Process exited with status 1 [sandboxed]. In file included from external/com_google_protobuf/src/google/protobuf/compiler/java/java_context.h:41:0, from external/com_google_protobuf/src/google/protobuf/compiler/java/java_enum_field_lite.cc:38: external/com_google_protobuf/src/google/protobuf/compiler/java/java_options.h:59:3: error: 'string' does not name a type string annotation_list_file; ^ external/com_google_protobuf/src/google/protobuf/compiler/java/java_options.h:62:3: error: 'string' does not name a type string output_list_file; ^ Use --strategy=CppCompile=standalone to disable sandboxing for the failing actions. INFO: Elapsed time: 41.487s, Critical Path: 6.20s //interpreter:eval_test NO STATUS Executed 0 out of 1 test: 1 was skipped. ```
* | Merge pull request #3236 from buchgr/bazel-linksFeng Xiao2017-06-161-0/+3
|\ \ | | | | | | bazel: add bazel symlinks to .gitignore
| * | bazel: add bazel symlinks to .gitignoreJakob Buchgraber2017-06-161-0/+3
| |/
* | Merge pull request #3235 from buchgr/java-targetFeng Xiao2017-06-161-1/+2
|\ \ | |/ |/| bazel: Make compiled jars java 6 binary compatible.
| * bazel: Make compiled jars java 6 binary compatible.Jakob Buchgraber2017-06-161-1/+2
|/ | | | See: https://github.com/bazelbuild/bazel/issues/3198
* Fix php jenkins test (#3233)Paul Yang2017-06-153-6/+6
| | | | Update commit id to upload latest composer. Compile php with bc-math for future json support.
* Fix incorrect function call (#3232)michaelbausor2017-06-151-1/+1
|
* 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-07 06:57:38 +0000