aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Collapse)AuthorAge
* Include googletest as a submodule (#3993)Gravatar Carlos O'Ryan2018-03-26
| | | Add googletest as a submodule in third_party/googletest.
* source code info for interpreted options; fix source code info for extension ↵Gravatar Joshua Humphries2018-03-26
| | | | | | | | | range options (#4342) * when interpreting options, rewrite file descriptor's source code info - so that interpreted option paths have correct location information - so that corresponding uninterpreted option paths are removed also includes a fix to source code locations for extension range options
* Merge pull request #4431 from xfxyjwf/rmnanoGravatar Feng Xiao2018-03-26
|\ | | | | Remove javanano.
* | Fixes MSVC compiler warning C4800 "Forcing value to bool 'true' or 'false'" ↵Gravatar Alexey Malov2018-03-26
| | | | | | | | (#4350)
* | Merge pull request #4395 from stone4774/fixbug_enum2json2Gravatar Feng Xiao2018-03-26
|\ \ | | | | | | Fix bug: whether always_print_enums_as_ints is true or false, it alwa…
| | * Remove javanano.Gravatar Feng Xiao2018-03-26
| | |
* | | Fix missing LIBPROTOC_EXPORT.Gravatar Egor Pugin2018-03-25
| |/ |/| | | This makes possible to build grpc_php_plugin with protobuf in shared mode.
* | Removed some unused C++ source filesGravatar Adam Cozzette2018-03-22
| |
| * Merge branch 'master' into fixbug_enum2json2Gravatar stone47742018-03-22
| |\ | |/ |/|
| * Use the first enum value instead of 0 in ↵Gravatar stone47742018-03-21
| | | | | | | | DefaultValueObjectWriter::FindEnumDefault
* | Merge pull request #4387 from acozzette/down-integrateGravatar Adam Cozzette2018-03-20
|\ \ | | | | | | Integrated internal changes from Google
| * | Added new test source files to Makefile.amGravatar Adam Cozzette2018-03-20
| | |
| * | Removed use of some type traitsGravatar Adam Cozzette2018-03-20
| | | | | | | | | | | | | | | Pre-5.1.0 versions of GCC do not support these particular type traits (see https://github.com/google/protobuf/issues/417).
| | * Fix bug: whether always_print_enums_as_ints is true or false, it always ↵Gravatar stone47742018-03-19
| | | | | | | | | | | | print the default value of enums as strings
* | | Merge pull request #4371 from Rasrack/gnuc_minorGravatar Adam Cozzette2018-03-15
|\ \ \ | | | | | | | | Fix spelling error of __GNUC_MINOR__
* \ \ \ Merge pull request #4310 from KindDragon/patch-1Gravatar Feng Xiao2018-03-14
|\ \ \ \ | | | | | | | | | | Support using MSVC intrinsics in Log2FloorNonZero
| | | * | Deleted scoped_ptr.hGravatar Adam Cozzette2018-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | We no longer need this, now that we have finished the switch to C++11 and are using std::unique_ptr.
| | | * | Fixed up proto3_lite_unittest.ccGravatar Adam Cozzette2018-03-14
| | | | |
| | | * | Merge branch 'master' into down-integrateGravatar Adam Cozzette2018-03-13
| | | |\ \ | |_|_|/ / |/| | | |
| | | * | Integrated internal changes from GoogleGravatar Adam Cozzette2018-03-13
| | | | |
| | * | | Fix spelling error of __GNUC_MINOR__Gravatar Adam Aili2018-03-10
| |/ / / |/| | |
* | | | Revert "Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources."Gravatar Feng Xiao2018-03-01
| |_|/ |/| | | | | | | | This reverts commit 724f0be33d0eb42055ebe81ce0c8c7bf88ea666c.
* | | Merge pull request #4183 from pcc/win-libcxxGravatar Feng Xiao2018-02-26
|\ \ \ | | | | | | | | Add support for libc++ on Windows.
* \ \ \ Merge pull request #4334 from jmillikin/blacklist-internal-proto-srcsGravatar Feng Xiao2018-02-26
|\ \ \ \ | | | | | | | | | | Blacklist all WELL_KNOWN_PROTOS from Bazel C++ code generation.
* \ \ \ \ Merge pull request #4195 from alexey-malov/IgnoreUnknownEnumsInJsonGravatar Feng Xiao2018-02-26
|\ \ \ \ \ | | | | | | | | | | | | Adds an option in C++ JSON parser to ignore unrecognized enum values
| | * | | | Move `compiler/plugin.pb.cc` to libprotobuf with the other WKT sources.Gravatar John Millikin2018-02-24
| |/ / / / |/| | | | | | | | | | | | | | | | | | | This lets all values of `WELL_KNOWN_PROTOS` be treated the same with regard to Bazel's protobuf blacklisting.
* | | | | 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
|\ \