aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Collapse)AuthorAge
...
* | | | | Merge pull request #4323 from dtapuska/masterGravatar Feng Xiao2018-02-20
|\ \ \ \ \ | | | | | | | | | | | | Rename a shadowed variable.
| * | | | | Rename a shadowed variable.Gravatar Dave Tapuska2018-02-20
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Shadowed variables can cause readability issues. Ensure a shadowed variable isn't used in header files which may be used in a dependent project that explicitly disables them.
* | | | | Merge pull request #3186 from gkelly/remove-unused-variableGravatar Feng Xiao2018-02-20
|\ \ \ \ \ | |/ / / / |/| | | | Remove unused output_file variable from js_embed
| | | | * Support using MSVC intrinsics in Log2FloorNonZeroGravatar Arkady Shapkin2018-02-15
| |_|_|/ |/| | |
| | * | The JsonParseOptions::ignore_unknown_fields option behavior treatsGravatar Alexey Malov2018-02-12
| | | | | | | | | | | | | | | | unrecognized string values in enum fields as default ones.
* | | | Remove stray indent on normal imports.Gravatar Thomas Van Lenten2018-02-08
| | | |
* | | | Remove use of GOOGLE_FALLTHROUGH_INTENDED from protobuf.Gravatar Nico Weber2018-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chrome is running into two issues with the use of this macro in open-source protobuf (https://crbug.com/809157): 1. GOOGLE_FALLTHROUGH_INTENDED is defined to nothing on __APPLE__ platforms, which blocks us from enabling -Wimplicit-fallthrough on Mac and iOS. (We use a hermetic self-built modern clang, so whatever Xcode bug that exclusion might be for doesn't apply to us.) 2. It's in a public header file, and it's included in a public header file. When clang suggests adding [[clang::fallthrough]], it checks if it knows of a macro expanding to that and if so, suggests inserting that. Since lots of chrome code includes protobuf headers, it often suggests inserting GOOGLE_FALLTHROUGH_INTENDED (from protobuf) instead of the correct FALLTHROUGH (from chrome's base). Since the fallthrough doens't do anyting useful, just remove it. Long ago, this might have had perf impact, but d64a2d9941c36a7bc added a parsing fast path that calls this switch as slow fallback, so it should be off the hot path nowadays. No intended behavior change. This is the public version of internal change 184824132.
* | | | Merge pull request #4239 from mrpi/masterGravatar Adam Cozzette2018-01-31
|\ \ \ \ | | | | | | | | | | Create std::string in Arena memory
* | | | | Fix to use "nil" instead of "NULL" for objc objects.Gravatar Thomas Van Lenten2018-01-31
| | | | |
| * | | | Fix -fpermissive: '<::' cannot begin a template-argument listGravatar Ludger Sprenker2018-01-30
| | | | | | | | | | | | | | | '<:' is an alternate spelling for '['.
* | | | | Add Vcpkg to C++ installation instructions for WindowsGravatar Robert Schumacher2018-01-29
| | | | | | | | | | | | | | | | | | | | Fixes issue #1154 by noting that `vcpkg` contains protobuf. Potential improvements: also remark how to use `vcpkg` to get dependencies when building from source via CMake.
* | | | | Merge pull request #4240 from davido/generate_warning_free_java_codeGravatar Feng Xiao2018-01-29
|\ \ \ \ \ | | | | | | | | | | | | Java: Generate warning free code
| * | | | | Java: Generate warning free codeGravatar David Ostrovsky2018-01-27
| | | | | | | | | | | | | | | | | | | | | | | | Partially fixes #4230.
* | | | | | Removed using statements from common.hGravatar Adam Cozzette2018-01-26
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | These statements pulled a bunch of symbols from the std namespace into the global namespace. This commit removes all of them except for std::string, which is a bit trickier to remove.
* | | | | Merge pull request #3934 from xfxyjwf/builtsourcesGravatar Feng Xiao2018-01-25
|\ \ \ \ \ | | | | | | | | | | | | Remove the use of BUILT_SOURCES
* | | | | | Add an explicit import of stdatomic.h.Gravatar Thomas Van Lenten2018-01-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The generated code for enums needs atomics support, so generate the import instead of relying on it via transitive imports. This will make future changes to this likely likely to break generated code and runtime support are mixed. Followup to https://github.com/google/protobuf/pull/4184.
| * | | | | Remove the use of BUILT_SOURCESGravatar Feng Xiao2018-01-24
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/google/protobuf/issues/3912 [BUILT_SOURCES](https://www.gnu.org/software/automake/manual/html_node/Sources.html) is used with [Automake's automatic dependency tracking](https://www.gnu.org/software/automake/manual/html_node/Dependencies.html#Dependencies) but doesn't work well in protobuf when cross-compiling. Their presence causes maek to always generate them even when they are not requested and as a result causes cross-compilation to fail because the built protoc cannot be used to generate unittest protos (see: https://github.com/google/protobuf/issues/3912). Removing it with explicit dependencies fixes the build issue when running 'make', 'make all', 'make install' at cross-compilation. It doesn't affect 'make protoc' because BUILT_SOURCES only works for the implicit targets 'all', 'check' or 'install'.
| * / / / Create std::string in Arena memoryGravatar Ludger Sprenker2018-01-24
|/ / / /
* | / / Migrate away from deprecated OSAtomic APIs. (#4184)Gravatar Jonathan Dierksen2018-01-22
| |/ / |/| | | | | | | | * Migrate away from deprecated OSAtomic APIs.
| | * Add support for libc++ on Windows.Gravatar Peter Collingbourne2018-01-17
| |/ |/| | | | | | | This disables a couple of workarounds which are only necessary with MSVC's standard library and cause problems with libc++.
* | Merge pull request #4148 from datacompboy/patch-2Gravatar Adam Cozzette2018-01-08
|\ \ | | | | | | Add more tests to time_test
| * | Update time_test.ccGravatar Anton Fedorov2018-01-05
| | | | | | | | | Better test coverage for datetime validation.
* | | Fix ValidateDateTime: check day instead monthGravatar Anton Fedorov2018-01-05
|/ / | | | | | | Found with PVS-Studio static analyser, see https://www.viva64.com/en/b/0550/
* | Merge remote-tracking branch 'origin/3.5.x' into masterGravatar Jisi Liu2018-01-03
|\ \
* \ \ Merge remote-tracking branch 'origin/3.5.x' into masterGravatar Jisi Liu2018-01-03
|\ \ \
| | * | remove nullptrGravatar Jisi Liu2018-01-02
| |/ /
| * | Merge pull request #4080 from pherl/arm64Gravatar Jisi Liu2017-12-20
| |\ \ | | | | | | | | Add support for Windows ARM64 build
| | * | Add support for Windows ARM64 buildGravatar Miradham Kamilov2017-12-20
| | | |
* | | | Merge pull request #4077 from mkamilov/masterGravatar Jisi Liu2017-12-20
|\ \ \ \ | | | | | | | | | | Add support for Windows ARM64 build
* | | | | line breaks adjstedGravatar Ubuntu2017-12-20
| | | | |
* | | | | formatting issuesGravatar Ubuntu2017-12-20
| | | | |
| | * | | Merge pull request #4072 from google/jieluoGravatar Jisi Liu2017-12-19
| | |\ \ \ | | | | | | | | | | | | Cherrypick for csharp, including:
| | | * | | Cherrypick for csharp, including:Gravatar Jie Luo2017-12-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add preserve UnknownFields Compare floating point values bitwise Add auto-generated header to C# generated files
| | * | | | Fix string::back() usage in googletest.ccGravatar Jisi Liu2017-12-19
| | | |/ / | | |/| |
| | * | | Merge pull request #4074 from pherl/mapatGravatar Jisi Liu2017-12-19
| | |\ \ \ | | | | | | | | | | | | Replace C++11 only method std::map::at
| | | * | | Replace C++11 only method std::map::atGravatar Jisi Liu2017-12-19
| | | |/ /
| | * / / Update version number to 3.5.1Gravatar Jisi Liu2017-12-19
| | |/ /
* | | | resolve issue 4032 and added a unit testGravatar Ubuntu2017-12-19
| | | |
| * | | Add support for Windows ARM64 buildGravatar Miradham Kamilov2017-12-19
|/ / /
| * | Merge pull request #4040 from bazurbat/3.5.xGravatar Adam Cozzette2017-12-15
| |\ \ | | | | | | | | Create containing directory before generating well_known_types_embed.cc
* | \ \ Merge pull request #4046 from acozzette/deprecated-valueof-issue-2054Gravatar Adam Cozzette2017-12-14
|\ \ \ \ | | | | | | | | | | Java: generate an annotation to suppress deprecation warnings
* \ \ \ \ Merge pull request #4045 from pherl/deprecateGravatar Jisi Liu2017-12-14
|\ \ \ \ \ | | | | | | | | | | | | Add deprecation annotation for oneof case.
| | * | | | Generate an annotation to suppress deprecation warningsGravatar Adam Cozzette2017-12-13
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | The valueOf method on enums is deprecated, but for compatibility reasons the generated code has to keep using it. We can use an annotation to suppress the deprecation warnings.
* | | | | Add auto-generated header to C# generated files (#4038)Gravatar Jan Tattermusch2017-12-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add auto-generated header to C# generated files * regenerate C# protos
* | | | | Merge pull request #4044 from xfxyjwf/issue3268Gravatar Feng Xiao2017-12-13
|\ \ \ \ \ | | | | | | | | | | | | Avoid double underscores in macro name
* \ \ \ \ \ Merge pull request #4041 from acozzette/fix-license-issue-1775Gravatar Adam Cozzette2017-12-13
|\ \ \ \ \ \ | | | | | | | | | | | | | | Added our standard license header to structurally_valid.cc and its test
| | | * | | | Add deprecation annotation for oneof case.Gravatar Jisi Liu2017-12-13
| | | | | | |
| | * | | | | Update generated code.Gravatar Feng Xiao2017-12-13
| | | | | | |
* | | | | | | Add unknown field support for csharp (#3936)Gravatar Jie Luo2017-12-13
| | | | | | | | | | | | | | | | | | | | | Add unknown field support for csharp
| | * | | | | Avoid two consecutive underscores in macro name.Gravatar Feng Xiao2017-12-13
| |/ / / / / |/| | | | | | | | | | | | | | | | | Fixes https://github.com/google/protobuf/issues/3268