aboutsummaryrefslogtreecommitdiff
path: root/src/google
Commit message (Collapse)AuthorAgeFilesLines
* Don't generate imports for the WKTs unless generating the WKTs.Thomas Van Lenten2018-04-024-8/+21
| | | | | Since the generated header import GPBProtocolBuffers.h, there is no need to generate imports for the WKTs as they will have already been imported.
* Trim imports for bundled generated protos.Thomas Van Lenten2018-04-022-12/+41
| | | | | | | | To avoid a cycle between headers, have the WKTs use minimal imports instead of using the helper to get everything from the library. Fixes https://github.com/google/protobuf/issues/4301 Fixes https://github.com/google/protobuf/issues/4403
* Removed atomicops.h since it is no longer usedAdam Cozzette2018-03-271-237/+0
|
* source code info for interpreted options; fix source code info for extension ↵Joshua Humphries2018-03-264-68/+748
| | | | | | | | | 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/rmnanoFeng Xiao2018-03-2624-5807/+0
|\ | | | | Remove javanano.
| * Remove javanano.Feng Xiao2018-03-2624-5807/+0
| |
* | Fixes MSVC compiler warning C4800 "Forcing value to bool 'true' or 'false'" ↵Alexey Malov2018-03-262-2/+2
| | | | | | | | (#4350)
* | Merge pull request #4395 from stone4774/fixbug_enum2json2Feng Xiao2018-03-265-17/+66
|\ \ | | | | | | Fix bug: whether always_print_enums_as_ints is true or false, it alwa…
| * \ Merge branch 'master' into fixbug_enum2json2stone47742018-03-22235-12876/+13225
| |\ \
| * | | Use the first enum value instead of 0 in ↵stone47742018-03-211-1/+1
| | | | | | | | | | | | | | | | DefaultValueObjectWriter::FindEnumDefault
| * | | Fix bug: whether always_print_enums_as_ints is true or false, it always ↵stone47742018-03-195-17/+66
| | | | | | | | | | | | | | | | print the default value of enums as strings
* | | | Fix missing LIBPROTOC_EXPORT.Egor Pugin2018-03-251-3/+6
| |_|/ |/| | | | | This makes possible to build grpc_php_plugin with protobuf in shared mode.
* | | Removed some unused C++ source filesAdam Cozzette2018-03-2220-4897/+0
| |/ |/|
* | Merge pull request #4387 from acozzette/down-integrateAdam Cozzette2018-03-20234-12869/+13215
|\ \ | | | | | | Integrated internal changes from Google
| * | Removed use of some type traitsAdam Cozzette2018-03-203-5/+5
| | | | | | | | | | | | | | | Pre-5.1.0 versions of GCC do not support these particular type traits (see https://github.com/google/protobuf/issues/417).
| * | Deleted scoped_ptr.hAdam Cozzette2018-03-1424-306/+47
| | | | | | | | | | | | | | | 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.ccAdam Cozzette2018-03-141-11/+11
| | |
| * | Merge branch 'master' into down-integrateAdam Cozzette2018-03-139-12/+77
| |\|
| * | Integrated internal changes from GoogleAdam Cozzette2018-03-13212-12586/+13191
| | |
* | | Merge pull request #4371 from Rasrack/gnuc_minorAdam Cozzette2018-03-151-1/+1
|\ \ \ | | | | | | | | Fix spelling error of __GNUC_MINOR__
| * | | Fix spelling error of __GNUC_MINOR__Adam Aili2018-03-101-1/+1
| | |/ | |/|
* | | Merge pull request #4310 from KindDragon/patch-1Feng Xiao2018-03-141-6/+9
|\ \ \ | |/ / |/| | Support using MSVC intrinsics in Log2FloorNonZero
| * | Support using MSVC intrinsics in Log2FloorNonZeroArkady Shapkin2018-02-151-6/+9
| |/
* | Merge pull request #4183 from pcc/win-libcxxFeng Xiao2018-02-262-2/+3
|\ \ | | | | | | Add support for libc++ on Windows.
| * | Add support for libc++ on Windows.Peter Collingbourne2018-01-172-2/+3
| | | | | | | | | | | | | | | This disables a couple of workarounds which are only necessary with MSVC's standard library and cause problems with libc++.
* | | Merge pull request #4195 from alexey-malov/IgnoreUnknownEnumsInJsonFeng Xiao2018-02-265-6/+72
|\ \ \ | | | | | | | | Adds an option in C++ JSON parser to ignore unrecognized enum values
| * | | The JsonParseOptions::ignore_unknown_fields option behavior treatsAlexey Malov2018-02-125-6/+72
| |/ / | | | | | | | | | unrecognized string values in enum fields as default ones.
* | | Merge pull request #4323 from dtapuska/masterFeng Xiao2018-02-201-2/+2
|\ \ \ | | | | | | | | Rename a shadowed variable.
| * | | Rename a shadowed variable.Dave Tapuska2018-02-201-2/+2
| | |/ | |/| | | | | | | | | | | | | 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-variableFeng Xiao2018-02-201-2/+0
|\ \ \ | |/ / |/| | Remove unused output_file variable from js_embed
| * | Remove unused output_file variable from js_embedGarret Kelly2017-06-051-2/+0
| | | | | | | | | | | | | | | The js_embed tool outputs to stdout, so the output_file variable is unnecessary and unused.
* | | Remove stray indent on normal imports.Thomas Van Lenten2018-02-081-2/+2
| | |
* | | Remove use of GOOGLE_FALLTHROUGH_INTENDED from protobuf.Nico Weber2018-02-072-16/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/masterAdam Cozzette2018-01-311-4/+2
|\ \ \ | | | | | | | | Create std::string in Arena memory
| * | | Fix -fpermissive: '<::' cannot begin a template-argument listLudger Sprenker2018-01-301-1/+1
| | | | | | | | | | | | '<:' is an alternate spelling for '['.
| * | | Create std::string in Arena memoryLudger Sprenker2018-01-241-4/+2
| | | |
* | | | Fix to use "nil" instead of "NULL" for objc objects.Thomas Van Lenten2018-01-311-1/+1
| | | |
* | | | Merge pull request #4240 from davido/generate_warning_free_java_codeFeng Xiao2018-01-292-0/+30
|\ \ \ \ | | | | | | | | | | Java: Generate warning free code
| * | | | Java: Generate warning free codeDavid Ostrovsky2018-01-272-0/+30
| | | | | | | | | | | | | | | | | | | | Partially fixes #4230.
* | | | | Removed using statements from common.hAdam Cozzette2018-01-2636-148/+143
|/ / / / | | | | | | | | | | | | | | | | | | | | 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.
* / / / Add an explicit import of stdatomic.h.Thomas Van Lenten2018-01-251-0/+35
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | / Migrate away from deprecated OSAtomic APIs. (#4184)Jonathan Dierksen2018-01-221-2/+3
| |/ |/| | | | | * Migrate away from deprecated OSAtomic APIs.
* | Merge pull request #4148 from datacompboy/patch-2Adam Cozzette2018-01-081-0/+53
|\ \ | | | | | | Add more tests to time_test
| * | Update time_test.ccAnton Fedorov2018-01-051-0/+53
| | | | | | | | | Better test coverage for datetime validation.
* | | Fix ValidateDateTime: check day instead monthAnton Fedorov2018-01-051-2/+2
|/ / | | | | | | Found with PVS-Studio static analyser, see https://www.viva64.com/en/b/0550/
* | Merge remote-tracking branch 'origin/3.5.x' into masterJisi Liu2018-01-031-1/+1
|\ \
| * | remove nullptrJisi Liu2018-01-021-1/+1
| | |
* | | Merge remote-tracking branch 'origin/3.5.x' into masterJisi Liu2018-01-0320-153/+301
|\| |
| * | Merge pull request #4080 from pherl/arm64Jisi Liu2017-12-201-0/+3
| |\ \ | | | | | | | | Add support for Windows ARM64 build
| | * | Add support for Windows ARM64 buildMiradham Kamilov2017-12-201-0/+3
| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-02 17:51:37 +0000