aboutsummaryrefslogtreecommitdiff
path: root/src/google
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | |
| * | | Merge pull request #4072 from google/jieluoJisi Liu2017-12-194-51/+99
| |\ \ \ | | | | | | | | | | Cherrypick for csharp, including:
| | * | | Cherrypick for csharp, including:Jie Luo2017-12-194-51/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add preserve UnknownFields Compare floating point values bitwise Add auto-generated header to C# generated files
| * | | | Fix string::back() usage in googletest.ccJisi Liu2017-12-191-1/+1
| | |/ / | |/| |
| * | | Merge pull request #4074 from pherl/mapatJisi Liu2017-12-191-1/+1
| |\ \ \ | | | | | | | | | | Replace C++11 only method std::map::at
| | * | | Replace C++11 only method std::map::atJisi Liu2017-12-191-1/+1
| | |/ /
| * / / Update version number to 3.5.1Jisi Liu2017-12-1913-13/+13
| |/ /
| * | Merge pull request #4042 from pherl/cpp_enumJisi Liu2017-12-131-9/+9
| |\ \ | | | | | | | | Use matching enum type for IsPOD.
| | * | Use matching enum type for IsPOD.Jisi Liu2017-12-131-9/+9
| | | |
| * | | Explicitly propagate the status of Flush().Jisi Liu2017-12-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Before the change, an implicit Flush() will be triggered in the destructor of the input stream. However, the return code of Flush() is not discarded. This change makes sure when Flush() fails, we will return false.
| * | | io_win32_unittest: remove incorrect error checkLaszlo Csomor2017-12-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Unlike GetEnvironmentVariableW, GetCurrentDirectoryW doesn't set ERROR_INSUFFICIENT_BUFFER.
| * | | io_win32_unittest: fix condition in GetCwdAsUtf8Laszlo Csomor2017-12-071-1/+1
| | | |
| * | | io_win32_unittest: use CWD as last tempdirLaszlo Csomor2017-12-071-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the test cannot find a temp directory by checking environment variables, it will fall back to using the current working directory as the temp directory root. This is what the test used to do as of commit https://github.com/google/protobuf/commit/6de51caed52d798815954646b230c5aef3e4d2fc and what was then changed by commit https://github.com/google/protobuf/pull/3978/commits/792d098769d8e000d8d474c8ffd201d2eabc2134
| * | | io_win32: add more encoding-related testsLaszlo Csomor2017-12-073-31/+89
| | | |
| * | | io_win32: support non-ASCII pathsLaszlo Csomor2017-12-073-89/+176
| | | | | | | | | | | | | | | | Fixes https://github.com/google/protobuf/issues/3951
| * | | io_win32_unittest: make //:win32_test run againLaszlo Csomor2017-12-071-49/+29
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Do not use "googletest.h", apprently that leads to linking errors on Windows which I couldn't figure out how to solve, and decided to just go with plain gTest instead. See https://github.com/google/protobuf/issues/3951
* | | Merge pull request #4077 from mkamilov/masterJisi Liu2017-12-201-0/+3
|\ \ \ | | | | | | | | Add support for Windows ARM64 build
| * | | Add support for Windows ARM64 buildMiradham Kamilov2017-12-191-0/+3
| | | |
* | | | line breaks adjstedUbuntu2017-12-201-5/+12
| | | |
* | | | formatting issuesUbuntu2017-12-202-8/+11
| | | |
* | | | resolve issue 4032 and added a unit testUbuntu2017-12-192-1/+17
|/ / /
* | | Merge pull request #4046 from acozzette/deprecated-valueof-issue-2054Adam Cozzette2017-12-141-1/+9
|\ \ \ | | | | | | | | Java: generate an annotation to suppress deprecation warnings
| * | | Generate an annotation to suppress deprecation warningsAdam Cozzette2017-12-131-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge pull request #4045 from pherl/deprecateJisi Liu2017-12-142-5/+7
|\ \ \ \ | |/ / / |/| | | Add deprecation annotation for oneof case.
| * | | Add deprecation annotation for oneof case.Jisi Liu2017-12-132-5/+7
| | | |
* | | | Add auto-generated header to C# generated files (#4038)Jan Tattermusch2017-12-131-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | * Add auto-generated header to C# generated files * regenerate C# protos
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-01 16:40:37 +0000