aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Merge pull request #2968 from ngg/cpp-proper-fwdGravatar Feng Xiao2017-06-23
|\ | | | | C++: Do not forward-declare dependencies in generated .h files
* \ Merge pull request #3266 from mbrickn/patch-1Gravatar Feng Xiao2017-06-23
|\ \ | | | | | | Updated links to use https
| * | Updated links to use httpsGravatar Maxwell Paul Brickner2017-06-23
|/ / | | | | | | | | | | | | Howdy! I just updated some links to use https instead of http. Thanks! ^ _ ^
* | Merge pull request #3261 from thomasvl/super_oddcaseGravatar Thomas Van Lenten2017-06-22
|\ \ | | | | | | If we fail to get a descriptor just super the method resolving.
| * | If we fail to get a descriptor just super the method resolving.Gravatar Thomas Van Lenten2017-06-22
|/ / | | | | | | | | | | 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)Gravatar Ryan Gordon2017-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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)Gravatar Joshua Haberman2017-06-19
| | | | | | | | | | | | * Fixed a bunch of Ruby conformance errors. * Fixed some more Ruby conformance errors in JSON.
* | Merge pull request #3243 from yjjnls/masterGravatar Feng Xiao2017-06-19
|\ \ | | | | | | replenish missed header files in install step
* \ \ Merge pull request #3244 from thomasvl/complete_docsGravatar Thomas Van Lenten2017-06-19
|\ \ \ | | | | | | | | ObjC: Document the exceptions on some of the writing apis.
| * | | ObjC: Document the exceptions on some of the writing apis.Gravatar Thomas Van Lenten2017-06-19
|/ / /
* | | Merge pull request #3240 from thomasvl/float_funGravatar Thomas Van Lenten2017-06-19
|\ \ \ | | | | | | | | Raise the number of digits used for floats.
| | * | replenish missed header files in install stepGravatar yjjnls2017-06-19
| |/ / |/| | | | | | | | install 'generated_message_table_driven.h' and 'metadata_lite.h', they are included when compiling the files generated using protoc.exe 3.3.0
* | | Remove inclusion of ext/json/php_json.h. (#3241)Gravatar Jeff Ching2017-06-17
| | | | | | | | | | | | That implementation of json is not being used - this extension is using a json encoder/decoder provided by 'upb'.
| * | Raise the number of digits used for floats.Gravatar Thomas Van Lenten2017-06-16
| | | | | | | | | | | | | | | About 1.5% of all IEEE754 single-precision numbers require nine decimal digits to represent accurately.
* | | Merge pull request #3237 from calder/patch-1Gravatar Feng Xiao2017-06-16
|\ \ \ | | | | | | | | Qualify string in java_options.h
* \ \ \ Merge pull request #3236 from buchgr/bazel-linksGravatar Feng Xiao2017-06-16
|\ \ \ \ | | | | | | | | | | bazel: add bazel symlinks to .gitignore
* \ \ \ \ Merge pull request #3235 from buchgr/java-targetGravatar Feng Xiao2017-06-16
|\ \ \ \ \ | |_|_|/ / |/| | | | bazel: Make compiled jars java 6 binary compatible.
| | | * | Qualify string in java_options.hGravatar Calder Coalson2017-06-16
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. ```
| * | | bazel: Make compiled jars java 6 binary compatible.Gravatar Jakob Buchgraber2017-06-16
|/ / / | | | | | | | | | See: https://github.com/bazelbuild/bazel/issues/3198
| * / bazel: add bazel symlinks to .gitignoreGravatar Jakob Buchgraber2017-06-16
|/ /
* | Fix php jenkins test (#3233)Gravatar Paul Yang2017-06-15
| | | | | | | | Update commit id to upload latest composer. Compile php with bc-math for future json support.
* | Fix incorrect function call (#3232)Gravatar michaelbausor2017-06-15
| |
* | Follows proper autoloading standards (#3123)Gravatar Brent Shaffer2017-06-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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_podspecGravatar Thomas Van Lenten2017-06-14
|\ \ | | | | | | Add tvOS to the podspec.
| * | Add tvOS to the podspec.Gravatar Thomas Van Lenten2017-06-14
|/ / | | | | | | Fixes https://github.com/google/protobuf/issues/3217
* | Merge pull request #3216 from traversaro/patch-1Gravatar Feng Xiao2017-06-12
|\ \ | | | | | | Export symbols used in inline functions
| * | Export symbols used in inline functionsGravatar Silvio Traversaro2017-06-12
|/ / | | | | | | fixed_address_empty_string symbol is used in an inline function. We have to export it to avoid undefined reference link errors.
| * C++: Do not forward-declare dependencies in generated .h filesGravatar Gergely Nagy2017-06-12
|/
* Merge pull request #3176 from acozzette/fix-3114Gravatar Adam Cozzette2017-06-07
|\ | | | | Ensure that for Java, imports of .proto files with empty packages works
* \ Merge pull request #3196 from matt-kwong/kokoroGravatar Feng Xiao2017-06-07
|\ \ | | | | | | Add continuous testing config files for Kokoro
| * | Add continuous testing config files for KokoroGravatar Matt Kwong2017-06-07
| | |
* | | Merge pull request #3191 from matt-kwong/kokoroGravatar Feng Xiao2017-06-06
|\| | | | | | | | Add MacOS and Linux tests to Kokoro
| * | Add MacOS and Linux tests to KokoroGravatar Matt Kwong2017-06-06
| | |
* | | Merge pull request #3189 from thomasvl/objc_proto3_unknown_fieldsGravatar Thomas Van Lenten2017-06-06
|\ \ \ | | | | | | | | ObjC: Preserve unknown fields in proto3 syntax files.
* \ \ \ Merge pull request #3160 from meteorcloudy/winbuildGravatar Feng Xiao2017-06-06
|\ \ \ \ | | | | | | | | | | Refactor cc options in BUILD file for Windows
* \ \ \ \ Merge pull request #3159 from yeswalrus/new-generateGravatar Adam Cozzette2017-06-06
|\ \ \ \ \ | | | | | | | | | | | | CMake: Add modern protobuf_generate
| | | * | | ObjC: Preserve unknown fields in proto3 syntax files.Gravatar Thomas Van Lenten2017-06-06
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | As announced: https://groups.google.com/forum/#!topic/protobuf/VX5qEmTW3y0 The ObjC side of https://github.com/google/protobuf/issues/272
* | | | | Merge pull request #3190 from thomasvl/objc_IllegalZeroFieldNumGravatar Thomas Van Lenten2017-06-06
|\ \ \ \ \ | | | | | | | | | | | | Properly error on a tag with field number zero.
| * | | | | Properly error on a tag with field number zero.Gravatar Thomas Van Lenten2017-06-06
|/ / / / /
* | | | | Merge pull request #3157 from yeswalrus/fix-version-checkGravatar Adam Cozzette2017-06-05
|\ \ \ \ \ | | | | | | | | | | | | Fix CMake version check
* | | | | | Add new file option php_namespace. (#3162)Gravatar Paul Yang2017-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| * | | | | fix check_and_save_build_option not correctly exporting build optionsGravatar Walter Gray2017-06-02
| | | | | |
| | * | | | add protobuf_generate function, allows use of target_sources where availableGravatar Walter Gray2017-06-02
| | | | | |
| | | | | * Ensure that for Java, imports of .proto files with empty packages worksGravatar Adam Cozzette2017-06-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #3169 from dmaclach/masterGravatar Thomas Van Lenten2017-06-01
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Optimize GPBDictionary.m codegen to reduce size of library
* | | | | | Merge pull request #3170 from thomasvl/int64_map_issueGravatar Thomas Van Lenten2017-06-01
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Fix some cases of reading of 64bit map values.
| * | | | | Fix some cases of reading of 64bit map values.Gravatar Thomas Van Lenten2017-06-01
|/ / / / / | | | | | | | | | | | | | | | Fixes https://github.com/google/protobuf/issues/3164.
| * / / / Optimize GPBDictionary.m codegen to reduce size of overall library by 46K ↵Gravatar Dave MacLachlan2017-06-01
|/ / / / | | | | | | | | | | | | per architecture.
| | | * Refactor cc options in BUILD file for WindowsGravatar Yun Peng2017-05-31
| |_|/ |/| | | | | | | | | | | Don't put gcc warnings options in copts, so that protobuf is able to build by MSVC toolchain without python wrappers.
| | * fix check_and_save_build_option not correctly exporting build optionsGravatar Walter Gray2017-05-30
| |/