aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google
Commit message (Collapse)AuthorAge
...
* | | Merge pull request #2822 from anandolee/masterGravatar Jie Luo2017-03-10
|\ \ \ | | |/ | |/| Detect generated code of WKT, addressbook and conformance protos
* | | Merge pull request #2832 from pherl/javaepGravatar Jisi Liu2017-03-10
|\ \ \ | | | | | | | | Fix java code according to error prone.
* \ \ \ Merge pull request #2824 from xfxyjwf/i1415Gravatar Feng Xiao2017-03-10
|\ \ \ \ | | | | | | | | | | Use per-type table to lookup JSON name.
| | * | | Fix java code according to error prone.Gravatar Jisi Liu2017-03-10
| | | | |
* | | | | Repeated/Map field setter should accept a regular PHP array (#2817)Gravatar Paul Yang2017-03-10
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Accept regular PHP array for repeated/map setter. Existing map/repeated field will be swapped by a clean map/repeated field. Then, elements in the array will be added to the map/repeated field. All elements will be type checked before adding. See #2686 for detail.
| | * | Add auto detect for generated code of WKT protos, addressbook.proto and ↵Gravatar Jie Luo2017-03-10
| | | | | | | | | | | | | | | | conformance.proto
| * | | Use per-type table to lookup JSON name.Gravatar Feng Xiao2017-03-09
| |/ / | | | | | | | | | | | | | | | | | | Different fields from different messages can map to the same JSON name and the original global lookup table is only capable of mapping one of such fields. This change converts the global table to per-type tables so fields from different messages won't conflict.
* / / Fix lint warnings in the javalite branch.Gravatar Jisi Liu2017-03-09
|/ /
* | Merge pull request #2810 from xfxyjwf/i1994Gravatar Feng Xiao2017-03-09
|\ \ | | | | | | Avoid redundant type casts for oneof bytes fields.
* \ \ Merge pull request #2775 from xfxyjwf/fixmajorGravatar Feng Xiao2017-03-09
|\ \ \ | | | | | | | | Undef major/minor if they are defined as macro.
* \ \ \ Merge pull request #2814 from pherl/javadeprecateGravatar Jisi Liu2017-03-09
|\ \ \ \ | | | | | | | | | | Add annotations for deprecated messages in Java
| * | | | Add annotations for deprecated messages in JavaGravatar Jisi Liu2017-03-09
| | | | |
| | | * | Avoid redundant type casts for oneof bytes fields.Gravatar Feng Xiao2017-03-08
| |_|/ / |/| | |
| | | * compiler/cli: PrintHelpText prints to stdout instead of stderrGravatar Emmanuel Odeke2017-03-08
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #698. PrintHelpText now prints to standard output instead of to standard error. The purpose of this CL is to make it easy for users to grep for matches otherwise stderr output has to be awkwardly redirectly to stdout using this shell trick `2>&1`, for example ```shell protoc --help 2>&1 | grep cpp ``` of which we shouldn't be making users have to work that hard just to get use of --help. + Exhibits: * Before: ```shell $ protoc --help | grep cpp Usage: protoc [OPTION] PROTO_FILES Parse PROTO_FILES and generate output based on the options given: -IPATH, --proto_path=PATH Specify the directory in which to search for imports. May be specified multiple times; directories will be searched in order. If not given, the current working directory is used. --version Show version info and exit. -h, --help Show this text and exit. --encode=MESSAGE_TYPE Read a text-format message of the given type from standard input and write it in binary to standard output. The message type must be defined in PROTO_FILES or their imports. --decode=MESSAGE_TYPE Read a binary message of the given type from standard input and write it in text format to standard output. The message type must be defined in PROTO_FILES or their imports. --decode_raw Read an arbitrary protocol message from standard input and write the raw tag/value pairs in text format to standard output. No PROTO_FILES should be given when using this flag. -oFILE, Writes a FileDescriptorSet (a protocol buffer, --descriptor_set_out=FILE defined in descriptor.proto) containing all of the input files to FILE. --include_imports When using --descriptor_set_out, also include all dependencies of the input files in the set, so that the set is self-contained. --include_source_info When using --descriptor_set_out, do not strip SourceCodeInfo from the FileDescriptorProto. This results in vastly larger descriptors that include information about the original location of each decl in the source file as well as surrounding comments. --dependency_out=FILE Write a dependency output file in the format expected by make. This writes the transitive set of input file paths to FILE --error_format=FORMAT Set the format in which to print errors. FORMAT may be 'gcc' (the default) or 'msvs' (Microsoft Visual Studio format). --print_free_field_numbers Print the free field numbers of the messages defined in the given proto files. Groups share the same field number space with the parent message. Extension ranges are counted as occupied fields numbers. --plugin=EXECUTABLE Specifies a plugin executable to use. Normally, protoc searches the PATH for plugins, but you may specify additional executables not in the path using this flag. Additionally, EXECUTABLE may be of the form NAME=PATH, in which case the given plugin name is mapped to the given executable even if the executable's own name differs. --cpp_out=OUT_DIR Generate C++ header and source. --csharp_out=OUT_DIR Generate C# source file. --java_out=OUT_DIR Generate Java source file. --javanano_out=OUT_DIR Generate Java Nano source file. --js_out=OUT_DIR Generate JavaScript source. --objc_out=OUT_DIR Generate Objective C header and source. --python_out=OUT_DIR Generate Python source file. --ruby_out=OUT_DIR Generate Ruby source file. ``` * After: ```shell $ protoc --help | grep cpp --plugin=EXECUTABLE Specifies a plugin executable to use. Normally, protoc searches the PATH for plugins, but you may specify additional executables not in the path using this flag. Additionally, EXECUTABLE may be of the form NAME=PATH, in which case the given plugin name is mapped to the given executable even if the executable's own name differs. --cpp_out=OUT_DIR Generate C++ header and source. --csharp_out=OUT_DIR Generate C# source file. --java_out=OUT_DIR Generate Java source file. --javanano_out=OUT_DIR Generate Java Nano source file. --js_out=OUT_DIR Generate JavaScript source. --objc_out=OUT_DIR Generate Objective C header and source. --python_out=OUT_DIR Generate Python source file. --ruby_out=OUT_DIR Generate Ruby source file. ```
* | | Removed a stray return statement, causing compilation error.Gravatar Manjunath Kudlur2017-03-06
| | |
* | | Detect if Descriptor.cs changes for csharpGravatar Jie Luo2017-03-06
|\ \ \ | | | | | | | | Merge pull request #2788 from anandolee/master
| * | | Detect if Descriptor.cs changes for csharpGravatar Jie Luo2017-03-02
| | | |
* | | | Return uint32 from Log2FloorNonZero64Gravatar Adam Cozzette2017-03-02
|/ / / | | | | | | | | | | | | | | | A uint32 is big enough to hold any return value from that function, and doing it this way prevents compiler warnings in coded_stream.h about narrowing a uint64 to a uint32.
* | | Fix gcc 4.1 build (#1035) (#1913)Gravatar Matt Hauck2017-03-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix gcc 4.1.2 compilation of map_field_inl.h Fixes "error: object missing in reference to '...'" errors from #1035 * Disable 64-bit map keys on gcc <= 4.1 * Add missing case statements
* | | Change hint type to `const void*` (#2568)Gravatar Matt Hauck2017-03-01
| | | | | | | | | This is both more correct, and the build fails on AIX without it
| | * Undef major/minor if they are defined as macro.Gravatar Feng Xiao2017-02-28
| |/ |/|
* | Merge pull request #2770 from xfxyjwf/fixcmakeGravatar Jisi Liu2017-02-28
|\ \ | | | | | | Remove the use of C++11 features.
* | | There might be duplicated enum values when allow_alias is true. Add ↵Gravatar Jie Luo2017-02-28
| | | | | | | | | | | | PreferredAlias into OriginalNameAttribute to remove the duplication (#2727)
| * | Remove the use of C++11 features.Gravatar Feng Xiao2017-02-27
| | |
* | | Merge pull request #2729 from MarcelRaad/fix_inline_msvc12Gravatar Adam Cozzette2017-02-27
|\ \ \ | |/ / |/| | Fix unresolved symbols with MSVC12 and /Zc:inline
* | | Merge pull request #2355 from xfxyjwf/fixjsonGravatar Feng Xiao2017-02-24
|\ \ \ | | | | | | | | Speed up JSON parsing.
* \ \ \ Merge pull request #2732 from AsturaPhoenix/masterGravatar Adam Cozzette2017-02-24
|\ \ \ \ | | | | | | | | | | const FieldDescriptorCompare
* | | | | Fix compiler warnings about unused variables in generated_message_reflection.hGravatar Aurimas Liutikas2017-02-22
| | | | |
* | | | | Add an option to always print enums as ints in Json APIGravatar Sanchay Harneja2017-02-18
| | | | | | | | | | | | | | | | | | | | https://github.com/google/protobuf/issues/2735
| * | | | const FieldDescriptorCompareGravatar Ross Wang2017-02-17
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Clang now validates that <set> comparators must have a const operator(): https://reviews.llvm.org/rL291969 Discussion: https://groups.google.com/d/msg/protobuf/9W6zFIHaJ-4/9RrfwelpEQAJ
| | * / Fix unresolved symbols with MSVC12 and /Zc:inlineGravatar Marcel Raad2017-02-17
| |/ / |/| | | | | | | | | | | | | | | | | In #726 and #813, linking errors with MSVC14 were resolved. The change in MSVC12 leading to these errors was not a newly introduced bug, but that /Zc:inline was made on by default. This option is also available with MSVC12, so the workaround should be applied for it too.
* | | Keep loop bounds in a local variable for string fields.Gravatar Chris Kennelly2017-02-15
| | |
* | | Keep loop bounds in a local variable.Gravatar Chris Kennelly2017-02-15
| | |
* | | Work with truncated tag numbers.Gravatar Chris Kennelly2017-02-15
| | | | | | | | | | | | | | | This allows more compact comparisons (1 byte instead of 4 byte immediates on x86) for each possible wire/tag inside each field.
* | | Expose rvalue setters for repeated string fields.Gravatar Chris Kennelly2017-02-15
| | | | | | | | | | | | rvalue setters for scalar string fields were added in #2506.
* | | Merge pull request #2663 from ckennelly/varint-sizeGravatar Adam Cozzette2017-02-15
|\ \ \ | | | | | | | | Inline branch-less VarintSize32/VarintSize64 implementations.
* \ \ \ Merge pull request #2689 from ckennelly/aliasing-fixed32-fixed64Gravatar Adam Cozzette2017-02-14
|\ \ \ \ | | | | | | | | | | Avoid aliasing CodedInputStream::buffer_ when parsing little endian integers
* | | | | Improve support for plugin parameters.Gravatar Thomas Van Lenten2017-02-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --[name]_opt support depended on the plugin being register, and didn't support working with just --[name]_out directive (where the plugin is found via the users PATH. This extends the command line handing to allow --[name]_out to be all it takes for the _opt directive to also be supported. Fixes https://github.com/google/protobuf/issues/2712
* | | | | Merge pull request #2609 from yixiang/patch-1Gravatar Feng Xiao2017-02-13
|\ \ \ \ \ | |_|_|_|/ |/| | | | Undef TYPE_BOOL to avoid conflict with iOS.
* | | | | Merge pull request #2451 from podsvirov/json-primitive-mapGravatar Feng Xiao2017-02-13
|\ \ \ \ \ | | | | | | | | | | | | JsonUtilTest: Add ParsePrimitiveMapIn subtest
| * | | | | JsonUtilTest: Add ParsePrimitiveMapIn subtestGravatar Konstantin Podsvirov2017-02-11
| | | | | |
* | | | | | Fix compiler warnings about unused variables in wire_format.hGravatar Aurimas Liutikas2017-02-10
| | | | | |
* | | | | | Switch to gcc atomic intrinsics for macOS and delete the file that uses (#2699)Gravatar Jonathan Hseu2017-02-10
| | | | | | | | | | | | | | | | | | the deprecated atomics.
* | | | | | Merge pull request #2647 from anandolee/masterGravatar Jie Luo2017-02-09
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix python compatibility test
| * | | | | Fix python compatibility test when a new generated code imports an old ↵Gravatar Jie Luo2017-02-09
| | | | | | | | | | | | | | | | | | | | | | | | version(2.6.1 or older) generated code.
| | | * | | Avoid aliasing CodedInputStream::buffer_ when parsing little endian integers.Gravatar Chris Kennelly2017-02-07
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | This eliminates an unnecessary reload of buffer_ that occurs (before this change) after the store to *value.
| | | * | Inline branch-less VarintSize32/VarintSize64 implementations.Gravatar Chris Kennelly2017-02-02
| |_|/ / |/| | |
* | | | Merge 3.2.x branch into master (#2648)Gravatar Paul Yang2017-01-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Down-integrate internal changes to github. * Update conformance test failure list. * Explicitly import used class in nano test to avoid random test fail. * Update _GNUC_VER to use the correct implementation of atomic operation on Mac. * maps_test.js: check whether Symbol is defined before using it (#2524) Symbol is not yet available on older versions of Node.js and so this test fails with them. This change just directly checks whether Symbol is available before we try to use it. * Added well_known_types_embed.cc to CLEANFILES so that it gets cleaned up * Updated Makefile.am to fix out-of-tree builds * Added Bazel genrule for generating well_known_types_embed.cc In pull request #2517 I made this change for the CMake and autotools builds but forgot to do it for the Bazel build. * Update _GNUC_VER to use the correct implementation of atomic operation on Mac. * Add new js file in extra dist. * Bump version number to 3.2.0 * Fixed issue with autoloading - Invalid paths (#2538) * PHP fix int64 decoding (#2516) * fix int64 decoding * fix int64 decoding + tests * Fix int64 decoding on 32-bit machines. * Fix warning in compiler/js/embed.cc embed.cc: In function ‘std::string CEscape(const string&)’: embed.cc:51:32: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] for (int i = 0; i < str.size(); ++i) { ^ * Fix include in auto-generated well_known_types_embed.cc Restore include style fix (e3da722) that has been trampled by auto-generation of well_known_types_embed.cc * Fixed cross compilations with the Autotools build Pull request #2517 caused cross compilations to start failing, because the js_embed binary was being built to run on the target platform instead of on the build machine. This change updates the Autotools build to use the AX_PROG_CXX_FOR_BUILD macro to find a suitable compiler for the build machine and always use that when building js_embed. * Minor fix for autocreated object repeated fields and maps. - If setting/clearing a repeated field/map that was objects, check the class before checking the autocreator. - Just to be paranoid, don’t mutate within copy/mutableCopy for the autocreated classes to ensure there is less chance of issues if someone does something really crazy threading wise. - Some more tests for the internal AutocreatedArray/AutocreatedDictionary classes to ensure things are working as expected. - Add Xcode 8.2 to the full_mac_build.sh supported list. * Fix generation of extending nested messages in JavaScript (#2439) * Fix generation of extending nested messages in JavaScript * Added missing test8.proto to build * Fix generated code when there is no namespace but there is enum definition. * Decoding unknown field should succeed. * Add embed.cc in src/Makefile.am to fix dist check. * Fixed "make distcheck" for the Autotools build To make the test pass I needed to fix out-of-tree builds and update EXTRA_DIST and CLEANFILES. * Remove redundent embed.cc from src/Makefile.am * Update version number to 3.2.0-rc.1 (#2578) * Change protoc-artifacts version to 3.2.0-rc.1 * Update version number to 3.2.0rc2 * Update change logs for 3.2.0 release. * Update php README * Update upb, fixes some bugs (including a hash table problem). (#2611) * Update upb, fixes some bugs (including a hash table problem). * Ruby: added a test for the previous hash table corruption. Verified that this triggers the bug in the currently released version. * Ruby: bugfix for SEGV. * Ruby: removed old code for dup'ing defs. * Reverting deployment target to 7.0 (#2618) The Protobuf library doesn’t require the 7.1 deployment target so reverting it back to 7.0 * Fix typo that breaks builds on big-endian (#2632) * Bump version number to 3.2.0
* | | | fix compile error on centos in metadata.h for constructors. (#2599)Gravatar michaelpengcn2017-01-27
| | | |
* | | | Oneof accessor should return the field name that is actually set. (#2631)Gravatar Paul Yang2017-01-27
|/ / /