aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2861 from byronyi/#710Adam Cozzette2017-03-204-0/+205
|\ | | | | migrate delimited messages functions to util package
| * Update delimited_message_util_test.ccBairen Yi2017-03-181-1/+1
| |
| * fix several issuesByron Yi2017-03-173-15/+15
| |
| * add LIBPROTOBUF_EXPORT to make msvc happyByron Yi2017-03-161-6/+6
| |
| * migrate delimited messages functions to util packageByron Yi2017-03-164-0/+205
| |
* | Merge pull request #2860 from prehistoric-penguin/masterFeng Xiao2017-03-202-60/+0
|\ \ | | | | | | Remove duplicated copyright statement
| * | Remove duplicated copyright statementprehistoric-penguin2017-03-162-60/+0
| |/
* | Merge pull request #2854 from hesmar/attributesFixAdam Cozzette2017-03-203-31/+31
|\ \ | | | | | | fix attributes warning
| * | fix attributes warningMarkus Heß2017-03-153-31/+31
| | |
* | | Merge pull request #2867 from mojoBrendan/masterFeng Xiao2017-03-177-9/+86
|\ \ \ | | | | | | | | Add preserve_proto_field_names option to JsonPrintOptions
| * | | Add option to preserve original proto field namesBrendan McCarthy2017-03-179-28/+87
| | | |
| * | | Add use_snake_case_for_field_names option to JsonPrintOptionsBrendan McCarthy2017-03-174-3/+21
| | |/ | |/|
* | | Merge pull request #2837 from anandolee/masterJie Luo2017-03-172-2/+19
|\ \ \ | | | | | | | | DefaultValueObjectWriter should populate oneof message field
| * | | DefaultValueObjectWriter should populate oneof message fieldJie Luo2017-03-102-2/+19
| | | |
* | | | Add file option php_class_prefix (#2849)Paul Yang2017-03-174-148/+358
| | | | | | | | | | | | | | | | This option will be prepended to generated classes of all messages in the containing file.
* | | | Merge pull request #2848 from xfxyjwf/freebsdFeng Xiao2017-03-174-0/+63
|\ \ \ \ | |_|/ / |/| | | Fix freebsd build.
| * | | Fix freebsd build.Feng Xiao2017-03-144-0/+63
| | |/ | |/| | | | | | | | | | | | | | | | | | | It turns out system headers included by generated plugin.pb.h file already contains major/minor macro definitions when built on FreeBSD and we need to add #undefs to the generated header file. This change also fixes another compile error regarding EXPECT_DEATH on FreeBSD.
* | | Merge pull request #2023 from odeke-em/fix-print-help-to-stdoutJoshua Haberman2017-03-152-8/+18
|\ \ \ | | | | | | | | compiler/cli: PrintHelpText prints to stdout instead of stderr
| * | | compiler/cli: PrintHelpText prints to stdout instead of stderrEmmanuel Odeke2017-03-082-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. ```
* | | | Merge pull request #2829 from afrantzis/hide-unnecessary-library-symbolsAdam Cozzette2017-03-154-0/+42
|\ \ \ \ | | | | | | | | | | Hide unnecessary exported library symbols
| * | | | Hide unnecessary exported library symbolsAlexandros Frantzis2017-03-134-0/+42
| | | | |
* | | | | Merge pull request #2846 from acozzette/bytestream-commentAdam Cozzette2017-03-151-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | Updated an outdated comment in bytestream.h
| * | | | Updated an outdated comment in bytestream.hAdam Cozzette2017-03-141-1/+1
| |/ / /
* / / / Replace CHECK() with GOOGLE_CHECK().Josh Haberman2017-03-131-3/+4
|/ / / | | | | | | | | | Fixes: https://github.com/google/protobuf/issues/1175
* | | Merge pull request #2822 from anandolee/masterJie Luo2017-03-101-18/+73
|\ \ \ | | |/ | |/| Detect generated code of WKT, addressbook and conformance protos
| * | Add auto detect for generated code of WKT protos, addressbook.proto and ↵Jie Luo2017-03-101-18/+73
| | | | | | | | | | | | conformance.proto
* | | Merge pull request #2832 from pherl/javaepJisi Liu2017-03-101-1/+1
|\ \ \ | | | | | | | | Fix java code according to error prone.
| * | | Fix java code according to error prone.Jisi Liu2017-03-101-1/+1
| | | |
* | | | Merge pull request #2824 from xfxyjwf/i1415Feng Xiao2017-03-103-10/+45
|\ \ \ \ | | | | | | | | | | Use per-type table to lookup JSON name.
| * | | | Use per-type table to lookup JSON name.Feng Xiao2017-03-093-10/+45
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Repeated/Map field setter should accept a regular PHP array (#2817)Paul Yang2017-03-101-1/+27
| |/ / |/| | | | | | | | | | | | | | | | | | | | 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.
* | | Fix lint warnings in the javalite branch.Jisi Liu2017-03-092-0/+2
|/ /
* | Merge pull request #2810 from xfxyjwf/i1994Feng Xiao2017-03-091-4/+22
|\ \ | | | | | | Avoid redundant type casts for oneof bytes fields.
| * | Avoid redundant type casts for oneof bytes fields.Feng Xiao2017-03-081-4/+22
| |/
* | Merge pull request #2775 from xfxyjwf/fixmajorFeng Xiao2017-03-092-1/+14
|\ \ | | | | | | Undef major/minor if they are defined as macro.
| * | Undef major/minor if they are defined as macro.Feng Xiao2017-02-282-1/+14
| | |
* | | Merge pull request #2814 from pherl/javadeprecateJisi Liu2017-03-093-10/+28
|\ \ \ | |_|/ |/| | Add annotations for deprecated messages in Java
| * | Add annotations for deprecated messages in JavaJisi Liu2017-03-093-10/+28
| | |
* | | Removed a stray return statement, causing compilation error.Manjunath Kudlur2017-03-061-1/+0
| | |
* | | Detect if Descriptor.cs changes for csharpJie Luo2017-03-063-1/+144
|\ \ \ | | | | | | | | Merge pull request #2788 from anandolee/master
| * | | Detect if Descriptor.cs changes for csharpJie Luo2017-03-023-1/+144
| | | |
* | | | Return uint32 from Log2FloorNonZero64Adam Cozzette2017-03-021-1/+1
|/ / / | | | | | | | | | | | | | | | 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)Matt Hauck2017-03-013-19/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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)Matt Hauck2017-03-011-1/+1
| |/ |/| | | This is both more correct, and the build fails on AIX without it
* | Merge pull request #2770 from xfxyjwf/fixcmakeJisi Liu2017-02-2814-410/+410
|\ \ | | | | | | Remove the use of C++11 features.
| * | Remove the use of C++11 features.Feng Xiao2017-02-2714-410/+410
| | |
* | | There might be duplicated enum values when allow_alias is true. Add ↵Jie Luo2017-02-282-4/+16
| | | | | | | | | | | | PreferredAlias into OriginalNameAttribute to remove the duplication (#2727)
* | | Merge pull request #2729 from MarcelRaad/fix_inline_msvc12Adam Cozzette2017-02-271-6/+6
|\ \ \ | |/ / |/| | Fix unresolved symbols with MSVC12 and /Zc:inline
| * | Fix unresolved symbols with MSVC12 and /Zc:inlineMarcel Raad2017-02-171-6/+6
| | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #2355 from xfxyjwf/fixjsonFeng Xiao2017-02-242-14/+20
|\ \ \ | | | | | | | | Speed up JSON parsing.
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-09 09:52:55 +0000